diff --git a/addons/account/__openerp__.py b/addons/account/__openerp__.py
index e1b9078ec3f..86166ec0125 100644
--- a/addons/account/__openerp__.py
+++ b/addons/account/__openerp__.py
@@ -19,11 +19,11 @@
 #
 ##############################################################################
 {
-    "name" : "eInvoicing",
-    "version" : "1.1",
-    "author" : "OpenERP SA",
-    "category": 'Accounting & Finance',
-    "description": """
+    'name' : 'eInvoicing',
+    'version' : '1.1',
+    'author' : 'OpenERP SA',
+    'category' : 'Accounting & Finance',
+    'description' : """
 Accounting and Financial Management.
 ====================================
 
@@ -44,14 +44,13 @@ Creates a dashboard for accountants that includes:
     * Company Analysis
     * Graph of Treasury
 
-The processes like maintaining of general ledger is done through the defined financial Journals (entry move line orgrouping is maintained through journal) for a particular
-financial year and for preparation of vouchers there is a module named account_voucher.
+The processes like maintaining of general ledger is done through the defined financial Journals (entry move line orgrouping is maintained through journal) 
+for a particular financial year and for preparation of vouchers there is a module named account_voucher.
     """,
     'website': 'http://www.openerp.com',
     'images' : ['images/accounts.jpeg','images/bank_statement.jpeg','images/cash_register.jpeg','images/chart_of_accounts.jpeg','images/customer_invoice.jpeg','images/journal_entries.jpeg'],
-    'init_xml': [],
-    "depends" : ["base_setup", "product", "analytic", "process", "board", "edi"],
-    'update_xml': [
+    'depends' : ['base_setup', 'product', 'analytic', 'process', 'board', 'edi'],
+    'data': [
         'security/account_security.xml',
         'security/ir.model.access.csv',
         'account_menuitem.xml',
@@ -122,12 +121,12 @@ financial year and for preparation of vouchers there is a module named account_v
         'ir_sequence_view.xml',
         'company_view.xml',
         'board_account_view.xml',
-        "edi/invoice_action_data.xml",
-        "account_bank_view.xml",
-        "res_config_view.xml",
-        "account_pre_install.yml"
+        'edi/invoice_action_data.xml',
+        'account_bank_view.xml',
+        'res_config_view.xml',
+        'account_pre_install.yml'
     ],
-    'demo_xml': [
+    'demo': [
         'demo/account_demo.xml',
         'project/project_demo.xml',
         'project/analytic_account_demo.xml',
diff --git a/addons/account/account.py b/addons/account/account.py
index fa30b20f2ca..7ec3bcde2c8 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -30,6 +30,8 @@ from osv import fields, osv
 import decimal_precision as dp
 from tools.translate import _
 from tools.float_utils import float_round
+from openerp import SUPERUSER_ID
+
 
 _logger = logging.getLogger(__name__)
 
@@ -109,7 +111,7 @@ class account_payment_term_line(osv.osv):
         'days': fields.integer('Number of Days', required=True, help="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."),
         'days2': fields.integer('Day of the Month', required=True, help="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)."),
-        'payment_id': fields.many2one('account.payment.term', 'Payment Term', required=True, select=True),
+        'payment_id': fields.many2one('account.payment.term', 'Payment Term', required=True, select=True, ondelete='cascade'),
     }
     _defaults = {
         'value': 'balance',
@@ -582,6 +584,8 @@ class account_account(osv.osv):
     def name_get(self, cr, uid, ids, context=None):
         if not ids:
             return []
+        if isinstance(ids, (int, long)):
+                    ids = [ids]
         reads = self.read(cr, uid, ids, ['name', 'code'], context=context)
         res = []
         for record in reads:
@@ -744,9 +748,11 @@ class account_journal(osv.osv):
         'profit_account_id' : fields.many2one('account.account', 'Profit Account'),
         'loss_account_id' : fields.many2one('account.account', 'Loss Account'),
         'internal_account_id' : fields.many2one('account.account', 'Internal Transfers Account', select=1),
+        'cash_control' : fields.boolean('Cash Control', help='If you want the journal should be control at opening/closing, check this option'),
     }
 
     _defaults = {
+        'cash_control' : False,
         'with_last_closing_balance' : False,
         'user_id': lambda self, cr, uid, context: uid,
         'company_id': lambda self, cr, uid, c: self.pool.get('res.users').browse(cr, uid, uid, c).company_id.id,
@@ -815,7 +821,7 @@ class account_journal(osv.osv):
         if not 'sequence_id' in vals or not vals['sequence_id']:
             # if we have the right to create a journal, we should be able to
             # create it's sequence.
-            vals.update({'sequence_id': self.create_sequence(cr, 1, vals, context)})
+            vals.update({'sequence_id': self.create_sequence(cr, SUPERUSER_ID, vals, context)})
         return super(account_journal, self).create(cr, uid, vals, context)
 
     def name_get(self, cr, user, ids, context=None):
@@ -1369,7 +1375,7 @@ class account_move(osv.osv):
         balance = 0.0
         for line in line_ids:
             if line[2]:
-                balance += (line[2]['debit'] or 0.00)- (line[2]['credit'] or 0.00)
+                balance += (line[2].get('debit',0.00)- (line[2].get('credit',0.00)))
         return {'value': {'balance': balance}}
 
     def write(self, cr, uid, ids, vals, context=None):
@@ -1854,7 +1860,7 @@ class account_tax(osv.osv):
 
     def get_precision_tax():
         def change_digit_tax(cr):
-            res = pooler.get_pool(cr.dbname).get('decimal.precision').precision_get(cr, 1, 'Account')
+            res = pooler.get_pool(cr.dbname).get('decimal.precision').precision_get(cr, SUPERUSER_ID, 'Account')
             return (16, res+2)
         return change_digit_tax
 
@@ -2993,6 +2999,7 @@ class wizard_multi_charts_accounts(osv.osv_memory):
 
     _columns = {
         'company_id':fields.many2one('res.company', 'Company', required=True),
+        'currency_id': fields.many2one('res.currency', 'Currency', help="Currency as per company's country."),
         'only_one_chart_template': fields.boolean('Only One Chart Template Available'),
         'chart_template_id': fields.many2one('account.chart.template', 'Chart Template', required=True),
         'bank_accounts_id': fields.one2many('account.bank.accounts.wizard', 'bank_account_id', 'Cash and Banks', required=True),
@@ -3003,6 +3010,13 @@ class wizard_multi_charts_accounts(osv.osv_memory):
         'purchase_tax_rate': fields.float('Purchase Tax(%)'),
         'complete_tax_set': fields.boolean('Complete Set of Taxes', help='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'),
     }
+    
+    def onchange_company_id(self, cr, uid, ids, company_id, context=None):
+        currency_id = False        
+        if company_id:
+            currency_id = self.pool.get('res.company').browse(cr, uid, company_id, context=context).currency_id.id
+        return {'value': {'currency_id': currency_id}}
+
     def onchange_tax_rate(self, cr, uid, ids, rate=False, context=None):
         return {'value': {'purchase_tax_rate': rate or False}}
 
@@ -3033,6 +3047,13 @@ class wizard_multi_charts_accounts(osv.osv_memory):
             res.update({'bank_accounts_id': [{'acc_name': _('Cash'), 'account_type': 'cash'},{'acc_name': _('Bank'), 'account_type': 'bank'}]})
         if 'company_id' in fields:
             res.update({'company_id': self.pool.get('res.users').browse(cr, uid, [uid], context=context)[0].company_id.id})
+        if 'currency_id' in fields:
+            company_id = res.get('company_id') or False
+            if company_id:
+                company_obj = self.pool.get('res.company')
+                country_id = company_obj.browse(cr, uid, company_id, context=context).country_id.id
+                currency_id = company_obj.on_change_country(cr, uid, company_id, country_id, context=context)['value']['currency_id']
+                res.update({'currency_id': currency_id})
 
         ids = self.pool.get('account.chart.template').search(cr, uid, [('visible', '=', True)], context=context)
         if ids:
@@ -3337,19 +3358,18 @@ class wizard_multi_charts_accounts(osv.osv_memory):
         ir_values_obj = self.pool.get('ir.values')
         obj_wizard = self.browse(cr, uid, ids[0])
         company_id = obj_wizard.company_id.id
+        self.pool.get('res.company').write(cr, uid, [company_id], {'currency_id': obj_wizard.currency_id.id})
         # If the floats for sale/purchase rates have been filled, create templates from them
         self._create_tax_templates_from_rates(cr, uid, obj_wizard, company_id, context=context)
 
         # Install all the templates objects and generate the real objects
         acc_template_ref, taxes_ref, tax_code_ref = self._install_template(cr, uid, obj_wizard.chart_template_id.id, company_id, code_digits=obj_wizard.code_digits, obj_wizard=obj_wizard, context=context)
 
-        # write values of default taxes for product
+        # write values of default taxes for product as super user
         if obj_wizard.sale_tax and taxes_ref:
-            ir_values_obj.set(cr, uid, key='default', key2=False, name="taxes_id", company=company_id,
-                                models =[('product.product',False)], value=[taxes_ref[obj_wizard.sale_tax.id]])
+            ir_values_obj.set_default(cr, SUPERUSER_ID, 'product.product', "taxes_id", [taxes_ref[obj_wizard.sale_tax.id]], for_all_users=True, company_id=company_id)
         if obj_wizard.purchase_tax and taxes_ref:
-                ir_values_obj.set(cr, uid, key='default', key2=False, name="supplier_taxes_id", company=company_id,
-                                models =[('product.product',False)], value=[taxes_ref[obj_wizard.purchase_tax.id]])
+            ir_values_obj.set_default(cr, SUPERUSER_ID, 'product.product', "supplier_taxes_id", [taxes_ref[obj_wizard.purchase_tax.id]], for_all_users=True, company_id=company_id)
 
         # Create Bank journals
         self._create_bank_journals_from_o2m(cr, uid, obj_wizard, company_id, acc_template_ref, context=context)
diff --git a/addons/account/account_bank_statement.py b/addons/account/account_bank_statement.py
index 8df291a98d1..095d461ff3b 100644
--- a/addons/account/account_bank_statement.py
+++ b/addons/account/account_bank_statement.py
@@ -430,7 +430,7 @@ class account_bank_statement(osv.osv):
                     'name': st_number,
                     'balance_end_real': st.balance_end
             }, context=context)
-            self.message_append_note(cr, uid, [st.id], body=_('Statement %s is confirmed, journal items are created.') % (st_number,), context=context)
+            self.message_post(cr, uid, [st.id], body=_('Statement %s confirmed, journal items were created.') % (st_number,), context=context)
         return self.write(cr, uid, ids, {'state':'confirm'}, context=context)
 
     def button_cancel(self, cr, uid, ids, context=None):
diff --git a/addons/account/account_cash_statement.py b/addons/account/account_cash_statement.py
index 9af0dcf60f4..17fa05d5f24 100644
--- a/addons/account/account_cash_statement.py
+++ b/addons/account/account_cash_statement.py
@@ -194,12 +194,27 @@ class account_cash_statement(osv.osv):
             journal = self.pool.get('account.journal').browse(cr, uid, vals['journal_id'], context=context)
         if journal and (journal.type == 'cash') and not vals.get('details_ids'):
             vals['details_ids'] = []
+
+            last_pieces = None
+
+            if journal.with_last_closing_balance == True:
+                domain = [('journal_id', '=', journal.id),
+                          ('state', '=', 'confirm')]
+                last_bank_statement_ids = self.search(cr, uid, domain, limit=1, order='create_date desc', context=context)
+                if last_bank_statement_ids:
+                    last_bank_statement = self.browse(cr, uid, last_bank_statement_ids[0], context=context)
+
+                    last_pieces = dict(
+                        (line.pieces, line.number_closing) for line in last_bank_statement.details_ids
+                    )
+
             for value in journal.cashbox_line_ids:
                 nested_values = {
                     'number_closing' : 0,
-                    'number_opening' : 0,
+                    'number_opening' : last_pieces.get(value.pieces, 0) if isinstance(last_pieces, dict) else 0,
                     'pieces' : value.pieces
                 }
+
                 vals['details_ids'].append([0, False, nested_values])
 
         res_id = super(account_cash_statement, self).create(cr, uid, vals, context=context)
diff --git a/addons/account/account_invoice.py b/addons/account/account_invoice.py
index 012bde42eff..15027b7a8f6 100644
--- a/addons/account/account_invoice.py
+++ b/addons/account/account_invoice.py
@@ -1045,7 +1045,7 @@ class account_invoice(osv.osv):
                 if obj_inv.type in ('out_invoice', 'out_refund'):
                     ctx = self.get_log_context(cr, uid, context=ctx)
                 message = _("Invoice  '%s' is validated.") % name
-                self.message_append_note(cr, uid, [inv_id], body=message, context=context)
+                self.message_post(cr, uid, [inv_id], body=message, context=context)
         return True
 
     def action_cancel(self, cr, uid, ids, *args):
@@ -1127,7 +1127,7 @@ class account_invoice(osv.osv):
         return map(lambda x: (0,0,x), lines)
 
     def refund(self, cr, uid, ids, date=None, period_id=None, description=None, journal_id=None):
-        invoices = self.read(cr, uid, ids, ['name', 'type', 'number', 'reference', 'comment', 'date_due', 'partner_id', 'partner_contact', 'partner_insite', 'partner_ref', 'payment_term', 'account_id', 'currency_id', 'invoice_line', 'tax_line', 'journal_id'])
+        invoices = self.read(cr, uid, ids, ['name', 'type', 'number', 'reference', 'comment', 'date_due', 'partner_id', 'partner_contact', 'partner_insite', 'partner_ref', 'payment_term', 'account_id', 'currency_id', 'invoice_line', 'tax_line', 'journal_id', 'company_id'])
         obj_invoice_line = self.pool.get('account.invoice.line')
         obj_invoice_tax = self.pool.get('account.invoice.tax')
         obj_journal = self.pool.get('account.journal')
@@ -1175,7 +1175,7 @@ class account_invoice(osv.osv):
                     'name': description,
                 })
             # take the id part of the tuple returned for many2one fields
-            for field in ('partner_id',
+            for field in ('partner_id', 'company_id',
                     'account_id', 'currency_id', 'payment_term', 'journal_id'):
                 invoice[field] = invoice[field] and invoice[field][0]
             # create the new invoice
@@ -1275,7 +1275,7 @@ class account_invoice(osv.osv):
             # TODO: use currency's formatting function
             msg = _("Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining).") % \
                     (name, pay_amount, code, invoice.amount_total, code, total, code)
-            self.message_append_note(cr, uid, [inv_id], body=msg, context=context)
+            self.message_post(cr, uid, [inv_id], body=msg, context=context)
             self.pool.get('account.move.line').reconcile_partial(cr, uid, line_ids, 'manual', context)
 
         # Update the stored value (fields.function), so we write to trigger recompute
@@ -1288,24 +1288,25 @@ class account_invoice(osv.osv):
 
     def _get_document_type(self, type):
         type_dict = {
-                'out_invoice': 'Customer invoice',
-                'in_invoice': 'Supplier invoice',
-                'out_refund': 'Customer Refund',
-                'in_refund': 'Supplier Refund',
+                # Translation markers will have no effect at runtime, only used to properly flag export
+                'out_invoice': _('Customer invoice'),
+                'in_invoice': _('Supplier invoice'),
+                'out_refund': _('Customer Refund'),
+                'in_refund': _('Supplier Refund'),
         }
         return type_dict.get(type, 'Invoice')
 
     def create_send_note(self, cr, uid, ids, context=None):
         for obj in self.browse(cr, uid, ids, context=context):
-            self.message_append_note(cr, uid, [obj.id],body=_("%s <b>created</b>.") % (self._get_document_type(obj.type)), context=context)
+            self.message_post(cr, uid, [obj.id], body=_("%s <b>created</b>.") % (_(self._get_document_type(obj.type))), context=context)
 
     def confirm_paid_send_note(self, cr, uid, ids, context=None):
-         for obj in self.browse(cr, uid, ids, context=context):
-            self.message_append_note(cr, uid, [obj.id], body=_("%s <b>paid</b>.") % (self._get_document_type(obj.type)), context=context)
+        for obj in self.browse(cr, uid, ids, context=context):
+            self.message_post(cr, uid, [obj.id], body=_("%s <b>paid</b>.") % (_(self._get_document_type(obj.type))), context=context)
 
     def invoice_cancel_send_note(self, cr, uid, ids, context=None):
         for obj in self.browse(cr, uid, ids, context=context):
-            self.message_append_note(cr, uid, [obj.id], body=_("%s <b>cancelled</b>.") % (self._get_document_type(obj.type)), context=context)
+            self.message_post(cr, uid, [obj.id], body=_("%s <b>cancelled</b>.") % (_(self._get_document_type(obj.type))), context=context)
 
 account_invoice()
 
@@ -1361,10 +1362,16 @@ class account_invoice_line(osv.osv):
         'company_id': fields.related('invoice_id','company_id',type='many2one',relation='res.company',string='Company', store=True, readonly=True),
         'partner_id': fields.related('invoice_id','partner_id',type='many2one',relation='res.partner',string='Partner',store=True)
     }
+
+    def _default_account_id(self, cr, uid, ids, context=None):
+        prop = self.pool.get('ir.property').get(cr, uid, 'property_account_income_categ', 'product.category', context=context)
+        return prop and prop.id or False
+
     _defaults = {
         'quantity': 1,
         'discount': 0.0,
         'price_unit': _price_unit_default,
+        'account_id': _default_account_id,
     }
 
     def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
@@ -1473,10 +1480,11 @@ class account_invoice_line(osv.osv):
             prod = self.pool.get('product.product').browse(cr, uid, product, context=context)
             prod_uom = self.pool.get('product.uom').browse(cr, uid, uom, context=context)
             if prod.uom_id.category_id.id != prod_uom.category_id.id:
-                 warning = {
+                warning = {
                     'title': _('Warning!'),
                     'message': _('The selected unit of measure is not compatible with the unit of measure of the product.')
-            }
+                }
+                res['value'].update({'uos_id': prod.uom_id.id})
             return {'value': res['value'], 'warning': warning}
         return res
 
diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index 143c5514141..610485ec3a0 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -191,17 +191,23 @@
                         <page string="Invoice">
                             <field context="{'partner_id': partner_id, 'price_type': 'price_type' in dir() and price_type or False, 'type': type}" name="invoice_line">
                                 <tree string="Invoice lines" editable="bottom">
-                                    <field name="product_id" on_change="product_id_change(product_id, uos_id, quantity, name, parent.type, parent.partner_id, parent.fiscal_position, price_unit, parent.currency_id, context, parent.company_id)"/>
-                                    <field domain="[('company_id', '=', parent.company_id), ('journal_id', '=', parent.journal_id), ('type', '&lt;&gt;', 'view')]" name="account_id" on_change="onchange_account_id(product_id,parent.partner_id,parent.type,parent.fiscal_position,account_id)" groups="base.group_account_user"/>
-                                    <field name="invoice_line_tax_id" view_mode="2" context="{'type':parent.type}" domain="[('parent_id','=',False)]"/>
-                                    <field domain="[('type','&lt;&gt;','view'), ('company_id', '=', parent.company_id), ('parent_id', '!=', False)]" name="account_analytic_id" groups="analytic.group_analytic_accounting"/>
+                                    <field name="product_id"
+                                        on_change="product_id_change(product_id, uos_id, quantity, name, parent.type, parent.partner_id, parent.fiscal_position, price_unit, parent.currency_id, context, parent.company_id)"/>
+                                    <field name="name"/>
+                                    <field name="company_id" groups="base.group_multi_company" readonly="1"/>
+                                    <field name="account_id" groups="account.group_account_user"
+                                        domain="[('company_id', '=', parent.company_id), ('journal_id', '=', parent.journal_id), ('type', '!=', 'view')]"
+                                        on_change="onchange_account_id(product_id, parent.partner_id, parent.type, parent.fiscal_position,account_id)"/>
+                                    <field name="account_analytic_id" groups="analytic.group_analytic_accounting"
+                                        domain="[('type','!=','view'), ('company_id', '=', parent.company_id), ('parent_id', '!=', False)]"/>
                                     <field name="quantity"/>
+                                    <field name="uos_id" groups="product.group_uom"
+                                        on_change="uos_id_change(product_id, uos_id, quantity, name, parent.type, parent.partner_id, parent.fiscal_position, price_unit, parent.currency_id, context, parent.company_id)"/>
                                     <field name="price_unit"/>
+                                    <field name="discount" groups="sale.group_discount_per_so_line"/>
+                                    <field name="invoice_line_tax_id" widget="many2many_tags" context="{'type':parent.type}"
+                                        domain="[('parent_id','=',False),('company_id', '=', parent.company_id)]"/>
                                     <field name="price_subtotal"/>
-                                    <field domain="[('company_id', '=', parent.company_id), ('journal_id', '=', parent.journal_id), ('type', '&lt;&gt;', 'view')]" name="account_id" on_change="onchange_account_id(product_id,parent.partner_id,parent.type,parent.fiscal_position,account_id)" invisible="1"/>
-                                    <!-- Removed if subtotal is set -->
-                                    <field name="name" invisible="1"/>
-                                    <field name="uos_id" invisible="1"/>
                                 </tree>
                             </field>
                             <group class="oe_subtotal_footer oe_right">
@@ -342,17 +348,22 @@
                         <page string="Invoice Lines">
                             <field name="invoice_line" nolabel="1" widget="one2many_list" context="{'type': type}">
                                 <tree string="Invoice Lines" editable="bottom">
-                                    <field name="invoice_line_tax_id" invisible="1"/>
-                                    <field name="product_id" />
+                                    <field name="product_id"
+                                        on_change="product_id_change(product_id, uos_id, quantity, name, parent.type, parent.partner_id, parent.fiscal_position, price_unit, parent.currency_id, context, parent.company_id)"/>
                                     <field name="name"/>
+                                    <field name="company_id" groups="base.group_multi_company" readonly="1"/>
                                     <field name="account_id" groups="account.group_account_user"
-                                        domain="[('company_id', '=', parent.company_id), ('journal_id', '=', parent.journal_id), ('type', '&lt;&gt;', 'view')]"
+                                        domain="[('company_id', '=', parent.company_id), ('journal_id', '=', parent.journal_id), ('type', '!=', 'view')]"
                                         on_change="onchange_account_id(product_id, parent.partner_id, parent.type, parent.fiscal_position,account_id)"/>
+                                    <field name="account_analytic_id" groups="analytic.group_analytic_accounting"
+                                        domain="[('type','!=','view'), ('company_id', '=', parent.company_id), ('parent_id', '!=', False)]"/>
                                     <field name="quantity"/>
                                     <field name="uos_id" groups="product.group_uom"
                                         on_change="uos_id_change(product_id, uos_id, quantity, name, parent.type, parent.partner_id, parent.fiscal_position, price_unit, parent.currency_id, context, parent.company_id)"/>
                                     <field name="price_unit"/>
                                     <field name="discount" groups="sale.group_discount_per_so_line"/>
+                                    <field name="invoice_line_tax_id" widget="many2many_tags" context="{'type':parent.type}"
+                                        domain="[('parent_id','=',False),('company_id', '=', parent.company_id)]"/>
                                     <field name="price_subtotal"/>
                                 </tree>
                             </field>
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 5bf45aab487..e3c5c211990 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -515,7 +515,7 @@
                             <separator colspan="4" string="Accounts Allowed (empty for no control)"/>
                             <field colspan="4" name="account_control_ids" nolabel="1"/>
                         </page>
-                        <page string="Cash Registers" attrs="{'invisible':[('type', '!=', 'cash')]}">
+                        <page string="Cash Registers">
                             <group>
                                 <group string="Accounts">
                                     <field name="profit_account_id"/>
@@ -524,10 +524,11 @@
                                 </group>
                                 <group string="Miscellaneous">
                                     <field name="with_last_closing_balance"/>
+                                    <field name="cash_control"/>
                                 </group>
                             </group>
-                            <separator string="Available Coins" colspan="4" />
-                            <field name="cashbox_line_ids" nolabel="1" string="Unit Of Currency Definition" colspan="4">
+                            <separator string="Available Coins" colspan="4" attrs="{'invisible' : [('cash_control', '=', False)] }"/>
+                            <field name="cashbox_line_ids" nolabel="1" string="Unit Of Currency Definition" colspan="4" attrs="{'invisible' : [('cash_control', '=', False)]}">
                                 <tree string="CashBox Lines" editable="bottom">
                                     <field name="pieces" />
                                 </tree>
@@ -2370,8 +2371,10 @@
                     <field name="complete_tax_set" invisible="1"/>
                     <div groups="base.group_multi_company">
                         <label for="company_id"/>
-                        <field name="company_id" widget="selection"/> <!-- we assume that this wizard will be run only by administrators and as this field may cause problem if hidden (because of the default company of the user removed from the selection because already configured), we simply choosed to remove the group "multi company" of it -->
+                        <field name="company_id" widget="selection" on_change="onchange_company_id(company_id)"/> <!-- we assume that this wizard will be run only by administrators and as this field may cause problem if hidden (because of the default company of the user removed from the selection because already configured), we simply choosed to remove the group "multi company" of it -->
                     </div>
+                    <label for="currency_id"/>
+                    <field name="currency_id" />
                     <group>
                         <div attrs="{'invisible': [('only_one_chart_template','=',True)]}">
                             <label for="chart_template_id"/>
diff --git a/addons/account/board_account_view.xml b/addons/account/board_account_view.xml
index 630c551c5ca..563c3f5fc6c 100644
--- a/addons/account/board_account_view.xml
+++ b/addons/account/board_account_view.xml
@@ -29,7 +29,6 @@
                 <form string="Account Board" version="7.0">
                     <board style="2-1">
                         <column>
-                            <action name="%(account.action_invoice_tree1)d" creatable="true" string="Draft Customer Invoices" domain="[('state','in',('draft','proforma2')), ('type','=','out_invoice')]"/>
                             <action name="%(action_company_analysis_tree)d" string="Company Analysis"/>
                         </column>
                         <column>
diff --git a/addons/account/demo/account_minimal.xml b/addons/account/demo/account_minimal.xml
index baa94450f02..94b3d2d4085 100644
--- a/addons/account/demo/account_minimal.xml
+++ b/addons/account/demo/account_minimal.xml
@@ -381,6 +381,11 @@
             <field name="name">Cash Journal - (test)</field>
             <field name="code">TCSH</field>
             <field name="type">cash</field>
+            <field name="profit_account_id" model="account.account" ref="rsa" />
+            <field name="loss_account_id" model="account.account" ref="rsa" />
+            <field name="internal_account_id" model="account.account" ref="rsa" />
+            <field name="with_last_closing_balance" eval="True" />
+            <field name="cash_control" eval="True" />
             <field name="view_id" ref="account_journal_bank_view"/>
             <field name="sequence_id" ref="sequence_cash_journal"/>
             <field model="account.account" name="default_debit_account_id" ref="cash"/>
diff --git a/addons/account/edi/invoice_action_data.xml b/addons/account/edi/invoice_action_data.xml
index 0eec6d27785..53fa03a6902 100644
--- a/addons/account/edi/invoice_action_data.xml
+++ b/addons/account/edi/invoice_action_data.xml
@@ -123,64 +123,6 @@
     </div>
 </div>
             ]]></field>
-            <field name="body_text"><![CDATA[
-Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name or ''},
-
-A new invoice is available for ${object.partner_id.name}:
-       | Invoice number: *${object.number}*
-       | Invoice total: *${object.amount_total} ${object.currency_id.name}*
-       | Invoice date: ${object.date_invoice}
-       % if object.origin:
-       | Order reference: ${object.origin}
-       % endif
-       | Your contact: ${object.user_id.name} ${object.user_id.email and '<%s>'%(object.user_id.email) or ''}
-
-You can view the invoice document, download it and pay online using the following link:
-    ${ctx.get('edi_web_url_view') or 'n/a'}
-
-% if object.company_id.paypal_account and object.type in ('out_invoice', 'in_refund'):
-<% 
-comp_name = quote(object.company_id.name)
-inv_number = quote(object.number)
-paypal_account = quote(object.company_id.paypal_account)
-inv_amount = quote(str(object.amount_total))
-cur_name = quote(object.currency_id.name)
-paypal_url = "https://www.paypal.com/cgi-bin/webscr?cmd=_xclick&business=%s&item_name=%s%%20Invoice%%20%s"\
-             "&invoice=%s&amount=%s&currency_code=%s&button_subtype=services&no_note=1&bn=OpenERP_Invoice_PayNow_%s" % \
-             (paypal_account,comp_name,inv_number,inv_number,inv_amount,cur_name,cur_name)
-%>
-It is also possible to directly pay with Paypal:
-    ${paypal_url}
-% endif
-
-If you have any question, do not hesitate to contact us.
-
-
-Thank you for choosing ${object.company_id.name}!
-
-
---
-${object.user_id.name} ${object.user_id.email and '<%s>'%(object.user_id.email) or ''}
-${object.company_id.name}
-% if object.company_id.street:
-${object.company_id.street or ''}
-% endif
-% if object.company_id.street2:
-${object.company_id.street2}
-% endif
-% if object.company_id.city or object.company_id.zip:
-${object.company_id.zip or ''} ${object.company_id.city or ''}
-% endif
-% if object.company_id.country_id:
-${object.company_id.state_id and ('%s, ' % object.company_id.state_id.name) or ''} ${object.company_id.country_id.name or ''}
-% endif
-% if object.company_id.phone:
-Phone: ${object.company_id.phone}
-% endif
-% if object.company_id.website:
-${object.company_id.website or ''}
-% endif
-            ]]></field>
         </record>
     </data>
 </openerp>
diff --git a/addons/account/i18n/account.pot b/addons/account/i18n/account.pot
index 174002a8d8d..0d5439719e2 100644
--- a/addons/account/i18n/account.pot
+++ b/addons/account/i18n/account.pot
@@ -9538,7 +9538,7 @@ msgid "Refund"
 msgstr ""
 
 #. module: account
-#: model:email.template,body_text:account.email_template_edi_invoice
+#: model:email.template,body:account.email_template_edi_invoice
 msgid "\n"
 "Hello${object.address_invoice_id.name and ' ' or ''}${object.address_invoice_id.name or ''},\n"
 "\n"
diff --git a/addons/account/i18n/ar.po b/addons/account/i18n/ar.po
index 7b7fbd86233..1ab481c3695 100644
--- a/addons/account/i18n/ar.po
+++ b/addons/account/i18n/ar.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:02+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:08+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -2162,7 +2162,7 @@ msgstr "لا يمكن تعديل الشركه المتسجله في المجله
 #. module: account
 #: report:account.invoice:0
 msgid "Customer Code"
-msgstr ""
+msgstr "رمز العميل"
 
 #. module: account
 #: view:account.installer:0
@@ -2221,7 +2221,7 @@ msgstr "لا يوجد دفتر يومية للمبيعات أو المشتريا
 #. module: account
 #: constraint:res.partner.bank:0
 msgid "The RIB and/or IBAN is not valid"
-msgstr ""
+msgstr "رقم الحساب RIB أو IBAN غير صحيح"
 
 #. module: account
 #: view:product.category:0
@@ -2309,7 +2309,7 @@ msgstr "اتركه فارغ لجميع السنوات المالية المفت
 #. module: account
 #: field:account.invoice.report,account_line_id:0
 msgid "Account Line"
-msgstr ""
+msgstr "سطر الحساب"
 
 #. module: account
 #: code:addons/account/account.py:1468
@@ -2326,6 +2326,8 @@ msgid ""
 "'Setup Your Bank Accounts' tool that will automatically create the accounts "
 "and journals for you."
 msgstr ""
+"إعداد يوميات المحاسبة. لحسابات البنوك، ينصح بإستخدام قسم \"إعداد حسابات "
+"البنك\" فهذا سينتج الحسابات و اليوميات تلقائياً."
 
 #. module: account
 #: model:ir.model,name:account.model_account_move
@@ -2435,7 +2437,7 @@ msgstr ""
 #: 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 ""
+msgstr "30% مقدما لنهاية 30 يوم"
 
 #. module: account
 #: view:account.entries.report:0
@@ -2569,7 +2571,7 @@ msgstr "هذا التقرير يعطي لمحة عامة عن وضع  يومية
 #. module: account
 #: model:ir.model,name:account.model_account_move_line_reconcile_writeoff
 msgid "Account move line reconcile (writeoff)"
-msgstr ""
+msgstr "سطر حركة حساب التسوية (إلغاء)"
 
 #. module: account
 #: model:account.account.type,name:account.account_type_tax
@@ -2665,7 +2667,7 @@ msgstr "يمكن للحساب أن يكون رمز رئيسي للضريبة أ
 #. module: account
 #: sql_constraint:account.model.line:0
 msgid "Wrong credit or debit value in model, they must be positive!"
-msgstr ""
+msgstr "خطا في قيمة حساب المدين/الدائن في النموذج,يجب ان يكونوا ايجابيين"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_automatic_reconcile
@@ -2700,7 +2702,7 @@ msgstr "تواريخ"
 #. module: account
 #: field:account.chart.template,parent_id:0
 msgid "Parent Chart Template"
-msgstr ""
+msgstr "قالب المخطط الرئيسي"
 
 #. module: account
 #: field:account.tax,parent_id:0
@@ -2712,7 +2714,7 @@ msgstr "حساب الضرائب الرئيسي"
 #: code:addons/account/wizard/account_change_currency.py:59
 #, python-format
 msgid "New currency is not configured properly !"
-msgstr ""
+msgstr "لم يتم تكوين العملة الجديدة بشكل صحيح"
 
 #. module: account
 #: view:account.subscription.generate:0
@@ -2769,7 +2771,7 @@ msgstr "الإعدادات المالية للشركة الجديدة"
 #. module: account
 #: view:account.installer:0
 msgid "Configure Your Chart of Accounts"
-msgstr ""
+msgstr "تكوين مخططاتك الحسابية"
 
 #. module: account
 #: view:account.use.model:0
@@ -2796,7 +2798,7 @@ msgstr "عليك بتعريف يومية تحليلية في يومية '%s' !"
 msgid ""
 "You need an Opening journal with centralisation checked to set the initial "
 "balance!"
-msgstr ""
+msgstr "انت تحتاج ليوميه إفتتاحية شاملة علامة المركزيه لضبط الرصيد المبدئي!"
 
 #. module: account
 #: view:account.invoice.tax:0
@@ -2808,7 +2810,7 @@ msgstr "رموز الضريبة"
 #. module: account
 #: view:account.account:0
 msgid "Unrealized Gains and losses"
-msgstr ""
+msgstr "الأرباح و الخسائر الغير محققة"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_account_customer
@@ -2894,7 +2896,7 @@ msgstr "مبلغ الرمز الرئيسي"
 msgid ""
 "You can not delete an invoice which is open or paid. We suggest you to "
 "refund it instead."
-msgstr ""
+msgstr "لا يمكنك حذف فاتورة مفتوحة او تم دفعها. يمكنك القيام بعملية رد."
 
 #. module: account
 #: field:wizard.multi.charts.accounts,sale_tax:0
@@ -2905,7 +2907,7 @@ msgstr "ضريبة البيع الإفتراضية"
 #: code:addons/account/account_invoice.py:1013
 #, python-format
 msgid "Invoice  '%s' is validated."
-msgstr ""
+msgstr "يتم التحقق من صحة الفاتورة '%s'"
 
 #. module: account
 #: help:account.model.line,date_maturity:0
@@ -2948,6 +2950,8 @@ msgid ""
 "Tax base different!\n"
 "Click on compute to update the tax base."
 msgstr ""
+"القاعده الضريبيه مختلفه!\n"
+"انقر علي الحساب لتحديث القاعده الضريبيه."
 
 #. module: account
 #: field:account.partner.ledger,page_split:0
@@ -2996,7 +3000,7 @@ msgstr "عملة الفاتورة"
 #: field:accounting.report,account_report_id:0
 #: model:ir.ui.menu,name:account.menu_account_financial_reports_tree
 msgid "Account Reports"
-msgstr ""
+msgstr "تقارير الحساب"
 
 #. module: account
 #: field:account.payment.term,line_ids:0
@@ -3021,7 +3025,7 @@ msgstr "قائمة قالب الضريبة"
 #. module: account
 #: model:ir.ui.menu,name:account.menu_account_print_sale_purchase_journal
 msgid "Sale/Purchase Journals"
-msgstr ""
+msgstr "بيع/شراء الدفاتر اليومية"
 
 #. module: account
 #: help:account.account,currency_mode:0
@@ -3110,7 +3114,7 @@ msgstr "سطور تحليلية"
 #. module: account
 #: view:account.invoice:0
 msgid "Proforma Invoices"
-msgstr ""
+msgstr "الفواتير المفترضة"
 
 #. module: account
 #: model:process.node,name:account.process_node_electronicfile0
@@ -3125,7 +3129,7 @@ msgstr "دين العميل"
 #. module: account
 #: view:account.payment.term.line:0
 msgid "  Day of the Month: 0"
-msgstr ""
+msgstr "  يوم من الشهر"
 
 #. module: account
 #: view:account.subscription:0
@@ -3172,7 +3176,7 @@ msgstr ""
 #. module: account
 #: view:report.account.sales:0
 msgid "This months' Sales by type"
-msgstr ""
+msgstr "هذه شهور المبيعات وفقا لنوع"
 
 #. module: account
 #: model:ir.model,name:account.model_account_unreconcile_reconcile
@@ -3182,7 +3186,7 @@ msgstr "حساب التسوية / إلغاءها"
 #. module: account
 #: sql_constraint:account.tax:0
 msgid "The description must be unique per company!"
-msgstr ""
+msgstr "وصف لكل شركة يجب ان تكون فريد!"
 
 #. module: account
 #: help:account.account.type,close_method:0
@@ -3284,7 +3288,7 @@ msgstr "إعداد برنامج المحاسبة"
 #. module: account
 #: view:account.payment.term.line:0
 msgid "  Value amount: 0.02"
-msgstr ""
+msgstr "  قيمة الرصيد:0.02"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.open_board_account
@@ -3314,7 +3318,7 @@ msgstr "إغلاق الفترة"
 #. module: account
 #: field:account.financial.report,display_detail:0
 msgid "Display details"
-msgstr ""
+msgstr "عرض التقاصيل"
 
 #. module: account
 #: report:account.overdue:0
@@ -3356,7 +3360,7 @@ msgstr "خريطة الضريبة"
 #: code:addons/account/account_cash_statement.py:314
 #, python-format
 msgid "The closing balance should be the same than the computed balance!"
-msgstr ""
+msgstr "الرصيد الختامي ينبغي ان يكون نفس الرصيد المحسوب"
 
 #. module: account
 #: view:account.journal:0
@@ -3433,17 +3437,17 @@ msgstr ""
 #. module: account
 #: view:account.invoice.line:0
 msgid "Quantity :"
-msgstr ""
+msgstr "الكمية"
 
 #. module: account
 #: field:account.aged.trial.balance,period_length:0
 msgid "Period Length (days)"
-msgstr ""
+msgstr "طول الفترة (أيام)"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_print_sale_purchase_journal
 msgid "Print Sale/Purchase Journal"
-msgstr ""
+msgstr "طيع البيع/الشراء اليومية"
 
 #. module: account
 #: field:account.invoice.report,state:0
@@ -3470,12 +3474,12 @@ msgstr "تقرير المبيعات حسب نوع الحساب"
 #. module: account
 #: view:account.move.line:0
 msgid "Unreconciled Journal Items"
-msgstr ""
+msgstr "بنود يوميه لم تتم تسويتها"
 
 #. module: account
 #: sql_constraint:res.currency:0
 msgid "The currency code must be unique per company!"
-msgstr ""
+msgstr "رمز العملة يجب ان يكون فريدا لكل شركة"
 
 #. module: account
 #: selection:account.account.type,close_method:0
@@ -3491,6 +3495,10 @@ msgid ""
 "amount greater than the total invoiced amount. The latest line of your "
 "payment term must be of type 'balance' to avoid rounding issues."
 msgstr ""
+"لا يمكن انشاء الفاتوره !\n"
+"شروط الدفع من المحتمل أن تكون غير مضبوطه لانه يعطي الكميه المحسوبه اكبر من "
+"المبلغ الاجمالي في الفاتوره. أخر سطر من شروط الدفع يجب ان يكون من نوع \" "
+"المتوازن\" لتجنب مشاكل تقريب الأرقام."
 
 #. module: account
 #: report:account.invoice:0
@@ -3524,7 +3532,7 @@ msgstr "النظير المركزي"
 #: code:addons/account/account_move_line.py:584
 #, python-format
 msgid "You can not create journal items on a \"view\" account %s %s"
-msgstr ""
+msgstr "لا يمكن انشاء وحدات يوميه علي \"عرض \"الحساب%s%s"
 
 #. module: account
 #: model:ir.model,name:account.model_account_partner_reconcile_process
@@ -3656,7 +3664,7 @@ msgstr "لا مرشحات"
 #. module: account
 #: view:account.invoice.report:0
 msgid "Pro-forma Invoices"
-msgstr ""
+msgstr "شكل الفاتورة"
 
 #. module: account
 #: view:res.partner:0
@@ -3746,7 +3754,7 @@ msgstr "#القيود"
 #. module: account
 #: selection:account.invoice.refund,filter_refund:0
 msgid "Create a draft Refund"
-msgstr ""
+msgstr "إنشاء مشروع استرداد"
 
 #. module: account
 #: view:account.state.open:0
@@ -3771,6 +3779,8 @@ msgid ""
 "centralised counterpart box in the related journal from the configuration "
 "menu."
 msgstr ""
+"لا يمكن إنشاء فاتوره في يوميه مركزيه. قم بإلغاء التحديد علي مربع المناظره "
+"المركزيه المتعلق بقيد اليوميه من قائمة الإعدادت."
 
 #. module: account
 #: field:account.account,name:0
@@ -3794,7 +3804,7 @@ msgstr "ميزان المراجعة للحسابات المعمرة"
 #: code:addons/account/account_move_line.py:591
 #, python-format
 msgid "You can not create journal items on a closed account %s %s"
-msgstr ""
+msgstr "لا يمكن انشاء عناصر اليومية لحساب مغلق%s%s"
 
 #. module: account
 #: field:account.move.line,date:0
@@ -3805,7 +3815,7 @@ msgstr "التاريخ الفعلي"
 #: 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 ""
+msgstr "اعداد الحسابات المصرفية الخاصة بك"
 
 #. module: account
 #: code:addons/account/wizard/account_move_bank_reconcile.py:53
@@ -3837,6 +3847,7 @@ msgid ""
 "The fiscalyear, periods or chart of account chosen have to belong to the "
 "same company."
 msgstr ""
+"السنة المالية.الفترات او المخطط للحساب تختار علي ان تنتمي إلى نفس الشركة"
 
 #. module: account
 #: model:ir.actions.todo.category,name:account.category_accounting_configuration
@@ -3852,7 +3863,7 @@ msgstr "المحاسبة"
 #. module: account
 #: view:account.entries.report:0
 msgid "Journal Entries with period in current year"
-msgstr ""
+msgstr "قيود اليومية مع فترة في العام الحالي"
 
 #. module: account
 #: help:account.central.journal,amount_currency:0
@@ -3870,6 +3881,8 @@ 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
@@ -3949,7 +3962,7 @@ msgstr "متوسط النسبة"
 #: field:account.common.account.report,display_account:0
 #: field:account.report.general.ledger,display_account:0
 msgid "Display Accounts"
-msgstr ""
+msgstr "عرض الحسابات"
 
 #. module: account
 #: view:account.state.open:0
@@ -3990,7 +4003,7 @@ msgstr "اذا تم وضع الحقل النشط لخطأ, ستسمح لك بإ
 #. module: account
 #: view:account.move.line:0
 msgid "Posted Journal Items"
-msgstr ""
+msgstr "نشر عناصر اليومية"
 
 #. module: account
 #: view:account.tax.template:0
@@ -4005,12 +4018,12 @@ msgstr "مسودة المدخلات"
 #. module: account
 #: view:account.payment.term.line:0
 msgid "  Day of the Month= -1"
-msgstr ""
+msgstr "  يوم في الشهر = -١"
 
 #. module: account
 #: view:account.payment.term.line:0
 msgid "  Number of Days: 30"
-msgstr ""
+msgstr "  عدد الأيام: ٣٠"
 
 #. module: account
 #: field:account.account,shortcut:0
@@ -4021,7 +4034,7 @@ msgstr "إختصار"
 #. module: account
 #: constraint:account.fiscalyear:0
 msgid "Error! The start date of the fiscal year must be before his end date."
-msgstr ""
+msgstr "خطأ! يجب أن يكون تاريخ بدء السنة المالية يكون قبل تاريخ نهايتها"
 
 #. module: account
 #: view:account.account:0
@@ -4129,7 +4142,7 @@ msgstr ""
 #. module: account
 #: field:res.company,paypal_account:0
 msgid "Paypal Account"
-msgstr ""
+msgstr "حساب باي بال"
 
 #. module: account
 #: field:account.invoice.report,uom_name:0
@@ -4157,7 +4170,7 @@ msgstr "حساب المتأخرات"
 #: code:addons/account/account.py:184
 #, python-format
 msgid "Balance Sheet (Liability account)"
-msgstr ""
+msgstr "الميزانية العامة (حسابات الخصوم)"
 
 #. module: account
 #: help:account.invoice,date_invoice:0
@@ -4253,7 +4266,7 @@ msgstr "المعالجة الدورية"
 #. module: account
 #: constraint:account.analytic.line:0
 msgid "You can not create analytic line on view account."
-msgstr ""
+msgstr "لا يمكنك إنشاء سطر تحليلي في حساب للعرض."
 
 #. module: account
 #: help:account.move.line,state:0
@@ -4282,7 +4295,7 @@ msgstr "خريطة الحساب"
 #. module: account
 #: selection:account.financial.report,style_overwrite:0
 msgid "Main Title 1 (bold, underlined)"
-msgstr ""
+msgstr "العنوان الرئيسي(سميك,تحته خط)"
 
 #. module: account
 #: report:account.analytic.account.balance:0
@@ -4303,7 +4316,7 @@ msgstr "إحصائيات الفواتير"
 #. module: account
 #: field:account.account,exchange_rate:0
 msgid "Exchange Rate"
-msgstr ""
+msgstr "سعر الصرف"
 
 #. module: account
 #: model:process.transition,note:account.process_transition_paymentorderreconcilation0
@@ -4336,7 +4349,7 @@ msgstr "غير مطبق"
 #. module: account
 #: field:account.chart.template,visible:0
 msgid "Can be Visible?"
-msgstr ""
+msgstr "هل تكون واضحة؟"
 
 #. module: account
 #: model:ir.model,name:account.model_account_journal_select
@@ -4351,7 +4364,7 @@ msgstr "أوراق دائنة"
 #. module: account
 #: sql_constraint:account.period:0
 msgid "The name of the period must be unique per company!"
-msgstr ""
+msgstr "اسم الفترة يجب ان يكون فريد لكل شركة"
 
 #. module: account
 #: view:wizard.multi.charts.accounts:0
@@ -4388,7 +4401,7 @@ msgstr "السماح بالتسوية"
 #, python-format
 msgid ""
 "You can not modify company of this period as some journal items exists."
-msgstr ""
+msgstr "لا يمكنك تعديل الشركة لهذه الفترة حيث ان بعض عناصر اليومية موجودة"
 
 #. module: account
 #: view:account.analytic.account:0
@@ -4421,7 +4434,7 @@ msgstr "نماذج التكرارات"
 #: code:addons/account/account_move_line.py:1251
 #, python-format
 msgid "Encoding error"
-msgstr ""
+msgstr "خطا الترميز"
 
 #. module: account
 #: selection:account.automatic.reconcile,power:0
@@ -4493,7 +4506,7 @@ msgstr "لإستخدام حساب الدخل اتركه فارغ"
 #: code:addons/account/account.py:3299
 #, python-format
 msgid "Purchase Tax %.2f%%"
-msgstr ""
+msgstr "ضريبة الشراء %0.2f%%"
 
 #. module: account
 #: view:account.subscription.generate:0
@@ -4599,6 +4612,7 @@ msgstr ""
 #: model:email.template,subject:account.email_template_edi_invoice
 msgid "${object.company_id.name} Invoice (Ref ${object.number or 'n/a' })"
 msgstr ""
+"$(الموضوع-معرف_الشركة.الاسم)الفاتورة$(المرجع$(الموضوع.الرقم او 'n/a'))"
 
 #. module: account
 #: help:res.partner,last_reconciliation_date:0
@@ -4626,7 +4640,7 @@ msgstr "الفواتير"
 #. module: account
 #: view:account.invoice:0
 msgid "My invoices"
-msgstr ""
+msgstr "الفواتير"
 
 #. module: account
 #: selection:account.bank.accounts.wizard,account_type:0
@@ -4649,7 +4663,7 @@ msgstr "مفوتر"
 #. module: account
 #: view:account.move:0
 msgid "Posted Journal Entries"
-msgstr ""
+msgstr "نشر قيود اليومية"
 
 #. module: account
 #: view:account.use.model:0
@@ -4712,12 +4726,12 @@ msgstr ""
 #: code:addons/account/account.py:923
 #, python-format
 msgid "Opening Period"
-msgstr ""
+msgstr "افتتاح الفترة"
 
 #. module: account
 #: view:account.move:0
 msgid "Journal Entries to Review"
-msgstr ""
+msgstr "لاستعراض قيود اليومية"
 
 #. module: account
 #: view:account.bank.statement:0
@@ -4858,7 +4872,7 @@ msgstr "حركات"
 #. module: account
 #: view:report.hr.timesheet.invoice.journal:0
 msgid "Sale journal in this month"
-msgstr ""
+msgstr "مبيع اليومية لهذا الشهر"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_vat_declaration
@@ -4879,7 +4893,7 @@ msgstr "للغلق"
 #. module: account
 #: field:account.treasury.report,date:0
 msgid "Beginning of Period Date"
-msgstr ""
+msgstr "بداية تاريخ الفترة"
 
 #. module: account
 #: code:addons/account/account.py:1351
@@ -4963,7 +4977,7 @@ msgstr "تحركات الهدف"
 #: 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 ""
+msgstr "صافي ٣٠ يوم"
 
 #. module: account
 #: field:account.subscription,period_type:0
@@ -5012,7 +5026,7 @@ msgstr ""
 #: field:account.financial.report,children_ids:0
 #: model:ir.model,name:account.model_account_financial_report
 msgid "Account Report"
-msgstr ""
+msgstr "تقرير الحساب"
 
 #. module: account
 #: field:account.journal.column,name:0
@@ -5232,7 +5246,7 @@ msgstr "إحصائيات القيود التحليلية"
 #. module: account
 #: field:wizard.multi.charts.accounts,bank_accounts_id:0
 msgid "Cash and Banks"
-msgstr ""
+msgstr "النقدية و البنوك"
 
 #. module: account
 #: model:ir.model,name:account.model_account_installer
@@ -5298,7 +5312,7 @@ msgstr "محاسبة تحليلية"
 #: field:account.partner.ledger,initial_balance:0
 #: field:account.report.general.ledger,initial_balance:0
 msgid "Include Initial Balances"
-msgstr ""
+msgstr "نشمل الارصدة الابتدائية"
 
 #. module: account
 #: selection:account.invoice,type:0
@@ -5311,7 +5325,7 @@ msgstr "رد مال للعميل"
 #: constraint:account.move:0
 msgid ""
 "You can not create more than one move per period on centralized journal"
-msgstr ""
+msgstr "لا يمكنك إنشاء أكثر من حركة لكل فترة في يومية مركزية"
 
 #. module: account
 #: field:account.tax,ref_tax_sign:0
@@ -5329,7 +5343,7 @@ msgstr "أُنشأ تقرير الفواتير في خلال اخر 15 يومً
 #. module: account
 #: view:account.payment.term.line:0
 msgid "  Number of Days: 14"
-msgstr ""
+msgstr "  عدد الايام:14"
 
 #. module: account
 #: field:account.fiscalyear,end_journal_period_id:0
@@ -5352,7 +5366,7 @@ msgstr "خطأ في الإعدادات!"
 #. module: account
 #: field:account.payment.term.line,value_amount:0
 msgid "Amount To Pay"
-msgstr ""
+msgstr "المبلغ للدفع"
 
 #. module: account
 #: help:account.partner.reconcile.process,to_reconcile:0
@@ -5393,7 +5407,7 @@ msgstr "تغيير العملة"
 #. module: account
 #: view:account.invoice:0
 msgid "This action will erase taxes"
-msgstr ""
+msgstr "هذا الفعل سوف يمحو الضرائب"
 
 #. module: account
 #: model:process.node,note:account.process_node_accountingentries0
@@ -5416,7 +5430,7 @@ msgstr "حسابات تحليلية"
 #. module: account
 #: view:account.invoice.report:0
 msgid "Customer Invoices And Refunds"
-msgstr ""
+msgstr "فواتير العملاء، والمبالغ المستردة"
 
 #. module: account
 #: field:account.analytic.line,amount_currency:0
@@ -5462,7 +5476,7 @@ msgstr "رقم (حركة)"
 #. module: account
 #: view:analytic.entries.report:0
 msgid "Analytic Entries during last 7 days"
-msgstr ""
+msgstr "قيود تحليلية خلال اخر 7 أيام"
 
 #. module: account
 #: selection:account.financial.report,style_overwrite:0
@@ -5536,7 +5550,7 @@ msgstr "فتح صندو النقدية"
 #. module: account
 #: selection:account.financial.report,style_overwrite:0
 msgid "Automatic formatting"
-msgstr ""
+msgstr "تنسيق تلقائي"
 
 #. module: account
 #: code:addons/account/account.py:963
@@ -5545,6 +5559,8 @@ msgid ""
 "No fiscal year defined for this date !\n"
 "Please create one from the configuration of the accounting menu."
 msgstr ""
+"لا يوجد سنة مالية  محددة بهذا التاريخ.الرجاء انشاء واحدة من تكوين في قائمة "
+"المحاسبة"
 
 #. module: account
 #: view:account.move.line.reconcile:0
@@ -5626,7 +5642,7 @@ msgstr "حسابات فرعية"
 #: code:addons/account/account_move_line.py:1214
 #, python-format
 msgid "Move name (id): %s (%s)"
-msgstr ""
+msgstr "نقل اسم(معرف):%s(%s)"
 
 #. module: account
 #: view:account.move.line.reconcile:0
@@ -5804,12 +5820,12 @@ msgstr "ترشيح بـ"
 #: code:addons/account/account.py:2256
 #, python-format
 msgid "You have a wrong expression \"%(...)s\" in your model !"
-msgstr ""
+msgstr "لديك تعبير خاطئ\"%(...)s\"في نموذجك"
 
 #. module: account
 #: field:account.bank.statement.line,date:0
 msgid "Entry Date"
-msgstr ""
+msgstr "ادخال الناريخ"
 
 #. module: account
 #: code:addons/account/account_move_line.py:1155
@@ -5827,14 +5843,14 @@ msgstr "المدخلات ليست من نفس الحساب او تم تسويت
 #. module: account
 #: help:account.bank.statement,balance_end:0
 msgid "Balance as calculated based on Starting Balance and transaction lines"
-msgstr ""
+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 ""
+msgstr "العملة الحالية غير معرفة بشكل صحيح"
 
 #. module: account
 #: field:account.tax,account_collected_id:0
@@ -5870,7 +5886,7 @@ msgstr "فترة  : %s"
 #. module: account
 #: model:ir.actions.act_window,name:account.action_review_financial_journals_installer
 msgid "Review your Financial Journals"
-msgstr ""
+msgstr "مراجعه القيود اليوميه الماليه الخاصه بك"
 
 #. module: account
 #: help:account.tax,name:0
@@ -5904,7 +5920,7 @@ msgstr "رد للعملاء"
 #. module: account
 #: field:account.account,foreign_balance:0
 msgid "Foreign Balance"
-msgstr ""
+msgstr "رصيد اجنبي"
 
 #. module: account
 #: field:account.journal.period,name:0
@@ -5940,7 +5956,7 @@ msgstr ""
 #. module: account
 #: view:account.subscription:0
 msgid "Running Subscription"
-msgstr ""
+msgstr "إشتراك مفعلة"
 
 #. module: account
 #: report:account.invoice:0
@@ -5966,13 +5982,15 @@ msgid ""
 "You can not define children to an account with internal type different of "
 "\"View\"! "
 msgstr ""
+"خطأ في الإعدادات!\n"
+"لا يمكنك تحديد فرع لحساب مع نوع داخلي مختلف من \"عرض\"! "
 
 #. 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 ""
+msgstr "دفتر اليومية سوف ينشا تلقائيا لهذا الحساب البنكي عند حفظ هذا السجل"
 
 #. module: account
 #: view:account.analytic.line:0
@@ -6050,7 +6068,7 @@ msgstr "هذا نموذج لقيود حسابات تكرارية"
 #. module: account
 #: field:wizard.multi.charts.accounts,sale_tax_rate:0
 msgid "Sales Tax(%)"
-msgstr ""
+msgstr "ضريبة المبيعات(%)"
 
 #. module: account
 #: view:account.addtmpl.wizard:0
@@ -6097,12 +6115,12 @@ msgstr "الشركات"
 #. module: account
 #: view:account.invoice.report:0
 msgid "Open and Paid Invoices"
-msgstr ""
+msgstr "فتح ودفع الفواتير"
 
 #. module: account
 #: selection:account.financial.report,display_detail:0
 msgid "Display children flat"
-msgstr ""
+msgstr "عرض الفرع الثابت"
 
 #. module: account
 #: code:addons/account/account.py:629
@@ -6110,7 +6128,7 @@ msgstr ""
 msgid ""
 "You can not remove/desactivate an account which is set on a customer or "
 "supplier."
-msgstr ""
+msgstr "لا يمكنك إزالة / إلغاء حساب الذي تم تعيينه كأحد العملاء أو الموردين."
 
 #. module: account
 #: help:account.fiscalyear.close.state,fy_id:0
@@ -6195,7 +6213,7 @@ msgstr "الدائنون"
 #. module: account
 #: constraint:account.move.line:0
 msgid "Company must be the same for its related account and period."
-msgstr ""
+msgstr "يجب ان تكون الشركة هي نفسها لها الصلة بحسابها و فترتها."
 
 #. module: account
 #: view:account.invoice:0
@@ -6225,7 +6243,7 @@ msgstr "صندوق نقدية"
 #. module: account
 #: model:account.account.type,name:account.account_type_cash_equity
 msgid "Equity"
-msgstr ""
+msgstr "الأسهم"
 
 #. module: account
 #: selection:account.tax,type:0
@@ -6246,7 +6264,7 @@ msgstr "طاقة"
 #: code:addons/account/account.py:3368
 #, python-format
 msgid "Cannot generate an unused journal code."
-msgstr ""
+msgstr "لا يمكن انشاء رمز قيد يوميه غير مستخدم"
 
 #. module: account
 #: view:project.account.analytic.line:0
@@ -6357,7 +6375,7 @@ msgstr "إنشاء إختياري"
 msgid ""
 "You cannot change the owner company of an account that already contains "
 "journal items."
-msgstr ""
+msgstr "لا يمكنك تغيير شركة مالكة لحساب يحتوي بالفعل علي عناصر يومية."
 
 #. module: account
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:58
@@ -6414,7 +6432,7 @@ msgstr "للقراءة فقط"
 #. module: account
 #: view:account.payment.term.line:0
 msgid "  Valuation: Balance"
-msgstr ""
+msgstr "  تقييم: الميزانية"
 
 #. module: account
 #: field:account.invoice.line,uos_id:0
@@ -6431,7 +6449,7 @@ msgstr "يجب ان تكون النسبة المئوية لأجل الدفع م
 #. module: account
 #: field:account.installer,has_default_company:0
 msgid "Has Default Company"
-msgstr ""
+msgstr "لديه شركة افتراضية"
 
 #. module: account
 #: model:ir.model,name:account.model_account_sequence_fiscalyear
@@ -6453,7 +6471,7 @@ msgstr "يومية تحليلية"
 #: code:addons/account/account.py:622
 #, python-format
 msgid "You can not desactivate an account that contains some journal items."
-msgstr ""
+msgstr "لا يمكنك الغاء حساب يحتوي علي بعض عناصر اليومية"
 
 #. module: account
 #: view:account.entries.report:0
@@ -6509,7 +6527,7 @@ msgstr "إحصائيات  القيود التحليلية"
 #: code:addons/account/account.py:624
 #, python-format
 msgid "You can not remove an account containing journal items."
-msgstr ""
+msgstr "لا يمكنك حذف حساب يحتوي علي عناصر اليومية."
 
 #. module: account
 #: code:addons/account/account_analytic_line.py:145
@@ -6526,7 +6544,7 @@ msgstr "إنشاء قيد يومية تكرارية يدوياً في يومية
 #. module: account
 #: help:res.partner.bank,currency_id:0
 msgid "Currency of the related account journal."
-msgstr ""
+msgstr "العملة لها علاقة بحساب اليومية."
 
 #. module: account
 #: code:addons/account/account.py:1563
@@ -6556,7 +6574,7 @@ msgstr ""
 #: code:addons/account/account.py:183
 #, python-format
 msgid "Balance Sheet (Asset account)"
-msgstr ""
+msgstr "الميزانية العمومية(حساب الاصول)"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_bank_reconcile_tree
@@ -6623,7 +6641,7 @@ msgstr "كود بايثون"
 #. module: account
 #: view:account.entries.report:0
 msgid "Journal Entries with period in current period"
-msgstr ""
+msgstr "قيود اليومية  بفترات خاصة الفترة الحالية"
 
 #. module: account
 #: help:account.journal,update_posted:0
@@ -6649,7 +6667,7 @@ msgstr "إنشاء قيد"
 #: code:addons/account/account.py:182
 #, python-format
 msgid "Profit & Loss (Expense account)"
-msgstr ""
+msgstr "الأرباح و الخسائر (حساب المصاريف)"
 
 #. module: account
 #: code:addons/account/account.py:622
@@ -6685,7 +6703,7 @@ msgstr "خطأ !"
 #. module: account
 #: field:account.financial.report,style_overwrite:0
 msgid "Financial Report Style"
-msgstr ""
+msgstr "هيئة التقرير المالي"
 
 #. module: account
 #: selection:account.financial.report,sign:0
@@ -6891,7 +6909,7 @@ msgstr ""
 #: field:account.chart.template,complete_tax_set:0
 #: field:wizard.multi.charts.accounts,complete_tax_set:0
 msgid "Complete Set of Taxes"
-msgstr ""
+msgstr "مجموعة كاملة من الضرائب"
 
 #. module: account
 #: view:account.chart.template:0
@@ -6910,6 +6928,9 @@ msgid ""
 "Please define BIC/Swift code on bank for bank type IBAN Account to make "
 "valid payments"
 msgstr ""
+"\n"
+"رجاءً حدد كود البنك (BIC/Swift) لحسابات البنوك من نوع IBAN وذلك لإجراء "
+"عمليات مقبولة."
 
 #. module: account
 #: report:account.analytic.account.cost_ledger:0
@@ -6951,7 +6972,7 @@ msgstr "رموز الفرعي"
 #. module: account
 #: view:account.tax.template:0
 msgid "Taxes used in Sales"
-msgstr ""
+msgstr "الضرائب المستخدمة في المبيعات"
 
 #. module: account
 #: code:addons/account/account_invoice.py:495
@@ -7030,7 +7051,7 @@ msgstr "مستند المصدر"
 #: code:addons/account/account.py:1432
 #, python-format
 msgid "You can not delete a posted journal entry \"%s\"!"
-msgstr ""
+msgstr "لا يمكنك إزالة قيد يومية مرحل \"%s\" !"
 
 #. module: account
 #: selection:account.partner.ledger,filter:0
@@ -7048,7 +7069,7 @@ msgstr "تسوية القوائم"
 #. module: account
 #: model:ir.model,name:account.model_accounting_report
 msgid "Accounting Report"
-msgstr ""
+msgstr "تقارير محاسبية"
 
 #. module: account
 #: report:account.invoice:0
@@ -7075,7 +7096,7 @@ msgstr ""
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_report_tree_hierarchy
 msgid "Financial Reports Hierarchy"
-msgstr ""
+msgstr "التسلسل الهرمي للتقارير المالية"
 
 #. module: account
 #: field:account.entries.report,product_uom_id:0
@@ -7150,7 +7171,7 @@ msgstr ""
 #. module: account
 #: field:account.chart.template,property_account_expense_opening:0
 msgid "Opening Entries Expense Account"
-msgstr ""
+msgstr "قتح قيود حساب المصروف"
 
 #. module: account
 #: code:addons/account/account_move_line.py:999
@@ -7193,12 +7214,12 @@ msgstr ""
 #. module: account
 #: view:account.entries.report:0
 msgid "Posted entries"
-msgstr ""
+msgstr "قيود مرحلة"
 
 #. module: account
 #: help:account.payment.term.line,value_amount:0
 msgid "For percent enter a ratio between 0-1."
-msgstr ""
+msgstr "للنسبة أدخل كسر بين رقمي ٠ - ١."
 
 #. module: account
 #: report:account.invoice:0
@@ -7211,7 +7232,7 @@ msgstr "تاريخ الفاتورة"
 #. module: account
 #: view:account.invoice.report:0
 msgid "Group by year of Invoice Date"
-msgstr ""
+msgstr "تجميع حسب السنة لتاريخ الفاتورة"
 
 #. module: account
 #: help:res.partner,credit:0
@@ -7272,7 +7293,7 @@ msgstr "ضريبة المشتريات الإفتراضية"
 #. module: account
 #: field:account.chart.template,property_account_income_opening:0
 msgid "Opening Entries Income Account"
-msgstr ""
+msgstr "فتح قيود حساب الدخل"
 
 #. module: account
 #: view:account.bank.statement:0
@@ -7298,7 +7319,7 @@ msgstr "ينبغي عليك اختيار الفترات التي تمتد الى
 #. module: account
 #: model:ir.actions.act_window,name:account.action_review_payment_terms_installer
 msgid "Review your Payment Terms"
-msgstr ""
+msgstr "معاينة شروط الدفع"
 
 #. module: account
 #: field:account.fiscalyear.close,report_name:0
@@ -7313,7 +7334,7 @@ msgstr "إنشاء قيود"
 #. module: account
 #: view:res.partner:0
 msgid "Information About the Bank"
-msgstr ""
+msgstr "معلومات عن البنك"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_reporting
@@ -7384,7 +7405,7 @@ msgstr "استخدم النموذج"
 #: code:addons/account/account.py:429
 #, python-format
 msgid "Unable to adapt the initial balance (negative value)!"
-msgstr ""
+msgstr "لم يتم قبول الرصيد الإفتتاحي (قيمة سالبة)!"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_moves_purchase
@@ -7490,7 +7511,7 @@ msgstr ""
 #. module: account
 #: model:ir.ui.menu,name:account.menu_multi_currency
 msgid "Multi-Currencies"
-msgstr ""
+msgstr "متعدد العملة"
 
 #. module: account
 #: field:account.model.line,date_maturity:0
@@ -7530,7 +7551,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
@@ -7545,7 +7566,7 @@ msgstr ""
 #. module: account
 #: view:account.move:0
 msgid "Unposted Journal Entries"
-msgstr ""
+msgstr "قيود يومية غير مرحلة"
 
 #. module: account
 #: view:product.product:0
@@ -7574,7 +7595,7 @@ msgstr "إلى"
 #: code:addons/account/account.py:1518
 #, python-format
 msgid "Currency Adjustment"
-msgstr ""
+msgstr "تعديل العملة"
 
 #. module: account
 #: field:account.fiscalyear.close,fy_id:0
@@ -7593,6 +7614,8 @@ msgstr "إلغاء الفواتير المختارة"
 msgid ""
 "This field is used to generate legal reports: profit and loss, balance sheet."
 msgstr ""
+"يستخدم هذا الحقل لإعداد التقارير القانونية: الأرباح و الخسائر و الميزانية "
+"العمومية."
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_review_payment_terms_installer
@@ -7720,17 +7743,17 @@ msgstr "مسلسل"
 #. module: account
 #: constraint:product.category:0
 msgid "Error ! You cannot create recursive categories."
-msgstr ""
+msgstr "خطأ ! لا يمكن إنشاء فئات متداخلة."
 
 #. module: account
 #: help:account.model.line,quantity:0
 msgid "The optional quantity on entries."
-msgstr ""
+msgstr "كمية اختيارية للقيود."
 
 #. module: account
 #: view:account.financial.report:0
 msgid "Parent Report"
-msgstr ""
+msgstr "تقرير رئيسي"
 
 #. module: account
 #: view:account.state.open:0
@@ -7779,7 +7802,7 @@ msgstr "    ٧ أيام    "
 #. module: account
 #: field:account.bank.statement,balance_end:0
 msgid "Computed Balance"
-msgstr ""
+msgstr "ميزانية محسوبة"
 
 #. module: account
 #: field:account.account,parent_id:0
@@ -7907,7 +7930,7 @@ msgstr "اختر عملة للفاتورة"
 #, python-format
 msgid ""
 "The bank account defined on the selected chart of accounts hasn't a code."
-msgstr ""
+msgstr "حساب المصرف المعرف في الدليل المحاسبي المحدد ليس لديه رمز."
 
 #. module: account
 #: code:addons/account/wizard/account_invoice_refund.py:108
@@ -8049,7 +8072,7 @@ msgstr "قيود تحليلية"
 #. module: account
 #: view:report.account_type.sales:0
 msgid "This Months Sales by type"
-msgstr ""
+msgstr "مبيعات هذه الشهور وفقا للنوع"
 
 #. module: account
 #: view:account.analytic.account:0
@@ -8109,7 +8132,7 @@ msgstr ""
 #, python-format
 msgid ""
 "Can not find a chart of accounts for this company, you should create one."
-msgstr ""
+msgstr "لم نستطع ايجاد اي دليل محاسبي لحسابات هذه الشركة، يجب انشاء واحدة."
 
 #. module: account
 #: view:account.invoice:0
@@ -8140,12 +8163,12 @@ msgstr "للضرائب ادخل النسبة % بين 0 و 1."
 #. module: account
 #: view:account.analytic.account:0
 msgid "Current Accounts"
-msgstr ""
+msgstr "الحسابات الحالية"
 
 #. module: account
 #: view:account.invoice.report:0
 msgid "Group by Invoice Date"
-msgstr ""
+msgstr "رتب حسب تاريخ الفاتورة"
 
 #. module: account
 #: view:account.invoice.refund:0
@@ -8186,6 +8209,8 @@ msgid ""
 "Total amount (in Company currency) for transactions held in secondary "
 "currency for this account."
 msgstr ""
+"المبلغ الاجمالي (بعملة الشركة) للعمليات المالية التي عقدت بالعملة الثانوية "
+"لهذا الحساب."
 
 #. module: account
 #: report:account.invoice:0
@@ -8230,7 +8255,7 @@ msgstr "حساب التصنيف الوارد"
 #. module: account
 #: field:account.account,adjusted_balance:0
 msgid "Adjusted Balance"
-msgstr ""
+msgstr "الرصيد المعدل"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_fiscal_position_template_form
@@ -8251,7 +8276,7 @@ msgstr "المبلغ الاساسي/الضريبة"
 #. module: account
 #: view:account.payment.term.line:0
 msgid "  Valuation: Percent"
-msgstr ""
+msgstr "  تقييم: النسبة المئوية"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_invoice_tree3
@@ -8320,7 +8345,7 @@ msgstr "الدفع"
 #: field:account.bank.statement,balance_end_real:0
 #: field:account.treasury.report,ending_balance:0
 msgid "Ending Balance"
-msgstr ""
+msgstr "رصيد ختامي"
 
 #. module: account
 #: help:account.move.line,blocked:0
@@ -8351,7 +8376,7 @@ msgstr "تقرير مشترك للحساب"
 #: view:account.invoice.report:0
 #: view:analytic.entries.report:0
 msgid "current month"
-msgstr ""
+msgstr "الشهر الجاري"
 
 #. module: account
 #: code:addons/account/account.py:1052
@@ -8360,6 +8385,8 @@ msgid ""
 "No period defined for this date: %s !\n"
 "Please create one."
 msgstr ""
+"لايوجد فترة معرفةلهذا التاريخ:%s!\n"
+"قم بإنشاء واحدة."
 
 #. module: account
 #: model:process.transition,name:account.process_transition_filestatement0
@@ -8387,7 +8414,7 @@ msgstr "أنواع الحساب"
 #. module: account
 #: view:account.payment.term.line:0
 msgid "  Value amount: n.a"
-msgstr ""
+msgstr "  قيمة المبلغ: غير معروف"
 
 #. module: account
 #: view:account.automatic.reconcile:0
@@ -8475,7 +8502,7 @@ msgstr "يستخدم حساب الشريك لهذه الفاتورة."
 #: code:addons/account/account.py:3296
 #, python-format
 msgid "Tax %.2f%%"
-msgstr ""
+msgstr "ضرائب  %.2f%%"
 
 #. module: account
 #: view:account.analytic.account:0
@@ -8654,7 +8681,7 @@ msgstr ""
 #. module: account
 #: selection:account.financial.report,style_overwrite:0
 msgid "Smallest Text"
-msgstr ""
+msgstr "أصغر نص"
 
 #. module: account
 #: model:res.groups,name:account.group_account_invoice
@@ -8781,7 +8808,7 @@ msgstr "عنوان جهة الإتصال"
 #: code:addons/account/account.py:2256
 #, python-format
 msgid "Wrong model !"
-msgstr ""
+msgstr "نموذج خاطئ !"
 
 #. module: account
 #: field:account.invoice.refund,period:0
@@ -8850,12 +8877,12 @@ msgstr ""
 #: view:account.move.line:0
 #: field:account.move.line,narration:0
 msgid "Internal Note"
-msgstr ""
+msgstr "ملاحظة داخلية"
 
 #. module: account
 #: view:report.account.sales:0
 msgid "This year's Sales by type"
-msgstr ""
+msgstr "مبيعات هذه السنة وفقا للنوع"
 
 #. module: account
 #: view:account.analytic.cost.ledger.journal.report:0
@@ -8908,7 +8935,7 @@ msgstr "سطور القيود"
 #. module: account
 #: model:ir.actions.act_window,name:account.action_view_financial_accounts_installer
 msgid "Review your Financial Accounts"
-msgstr ""
+msgstr "معاينة حساباتك المالية"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_open_journal_button
@@ -8989,7 +9016,7 @@ msgstr "عزيزي سيدي / سيدتي،"
 #. module: account
 #: field:account.vat.declaration,display_detail:0
 msgid "Display Detail"
-msgstr ""
+msgstr "عرض التفاصيل"
 
 #. module: account
 #: code:addons/account/account.py:3118
@@ -9033,7 +9060,7 @@ msgstr "نهاية الفترة"
 #: model:ir.actions.act_window,name:account.action_account_report_pl
 #: model:ir.ui.menu,name:account.menu_account_reports
 msgid "Financial Reports"
-msgstr ""
+msgstr "تقارير مالية"
 
 #. module: account
 #: report:account.account.balance:0
@@ -9288,7 +9315,7 @@ msgstr "لا يمكنك تغيير الضريبة, يجب عليك ازالة و
 #. module: account
 #: view:analytic.entries.report:0
 msgid "Analytic Entries of last 365 days"
-msgstr ""
+msgstr "قيود تحليلية لآخر ٣٦٥ يوم"
 
 #. module: account
 #: report:account.central.journal:0
@@ -9346,7 +9373,7 @@ msgstr "يجب ان يكون لليومية نظير مركزي بدون تخط
 #. module: account
 #: view:account.invoice.report:0
 msgid "Customer And Supplier Invoices"
-msgstr ""
+msgstr "فواتير العميل و المورد"
 
 #. module: account
 #: model:process.node,note:account.process_node_paymententries0
@@ -9636,7 +9663,7 @@ msgstr ""
 #: code:addons/account/account.py:181
 #, python-format
 msgid "Profit & Loss (Income account)"
-msgstr ""
+msgstr "الأرباح و الخسائر(حساب الدخل)"
 
 #. module: account
 #: constraint:account.account:0
@@ -9738,7 +9765,7 @@ msgstr "أبريل/ نيسان"
 #. module: account
 #: model:account.financial.report,name:account.account_financial_report_profitloss_toreport0
 msgid "Profit (Loss) to report"
-msgstr ""
+msgstr "تقرير للربح (الخسارة) المقدم"
 
 #. module: account
 #: view:account.move.line.reconcile.select:0
@@ -9762,7 +9789,7 @@ msgstr ""
 #. module: account
 #: selection:account.financial.report,style_overwrite:0
 msgid "Title 2 (bold)"
-msgstr ""
+msgstr "عنوان ٢ (سميك)"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_invoice_tree2
@@ -9922,7 +9949,7 @@ msgstr "مسلسل السنوات المالية"
 #. module: account
 #: selection:account.financial.report,display_detail:0
 msgid "No detail"
-msgstr ""
+msgstr "لا تفاصيل"
 
 #. module: account
 #: code:addons/account/account_analytic_line.py:102
@@ -9933,14 +9960,14 @@ msgstr "لا يوجد حساب دخل معرّف لهذا المنتج: \"%s\" (
 #. module: account
 #: constraint:account.move.line:0
 msgid "You can not create journal items on closed account."
-msgstr ""
+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 ""
+msgstr "مكاسب أو خسائر غير محققة"
 
 #. module: account
 #: view:account.fiscalyear:0
@@ -9953,12 +9980,12 @@ msgstr "حالات"
 #. module: account
 #: model:ir.actions.server,name:account.ir_actions_server_edi_invoice
 msgid "Auto-email confirmed invoices"
-msgstr ""
+msgstr "رسائل لتأكيد الفواتير"
 
 #. module: account
 #: field:account.invoice,check_total:0
 msgid "Verification Total"
-msgstr ""
+msgstr "إجمالي المحقق"
 
 #. module: account
 #: report:account.analytic.account.balance:0
@@ -10083,7 +10110,7 @@ msgstr "حسابات فارغة؟ "
 #. module: account
 #: constraint:account.bank.statement:0
 msgid "The journal and period chosen have to belong to the same company."
-msgstr ""
+msgstr "يجب أن يكون اليومية و الفترة مرتبطين لشركة واحدة."
 
 #. module: account
 #: view:account.invoice:0
@@ -10113,7 +10140,7 @@ msgstr ""
 #. module: account
 #: view:wizard.multi.charts.accounts:0
 msgid "Generate Your Chart of Accounts from a Chart Template"
-msgstr ""
+msgstr "انشاء دليل الحسابات من قالب للدليل"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_invoice_report_all
@@ -10184,7 +10211,7 @@ msgstr "مدين"
 #. module: account
 #: selection:account.financial.report,style_overwrite:0
 msgid "Title 3 (bold, smaller)"
-msgstr ""
+msgstr "عنوان ٣ (سميك، أصغر)"
 
 #. module: account
 #: field:account.invoice,invoice_line:0
@@ -10199,7 +10226,7 @@ msgstr "خطأ ! لا يمكنك انشاء قوالب الحاسب العودي
 #. module: account
 #: selection:account.print.journal,sort_selection:0
 msgid "Journal Entry Number"
-msgstr ""
+msgstr "رقم قيد اليومية"
 
 #. module: account
 #: view:account.subscription:0
@@ -11700,3 +11727,6 @@ msgstr ""
 #~ "لا يمكن إنشاء تسلسل تلقائي لهذه الجزئية!\n"
 #~ "\n"
 #~ "ضع تسلسل في تعريف اليومية للترقيم التلقائي أو خلق سلسلة يدويا لهذه الجزئية."
+
+#~ msgid "Install your Chart of Accounts"
+#~ msgstr "تنصيب دليلك المحاسبي"
diff --git a/addons/account/i18n/bg.po b/addons/account/i18n/bg.po
index 568b62eb13a..44f9831dbfa 100644
--- a/addons/account/i18n/bg.po
+++ b/addons/account/i18n/bg.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:03+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:09+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -173,7 +173,7 @@ msgstr "Предупреждение!"
 #: code:addons/account/account.py:3112
 #, python-format
 msgid "Miscellaneous Journal"
-msgstr ""
+msgstr "Различни дневници"
 
 #. module: account
 #: field:account.fiscal.position.account,account_src_id:0
@@ -189,7 +189,7 @@ msgstr "Всички аналитични записи"
 #. module: account
 #: field:accounting.report,label_filter:0
 msgid "Column Label"
-msgstr ""
+msgstr "Име на колона"
 
 #. module: account
 #: code:addons/account/wizard/account_move_journal.py:95
diff --git a/addons/account/i18n/br.po b/addons/account/i18n/br.po
index b2f7c91d8c8..10c3dde5352 100644
--- a/addons/account/i18n/br.po
+++ b/addons/account/i18n/br.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:03+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:09+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account
 #: view:account.invoice.report:0
diff --git a/addons/account/i18n/bs.po b/addons/account/i18n/bs.po
index 6efe46078a0..e738a25a76d 100644
--- a/addons/account/i18n/bs.po
+++ b/addons/account/i18n/bs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:03+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:09+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account
 #: view:account.invoice.report:0
diff --git a/addons/account/i18n/ca.po b/addons/account/i18n/ca.po
index be920cff7d2..cbbe8c6d706 100644
--- a/addons/account/i18n/ca.po
+++ b/addons/account/i18n/ca.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:03+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:09+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account
 #: view:account.invoice.report:0
diff --git a/addons/account/i18n/cs.po b/addons/account/i18n/cs.po
index fa77e59bf7e..a0539292157 100644
--- a/addons/account/i18n/cs.po
+++ b/addons/account/i18n/cs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:03+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:09+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 "X-Poedit-Language: Czech\n"
 
 #. module: account
diff --git a/addons/account/i18n/da.po b/addons/account/i18n/da.po
index e87f7bbdc72..aa52c49d510 100644
--- a/addons/account/i18n/da.po
+++ b/addons/account/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:03+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:09+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account
 #: view:account.invoice.report:0
diff --git a/addons/account/i18n/de.po b/addons/account/i18n/de.po
index 1a0dfc11029..38e567be40d 100644
--- a/addons/account/i18n/de.po
+++ b/addons/account/i18n/de.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:04+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:10+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -4499,6 +4499,10 @@ msgid ""
 "you want to generate accounts of this template only when loading its child "
 "template."
 msgstr ""
+"Setzen Sie hier keinen Haken, wenn Sie nicht möchten, dass diese Vorlage zur "
+"Erzeugung des Kontenplans durch den Assistenten genutzt wird. Das ist "
+"Sinnvoll, wenn Sie untergeordnete Konten nur aus dieser Vorlage anlegen "
+"wollen, wenn Sie eine abgeleitete Vorlage laden."
 
 #. module: account
 #: view:account.use.model:0
@@ -7769,6 +7773,12 @@ msgid ""
 "few new accounts (You don't need to define the whole structure that is "
 "common to both several times)."
 msgstr ""
+"Dieses wahlfreie Feld ermöglicht Ihnen eine Konten-Vorlage von einer "
+"Kontenplan-Vorlage abzuleiten, wobei sich die Konten des vom Stamm-"
+"Kontenplan unterscheiden können. So können Sie eine Kontenplan-Vorlage "
+"festlegen, die eine Andere, ggf. auch nur geringfügig, erweitert. (Sie "
+"brauchen also nicht die beiden gemeinsamen Strukturen mehrfach zu "
+"definieren)."
 
 #. module: account
 #: view:account.move:0
diff --git a/addons/account/i18n/el.po b/addons/account/i18n/el.po
index ef88a09b12d..5853ab73bef 100644
--- a/addons/account/i18n/el.po
+++ b/addons/account/i18n/el.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:04+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:10+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account
 #: view:account.invoice.report:0
diff --git a/addons/account/i18n/en_GB.po b/addons/account/i18n/en_GB.po
index 1ad3f3dbfca..2857aaa8fdf 100644
--- a/addons/account/i18n/en_GB.po
+++ b/addons/account/i18n/en_GB.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:09+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:15+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account
 #: view:account.invoice.report:0
diff --git a/addons/account/i18n/en_US.po b/addons/account/i18n/en_US.po
index fe6dc40692e..a50e2222169 100644
--- a/addons/account/i18n/en_US.po
+++ b/addons/account/i18n/en_US.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:08+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:14+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account
 #: view:account.invoice.report:0
diff --git a/addons/account/i18n/es.po b/addons/account/i18n/es.po
index ae60b0b9c66..80eddbadba5 100644
--- a/addons/account/i18n/es.po
+++ b/addons/account/i18n/es.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:07+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:13+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account
 #: view:account.invoice.report:0
diff --git a/addons/account/i18n/es_AR.po b/addons/account/i18n/es_AR.po
index 29bc83e2109..8edfdf609b0 100644
--- a/addons/account/i18n/es_AR.po
+++ b/addons/account/i18n/es_AR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:09+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:14+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account
 #: view:account.invoice.report:0
diff --git a/addons/account/i18n/es_CL.po b/addons/account/i18n/es_CL.po
index 8c8b600ca61..ff92eb98335 100644
--- a/addons/account/i18n/es_CL.po
+++ b/addons/account/i18n/es_CL.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:09+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:15+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account
 #: view:account.invoice.report:0
diff --git a/addons/account/i18n/es_CR.po b/addons/account/i18n/es_CR.po
index 4eb1177e32b..ced59adc523 100644
--- a/addons/account/i18n/es_CR.po
+++ b/addons/account/i18n/es_CR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:09+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:15+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 "Language: \n"
 
 #. module: account
diff --git a/addons/account/i18n/es_DO.po b/addons/account/i18n/es_DO.po
index 08141cff24b..7c5da212f69 100644
--- a/addons/account/i18n/es_DO.po
+++ b/addons/account/i18n/es_DO.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:09+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:15+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account
 #: view:account.invoice.report:0
diff --git a/addons/account/i18n/es_EC.po b/addons/account/i18n/es_EC.po
index 97c15d91fe9..e7206ce3984 100644
--- a/addons/account/i18n/es_EC.po
+++ b/addons/account/i18n/es_EC.po
@@ -16,8 +16,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:10+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:15+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account
 #: view:account.invoice.report:0
diff --git a/addons/account/i18n/es_PY.po b/addons/account/i18n/es_PY.po
index 4c4943ade57..f3fddd92cd8 100644
--- a/addons/account/i18n/es_PY.po
+++ b/addons/account/i18n/es_PY.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:10+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:16+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account
 #: view:account.invoice.report:0
diff --git a/addons/account/i18n/es_UY.po b/addons/account/i18n/es_UY.po
index ba90609e994..86c904039e6 100644
--- a/addons/account/i18n/es_UY.po
+++ b/addons/account/i18n/es_UY.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-15 04:40+0000\n"
-"X-Generator: Launchpad (build 15801)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:15+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account
 #: view:account.invoice.report:0
diff --git a/addons/account/i18n/es_VE.po b/addons/account/i18n/es_VE.po
index c32209098e9..86c94500c7a 100644
--- a/addons/account/i18n/es_VE.po
+++ b/addons/account/i18n/es_VE.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:09+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:14+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account
 #: view:account.invoice.report:0
diff --git a/addons/account/i18n/et.po b/addons/account/i18n/et.po
index 6dcc8d00181..665fc979e17 100644
--- a/addons/account/i18n/et.po
+++ b/addons/account/i18n/et.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:03+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:09+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account
 #: view:account.invoice.report:0
diff --git a/addons/account/i18n/eu.po b/addons/account/i18n/eu.po
index 02a2f81d73a..4d9eb943826 100644
--- a/addons/account/i18n/eu.po
+++ b/addons/account/i18n/eu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:02+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:08+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account
 #: view:account.invoice.report:0
diff --git a/addons/account/i18n/fa.po b/addons/account/i18n/fa.po
index 674cd5034a8..2db27937b63 100644
--- a/addons/account/i18n/fa.po
+++ b/addons/account/i18n/fa.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:06+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:12+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account
 #: view:account.invoice.report:0
diff --git a/addons/account/i18n/fa_AF.po b/addons/account/i18n/fa_AF.po
index 3bc3db4cd87..54f677d4dd6 100644
--- a/addons/account/i18n/fa_AF.po
+++ b/addons/account/i18n/fa_AF.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:10+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:16+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account
 #: view:account.invoice.report:0
diff --git a/addons/account/i18n/fi.po b/addons/account/i18n/fi.po
index e9a1633c35c..eb5e0b44fd7 100644
--- a/addons/account/i18n/fi.po
+++ b/addons/account/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:03+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:09+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account
 #: view:account.invoice.report:0
diff --git a/addons/account/i18n/fr.po b/addons/account/i18n/fr.po
index ab44d01d9d1..cf1f4930b6e 100644
--- a/addons/account/i18n/fr.po
+++ b/addons/account/i18n/fr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:04+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:10+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account
 #: code:addons/account/account_move_line.py:1200
diff --git a/addons/account/i18n/fr_BE.po b/addons/account/i18n/fr_BE.po
index a511d97eb7a..cf4f9297a95 100644
--- a/addons/account/i18n/fr_BE.po
+++ b/addons/account/i18n/fr_BE.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:08+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:14+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account
 #: view:account.invoice.report:0
diff --git a/addons/account/i18n/gl.po b/addons/account/i18n/gl.po
index cb8bd94487b..82637925ec6 100644
--- a/addons/account/i18n/gl.po
+++ b/addons/account/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:04+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:10+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account
 #: view:account.invoice.report:0
diff --git a/addons/account/i18n/gu.po b/addons/account/i18n/gu.po
index 5056d4f6eee..2c64739c90c 100644
--- a/addons/account/i18n/gu.po
+++ b/addons/account/i18n/gu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:04+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:10+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account
 #: view:account.invoice.report:0
diff --git a/addons/account/i18n/he.po b/addons/account/i18n/he.po
index fdb2f44a827..7110517a827 100644
--- a/addons/account/i18n/he.po
+++ b/addons/account/i18n/he.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:04+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:10+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account
 #: view:account.invoice.report:0
diff --git a/addons/account/i18n/hi.po b/addons/account/i18n/hi.po
index db761c54d65..c4cbeee6feb 100644
--- a/addons/account/i18n/hi.po
+++ b/addons/account/i18n/hi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:04+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:10+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account
 #: view:account.invoice.report:0
diff --git a/addons/account/i18n/hr.po b/addons/account/i18n/hr.po
index a48300a0d23..995353a9134 100644
--- a/addons/account/i18n/hr.po
+++ b/addons/account/i18n/hr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:07+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:13+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account
 #: view:account.invoice.report:0
diff --git a/addons/account/i18n/hu.po b/addons/account/i18n/hu.po
index 61398c197ee..f2d2b708dc2 100644
--- a/addons/account/i18n/hu.po
+++ b/addons/account/i18n/hu.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:04+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:10+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account
 #: view:account.invoice.report:0
diff --git a/addons/account/i18n/id.po b/addons/account/i18n/id.po
index 0545ca97ae6..0d55378ac25 100644
--- a/addons/account/i18n/id.po
+++ b/addons/account/i18n/id.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:35+0000\n"
-"PO-Revision-Date: 2012-06-06 10:35+0000\n"
-"Last-Translator: Budi Iskandar <Unknown>\n"
+"PO-Revision-Date: 2012-08-24 02:50+0000\n"
+"Last-Translator: Ginandjar Satyanagara <Unknown>\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: 2012-08-07 05:05+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:10+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -43,7 +43,7 @@ msgstr ""
 #. module: account
 #: view:account.move.reconcile:0
 msgid "Journal Entry Reconcile"
-msgstr "Rekonsiliasi Ayat-ayat Jurnal"
+msgstr ""
 
 #. module: account
 #: view:account.account:0
@@ -61,7 +61,7 @@ msgstr "Proforma/Terbuka/Terbayar Faktur"
 #. module: account
 #: field:report.invoice.created,residual:0
 msgid "Residual"
-msgstr "Sisa"
+msgstr "Tersisa"
 
 #. module: account
 #: constraint:account.period:0
diff --git a/addons/account/i18n/it.po b/addons/account/i18n/it.po
index 42480a0f728..5c8ce7db89a 100644
--- a/addons/account/i18n/it.po
+++ b/addons/account/i18n/it.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:05+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:10+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account
 #: view:account.invoice.report:0
diff --git a/addons/account/i18n/ja.po b/addons/account/i18n/ja.po
index 1a96374656e..54035207c7d 100644
--- a/addons/account/i18n/ja.po
+++ b/addons/account/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:05+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:11+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account
 #: view:account.invoice.report:0
diff --git a/addons/account/i18n/kab.po b/addons/account/i18n/kab.po
index f2a4108c0a7..fd508671dea 100644
--- a/addons/account/i18n/kab.po
+++ b/addons/account/i18n/kab.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:05+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:11+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account
 #: view:account.invoice.report:0
diff --git a/addons/account/i18n/kk.po b/addons/account/i18n/kk.po
index 276dcfbf453..3f26510ae69 100644
--- a/addons/account/i18n/kk.po
+++ b/addons/account/i18n/kk.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:05+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:11+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account
 #: view:account.invoice.report:0
diff --git a/addons/account/i18n/ko.po b/addons/account/i18n/ko.po
index 48d31016ebb..74010eb4d3b 100644
--- a/addons/account/i18n/ko.po
+++ b/addons/account/i18n/ko.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:05+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:11+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account
 #: view:account.invoice.report:0
diff --git a/addons/account/i18n/lo.po b/addons/account/i18n/lo.po
index 7b8fce547bf..6b7670a4cdc 100644
--- a/addons/account/i18n/lo.po
+++ b/addons/account/i18n/lo.po
@@ -8,20 +8,20 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:35+0000\n"
-"PO-Revision-Date: 2011-01-18 17:01+0000\n"
+"PO-Revision-Date: 2012-08-20 18:21+0000\n"
 "Last-Translator: Brice Muangkhot ສຸພາ ເມືອງໂຄຕ <bmuangkhot@gmail.com>\n"
 "Language-Team: Lao <lo@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:05+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:11+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account
 #: view:account.invoice.report:0
 #: view:analytic.entries.report:0
 msgid "last month"
-msgstr ""
+msgstr "ເດືອນແລ້ວນີ້"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -71,7 +71,7 @@ msgstr ""
 #. module: account
 #: field:account.analytic.line,currency_id:0
 msgid "Account currency"
-msgstr "ເງີນຕາສໍາລັບບັນຊີ"
+msgstr "ເງີນຕາສຳລັບບັນຊີ"
 
 #. module: account
 #: view:account.tax:0
@@ -122,7 +122,7 @@ msgstr ""
 #: report:account.invoice:0
 #: field:account.invoice.line,origin:0
 msgid "Origin"
-msgstr "ຮາກຕົ້້ນ"
+msgstr "ຮາກຕົ້ນ"
 
 #. module: account
 #: view:account.account:0
@@ -131,7 +131,7 @@ msgstr "ຮາກຕົ້້ນ"
 #: view:account.move.line.reconcile:0
 #: view:account.move.line.reconcile.writeoff:0
 msgid "Reconcile"
-msgstr ""
+msgstr "ສົມຕໍ່"
 
 #. module: account
 #: field:account.bank.statement.line,ref:0
@@ -299,7 +299,7 @@ msgstr "ຊື່ຫ້ອງ"
 msgid ""
 "Installs localized accounting charts to match as closely as possible the "
 "accounting needs of your company based on your country."
-msgstr ""
+msgstr "ຕິດຕັ້ງ"
 
 #. module: account
 #: code:addons/account/wizard/account_move_journal.py:63
@@ -314,7 +314,7 @@ msgstr "ບໍ່ສາມາດຄົ້ນພົບລາຍວັນບັນ
 #. module: account
 #: model:ir.model,name:account.model_account_unreconcile
 msgid "Account Unreconcile"
-msgstr ""
+msgstr "ບັນຊີຍັງບໍ່ທັນສົມຕໍ່"
 
 #. module: account
 #: view:product.product:0
diff --git a/addons/account/i18n/lt.po b/addons/account/i18n/lt.po
index 1b46ff09453..ebbb71e4de1 100644
--- a/addons/account/i18n/lt.po
+++ b/addons/account/i18n/lt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:05+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:11+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account
 #: view:account.invoice.report:0
diff --git a/addons/account/i18n/lv.po b/addons/account/i18n/lv.po
index 65c0faadc14..fa65cc9c876 100644
--- a/addons/account/i18n/lv.po
+++ b/addons/account/i18n/lv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:05+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:11+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account
 #: view:account.invoice.report:0
diff --git a/addons/account/i18n/mk.po b/addons/account/i18n/mk.po
index fd49bf8cec4..7de94f3a548 100644
--- a/addons/account/i18n/mk.po
+++ b/addons/account/i18n/mk.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:06+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:11+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account
 #: view:account.invoice.report:0
diff --git a/addons/account/i18n/mn.po b/addons/account/i18n/mn.po
index b94027a9411..ef6d89fe886 100644
--- a/addons/account/i18n/mn.po
+++ b/addons/account/i18n/mn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-08 04:36+0000\n"
-"X-Generator: Launchpad (build 15757)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:11+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -6661,7 +6661,7 @@ msgid ""
 "need for your company."
 msgstr ""
 "Дансны төрөл нь данс журнал яаж хэрэглэгдэхийг тодорхойлдог. Санхүүгийн "
-"хойшлуулах арга нь тогтмол хугацааны хаалтууд дээр хийгдэх боловсруулалтыг "
+"хойшлогдсон арга нь тогтмол хугацааны хаалтууд дээр хийгдэх боловсруулалтыг "
 "хэлдэг. Баланс тайлан, Ашиг-Алдагдлын тайлан зэрэг нь (ашиг/алдагдал болон "
 "баланс тайлан) ангилалуудыг хэрэглэдэг. Жишээлбэл: дансны төрөл нь хөрөнгө, "
 "авлага, өглөгтэй холбогдсон байж болно. Энэ харагдацаас өөрийн компанид "
@@ -8148,7 +8148,7 @@ msgstr ""
 #. module: account
 #: field:account.account.type,close_method:0
 msgid "Deferral Method"
-msgstr "Хаагдах хэлбэр"
+msgstr "Хойшлогдсон Арга"
 
 #. module: account
 #: code:addons/account/account_invoice.py:379
@@ -9868,6 +9868,9 @@ msgid ""
 "You can not select an account type with a deferral method different of "
 "\"Unreconciled\" for accounts with internal type \"Payable/Receivable\"! "
 msgstr ""
+"Тохиргооны алдаа! \n"
+"Дотоод төрөл нь \"Өглөг/Авлага\" төрөлтэй дансдын хувьд хойшлогдсон аргатай "
+"дансанд \"Тулгахгүй\"-с өөр төрлийг сонгож болохгүй! "
 
 #. module: account
 #: view:account.model:0
diff --git a/addons/account/i18n/nb.po b/addons/account/i18n/nb.po
index 19af0a3e4dd..bcb55185b2b 100644
--- a/addons/account/i18n/nb.po
+++ b/addons/account/i18n/nb.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:06+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:12+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -39,6 +39,8 @@ msgid ""
 "Determine the display order in the report 'Accounting \\ Reporting \\ "
 "Generic Reporting \\ Taxes \\ Taxes Report'"
 msgstr ""
+"Bestem visningsrekkefølgen i rapporten «Regnskap \\ Rapportering \\ Generic "
+"Rapportering \\ Skatter \\ skatte Rapport"
 
 #. module: account
 #: view:account.move.reconcile:0
@@ -76,13 +78,13 @@ msgstr "Kontovaluta"
 #. module: account
 #: view:account.tax:0
 msgid "Children Definition"
-msgstr ""
+msgstr "barne Definisjon"
 
 #. module: account
 #: code:addons/account/account_bank_statement.py:302
 #, python-format
 msgid "Journal item \"%s\" is not valid."
-msgstr ""
+msgstr "Journal element «% s\" er ikke gyldig."
 
 #. module: account
 #: model:ir.model,name:account.model_report_aged_receivable
@@ -119,6 +121,7 @@ msgid ""
 "Configuration error! The currency chosen should be shared by the default "
 "accounts too."
 msgstr ""
+"Konfigurasjon feil! Den valgte valutaen bør deles av standard kontoer også."
 
 #. module: account
 #: report:account.invoice:0
@@ -259,6 +262,9 @@ msgid ""
 "legal reports, and set the rules to close a fiscal year and generate opening "
 "entries."
 msgstr ""
+"Kontotype brukes for informasjons formål, å generere landsspesifikke "
+"juridiske rapporter og angi reglene for å lukke et regnskapsår og generere "
+"åpning oppføringer."
 
 #. module: account
 #: report:account.overdue:0
@@ -344,6 +350,9 @@ msgid ""
 "leave the automatic formatting, it will be computed based on the financial "
 "reports hierarchy (auto-computed field 'level')."
 msgstr ""
+"Du kan sette opp formatet du ønsker denne posten skal vises. Hvis du lar den "
+"automatiske formateringen, vil det bli beregnet basert på økonomiske "
+"rapporter hierarkiet (auto-computertomographie feltet 'nivå')."
 
 #. module: account
 #: view:account.installer:0
@@ -373,7 +382,7 @@ msgstr ""
 #. module: account
 #: constraint:account.move.line:0
 msgid "You can not create journal items on an account of type view."
-msgstr ""
+msgstr "Du kan ikke lage journalregistreringer på konto av typen vis"
 
 #. module: account
 #: model:ir.model,name:account.model_account_tax_template
@@ -460,6 +469,9 @@ msgid ""
 "it comes to 'Printed' state. When all transactions are done, it comes in "
 "'Done' state."
 msgstr ""
+"Når tidsskriftet periode er opprettet. Staten er \"Kladd\". Hvis en rapport "
+"skrives det kommer til \"Trykt \"tilstand. Når alle transaksjoner er gjort, "
+"kommer det i Ferdig tilstand"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_tax_chart
@@ -663,7 +675,7 @@ msgstr "Lukk periode"
 #. module: account
 #: model:ir.model,name:account.model_account_common_partner_report
 msgid "Account Common Partner Report"
-msgstr ""
+msgstr "Konto Felles Partner Rapport"
 
 #. module: account
 #: field:account.fiscalyear.close,period_id:0
@@ -689,6 +701,8 @@ 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 ""
+"Datoen for din bilagsregistrering ikke er i den definerte perioden! Du bør "
+"endre datoen eller fjerne denne begrensningen fra tidsskriftet."
 
 #. module: account
 #: model:ir.model,name:account.model_account_report_general_ledger
@@ -787,7 +801,7 @@ msgstr ""
 #. module: account
 #: model:ir.model,name:account.model_account_subscription_line
 msgid "Account Subscription Line"
-msgstr ""
+msgstr "Konto Abonnement Linje"
 
 #. module: account
 #: help:account.invoice,reference:0
@@ -863,6 +877,8 @@ msgid ""
 "Can not %s invoice which is already reconciled, invoice should be "
 "unreconciled first. You can only Refund this invoice"
 msgstr ""
+"Kan ikke% s faktura som allerede er forsonet, bør fakturaen ikke avstemte "
+"først. Du kan bare tilbakebetale denne fakturaen."
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_subscription_form_new
@@ -914,6 +930,8 @@ msgid ""
 "You cannot validate this journal entry because account \"%s\" does not "
 "belong to chart of accounts \"%s\"!"
 msgstr ""
+"Du kan ikke validere dette bilagsregistrering fordi kontoen \"% s\" ikke "
+"hører til kontoplan \"% s\"!"
 
 #. module: account
 #: code:addons/account/account_move_line.py:835
@@ -922,6 +940,8 @@ msgid ""
 "This account does not allow reconciliation! You should update the account "
 "definition to change this."
 msgstr ""
+"Denne kontoen tillater ikke avstemming! Du bør oppdatere konto definisjonen "
+"å endre dette."
 
 #. module: account
 #: view:account.invoice:0
@@ -984,12 +1004,15 @@ msgid ""
 "amount.If the tax account is base tax code, this field will contain the "
 "basic amount(without tax)."
 msgstr ""
+"Dersom Skatt kontoen er en skatt kode konto, vil dette feltet inneholde "
+"skattlagt beløp. Vis skatte kontoen er base skatt kode, dette feltet vil "
+"inneholde grunnbeløpet (uten skatt)."
 
 #. module: account
 #: code:addons/account/account.py:2596
 #, python-format
 msgid "I can not locate a parent code for the template account!"
-msgstr ""
+msgstr "Jeg kan ikke finne en forelder kode for mal konto!"
 
 #. module: account
 #: view:account.analytic.line:0
@@ -1065,6 +1088,8 @@ msgid ""
 "You cannot change the type of account from '%s' to '%s' type as it contains "
 "journal items!"
 msgstr ""
+"Du kan ikke endre kontotype fra '% s' til '% s' type som inneholder "
+"tidsskrift vare!"
 
 #. module: account
 #: field:account.report.general.ledger,sortby:0
@@ -1096,7 +1121,7 @@ msgstr ""
 #. module: account
 #: view:account.tax:0
 msgid "Applicability Options"
-msgstr ""
+msgstr "anvendbarhe Alternativer"
 
 #. module: account
 #: report:account.partner.balance:0
@@ -1130,7 +1155,7 @@ msgstr "Opprett registreringer før:"
 #. module: account
 #: view:account.move.line:0
 msgid "Unbalanced Journal Items"
-msgstr ""
+msgstr "Ubalanserte Journal Elementer"
 
 #. module: account
 #: model:account.account.type,name:account.data_account_type_bank
@@ -1156,6 +1181,8 @@ msgid ""
 "Total amount (in Secondary currency) for transactions held in secondary "
 "currency for this account."
 msgstr ""
+"Totalt beløp (i videregående valuta) for transaksjoner som ble holdt i "
+"videregående valuta for denne kontoen."
 
 #. module: account
 #: field:account.fiscal.position.tax,tax_dest_id:0
@@ -1181,6 +1208,10 @@ msgid ""
 "purchase orders or receipts. This way, you can control the invoice from your "
 "supplier according to what you purchased or received."
 msgstr ""
+"Med leverandørfakturaer kan du gå inn og administrere fakturaer utstedt av "
+"dine leverandører. OpenERP kan også generere utkast fakturaer automatisk fra "
+"innkjøpsordrer eller kvitteringer. På denne måten kan du kontrollere at "
+"fakturaen fra leverandøren i henhold til hva du har kjøpt eller mottatt."
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_tax_code_template_form
@@ -1233,6 +1264,8 @@ msgid ""
 "You can not use this general account in this journal, check the tab 'Entry "
 "Controls' on the related journal !"
 msgstr ""
+"Du kan ikke bruke denne generelle konto i dette tidsskriftet, sjekk fanen "
+"'Entry Controls' på den relaterte tidsskriftet!"
 
 #. module: account
 #: field:account.move.line.reconcile,trans_nbr:0
@@ -1269,7 +1302,7 @@ msgstr "Andre"
 #. module: account
 #: view:account.subscription:0
 msgid "Draft Subscription"
-msgstr ""
+msgstr "utkast abonnement"
 
 #. module: account
 #: view:account.account:0
@@ -1482,6 +1515,10 @@ msgid ""
 "entry per accounting document: invoice, refund, supplier payment, bank "
 "statements, etc."
 msgstr ""
+"En bilagsregistrering består av flere journaler elementer, som hver er enten "
+"en debet eller kreditt transaksjon. OpenERP oppretter automatisk en "
+"bilagsregistrering per regnskap dokumentet: faktura, tilbakebetaling, "
+"leverandør betaling, kontoutskrifter, etc."
 
 #. module: account
 #: view:account.entries.report:0
@@ -1494,6 +1531,8 @@ msgid ""
 "By unchecking the active field, you may hide a fiscal position without "
 "deleting it."
 msgstr ""
+"Ved å fjerne det aktive feltet, kan du skjule en finanspolitisk posisjon "
+"uten å slette den."
 
 #. module: account
 #: model:ir.model,name:account.model_temp_range
@@ -1601,6 +1640,12 @@ msgid ""
 "the Payment column of a line, you can press F1 to open the reconciliation "
 "form."
 msgstr ""
+"En kontoutskrift er en oppsummering av alle finansielle transaksjoner det "
+"skjer over en gitt tidsperiode på en innskuddskonto, kredittkort eller en "
+"annen type økonomisk konto. Utgangspunktet balansen vil bli foreslått "
+"automatisk og utgående balanse er å finne på kontoutskriften din. Når du er "
+"i Betaling kolonne på en linje, kan du trykke F1 for å åpne forsoning "
+"skjemaet."
 
 #. module: account
 #: report:account.analytic.account.cost_ledger:0
@@ -1638,7 +1683,7 @@ msgstr "Analytiske kostnader å fakturere"
 #. module: account
 #: view:ir.sequence:0
 msgid "Fiscal Year Sequence"
-msgstr ""
+msgstr "Regnskapsåret sekvens"
 
 #. module: account
 #: field:wizard.multi.charts.accounts,seq_journal:0
@@ -1656,6 +1701,8 @@ msgid ""
 "Cancel Invoice: Creates the refund invoice, validate and reconcile it to "
 "cancel the current invoice."
 msgstr ""
+"Avbryt Faktura: Oppretter tilbakebetalingen faktura, validere og forsone det "
+"å avbryte den aktuelle fakturaen."
 
 #. module: account
 #: model:ir.ui.menu,name:account.periodical_processing_invoicing
@@ -1692,11 +1739,13 @@ msgid ""
 "Have a complete tree view of all journal items per account code by clicking "
 "on an account."
 msgstr ""
+"Vis din bedrift kontoplan per regnskapsår og filtrere etter periode. Ha en "
+"komplett trevisning av alle journaler pr kontokode ved å klikke på en konto."
 
 #. module: account
 #: view:account.analytic.account:0
 msgid "Pending Accounts"
-msgstr ""
+msgstr "Ventende kontoer"
 
 #. module: account
 #: view:account.tax.template:0
@@ -1709,6 +1758,8 @@ msgid ""
 "If the active field is set to False, it will allow you to hide the journal "
 "period without removing it."
 msgstr ""
+"Dersom det aktive feltet er satt til False, vil det tillate deg å skjule "
+"tidsskriftet perioden uten å fjerne det."
 
 #. module: account
 #: view:res.partner:0
@@ -1723,7 +1774,7 @@ msgstr "Debitorer og kreditorer"
 #. module: account
 #: model:ir.model,name:account.model_account_common_journal_report
 msgid "Account Common Journal Report"
-msgstr ""
+msgstr "Felles konto Journal Rapport"
 
 #. module: account
 #: selection:account.partner.balance,display_partner:0
@@ -1868,7 +1919,7 @@ msgstr "Gyldig"
 #: 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 ""
+msgstr "Konto Print Journal"
 
 #. module: account
 #: model:ir.model,name:account.model_product_category
@@ -1887,12 +1938,15 @@ msgid ""
 "will be added, Loss : Amount will be deducted.), as calculated in Profit & "
 "Loss Report"
 msgstr ""
+"Denne kontoen brukes for overføring Gevinst / tap (Vis det er Gevinst: "
+"Beløpe vil bli lagt til, tap: Beløpet blir trukket.) Som beregnes i "
+"Resultatregnskap Report"
 
 #. 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 ""
+msgstr "Sammenligning mellom regnskap og betaling oppføringer"
 
 #. module: account
 #: view:account.tax:0
@@ -1906,6 +1960,8 @@ msgid ""
 "Check this box if you want to use a different sequence for each created "
 "journal. Otherwise, all will use the same sequence."
 msgstr ""
+"Sjekk denne boksen hvis du ønsker å bruke en annen sekvens for hver "
+"opprettet journal. Ellers vil alle bruke samme sekvens."
 
 #. module: account
 #: help:account.partner.ledger,amount_currency:0
@@ -1914,6 +1970,8 @@ msgid ""
 "It adds the currency column if the currency is different then the company "
 "currency"
 msgstr ""
+"Det legger valutaen kolonne hvis valutaen er forskjellig enn selskapet "
+"valutaen"
 
 #. module: account
 #: help:account.journal,allow_date:0
@@ -1921,6 +1979,8 @@ msgid ""
 "If set to True then do not accept the entry if the entry date is not into "
 "the period dates"
 msgstr ""
+"Hvis den er satt til True ikke godta oppføringen hvis Påmeldingsfrist ikke "
+"er i perioden datoer."
 
 #. module: account
 #: code:addons/account/account_invoice.py:73
@@ -1941,11 +2001,14 @@ msgid ""
 "currency. You should remove the secondary currency on the account or select "
 "a multi-currency view on the journal."
 msgstr ""
+"Den valgte kontoen av dine Bilagsregistrering blir tvunget for å gi en "
+"sekundær valuta. Du bør fjerne den sekundære valuta på konto eller velg en "
+"flervaluta syn på tidsskriftet."
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_financial_report_tree
 msgid "Makes a generic system to draw financial reports easily."
-msgstr ""
+msgstr "Gjør et generisk system for å tegne finansielle rapporter enkelt."
 
 #. module: account
 #: view:account.invoice:0
@@ -1959,6 +2022,8 @@ msgid ""
 "If the active field is set to False, it will allow you to hide the tax "
 "without removing it."
 msgstr ""
+"Dersom det aktive feltet er satt til False, vil det tillate deg å skjule "
+"skatt uten å fjerne det."
 
 #. module: account
 #: view:account.analytic.line:0
@@ -2013,7 +2078,7 @@ msgstr "Konto for avstemming"
 #. module: account
 #: model:process.transition,note:account.process_transition_filestatement0
 msgid "Import of the statement in the system from an electronic file"
-msgstr ""
+msgstr "Importer av uttalelsen i systemet fra en elektronisk fil"
 
 #. module: account
 #: model:process.node,name:account.process_node_importinvoice0
@@ -2050,6 +2115,8 @@ msgid ""
 "Invalid period ! Some periods overlap or the date period is not in the scope "
 "of the fiscal year. "
 msgstr ""
+"Ugyldig periode! Enkelte perioder overlapper eller dato perioden er ikke i "
+"omfanget av regnskapsåret. "
 
 #. module: account
 #: code:addons/account/account_bank_statement.py:357
@@ -2072,6 +2139,9 @@ msgid ""
 "There is no default default debit account defined \n"
 "on journal \"%s\""
 msgstr ""
+"Det er ingen standard. \n"
+"Standard belastningskonto definert\n"
+"på tidsskriftet \"% s\""
 
 #. module: account
 #: help:account.account.template,type:0
@@ -2083,6 +2153,11 @@ msgid ""
 "partners accounts (for debit/credit computations), closed for depreciated "
 "accounts."
 msgstr ""
+"Denne typen blir brukt til å differensiere typer med spesielle effekter i "
+"OpenERP: view kan ikke ha oppføringer, konsolidering er kontoer som kan få "
+"barne kontoer for flere firma konsolideringer, betales / mottas er for "
+"samarbeidspartnere kontoer (for debet / kreditt beregninger), stengt for "
+"nedskrevne kontoer."
 
 #. module: account
 #: view:account.chart.template:0
@@ -2097,6 +2172,9 @@ msgid ""
 "Put a sequence in the journal definition for automatic numbering or create a "
 "sequence manually for this piece."
 msgstr ""
+"Kan ikke opprette en automatisk sekvens for dette stykket!\n"
+"Sett en sekvens i tidsskriftet definisjonen for automatisk nummerering eller "
+"opprette en sekvens manuelt for dette stykket."
 
 #. module: account
 #: code:addons/account/account.py:787
@@ -2105,6 +2183,8 @@ msgid ""
 "You can not modify the company of this journal as its related record exist "
 "in journal items"
 msgstr ""
+"Du kan ikke endre selskapet av magasinet som dens tilhørende rekord finnes i "
+"tidsskriftet varer"
 
 #. module: account
 #: report:account.invoice:0
@@ -2118,6 +2198,9 @@ msgid ""
 "certified Chart of Accounts exists for your specified country, a generic one "
 "can be installed and will be selected by default."
 msgstr ""
+"Standardinnstillingen Kontoplan er tilsvarende ditt valg av land. Hvis ingen "
+"sertifisert Kontoplan finnes for ditt angitte landet, kan en generisk bli "
+"installert og vil bli valgt som standard."
 
 #. module: account
 #: view:account.account.type:0
@@ -2263,6 +2346,8 @@ msgid ""
 "There is no default default credit account defined \n"
 "on journal \"%s\""
 msgstr ""
+"Det er ingen standard.\n"
+"Standard kreditt konto definert på tidsskriftet \"% s\""
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_review_financial_journals_installer
@@ -2271,6 +2356,9 @@ msgid ""
 "'Setup Your Bank Accounts' tool that will automatically create the accounts "
 "and journals for you."
 msgstr ""
+"Sett opp ditt regnskap tidsskrifter. For bankkonti, er det bedre å bruke "
+"\"Setup bankkontoer Verktøyet som vil automatisk opprette kontoer og "
+"tidsskrifter for deg."
 
 #. module: account
 #: model:ir.model,name:account.model_account_move
@@ -2280,7 +2368,7 @@ msgstr "Kontopostering"
 #. module: account
 #: constraint:res.partner:0
 msgid "Error ! You cannot create recursive associated members."
-msgstr ""
+msgstr "Feil! Du kan ikke opprette rekursive tilknyttede medlemmer."
 
 #. module: account
 #: field:account.sequence.fiscalyear,sequence_main_id:0
@@ -2294,6 +2382,8 @@ msgid ""
 "In order to delete a bank statement, you must first cancel it to delete "
 "related journal items."
 msgstr ""
+"For å slette en kontoutskrift, må du først avbryte det å slette relaterte "
+"tidsskriftet elementer."
 
 #. module: account
 #: field:account.invoice,payment_term:0
@@ -2311,7 +2401,7 @@ msgstr "Betalingsbetingelser"
 #: 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 ""
+msgstr "skattemessige posisjoner"
 
 #. module: account
 #: constraint:account.account:0
@@ -2370,6 +2460,9 @@ msgid ""
 "You can create one in the menu: \n"
 "Configuration\\Financial Accounting\\Accounts\\Journals."
 msgstr ""
+"Kan ikke finne noen konto journal av% s for denne bedriften.\n"
+"Du kan opprette en i menyen:\n"
+"Configuration \\ Financial Accounting \\ regnskap \\ Journals."
 
 #. module: account
 #: model:account.payment.term,name:account.account_payment_term_advance
@@ -2391,7 +2484,7 @@ msgstr "Basiskode"
 #. module: account
 #: help:account.invoice.tax,sequence:0
 msgid "Gives the sequence order when displaying a list of invoice tax."
-msgstr ""
+msgstr "Gir sekvensen ordre når det viser en liste over faktura skatt."
 
 #. module: account
 #: field:account.tax,base_sign:0
@@ -2411,11 +2504,18 @@ 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 ""
+"Denne menyen skriver en merverdiavgift erklæring basert på fakturaer eller "
+"betalinger. Velg en eller flere perioder av regnskapsåret. Informasjonen som "
+"kreves for en selvangivelse blir automatisk generert av OpenERP fra "
+"fakturaer (eller utbetalinger, i noen land). Disse dataene blir oppdatert i "
+"sanntid. Det er veldig nyttig fordi det lar deg forhåndsvise til enhver tid "
+"den skatten som du skylder på begynnelsen og slutten av måneden eller "
+"kvartalet."
 
 #. module: account
 #: selection:account.move.line,centralisation:0
 msgid "Debit Centralisation"
-msgstr ""
+msgstr "Debet Sentralisering"
 
 #. module: account
 #: view:account.invoice.confirm:0
@@ -2435,12 +2535,12 @@ msgstr "Dag"
 #. module: account
 #: model:ir.actions.act_window,name:account.act_account_renew_view
 msgid "Accounts to Renew"
-msgstr ""
+msgstr "Kontoer for å fornye"
 
 #. module: account
 #: model:ir.model,name:account.model_account_model_line
 msgid "Account Model Entries"
-msgstr ""
+msgstr "Konto Modell oppføringer"
 
 #. module: account
 #: code:addons/account/account.py:3117
@@ -2493,17 +2593,21 @@ msgid ""
 "The fiscal position will determine taxes and the accounts used for the "
 "partner."
 msgstr ""
+"Den finanspolitiske stillingen vil bestemme skatter og regnskapet brukes for "
+"partneren."
 
 #. module: account
 #: view:account.print.journal:0
 msgid ""
 "This report gives you an overview of the situation of a specific journal"
 msgstr ""
+"Denne rapporten gir deg en oversikt over situasjonen til en bestemt "
+"tidsskrift"
 
 #. module: account
 #: model:ir.model,name:account.model_account_move_line_reconcile_writeoff
 msgid "Account move line reconcile (writeoff)"
-msgstr ""
+msgstr "Konto trekk linje forsonet (writeoff)"
 
 #. module: account
 #: model:account.account.type,name:account.account_type_tax
@@ -2594,7 +2698,7 @@ msgstr "Ref"
 #. 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 ""
+msgstr "Kontoen kan enten være en base skatt kode eller en skatt kode konto"
 
 #. module: account
 #: sql_constraint:account.model.line:0
@@ -2615,7 +2719,7 @@ msgstr "Betalt/avstemt"
 #: field:account.tax,ref_base_code_id:0
 #: field:account.tax.template,ref_base_code_id:0
 msgid "Refund Base Code"
-msgstr ""
+msgstr "Tilbakebetaling Base kode."
 
 #. module: account
 #: selection:account.tax.template,applicable_type:0
@@ -2634,7 +2738,7 @@ msgstr "Datoer"
 #. module: account
 #: field:account.chart.template,parent_id:0
 msgid "Parent Chart Template"
-msgstr ""
+msgstr "Forelder figur mal."
 
 #. module: account
 #: field:account.tax,parent_id:0
@@ -2654,6 +2758,8 @@ msgid ""
 "Automatically generate entries based on what has been entered in the  system "
 "before a specific date."
 msgstr ""
+"Automatisk genererer oppføringer basert på hva som har blitt lagt inn i "
+"systemet før en bestemt dato."
 
 #. module: account
 #: view:account.aged.trial.balance:0
@@ -2687,12 +2793,17 @@ msgid ""
 "Note that journal entries that are automatically created by the system are "
 "always skipping that state."
 msgstr ""
+"Merk denne boksen hvis du ikke vil at nye posteringer for å passere gjennom "
+"\"utkast\" staten og i stedet går direkte til \"postet statens uten manuell "
+"validering.\n"
+"Merk at posteringer som opprettes automatisk av systemet er alltid hopper "
+"over staten."
 
 #. module: account
 #: model:ir.actions.server,name:account.ir_actions_server_action_wizard_multi_chart
 #: model:ir.ui.menu,name:account.menu_act_ir_actions_bleble
 msgid "New Company Financial Setting"
-msgstr ""
+msgstr "Ny selskap finansiell innstilling"
 
 #. module: account
 #: view:account.installer:0
@@ -2702,7 +2813,7 @@ msgstr "Konfigurer din kontoplan"
 #. module: account
 #: view:account.use.model:0
 msgid "This wizard will create recurring accounting entries"
-msgstr ""
+msgstr "Denne veiviseren vil skape gjentakende regnskapspostene."
 
 #. module: account
 #: code:addons/account/account.py:1321
@@ -2716,7 +2827,7 @@ msgstr "Ingen sekvens angitt i journal !"
 #: code:addons/account/account_move_line.py:173
 #, python-format
 msgid "You have to define an analytic journal on the '%s' journal!"
-msgstr ""
+msgstr "Du må definere en analytisk journal på '% s' dagbok!"
 
 #. module: account
 #: code:addons/account/account.py:407
@@ -2725,6 +2836,8 @@ msgid ""
 "You need an Opening journal with centralisation checked to set the initial "
 "balance!"
 msgstr ""
+"Du trenger en åpning tidsskrift med sentralisering sjekket for å sette den "
+"innledende balanse!"
 
 #. module: account
 #: view:account.invoice.tax:0
@@ -2763,7 +2876,7 @@ msgstr "August"
 #. module: account
 #: model:process.transition,note:account.process_transition_paymentreconcile0
 msgid "Payment entries are the second input of the reconciliation."
-msgstr ""
+msgstr "Betaling oppføringer er den andre inngangen på forsoning."
 
 #. module: account
 #: selection:account.entries.report,month:0
@@ -2780,6 +2893,9 @@ 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 ""
+"Den optimale mengden uttrykt denne linjen, for eksempel: antall solgte "
+"produkt. Mengden er ikke et juridisk krav, men er svært nyttig for noen "
+"rapporter."
 
 #. module: account
 #: view:account.payment.term.line:0
@@ -2808,6 +2924,7 @@ msgstr "La stå blank for å benytte samme periode bekreftelses(faktura)dato."
 msgid ""
 "used in statement reconciliation domain, but shouldn't be used elswhere."
 msgstr ""
+"Brukt i setningen forsoning domene, men bør ikke brukes andre steder."
 
 #. module: account
 #: field:account.invoice.tax,base_amount:0
@@ -2842,6 +2959,9 @@ msgid ""
 "between the creation date or the creation date of the entries plus the "
 "partner payment terms."
 msgstr ""
+"Forfallsdatoen for genererte oppføringer for denne modellen. Du kan velge "
+"mellom opprettelsesdatoen eller opprettelsesdatoen av oppføringene pluss "
+"samarbeidslandene betalingsvilkårene."
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_accounting
@@ -2874,6 +2994,8 @@ msgid ""
 "Tax base different!\n"
 "Click on compute to update the tax base."
 msgstr ""
+"Skattegrunnlag annerledes!\n"
+"Klikk på datamaskinen for å oppdatere skattegrunnlaget."
 
 #. module: account
 #: field:account.partner.ledger,page_split:0
@@ -2900,6 +3022,8 @@ msgid ""
 "Set if the amount of tax must be included in the base amount before "
 "computing the next taxes."
 msgstr ""
+"Still hvis mengden av skatt må inkluderes i grunnbeløpet før du kan regne de "
+"neste skattene."
 
 #. module: account
 #: help:account.journal,user_id:0
@@ -3049,7 +3173,7 @@ msgstr "Kundekreditt"
 #. module: account
 #: view:account.payment.term.line:0
 msgid "  Day of the Month: 0"
-msgstr ""
+msgstr "  Dagen i måneden: 0"
 
 #. module: account
 #: view:account.subscription:0
@@ -3059,12 +3183,12 @@ msgstr "Starter på"
 #. module: account
 #: model:ir.model,name:account.model_account_partner_ledger
 msgid "Account Partner Ledger"
-msgstr ""
+msgstr "Konto Partner ledger"
 
 #. module: account
 #: help:account.journal.column,sequence:0
 msgid "Gives the sequence order to journal column."
-msgstr ""
+msgstr "Gir sekvensen for å merke kolonne."
 
 #. module: account
 #: help:account.account,currency_id:0
@@ -3072,6 +3196,7 @@ msgstr ""
 #: help:account.bank.accounts.wizard,currency_id:0
 msgid "Forces all moves for this account to have this secondary currency."
 msgstr ""
+"Tvinger alle trekk for denne kontoen til å ha denne sekundære valuta."
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_validate_account_move_line
@@ -3079,6 +3204,8 @@ 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 ""
+"Denne veiviseren vil validere alle posteringer på en bestemt journal og "
+"periode. Når bilag er validert, kan du ikke oppdatere dem lenger."
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_chart_template_form
@@ -3094,7 +3221,7 @@ msgstr ""
 #. module: account
 #: view:report.account.sales:0
 msgid "This months' Sales by type"
-msgstr ""
+msgstr "Denne måneds Salgssentral etter type"
 
 #. module: account
 #: model:ir.model,name:account.model_account_unreconcile_reconcile
@@ -3193,12 +3320,12 @@ msgstr "Innkjøp"
 #: view:account.installer:0
 #: view:wizard.multi.charts.accounts:0
 msgid "Accounting Application Configuration"
-msgstr ""
+msgstr "Regnskap programkonfigurasjon"
 
 #. module: account
 #: view:account.payment.term.line:0
 msgid "  Value amount: 0.02"
-msgstr ""
+msgstr "  Verdi beløp: 0.02"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.open_board_account
@@ -3238,7 +3365,7 @@ msgstr "MVA:"
 #. module: account
 #: constraint:account.invoice:0
 msgid "Invalid BBA Structured Communication !"
-msgstr ""
+msgstr "Ugyldig BBA Strukturert Kommunikasjon!"
 
 #. module: account
 #: help:account.analytic.line,amount_currency:0
@@ -3246,6 +3373,8 @@ msgid ""
 "The amount expressed in the related account currency if not equal to the "
 "company one."
 msgstr ""
+"Beløpet uttrykt i den tilknyttede kontoen valuta hvis ikke lik den selskapet "
+"en."
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_unreconcile
@@ -3270,12 +3399,12 @@ msgstr "Avgiftsplan"
 #: code:addons/account/account_cash_statement.py:314
 #, python-format
 msgid "The closing balance should be the same than the computed balance!"
-msgstr ""
+msgstr "Den utgående balanse bør være den samme enn den beregnede balanse!"
 
 #. module: account
 #: view:account.journal:0
 msgid "Search Account Journal"
-msgstr ""
+msgstr "Søk Konto Journal"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_invoice_tree_pending_invoice
@@ -3300,6 +3429,8 @@ msgid ""
 "All selected journal entries will be validated and posted. It means you "
 "won't be able to modify their accounting fields anymore."
 msgstr ""
+"Alle valgte posteringer blir validert og postet. Det betyr at du ikke kunne "
+"endre sine regnskapsprinsipper felt lenger."
 
 #. module: account
 #: model:ir.actions.report.xml,name:account.account_transfers
@@ -3325,7 +3456,7 @@ msgstr "Søk bevegelse"
 #: field:account.tax.code,name:0
 #: field:account.tax.code.template,name:0
 msgid "Tax Case Name"
-msgstr ""
+msgstr "Skatt saksnavnet"
 
 #. module: account
 #: report:account.invoice:0
@@ -3340,6 +3471,8 @@ msgid ""
 "Selected Invoice(s) cannot be cancelled as they are already in 'Cancelled' "
 "or 'Done' state!"
 msgstr ""
+"Valgte fakturaer) kan ikke kanselleres som de er allerede i \"Avlyst\" eller "
+"\"ferdig\" stat!"
 
 #. module: account
 #: view:account.invoice.line:0
@@ -3402,6 +3535,11 @@ msgid ""
 "amount greater than the total invoiced amount. The latest line of your "
 "payment term must be of type 'balance' to avoid rounding issues."
 msgstr ""
+"Kan ikke opprette fakturaen!\n"
+"Den tilhørende innbetaling sikt er trolig feilkonfigurert som det gir en "
+"beregnet beløp større enn det totale fakturerte beløpet. Den siste linjen "
+"din betalingsfrist må være av typen \"balanse\" for å unngå avrunding "
+"problemer."
 
 #. module: account
 #: report:account.invoice:0
@@ -3435,12 +3573,12 @@ msgstr "Centralised counterpart"
 #: code:addons/account/account_move_line.py:584
 #, python-format
 msgid "You can not create journal items on a \"view\" account %s %s"
-msgstr ""
+msgstr "Du kan ikke opprette journal elementer på en \"vis\"-kontoen% s% s"
 
 #. module: account
 #: model:ir.model,name:account.model_account_partner_reconcile_process
 msgid "Reconcilation Process partner by partner"
-msgstr ""
+msgstr "Forsoningsprosess partner med partner"
 
 #. module: account
 #: selection:account.automatic.reconcile,power:0
@@ -3585,7 +3723,7 @@ msgstr ""
 #: view:account.tax:0
 #: view:account.tax.template:0
 msgid "Applicable Code (if type=code)"
-msgstr ""
+msgstr "Gjelder kode (hvis type = kode)"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -3623,6 +3761,8 @@ msgstr "Betalingsoppdrag"
 msgid ""
 "Check this option if you want the user to reconcile entries in this account."
 msgstr ""
+"Sjekk dette alternativet hvis du vil at brukeren skal avstemme oppføringer i "
+"denne kontoen."
 
 #. module: account
 #: model:ir.actions.report.xml,name:account.account_account_balance_landscape
@@ -3664,7 +3804,7 @@ msgstr "Åpne faktura"
 #. module: account
 #: field:account.invoice.tax,factor_tax:0
 msgid "Multipication factor Tax code"
-msgstr ""
+msgstr "Multiplikasjonsfaktor Skatt kode"
 
 #. module: account
 #: view:account.fiscal.position:0
@@ -3679,6 +3819,9 @@ msgid ""
 "centralised counterpart box in the related journal from the configuration "
 "menu."
 msgstr ""
+"Du kan ikke opprette en faktura på en sentralisert journal. Fjern merkingen "
+"den sentraliserte motpart boksen i den aktuelle tidsskriftet fra "
+"konfigurasjonsmenyen."
 
 #. module: account
 #: field:account.account,name:0
@@ -3696,7 +3839,7 @@ msgstr "Navn"
 #. module: account
 #: model:ir.model,name:account.model_account_aged_trial_balance
 msgid "Account Aged Trial balance Report"
-msgstr ""
+msgstr "Konto Aldret saldobalansen Rapport"
 
 #. module: account
 #: code:addons/account/account_move_line.py:591
@@ -3745,6 +3888,8 @@ msgid ""
 "The fiscalyear, periods or chart of account chosen have to belong to the "
 "same company."
 msgstr ""
+"Regnskapsåret, perioder eller en oversikt over kontoen valgt å tilhøre samme "
+"selskap"
 
 #. module: account
 #: model:ir.actions.todo.category,name:account.category_accounting_configuration
@@ -3771,6 +3916,8 @@ msgid ""
 "Print Report with the currency column if the currency is different then the "
 "company currency"
 msgstr ""
+"Skriv rapport med valutaen kolonne hvis valutaen er forskjellig enn "
+"selskapet valutaen"
 
 #. module: account
 #: help:account.account,unrealized_gain_loss:0
@@ -3778,6 +3925,8 @@ msgid ""
 "Value of Loss or Gain due to changes in exchange rate when doing multi-"
 "currency transactions."
 msgstr ""
+"Verdi av tap eller gevinst som følge av endringer i valutakursen når du gjør "
+"flere valutatransaksjoner."
 
 #. module: account
 #: view:account.analytic.line:0
@@ -3797,6 +3946,10 @@ msgid ""
 "debit/credit accounts, of type 'situation' and with a centralized "
 "counterpart."
 msgstr ""
+"Det beste praksis her er å bruke et tidsskrift dedikert til inneholde de "
+"første oppføringene i alle regnskapsår. Merk at du bør definere det med "
+"standard debet / kreditt-kontoer, av typen \"situasjon\" og med en "
+"sentralisert motpart."
 
 #. module: account
 #: view:account.installer:0
@@ -3832,7 +3985,7 @@ msgstr "Valider"
 #: 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 ""
+msgstr "Kostnad merker"
 
 #. module: account
 #: model:account.financial.report,name:account.account_financial_report_assets0
@@ -3891,6 +4044,8 @@ msgid ""
 "If the active field is set to False, it will allow you to hide the account "
 "without removing it."
 msgstr ""
+"Dersom det aktive feltet er satt til False, vil det tillate deg å skjule "
+"kontoen uten å fjerne det."
 
 #. module: account
 #: view:account.move.line:0
@@ -3905,7 +4060,7 @@ msgstr "Søk avgiftsmaler"
 #. module: account
 #: model:ir.ui.menu,name:account.periodical_processing_journal_entries_validation
 msgid "Draft Entries"
-msgstr ""
+msgstr "utkastene"
 
 #. module: account
 #: view:account.payment.term.line:0
@@ -3926,7 +4081,7 @@ msgstr "Snarvei"
 #. module: account
 #: constraint:account.fiscalyear:0
 msgid "Error! The start date of the fiscal year must be before his end date."
-msgstr ""
+msgstr "Feil! Startdatoen for regnskapsåret må være før han sluttdato."
 
 #. module: account
 #: view:account.account:0
@@ -3985,6 +4140,8 @@ msgid ""
 "You haven't supplied enough argument to compute the initial balance, please "
 "select a period and journal in the context."
 msgstr ""
+"Du har ikke levert nok argument til å beregne utgangsposisjonen balanse, "
+"vennligst velg en periode og tidsskrift i sammenheng."
 
 #. module: account
 #: model:process.transition,note:account.process_transition_supplieranalyticcost0
@@ -3992,11 +4149,13 @@ msgid ""
 "Analytic costs (timesheets, some purchased products, ...) come from analytic "
 "accounts. These generate draft supplier invoices."
 msgstr ""
+"Analytiske kostnader (timelister, noen kjøpte produkter, ...) kommer fra "
+"analytiske kontoer. Disse genererer utkast leverandørfakturaer."
 
 #. module: account
 #: view:account.bank.statement:0
 msgid "Close CashBox"
-msgstr ""
+msgstr "Lukk Cash Box"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -4028,11 +4187,15 @@ msgid ""
 "some non legal fields or you must unconfirm the journal entry first! \n"
 "%s"
 msgstr ""
+"Du kan ikke gjøre denne endringen på en bekreftet oppføring! Du kan bare "
+"endre noen ikke juridiske felt, eller du må bekrefte bilagsregistreringen "
+"først!\n"
+"% s"
 
 #. module: account
 #: field:res.company,paypal_account:0
 msgid "Paypal Account"
-msgstr ""
+msgstr "Paypal-konto"
 
 #. module: account
 #: field:account.invoice.report,uom_name:0
@@ -4048,19 +4211,19 @@ msgstr "Notat"
 #. module: account
 #: selection:account.financial.report,sign:0
 msgid "Reverse balance sign"
-msgstr ""
+msgstr "Omvendt balanse tegn"
 
 #. module: account
 #: view:account.analytic.account:0
 msgid "Overdue Account"
-msgstr ""
+msgstr "forfalt konto"
 
 #. module: account
 #: selection:account.account.type,report_type:0
 #: code:addons/account/account.py:184
 #, python-format
 msgid "Balance Sheet (Liability account)"
-msgstr ""
+msgstr "Balanse (Ansvar konto)"
 
 #. module: account
 #: help:account.invoice,date_invoice:0
@@ -4075,7 +4238,7 @@ msgstr "Avgiftslinjer"
 #. module: account
 #: field:account.tax,base_code_id:0
 msgid "Account Base Code"
-msgstr ""
+msgstr "Konto Base kode"
 
 #. module: account
 #: code:addons/account/account_analytic_line.py:93
@@ -4093,6 +4256,7 @@ msgstr "Innstillinger for kundekontering"
 #: help:res.company,paypal_account:0
 msgid "Paypal username (usually email) for receiving online payments."
 msgstr ""
+"Paypal brukernavn (vanligvis e-post) for å motta elektroniske betalinger."
 
 #. module: account
 #: selection:account.aged.trial.balance,target_move:0
@@ -4121,7 +4285,7 @@ msgstr "Alle posteringer"
 #: code:addons/account/account_bank_statement.py:367
 #, python-format
 msgid "Statement %s is confirmed, journal items are created."
-msgstr ""
+msgstr "Uttalelse% s er bekreftet, er tidsskriftet elementer opprettet."
 
 #. module: account
 #: field:report.aged.receivable,name:0
@@ -4131,7 +4295,7 @@ msgstr "Måned periode"
 #. module: account
 #: help:account.analytic.balance,empty_acc:0
 msgid "Check if you want to display Accounts with 0 balance too."
-msgstr ""
+msgstr "Sjekk om du vil vise regnskap med 0 balanse også."
 
 #. module: account
 #: view:account.tax:0
@@ -4147,7 +4311,7 @@ msgstr "Standard avgifter"
 #: code:addons/account/wizard/account_fiscalyear_close.py:41
 #, python-format
 msgid "End of Fiscal Year Entry"
-msgstr ""
+msgstr "Slutt av regnskapsåret oppføring."
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_periodical_processing
@@ -4157,7 +4321,7 @@ msgstr "Periodevis kjøring"
 #. module: account
 #: constraint:account.analytic.line:0
 msgid "You can not create analytic line on view account."
-msgstr ""
+msgstr "Du kan ikke opprette analytisk linje på visning konto."
 
 #. module: account
 #: help:account.move.line,state:0
@@ -4165,6 +4329,8 @@ msgid ""
 "When new move line is created the state will be 'Draft'.\n"
 "* When all the payments are done it will be in 'Valid' state."
 msgstr ""
+"Når den nye trekk linjen opprettes staten vil være \"kladd\".\n"
+"* Når alle betalingene er gjort vil det være i \"Gyldig\" tilstand."
 
 #. module: account
 #: field:account.journal,view_id:0
@@ -11471,3 +11637,6 @@ msgstr ""
 
 #~ msgid "Install your Chart of Accounts"
 #~ msgstr "Installer din kontoplan"
+
+#~ msgid "Open For Unreconciliation"
+#~ msgstr "Åpen for Unreconciliation"
diff --git a/addons/account/i18n/nl.po b/addons/account/i18n/nl.po
index df7a15b17a9..8f4302a2fcf 100644
--- a/addons/account/i18n/nl.po
+++ b/addons/account/i18n/nl.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 00:35+0000\n"
-"PO-Revision-Date: 2012-06-28 12:47+0000\n"
+"PO-Revision-Date: 2012-08-26 14:01+0000\n"
 "Last-Translator: Erwin <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: 2012-08-07 05:03+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:09+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account
 #: code:addons/account/account.py:1307
@@ -687,7 +687,7 @@ msgstr "VKB"
 #: view:account.period:0
 #: view:account.period.close:0
 msgid "Close Period"
-msgstr "Afsluit periode"
+msgstr "Periode afsluiten"
 
 #. module: account
 #: model:ir.model,name:account.model_account_common_partner_report
@@ -1282,7 +1282,7 @@ msgstr "Situatie"
 #. module: account
 #: help:account.move.line,move_id:0
 msgid "The move of this entry line."
-msgstr "De verplaatsing van deze boekingsregel"
+msgstr "De mutatie van deze boekingsregel"
 
 #. module: account
 #: code:addons/account/account_move_line.py:1302
@@ -2393,7 +2393,7 @@ msgstr ""
 #. module: account
 #: model:ir.model,name:account.model_account_move
 msgid "Account Entry"
-msgstr "Boeking"
+msgstr "Journaalpost"
 
 #. module: account
 #: constraint:res.partner:0
@@ -2510,7 +2510,7 @@ msgstr "Onafgeletterde boekingen"
 #: field:account.invoice.tax,base_code_id:0
 #: field:account.tax.template,base_code_id:0
 msgid "Base Code"
-msgstr "Basiscode"
+msgstr "Grondslag"
 
 #. module: account
 #: help:account.invoice.tax,sequence:0
@@ -2523,7 +2523,7 @@ msgstr "Bepaalt de volgorde bij afbeelden lijst van factuur belasting."
 #: field:account.tax.template,base_sign:0
 #: field:account.tax.template,ref_base_sign:0
 msgid "Base Code Sign"
-msgstr "Basiscode teken (+/-)"
+msgstr "Grondslag teken (+/-)"
 
 #. module: account
 #: view:account.vat.declaration:0
@@ -2751,7 +2751,7 @@ msgstr "Betaald/Afgeletterd"
 #: field:account.tax,ref_base_code_id:0
 #: field:account.tax.template,ref_base_code_id:0
 msgid "Refund Base Code"
-msgstr "Credit basiscode"
+msgstr "Credit grondslag"
 
 #. module: account
 #: selection:account.tax.template,applicable_type:0
@@ -2835,7 +2835,7 @@ msgstr ""
 #: model:ir.actions.server,name:account.ir_actions_server_action_wizard_multi_chart
 #: model:ir.ui.menu,name:account.menu_act_ir_actions_bleble
 msgid "New Company Financial Setting"
-msgstr "Nieuwe financiële regeling configureren voor dit bedrijf"
+msgstr "Nieuwe financiële administratie configureren voor dit bedrijf"
 
 #. module: account
 #: view:account.installer:0
@@ -2962,7 +2962,7 @@ msgstr ""
 #. module: account
 #: field:account.invoice.tax,base_amount:0
 msgid "Base Code Amount"
-msgstr "Basiscode bedrag"
+msgstr "Grondslag"
 
 #. module: account
 #: code:addons/account/account_invoice.py:392
@@ -3248,7 +3248,7 @@ msgstr "Grootboekrekening sjablonen"
 #. module: account
 #: model:ir.actions.act_window,name:account.action_wizard_multi_chart
 msgid "Set Your Accounting Options"
-msgstr ""
+msgstr "Stel uw financiële instellingen in"
 
 #. module: account
 #: view:report.account.sales:0
@@ -4284,7 +4284,7 @@ msgstr "Belastingregels"
 #. module: account
 #: field:account.tax,base_code_id:0
 msgid "Account Base Code"
-msgstr "Basiscode"
+msgstr "Grondslag"
 
 #. module: account
 #: code:addons/account/account_analytic_line.py:93
@@ -4538,7 +4538,7 @@ msgstr "Kostenplaats grootboek"
 #: model:ir.actions.act_window,name:account.action_model_form
 #: model:ir.ui.menu,name:account.menu_action_model_form
 msgid "Recurring Models"
-msgstr "Herhalende modellen"
+msgstr "Herhalende boekingen"
 
 #. module: account
 #: code:addons/account/account_move_line.py:1251
@@ -5132,7 +5132,7 @@ msgstr "Python Code (reverse)"
 #: 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 "Betalingsconditie"
+msgstr "Betalingscondities"
 
 #. module: account
 #: help:account.chart.template,complete_tax_set:0
@@ -5426,7 +5426,7 @@ msgstr "Communicatie"
 #. module: account
 #: model:ir.ui.menu,name:account.menu_analytic_accounting
 msgid "Analytic Accounting"
-msgstr "Kostenplaats dagboeken"
+msgstr "Kostenplaatsen"
 
 #. module: account
 #: field:account.partner.ledger,initial_balance:0
@@ -5827,7 +5827,7 @@ msgstr "Vrije referentie"
 #. module: account
 #: field:account.payment.term.line,value:0
 msgid "Valuation"
-msgstr "Raming"
+msgstr "Soort"
 
 #. module: account
 #: selection:account.aged.trial.balance,result_selection:0
@@ -6055,7 +6055,7 @@ msgstr "Naam dagboekperiode"
 #. module: account
 #: field:account.invoice.tax,factor_base:0
 msgid "Multipication factor for Base code"
-msgstr "Vermenigvuldigingsfactor voor basiscode"
+msgstr "Vermenigvuldigingsfactor voor grondslag"
 
 #. module: account
 #: code:addons/account/wizard/account_report_common.py:150
@@ -7273,7 +7273,7 @@ msgstr ""
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_report_tree_hierarchy
 msgid "Financial Reports Hierarchy"
-msgstr "Financieel rapporthistorie"
+msgstr "Financiele rapporten hiërarchie"
 
 #. module: account
 #: field:account.entries.report,product_uom_id:0
@@ -7548,7 +7548,7 @@ msgstr "Kas sluiten"
 #: view:account.journal:0
 #: field:res.partner.bank,journal_id:0
 msgid "Account Journal"
-msgstr "Rekeningdagboek"
+msgstr "Bankboek"
 
 #. module: account
 #: model:process.node,name:account.process_node_paidinvoice0
@@ -7980,7 +7980,7 @@ msgid ""
 "view to it."
 msgstr ""
 "Hier kunt u een bestaande dagboekweergave aanmaken of wijzigen. Een "
-"dagboekweergave bepaald de manier waarop uw boekingen kunt kanen in uw "
+"dagboekweergave bepaald de manier waarop uw boekingen kunt maken in uw "
 "dagboek. Selecteer de velden welke in uw dagboek moeten worden weergegeven "
 "en bepaal de volgorde van weergave. Vervolgens kunt u een nieuw dagboek "
 "aanmaken en deze koppelen aan de weergave."
@@ -8640,7 +8640,7 @@ msgstr "Bankmutatie afletteren"
 #: 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 "Categoriën grootboekrekeningen"
+msgstr "Grootboekrekeningen categorieën"
 
 #. module: account
 #: view:account.payment.term.line:0
@@ -8852,7 +8852,7 @@ msgstr "Onbetaalde facturen"
 #, python-format
 msgid "The payment term of supplier does not have a payment term line!"
 msgstr ""
-"De betalingsconditie van de leverancier heeft geen betalingconditieregels!"
+"De betalingsconditie van de leverancier heeft geen betalingsconditieregels!"
 
 #. module: account
 #: field:account.move.line.reconcile,debit:0
diff --git a/addons/account/i18n/nl_BE.po b/addons/account/i18n/nl_BE.po
index 3690eb805d7..dd401630e6b 100644
--- a/addons/account/i18n/nl_BE.po
+++ b/addons/account/i18n/nl_BE.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:09+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:15+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account
 #: view:account.invoice.report:0
diff --git a/addons/account/i18n/oc.po b/addons/account/i18n/oc.po
index a80c4a7ccf9..38cb05b05bd 100644
--- a/addons/account/i18n/oc.po
+++ b/addons/account/i18n/oc.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:06+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:12+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account
 #: view:account.invoice.report:0
diff --git a/addons/account/i18n/pl.po b/addons/account/i18n/pl.po
index f6932d78d03..e1d8d1bf914 100644
--- a/addons/account/i18n/pl.po
+++ b/addons/account/i18n/pl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:06+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:12+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account
 #: view:account.invoice.report:0
diff --git a/addons/account/i18n/pt.po b/addons/account/i18n/pt.po
index 0d6ce921b02..c0f6defa9bd 100644
--- a/addons/account/i18n/pt.po
+++ b/addons/account/i18n/pt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:06+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:12+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account
 #: view:account.invoice.report:0
diff --git a/addons/account/i18n/pt_BR.po b/addons/account/i18n/pt_BR.po
index 6dc0b2d6c1a..b550e029363 100644
--- a/addons/account/i18n/pt_BR.po
+++ b/addons/account/i18n/pt_BR.po
@@ -8,13 +8,14 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 00:35+0000\n"
 "PO-Revision-Date: 2012-07-28 14:05+0000\n"
-"Last-Translator: Fábio Martinelli <webmaster@guaru.net>\n"
+"Last-Translator: Fábio Martinelli - http://zupy.com.br "
+"<webmaster@guaru.net>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:09+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:14+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account
 #: view:account.invoice.report:0
diff --git a/addons/account/i18n/ro.po b/addons/account/i18n/ro.po
index 150c7f0e10d..58f0c523d93 100644
--- a/addons/account/i18n/ro.po
+++ b/addons/account/i18n/ro.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:06+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:12+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account
 #: view:account.invoice.report:0
diff --git a/addons/account/i18n/ru.po b/addons/account/i18n/ru.po
index 3554acbbb25..c194906a978 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-02-08 00:35+0000\n"
-"PO-Revision-Date: 2012-05-10 17:32+0000\n"
-"Last-Translator: Michael Otcheskih <otma@mail.ru>\n"
+"PO-Revision-Date: 2012-08-17 11:07+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: 2012-08-07 05:06+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:12+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -9872,7 +9872,7 @@ msgstr "Не определен счет доходов для ТМЦ: \"%s\" (i
 #. module: account
 #: constraint:account.move.line:0
 msgid "You can not create journal items on closed account."
-msgstr ""
+msgstr "Нельзя создать элемент журнала по закрытому счету ."
 
 #. module: account
 #: field:account.account,unrealized_gain_loss:0
diff --git a/addons/account/i18n/si.po b/addons/account/i18n/si.po
index 9c13d6f7ba0..7c57f9a75dd 100644
--- a/addons/account/i18n/si.po
+++ b/addons/account/i18n/si.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:07+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:13+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account
 #: view:account.invoice.report:0
diff --git a/addons/account/i18n/sk.po b/addons/account/i18n/sk.po
index 9774aba5fe2..5e52ea442d5 100644
--- a/addons/account/i18n/sk.po
+++ b/addons/account/i18n/sk.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:07+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:13+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account
 #: view:account.invoice.report:0
diff --git a/addons/account/i18n/sl.po b/addons/account/i18n/sl.po
index 77b2947143d..5ccefe2ceba 100644
--- a/addons/account/i18n/sl.po
+++ b/addons/account/i18n/sl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:07+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:13+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account
 #: view:account.invoice.report:0
diff --git a/addons/account/i18n/sq.po b/addons/account/i18n/sq.po
index 07c5a161ceb..4619e847e17 100644
--- a/addons/account/i18n/sq.po
+++ b/addons/account/i18n/sq.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:02+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:08+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account
 #: view:account.invoice.report:0
diff --git a/addons/account/i18n/sr.po b/addons/account/i18n/sr.po
index 11eff8ff773..fdf8c91d35b 100644
--- a/addons/account/i18n/sr.po
+++ b/addons/account/i18n/sr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:07+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:12+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account
 #: view:account.invoice.report:0
diff --git a/addons/account/i18n/sr@latin.po b/addons/account/i18n/sr@latin.po
index 79f57e9a213..e0803f8a337 100644
--- a/addons/account/i18n/sr@latin.po
+++ b/addons/account/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:10+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:16+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account
 #: view:account.invoice.report:0
diff --git a/addons/account/i18n/sv.po b/addons/account/i18n/sv.po
index cee9ca98236..852ccaaa2fd 100644
--- a/addons/account/i18n/sv.po
+++ b/addons/account/i18n/sv.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:07+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:13+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -1216,10 +1216,10 @@ msgid ""
 "purchase orders or receipts. This way, you can control the invoice from your "
 "supplier according to what you purchased or received."
 msgstr ""
-"Med Leverantörs Fakturor kan du ange och hantera fakturor som utfärdats av "
-"dina leverantörer. OpenERP kan även generera utkast på fakturor automatiskt "
-"från inköpsorder eller kvitton. På så sätt kan du styra fakturan från din "
-"leverantör beroende på vad du köpt eller fått."
+"Med Leverantörsfakturor kan du registrera och hantera fakturor som utfärdats "
+"av dina leverantörer. OpenERP kan även generera utkast på fakturor "
+"automatiskt från inköpsorder eller kvitton. På så sätt kan du styra fakturan "
+"från din leverantör beroende på vad du köpt eller tagit emot."
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_tax_code_template_form
diff --git a/addons/account/i18n/ta.po b/addons/account/i18n/ta.po
index 0ef4bb69732..144a7ad2661 100644
--- a/addons/account/i18n/ta.po
+++ b/addons/account/i18n/ta.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:07+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:13+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account
 #: view:account.invoice.report:0
diff --git a/addons/account/i18n/te.po b/addons/account/i18n/te.po
index adbf8bd6ad5..6e594752950 100644
--- a/addons/account/i18n/te.po
+++ b/addons/account/i18n/te.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:07+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:13+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account
 #: view:account.invoice.report:0
diff --git a/addons/account/i18n/th.po b/addons/account/i18n/th.po
index 7761fa6af85..727cd8a6a2f 100644
--- a/addons/account/i18n/th.po
+++ b/addons/account/i18n/th.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:08+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:13+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account
 #: view:account.invoice.report:0
diff --git a/addons/account/i18n/tlh.po b/addons/account/i18n/tlh.po
index 58419b316d1..2a6a0e4cbbe 100644
--- a/addons/account/i18n/tlh.po
+++ b/addons/account/i18n/tlh.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:08+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:13+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account
 #: view:account.invoice.report:0
diff --git a/addons/account/i18n/tr.po b/addons/account/i18n/tr.po
index 26bd0b01273..67ec4248e4b 100644
--- a/addons/account/i18n/tr.po
+++ b/addons/account/i18n/tr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:08+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:14+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -145,7 +145,7 @@ msgstr "Uzlaşma"
 #: field:account.move.line,ref:0
 #: field:account.subscription,ref:0
 msgid "Reference"
-msgstr "İlgi"
+msgstr "Kaynak"
 
 #. module: account
 #: view:account.open.closed.fiscalyear:0
@@ -182,7 +182,7 @@ msgstr "Hesap Kaynağı"
 #. module: account
 #: model:ir.actions.act_window,name:account.act_acc_analytic_acc_5_report_hr_timesheet_invoice_journal
 msgid "All Analytic Entries"
-msgstr "Bütün Analitik Girişler"
+msgstr "Bütün Analiz Girişleri"
 
 #. module: account
 #: field:accounting.report,label_filter:0
diff --git a/addons/account/i18n/ug.po b/addons/account/i18n/ug.po
index 61c3072260e..4e8e3437370 100644
--- a/addons/account/i18n/ug.po
+++ b/addons/account/i18n/ug.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:08+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:14+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account
 #: view:account.invoice.report:0
diff --git a/addons/account/i18n/uk.po b/addons/account/i18n/uk.po
index 6caed34bede..4926f8bac8f 100644
--- a/addons/account/i18n/uk.po
+++ b/addons/account/i18n/uk.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:08+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:14+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account
 #: view:account.invoice.report:0
diff --git a/addons/account/i18n/ur.po b/addons/account/i18n/ur.po
index 866617b7ae5..f16ef611b74 100644
--- a/addons/account/i18n/ur.po
+++ b/addons/account/i18n/ur.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:08+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:14+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account
 #: view:account.invoice.report:0
diff --git a/addons/account/i18n/vi.po b/addons/account/i18n/vi.po
index 3d7c8282a66..429dda0864a 100644
--- a/addons/account/i18n/vi.po
+++ b/addons/account/i18n/vi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:08+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:14+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account
 #: view:account.invoice.report:0
diff --git a/addons/account/i18n/zh_CN.po b/addons/account/i18n/zh_CN.po
index 46ebba61e4c..a51b7c7930a 100644
--- a/addons/account/i18n/zh_CN.po
+++ b/addons/account/i18n/zh_CN.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:10+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:15+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account
 #: view:account.invoice.report:0
diff --git a/addons/account/i18n/zh_HK.po b/addons/account/i18n/zh_HK.po
index fcf4d3d9a95..e15fadaee5a 100644
--- a/addons/account/i18n/zh_HK.po
+++ b/addons/account/i18n/zh_HK.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:08+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:14+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account
 #: view:account.invoice.report:0
diff --git a/addons/account/i18n/zh_TW.po b/addons/account/i18n/zh_TW.po
index f2f3d4279c0..628bd574dad 100644
--- a/addons/account/i18n/zh_TW.po
+++ b/addons/account/i18n/zh_TW.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 00:35+0000\n"
-"PO-Revision-Date: 2012-06-20 16:16+0000\n"
+"PO-Revision-Date: 2012-08-21 06:06+0000\n"
 "Last-Translator: Boyce Huang <boyce.huang@cenoq.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:09+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:15+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -42,7 +42,7 @@ msgstr "確定以下報表的顯示順序：」會計-報表-通用報表-稅-
 #. module: account
 #: view:account.move.reconcile:0
 msgid "Journal Entry Reconcile"
-msgstr "憑證核銷"
+msgstr "帳簿分錄調節"
 
 #. module: account
 #: view:account.account:0
@@ -70,7 +70,7 @@ msgstr "錯誤！此會計期間無效 "
 #. module: account
 #: field:account.analytic.line,currency_id:0
 msgid "Account currency"
-msgstr "幣種"
+msgstr "幣別"
 
 #. module: account
 #: view:account.tax:0
@@ -81,12 +81,12 @@ msgstr "子項定義"
 #: code:addons/account/account_bank_statement.py:302
 #, python-format
 msgid "Journal item \"%s\" is not valid."
-msgstr "憑證\"%s\"無效"
+msgstr "借貸項\"%s\"無效"
 
 #. module: account
 #: model:ir.model,name:account.model_report_aged_receivable
 msgid "Aged Receivable Till Today"
-msgstr "應收賬款賬齡"
+msgstr "應收帳款帳齡"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_invoiceimport0
@@ -108,14 +108,14 @@ msgstr "借方合計"
 msgid ""
 "If you unreconciliate transactions, you must also verify all the actions "
 "that are linked to those transactions because they will not be disabled"
-msgstr "如果您反核銷交易，您必須檢查所有與這交易有關的操作，因為他們不會被關閉。"
+msgstr "如果您有未調節交易，您必須檢查所有與此交易有關的操作，因為他們不會被關閉。"
 
 #. module: account
 #: constraint:account.journal:0
 msgid ""
 "Configuration error! The currency chosen should be shared by the default "
 "accounts too."
-msgstr "設置錯誤！所選幣種應與預設科目共享。"
+msgstr "設置錯誤！所選幣別應與默認科目共享。"
 
 #. module: account
 #: report:account.invoice:0
@@ -130,7 +130,7 @@ msgstr "來源"
 #: view:account.move.line.reconcile:0
 #: view:account.move.line.reconcile.writeoff:0
 msgid "Reconcile"
-msgstr "核銷"
+msgstr "調節"
 
 #. module: account
 #: field:account.bank.statement.line,ref:0
@@ -152,7 +152,7 @@ msgstr "選擇會計年度 "
 msgid ""
 "If the active field is set to False, it will allow you to hide the payment "
 "term without removing it."
-msgstr "如果設置為false，該付款條款將會被隱藏。"
+msgstr "如果設置為false，該付款條件將會被隱藏。"
 
 #. module: account
 #: code:addons/account/account_invoice.py:1428
@@ -164,18 +164,18 @@ msgstr "警告！"
 #: code:addons/account/account.py:3112
 #, python-format
 msgid "Miscellaneous Journal"
-msgstr "其它憑證簿"
+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 "源科目"
+msgstr "來源科目"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.act_acc_analytic_acc_5_report_hr_timesheet_invoice_journal
 msgid "All Analytic Entries"
-msgstr "所有輔助核算"
+msgstr "所有的輔助核算明細"
 
 #. module: account
 #: field:accounting.report,label_filter:0
@@ -186,7 +186,7 @@ msgstr "欄位標籤"
 #: code:addons/account/wizard/account_move_journal.py:95
 #, python-format
 msgid "Journal: %s"
-msgstr "賬簿：%s"
+msgstr "帳簿：%s"
 
 #. module: account
 #: help:account.analytic.journal,type:0
@@ -194,13 +194,13 @@ 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 "定義輔助核算賬簿的類型。當為同一類單據(如：發票) 建立輔助核算，OpenERP將看成一個相同類型。"
+msgstr "定義輔助核算帳簿的類型。當為同一類單據(如：發票) 建立輔助核算分錄，OpenERP將看成一個相同類型。"
 
 #. 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 "稅模板"
+msgstr "稅範本"
 
 #. module: account
 #: model:ir.model,name:account.model_account_tax
@@ -210,7 +210,7 @@ msgstr "account.tax"
 #. module: account
 #: model:ir.model,name:account.model_account_move_line_reconcile_select
 msgid "Move line reconcile select"
-msgstr "選擇憑證行核銷"
+msgstr "選擇移動的調節明細"
 
 #. module: account
 #: help:account.tax.code,notprintable:0
@@ -229,7 +229,7 @@ msgstr "發票'%s'已部分支付了%s%s ，總金額為：%s%s, 尚餘%s%s未
 #. module: account
 #: model:process.transition,note:account.process_transition_supplierentriesreconcile0
 msgid "Accounting entries are an input of the reconciliation."
-msgstr "核銷的第一個輸入是會計分錄"
+msgstr "調節的第一個輸入是科目分錄"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_management_belgian_reports
@@ -240,7 +240,7 @@ msgstr "比利時報表"
 #: code:addons/account/account_move_line.py:1200
 #, python-format
 msgid "You can not add/modify entries in a closed journal."
-msgstr "不能在已關閉的賬簿添加或修改分錄"
+msgstr "不能在已關閉的帳簿中添加或修改分錄"
 
 #. module: account
 #: help:account.account,user_type:0
@@ -248,7 +248,7 @@ 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 "科目類別用於生成合乎各國財稅規範的報表，設置財年結帳的規則以及生成未登帳憑證"
+msgstr "科目類別是資訊目的，用以產生國家別的法定報表，並建立年度結帳規則及產生開帳分錄"
 
 #. module: account
 #: report:account.overdue:0
@@ -275,7 +275,7 @@ msgstr "允許勾銷"
 #. module: account
 #: view:account.analytic.chart:0
 msgid "Select the Period for Analysis"
-msgstr "選擇輔助核算的會計期間"
+msgstr "選擇分析的會計期間"
 
 #. module: account
 #: view:account.move.line:0
@@ -286,7 +286,7 @@ msgstr "St."
 #: code:addons/account/account_invoice.py:551
 #, python-format
 msgid "Invoice line account company does not match with invoice company."
-msgstr "發票明細的科目公司與發票頭的公司不匹配。"
+msgstr "發票明細的科目公司與發票抬頭的公司不匹配。"
 
 #. module: account
 #: field:account.journal.column,field:0
@@ -310,12 +310,12 @@ msgid ""
 "Configuration/Financial Accounting/Accounts/Journals."
 msgstr ""
 "無法找到這公司的 %s 。\n"
-"您可以在選單：設置 / 財務會計 / 賬簿 裡建立。"
+"您可以在選單：設置 / 財務會計 / 帳簿 裡建立。"
 
 #. module: account
 #: model:ir.model,name:account.model_account_unreconcile
 msgid "Account Unreconcile"
-msgstr "科目反核銷"
+msgstr "科目未調節"
 
 #. module: account
 #: view:product.product:0
@@ -329,7 +329,7 @@ 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 "這裡可以設置你想要記錄顯示格式.如果保留自動,它將基於財務報告結構計算(自動計算欄位\"level\")"
+msgstr "這裡可以設置你想要記錄顯示格式.如果保留自動,它將基於財務報表結構計算(自動計算欄位\"level\")"
 
 #. module: account
 #: view:account.installer:0
@@ -343,7 +343,7 @@ msgstr "設置"
 #: selection:report.account.sales,month:0
 #: selection:report.account_type.sales,month:0
 msgid "June"
-msgstr "6"
+msgstr "6月"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_moves_bank
@@ -351,12 +351,12 @@ msgid ""
 "This view is used by accountants in order to record entries massively in "
 "OpenERP. Journal items are created by OpenERP if you use Bank Statements, "
 "Cash Registers, or Customer/Supplier payments."
-msgstr "本視圖供財務人員在系統中錄入單據。如果您在系統裡使用銀行對賬單，現金記錄或者客戶/供應商付款, 相應賬簿的明細會由系統自建立。"
+msgstr "本視圖供財務人員在系統中錄入單據。如果您在系統裡使用銀行對帳單，現金記錄或者客戶/供應商付款, 相應帳簿的分錄會由系統自建立。"
 
 #. module: account
 #: constraint:account.move.line:0
 msgid "You can not create journal items on an account of type view."
-msgstr "憑證上不能使用視圖類型的科目"
+msgstr "借貸項不能使用視圖類型的科目"
 
 #. module: account
 #: model:ir.model,name:account.model_account_tax_template
@@ -377,7 +377,7 @@ msgstr "建立日期"
 #. module: account
 #: selection:account.journal,type:0
 msgid "Purchase Refund"
-msgstr "採購紅字發票"
+msgstr "進貨退回"
 
 #. module: account
 #: selection:account.journal,type:0
@@ -387,7 +387,7 @@ msgstr "開啟/結束狀態"
 #. module: account
 #: help:account.journal,currency:0
 msgid "The currency used to enter statement"
-msgstr "使用的貨幣"
+msgstr "報表使用的幣別"
 
 #. module: account
 #: field:account.open.closed.fiscalyear,fyear_id:0
@@ -399,7 +399,7 @@ msgstr "打開會計年度"
 msgid ""
 "This field contains the informatin related to the numbering of the journal "
 "entries of this journal."
-msgstr "這欄位控制該賬簿裡明細的編號"
+msgstr "這欄位控制該帳簿裡分錄的編號"
 
 #. module: account
 #: field:account.journal,default_debit_account_id:0
@@ -427,7 +427,7 @@ msgstr "科目一覽表模板"
 #. module: account
 #: help:account.model.line,amount_currency:0
 msgid "The amount expressed in an optional other currency."
-msgstr "備選幣種所示金額"
+msgstr "其他幣別所示金額"
 
 #. module: account
 #: field:accounting.report,enable_filter:0
@@ -440,7 +440,7 @@ msgid ""
 "When journal period is created. The state is 'Draft'. If a report is printed "
 "it comes to 'Printed' state. When all transactions are done, it comes in "
 "'Done' state."
-msgstr "當賬簿建立時它的狀態為「草稿」。如果報表已打印狀態變為「已打印」。當所有交易已完成它的狀態為「完成」。"
+msgstr "當帳簿建立時它的狀態為「草稿」。如果報表已列印狀態變為「已列印」。當所有交易已完成它的狀態為「完成」。"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_tax_chart
@@ -450,6 +450,8 @@ msgid ""
 "amount of each area of the tax declaration for your country. It’s presented "
 "in a hierarchical structure, which can be modified to fit your needs."
 msgstr ""
+"稅的圖表反映的涉稅案件（或稅碼）的結構是一個樹視圖，並顯示當前的納稅情況。稅務圖表代表各個領域為貴國的納稅申報的金額。它在一個層次結構，它可以進行修改，以"
+"適應您的需求。"
 
 #. module: account
 #: view:account.analytic.line:0
@@ -479,7 +481,7 @@ msgstr ""
 #: model:ir.model,name:account.model_account_journal
 #: field:validate.account.move,journal_id:0
 msgid "Journal"
-msgstr "賬簿"
+msgstr "帳簿"
 
 #. module: account
 #: model:ir.model,name:account.model_account_invoice_confirm
@@ -494,7 +496,7 @@ msgstr "上級目標"
 #. module: account
 #: field:account.bank.statement,account_id:0
 msgid "Account used in this journal"
-msgstr "這賬簿上的科目"
+msgstr "這帳簿上使用的科目"
 
 #. module: account
 #: help:account.aged.trial.balance,chart_account_id:0
@@ -522,7 +524,7 @@ msgstr "公司名稱必須唯一！"
 #. module: account
 #: model:ir.model,name:account.model_account_invoice_refund
 msgid "Invoice Refund"
-msgstr "紅字發票"
+msgstr "折讓"
 
 #. module: account
 #: report:account.overdue:0
@@ -532,13 +534,13 @@ msgstr "Li."
 #. module: account
 #: field:account.automatic.reconcile,unreconciled:0
 msgid "Not reconciled transactions"
-msgstr "沒核銷的交易"
+msgstr "未調節的交易"
 
 #. module: account
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
 msgid "Counterpart"
-msgstr "對方"
+msgstr "副本"
 
 #. module: account
 #: view:account.fiscal.position:0
@@ -582,7 +584,7 @@ msgstr "3個月"
 msgid ""
 "If you unreconciliate transactions, you must also verify all the actions "
 "that are linked to those transactions because they will not be disable"
-msgstr "如果執行反核銷, 你必須檢驗鏈接該處理的所有操作. 因為他們不會被禁止."
+msgstr "如果執行未調節的交易, 你必須檢驗鏈接該處理的所有操作. 因為他們不會被禁止."
 
 #. module: account
 #: view:analytic.entries.report:0
@@ -608,7 +610,7 @@ msgstr "稅一覽表"
 #. module: account
 #: report:account.central.journal:0
 msgid "Centralized Journal"
-msgstr "匯總賬簿"
+msgstr "集中帳簿"
 
 #. module: account
 #: sql_constraint:account.sequence.fiscalyear:0
@@ -619,12 +621,12 @@ msgstr "序列號必須唯一"
 #: code:addons/account/account_move_line.py:1251
 #, python-format
 msgid "No period found or more than one period found for the given date."
-msgstr "根據輸入的憑證日期沒有找到期間或找到了多個期間"
+msgstr "根據輸入的日期沒有找到期間或找到了多個期間"
 
 #. module: account
 #: field:account.invoice.tax,tax_amount:0
 msgid "Tax Code Amount"
-msgstr "稅金額"
+msgstr "稅碼金額"
 
 #. module: account
 #: code:addons/account/account.py:3116
@@ -636,12 +638,12 @@ msgstr "SAJ"
 #: view:account.period:0
 #: view:account.period.close:0
 msgid "Close Period"
-msgstr "關閉會計期間"
+msgstr "關帳期間"
 
 #. module: account
 #: model:ir.model,name:account.model_account_common_partner_report
 msgid "Account Common Partner Report"
-msgstr "業務夥伴普通報表"
+msgstr "一般業務夥伴會計報表"
 
 #. module: account
 #: field:account.fiscalyear.close,period_id:0
@@ -651,26 +653,26 @@ msgstr "會計期間的啟用分錄"
 #. module: account
 #: model:ir.model,name:account.model_account_journal_period
 msgid "Journal Period"
-msgstr "賬簿的會計期間"
+msgstr "帳簿期間"
 
 #. module: account
 #: code:addons/account/account_move_line.py:750
 #: code:addons/account/account_move_line.py:803
 #, python-format
 msgid "To reconcile the entries company should be the same for all entries"
-msgstr "要核銷這些憑證，這些憑證所屬公司必須一致"
+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 "憑證日期不在所選期間內！可以修改憑證日期或在憑證簿上去掉這個檢查項。"
+msgstr "帳簿分錄日期不在所選期間內！你應該去修改帳簿日期或在帳簿上去掉這個檢查項。"
 
 #. module: account
 #: model:ir.model,name:account.model_account_report_general_ledger
 msgid "General Ledger Report"
-msgstr "總賬報表"
+msgstr "總帳報表"
 
 #. module: account
 #: view:account.invoice:0
@@ -680,22 +682,22 @@ msgstr "重開"
 #. module: account
 #: view:account.use.model:0
 msgid "Are you sure you want to create entries?"
-msgstr "你確定建立分錄?"
+msgstr "你確定要建立分錄?"
 
 #. module: account
 #: view:account.invoice:0
 msgid "Print Invoice"
-msgstr "打印發票"
+msgstr "列印發票"
 
 #. module: account
 #: field:account.partner.reconcile.process,today_reconciled:0
 msgid "Partners Reconciled Today"
-msgstr "今天的與業務夥伴核銷"
+msgstr "夥伴今天已調節"
 
 #. module: account
 #: view:report.hr.timesheet.invoice.journal:0
 msgid "Sale journal in this year"
-msgstr "本年度銷售憑證簿"
+msgstr "本年度銷售帳簿"
 
 #. module: account
 #: selection:account.financial.report,display_detail:0
@@ -711,14 +713,14 @@ msgstr "百分比"
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_charts
 msgid "Charts"
-msgstr "表"
+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 "輔助核算明細"
+msgstr "輔助核算項目明細"
 
 #. module: account
 #: field:account.invoice.refund,filter_refund:0
@@ -729,7 +731,7 @@ msgstr "退款方式"
 #: code:addons/account/wizard/account_change_currency.py:38
 #, python-format
 msgid "You can only change currency for Draft Invoice !"
-msgstr "你只能對發票草稿修改幣種"
+msgstr "你只能對發票草稿修改幣別"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_account_report
@@ -757,7 +759,7 @@ msgstr "類型"
 msgid ""
 "Taxes are missing!\n"
 "Click on compute button."
-msgstr "沒有選擇稅!"
+msgstr "沒有選擇稅!點擊計算按鈕."
 
 #. module: account
 #: model:ir.model,name:account.model_account_subscription_line
@@ -780,7 +782,7 @@ msgstr "供應商發票和退款"
 #: view:account.unreconcile.reconcile:0
 #: model:ir.model,name:account.model_account_move_line_unreconcile_select
 msgid "Unreconciliation"
-msgstr "反核銷"
+msgstr "未調節"
 
 #. module: account
 #: view:account.payment.term.line:0
@@ -790,12 +792,12 @@ msgstr "於第14個工作日支付總款2%，餘款至30個工作日所在月之
 #. module: account
 #: model:ir.model,name:account.model_account_analytic_journal_report
 msgid "Account Analytic Journal"
-msgstr "輔助核算賬簿"
+msgstr "輔助核算帳簿"
 
 #. module: account
 #: model:ir.model,name:account.model_account_automatic_reconcile
 msgid "Automatic Reconcile"
-msgstr "自動核銷"
+msgstr "自動調節"
 
 #. module: account
 #: report:account.analytic.account.quantity_cost_ledger:0
@@ -810,7 +812,7 @@ msgid ""
 "or Loss you'd realized if those transactions were ended today. Only for "
 "accounts having a secondary currency set."
 msgstr ""
-"多幣種交易時，可能會因為匯率的變動而引起金額的上下浮動。本選單項讓你能瞭解如果交易於本日結算所引起的匯差損益。只對設置了第二幣種的科目有效。"
+"多幣種交易時，可能會因為匯率的變動而引起金額的上下浮動。本選單項讓你能瞭解如果交易於本日結算所引起的匯差損益。只對設置了第二幣別的科目有效。"
 
 #. module: account
 #: selection:account.entries.report,month:0
@@ -819,7 +821,7 @@ msgstr ""
 #: selection:report.account.sales,month:0
 #: selection:report.account_type.sales,month:0
 msgid "September"
-msgstr "九月"
+msgstr "9月"
 
 #. module: account
 #: selection:account.subscription,period_type:0
@@ -838,7 +840,7 @@ msgstr "如果選中，在新的科目表中預設將不包含此項。"
 msgid ""
 "Can not %s invoice which is already reconciled, invoice should be "
 "unreconciled first. You can only Refund this invoice"
-msgstr "該發票 %s 已核銷，除非先將其反核銷。目前只能對該發票做退貨處理。"
+msgstr "該發票 %s 已調節，除非先將其改成未調節。目前只能對該發票做退貨處理。"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_subscription_form_new
@@ -853,7 +855,7 @@ msgstr "計算"
 #. module: account
 #: selection:account.invoice.refund,filter_refund:0
 msgid "Cancel: refund invoice and reconcile"
-msgstr "取消：發票退款並核銷"
+msgstr "取消：發票退款並調節"
 
 #. module: account
 #: field:account.cashbox.line,pieces:0
@@ -889,7 +891,7 @@ msgstr "到期"
 msgid ""
 "You cannot validate this journal entry because account \"%s\" does not "
 "belong to chart of accounts \"%s\"!"
-msgstr "你不能覆核這張會計憑證，因為會計科目 \"%s\"不屬於科目表 \"%s\"！"
+msgstr "你不能覆核這筆分錄，因為會計科目 \"%s\"不屬於科目表 \"%s\"！"
 
 #. module: account
 #: code:addons/account/account_move_line.py:835
@@ -931,27 +933,27 @@ msgstr "負債"
 #. module: account
 #: view:account.entries.report:0
 msgid "Extended Filters..."
-msgstr "增加篩選條件"
+msgstr "增加篩選條件..."
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_account_central_journal
 msgid "Centralizing Journal"
-msgstr "匯總賬簿"
+msgstr "集中帳簿"
 
 #. module: account
 #: selection:account.journal,type:0
 msgid "Sale Refund"
-msgstr "銷售紅字發票"
+msgstr "銷貨退回"
 
 #. module: account
 #: model:process.node,note:account.process_node_accountingstatemententries0
 msgid "Bank statement"
-msgstr "銀行對賬單"
+msgstr "銀行對帳單"
 
 #. module: account
 #: field:account.analytic.line,move_id:0
 msgid "Move Line"
-msgstr "憑證行"
+msgstr "移動明細"
 
 #. module: account
 #: help:account.move.line,tax_amount:0
@@ -965,7 +967,7 @@ msgstr "如果這稅科目是一個稅編碼科目，這欄位金額要徵稅。
 #: code:addons/account/account.py:2596
 #, python-format
 msgid "I can not locate a parent code for the template account!"
-msgstr "無法為該科目模板定位其父科目"
+msgstr "無法為該科目模板定位其上層科目"
 
 #. module: account
 #: view:account.analytic.line:0
@@ -975,7 +977,7 @@ msgstr "採購"
 #. module: account
 #: field:account.model,lines_id:0
 msgid "Model Entries"
-msgstr "模型項"
+msgstr "模型分錄"
 
 #. module: account
 #: field:account.account,code:0
@@ -1002,7 +1004,7 @@ msgstr "編碼"
 #: code:addons/account/account_move_line.py:173
 #, python-format
 msgid "No Analytic Journal !"
-msgstr "沒輔助核算賬簿！"
+msgstr "沒有輔助核算帳簿 !"
 
 #. module: account
 #: report:account.partner.balance:0
@@ -1022,7 +1024,7 @@ msgstr "科目名稱"
 #: field:account.chart.template,property_reserve_and_surplus_account:0
 #: field:res.company,property_reserve_and_surplus_account:0
 msgid "Reserve and Profit/Loss Account"
-msgstr "所有者權益類科目"
+msgstr "業主權益類科目"
 
 #. module: account
 #: field:report.account.receivable,name:0
@@ -1040,7 +1042,7 @@ msgstr "橫向模式"
 msgid ""
 "You cannot change the type of account from '%s' to '%s' type as it contains "
 "journal items!"
-msgstr "無法將科目類別從 '%s' 改變為 '%s' ，因為已有憑證使用該科目"
+msgstr "無法將科目類別從 '%s' 改變為 '%s' ，因為已有借貸項使用該科目"
 
 #. module: account
 #: field:account.report.general.ledger,sortby:0
@@ -1093,17 +1095,17 @@ msgstr "-"
 #: view:account.analytic.account:0
 #: model:res.groups,name:account.group_account_manager
 msgid "Manager"
-msgstr "經理"
+msgstr "管理者"
 
 #. module: account
 #: view:account.subscription.generate:0
 msgid "Generate Entries before:"
-msgstr "生成分錄前："
+msgstr "產生分錄前："
 
 #. module: account
 #: view:account.move.line:0
 msgid "Unbalanced Journal Items"
-msgstr "未平財務憑證"
+msgstr "未平衡借貸項"
 
 #. module: account
 #: model:account.account.type,name:account.data_account_type_bank
@@ -1128,7 +1130,7 @@ msgstr "確認報表"
 msgid ""
 "Total amount (in Secondary currency) for transactions held in secondary "
 "currency for this account."
-msgstr "此科目上以第二幣種發生交易的合計金額（第二幣種）"
+msgstr "此科目上以第二幣別發生交易的合計金額（第二幣種）"
 
 #. module: account
 #: field:account.fiscal.position.tax,tax_dest_id:0
@@ -1144,7 +1146,7 @@ msgstr "貸方匯總"
 #. module: account
 #: view:report.account_type.sales:0
 msgid "All Months Sales by type"
-msgstr "以銷售類別劃分的銷售匯總"
+msgstr "所有月份的銷售類型"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_invoice_tree2
@@ -1159,7 +1161,7 @@ msgstr "供應商發票，您可以輸入和管理你的供應商發出的發票
 #: 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 "稅編碼模板"
+msgstr "稅編碼範本"
 
 #. module: account
 #: view:account.invoice.cancel:0
@@ -1205,7 +1207,7 @@ msgstr "分錄明細的變動"
 msgid ""
 "You can not use this general account in this journal, check the tab 'Entry "
 "Controls' on the related journal !"
-msgstr "在本憑證簿中不能使用該總賬科目，請檢查相關憑證簿的「科目控制」頁"
+msgstr "在本帳簿中不能使用該總帳科目，請檢查相關帳簿的「分錄控制」頁"
 
 #. module: account
 #: field:account.move.line.reconcile,trans_nbr:0
@@ -1224,7 +1226,7 @@ msgstr "分錄標籤"
 #: code:addons/account/account.py:1129
 #, python-format
 msgid "You can not modify/delete a journal with entries for this period !"
-msgstr "您不能修改/刪除這賬簿和在此會計期間的分錄！"
+msgstr "您不能修改/刪除在此期間的帳簿和分錄！"
 
 #. module: account
 #: help:account.invoice,origin:0
@@ -1303,7 +1305,7 @@ msgstr "級別"
 #: model:ir.ui.menu,name:account.menu_tax_report
 #: model:ir.ui.menu,name:account.next_id_27
 msgid "Taxes"
-msgstr "稅"
+msgstr "稅別"
 
 #. module: account
 #: code:addons/account/wizard/account_financial_report.py:69
@@ -1320,19 +1322,19 @@ msgstr "損益類"
 #. module: account
 #: model:ir.model,name:account.model_account_account_template
 msgid "Templates for Accounts"
-msgstr "科目模板"
+msgstr "科目範本"
 
 #. module: account
 #: view:account.tax.code.template:0
 msgid "Search tax template"
-msgstr "搜索稅模板"
+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 "核銷"
+msgstr "調節分錄"
 
 #. module: account
 #: model:ir.actions.report.xml,name:account.account_overdue
@@ -1354,7 +1356,7 @@ msgstr "重置為草稿"
 #. module: account
 #: view:wizard.multi.charts.accounts:0
 msgid "Bank Information"
-msgstr "銀行信息"
+msgstr "銀行資訊"
 
 #. module: account
 #: view:account.aged.trial.balance:0
@@ -1365,7 +1367,7 @@ msgstr "報表選項"
 #. module: account
 #: model:ir.model,name:account.model_account_entries_report
 msgid "Journal Items Analysis"
-msgstr "賬簿明細分析"
+msgstr "借貸項分析"
 
 #. module: account
 #: model:ir.ui.menu,name:account.next_id_22
@@ -1379,7 +1381,7 @@ msgstr "業務夥伴"
 #: model:process.node,name:account.process_node_bankstatement0
 #: model:process.node,name:account.process_node_supplierbankstatement0
 msgid "Bank Statement"
-msgstr "銀行對賬單"
+msgstr "銀行對帳單"
 
 #. module: account
 #: field:res.partner,property_account_receivable:0
@@ -1389,7 +1391,7 @@ msgstr "應收科目"
 #. module: account
 #: model:ir.actions.report.xml,name:account.account_central_journal
 msgid "Central Journal"
-msgstr "匯總賬簿"
+msgstr "集中帳簿"
 
 #. module: account
 #: selection:account.balance.report,display_account:0
@@ -1397,12 +1399,12 @@ msgstr "匯總賬簿"
 #: 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"
+msgstr "餘額不能為0"
 
 #. module: account
 #: view:account.tax:0
 msgid "Search Taxes"
-msgstr "搜索稅種"
+msgstr "搜索稅別"
 
 #. module: account
 #: model:ir.model,name:account.model_account_analytic_cost_ledger
@@ -1417,7 +1419,7 @@ msgstr "建立分錄"
 #. module: account
 #: field:account.entries.report,nbr:0
 msgid "# of Items"
-msgstr "# 明細"
+msgstr "明細數"
 
 #. module: account
 #: field:account.automatic.reconcile,max_amount:0
@@ -1453,7 +1455,7 @@ msgid ""
 "debit or a credit transaction. OpenERP automatically creates one journal "
 "entry per accounting document: invoice, refund, supplier payment, bank "
 "statements, etc."
-msgstr "賬簿的分錄由多個明細組成，每一分錄含有借方和貸方。 系統會自動建立每個財務單據的賬簿分錄：發票，紅字發票，供應商付款，銀行對賬單等。"
+msgstr "帳簿的分錄由多個借貸項組成，每一分錄含有借方和貸方。 系統會自動建立每個財務單據的帳簿分錄：發票，折讓單，供應商付款，銀行對帳單等。"
 
 #. module: account
 #: view:account.entries.report:0
@@ -1470,13 +1472,13 @@ msgstr "如不勾選該項，可以隱藏而不刪除此應稅條件"
 #. module: account
 #: model:ir.model,name:account.model_temp_range
 msgid "A Temporary table used for Dashboard view"
-msgstr "用於儀表盤視圖的臨時表"
+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 "供應商紅字發票"
+msgstr "供應商折讓"
 
 #. module: account
 #: selection:account.account,type:0
@@ -1497,12 +1499,12 @@ msgstr "定期分錄"
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_template
 msgid "Template for Fiscal Position"
-msgstr "財務結構模板"
+msgstr "財務結構範本"
 
 #. module: account
 #: field:account.automatic.reconcile,reconciled:0
 msgid "Reconciled transactions"
-msgstr "已核銷處理"
+msgstr "已調節交易"
 
 #. module: account
 #: field:account.journal.view,columns_id:0
@@ -1517,12 +1519,12 @@ msgstr "."
 #. module: account
 #: view:account.analytic.cost.ledger.journal.report:0
 msgid "and Journals"
-msgstr "和賬簿"
+msgstr "和帳簿"
 
 #. module: account
 #: field:account.journal,groups_id:0
 msgid "Groups"
-msgstr "組"
+msgstr "群組"
 
 #. module: account
 #: field:account.invoice,amount_untaxed:0
@@ -1533,23 +1535,23 @@ msgstr "未完稅"
 #. module: account
 #: view:account.partner.reconcile.process:0
 msgid "Go to Next Partner"
-msgstr ""
+msgstr "移至下一個業務夥伴"
 
 #. module: account
 #: view:account.bank.statement:0
 msgid "Search Bank Statements"
-msgstr "搜索銀行對賬單"
+msgstr "搜索銀行對帳單"
 
 #. module: account
 #: view:account.move.line:0
 msgid "Unposted Journal Items"
-msgstr "未登帳憑證項"
+msgstr "未登借貸項"
 
 #. module: account
 #: view:account.chart.template:0
 #: field:account.chart.template,property_account_payable:0
 msgid "Payable Account"
-msgstr "應付款科目"
+msgstr "應付帳款科目"
 
 #. module: account
 #: field:account.tax,account_paid_id:0
@@ -1561,7 +1563,7 @@ msgstr "退稅科目"
 #: view:account.bank.statement:0
 #: field:account.bank.statement,line_ids:0
 msgid "Statement lines"
-msgstr "銀行對賬單明細"
+msgstr "銀行對帳單明細"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_bank_statement_tree
@@ -1572,7 +1574,7 @@ msgid ""
 "and the closing balance is to be found on your statement. When you are in "
 "the Payment column of a line, you can press F1 to open the reconciliation "
 "form."
-msgstr "銀行對賬單是在一個銀行帳戶在給定時間內的所有業務，它將自動計算期初餘額和期末結餘。當在一行的付款欄可以按F1可以打開對賬窗口。"
+msgstr "銀行對帳單是在一個銀行帳戶在給定時間內的所有業務，它將自動計算期初餘額和期末結餘。當在一行的付款欄可以按F1可以打開對帳窗口。"
 
 #. module: account
 #: report:account.analytic.account.cost_ledger:0
@@ -1589,7 +1591,7 @@ msgstr "一般科目"
 #. module: account
 #: field:res.partner,debit_limit:0
 msgid "Payable Limit"
-msgstr "應付款限額"
+msgstr "應付帳款限額"
 
 #. module: account
 #: report:account.invoice:0
@@ -1615,19 +1617,19 @@ msgstr "會計年度序列"
 #. module: account
 #: field:wizard.multi.charts.accounts,seq_journal:0
 msgid "Separated Journal Sequences"
-msgstr "分散的賬簿序列"
+msgstr "分散的帳簿序列"
 
 #. module: account
 #: view:account.invoice:0
 msgid "Responsible"
-msgstr "負責人"
+msgstr "Responsible"
 
 #. module: account
 #: view:account.invoice.refund:0
 msgid ""
 "Cancel Invoice: Creates the refund invoice, validate and reconcile it to "
 "cancel the current invoice."
-msgstr "取消發票：建立紅字發票，使其生效和核對它並取消當前的發票"
+msgstr "取消發票：建立折讓單，使其生效和核對它並取消當前的折讓單"
 
 #. module: account
 #: model:ir.ui.menu,name:account.periodical_processing_invoicing
@@ -1643,7 +1645,7 @@ msgstr "未確定業務夥伴"
 #. module: account
 #: field:account.tax.code,sum:0
 msgid "Year Sum"
-msgstr "年合計"
+msgstr "年度合計"
 
 #. module: account
 #: code:addons/account/account_invoice.py:1429
@@ -1655,7 +1657,7 @@ msgstr "您選擇的計量單位不適合本產品。"
 #. module: account
 #: view:account.change.currency:0
 msgid "This wizard will change the currency of the invoice"
-msgstr "該嚮導將改變發票的幣種"
+msgstr "該精靈將改變發票的幣別"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_chart
@@ -1668,7 +1670,7 @@ msgstr "顯示您公司每個會計年度的科目表和過濾的會計週期。
 #. module: account
 #: view:account.analytic.account:0
 msgid "Pending Accounts"
-msgstr "Pending Accounts"
+msgstr "暫存科目"
 
 #. module: account
 #: view:account.tax.template:0
@@ -1705,13 +1707,13 @@ msgstr "所有業務夥伴"
 #. module: account
 #: view:account.analytic.chart:0
 msgid "Analytic Account Charts"
-msgstr "輔助核算項一覽表"
+msgstr "輔助核算項目一覽表"
 
 #. module: account
 #: view:account.analytic.line:0
 #: view:analytic.entries.report:0
 msgid "My Entries"
-msgstr "我的工作區"
+msgstr "我的分錄"
 
 #. module: account
 #: report:account.overdue:0
@@ -1722,7 +1724,7 @@ msgstr "客戶關聯:"
 #: code:addons/account/account_cash_statement.py:292
 #, python-format
 msgid "User %s does not have rights to access %s journal !"
-msgstr "用戶 %s 沒有權限訪問 %s！"
+msgstr "使用者 %s 沒有權限存取 %s！"
 
 #. module: account
 #: help:account.period,special:0
@@ -1732,7 +1734,7 @@ msgstr "這會計期間可以重疊"
 #. module: account
 #: model:process.node,name:account.process_node_draftstatement0
 msgid "Draft statement"
-msgstr "銀行單據草稿"
+msgstr "銀行對帳單草稿"
 
 #. module: account
 #: view:account.tax:0
@@ -1755,7 +1757,7 @@ msgstr "錯誤！"
 #. module: account
 #: sql_constraint:account.move.line:0
 msgid "Wrong credit or debit value in accounting entry !"
-msgstr "錯誤的出納會計分錄"
+msgstr "會計分錄中包含錯誤的借貸值！"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -1777,7 +1779,7 @@ msgstr "設置會計年度"
 #. module: account
 #: model:ir.actions.act_window,name:account.action_project_account_analytic_line_form
 msgid "Entries By Line"
-msgstr "按明細"
+msgstr "分錄明細"
 
 #. module: account
 #: field:account.vat.declaration,based_on:0
@@ -1788,7 +1790,7 @@ msgstr "基於"
 #: field:account.invoice,move_id:0
 #: field:account.invoice,move_name:0
 msgid "Journal Entry"
-msgstr "會計憑證"
+msgstr "帳簿分錄"
 
 #. module: account
 #: view:account.tax:0
@@ -1817,18 +1819,18 @@ msgstr "錯誤！您不能建立遞歸公司."
 #. module: account
 #: model:ir.actions.report.xml,name:account.account_journal_sale_purchase
 msgid "Sale/Purchase Journal"
-msgstr "銷售/採購 日記帳"
+msgstr "銷售/採購 帳簿"
 
 #. module: account
 #: view:account.analytic.account:0
 msgid "Analytic account"
-msgstr "輔助核算項"
+msgstr "輔助核算項目"
 
 #. module: account
 #: code:addons/account/account_bank_statement.py:339
 #, python-format
 msgid "Please verify that an account is defined in the journal."
-msgstr "請檢查在賬簿中已定義科目。"
+msgstr "請確認在帳簿中的科目已定義。"
 
 #. module: account
 #: selection:account.entries.report,move_line_state:0
@@ -1840,12 +1842,12 @@ msgstr "生效"
 #: 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 "打印賬簿"
+msgstr "列印帳簿"
 
 #. module: account
 #: model:ir.model,name:account.model_product_category
 msgid "Product Category"
-msgstr "產品類別"
+msgstr "產品分類"
 
 #. module: account
 #: selection:account.account.type,report_type:0
@@ -1864,13 +1866,13 @@ msgstr "該科目用於記錄損益金額（如果為收益：金額增加，虧
 #: model:process.node,note:account.process_node_reconciliation0
 #: model:process.node,note:account.process_node_supplierreconciliation0
 msgid "Comparison between accounting and payment entries"
-msgstr "比較會計和支付項"
+msgstr "比較科目和應付之間的分錄"
 
 #. module: account
 #: view:account.tax:0
 #: view:account.tax.template:0
 msgid "Tax Definition"
-msgstr "稅定義"
+msgstr "稅的定義"
 
 #. module: account
 #: help:wizard.multi.charts.accounts,seq_journal:0
@@ -1885,20 +1887,20 @@ msgstr "勾選此項, 如果您想每個新建的分錄使用不同的序列，
 msgid ""
 "It adds the currency column if the currency is different then the company "
 "currency"
-msgstr "此選項增加一個幣種，如果公司使用不用的貨幣。"
+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 "如果設為True當分錄的日期不在會計週期內，將不接受這分錄"
+msgstr "如果設為真實當分錄的日期不在會計週期內，將不接受這分錄"
 
 #. module: account
 #: code:addons/account/account_invoice.py:73
 #, python-format
 msgid "You must define an analytic journal of type '%s'!"
-msgstr "你必須定義一個類型為 '%s'的成本憑證簿！"
+msgstr "你必須定義一個類型為 '%s'的輔助核算帳簿！"
 
 #. module: account
 #: field:account.installer,config_logo:0
@@ -1912,12 +1914,12 @@ 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 "憑證上的科目要求輸入一個外幣。你可以在科目設置中去掉這個外幣或在憑證簿設置上選擇一個支持多幣種的輸入界面。"
+msgstr "分錄上的科目要求輸入一個外幣。你可以在科目設置中去掉這個外幣或在帳簿設置選擇一個支持多幣別的輸入界面。"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_financial_report_tree
 msgid "Makes a generic system to draw financial reports easily."
-msgstr "使生成財務報表更容易"
+msgstr "做一個通用的系統，來使繪製財務報表能更輕鬆"
 
 #. module: account
 #: view:account.invoice:0
@@ -1935,7 +1937,7 @@ msgstr "如果此欄位設為False，您可以隱藏而不刪除這稅。"
 #. module: account
 #: view:account.analytic.line:0
 msgid "Analytic Journal Items related to a sale journal."
-msgstr "與某銷售憑證簿關聯的分析憑證"
+msgstr "關聯到銷售帳簿的輔助核算項目明細。"
 
 #. module: account
 #: selection:account.financial.report,style_overwrite:0
@@ -1963,7 +1965,7 @@ msgstr "增值稅申報"
 #. module: account
 #: field:account.move.reconcile,line_partial_ids:0
 msgid "Partial Entry lines"
-msgstr "部分分錄行"
+msgstr "部分分錄明細"
 
 #. module: account
 #: view:account.fiscalyear:0
@@ -1980,12 +1982,12 @@ msgstr "打開分錄"
 #. module: account
 #: field:account.automatic.reconcile,account_ids:0
 msgid "Accounts to Reconcile"
-msgstr "科目核銷"
+msgstr "科目調節"
 
 #. module: account
 #: model:process.transition,note:account.process_transition_filestatement0
 msgid "Import of the statement in the system from an electronic file"
-msgstr "從電子文件中導入"
+msgstr "從電子文件導入系統中的聲明"
 
 #. module: account
 #: model:process.node,name:account.process_node_importinvoice0
@@ -1999,7 +2001,7 @@ msgstr "導入發票"
 #: selection:report.account.sales,month:0
 #: selection:report.account_type.sales,month:0
 msgid "January"
-msgstr "1"
+msgstr "1月"
 
 #. module: account
 #: view:account.journal:0
@@ -2027,7 +2029,7 @@ msgstr "無效會計期間！會計期間重複或者會計期間不在這會計
 #: code:addons/account/account_bank_statement.py:357
 #, python-format
 msgid "You have to assign an analytic journal on the '%s' journal!"
-msgstr "必須分配一個輔助核算賬簿給\"%s\"賬簿"
+msgstr "必須分配一個輔助核算輔助核算帳簿給\"%s\"帳簿"
 
 #. module: account
 #: selection:account.invoice,state:0
@@ -2043,7 +2045,7 @@ msgstr "形式發票"
 msgid ""
 "There is no default default debit account defined \n"
 "on journal \"%s\""
-msgstr "在 \"%s\" 沒設定預設借方的科目"
+msgstr "在 \"%s\" 帳簿沒設定預設借方的科目"
 
 #. module: account
 #: help:account.account.template,type:0
@@ -2059,7 +2061,7 @@ msgstr "這類型用來區分特殊結果：視圖不能有分錄，多公司合
 #. module: account
 #: view:account.chart.template:0
 msgid "Search Chart of Account Templates"
-msgstr "搜索科目一覽表模板"
+msgstr "搜索科目一覽表範本"
 
 #. module: account
 #: code:addons/account/account_move_line.py:1277
@@ -2070,7 +2072,7 @@ msgid ""
 "sequence manually for this piece."
 msgstr ""
 "無法為此項建立自動序號!\n"
-"請為該憑證簿配置自動序號。"
+"請為該帳簿配置自動序號。"
 
 #. module: account
 #: code:addons/account/account.py:787
@@ -2078,7 +2080,7 @@ msgstr ""
 msgid ""
 "You can not modify the company of this journal as its related record exist "
 "in journal items"
-msgstr "不能修改該憑證簿的公司設置，因為已存在憑證記錄"
+msgstr "不能修改該帳簿的公司設置，因為已存在關聯的借貸項"
 
 #. module: account
 #: report:account.invoice:0
@@ -2135,7 +2137,7 @@ msgstr "收益科目"
 #: code:addons/account/account_invoice.py:370
 #, python-format
 msgid "There is no Accounting Journal of type Sale/Purchase defined!"
-msgstr "沒定義銷售/採購 的賬簿!"
+msgstr "會計科目尚未定義銷售/採購的類型!"
 
 #. module: account
 #: constraint:res.partner.bank:0
@@ -2167,7 +2169,7 @@ msgstr "# 產品數量 "
 #. module: account
 #: model:ir.model,name:account.model_product_template
 msgid "Product Template"
-msgstr "產品模板"
+msgstr "產品範本"
 
 #. module: account
 #: report:account.account.balance:0
@@ -2223,7 +2225,7 @@ msgstr "會計年度"
 #: help:accounting.report,fiscalyear_id:0
 #: help:accounting.report,fiscalyear_id_cmp:0
 msgid "Keep empty for all open fiscal year"
-msgstr "留空為所有開啟的會計年度"
+msgstr "所有已開啟的會計年度都保持空白"
 
 #. module: account
 #: field:account.invoice.report,account_line_id:0
@@ -2236,7 +2238,7 @@ msgstr "發票明細"
 msgid ""
 "There is no default default credit account defined \n"
 "on journal \"%s\""
-msgstr "\"%s\"上沒有定義預設貸方科目"
+msgstr "\"%s\"帳簿尚未定義預設的貸方科目"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_review_financial_journals_installer
@@ -2244,12 +2246,12 @@ msgid ""
 "Setup your accounting journals. For bank accounts, it's better to use the "
 "'Setup Your Bank Accounts' tool that will automatically create the accounts "
 "and journals for you."
-msgstr "設置憑證簿。最好使用 '設置銀行科目' 來自動建立和設置銀行科目。"
+msgstr "設置你的會計帳簿。最好使用 '設置銀行科目' 來自動建立和設置銀行科目。"
 
 #. module: account
 #: model:ir.model,name:account.model_account_move
 msgid "Account Entry"
-msgstr "憑證"
+msgstr "會計分錄"
 
 #. module: account
 #: constraint:res.partner:0
@@ -2267,7 +2269,7 @@ msgstr "主序列"
 msgid ""
 "In order to delete a bank statement, you must first cancel it to delete "
 "related journal items."
-msgstr "要刪除銀行對帳單，必須先取消並刪除相關憑證項"
+msgstr "要刪除銀行對帳單，必須先取消並刪除相關借貸項"
 
 #. module: account
 #: field:account.invoice,payment_term:0
@@ -2279,7 +2281,7 @@ msgstr "要刪除銀行對帳單，必須先取消並刪除相關憑證項"
 #: model:ir.model,name:account.model_account_payment_term
 #: field:res.partner,property_payment_term:0
 msgid "Payment Term"
-msgstr "付款條款"
+msgstr "付款條件"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_fiscal_position_form
@@ -2291,7 +2293,7 @@ msgstr "財務結構"
 #: constraint:account.account:0
 #: constraint:account.tax.code:0
 msgid "Error ! You can not create recursive accounts."
-msgstr "錯誤!您不能建立遞歸的科目"
+msgstr "錯誤!您不能建立循環的科目"
 
 #. module: account
 #: field:account.period.close,sure:0
@@ -2316,7 +2318,7 @@ msgstr "篩選"
 #: selection:report.invoice.created,state:0
 #, python-format
 msgid "Open"
-msgstr "打開"
+msgstr "開啟"
 
 #. module: account
 #: model:process.node,note:account.process_node_draftinvoices0
@@ -2327,13 +2329,13 @@ msgstr "草稿狀態的發票"
 #. module: account
 #: view:account.partner.reconcile.process:0
 msgid "Partner Reconciliation"
-msgstr "往來業務核銷"
+msgstr "往來業務調節"
 
 #. module: account
 #: field:account.tax,tax_code_id:0
 #: view:account.tax.code:0
 msgid "Account Tax Code"
-msgstr "稅編碼"
+msgstr "會計稅編碼"
 
 #. module: account
 #: code:addons/account/account_invoice.py:572
@@ -2344,20 +2346,20 @@ msgid ""
 "You can create one in the menu: \n"
 "Configuration\\Financial Accounting\\Accounts\\Journals."
 msgstr ""
-"無法找到這類型 %s  的賬簿。\n"
+"無法找到這類型 %s  的帳簿。\n"
 "\n"
-"您可以在 設置/財務會計/科目/賬簿 裡設置"
+"您可以在 設置/財務會計/科目/帳簿 裡設置"
 
 #. 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 "預付30%30天內支付餘款"
+msgstr "預付30% 30天內支付餘款"
 
 #. module: account
 #: view:account.entries.report:0
 msgid "Unreconciled entries"
-msgstr "憑證反核銷"
+msgstr "未調節分錄"
 
 #. module: account
 #: field:account.invoice.tax,base_code_id:0
@@ -2388,11 +2390,14 @@ 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
 #: selection:account.move.line,centralisation:0
 msgid "Debit Centralisation"
-msgstr "借方匯總"
+msgstr "借方彙總"
 
 #. module: account
 #: view:account.invoice.confirm:0
@@ -2412,12 +2417,12 @@ msgstr "日"
 #. module: account
 #: model:ir.actions.act_window,name:account.act_account_renew_view
 msgid "Accounts to Renew"
-msgstr "延續科目有效期"
+msgstr "延續科目有效期限"
 
 #. module: account
 #: model:ir.model,name:account.model_account_model_line
 msgid "Account Model Entries"
-msgstr "憑證模板"
+msgstr "科目模型分錄"
 
 #. module: account
 #: code:addons/account/account.py:3117
@@ -2428,12 +2433,12 @@ msgstr "EXJ"
 #. module: account
 #: field:product.template,supplier_taxes_id:0
 msgid "Supplier Taxes"
-msgstr "進項稅"
+msgstr "進項稅額"
 
 #. module: account
 #: view:account.entries.report:0
 msgid "entries"
-msgstr "憑證"
+msgstr "分錄"
 
 #. module: account
 #: help:account.invoice,date_due:0
@@ -2444,7 +2449,7 @@ msgid ""
 "date empty, it means direct payment. The payment term may compute several "
 "due dates, for example 50% now, 50% in one month."
 msgstr ""
-"如果您使用付款條款, 到期將自動生成分錄. 如果付款條款和到期日期為空, 則意味著直接付款. 付款條款可以計算出幾個到期日, 例如現在先付50%, "
+"如果您使用付款條件, 到期將自動生成分錄. 如果付款條件和到期日期為空, 則意味著直接付款. 付款條件可以計算出幾個到期日, 例如現在先付50%, "
 "然後在一個月內支付餘下的50%."
 
 #. module: account
@@ -2460,25 +2465,25 @@ msgstr "報表"
 #. module: account
 #: report:account.analytic.account.journal:0
 msgid "Move Name"
-msgstr "憑證名稱"
+msgstr "移轉名稱"
 
 #. module: account
 #: help:res.partner,property_account_position:0
 msgid ""
 "The fiscal position will determine taxes and the accounts used for the "
 "partner."
-msgstr "財務結構決定業務夥伴用的稅和科目。"
+msgstr "財務結構決定業務夥伴用的稅別和科目。"
 
 #. module: account
 #: view:account.print.journal:0
 msgid ""
 "This report gives you an overview of the situation of a specific journal"
-msgstr "這報表是您指定賬簿的概述"
+msgstr "這報表是您指定帳簿的概述"
 
 #. module: account
 #: model:ir.model,name:account.model_account_move_line_reconcile_writeoff
 msgid "Account move line reconcile (writeoff)"
-msgstr "憑證行核銷（註銷）"
+msgstr "科目移轉明細調節（核銷）"
 
 #. module: account
 #: model:account.account.type,name:account.account_type_tax
@@ -2486,7 +2491,7 @@ msgstr "憑證行核銷（註銷）"
 #: field:account.invoice,amount_tax:0
 #: field:account.move.line,account_tax_id:0
 msgid "Tax"
-msgstr "稅"
+msgstr "稅額"
 
 #. module: account
 #: view:account.analytic.account:0
@@ -2497,7 +2502,7 @@ msgstr "稅"
 #: field:account.move.line,analytic_account_id:0
 #: field:account.move.line.reconcile.writeoff,analytic_id:0
 msgid "Analytic Account"
-msgstr "輔助核算項"
+msgstr "輔助核算項目"
 
 #. module: account
 #: view:account.account:0
@@ -2538,7 +2543,7 @@ msgstr "標籤"
 #: view:account.tax:0
 #: view:res.partner.bank:0
 msgid "Accounting Information"
-msgstr "會計信息"
+msgstr "會計資訊"
 
 #. module: account
 #: view:account.tax:0
@@ -2550,7 +2555,7 @@ msgstr "特殊算法"
 #: view:account.move.bank.reconcile:0
 #: model:ir.actions.act_window,name:account.action_account_bank_reconcile_tree
 msgid "Bank reconciliation"
-msgstr "銀行對賬單"
+msgstr "銀行對帳單"
 
 #. module: account
 #: report:account.invoice:0
@@ -2579,12 +2584,12 @@ msgstr "借貸數值不正確，必須為正值"
 #. module: account
 #: model:ir.ui.menu,name:account.menu_automatic_reconcile
 msgid "Automatic Reconciliation"
-msgstr "自動核銷"
+msgstr "自動調節"
 
 #. module: account
 #: field:account.invoice,reconciled:0
 msgid "Paid/Reconciled"
-msgstr "已付/已核銷"
+msgstr "已付/已調節"
 
 #. module: account
 #: field:account.tax,ref_base_code_id:0
@@ -2595,7 +2600,7 @@ msgstr "退稅基編碼"
 #. module: account
 #: selection:account.tax.template,applicable_type:0
 msgid "True"
-msgstr "True"
+msgstr "真實"
 
 #. module: account
 #: view:account.bank.statement:0
@@ -2609,19 +2614,19 @@ msgstr "日期"
 #. module: account
 #: field:account.chart.template,parent_id:0
 msgid "Parent Chart Template"
-msgstr "父科目表模板"
+msgstr "上層科目表模板"
 
 #. module: account
 #: field:account.tax,parent_id:0
 #: field:account.tax.template,parent_id:0
 msgid "Parent Tax Account"
-msgstr "父稅科目"
+msgstr "上層稅科目"
 
 #. module: account
 #: code:addons/account/wizard/account_change_currency.py:59
 #, python-format
 msgid "New currency is not configured properly !"
-msgstr "新幣種設置不正確"
+msgstr "新幣別設置不正確"
 
 #. module: account
 #: view:account.subscription.generate:0
@@ -2662,7 +2667,7 @@ msgid ""
 "Note that journal entries that are automatically created by the system are "
 "always skipping that state."
 msgstr ""
-"勾選，如果您不想新的分錄跳過「草稿」狀態直接到「已登賬」狀態，中間無需手動審核。\n"
+"勾選，如果您不想新的分錄跳過「草稿」狀態直接到「已登帳」狀態，中間無需手動審核。\n"
 "注意系統自動建立的分錄總是跳過這狀態。"
 
 #. module: account
@@ -2679,13 +2684,13 @@ msgstr "科目表設置"
 #. module: account
 #: view:account.use.model:0
 msgid "This wizard will create recurring accounting entries"
-msgstr "該嚮導將建立一個定期分錄"
+msgstr "該精靈將建立一個定期分錄"
 
 #. module: account
 #: code:addons/account/account.py:1321
 #, python-format
 msgid "No sequence defined on the journal !"
-msgstr "沒定義賬簿的序列！"
+msgstr "尚未定義帳簿的序列！"
 
 #. module: account
 #: code:addons/account/account.py:2268
@@ -2693,7 +2698,7 @@ msgstr "沒定義賬簿的序列！"
 #: code:addons/account/account_move_line.py:173
 #, python-format
 msgid "You have to define an analytic journal on the '%s' journal!"
-msgstr "您必須定義這 '%s' 的輔助核算賬簿！"
+msgstr "您必須在這 '%s' 的帳簿上先定義輔助核算帳簿！"
 
 #. module: account
 #: code:addons/account/account.py:407
@@ -2701,7 +2706,7 @@ msgstr "您必須定義這 '%s' 的輔助核算賬簿！"
 msgid ""
 "You need an Opening journal with centralisation checked to set the initial "
 "balance!"
-msgstr "要設置期初餘額需在憑證簿設置中勾選合併選項"
+msgstr "要設置期初餘額需在帳簿設置中勾選合併選項"
 
 #. module: account
 #: view:account.invoice.tax:0
@@ -2719,7 +2724,7 @@ msgstr "未確認損益"
 #: model:ir.ui.menu,name:account.menu_account_customer
 #: model:ir.ui.menu,name:account.menu_finance_receivables
 msgid "Customers"
-msgstr "客戶"
+msgstr "客戶／供應商"
 
 #. module: account
 #: report:account.analytic.account.cost_ledger:0
@@ -2735,12 +2740,12 @@ msgstr "會計期間到"
 #: selection:report.account.sales,month:0
 #: selection:report.account_type.sales,month:0
 msgid "August"
-msgstr "8"
+msgstr "8月"
 
 #. module: account
 #: model:process.transition,note:account.process_transition_paymentreconcile0
 msgid "Payment entries are the second input of the reconciliation."
-msgstr "核銷的第二個輸入項是付款分錄"
+msgstr "調節的第二個輸入項是付款分錄"
 
 #. module: account
 #: selection:account.entries.report,month:0
@@ -2749,14 +2754,14 @@ msgstr "核銷的第二個輸入項是付款分錄"
 #: selection:report.account.sales,month:0
 #: selection:report.account_type.sales,month:0
 msgid "October"
-msgstr "10"
+msgstr "10月"
 
 #. 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 "行顯示的非強制性數量，如：已銷售產品。這數量不是一個強制要求，但對一些報表非常有用。"
+msgstr "這個明細顯示的非強制性數量，如：已銷售產品。這數量不是一個強制要求，但對一些報表非常有用。"
 
 #. module: account
 #: view:account.payment.term.line:0
@@ -2784,7 +2789,7 @@ msgstr "留空使用覆核(發票)日期的會計期間"
 #: help:account.bank.statement,account_id:0
 msgid ""
 "used in statement reconciliation domain, but shouldn't be used elswhere."
-msgstr "用於銀行對賬單，但不能使用到別處。"
+msgstr "使用於銀行對帳單調節領域，但不能使用到別處。"
 
 #. module: account
 #: field:account.invoice.tax,base_amount:0
@@ -2802,7 +2807,7 @@ msgstr "無法刪除已確認或付款的發票。建議您做退款處理。"
 #. module: account
 #: field:wizard.multi.charts.accounts,sale_tax:0
 msgid "Default Sale Tax"
-msgstr "預設銷售稅"
+msgstr "預設銷項稅額"
 
 #. module: account
 #: code:addons/account/account_invoice.py:1013
@@ -2816,7 +2821,7 @@ 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 "這模型生成的到期日期，您可以選擇建立日期或建立日期加上業務夥伴付款條件。"
+msgstr "這模型產生的到期日期，您可以選擇建立日期或建立日期加上業務夥伴付款條件。"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_accounting
@@ -2881,7 +2886,7 @@ msgstr "如果在計算未來的稅前這稅額必須包含在稅基金額裡，
 #. module: account
 #: help:account.journal,user_id:0
 msgid "The user responsible for this journal"
-msgstr "這用戶負責這賬簿"
+msgstr "此使用者負責此帳簿"
 
 #. module: account
 #: view:account.period:0
@@ -2912,7 +2917,7 @@ msgstr "現金交易"
 #. module: account
 #: view:res.partner:0
 msgid "Bank account"
-msgstr "銀行賬號"
+msgstr "銀行帳號"
 
 #. module: account
 #: field:account.chart.template,tax_template_ids:0
@@ -2922,7 +2927,7 @@ msgstr "稅模板列表"
 #. module: account
 #: model:ir.ui.menu,name:account.menu_account_print_sale_purchase_journal
 msgid "Sale/Purchase Journals"
-msgstr "銷售/採購 憑證簿"
+msgstr "銷售/採購 帳簿"
 
 #. module: account
 #: help:account.account,currency_mode:0
@@ -3037,7 +3042,7 @@ msgstr "業務夥伴會計帳本(往來帳)"
 #. module: account
 #: help:account.journal.column,sequence:0
 msgid "Gives the sequence order to journal column."
-msgstr "指定賬簿的序列"
+msgstr "指定帳簿的序列"
 
 #. module: account
 #: help:account.account,currency_id:0
@@ -3051,7 +3056,7 @@ msgstr "強制將這科目的所有憑證轉為第二幣別。"
 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 "這嚮導將使指定的會計期間和賬簿的所有分錄生效。一旦生效您不能再修改它們。"
+msgstr "這精靈將使指定的會計期間和帳簿的所有分錄生效。一旦生效您不能再修改它們。"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_chart_template_form
@@ -3062,7 +3067,7 @@ msgstr "科目一覽表模板"
 #. module: account
 #: model:ir.actions.act_window,name:account.action_wizard_multi_chart
 msgid "Set Your Accounting Options"
-msgstr ""
+msgstr "設定你的會計選項"
 
 #. module: account
 #: view:report.account.sales:0
@@ -3072,7 +3077,7 @@ msgstr "按類別劃分的月度銷售記錄"
 #. module: account
 #: model:ir.model,name:account.model_account_unreconcile_reconcile
 msgid "Account Unreconcile Reconcile"
-msgstr "科目核銷反核銷"
+msgstr "科目調節未調節"
 
 #. module: account
 #: sql_constraint:account.tax:0
@@ -3094,9 +3099,9 @@ msgid ""
 msgstr ""
 "在這設定科目年終結轉時產生分錄的方法\n"
 "    'None'  不做結轉\n"
-"    'Balance'  年末餘額轉到下年\n"
-"    'Detail'  把該科目上年的所有分錄明細帶入下年，即使已對賬\n"
-"    'Unreconciled'  把該科目未對賬分錄明細帶入下年"
+"    'Balance'  年末餘額轉到隔年\n"
+"    'Detail'  把該科目上年的所有分錄明細帶入隔年，即使已對帳\n"
+"    'Unreconciled'  把該科目未對帳分錄明細帶入隔年"
 
 #. module: account
 #: code:addons/account/wizard/account_open_closed_fiscalyear.py:39
@@ -3142,12 +3147,12 @@ msgstr "留空使用這費用科目"
 #: model:ir.ui.menu,name:account.menu_journals
 #: model:ir.ui.menu,name:account.menu_journals_report
 msgid "Journals"
-msgstr "賬簿"
+msgstr "帳簿"
 
 #. module: account
 #: field:account.partner.reconcile.process,to_reconcile:0
 msgid "Remaining Partners"
-msgstr "業務夥伴剩餘的"
+msgstr "剩餘的業務夥伴"
 
 #. module: account
 #: view:account.subscription:0
@@ -3181,7 +3186,7 @@ msgstr "  值: 0.02"
 #: model:ir.actions.act_window,name:account.open_board_account
 #: model:ir.ui.menu,name:account.menu_board_account
 msgid "Accounting Dashboard"
-msgstr "會計儀表盤"
+msgstr "會計控制台"
 
 #. module: account
 #: field:account.bank.statement,balance_start:0
@@ -3229,13 +3234,13 @@ msgstr "如果不是同一公司, 這金額表示相關科目的幣別。"
 #: 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 "反核銷分錄"
+msgstr "未調節分錄"
 
 #. module: account
 #: field:account.tax.code,notprintable:0
 #: field:account.tax.code.template,notprintable:0
 msgid "Not Printable in Invoice"
-msgstr "不打印在發票上"
+msgstr "不列印在發票上"
 
 #. module: account
 #: report:account.vat.declaration:0
@@ -3252,31 +3257,31 @@ msgstr "期末餘額與計算出來的餘額不平衡."
 #. module: account
 #: view:account.journal:0
 msgid "Search Account Journal"
-msgstr "搜索賬簿"
+msgstr "搜尋會計帳簿"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_invoice_tree_pending_invoice
 msgid "Pending Invoice"
-msgstr "待開票"
+msgstr "待開發票"
 
 #. module: account
 #: view:account.invoice.report:0
 #: selection:account.subscription,period_type:0
 #: view:analytic.entries.report:0
 msgid "year"
-msgstr "年"
+msgstr "年度"
 
 #. module: account
 #: view:product.product:0
 msgid "Purchase Taxes"
-msgstr "進項稅"
+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 "所有選擇的分錄將生效並過賬，這意味著您將不能修改它們。"
+msgstr "所有選擇的分錄將生效並過帳，這意味著您將不能修改它們。"
 
 #. module: account
 #: model:ir.actions.report.xml,name:account.account_transfers
@@ -3331,7 +3336,7 @@ msgstr "期間（天數）"
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_print_sale_purchase_journal
 msgid "Print Sale/Purchase Journal"
-msgstr "打印 銷售/採購 憑證簿"
+msgstr "列印 銷售/採購 帳簿"
 
 #. module: account
 #: field:account.invoice.report,state:0
@@ -3358,7 +3363,7 @@ msgstr "銷售報表的科目類型"
 #. module: account
 #: view:account.move.line:0
 msgid "Unreconciled Journal Items"
-msgstr "未核銷憑證"
+msgstr "未調節憑證"
 
 #. module: account
 #: sql_constraint:res.currency:0
@@ -3368,7 +3373,7 @@ msgstr "每個公司的貨幣代碼必須唯一"
 #. module: account
 #: selection:account.account.type,close_method:0
 msgid "Detail"
-msgstr "詳情"
+msgstr "細節"
 
 #. module: account
 #: code:addons/account/account_invoice.py:839
@@ -3380,7 +3385,7 @@ msgid ""
 "payment term must be of type 'balance' to avoid rounding issues."
 msgstr ""
 "不能建立發票\n"
-"關聯的付款條款可能缺少配置導致給出的計算金額超過總發票金額.最後的付款條款行必須是」平衡「類型以避免四捨五入問題"
+"關聯的付款條件可能缺少配置導致給出的計算金額超過總發票金額.最後的付款條件行必須是「平衡」類型以避免四捨五入問題"
 
 #. module: account
 #: report:account.invoice:0
@@ -3403,7 +3408,7 @@ msgstr "科目一覽表"
 #. module: account
 #: view:account.tax.chart:0
 msgid "(If you do not select period it will take all open periods)"
-msgstr "如果您不選擇會計期間，它將取所有開啟的會計期間"
+msgstr "如果您不選擇會計期間，它將使用所有開啟的會計期間"
 
 #. module: account
 #: field:account.journal,centralisation:0
@@ -3419,7 +3424,7 @@ msgstr "憑證中不能使用 「視圖」 類型的會計科目 %s %s"
 #. module: account
 #: model:ir.model,name:account.model_account_partner_reconcile_process
 msgid "Reconcilation Process partner by partner"
-msgstr "與業務夥伴核銷的進程"
+msgstr "與業務夥伴調節的過程"
 
 #. module: account
 #: selection:account.automatic.reconcile,power:0
@@ -3473,13 +3478,13 @@ msgstr "日期"
 #. module: account
 #: view:account.move:0
 msgid "Post"
-msgstr "過賬"
+msgstr "過帳"
 
 #. module: account
 #: view:account.unreconcile:0
 #: view:account.unreconcile.reconcile:0
 msgid "Unreconcile"
-msgstr "反核銷"
+msgstr "反調節"
 
 #. module: account
 #: view:account.analytic.line:0
@@ -3489,12 +3494,12 @@ msgstr "反核銷"
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,user_id:0
 msgid "User"
-msgstr "用戶"
+msgstr "使用者"
 
 #. module: account
 #: view:account.chart.template:0
 msgid "Chart of Accounts Template"
-msgstr "科目一覽表模板"
+msgstr "科目一覽表模組"
 
 #. module: account
 #: code:addons/account/account.py:2280
@@ -3504,14 +3509,14 @@ msgid ""
 "based on partner payment term!\n"
 "Please define partner on it!"
 msgstr ""
-"用模型明細  '%s' 產生分錄明細的到期日期，模型  '%s' 基於業務夥伴的付款條款。\n"
+"用模型明細  '%s' 產生分錄明細的到期日期，模型  '%s' 基於業務夥伴的付款條件。\n"
 "請在業務夥伴裡定義它"
 
 #. module: account
 #: code:addons/account/account_move_line.py:837
 #, python-format
 msgid "Some entries are already reconciled !"
-msgstr "部分分錄已核銷！"
+msgstr "部分分錄已調節！"
 
 #. module: account
 #: view:account.tax:0
@@ -3550,7 +3555,7 @@ msgstr "形式發票"
 #. module: account
 #: view:res.partner:0
 msgid "History"
-msgstr "日誌"
+msgstr "歷史記錄"
 
 #. module: account
 #: help:account.tax,applicable_type:0
@@ -3585,12 +3590,12 @@ msgstr "有異議"
 #. module: account
 #: view:account.analytic.line:0
 msgid "Search Analytic Lines"
-msgstr "搜索輔助核算明細"
+msgstr "搜尋輔助核算項目明細"
 
 #. module: account
 #: field:res.partner,property_account_payable:0
 msgid "Account Payable"
-msgstr "應付賬"
+msgstr "應付帳款科目"
 
 #. module: account
 #: model:process.node,name:account.process_node_supplierpaymentorder0
@@ -3601,7 +3606,7 @@ msgstr "付款單"
 #: help:account.account.template,reconcile:0
 msgid ""
 "Check this option if you want the user to reconcile entries in this account."
-msgstr "勾選此項, 如果您想用戶在這科目核銷分錄。"
+msgstr "勾選此項, 如果您想使用者在這科目調節分錄。"
 
 #. module: account
 #: model:ir.actions.report.xml,name:account.account_account_balance_landscape
@@ -3617,7 +3622,7 @@ msgstr "單價"
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_tree1
 msgid "Analytic Items"
-msgstr "分析明細"
+msgstr "輔助核算明細"
 
 #. module: account
 #: code:addons/account/account_move_line.py:1153
@@ -3628,7 +3633,7 @@ msgstr "無法更改稅目!"
 #. module: account
 #: field:analytic.entries.report,nbr:0
 msgid "#Entries"
-msgstr "# 項"
+msgstr "分錄"
 
 #. module: account
 #: selection:account.invoice.refund,filter_refund:0
@@ -3638,7 +3643,7 @@ msgstr "建立退款草稿"
 #. module: account
 #: view:account.state.open:0
 msgid "Open Invoice"
-msgstr "未結髮票"
+msgstr "開啟發票"
 
 #. module: account
 #: field:account.invoice.tax,factor_tax:0
@@ -3681,7 +3686,7 @@ msgstr "過期的試算表"
 #: code:addons/account/account_move_line.py:591
 #, python-format
 msgid "You can not create journal items on a closed account %s %s"
-msgstr "憑證中不能使用關閉的會計科目 %s %s"
+msgstr "帳簿中不能使用關閉的會計科目 %s %s"
 
 #. module: account
 #: field:account.move.line,date:0
@@ -3703,7 +3708,7 @@ msgstr "標準編碼"
 #. module: account
 #: help:account.journal,analytic_journal_id:0
 msgid "Journal for analytic entries"
-msgstr "輔助核算賬簿"
+msgstr "輔助核算分錄帳簿"
 
 #. module: account
 #: constraint:account.aged.trial.balance:0
@@ -3739,7 +3744,7 @@ msgstr "會計"
 #. module: account
 #: view:account.entries.report:0
 msgid "Journal Entries with period in current year"
-msgstr "本年度期間的憑證"
+msgstr "本年度期間的帳簿分錄"
 
 #. module: account
 #: help:account.central.journal,amount_currency:0
@@ -3749,19 +3754,19 @@ msgstr "本年度期間的憑證"
 msgid ""
 "Print Report with the currency column if the currency is different then the "
 "company currency"
-msgstr "如果打印貨幣與報表的貨幣是不同的,那麼使用公司的貨幣"
+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 "多幣種交易時所產生的匯兌損益金額"
+msgstr "多幣別交易時所產生的匯兌損益金額"
 
 #. module: account
 #: view:account.analytic.line:0
 msgid "General Accounting"
-msgstr "一般會計"
+msgstr "一般會計科目"
 
 #. module: account
 #: report:account.overdue:0
@@ -3775,7 +3780,7 @@ msgid ""
 "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 "最好使用一個專用的賬簿去控制所有會計年度的開賬分錄。注意您應該設定預設的借方/貸方科目，「狀態」的類型和能匯總賬簿對應。"
+msgstr "最好使用一個專用的帳簿去控制所有會計年度的開帳分錄。注意您應該設定預設的借方/貸方科目，「狀態」的類型和能匯總帳簿對應。"
 
 #. module: account
 #: view:account.installer:0
@@ -3811,7 +3816,7 @@ msgstr "使其生效"
 #: 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 "成本分類賬"
+msgstr "成本分類帳"
 
 #. module: account
 #: model:account.financial.report,name:account.account_financial_report_assets0
@@ -3838,7 +3843,7 @@ msgstr "顯示科目列表"
 #. module: account
 #: view:account.state.open:0
 msgid "(Invoice should be unreconciled if you want to open it)"
-msgstr "(如果你想打開它發票要反核銷)"
+msgstr "(如果你想打開它發票要反調節)"
 
 #. module: account
 #: field:account.chart,period_from:0
@@ -3856,13 +3861,13 @@ msgstr "稅名稱"
 #: 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 "月結束為30天"
+msgstr "月結60天"
 
 #. 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 "輔助核算餘額"
+msgstr "分析餘額"
 
 #. module: account
 #: help:account.account,active:0
@@ -3874,12 +3879,12 @@ msgstr "如果活動欄位設置為False，您將可以隱藏它而不在科目
 #. module: account
 #: view:account.move.line:0
 msgid "Posted Journal Items"
-msgstr "已登帳憑證"
+msgstr "已過帳憑證"
 
 #. module: account
 #: view:account.tax.template:0
 msgid "Search Tax Templates"
-msgstr "搜尋稅模板"
+msgstr "搜尋稅模組"
 
 #. module: account
 #: model:ir.ui.menu,name:account.periodical_processing_journal_entries_validation
@@ -3905,7 +3910,7 @@ msgstr "快捷鍵"
 #. module: account
 #: constraint:account.fiscalyear:0
 msgid "Error! The start date of the fiscal year must be before his end date."
-msgstr "錯誤！ 財年的開始日期須小於截止日期"
+msgstr "錯誤！ 財務年度的開始日期須小於截止日期"
 
 #. module: account
 #: view:account.account:0
@@ -3973,7 +3978,7 @@ msgstr "（時間表，一些採購產品，... ...）分析成本來輔助核
 #. module: account
 #: view:account.bank.statement:0
 msgid "Close CashBox"
-msgstr "關閉出納賬"
+msgstr "關閉出納帳"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -4005,13 +4010,13 @@ msgid ""
 "some non legal fields or you must unconfirm the journal entry first! \n"
 "%s"
 msgstr ""
-"你不能修改已覆核的會計憑證！你只可以修改一些非關鍵欄位或者先取消覆核這張憑證！\n"
+"你不能修改已覆核的分錄！你只可以修改一些非關鍵欄位或者先取消覆核這筆分錄！\n"
 "%s"
 
 #. module: account
 #: field:res.company,paypal_account:0
 msgid "Paypal Account"
-msgstr "Paypal賬戶"
+msgstr "Paypal帳戶"
 
 #. module: account
 #: field:account.invoice.report,uom_name:0
@@ -4027,7 +4032,7 @@ msgstr "備註"
 #. module: account
 #: selection:account.financial.report,sign:0
 msgid "Reverse balance sign"
-msgstr "餘額取反"
+msgstr "反向平衡的標誌"
 
 #. module: account
 #: view:account.analytic.account:0
@@ -4070,7 +4075,7 @@ msgstr "客戶會計屬性"
 #. module: account
 #: help:res.company,paypal_account:0
 msgid "Paypal username (usually email) for receiving online payments."
-msgstr "Paypal 用戶名 (通常為 email) 用於接受在線支付。"
+msgstr "Paypal 帳號 (通常為 email) 用於接受在線支付。"
 
 #. module: account
 #: selection:account.aged.trial.balance,target_move:0
@@ -4093,18 +4098,18 @@ msgstr "Paypal 用戶名 (通常為 email) 用於接受在線支付。"
 #: code:addons/account/report/common_report_header.py:68
 #, python-format
 msgid "All Posted Entries"
-msgstr "所有已登賬憑證"
+msgstr "所有已登帳分錄"
 
 #. module: account
 #: code:addons/account/account_bank_statement.py:367
 #, python-format
 msgid "Statement %s is confirmed, journal items are created."
-msgstr "銀行對賬單 %s 確認，建立賬簿裡的明細。"
+msgstr "銀行對帳單 %s 確認，建立帳簿裡的借貸項。"
 
 #. module: account
 #: field:report.aged.receivable,name:0
 msgid "Month Range"
-msgstr "月度"
+msgstr "月區間"
 
 #. module: account
 #: help:account.analytic.balance,empty_acc:0
@@ -4125,7 +4130,7 @@ msgstr "預設稅"
 #: code:addons/account/wizard/account_fiscalyear_close.py:41
 #, python-format
 msgid "End of Fiscal Year Entry"
-msgstr "會計年度結賬分錄"
+msgstr "會計年度結帳分錄"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_periodical_processing
@@ -4135,7 +4140,7 @@ msgstr "定期處理"
 #. module: account
 #: constraint:account.analytic.line:0
 msgid "You can not create analytic line on view account."
-msgstr "無法在視圖類型的科目上建立分析憑證行"
+msgstr "無法在視圖類型的科目上建立輔助核算頁目明細。"
 
 #. module: account
 #: help:account.move.line,state:0
@@ -4175,7 +4180,7 @@ msgstr "科目名稱"
 #. module: account
 #: help:account.fiscalyear.close,report_name:0
 msgid "Give name of the new entries"
-msgstr "給新條目名稱"
+msgstr "給新項目名稱"
 
 #. module: account
 #: model:ir.model,name:account.model_account_invoice_report
@@ -4190,18 +4195,18 @@ msgstr "匯率"
 #. module: account
 #: model:process.transition,note:account.process_transition_paymentorderreconcilation0
 msgid "Bank statements are entered in the system."
-msgstr "把銀行對賬單輸入到系統中。"
+msgstr "把銀行對帳單輸入到系統中。"
 
 #. module: account
 #: code:addons/account/wizard/account_reconcile.py:133
 #, python-format
 msgid "Reconcile Writeoff"
-msgstr "補差額時核銷"
+msgstr "調節時核銷"
 
 #. module: account
 #: view:report.account.receivable:0
 msgid "Accounts by Type"
-msgstr ""
+msgstr "依類型劃分的科目"
 
 #. module: account
 #: view:account.bank.statement:0
@@ -4223,7 +4228,7 @@ msgstr "可顯示？"
 #. module: account
 #: model:ir.model,name:account.model_account_journal_select
 msgid "Account Journal Select"
-msgstr "選擇賬簿"
+msgstr "選擇帳簿"
 
 #. module: account
 #: view:account.tax.template:0
@@ -4243,7 +4248,7 @@ msgstr "res_config_contents"
 #. module: account
 #: view:account.unreconcile:0
 msgid "Unreconciliate Transactions"
-msgstr ""
+msgstr "反核銷"
 
 #. module: account
 #: help:account.chart.template,visible:0
@@ -4252,7 +4257,7 @@ msgid ""
 "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 "如果你不想在根據模版生成科目表的嚮導裡用這個模版，不要勾選這個欄位。用於你僅需要在用到本模版的子模板時才生成這個模版的會計科目。"
+msgstr "如果你不想在根據模組產生科目表的精靈裡用這個模組，不要勾選這個欄位。用於你僅需要在用到本模組的子模組時才生成這個模組的會計科目。"
 
 #. module: account
 #: view:account.use.model:0
@@ -4263,7 +4268,7 @@ msgstr "按模型建立分錄"
 #: field:account.account,reconcile:0
 #: field:account.account.template,reconcile:0
 msgid "Allow Reconciliation"
-msgstr "允許核銷"
+msgstr "允許調節"
 
 #. module: account
 #: code:addons/account/account.py:1077
@@ -4291,7 +4296,7 @@ msgstr "含稅價"
 #. module: account
 #: model:ir.model,name:account.model_account_analytic_cost_ledger_journal_report
 msgid "Account Analytic Cost Ledger For Journal Report"
-msgstr "分析本期成本明細賬的報表"
+msgstr "分析本期成本明細帳的報表"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_model_form
@@ -4336,7 +4341,7 @@ msgstr "它將充當預設帳戶的信貸數額"
 #: view:validate.account.move:0
 #: view:validate.account.move.lines:0
 msgid "Post Journal Entries"
-msgstr "登賬"
+msgstr "登帳"
 
 #. module: account
 #: selection:account.invoice,state:0
@@ -4348,7 +4353,7 @@ msgstr "已取消"
 #. module: account
 #: help:account.bank.statement,balance_end_cash:0
 msgid "Closing balance based on cashBox"
-msgstr "錢箱額"
+msgstr "錢箱結餘金額"
 
 #. module: account
 #: view:account.payment.term.line:0
@@ -4380,7 +4385,7 @@ msgstr "採購稅 %.2f%%"
 #: model:ir.actions.act_window,name:account.action_account_subscription_generate
 #: model:ir.ui.menu,name:account.menu_generate_subscription
 msgid "Generate Entries"
-msgstr "生成分錄"
+msgstr "產生分錄"
 
 #. module: account
 #: help:account.vat.declaration,chart_tax_id:0
@@ -4435,7 +4440,7 @@ msgstr "操作日期"
 #. module: account
 #: view:account.unreconcile.reconcile:0
 msgid "Unreconciliation Transactions"
-msgstr ""
+msgstr "反核銷"
 
 #. module: account
 #: field:account.tax,ref_tax_code_id:0
@@ -4448,7 +4453,7 @@ msgstr "退稅編碼"
 msgid ""
 "All draft account entries in this journal and period will be validated. It "
 "means you won't be able to modify their accounting fields anymore."
-msgstr "所有選的會計期間和賬簿裡的分錄草稿都已生效。也就是說您再也不能再修改它們的會計欄位。"
+msgstr "所有選的會計期間和帳簿裡的分錄草稿都已生效。也就是說您再也不能再修改它們的會計欄位。"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_configuration
@@ -4480,7 +4485,7 @@ msgstr "${object.company_id.name} 發票 (編號 ${object.number or 'n/a' })"
 #: help:res.partner,last_reconciliation_date:0
 msgid ""
 "Date on which the partner accounting entries were reconciled last time"
-msgstr "業務夥伴最後一次核銷的日期"
+msgstr "業務夥伴最後一次調節的日期"
 
 #. module: account
 #: field:account.fiscalyear.close,fy2_id:0
@@ -4538,7 +4543,7 @@ 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 "發票的收款銀行帳號。如果是客戶發票或供應商紅字發票，這裡是本公司的銀行賬號，否則這裡是業務夥伴的銀行賬號。"
+msgstr "發票的收款銀行帳號。如果是客戶發票或供應商折讓單，這裡是本公司的銀行帳號，否則這裡是業務夥伴的銀行帳號。"
 
 #. module: account
 #: view:account.state.open:0
@@ -4569,7 +4574,7 @@ msgstr "您確定嗎？"
 #. module: account
 #: help:account.move.line,statement_id:0
 msgid "The bank statement used for bank reconciliation"
-msgstr "這銀行對賬單用於對賬"
+msgstr "這銀行對帳單用於對帳"
 
 #. module: account
 #: model:process.transition,note:account.process_transition_suppliercustomerinvoice0
@@ -4631,7 +4636,7 @@ msgstr "稅適用"
 #: model:ir.ui.menu,name:account.menu_eaction_account_moves_sale
 #, python-format
 msgid "Journal Items"
-msgstr "會計憑證行"
+msgstr "借貸項"
 
 #. module: account
 #: code:addons/account/account.py:1088
@@ -4684,7 +4689,7 @@ msgstr "這份報表是關於業務夥伴的分析。其中包含每個業務夥
 msgid ""
 "To print an analytics (or costs) journal for a given period. The report give "
 "code, move name, account number, general amount and analytic amount."
-msgstr "打印在這會計期間生成的輔助核算(或成本)賬簿 ,該報表內容為：代碼，憑證名，科目編碼，總金額和輔助核算金額。"
+msgstr "列印在這會計期間生成的輔助核算(或成本)帳簿 ,該報表內容為：代碼，憑證名，科目編碼，總金額和輔助核算金額。"
 
 #. module: account
 #: sql_constraint:account.invoice:0
@@ -4699,7 +4704,7 @@ msgstr "科目餘額"
 #. module: account
 #: view:account.fiscalyear.close:0
 msgid "Generate Fiscal Year Opening Entries"
-msgstr "生成會計年度開賬分錄"
+msgstr "產生會計年度開帳分錄"
 
 #. module: account
 #: model:res.groups,name:account.group_account_user
@@ -4711,7 +4716,7 @@ msgstr "會計"
 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 "在這裡分析貴公司的資金。這裡匯總了每個期間在流動資產科目上的會計憑證。"
+msgstr "在這裡分析貴公司的資金。這裡匯總了每個期間在流動資產科目上的分錄。"
 
 #. module: account
 #: field:account.journal,group_invoice_lines:0
@@ -4763,13 +4768,13 @@ msgid ""
 "You should set the journal to allow cancelling entries if you want to do "
 "that."
 msgstr ""
-"您不能修改已登賬的分錄!\n"
-"如需修改請將此賬簿設置為允許作廢分錄。"
+"您不能修改已登帳的分錄!\n"
+"如需修改請將此帳簿設置為允許作廢分錄。"
 
 #. module: account
 #: model:ir.ui.menu,name:account.account_template_folder
 msgid "Templates"
-msgstr "模板"
+msgstr "範本"
 
 #. module: account
 #: field:account.invoice.tax,name:0
@@ -4869,7 +4874,7 @@ msgstr "Python代碼(reverse)"
 #: 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 "付款條款"
+msgstr "付款條件"
 
 #. module: account
 #: help:account.chart.template,complete_tax_set:0
@@ -4877,7 +4882,7 @@ 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 "這個選項用於確定你是否希望提示用戶輸入銷售和採購的稅率，或者是從下拉列表選擇稅。這是設置稅模版的最後一步。"
+msgstr "這個選項用於確定你是否希望提示使用者輸入銷售和採購的稅率，或者是從下拉列表選擇稅。這是設置稅模版的最後一步。"
 
 #. module: account
 #: view:account.financial.report:0
@@ -4948,7 +4953,7 @@ msgstr "稅科目"
 #. module: account
 #: view:account.automatic.reconcile:0
 msgid "Reconciliation Result"
-msgstr ""
+msgstr "調節結果"
 
 #. module: account
 #: model:account.financial.report,name:account.account_financial_report_balancesheet0
@@ -4960,7 +4965,7 @@ msgstr "資產負債表"
 #: view:account.general.journal:0
 #: model:ir.ui.menu,name:account.menu_account_general_journal
 msgid "General Journals"
-msgstr "一般賬簿"
+msgstr "總分類帳"
 
 #. module: account
 #: field:account.journal,allow_date:0
@@ -5052,7 +5057,7 @@ msgstr "基於子稅"
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_tax_template
 msgid "Template Tax Fiscal Position"
-msgstr "稅務的模板"
+msgstr "稅務的模組"
 
 #. module: account
 #: field:account.journal,update_posted:0
@@ -5175,7 +5180,7 @@ msgstr "包括初始餘額"
 #: selection:account.invoice.report,type:0
 #: selection:report.invoice.created,type:0
 msgid "Customer Refund"
-msgstr "客戶紅字發票"
+msgstr "客戶折讓"
 
 #. module: account
 #: constraint:account.move:0
@@ -5204,7 +5209,7 @@ msgstr "  享受現金折扣的天數：14"
 #. module: account
 #: field:account.fiscalyear,end_journal_period_id:0
 msgid "End of Year Entries Journal"
-msgstr "賬簿的結賬分錄"
+msgstr "帳簿的年度結帳分錄"
 
 #. module: account
 #: code:addons/account/account.py:3446
@@ -5230,7 +5235,7 @@ 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 "這是業務夥伴的餘額，您應該檢查出那個已核銷那個未核銷。這數字計算當前業務夥伴要核銷部分。"
+msgstr "這是業務夥伴的餘額，您應該檢查出那個已調節那個未調節。這數字計算當前業務夥伴要調節部分。"
 
 #. module: account
 #: view:account.subscription.line:0
@@ -5249,7 +5254,7 @@ msgstr "產品數量"
 #: selection:account.move,state:0
 #: view:account.move.line:0
 msgid "Unposted"
-msgstr "未登賬"
+msgstr "未登帳"
 
 #. module: account
 #: view:account.change.currency:0
@@ -5279,7 +5284,7 @@ msgstr "付款日期"
 #: 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 "輔助核算項"
+msgstr "輔助核算項目"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -5292,7 +5297,7 @@ msgstr "客戶發票和退款"
 #: field:account.model.line,amount_currency:0
 #: field:account.move.line,amount_currency:0
 msgid "Amount Currency"
-msgstr "金額"
+msgstr "貨幣金額"
 
 #. module: account
 #: code:addons/account/wizard/account_validate_account_move.py:39
@@ -5300,12 +5305,12 @@ msgstr "金額"
 msgid ""
 "Specified Journal does not have any account move entries in draft state for "
 "this period"
-msgstr "指定的賬簿在這會計期間沒有草稿狀態的憑證"
+msgstr "指定的帳簿在這會計期間沒有草稿狀態的分錄"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_view_move_line
 msgid "Lines to reconcile"
-msgstr "核銷"
+msgstr "調節的行"
 
 #. module: account
 #: report:account.analytic.account.balance:0
@@ -5330,7 +5335,7 @@ msgstr "編號"
 #. module: account
 #: view:analytic.entries.report:0
 msgid "Analytic Entries during last 7 days"
-msgstr "分析最近7天內的分錄"
+msgstr "最近7天內的輔助核算分錄"
 
 #. module: account
 #: selection:account.financial.report,style_overwrite:0
@@ -5340,21 +5345,21 @@ msgstr "普通文本"
 #. module: account
 #: view:account.invoice.refund:0
 msgid "Refund Invoice Options"
-msgstr "紅字發票選項"
+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 "部分金額可以加起來作為找到的平衡點來強制填充自動核銷"
+msgstr "部分金額可以加起來作為找到的平衡點來強制填充自動調節"
 
 #. module: account
 #: help:account.payment.term.line,sequence:0
 msgid ""
 "The sequence field is used to order the payment term lines from the lowest "
 "sequences to the higher ones"
-msgstr "這序列欄位用於付款條款的從低到高排序."
+msgstr "這序列欄位用於付款條件的從低到高排序."
 
 #. module: account
 #: view:account.fiscal.position.template:0
@@ -5377,7 +5382,7 @@ msgid ""
 "impossible any new entry record. Close a fiscal year when you need to "
 "finalize your end of year results definitive "
 msgstr ""
-"如果不希望在這個年度輸入會計憑證，可以在這裡關閉年度。這樣該年度的所有期間都關閉了，不能再記賬了。如果你希望會計報表不會變更請關閉會計年度。 "
+"如果不希望在這個年度輸入分錄，可以在這裡關閉年度。這樣該年度的所有期間都關閉了，不能再記帳了。如果你希望會計報表不會變更請關閉會計年度。 "
 
 #. module: account
 #: field:account.central.journal,amount_currency:0
@@ -5412,7 +5417,7 @@ msgstr ""
 #. module: account
 #: view:account.move.line.reconcile:0
 msgid "Reconcile With Write-Off"
-msgstr "補差額時核銷"
+msgstr "調節與核銷"
 
 #. module: account
 #: selection:account.payment.term.line,value:0
@@ -5433,7 +5438,7 @@ msgstr "發票數據"
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_automatic_reconcile
 msgid "Account Automatic Reconcile"
-msgstr "科目自動核銷"
+msgstr "科目自動調節"
 
 #. module: account
 #: view:account.move:0
@@ -5444,7 +5449,7 @@ msgstr "明細"
 #. module: account
 #: model:ir.model,name:account.model_account_move_journal
 msgid "Move journal"
-msgstr "憑證賬簿"
+msgstr "憑證帳簿"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_fiscalyear_close
@@ -5456,7 +5461,7 @@ msgstr "產生開啟分錄"
 #: code:addons/account/account_move_line.py:759
 #, python-format
 msgid "Already Reconciled!"
-msgstr "已核銷！"
+msgstr "已調節！"
 
 #. module: account
 #: help:account.tax,type:0
@@ -5478,7 +5483,7 @@ msgstr "建立日期"
 #: 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 "輔助核算賬簿"
+msgstr "輔助核算帳簿"
 
 #. module: account
 #: field:account.account,child_id:0
@@ -5501,7 +5506,7 @@ msgstr "補差額"
 #. module: account
 #: field:res.partner,debit:0
 msgid "Total Payable"
-msgstr "應付款合計"
+msgstr "應付帳款合計"
 
 #. module: account
 #: model:account.account.type,name:account.data_account_type_income
@@ -5530,7 +5535,7 @@ msgstr "3"
 #. module: account
 #: view:account.account.template:0
 msgid "Account Template"
-msgstr "科目模板"
+msgstr "科目模組"
 
 #. module: account
 #: report:account.journal.period.print.sale.purchase:0
@@ -5561,7 +5566,7 @@ msgstr "定價"
 #: code:addons/account/report/account_partner_balance.py:301
 #, python-format
 msgid "Receivable and Payable Accounts"
-msgstr "應收款與應付款科目"
+msgstr "應收帳款與應付帳款科目"
 
 #. module: account
 #: field:account.fiscal.position.account.template,position_id:0
@@ -5582,7 +5587,7 @@ msgstr "最大數量:"
 #. module: account
 #: view:account.invoice.refund:0
 msgid "Refund Invoice"
-msgstr "紅字發票"
+msgstr "折讓單"
 
 #. module: account
 #: field:account.invoice,address_invoice_id:0
@@ -5610,7 +5615,7 @@ msgstr "稅編碼基於你所在國家的稅務制度定義。OpenERP允許用
 msgid ""
 "Shows you the progress made today on the reconciliation process. Given by \n"
 "Partners Reconciled Today \\ (Remaining Partners + Partners Reconciled Today)"
-msgstr "顯示您今天核銷的進度，今天業務夥伴的已核銷 / （業務夥伴的餘額 + 今天業務夥伴的已核銷）"
+msgstr "顯示您今天調節的進度，今天業務夥伴的已調節 / （業務夥伴的餘額 + 今天業務夥伴的已調節）"
 
 #. module: account
 #: help:account.payment.term.line,value:0
@@ -5618,7 +5623,7 @@ 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 threated."
-msgstr "選擇這付款條款明細的相關定價類別。注意您應該在最後一行的類型為「餘額」以確保已支付全部金額。"
+msgstr "選擇這付款條件明細的相關定價類別。注意您應該在最後一行的類型為「餘額」以確保已支付全部金額。"
 
 #. module: account
 #: field:account.invoice,period_id:0
@@ -5632,7 +5637,7 @@ msgstr "強制會計期間"
 #: view:account.invoice.report:0
 #: field:account.invoice.report,nbr:0
 msgid "# of Lines"
-msgstr "# 明細"
+msgstr "明細數"
 
 #. module: account
 #: field:account.aged.trial.balance,filter:0
@@ -5699,7 +5704,7 @@ msgstr "發票稅科目"
 #: 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 "一般賬簿"
+msgstr "總分類帳"
 
 #. module: account
 #: field:account.payment.term.line,days:0
@@ -5734,7 +5739,7 @@ msgstr "這名稱將顯示在報表"
 #: report:account.analytic.account.cost_ledger:0
 #: report:account.analytic.account.quantity_cost_ledger:0
 msgid "Printing date"
-msgstr "打印日期"
+msgstr "列印日期"
 
 #. module: account
 #: selection:account.account.type,close_method:0
@@ -5752,7 +5757,7 @@ msgstr "  365 日  "
 #: model:ir.actions.act_window,name:account.action_invoice_tree3
 #: model:ir.ui.menu,name:account.menu_action_invoice_tree3
 msgid "Customer Refunds"
-msgstr "客戶紅字發票"
+msgstr "客戶折讓"
 
 #. module: account
 #: field:account.account,foreign_balance:0
@@ -5762,7 +5767,7 @@ msgstr "國外資產"
 #. module: account
 #: field:account.journal.period,name:0
 msgid "Journal-Period Name"
-msgstr "賬簿 - 會計期間名稱"
+msgstr "帳簿 - 會計期間名稱"
 
 #. module: account
 #: field:account.invoice.tax,factor_base:0
@@ -5778,7 +5783,7 @@ msgstr "尚未實現"
 #. module: account
 #: help:account.journal,company_id:0
 msgid "Company related to this journal"
-msgstr "公司設定的賬簿"
+msgstr "公司設定的帳簿"
 
 #. module: account
 #: code:addons/account/wizard/account_invoice_state.py:44
@@ -5823,7 +5828,7 @@ msgstr "配置錯誤！ "
 msgid ""
 "This journal will be created automatically for this bank account when you "
 "save the record"
-msgstr "當保存數據時，系統會自動為此銀行賬戶建立像相應的憑證."
+msgstr "當保存數據時，系統會自動為此銀行帳戶建立像相應的憑證."
 
 #. module: account
 #: view:account.analytic.line:0
@@ -5843,7 +5848,7 @@ msgid ""
 "OpenERP. If you want to record a supplier invoice, start by recording the "
 "line of the expense account. OpenERP will propose to you automatically the "
 "Tax related to this account and the counterpart \"Account Payable\"."
-msgstr "這個界面用於會計快速輸入憑證。如果需要記錄供應商發票，先輸入費用行，OpenERP會自動生成對應的稅行和應付賬款行。"
+msgstr "這個界面用於會計快速輸入憑證。如果需要記錄供應商發票，先輸入費用行，OpenERP會自動生成對應的稅行和應付帳款行。"
 
 #. module: account
 #: field:account.entries.report,date_created:0
@@ -5866,6 +5871,8 @@ msgid ""
 "As soon as the reconciliation is done, the invoice's state turns to “done” "
 "(i.e. paid) in the system."
 msgstr ""
+"As soon as the reconciliation is done, the invoice's state turns to “done” "
+"(i.e. paid) in the system."
 
 #. module: account
 #: view:account.chart.template:0
@@ -5896,7 +5903,7 @@ msgstr "這是一個定期分錄模型"
 #. module: account
 #: field:wizard.multi.charts.accounts,sale_tax_rate:0
 msgid "Sales Tax(%)"
-msgstr "銷售稅(%)"
+msgstr "銷項稅額(%)"
 
 #. module: account
 #: view:account.addtmpl.wizard:0
@@ -5907,7 +5914,7 @@ msgstr "根據這個範本建立使用者"
 #: view:account.account.type:0
 #: view:account.tax.code:0
 msgid "Reporting Configuration"
-msgstr "報告設置"
+msgstr "報表設置"
 
 #. module: account
 #: field:account.tax,type:0
@@ -5928,7 +5935,7 @@ msgid ""
 "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 "這個選項用於確定你是否希望提示用戶輸入銷售和採購的稅率，或者是打開稅選擇列表。這是設置稅模版的最後一步。"
+msgstr "這個選項用於確定你是否希望提示使用者輸入銷售和採購的稅率，或者是打開稅選擇列表。這是設置稅模版的最後一步。"
 
 #. module: account
 #: report:account.vat.declaration:0
@@ -5966,7 +5973,7 @@ 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 "這嚮導列出所有安裝要設置的稅"
+msgstr "這精靈列出所有安裝要設置的稅"
 
 #. module: account
 #: model:ir.actions.report.xml,name:account.account_intracom
@@ -6036,7 +6043,7 @@ msgstr "取消"
 #: model:account.account.type,name:account.data_account_type_receivable
 #: selection:account.entries.report,type:0
 msgid "Receivable"
-msgstr "應收款"
+msgstr "應收帳款"
 
 #. module: account
 #: constraint:account.move.line:0
@@ -6081,7 +6088,7 @@ msgstr "百分比"
 #. module: account
 #: selection:account.report.general.ledger,sortby:0
 msgid "Journal & Partner"
-msgstr "賬簿 & 業務夥伴"
+msgstr "帳簿 & 業務夥伴"
 
 #. module: account
 #: field:account.automatic.reconcile,power:0
@@ -6131,7 +6138,7 @@ msgstr "適用類型"
 #. module: account
 #: field:account.invoice.line,invoice_id:0
 msgid "Invoice Reference"
-msgstr "發票"
+msgstr "Invoice Reference"
 
 #. module: account
 #: help:account.tax.template,sequence:0
@@ -6160,7 +6167,7 @@ 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 "此嚮導將生成選定會計年度的年結憑證。注意你可以針對相同年度多次運行這個嚮導：新生成的憑證會覆蓋原有憑證。"
+msgstr "此精靈將生成選定會計年度的年結憑證。注意你可以針對相同年度多次運行這個精靈：新生成的憑證會覆蓋原有憑證。"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_bank_and_cash
@@ -6179,7 +6186,7 @@ msgstr "這視圖用於分析貴公司輔助核算項的發生額。用查找功
 #. module: account
 #: sql_constraint:account.journal:0
 msgid "The name of the journal must be unique per company !"
-msgstr "每個公司的賬簿名稱必須唯一！"
+msgstr "每個公司的帳簿名稱必須唯一！"
 
 #. module: account
 #: field:account.account.template,nocreate:0
@@ -6192,7 +6199,7 @@ msgstr "非強制建立"
 msgid ""
 "You cannot change the owner company of an account that already contains "
 "journal items."
-msgstr "你不能修改已經存在憑證的公司帳戶。"
+msgstr "你不能修改已經存在借貸項的公司帳戶。"
 
 #. module: account
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:58
@@ -6206,7 +6213,7 @@ msgstr "輸入開始日期"
 #: selection:account.invoice.report,type:0
 #: selection:report.invoice.created,type:0
 msgid "Supplier Refund"
-msgstr "供應商紅字發票"
+msgstr "供應商折讓"
 
 #. module: account
 #: field:account.bank.statement,move_line_ids:0
@@ -6239,7 +6246,7 @@ msgstr "匯總"
 #: view:account.tax.code.template:0
 #: view:analytic.entries.report:0
 msgid "Group By..."
-msgstr "分組..."
+msgstr "分類方式..."
 
 #. module: account
 #: field:account.journal.column,readonly:0
@@ -6254,7 +6261,7 @@ msgstr "  估值:平衡"
 #. module: account
 #: field:account.invoice.line,uos_id:0
 msgid "Unit of Measure"
-msgstr "計量單位"
+msgstr "量度單位"
 
 #. module: account
 #: constraint:account.payment.term.line:0
@@ -6282,13 +6289,13 @@ msgstr "account.sequence.fiscalyear"
 #: model:ir.actions.report.xml,name:account.analytic_journal_print
 #: model:ir.model,name:account.model_account_analytic_journal
 msgid "Analytic Journal"
-msgstr "輔助核算賬薄"
+msgstr "輔助核算帳薄"
 
 #. module: account
 #: code:addons/account/account.py:622
 #, python-format
 msgid "You can not desactivate an account that contains some journal items."
-msgstr "您不能停用已經存在憑證的賬戶。"
+msgstr "您不能停用已經存在借貸項的帳戶。"
 
 #. module: account
 #: view:account.entries.report:0
@@ -6344,24 +6351,24 @@ msgstr "輔助核算統計"
 #: code:addons/account/account.py:624
 #, python-format
 msgid "You can not remove an account containing journal items."
-msgstr "您不能刪除已經存在憑證的賬戶。"
+msgstr "您不能刪除已經存在借貸項的帳戶。"
 
 #. module: account
 #: code:addons/account/account_analytic_line.py:145
 #: code:addons/account/account_move_line.py:933
 #, python-format
 msgid "Entries: "
-msgstr "憑證： "
+msgstr "分錄： "
 
 #. module: account
 #: view:account.use.model:0
 msgid "Create manual recurring entries in a chosen journal."
-msgstr "在選定的賬簿手動建立定期分錄。"
+msgstr "在選定的帳簿手動建立定期分錄。"
 
 #. module: account
 #: help:res.partner.bank,currency_id:0
 msgid "Currency of the related account journal."
-msgstr "貨幣的關聯賬戶憑證。"
+msgstr "貨幣的關聯會計帳簿。"
 
 #. module: account
 #: code:addons/account/account.py:1563
@@ -6380,7 +6387,7 @@ msgid ""
 "account. From this view, you can create and manage the account types you "
 "need for your company."
 msgstr ""
-"科目類型確定了科目在記賬時如何使用。科目類型的結轉方法確定年結時的流程。分類用於資產負債表和損益表。您可以在這裡建立和管理貴公司的科目類型。"
+"科目類型確定了科目在記帳時如何使用。科目類型的結轉方法確定年結時的流程。分類用於資產負債表和損益表。您可以在這裡建立和管理貴公司的科目類型。"
 
 #. module: account
 #: selection:account.account.type,report_type:0
@@ -6395,7 +6402,7 @@ msgid ""
 "Bank Reconciliation consists of verifying that your bank statement "
 "corresponds with the entries (or records) of that account in your accounting "
 "system."
-msgstr "銀行對賬是核實您的銀行帳戶與本公司該科目內容是否一致。"
+msgstr "銀行對帳是核實您的銀行帳戶與本公司該科目內容是否一致。"
 
 #. module: account
 #: model:process.node,note:account.process_node_draftstatement0
@@ -6413,7 +6420,7 @@ msgstr "借方合計"
 #: code:addons/account/account_move_line.py:808
 #, python-format
 msgid "Entry \"%s\" is not valid !"
-msgstr "憑證\"%s\"無效！"
+msgstr "分錄\"%s\"無效！"
 
 #. module: account
 #: report:account.invoice:0
@@ -6425,14 +6432,14 @@ msgstr "傳真:"
 msgid ""
 "This will automatically configure your chart of accounts, bank accounts, "
 "taxes and journals according to the selected template"
-msgstr "將根據選擇的模板自動設置您的科目表、銀行帳號、賬簿"
+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 "這科目將用於替換當前業務夥伴的預設應收款科目"
+msgstr "這科目將用於替換當前業務夥伴的預設應收帳款科目"
 
 #. module: account
 #: field:account.tax,python_applicable:0
@@ -6443,19 +6450,19 @@ msgstr "這科目將用於替換當前業務夥伴的預設應收款科目"
 #: field:account.tax.template,python_compute:0
 #: selection:account.tax.template,type:0
 msgid "Python Code"
-msgstr "Python代碼"
+msgstr "Python程式碼"
 
 #. module: account
 #: view:account.entries.report:0
 msgid "Journal Entries with period in current period"
-msgstr "當前期間憑證列表"
+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 "勾選這裡，則此憑證簿下的會計憑證或發票可以被作廢。"
+msgstr "勾選這裡，則此帳簿下的分錄或發票可以被作廢。"
 
 #. module: account
 #: view:account.fiscalyear.close:0
@@ -6472,7 +6479,7 @@ msgstr "建立分錄"
 #: code:addons/account/account.py:182
 #, python-format
 msgid "Profit & Loss (Expense account)"
-msgstr "損益(費用賬戶)"
+msgstr "損益(費用帳戶)"
 
 #. module: account
 #: code:addons/account/account.py:622
@@ -6525,7 +6532,7 @@ msgstr "稅務報表"
 #. module: account
 #: selection:account.journal.period,state:0
 msgid "Printed"
-msgstr "已打印"
+msgstr "已列印"
 
 #. module: account
 #: code:addons/account/account_move_line.py:584
@@ -6537,7 +6544,7 @@ msgstr "錯誤："
 #. module: account
 #: view:account.analytic.line:0
 msgid "Project line"
-msgstr "項目明細"
+msgstr "專案細項"
 
 #. module: account
 #: field:account.invoice.tax,manual:0
@@ -6577,7 +6584,7 @@ msgstr "如果你選擇了按日期或期間篩選，可以用這個欄位按所
 #: 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 "會計憑證"
+msgstr "分錄"
 
 #. module: account
 #: help:account.partner.ledger,page_split:0
@@ -6592,7 +6599,7 @@ msgid ""
 "some non legal fields or you must unreconcile first!\n"
 "%s"
 msgstr ""
-"你不能對已核銷的會計憑證做這樣的修改！你只能改一些非關鍵欄位或者先反核銷這個憑證！\n"
+"你不能對已核銷的分錄做這樣的修改！你只能改一些非關鍵欄位或者先反核銷這筆分錄！\n"
 "%s"
 
 #. module: account
@@ -6616,7 +6623,7 @@ msgstr "這個報表是每個業務夥伴的往來匯總。這個PDF報表的每
 #, python-format
 msgid ""
 "Selected Entry Lines does not have any account move enties in draft state"
-msgstr "所選的憑證沒有為草稿狀態的"
+msgstr "所選的分錄沒有為草稿狀態的"
 
 #. module: account
 #: selection:account.aged.trial.balance,target_move:0
@@ -6639,18 +6646,18 @@ msgstr "所選的憑證沒有為草稿狀態的"
 #: code:addons/account/report/common_report_header.py:67
 #, python-format
 msgid "All Entries"
-msgstr "所有憑證"
+msgstr "所有分錄"
 
 #. module: account
 #: constraint:product.template:0
 msgid ""
 "Error: The default UOM and the purchase UOM must be in the same category."
-msgstr "錯誤:預設的計量單位和採購的計量單位必須是同一類型."
+msgstr "錯誤：預設計量單位和採購計量單位必須在同一分類中。"
 
 #. module: account
 #: view:account.journal.select:0
 msgid "Journal Select"
-msgstr "選擇賬簿"
+msgstr "選擇帳簿"
 
 #. module: account
 #: view:account.bank.statement:0
@@ -6679,7 +6686,7 @@ msgstr "稅負"
 #: model:ir.actions.report.xml,name:account.account_general_ledger_landscape
 #: model:ir.ui.menu,name:account.menu_general_ledger
 msgid "General Ledger"
-msgstr "總賬"
+msgstr "總帳"
 
 #. module: account
 #: model:process.transition,note:account.process_transition_paymentorderbank0
@@ -6699,7 +6706,7 @@ msgstr "此報表用於生成一個試算平衡表的PDF報表。這樣你可以
 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 "勾選這裡，如果您不確定憑證是否正確，您可以把它標注為「待審核」狀態交由會計師來確定。"
+msgstr "勾選這裡，如果您不確定分錄是否正確，您可以把它標注為「待審核」狀態交由會計師來確定。"
 
 #. module: account
 #: field:account.chart.template,complete_tax_set:0
@@ -6752,7 +6759,7 @@ msgid ""
 "\n"
 "e.g. My model on %(date)s"
 msgstr ""
-"可以在憑證模版的名稱上使用年月日變量\n"
+"可以在分錄模版的名稱上使用年月日變量\n"
 "\n"
 "%(year)s：本年\n"
 "%(month)s：本月\n"
@@ -6803,7 +6810,7 @@ msgstr "銷售"
 #: view:account.journal.column:0
 #: model:ir.model,name:account.model_account_journal_column
 msgid "Journal Column"
-msgstr "賬簿列"
+msgstr "帳簿欄"
 
 #. module: account
 #: selection:account.invoice.report,state:0
@@ -6821,8 +6828,8 @@ msgid ""
 "accounting application of OpenERP, journals and accounts will be created "
 "automatically based on these data."
 msgstr ""
-"配置貴公司的銀行賬號並選擇需要在報表頁腳顯示的帳號。你可以在列表視圖對銀行排序。如果你使用了OpenERP的會計功能，會基於這些銀行賬號數據自動建立憑證簿"
-"和會計科目。"
+"配置貴公司的銀行帳號並選擇需要在報表頁腳顯示的帳號。你可以在列表視圖對銀行排序。如果你使用了OpenERP的會計功能，會基於這些銀行帳號數據自動建立帳簿和"
+"會計科目。"
 
 #. module: account
 #: model:process.transition,note:account.process_transition_invoicemanually0
@@ -6839,7 +6846,7 @@ msgid ""
 "you request an interval of 30 days OpenERP generates an analysis of "
 "creditors for the past month, past two months, and so on. "
 msgstr ""
-"業務夥伴過期試算表是某個時間段內應收賬款的詳細的報表。打開這個報表後請輸入公司名稱、會計期間、分析的時間段（按天）。OpenERP會按期間計算應收賬款餘額"
+"業務夥伴過期試算表是某個時間段內應收帳款的詳細的報表。打開這個報表後請輸入公司名稱、會計期間、分析的時間段（按天）。OpenERP會按期間計算應收帳款餘額"
 "。如果你輸入了30天，OpenERP生成業務夥伴前一個月，再前一個月的金額。 "
 
 #. module: account
@@ -6852,7 +6859,7 @@ msgstr "源單據"
 #: code:addons/account/account.py:1432
 #, python-format
 msgid "You can not delete a posted journal entry \"%s\"!"
-msgstr "你不能刪除一個已覆核的會計憑證「%s」 ！"
+msgstr "你不能刪除一個已覆核的分錄「%s」 ！"
 
 #. module: account
 #: selection:account.partner.ledger,filter:0
@@ -6865,7 +6872,7 @@ msgstr "未核銷分錄"
 #. module: account
 #: model:ir.ui.menu,name:account.menu_menu_Bank_process
 msgid "Statements Reconciliation"
-msgstr "對賬報表"
+msgstr "對帳報表"
 
 #. module: account
 #: model:ir.model,name:account.model_accounting_report
@@ -6889,7 +6896,7 @@ msgid ""
 "from a specific date, i.e. corresponding to the signature of a contract or "
 "an agreement with a customer or a supplier. With Define Recurring Entries, "
 "you can create such entries to automate the postings in the system."
-msgstr "定期憑證是一中在指定時間發生的各種憑證，一般基於與客戶或供應商簽訂的合同。您可以定義定期憑證在系統中自動過賬。"
+msgstr "定期分錄是一中在指定時間發生的各種分錄，一般基於與客戶或供應商簽訂的合同。您可以定義定期分錄在系統中自動過帳。"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_report_tree_hierarchy
@@ -6910,14 +6917,14 @@ msgid ""
 "This feature provides an easy way to follow up cash payments on a daily "
 "basis. You can enter the coins that are in your cash box, and then post "
 "entries when money comes in or goes out of the cash box."
-msgstr "現金記錄用來管理現金日記賬上的收支分錄。這個功能用於跟蹤日常的現金支付。可以輸入你備用現金的金額，然後在現金進出時建立分錄。"
+msgstr "現金記錄用來管理現金帳簿上的收支分錄。這個功能用於追蹤日常的現金支付。可以輸入你備用現金的金額，然後在現金進出時建立分錄。"
 
 #. module: account
 #: help:account.invoice.refund,date:0
 msgid ""
 "This date will be used as the invoice date for Refund Invoice and Period "
 "will be chosen accordingly!"
-msgstr "這日期將用作這紅字發票的發票日期和將選擇相應的會計期間!"
+msgstr "這日期將用作這折讓單的日期和將選擇相應的會計期間!"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.act_account_invoice_partner_relation
@@ -6944,7 +6951,7 @@ msgstr "稅模板"
 #. module: account
 #: view:account.journal.select:0
 msgid "Are you sure you want to open Journal Entries?"
-msgstr "你確定要顯示這個憑證簿的會計憑證麼？"
+msgstr "你確定要顯示這個帳簿的分錄嗎？"
 
 #. module: account
 #: view:account.state.open:0
@@ -6987,7 +6994,7 @@ msgstr "導入會計科目表"
 #: field:account.move.line,statement_id:0
 #: model:process.process,name:account.process_process_statementprocess0
 msgid "Statement"
-msgstr "對賬單"
+msgstr "對帳單"
 
 #. module: account
 #: help:account.journal,default_debit_account_id:0
@@ -6999,12 +7006,12 @@ msgstr "它將作為一個預設的借方科目"
 msgid ""
 "You can search for individual account entries through useful information. To "
 "search for account entries, open a journal, then select a record line."
-msgstr "要搜索分錄明細，打開一個賬簿，選擇一個記錄。"
+msgstr "要搜索分錄明細，打開一個帳簿，選擇一個記錄。"
 
 #. module: account
 #: view:account.entries.report:0
 msgid "Posted entries"
-msgstr "已覆核的會計憑證呢個"
+msgstr "已登的分錄"
 
 #. module: account
 #: help:account.payment.term.line,value_amount:0
@@ -7056,7 +7063,7 @@ 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 "勾選此項，在會計年度關閉時, 確定每個賬簿的分錄不會產生新副本, 而是共享同一副本。"
+msgstr "勾選此項，在會計年度關閉時, 確定每個帳簿的分錄不會產生新副本, 而是共享同一副本。"
 
 #. module: account
 #: field:account.bank.statement,closing_date:0
@@ -7066,7 +7073,7 @@ msgstr "關閉在"
 #. module: account
 #: model:ir.model,name:account.model_account_bank_statement_line
 msgid "Bank Statement Line"
-msgstr "銀行對賬單明細"
+msgstr "銀行對帳單明細"
 
 #. module: account
 #: field:account.automatic.reconcile,date2:0
@@ -7105,7 +7112,7 @@ msgstr "同一家公司你應該選擇一個會計期間"
 #. module: account
 #: model:ir.actions.act_window,name:account.action_review_payment_terms_installer
 msgid "Review your Payment Terms"
-msgstr "檢查你的付款條件"
+msgstr "檢查您的付款條件"
 
 #. module: account
 #: field:account.fiscalyear.close,report_name:0
@@ -7153,13 +7160,13 @@ msgstr "關閉錢箱"
 #: view:account.journal:0
 #: field:res.partner.bank,journal_id:0
 msgid "Account Journal"
-msgstr "賬簿"
+msgstr "帳簿"
 
 #. module: account
 #: model:process.node,name:account.process_node_paidinvoice0
 #: model:process.node,name:account.process_node_supplierpaidinvoice0
 msgid "Paid invoice"
-msgstr "支付發票"
+msgstr "已支付發票"
 
 #. module: account
 #: help:account.partner.reconcile.process,next_partner_id:0
@@ -7198,7 +7205,7 @@ msgid ""
 "OpenERP. If you want to record a supplier invoice, start by recording the "
 "line of the expense account, OpenERP will propose to you automatically the "
 "Tax related to this account and the counter-part \"Account Payable\"."
-msgstr "此界面用於會計人員正式的記錄。當輸入供應商發票時，請先輸入明細的費用科目，OpenERP將為您自動生成相關的稅和應付款"
+msgstr "此界面用於會計人員正式的記錄。當輸入供應商發票時，請先輸入明細的費用科目，OpenERP將為您自動生成相關的稅和應付帳款"
 
 #. module: account
 #: view:account.invoice.line:0
@@ -7210,7 +7217,7 @@ msgstr "發票明細"
 #. module: account
 #: view:account.invoice.report:0
 msgid "Customer And Supplier Refunds"
-msgstr "客戶和供應商紅字發票"
+msgstr "客戶和供應商折讓"
 
 #. module: account
 #: field:account.financial.report,sign:0
@@ -7221,7 +7228,7 @@ msgstr "報表上的符號"
 #: code:addons/account/wizard/account_fiscalyear_close.py:73
 #, python-format
 msgid "The periods to generate opening entries were not found"
-msgstr "用於生成期初餘額會計憑證的期間不存在"
+msgstr "用於生成期初餘額分錄的期間不存在"
 
 #. module: account
 #: model:account.account.type,name:account.data_account_type_view
@@ -7267,7 +7274,7 @@ msgstr "可選信息"
 #: code:addons/account/wizard/account_fiscalyear_close.py:84
 #, python-format
 msgid "The journal must have default credit and debit account"
-msgstr "這賬簿必須要有預設貸方和借方科目"
+msgstr "這帳簿必須要有預設貸方和借方科目"
 
 #. module: account
 #: report:account.general.journal:0
@@ -7284,7 +7291,7 @@ msgstr "當日匯率"
 msgid ""
 "This field is used for payable and receivable journal entries. You can put "
 "the limit date for the payment of this line."
-msgstr "此欄位是用於應付賬款和應收賬款的分錄。您可以用它設置付款明細的最後限期。"
+msgstr "此欄位是用於應付帳款和應收帳款的分錄。您可以用它設置付款明細的最後限期。"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_multi_currency
@@ -7306,13 +7313,13 @@ msgstr "無效科目!"
 #: code:addons/account/account.py:3108
 #, python-format
 msgid "Sales Journal"
-msgstr "銷售賬簿"
+msgstr "銷售帳簿"
 
 #. module: account
 #: code:addons/account/wizard/account_move_journal.py:104
 #, python-format
 msgid "Open Journal Items !"
-msgstr "打開賬簿的明細！"
+msgstr "打開帳簿的借貸項！"
 
 #. module: account
 #: model:ir.model,name:account.model_account_invoice_tax
@@ -7346,7 +7353,7 @@ msgstr ""
 #. module: account
 #: view:account.move:0
 msgid "Unposted Journal Entries"
-msgstr "未審核的會計憑證"
+msgstr "未登的分錄"
 
 #. module: account
 #: view:product.product:0
@@ -7402,7 +7409,7 @@ msgid ""
 "one or several payments. Customers periodic reminders will use the payment "
 "terms for each letter. Each customer or supplier can be assigned to one of "
 "these payment terms."
-msgstr "付款條款用於客戶或供應商的付款。對客戶的定期催款會在每個催款函中用到付款條件。可以為每個供應商或客戶指定預設付款條件。"
+msgstr "付款條件用於客戶或供應商的付款。對客戶的定期催款會在每個催款函中用到付款條件。可以為每個供應商或客戶指定預設付款條件。"
 
 #. module: account
 #: selection:account.entries.report,month:0
@@ -7423,7 +7430,7 @@ msgstr "5"
 #: code:addons/account/report/account_partner_balance.py:299
 #, python-format
 msgid "Payable Accounts"
-msgstr "應付款科目"
+msgstr "應付帳款科目"
 
 #. module: account
 #: code:addons/account/account_invoice.py:732
@@ -7452,12 +7459,12 @@ msgstr "事務編碼"
 #. module: account
 #: view:validate.account.move:0
 msgid "Post Journal Entries of a Journal"
-msgstr "賬簿裡的分錄登賬"
+msgstr "帳簿裡的分錄登帳"
 
 #. module: account
 #: view:product.product:0
 msgid "Sale Taxes"
-msgstr "銷售稅"
+msgstr "銷項稅額"
 
 #. module: account
 #: field:account.financial.report,name:0
@@ -7496,7 +7503,7 @@ msgstr "目標科目"
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:58
 #, python-format
 msgid "UserError"
-msgstr "用戶錯誤"
+msgstr "使用者錯誤"
 
 #. module: account
 #: model:process.node,note:account.process_node_supplierpaymentorder0
@@ -7526,7 +7533,7 @@ msgstr "錯誤！您不能建立循環分類。"
 #. module: account
 #: help:account.model.line,quantity:0
 msgid "The optional quantity on entries."
-msgstr "憑證行中可選的數量"
+msgstr "分錄行中可選的數量"
 
 #. module: account
 #: view:account.financial.report:0
@@ -7546,7 +7553,7 @@ msgstr "銷售科目類型"
 #. module: account
 #: help:account.invoice,move_id:0
 msgid "Link to the automatically generated Journal Items."
-msgstr "鏈接到自動生成的會計憑證行"
+msgstr "鏈接到自動生成的借貸項"
 
 #. module: account
 #: selection:account.installer,period:0
@@ -7562,7 +7569,7 @@ msgid ""
 "in which they will appear. Then you can create a new journal and link your "
 "view to it."
 msgstr ""
-"在這裡您可以修改一個賬簿視圖或建一個新的視圖。賬簿視圖定義您輸入分錄。當您要建立一個新的視圖，選擇您要顯示在視圖上的欄位並指定它們的序列。"
+"在這裡您可以修改一個帳簿視圖或建一個新的視圖。帳簿視圖定義您輸入分錄。當您要建立一個新的視圖，選擇您要顯示在視圖上的欄位並指定它們的序列。"
 
 #. module: account
 #: model:account.account.type,name:account.data_account_type_asset
@@ -7614,7 +7621,7 @@ msgstr "序列欄位用於稅從低到高排序.。如果稅中有子稅這排
 #. module: account
 #: model:ir.model,name:account.model_account_cashbox_line
 msgid "CashBox Line"
-msgstr "錢箱賬明細"
+msgstr "現金帳明細"
 
 #. module: account
 #: view:account.partner.ledger:0
@@ -7624,7 +7631,7 @@ msgstr "錢箱賬明細"
 #: 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 "業務夥伴分類賬"
+msgstr "業務夥伴分類帳"
 
 #. module: account
 #: selection:account.tax.template,type:0
@@ -7656,7 +7663,7 @@ msgstr "憑證明細的狀態"
 #. module: account
 #: model:ir.model,name:account.model_account_move_line_reconcile
 msgid "Account move line reconcile"
-msgstr "核銷憑證明細"
+msgstr "調節憑證明細"
 
 #. module: account
 #: view:account.subscription.generate:0
@@ -7699,7 +7706,7 @@ msgstr "在發票上選擇合適的幣別"
 #, python-format
 msgid ""
 "The bank account defined on the selected chart of accounts hasn't a code."
-msgstr "所選會計科目表上定義的銀行賬號沒有編碼"
+msgstr "所選會計科目表上定義的銀行帳號沒有編碼"
 
 #. module: account
 #: code:addons/account/wizard/account_invoice_refund.py:108
@@ -7758,7 +7765,7 @@ msgid ""
 "The statement balance is incorrect !\n"
 "The expected balance (%.2f) is different than the computed one. (%.2f)"
 msgstr ""
-"銀行對賬單餘額不正確！\n"
+"銀行對帳單餘額不正確！\n"
 "預期的餘額是(%.2f)，現在算出來的是(%.2f)"
 
 #. module: account
@@ -7777,8 +7784,8 @@ msgid ""
 "Most of the OpenERP operations (invoices, timesheets, expenses, etc) "
 "generate analytic entries on the related account."
 msgstr ""
-"會計科目表一般按所在國家的要求有確定的結構。成本科目表按您的業務需求和內部報表自定義。一般包含合同、項目、產品、部門。大多數OpenERP業務（發票、計工"
-"單、報銷等）會生成相關成本科目的成本憑證。"
+"會計科目表一般按所在國家的要求有確定的結構。成本科目表按您的業務需求和內部報表自定義。一般包含合同、項目、產品、部門。大多數OpenERP業務（發票、工時"
+"表、報銷等）會生成相關成本科目的成本分錄。"
 
 #. module: account
 #: field:account.account.type,close_method:0
@@ -7812,7 +7819,7 @@ msgstr "如果勾選此項, 系統將試圖對生成的發票分組"
 #: help:account.account,reconcile:0
 msgid ""
 "Check this box if this account allows reconciliation of journal items."
-msgstr "如果此會計科目需要核銷，勾選這裡"
+msgstr "如果此會計科目需要調節，勾選這裡"
 
 #. module: account
 #: help:account.period,state:0
@@ -7874,9 +7881,9 @@ msgid ""
 msgstr ""
 " 新建的發票是『草稿』狀態。\n"
 "點擊了形式發票按鈕後的發票是『形式發票』狀態，此時沒有發票號。\n"
-"當用戶開好了發票後，點『建立』按鈕發票進入『未付款』狀態，此時分配了發票號。\n"
+"當使用者開好了發票後，點『建立』按鈕發票進入『未付款』狀態，此時分配了發票號。\n"
 "當輸入付款以後發票進入『已付款』狀態。\n"
-"如用戶作廢了發票則進入『已取消』狀態。"
+"如使用者作廢了發票則進入『已取消』狀態。"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -7924,7 +7931,7 @@ msgstr "選擇會計年度"
 #: code:addons/account/account.py:3111
 #, python-format
 msgid "Purchase Refund Journal"
-msgstr "採購紅字發票賬簿"
+msgstr "進貨退回帳簿"
 
 #. module: account
 #: help:account.tax.template,amount:0
@@ -7988,24 +7995,24 @@ msgstr "不含稅合計:"
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_generic_reporting
 msgid "Generic Reporting"
-msgstr "通用報告"
+msgstr "通用報表"
 
 #. module: account
 #: field:account.move.line.reconcile.writeoff,journal_id:0
 msgid "Write-Off Journal"
-msgstr "補差額賬簿"
+msgstr "補差額帳簿"
 
 #. module: account
 #: help:res.partner,property_payment_term:0
 msgid ""
 "This payment term will be used instead of the default one for the current "
 "partner"
-msgstr "這付款條款將替代為當前業務夥伴預設的."
+msgstr "這付款條件將替代為當前業務夥伴預設的."
 
 #. module: account
 #: view:account.tax.template:0
 msgid "Compute Code for Taxes Included Prices"
-msgstr ""
+msgstr "計算含稅價格代碼"
 
 #. module: account
 #: code:addons/account/account_invoice.py:1030
@@ -8013,7 +8020,7 @@ msgstr ""
 msgid ""
 "You can not cancel an invoice which is partially paid! You need to "
 "unreconcile related payment entries first!"
-msgstr "你不能取消已部分付款的發票！你需要先反核銷對應的付款憑證。"
+msgstr "你不能取消已部分付款的發票！你需要先反核銷對應的付款分錄。"
 
 #. module: account
 #: field:account.chart.template,property_account_income_categ:0
@@ -8029,7 +8036,7 @@ msgstr "已調整的餘額"
 #: 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 "財務結構模板"
+msgstr "財務結構模組"
 
 #. module: account
 #: view:account.entries.report:0
@@ -8053,7 +8060,7 @@ msgid ""
 "refund is a document that credits an invoice completely or partially. You "
 "can easily generate refunds and reconcile them directly from the invoice "
 "form."
-msgstr "在客戶紅字發票您能管理您客戶的欠款單，紅字發票是發票的全部或部分項。您能直接在發票窗口輕鬆生成紅字發票和核對它們。"
+msgstr "在客戶折讓您能管理您客戶的欠款單，折讓單是發票的全部或部分項。您能直接在發票窗口輕鬆生成折讓單和核對它們。"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_vat_declaration
@@ -8065,6 +8072,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 ""
+"This menu print a VAT declaration based on invoices or payments. You can "
+"select one or several periods of the fiscal year. 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."
 
 #. module: account
 #: report:account.invoice:0
@@ -8074,7 +8087,7 @@ msgstr "電話:"
 #. module: account
 #: field:account.account,company_currency_id:0
 msgid "Company Currency"
-msgstr "公司本位幣"
+msgstr "公司貨幣"
 
 #. module: account
 #: field:account.aged.trial.balance,chart_account_id:0
@@ -8111,13 +8124,13 @@ msgstr "期末結餘"
 msgid ""
 "You can check this box to mark this journal item as a litigation with the "
 "associated partner"
-msgstr "您可以勾選此，標記賬簿的明細正與相關業務夥伴在爭議中。"
+msgstr "您可以勾選此，標記帳簿的明細正與相關業務夥伴在爭議中。"
 
 #. module: account
 #: field:account.move.line,reconcile_partial_id:0
 #: view:account.move.line.reconcile:0
 msgid "Partial Reconcile"
-msgstr "部分核銷"
+msgstr "部分調節"
 
 #. module: account
 #: model:ir.model,name:account.model_account_analytic_inverted_balance
@@ -8148,18 +8161,18 @@ msgstr ""
 #. module: account
 #: model:process.transition,name:account.process_transition_filestatement0
 msgid "Automatic import of the bank sta"
-msgstr "自動導入銀行對賬單"
+msgstr "自動導入銀行對帳單"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_journal_view
 #: model:ir.ui.menu,name:account.menu_action_account_journal_view
 msgid "Journal Views"
-msgstr "賬簿視圖"
+msgstr "帳簿視圖"
 
 #. module: account
 #: model:ir.model,name:account.model_account_move_bank_reconcile
 msgid "Move bank reconcile"
-msgstr "核銷銀行憑證"
+msgstr "調節銀行憑證"
 
 #. module: account
 #: field:account.financial.report,account_type_ids:0
@@ -8185,13 +8198,13 @@ msgstr "  金額：無"
 #: model:process.node,name:account.process_node_supplierreconciliation0
 #, python-format
 msgid "Reconciliation"
-msgstr "核銷"
+msgstr "調節"
 
 #. module: account
 #: view:account.chart.template:0
 #: field:account.chart.template,property_account_receivable:0
 msgid "Receivable Account"
-msgstr "應收款科目"
+msgstr "應收帳款科目"
 
 #. module: account
 #: view:account.invoice:0
@@ -8203,8 +8216,8 @@ msgid ""
 "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.model,name:account.model_account_fiscalyear_close_state
@@ -8214,7 +8227,7 @@ msgstr "關閉一個會計年度"
 #. module: account
 #: field:account.invoice.refund,journal_id:0
 msgid "Refund Journal"
-msgstr "紅字發票賬簿"
+msgstr "折讓帳簿"
 
 #. module: account
 #: report:account.account.balance:0
@@ -8240,7 +8253,7 @@ msgstr "客戶發票用於管理要發給客戶的銷售發票。OpenERP可以
 #, python-format
 msgid ""
 "In order to close a period, you must first post related journal entries."
-msgstr "在關閉會計期間之前，請先覆核本期間的會計憑證。"
+msgstr "在關閉會計期間之前，請先覆核本期間的分錄。"
 
 #. module: account
 #: view:account.entries.report:0
@@ -8263,7 +8276,7 @@ msgstr "稅 %.2f%%"
 #. module: account
 #: view:account.analytic.account:0
 msgid "Contacts"
-msgstr "聯繫人"
+msgstr "聯絡人"
 
 #. module: account
 #: field:account.tax.code,parent_id:0
@@ -8275,18 +8288,18 @@ msgstr "上級代碼"
 #. module: account
 #: model:ir.model,name:account.model_account_payment_term_line
 msgid "Payment Term Line"
-msgstr "付款條款明細"
+msgstr "付款條件明細"
 
 #. module: account
 #: code:addons/account/account.py:3109
 #, python-format
 msgid "Purchase Journal"
-msgstr "採購賬簿"
+msgstr "採購帳簿"
 
 #. module: account
 #: view:account.invoice.refund:0
 msgid "Refund Invoice: Creates the refund invoice, ready for editing."
-msgstr "紅字發票：建立紅字發票，準備編輯。"
+msgstr "折讓單：建立折讓，準備編輯。"
 
 #. module: account
 #: field:account.invoice.line,price_subtotal:0
@@ -8296,12 +8309,12 @@ msgstr "小計"
 #. module: account
 #: view:account.vat.declaration:0
 msgid "Print Tax Statement"
-msgstr "打印稅單"
+msgstr "列印稅單"
 
 #. module: account
 #: view:account.model.line:0
 msgid "Journal Entry Model Line"
-msgstr "賬簿模型明細"
+msgstr "分錄模型明細"
 
 #. module: account
 #: view:account.invoice:0
@@ -8333,7 +8346,7 @@ msgstr "供應商會計屬性"
 msgid ""
 "The residual amount on a receivable or payable of a journal entry expressed "
 "in the company currency."
-msgstr "用公司本位幣表示的應收或應付賬簿的餘額。"
+msgstr "用公司本位幣表示的應收或應付分錄的餘額。"
 
 #. module: account
 #: view:account.tax.code:0
@@ -8388,7 +8401,7 @@ msgstr "資金"
 #: view:account.analytic.journal.report:0
 #: view:account.common.report:0
 msgid "Print"
-msgstr "打印"
+msgstr "列印"
 
 #. module: account
 #: view:account.journal:0
@@ -8398,7 +8411,7 @@ msgstr "允許科目(留空為不限制)"
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_account_template
 msgid "Template Account Fiscal Mapping"
-msgstr "科目一覽模版"
+msgstr "科目一覽模組"
 
 #. module: account
 #: view:board.board:0
@@ -8426,12 +8439,12 @@ msgstr "輔助核算成本"
 #: report:account.general.journal:0
 #: field:account.journal,name:0
 msgid "Journal Name"
-msgstr "賬簿名稱"
+msgstr "帳簿名稱"
 
 #. module: account
 #: view:account.move.line:0
 msgid "Next Partner Entries to reconcile"
-msgstr "要核銷的下一個往來憑證"
+msgstr "要調節的下一個往來分錄"
 
 #. module: account
 #: selection:account.financial.report,style_overwrite:0
@@ -8455,7 +8468,7 @@ msgstr "發票建立時自動計算出唯一的發票編號"
 msgid ""
 "The amount of the voucher must be the same amount as the one on the "
 "statement line"
-msgstr "手工單據的金額必須和對賬單明細上的金額一致"
+msgstr "分錄金額必須和對帳單明細上的金額一致"
 
 #. module: account
 #: model:account.account.type,name:account.data_account_type_expense
@@ -8489,7 +8502,7 @@ msgid ""
 "Make sure you have configured payment terms properly !\n"
 "The latest payment term line should be of the type \"Balance\" !"
 msgstr ""
-"你不能覆核沒有平衡的會計憑證！\n"
+"你不能覆核沒有平衡的分錄！\n"
 "請確認你的付款條件配置正確！\n"
 "付款條件的最後一行類型應該是『餘額』！"
 
@@ -8527,7 +8540,7 @@ msgstr "幣別"
 #: help:account.bank.statement.line,sequence:0
 msgid ""
 "Gives the sequence order when displaying a list of bank statement lines."
-msgstr "提供顯示銀行對賬單的序列"
+msgstr "提供顯示銀行對帳單的序列"
 
 #. module: account
 #: model:process.transition,note:account.process_transition_validentries0
@@ -8550,7 +8563,7 @@ msgstr "根據您的需要定義公司的會計年度。每個會計年度會計
 #: view:account.entries.report:0
 #: model:ir.actions.act_window,name:account.act_account_acount_move_line_reconcile_open
 msgid "Reconciled entries"
-msgstr "核銷分錄"
+msgstr "調節分錄"
 
 #. module: account
 #: field:account.invoice,address_contact_id:0
@@ -8571,7 +8584,7 @@ msgstr "強制會計期間"
 #. module: account
 #: model:ir.model,name:account.model_account_partner_balance
 msgid "Print Account Partner Balance"
-msgstr "打印業務夥伴餘額"
+msgstr "列印業務夥伴餘額"
 
 #. module: account
 #: help:account.financial.report,sign:0
@@ -8582,8 +8595,8 @@ msgid ""
 "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
@@ -8603,12 +8616,12 @@ msgstr "未知的"
 #: code:addons/account/account.py:3113
 #, python-format
 msgid "Opening Entries Journal"
-msgstr "賬簿的開賬分錄"
+msgstr "帳簿的開帳分錄"
 
 #. module: account
 #: model:process.transition,note:account.process_transition_customerinvoice0
 msgid "Draft invoices are checked, validated and printed."
-msgstr "發票草稿待檢查，生效和打印。"
+msgstr "發票草稿待檢查，生效和列印。"
 
 #. module: account
 #: help:account.chart.template,property_reserve_and_surplus_account:0
@@ -8622,7 +8635,7 @@ msgstr "這科目用於損益(如果是利潤：金額就加，損失：金額
 #: code:addons/account/account_invoice.py:808
 #, python-format
 msgid "Please define sequence on the journal related to this invoice."
-msgstr "請為這張發票對應的憑證簿選擇編號規則"
+msgstr "請為這張發票對應的帳簿選擇編號規則"
 
 #. module: account
 #: view:account.move:0
@@ -8640,7 +8653,7 @@ msgstr "本年按類型分組的銷售"
 #. module: account
 #: view:account.analytic.cost.ledger.journal.report:0
 msgid "Cost Ledger for Period"
-msgstr ""
+msgstr "成本分類帳的會計期間"
 
 #. module: account
 #: help:account.tax,child_depend:0
@@ -8658,7 +8671,7 @@ msgstr "Python代碼"
 #. module: account
 #: field:account.analytic.journal,code:0
 msgid "Journal Code"
-msgstr "賬簿編碼"
+msgstr "帳簿編碼"
 
 #. module: account
 #: help:account.tax.code,sign:0
@@ -8679,18 +8692,18 @@ msgstr "餘額"
 #: field:account.invoice,move_lines:0
 #: field:account.move.reconcile,line_id:0
 msgid "Entry Lines"
-msgstr "憑證明細"
+msgstr "分錄明細"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_view_financial_accounts_installer
 msgid "Review your Financial Accounts"
-msgstr "檢查你的會計科目"
+msgstr "檢查您的會計科目"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_open_journal_button
 #: model:ir.actions.act_window,name:account.action_validate_account_move
 msgid "Open Journal"
-msgstr "未結的賬簿"
+msgstr "未結的帳簿"
 
 #. module: account
 #: report:account.analytic.account.journal:0
@@ -8708,7 +8721,7 @@ msgstr "會計期間從"
 #: code:addons/account/account.py:3110
 #, python-format
 msgid "Sales Refund Journal"
-msgstr "銷售紅字發票賬簿"
+msgstr "銷貨折讓帳簿"
 
 #. module: account
 #: view:account.move:0
@@ -8778,7 +8791,7 @@ msgstr "SCNJ"
 msgid ""
 "Analytic costs (timesheets, some purchased products, ...) come from analytic "
 "accounts. These generate draft invoices."
-msgstr "從這些發票草稿產生的成本輔助核算項(計工單或原材料投入)。"
+msgstr "從這些發票草稿產生的成本輔助核算項目(工時表或原材料投入)。"
 
 #. module: account
 #: help:account.journal,view_id:0
@@ -8788,8 +8801,8 @@ msgid ""
 "in which order. You can create your own view for a faster encoding in each "
 "journal."
 msgstr ""
-"選擇在輸入或顯示該憑證簿中的會計憑證行所使用的的視圖。這視圖可以定義欄位是否顯示，是否必輸，是否只讀，按什麼序列顯示。您可以為每個憑證簿定義視圖用於快速輸"
-"入會計憑證行。"
+"選擇在輸入或顯示該帳簿中的借貸項所使用的的視圖。這視圖可以定義欄位是否顯示，是否必輸，是否只讀，按什麼序列顯示。您可以為每個帳簿定義視圖用於快速輸入借貸項"
+"。"
 
 #. module: account
 #: field:account.period,date_stop:0
@@ -8853,7 +8866,7 @@ msgstr "公司是指業務夥伴"
 #: field:account.journal.view,name:0
 #: model:ir.model,name:account.model_account_journal_view
 msgid "Journal View"
-msgstr "賬簿視圖"
+msgstr "帳簿視圖"
 
 #. module: account
 #: view:account.move.line:0
@@ -8870,7 +8883,7 @@ msgstr "經會計師生效的發票分錄 "
 #. module: account
 #: report:account.overdue:0
 msgid "Best regards."
-msgstr "最好的祝願"
+msgstr "最好的問候"
 
 #. module: account
 #: view:account.invoice:0
@@ -8880,7 +8893,7 @@ msgstr "未付"
 #. module: account
 #: model:ir.model,name:account.model_account_tax_code_template
 msgid "Tax Code Template"
-msgstr "稅編碼模板"
+msgstr "稅編碼模組"
 
 #. module: account
 #: report:account.overdue:0
@@ -8899,20 +8912,19 @@ msgid ""
 "suppliers. A refund is a document that credits an invoice completely or "
 "partially. You can easily generate refunds and reconcile them directly from "
 "the invoice form."
-msgstr ""
-"在供應商紅字發票裡您能管理您從供應商收到的欠款單據。紅字發票是一個單據是發票裡的全部或部分項。您能直接在發票窗口輕鬆生成紅字發票和核對它們。"
+msgstr "在進貨退回裡您能管理您從供應商收到的欠款單據。折讓單是一個單據是發票裡的全部或部分項。您能直接在發票窗口輕鬆生成折讓單和核對它們。"
 
 #. module: account
 #: view:account.account.template:0
 msgid "Receivale Accounts"
-msgstr "應收款科目"
+msgstr "應收帳款科目"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_bank_statement_periodic_tree
 #: 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 "銀行對賬單"
+msgstr "銀行對帳單"
 
 #. module: account
 #: field:account.account,balance:0
@@ -8974,7 +8986,7 @@ msgstr "本年"
 #. module: account
 #: view:board.board:0
 msgid "Account Board"
-msgstr "會計儀表盤"
+msgstr "會計控制台"
 
 #. module: account
 #: view:account.model:0
@@ -8985,7 +8997,7 @@ msgstr "圖表"
 #. module: account
 #: view:account.analytic.account:0
 msgid "Contract Data"
-msgstr "合同信息"
+msgstr "合約資料"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_moves_sale
@@ -8996,18 +9008,18 @@ msgid ""
 "the income account. OpenERP will propose to you automatically the Tax "
 "related to this account and the counter-part \"Account receivable\"."
 msgstr ""
-"此界面用於會計輸入正式的單據。如果需要輸入一張客戶發票，首先選擇好賬簿和會計期間，然後首先輸入利潤科目的分錄，系統會自動處理相關的稅和應收款。"
+"此界面用於會計輸入正式的單據。如果需要輸入一張客戶發票，首先選擇好帳簿和會計期間，然後首先輸入利潤科目的分錄，系統會自動處理相關的稅和應收帳款。"
 
 #. module: account
 #: code:addons/account/wizard/account_automatic_reconcile.py:152
 #, python-format
 msgid "You must select accounts to reconcile"
-msgstr "您必須選擇核銷科目"
+msgstr "您必須選擇調節科目"
 
 #. module: account
 #: model:process.transition,note:account.process_transition_entriesreconcile0
 msgid "Accounting entries are the first input of the reconciliation."
-msgstr "核銷的第一個輸入是會計分錄。"
+msgstr "調節的第一個輸入是會計分錄。"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_period_form
@@ -9020,7 +9032,7 @@ msgid ""
 "period."
 msgstr ""
 "這裡定義一個會計期間，把會計年度分成更小的時間區間。會計期間通常是按月或者按季度分期。一般按照稅務申報表定義期間。根據貴公司需求用期間的打開和關閉控制在一"
-"定時間段內是否允許過賬"
+"定時間段內是否允許過帳"
 
 #. module: account
 #: report:account.third_party_ledger:0
@@ -9032,7 +9044,7 @@ msgstr "篩選"
 #: model:process.node,note:account.process_node_manually0
 #: model:process.transition,name:account.process_transition_invoicemanually0
 msgid "Manual entry"
-msgstr "手工錄入"
+msgstr "手工鍵入"
 
 #. module: account
 #: report:account.general.ledger:0
@@ -9048,12 +9060,12 @@ msgstr "憑證"
 #: code:addons/account/account_move_line.py:1153
 #, python-format
 msgid "You can not change the tax, you should remove and recreate lines !"
-msgstr "您不能更改此稅目，請移除並重新建立憑證！"
+msgstr "您不能更改此稅目，請移除並重新建立分錄！"
 
 #. module: account
 #: view:analytic.entries.report:0
 msgid "Analytic Entries of last 365 days"
-msgstr "過去365天的成本憑證"
+msgstr "過去365天的成本分錄"
 
 #. module: account
 #: report:account.central.journal:0
@@ -9063,13 +9075,13 @@ msgstr "A/C 號"
 #. module: account
 #: model:ir.actions.act_window,name:account.act_account_journal_2_account_bank_statement
 msgid "Bank statements"
-msgstr "銀行對賬單"
+msgstr "銀行對帳單"
 
 #. module: account
 #: help:account.addtmpl.wizard,cparent_id:0
 msgid ""
 "Creates an account with the selected template under this existing parent."
-msgstr "根據現在選定的模板建立一個科目"
+msgstr "根據現在選定的模組建立一個科目"
 
 #. module: account
 #: selection:account.model.line,date_maturity:0
@@ -9082,7 +9094,7 @@ msgstr "日期中的一天"
 msgid ""
 "You have to define the bank account\n"
 "in the journal definition for reconciliation."
-msgstr "為了對賬，您必須在賬簿中定義一個銀行帳號。"
+msgstr "為了對帳，您必須在帳簿中定義一個銀行帳號。"
 
 #. module: account
 #: view:account.move.line.reconcile:0
@@ -9106,7 +9118,7 @@ msgstr "合併子科目"
 msgid ""
 "The journal must have centralised counterpart without the Skipping draft "
 "state option checked!"
-msgstr "匯總的賬簿沒勾上跳過草稿狀態的選項"
+msgstr "匯總的帳簿沒勾上跳過草稿狀態的選項"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -9127,7 +9139,7 @@ msgstr "付款分錄"
 #: selection:report.account.sales,month:0
 #: selection:report.account_type.sales,month:0
 msgid "July"
-msgstr "7"
+msgstr "7月"
 
 #. module: account
 #: view:account.account:0
@@ -9150,7 +9162,7 @@ msgstr "輔助核算餘額"
 msgid ""
 "No opening/closing period defined, please create one to set the initial "
 "balance!"
-msgstr "沒有定期開賬/關賬期間，請建立一個再設置期初餘額。"
+msgstr "沒有定期開帳/關帳期間，請建立一個再設置期初餘額。"
 
 #. module: account
 #: report:account.account.balance:0
@@ -9188,7 +9200,7 @@ msgstr "到期日期"
 #. module: account
 #: view:account.move.journal:0
 msgid "Standard Entries"
-msgstr ""
+msgstr "標準分錄"
 
 #. module: account
 #: help:account.journal,type:0
@@ -9199,13 +9211,13 @@ msgid ""
 "journals. Select 'Opening/Closing Situation' for entries generated for new "
 "fiscal years."
 msgstr ""
-"『銷售』用於客戶發票的憑證簿；『採購』用於供應商發票的憑證簿；『現金』或『銀行』用於客戶或供應商付款的憑證簿。『普通』用於其他各種業務。『初始化』用於生成"
-"新會計年度的年初餘額。"
+"『銷售』用於客戶發票的帳簿；『採購』用於供應商發票的帳簿；『現金』或『銀行』用於客戶或供應商付款的帳簿。『普通』用於其他各種業務。『初始化』用於生成新會計"
+"年度的年初餘額。"
 
 #. module: account
 #: model:ir.model,name:account.model_account_subscription
 msgid "Account Subscription"
-msgstr "週期性憑證科目"
+msgstr "週期性分錄科目"
 
 #. module: account
 #: report:account.overdue:0
@@ -9215,7 +9227,7 @@ msgstr "付款到期日"
 #. module: account
 #: view:account.subscription:0
 msgid "Entry Subscription"
-msgstr "週期性憑證"
+msgstr "週期性分錄"
 
 #. module: account
 #: report:account.account.balance:0
@@ -9252,7 +9264,7 @@ msgstr "開始日期"
 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 "此欄位表示發票已付款，也就是說這張發票對應的會計憑證與一張或幾張付款對應的會計憑證已核銷。"
+msgstr "此欄位表示發票已付款，也就是說這張發票對應的分錄與一張或幾張付款對應的分錄已調節。"
 
 #. module: account
 #: view:account.invoice:0
@@ -9290,8 +9302,8 @@ msgid ""
 "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
@@ -9302,7 +9314,7 @@ msgstr "等待中"
 #: model:process.transition,name:account.process_transition_analyticinvoice0
 #: model:process.transition,name:account.process_transition_supplieranalyticcost0
 msgid "From analytic accounts"
-msgstr "輔助核算項"
+msgstr "輔助核算項目"
 
 #. module: account
 #: field:account.period,name:0
@@ -9352,7 +9364,7 @@ msgstr "打開/關閉會計期間"
 #: field:account.account.template,currency_id:0
 #: field:account.bank.accounts.wizard,currency_id:0
 msgid "Secondary Currency"
-msgstr "外幣"
+msgstr "第二貨幣"
 
 #. module: account
 #: model:ir.model,name:account.model_validate_account_move
@@ -9389,7 +9401,7 @@ msgid ""
 "You can select here the journal to use for the refund invoice that will be "
 "created. If you leave that field empty, it will use the same journal as the "
 "current invoice."
-msgstr "在這裡您能選擇紅字發票賬簿。如不輸入會使用當前發票的賬簿。"
+msgstr "在這裡您能選擇折讓帳簿。如不輸入會使用當前發票的帳簿。"
 
 #. module: account
 #: selection:account.account.type,report_type:0
@@ -9406,12 +9418,12 @@ msgid ""
 "\"Unreconciled\" for accounts with internal type \"Payable/Receivable\"! "
 msgstr ""
 "配置錯誤！\n"
-"對於內部類型是『應收/應付』的會計科目，你需要選擇結轉方式是『未核銷』的科目類型。 "
+"對於內部類型是『應收/應付』的會計科目，你需要選擇結轉方式是『未調節』的科目類型。 "
 
 #. module: account
 #: view:account.model:0
 msgid "Journal Entry Model"
-msgstr "賬簿分錄模型"
+msgstr "帳簿分錄模型"
 
 #. module: account
 #: code:addons/account/wizard/account_use_model.py:44
@@ -9420,7 +9432,7 @@ msgid ""
 "Maturity date of entry line generated by model line '%s' is based on partner "
 "payment term!\n"
 "Please define partner on it!"
-msgstr "週期性憑證行 '%s'生成的生效日期基於業務夥伴的付款條件。請輸入業務夥伴！"
+msgstr "週期性分錄明細 '%s'生成的生效日期基於業務夥伴的付款條件。請輸入業務夥伴！"
 
 #. module: account
 #: field:account.cashbox.line,number:0
@@ -9440,7 +9452,7 @@ msgstr "一般"
 #. module: account
 #: view:analytic.entries.report:0
 msgid "Analytic Entries of last 30 days"
-msgstr "過去30天的成本憑證"
+msgstr "過去30天的輔助核算項目明細"
 
 #. module: account
 #: selection:account.aged.trial.balance,filter:0
@@ -9483,7 +9495,7 @@ msgstr "匯率"
 #: field:account.account,tax_ids:0
 #: field:account.account.template,tax_ids:0
 msgid "Default Taxes"
-msgstr "預設稅"
+msgstr "預設稅額"
 
 #. module: account
 #: selection:account.entries.report,month:0
@@ -9492,29 +9504,29 @@ msgstr "預設稅"
 #: selection:report.account.sales,month:0
 #: selection:report.account_type.sales,month:0
 msgid "April"
-msgstr "4"
+msgstr "4月"
 
 #. module: account
 #: model:account.financial.report,name:account.account_financial_report_profitloss_toreport0
 msgid "Profit (Loss) to report"
-msgstr "要打印的損益"
+msgstr "要列印的損益"
 
 #. module: account
 #: view:account.move.line.reconcile.select:0
 msgid "Open for Reconciliation"
-msgstr "打開核銷"
+msgstr "開啟調節"
 
 #. module: account
 #: field:account.account,parent_left:0
 msgid "Parent Left"
-msgstr "上級左"
+msgstr "上級左邊"
 
 #. module: account
 #: help:account.invoice.refund,filter_refund:0
 msgid ""
 "Refund invoice base on this type. You can not Modify and Cancel if the "
 "invoice is already reconciled"
-msgstr "紅字發票基於這個類型，如果這發票已經核銷您不能修改或取消它。"
+msgstr "折讓單基於這個類型，如果這發票已經調節您不能修改或取消它。"
 
 #. module: account
 #: selection:account.financial.report,style_overwrite:0
@@ -9549,7 +9561,7 @@ 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 "使分錄生效的過程也被稱為「過賬」，也就是把分錄的金額抄寫到賬簿上的過程。"
+msgstr "使分錄生效的過程也被稱為「過帳」，也就是把分錄的金額抄寫到帳簿上的過程。"
 
 #. module: account
 #: help:account.bank.statement,state:0
@@ -9568,14 +9580,14 @@ msgstr "會計期間"
 #. module: account
 #: view:account.subscription:0
 msgid "Remove Lines"
-msgstr "刪除行"
+msgstr "刪除明細"
 
 #. module: account
 #: view:account.report.general.ledger:0
 msgid ""
 "This report allows you to print or generate a pdf of your general ledger "
 "with details of all your account journals"
-msgstr "本報表讓您打印或產生一個由所有賬簿生成的總賬"
+msgstr "本報表讓您列印或產生一個由所有帳簿生成的總帳"
 
 #. module: account
 #: selection:account.account,type:0
@@ -9596,7 +9608,7 @@ msgstr "內部類型"
 #. module: account
 #: model:ir.actions.act_window,name:account.action_subscription_form_running
 msgid "Running Subscriptions"
-msgstr "運行中的週期性憑證"
+msgstr "運行中的週期性分錄"
 
 #. module: account
 #: view:report.account.sales:0
@@ -9621,7 +9633,7 @@ msgstr "選擇會計期間"
 #: selection:account.move,state:0
 #: view:account.move.line:0
 msgid "Posted"
-msgstr "已登賬"
+msgstr "已登帳"
 
 #. module: account
 #: report:account.account.balance:0
@@ -9656,7 +9668,7 @@ msgstr "結束日期"
 #: 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 "取消開賬分錄"
+msgstr "取消開帳分錄"
 
 #. module: account
 #: field:account.payment.term.line,days2:0
@@ -9667,7 +9679,7 @@ msgstr "月天數"
 #: field:account.fiscal.position.tax,tax_src_id:0
 #: field:account.fiscal.position.tax.template,tax_src_id:0
 msgid "Tax Source"
-msgstr "稅源自"
+msgstr "稅額來源"
 
 #. module: account
 #: view:ir.sequence:0
@@ -9688,7 +9700,7 @@ msgstr "沒有為此產品  \"%s\" (id:%d)：定義利潤科目"
 #. module: account
 #: constraint:account.move.line:0
 msgid "You can not create journal items on closed account."
-msgstr "憑證上不能使用已關閉的科目"
+msgstr "借貸項上不能使用已關閉的科目"
 
 #. module: account
 #: field:account.account,unrealized_gain_loss:0
@@ -9732,7 +9744,7 @@ msgstr "合計"
 #: code:addons/account/wizard/account_move_journal.py:97
 #, python-format
 msgid "Journal: All"
-msgstr "所有賬簿"
+msgstr "所有帳簿"
 
 #. module: account
 #: field:account.account,company_id:0
@@ -9810,7 +9822,7 @@ msgstr "建立月度會計期間"
 #. module: account
 #: field:account.tax.code.template,sign:0
 msgid "Sign For Parent"
-msgstr "父項的符號"
+msgstr "上級項目的符號"
 
 #. module: account
 #: model:ir.model,name:account.model_account_balance_report
@@ -9820,7 +9832,7 @@ msgstr "試算平衡表"
 #. module: account
 #: model:ir.actions.act_window,name:account.action_bank_statement_draft_tree
 msgid "Draft statements"
-msgstr "銀行對賬單草稿"
+msgstr "銀行對帳單草稿"
 
 #. module: account
 #: model:process.transition,note:account.process_transition_statemententries0
@@ -9836,7 +9848,7 @@ msgstr "科目留空？ "
 #. module: account
 #: constraint:account.bank.statement:0
 msgid "The journal and period chosen have to belong to the same company."
-msgstr "所選的憑證簿和期間必須屬於相同公司。"
+msgstr "所選的帳簿和期間必須屬於相同公司。"
 
 #. module: account
 #: view:account.invoice:0
@@ -9851,7 +9863,7 @@ msgstr "結束會計期間"
 #. module: account
 #: sql_constraint:account.journal:0
 msgid "The code of the journal must be unique per company !"
-msgstr "每個公司的賬簿編碼必須唯一！"
+msgstr "每個公司的帳簿編碼必須唯一！"
 
 #. module: account
 #: help:product.category,property_account_expense_categ:0
@@ -9864,7 +9876,7 @@ msgstr "這科目將被用於當前產品分類的出庫價用成本價。"
 #. module: account
 #: view:wizard.multi.charts.accounts:0
 msgid "Generate Your Chart of Accounts from a Chart Template"
-msgstr "從科目模版生成會計科目"
+msgstr "從科目模組產生會計科目"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_invoice_report_all
@@ -9872,7 +9884,7 @@ msgid ""
 "From this report, you can have an overview of the amount invoiced to your "
 "customer as well as payment delays. The tool search can also be used to "
 "personalise your Invoices reports and so, match this analysis to your needs."
-msgstr "在這報表中，您可以知道給您的客戶開發票的總金額和拖欠的款項。這工具也可以用來搜索您特定的發票報表等。"
+msgstr "從這份報表中，你可以有一個概述發票給您的客戶，以及拖延支付的金額。搜索工具也可以用來個性化您的發票報表，因此，符合此分析您的需求。"
 
 #. module: account
 #: view:account.automatic.reconcile:0
@@ -9947,7 +9959,7 @@ msgstr "錯誤！您不能建立遞歸的科目模板。"
 #. module: account
 #: selection:account.print.journal,sort_selection:0
 msgid "Journal Entry Number"
-msgstr "會計憑證編號"
+msgstr "分錄編號"
 
 #. module: account
 #: view:account.subscription:0
@@ -9960,23 +9972,23 @@ msgstr "定期"
 msgid ""
 "You cannot change the type of account from 'Closed' to any other type which "
 "contains journal items!"
-msgstr "如果會計科目已經有過會計憑證，且現在是『關閉』類型，不能改為其他類型。"
+msgstr "如果會計科目已經有過分錄，且現在是『關閉』類型，不能改為其他類型。"
 
 #. module: account
 #: code:addons/account/account_move_line.py:832
 #, python-format
 msgid "Entry is already reconciled"
-msgstr "分錄已核銷"
+msgstr "分錄已調節"
 
 #. module: account
 #: model:ir.model,name:account.model_report_account_receivable
 msgid "Receivable accounts"
-msgstr "應收款科目"
+msgstr "應收帳款科目"
 
 #. module: account
 #: selection:account.model.line,date_maturity:0
 msgid "Partner Payment Term"
-msgstr "業務夥伴付款條款"
+msgstr "業務夥伴付款條件"
 
 #. module: account
 #: field:temp.range,name:0
@@ -9986,7 +9998,7 @@ msgstr "範圍"
 #. module: account
 #: view:account.analytic.line:0
 msgid "Analytic Journal Items related to a purchase journal."
-msgstr "與採購憑證簿相關的成本憑證"
+msgstr "與採購憑證簿相關的輔助核算帳簿"
 
 #. module: account
 #: help:account.account,type:0
@@ -10009,12 +10021,12 @@ msgstr "進展"
 #. module: account
 #: view:account.analytic.account:0
 msgid "Account Data"
-msgstr "輔助核算項數據"
+msgstr "會計資料"
 
 #. module: account
 #: view:account.tax.code.template:0
 msgid "Account Tax Code Template"
-msgstr "稅編碼模板"
+msgstr "稅編碼模組"
 
 #. module: account
 #: model:process.node,name:account.process_node_manually0
@@ -10028,13 +10040,13 @@ msgstr "手動"
 #: selection:report.account.sales,month:0
 #: selection:report.account_type.sales,month:0
 msgid "December"
-msgstr "12"
+msgstr "12月"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_analytic_journal_tree
 #: model:ir.ui.menu,name:account.account_analytic_journal_print
 msgid "Print Analytic Journals"
-msgstr "打印輔助核算賬簿"
+msgstr "列印輔助核算帳簿"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -10050,7 +10062,7 @@ msgstr "Fin.Account"
 #: model:ir.actions.act_window,name:account.action_aged_receivable_graph
 #: view:report.aged.receivable:0
 msgid "Aged Receivable"
-msgstr "舊的應收款"
+msgstr "舊的應收帳款"
 
 #. module: account
 #: field:account.tax,applicable_type:0
@@ -10061,7 +10073,7 @@ msgstr "適用範圍"
 #: code:addons/account/wizard/account_move_journal.py:165
 #, python-format
 msgid "This period is already closed !"
-msgstr "這會計期間已經結束!"
+msgstr "此會計期間已經結束!"
 
 #. module: account
 #: help:account.move.line,currency_id:0
@@ -10095,18 +10107,18 @@ msgid ""
 "may keep several types of specialized journals such as a cash journal, "
 "purchase journal, sales journal..."
 msgstr ""
-"在這選單建立或管理貴公司使用的賬簿。賬簿使用借貸記賬法記錄貴公司的經濟業務記錄每天的業務量，每個公司可以定義不同類型的賬簿，如：現金日記賬、採購賬簿、銷售"
-"賬簿。"
+"在這選單建立或管理貴公司使用的帳簿。帳簿使用借貸記帳法記錄貴公司的經濟業務記錄每天的業務量，每個公司可以定義不同類型的帳簿，如：現金帳簿、採購帳簿、銷售帳"
+"簿。"
 
 #. module: account
 #: view:account.payment.term:0
 msgid "Description on Invoices"
-msgstr ""
+msgstr "發票說明"
 
 #. module: account
 #: model:ir.model,name:account.model_account_analytic_chart
 msgid "Account Analytic Chart"
-msgstr "輔助核算項一覽表"
+msgstr "輔助核算項目一覽表"
 
 #. module: account
 #: help:account.invoice,residual:0
@@ -10139,8 +10151,8 @@ msgid ""
 "created by the system on document validation (invoices, bank statements...) "
 "and will be created in 'Posted' state."
 msgstr ""
-"所有新建的會計憑證一般來說都是『未過賬』狀態，你可以在憑證簿上設置略過這個狀態。這樣在業務單據（發票、銀行票據）確認的時候系統會自動建立會計憑證並直接是『"
-"已過帳』狀態。"
+"所有新建的分錄一般來說都是『未過帳』狀態，你可以在帳簿設置略過這個狀態。這樣在業務單據（發票、銀行票據）確認的時候系統會自動建立分錄並直接是『已過帳』狀態"
+"。"
 
 #. module: account
 #: view:account.fiscal.position.template:0
@@ -10160,12 +10172,12 @@ msgstr "發票'%s'是等待覆核。"
 #: selection:report.account.sales,month:0
 #: selection:report.account_type.sales,month:0
 msgid "November"
-msgstr "11"
+msgstr "11月"
 
 #. module: account
 #: selection:account.invoice.refund,filter_refund:0
 msgid "Modify: refund invoice, reconcile and create a new draft invoice"
-msgstr "修改：紅字發票，核銷和新建一個草稿發票。"
+msgstr "修改：折讓單，調節和新建一個草稿折讓單。"
 
 #. module: account
 #: help:account.invoice.line,account_id:0
@@ -10181,7 +10193,7 @@ msgstr "週期次數"
 #: report:account.general.journal:0
 #: model:ir.actions.report.xml,name:account.account_general_journal
 msgid "General Journal"
-msgstr "一般賬簿"
+msgstr "總分類帳"
 
 #. module: account
 #: view:account.invoice:0
@@ -10195,7 +10207,7 @@ msgstr "搜索發票"
 #: view:account.invoice.report:0
 #: model:ir.actions.act_window,name:account.action_account_invoice_refund
 msgid "Refund"
-msgstr "紅字發票"
+msgstr "折讓"
 
 #. module: account
 #: model:email.template,body_text:account.email_template_edi_invoice
@@ -10281,7 +10293,7 @@ msgstr ""
 "% if object.origin:\n"
 "| 訂單號: ${object.origin}\n"
 "% endif\n"
-"| 聯繫人: ${object.user_id.name} ${object.user_id.user_email and "
+"| 聯絡人: ${object.user_id.name} ${object.user_id.user_email and "
 "'<%s>'%(object.user_id.user_email) or ''}\n"
 "\n"
 "你可以查看這張發票，下載並在線支付，地址是：\n"
@@ -10339,12 +10351,12 @@ msgstr ""
 #. module: account
 #: model:ir.model,name:account.model_res_partner_bank
 msgid "Bank Accounts"
-msgstr "銀行賬號"
+msgstr "銀行帳戶"
 
 #. module: account
 #: field:res.partner,credit:0
 msgid "Total Receivable"
-msgstr "應收款合計"
+msgstr "應收帳款合計"
 
 #. module: account
 #: view:account.account:0
@@ -10352,7 +10364,7 @@ msgstr "應收款合計"
 #: view:account.journal:0
 #: view:account.move.line:0
 msgid "General Information"
-msgstr "普通信息"
+msgstr "一般資訊"
 
 #. module: account
 #: view:account.move:0
@@ -10369,7 +10381,7 @@ msgstr "使憑證行生效"
 #: 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 "成本分類賬(只有數量)"
+msgstr "成本分類帳(只有數量)"
 
 #. module: account
 #: model:process.node,note:account.process_node_supplierpaidinvoice0
@@ -10379,12 +10391,12 @@ 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 "一旦核銷完成，這發票可能已被支付。"
+msgstr "一旦調節完成，這發票可能已被支付。"
 
 #. module: account
 #: view:account.account.template:0
 msgid "Search Account Templates"
-msgstr "搜索科目模板"
+msgstr "搜尋科目範本"
 
 #. module: account
 #: view:account.invoice.tax:0
@@ -10424,7 +10436,7 @@ msgstr "會計年度"
 msgid ""
 "If the active field is set to False, it will allow you to hide the analytic "
 "journal without removing it."
-msgstr "如果有效欄位設為否，您將可以不必刪除就隱藏輔助核算賬簿。"
+msgstr "如果有效欄位設為否，您將可以不必刪除就隱藏輔助核算帳簿。"
 
 #. module: account
 #: field:account.analytic.line,ref:0
@@ -10444,7 +10456,7 @@ msgstr "科目模型"
 #: selection:report.account.sales,month:0
 #: selection:report.account_type.sales,month:0
 msgid "February"
-msgstr "2"
+msgstr "2月"
 
 #. module: account
 #: help:account.bank.statement,name:0
@@ -10461,13 +10473,13 @@ msgstr "如果您指定其它名稱，它建立的憑證或分錄將用報表名
 #: field:account.invoice,partner_bank_id:0
 #: field:account.invoice.report,partner_bank_id:0
 msgid "Bank Account"
-msgstr "銀行賬號"
+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 "匯總賬簿"
+msgstr "匯總帳簿"
 
 #. module: account
 #: report:account.overdue:0
@@ -10501,12 +10513,12 @@ msgstr "通常用 1或-1"
 #: 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 "輔助核算項一覽表"
+msgstr "輔助核算項目一覽表"
 
 #. module: account
 #: field:account.chart.template,property_account_expense:0
 msgid "Expense Account on Product Template"
-msgstr "產品模板的費用科目"
+msgstr "產品模組的費用科目"
 
 #. module: account
 #: help:accounting.report,label_filter:0
@@ -10540,7 +10552,7 @@ msgstr ""
 msgid ""
 "The residual amount on a receivable or payable of a journal entry expressed "
 "in its currency (maybe different of the company currency)."
-msgstr "基於當前幣別的應收或應付款的餘額"
+msgstr "基於當前幣別的應收或應付帳款的餘額"
 
 #~ msgid "Invoice Movement"
 #~ msgstr "发票转移"
@@ -10573,69 +10585,72 @@ msgstr "基於當前幣別的應收或應付款的餘額"
 #~ msgid "Invoices Created Within Past 15 Days"
 #~ msgstr "過去15天開的發票"
 
-#~ msgid "Open For Unreconciliation"
-#~ msgstr "打開反核銷"
-
-#, python-format
-#~ msgid "Receivable Accounts"
-#~ msgstr "應收款科目"
-
-#~ msgid "Go to next partner"
-#~ msgstr "下一個業務夥伴"
-
 #~ msgid "Sales by Account Type"
 #~ msgstr "銷售科目類型"
 
 #~ msgid "Sales by Account"
 #~ msgstr "銷售科目"
 
-#~ msgid "Tax codes"
-#~ msgstr "稅編碼"
-
 #~ msgid "Generate Chart of Accounts from a Chart Template"
 #~ msgstr "從模板產生科目一覽表"
 
-#~ msgid "Accounts by type"
-#~ msgstr "按類型劃分的科目"
-
-#~ msgid "Unreconciliate transactions"
-#~ msgstr "反核銷業務"
-
-#~ msgid "Unreconciliation transactions"
-#~ msgstr "反核銷處理"
-
-#~ msgid "Are you sure ?"
-#~ msgstr "你確定嗎?"
-
-#~ msgid "Reconciliation result"
-#~ msgstr "核銷結果"
-
-#~ msgid "Create an Account based on this template"
-#~ msgstr "基於此模板建立科目"
-
-#~ msgid "Dashboard"
-#~ msgstr "儀表盤"
-
 #~ msgid "Income Accounts"
 #~ msgstr "損益科目"
 
 #~ msgid "Install your Chart of Accounts"
 #~ msgstr "導入會計科目表"
 
+#~ msgid "Open For Unreconciliation"
+#~ msgstr "打開未調節項目"
+
+#, python-format
+#~ msgid "Receivable Accounts"
+#~ msgstr "應收帳款科目"
+
+#~ msgid "Go to next partner"
+#~ msgstr "轉到下一個合作夥伴"
+
+#~ msgid "Tax codes"
+#~ msgstr "稅碼"
+
+#~ msgid "Accounts by type"
+#~ msgstr "Accounts by type"
+
+#~ msgid "Unreconciliate transactions"
+#~ msgstr "未調節交易"
+
+#~ msgid "Unreconciliation transactions"
+#~ msgstr "調節交易"
+
+#~ msgid "Are you sure ?"
+#~ msgstr "你確定?"
+
+#~ msgid "Reconciliation result"
+#~ msgstr "Reconciliation result"
+
+#~ msgid "Create an Account based on this template"
+#~ msgstr "Create an Account based on this template"
+
+#~ msgid "Dashboard"
+#~ msgstr "控制台"
+
 #~ msgid "Open for bank reconciliation"
-#~ msgstr "開始銀行對賬"
+#~ msgstr "Open for bank reconciliation"
 
 #~ msgid "Compute Code for Taxes included prices"
-#~ msgstr "含稅價格計算代碼"
+#~ msgstr "Compute Code for Taxes included prices"
 
 #~ msgid "Cost Ledger for period"
-#~ msgstr "成本分類賬的會計期間"
+#~ msgstr "週期的成本總帳"
 
 #~ msgid "Reconciliation transactions"
-#~ msgstr "核銷交易"
+#~ msgstr "Reconciliation transactions"
 
 #~ msgid "Standard entries"
-#~ msgstr "普通分錄"
+#~ msgstr "標準分錄"
 
 #~ msgid "Description On Invoices"
-#~ msgstr "發票上的描述"
+#~ msgstr "發票上的說明"
+
+#~ msgid "Amount currency"
+#~ msgstr "Amount currency"
diff --git a/addons/account/product_view.xml b/addons/account/product_view.xml
index 659a4f6ac36..5f417825032 100644
--- a/addons/account/product_view.xml
+++ b/addons/account/product_view.xml
@@ -7,7 +7,7 @@
             <field name="inherit_id" ref="product.product_normal_form_view"/>
             <field name="arch" type="xml">
                 <notebook position="inside">
-                    <page string="Accounting" groups="base.group_user">
+                    <page string="Accounting" groups="account.group_account_user">
                         <group name="properties">
                             <group>
                                 <field name="property_account_income" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]" attrs="{'readonly':[('sale_ok','=',0)]}"/>
diff --git a/addons/account/project/project_view.xml b/addons/account/project/project_view.xml
index e3b902a000f..77e987f24d4 100644
--- a/addons/account/project/project_view.xml
+++ b/addons/account/project/project_view.xml
@@ -186,19 +186,23 @@
                 <search string="Search Analytic Lines">
                     <field name="name" string="Analytic Line"/>
                     <field name="date"/>
-                    <filter name="sales" string="Sales" domain="[('journal_id.type','=','sale')]" icon="terp-camera_test" help="Analytic Journal Items related to a sale journal."/>
-                    <filter name="purchases" string="Purchases" domain="[('journal_id.type','=','purchase')]" icon="terp-purchase" help="Analytic Journal Items related to a purchase journal."/>
-                    <filter name="others" string="Others" domain="[('journal_id.type','in',('cash','general','situation'))]" icon="terp-folder-orange"/>
+                    <filter name="sales" string="Sales" domain="[('journal_id.type','=','sale')]" help="Analytic Journal Items related to a sale journal."/>
+                    <filter name="purchases" string="Purchases" domain="[('journal_id.type','=','purchase')]" help="Analytic Journal Items related to a purchase journal."/>
+                    <filter name="others" string="Others" domain="[('journal_id.type','in',('cash','general','situation'))]"/>
                     <separator/>
-                    <filter string="My Entries" domain="[('user_id','=',uid)]" icon="terp-personal"/>
+                    <filter string="My Entries" domain="[('user_id','=',uid)]"/>
                     <field name="account_id"/>
                     <field name="user_id"/>
                     <group string="Group By..." expand="0">
-                        <filter string="Account" context="{'group_by':'account_id'}" icon="terp-folder-green"/>
-                        <filter string="Journal" context="{'group_by':'journal_id'}" icon="terp-folder-orange"/>
-                        <filter string="User" context="{'group_by':'user_id'}" icon="terp-personal"/>
-                        <filter string="Fin.Account" context="{'group_by':'general_account_id'}" icon="terp-folder-green"/>
-                        <filter string="Product" context="{'group_by':'product_id'}" icon="terp-accessories-archiver"/>
+                        <filter string="Analytic Account" context="{'group_by':'account_id'}"/>
+                        <filter string="Fin. Account" context="{'group_by':'general_account_id'}"/>
+                        <filter string="Journal" context="{'group_by':'journal_id'}" name="group_journal"/>
+                        <separator/>
+                        <filter string="Product" context="{'group_by':'product_id'}"/>
+                        <filter string="User" context="{'group_by':'user_id'}"/>
+                        <separator/>
+                        <filter string="Date" context="{'group_by':'date'}" name="group_date"/>
+
                     </group>
                 </search>
             </field>
@@ -357,16 +361,6 @@
             action="action_account_analytic_journal_tree"
             id="account_analytic_journal_print" parent="account.next_id_40"/>
 
-
-        <act_window
-            context="{'search_default_account_id': [active_id], 'search_default_user_id': False, 'default_account_id': active_id}"
-            id="act_acc_analytic_acc_5_report_hr_timesheet_invoice_journal"
-            name="All Analytic Entries"
-            res_model="account.analytic.line"
-            src_model="account.analytic.account"
-            view_mode="tree,form"
-            view_type="form"/>
-
         <record id="view_account_journal_1" model="ir.ui.view">
             <field name="name">account.journal.form.1</field>
             <field name="model">account.journal</field>
diff --git a/addons/account/res_config.py b/addons/account/res_config.py
index 658f87962ff..9674cd0e65c 100644
--- a/addons/account/res_config.py
+++ b/addons/account/res_config.py
@@ -145,42 +145,45 @@ class account_config_settings(osv.osv_memory):
 
     def onchange_company_id(self, cr, uid, ids, company_id):
         # update related fields
-        company = self.pool.get('res.company').browse(cr, uid, company_id)
-        has_chart_of_accounts = company_id not in self.pool.get('account.installer').get_unconfigured_cmp(cr, uid)
-        fiscalyear_count = self.pool.get('account.fiscalyear').search_count(cr, uid,
-            [('date_start', '<=', time.strftime('%Y-%m-%d')), ('date_stop', '>=', time.strftime('%Y-%m-%d')),
-             ('company_id', '=', company_id)])
-        values = {
-            'expects_chart_of_accounts': company.expects_chart_of_accounts,
-            'currency_id': company.currency_id.id,
-            'paypal_account': company.paypal_account,
-            'company_footer': company.rml_footer2,
-            'has_chart_of_accounts': has_chart_of_accounts,
-            'has_fiscal_year': bool(fiscalyear_count),
-            'chart_template_id': False,
-            'tax_calculation_rounding_method': company.tax_calculation_rounding_method,
-        }
-        # update journals and sequences
-        for journal_type in ('sale', 'sale_refund', 'purchase', 'purchase_refund'):
-            for suffix in ('_journal_id', '_sequence_prefix', '_sequence_next'):
-                values[journal_type + suffix] = False
-        journal_obj = self.pool.get('account.journal')
-        journal_ids = journal_obj.search(cr, uid, [('company_id', '=', company_id)])
-        for journal in journal_obj.browse(cr, uid, journal_ids):
-            if journal.type in ('sale', 'sale_refund', 'purchase', 'purchase_refund'):
-                values.update({
-                    journal.type + '_journal_id': journal.id,
-                    journal.type + '_sequence_prefix': journal.sequence_id.prefix,
-                    journal.type + '_sequence_next': journal.sequence_id.number_next,
-                })
-        # update taxes
-        ir_values = self.pool.get('ir.values')
-        taxes_id = ir_values.get_default(cr, uid, 'product.product', 'taxes_id', company_id=company_id)
-        supplier_taxes_id = ir_values.get_default(cr, uid, 'product.product', 'supplier_taxes_id', company_id=company_id)
-        values.update({
-            'default_sale_tax': isinstance(taxes_id, list) and taxes_id[0] or taxes_id,
-            'default_purchase_tax': isinstance(supplier_taxes_id, list) and supplier_taxes_id[0] or supplier_taxes_id,
-        })
+        values = {}
+        values['currency_id'] = False
+        if company_id:
+            company = self.pool.get('res.company').browse(cr, uid, company_id)
+            has_chart_of_accounts = company_id not in self.pool.get('account.installer').get_unconfigured_cmp(cr, uid)
+            fiscalyear_count = self.pool.get('account.fiscalyear').search_count(cr, uid,
+                [('date_start', '<=', time.strftime('%Y-%m-%d')), ('date_stop', '>=', time.strftime('%Y-%m-%d')),
+                 ('company_id', '=', company_id)])
+            values = {
+                'expects_chart_of_accounts': company.expects_chart_of_accounts,
+                'currency_id': company.currency_id.id,
+                'paypal_account': company.paypal_account,
+                'company_footer': company.rml_footer2,
+                'has_chart_of_accounts': has_chart_of_accounts,
+                'has_fiscal_year': bool(fiscalyear_count),
+                'chart_template_id': False,
+                'tax_calculation_rounding_method': company.tax_calculation_rounding_method,
+            }
+            # update journals and sequences
+            for journal_type in ('sale', 'sale_refund', 'purchase', 'purchase_refund'):
+                for suffix in ('_journal_id', '_sequence_prefix', '_sequence_next'):
+                    values[journal_type + suffix] = False
+            journal_obj = self.pool.get('account.journal')
+            journal_ids = journal_obj.search(cr, uid, [('company_id', '=', company_id)])
+            for journal in journal_obj.browse(cr, uid, journal_ids):
+                if journal.type in ('sale', 'sale_refund', 'purchase', 'purchase_refund'):
+                    values.update({
+                        journal.type + '_journal_id': journal.id,
+                        journal.type + '_sequence_prefix': journal.sequence_id.prefix,
+                        journal.type + '_sequence_next': journal.sequence_id.number_next,
+                    })
+            # update taxes
+            ir_values = self.pool.get('ir.values')
+            taxes_id = ir_values.get_default(cr, uid, 'product.product', 'taxes_id', company_id=company_id)
+            supplier_taxes_id = ir_values.get_default(cr, uid, 'product.product', 'supplier_taxes_id', company_id=company_id)
+            values.update({
+                'default_sale_tax': isinstance(taxes_id, list) and taxes_id[0] or taxes_id,
+                'default_purchase_tax': isinstance(supplier_taxes_id, list) and supplier_taxes_id[0] or supplier_taxes_id,
+            })
         return {'value': values}
 
     def onchange_chart_template_id(self, cr, uid, ids, chart_template_id, context=None):
diff --git a/addons/account/test/account_change_currency.yml b/addons/account/test/account_change_currency.yml
index 1f1a412c19e..5f06a20b1ab 100644
--- a/addons/account/test/account_change_currency.yml
+++ b/addons/account/test/account_change_currency.yml
@@ -7,7 +7,7 @@
     currency_id: base.EUR
     invoice_line:
       - account_id: account.a_sale
-        name: '[PC1] Basic PC'
+        name: '[PCSC234] PC Assemble SC234'
         price_unit: 450.0
         quantity: 1.0
         product_id: product.product_product_3
diff --git a/addons/account/test/account_invoice_state.yml b/addons/account/test/account_invoice_state.yml
index 6553635a781..7b995150af0 100644
--- a/addons/account/test/account_invoice_state.yml
+++ b/addons/account/test/account_invoice_state.yml
@@ -7,7 +7,7 @@
     currency_id: base.EUR
     invoice_line:
       - account_id: account.a_sale
-        name: '[PC1] Basic PC'
+        name: '[PCSC234] PC Assemble SC234'
         price_unit: 450.0
         quantity: 1.0
         product_id: product.product_product_3
diff --git a/addons/account/test/account_sequence_test.yml b/addons/account/test/account_sequence_test.yml
index 3bc4a778794..74dcbce56ba 100644
--- a/addons/account/test/account_sequence_test.yml
+++ b/addons/account/test/account_sequence_test.yml
@@ -20,7 +20,7 @@
     currency_id: base.EUR
     invoice_line:
       - account_id: account.a_sale
-        name: '[PC3] Medium PC'
+        name: '[PC-DEM] PC on Demand'
         price_unit: 900.0
         quantity: 10.0
         product_id: product.product_product_5
diff --git a/addons/account/test/account_supplier_invoice.yml b/addons/account/test/account_supplier_invoice.yml
index ccebd2ea90c..9c5ce2dea3e 100644
--- a/addons/account/test/account_supplier_invoice.yml
+++ b/addons/account/test/account_supplier_invoice.yml
@@ -28,7 +28,7 @@
     currency_id: base.EUR
     invoice_line:
       - account_id: account.a_expense
-        name: '[PC1] Basic PC'
+        name: '[PCSC234] PC Assemble SC234'
         price_unit: 300.0
         product_id: product.product_product_3
         quantity: 10.0
diff --git a/addons/account/test/test_edi_invoice.yml b/addons/account/test/test_edi_invoice.yml
index 516be311cf8..80dc098e770 100644
--- a/addons/account/test/test_edi_invoice.yml
+++ b/addons/account/test/test_edi_invoice.yml
@@ -24,7 +24,7 @@
         uos_id: 1
         quantity: 5.0
         price_unit: 100.0
-        name: 'Medium PC'
+        name: 'PC on Demand'
         account_id: account.a_pay
     tax_line:
       - name: sale tax
@@ -104,9 +104,9 @@
                 "__model": "account.invoice.line",
                 "__id": "account:b22acf7a-ddcd-11e0-a4db-701a04e25543.account_invoice_line-1RP3so",
                 "uos_id": ["product:b22acf7a-ddcd-11e0-a4db-701a04e25543.product_uom_unit", "Unit"],
-                "name": "Basic PC",
+                "name": "PC Assemble SC234",
                 "price_unit": 10.0,
-                "product_id": ["product:b22acf7a-ddcd-11e0-a4db-701a04e25543.product_product_3", "[PC1] Basic PC"],
+                "product_id": ["product:b22acf7a-ddcd-11e0-a4db-701a04e25543.product_product_3", "[PCSC234] PC Assemble SC234"],
                 "quantity": 1.0
         },
         {
@@ -114,9 +114,9 @@
                 "__model": "account.invoice.line",
                 "__id": "account:b22acf7a-ddcd-11e0-a4db-701a04e25543.account_invoice_line-u2XV5",
                 "uos_id": ["product:b22acf7a-ddcd-11e0-a4db-701a04e25543.product_uom_unit", "Unit"],
-                "name": "Medium PC",
+                "name": "PC on Demand",
                 "price_unit": 100.0,
-                "product_id": ["product:b22acf7a-ddcd-11e0-a4db-701a04e25543.product_product_5", "[PC3] Medium PC"],
+                "product_id": ["product:b22acf7a-ddcd-11e0-a4db-701a04e25543.product_product_5", "[PC-DEM] PC on Demand"],
                 "quantity": 5.0
         }]
     }
@@ -137,12 +137,12 @@
     assert invoice_new.type == 'in_invoice', "Invoice type was not set properly"
     assert len(invoice_new.invoice_line) == 2, "invoice lines are not same"
     for inv_line in invoice_new.invoice_line:
-        if inv_line.name == 'Basic PC':
+        if inv_line.name == 'PC Assemble SC234':
             assert inv_line.uos_id.name == "Unit" , "uom is not same"
             assert inv_line.price_unit == 10 , "price unit is not same"
             assert inv_line.quantity == 1 , "product qty is not same"
             assert inv_line.price_subtotal == 10, "price sub total is not same"
-        elif inv_line.name == 'Medium PC':
+        elif inv_line.name == 'PC on Demand':
             assert inv_line.uos_id.name == "Unit" , "uom is not same"
             assert inv_line.price_unit == 100 , "price unit is not same"
             assert inv_line.quantity == 5 , "product qty is not same"
diff --git a/addons/account/wizard/account_report_common.py b/addons/account/wizard/account_report_common.py
index 02da9a6ab1f..9acc09e9026 100644
--- a/addons/account/wizard/account_report_common.py
+++ b/addons/account/wizard/account_report_common.py
@@ -30,9 +30,11 @@ class account_common_report(osv.osv_memory):
     _description = "Account Common Report"
 
     def onchange_chart_id(self, cr, uid, ids, chart_account_id=False, context=None):
+        res = {}
         if chart_account_id:
             company_id = self.pool.get('account.account').browse(cr, uid, chart_account_id, context=context).company_id.id
-        return {'value': {'company_id': company_id}}
+            res['value'] = {'company_id': company_id}
+        return res
 
     _columns = {
         'chart_account_id': fields.many2one('account.account', 'Chart of Account', help='Select Charts of Accounts', required=True, domain = [('parent_id','=',False)]),
diff --git a/addons/account/wizard/pos_box.py b/addons/account/wizard/pos_box.py
index b4254b5ba84..b5d1cc37776 100644
--- a/addons/account/wizard/pos_box.py
+++ b/addons/account/wizard/pos_box.py
@@ -40,6 +40,10 @@ class CashBox(osv.osv_memory):
 
         return {}
 
+    def _create_bank_statement_line(self, cr, uid, box, record, context=None):
+        values = self._compute_values_for_statement_line(cr, uid, box, record, context=context)
+        return self.pool.get('account.bank.statement.line').create(cr, uid, values, context=context)
+
 
 class CashBoxIn(CashBox):
     _name = 'cash.box.in'
@@ -49,30 +53,24 @@ class CashBoxIn(CashBox):
         'ref' : fields.char('Reference', size=32),
     })
 
-    def _create_bank_statement_line(self, cr, uid, box, record, context=None):
-        absl_proxy = self.pool.get('account.bank.statement.line')
-
-        values = {
+    def _compute_values_for_statement_line(self, cr, uid, box, record, context=None):
+        return {
             'statement_id' : record.id,
             'journal_id' : record.journal_id.id,
             'account_id' : record.journal_id.internal_account_id.id,
             'amount' : box.amount or 0.0,
-            'ref' : "%s" % (box.ref or ''),
+            'ref' : '%s' % (box.ref or ''),
             'name' : box.name,
         }
 
-        return absl_proxy.create(cr, uid, values, context=context)
-
 CashBoxIn()
 
 class CashBoxOut(CashBox):
     _name = 'cash.box.out'
 
-    def _create_bank_statement_line(self, cr, uid, box, record, context=None):
-        absl_proxy = self.pool.get('account.bank.statement.line')
-
+    def _compute_values_for_statement_line(self, cr, uid, box, record, context=None):
         amount = box.amount or 0.0
-        values = {
+        return {
             'statement_id' : record.id,
             'journal_id' : record.journal_id.id,
             'account_id' : record.journal_id.internal_account_id.id,
@@ -80,6 +78,4 @@ class CashBoxOut(CashBox):
             'name' : box.name,
         }
 
-        return absl_proxy.create(cr, uid, values, context=context)
-
 CashBoxOut()
diff --git a/addons/account_accountant/__openerp__.py b/addons/account_accountant/__openerp__.py
index 7c97112b875..ea4d7887a15 100644
--- a/addons/account_accountant/__openerp__.py
+++ b/addons/account_accountant/__openerp__.py
@@ -19,13 +19,13 @@
 #
 ##############################################################################
 {
-    "name" : "Accounting and Finance",
-    "version" : "1.1",
-    "author" : "OpenERP SA",
-    "category": 'Accounting & Finance',
-    "sequence": 10,
-    "summary": "Financial and Analytic Accounting",
-    "description": """
+    'name' : 'Accounting and Finance',
+    'version' : '1.1',
+    'author' : 'OpenERP SA',
+    'category': 'Accounting & Finance',
+    'sequence': 10,
+    'summary': 'Financial and Analytic Accounting',
+    'description': """
 Accounting Access Rights.
 =========================
 
@@ -36,13 +36,12 @@ It assigns manager and user access rights to the Administrator and only
 user rights to Demo user.
     """,
     'website': 'http://www.openerp.com',
-    'init_xml': [],
-    "depends" : ["account_voucher"],
-    'update_xml': [
+    'depends' : ['account_voucher'],
+    'data': [
         'security/account_security.xml',
         'account_accountant_data.xml'
     ],
-    'demo_xml': ['account_accountant_demo.xml'],
+    'demo': ['account_accountant_demo.xml'],
     'test': [],
     'installable': True,
     'auto_install': False,
diff --git a/addons/account_accountant/account_accountant_data.xml b/addons/account_accountant/account_accountant_data.xml
index 57fb229ad12..5b563017c62 100644
--- a/addons/account_accountant/account_accountant_data.xml
+++ b/addons/account_accountant/account_accountant_data.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-        <!-- rename root menu "Accounting" -->
-        <record id="account.menu_finance" model="ir.ui.menu">
-            <field name="name">Accounting</field>
-        </record>
+        <!-- Rename root menu "Accounting" -->
+        <!-- Top menu item -->
+        <menuitem name="Accounting"
+            id="account.menu_finance"/>
     </data>
 
     <data noupdate="1">
@@ -19,17 +19,16 @@
             <field name="type">automatic</field>
             <field name="sequence">100</field>
         </record>
-    </data>
 
-    <data noupdate="1">
-        <!-- notify all employees of module installation -->
-        <function model="mail.group" name="message_append_note">
-            <!-- ids, subject, body, parent_id=False, type='notification', content_subtype='html' -->
-            <value eval="[ref('mail.group_all_employees')]"/>
-            <value>Module Accounting and Finance has been installed.</value>
-            <value>With OpenERP's accounting, you can get an instant access to all your financial data, setup your analytic accounting, forecast your taxes, control your budgets, easily create and send invoices, record bank statements, etc.
+        <!-- Notify all employees of module installation -->
+        <record model="mail.message" id="module_install_notification">
+            <field name="model">mail.group</field>
+            <field name="res_id" ref="mail.group_all_employees"/>
+            <field name="type">notification</field>
+            <field name="subject">Accounting and Finance application installed!</field>
+            <field name="body">With OpenERP's accounting, you get instant access to your financial data, and can setup analytic accounting, forecast taxes, control budgets, easily create and send invoices, record bank statements, etc.
 
-The accounting features are fully integrated with others OpenERP applications to automate all your processes: creation of customer invoices, control of supplier invoices, point-of-sale integration, automated follow-ups, etc.</value>
-        </function>
+The accounting features are fully integrated with other OpenERP applications to automate all your processes: creation of customer invoices, control of supplier invoices, point-of-sale integration, automated follow-ups, etc.</field>
+        </record>
     </data>
 </openerp>
diff --git a/addons/account_accountant/i18n/ar.po b/addons/account_accountant/i18n/ar.po
index 7abec625d1c..b28f43d92f6 100644
--- a/addons/account_accountant/i18n/ar.po
+++ b/addons/account_accountant/i18n/ar.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #~ msgid "Accountant"
 #~ msgstr "محاسب"
diff --git a/addons/account_accountant/i18n/az.po b/addons/account_accountant/i18n/az.po
index b21f105ce35..5e9be62a991 100644
--- a/addons/account_accountant/i18n/az.po
+++ b/addons/account_accountant/i18n/az.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #~ msgid ""
 #~ "\n"
diff --git a/addons/account_accountant/i18n/bg.po b/addons/account_accountant/i18n/bg.po
index 9905bbca745..0279947a920 100644
--- a/addons/account_accountant/i18n/bg.po
+++ b/addons/account_accountant/i18n/bg.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #~ msgid "Accountant"
 #~ msgstr "Счетоводител"
diff --git a/addons/account_accountant/i18n/bn.po b/addons/account_accountant/i18n/bn.po
index 0634a92b634..5c773033e01 100644
--- a/addons/account_accountant/i18n/bn.po
+++ b/addons/account_accountant/i18n/bn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #~ msgid ""
 #~ "\n"
diff --git a/addons/account_accountant/i18n/bs.po b/addons/account_accountant/i18n/bs.po
index b6539ecf7db..7597066f24f 100644
--- a/addons/account_accountant/i18n/bs.po
+++ b/addons/account_accountant/i18n/bs.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #~ msgid ""
 #~ "\n"
diff --git a/addons/account_accountant/i18n/ca.po b/addons/account_accountant/i18n/ca.po
index 64bd7a38a7b..e1a5fb78f9c 100644
--- a/addons/account_accountant/i18n/ca.po
+++ b/addons/account_accountant/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #~ msgid "Accountant"
 #~ msgstr "Comptable"
diff --git a/addons/account_accountant/i18n/cs.po b/addons/account_accountant/i18n/cs.po
index db535469c5e..d963d79fcde 100644
--- a/addons/account_accountant/i18n/cs.po
+++ b/addons/account_accountant/i18n/cs.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #~ msgid "Accountant"
 #~ msgstr "účetní"
diff --git a/addons/account_accountant/i18n/da.po b/addons/account_accountant/i18n/da.po
index 52fd3259a1e..fc98d7980d1 100644
--- a/addons/account_accountant/i18n/da.po
+++ b/addons/account_accountant/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #~ msgid "Accountant"
 #~ msgstr "Bogholder"
diff --git a/addons/account_accountant/i18n/de.po b/addons/account_accountant/i18n/de.po
index 3533e808dd2..6ce9c66daa0 100644
--- a/addons/account_accountant/i18n/de.po
+++ b/addons/account_accountant/i18n/de.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #~ msgid "Accountant"
 #~ msgstr "Finanzbuchhaltung Administrator"
diff --git a/addons/account_accountant/i18n/el.po b/addons/account_accountant/i18n/el.po
index 99a3e8e676c..ed0aa6b3245 100644
--- a/addons/account_accountant/i18n/el.po
+++ b/addons/account_accountant/i18n/el.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #~ msgid "Accountant"
 #~ msgstr "Λογιστής"
diff --git a/addons/account_accountant/i18n/en_GB.po b/addons/account_accountant/i18n/en_GB.po
index a9c5c344c42..f00dd18ad65 100644
--- a/addons/account_accountant/i18n/en_GB.po
+++ b/addons/account_accountant/i18n/en_GB.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #~ msgid ""
 #~ "\n"
diff --git a/addons/account_accountant/i18n/es.po b/addons/account_accountant/i18n/es.po
index bf6cef342ad..3a9c6875446 100644
--- a/addons/account_accountant/i18n/es.po
+++ b/addons/account_accountant/i18n/es.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #~ msgid "Accountant"
 #~ msgstr "Contable"
diff --git a/addons/account_accountant/i18n/es_CR.po b/addons/account_accountant/i18n/es_CR.po
index 4780cdc0fac..1d68904d815 100644
--- a/addons/account_accountant/i18n/es_CR.po
+++ b/addons/account_accountant/i18n/es_CR.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 "Language: es\n"
 
 #~ msgid "Accountant"
diff --git a/addons/account_accountant/i18n/es_EC.po b/addons/account_accountant/i18n/es_EC.po
index 84b9053798f..c7b28b0d95f 100644
--- a/addons/account_accountant/i18n/es_EC.po
+++ b/addons/account_accountant/i18n/es_EC.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #~ msgid "Accountant"
 #~ msgstr "Contador"
diff --git a/addons/account_accountant/i18n/es_PY.po b/addons/account_accountant/i18n/es_PY.po
index e88734c940b..f81e5e43aac 100644
--- a/addons/account_accountant/i18n/es_PY.po
+++ b/addons/account_accountant/i18n/es_PY.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #~ msgid ""
 #~ "\n"
diff --git a/addons/account_accountant/i18n/et.po b/addons/account_accountant/i18n/et.po
index c5b4c06cc34..21c4ae8676f 100644
--- a/addons/account_accountant/i18n/et.po
+++ b/addons/account_accountant/i18n/et.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 
diff --git a/addons/account_accountant/i18n/fa.po b/addons/account_accountant/i18n/fa.po
index 38719a3a01c..d5b725696bf 100644
--- a/addons/account_accountant/i18n/fa.po
+++ b/addons/account_accountant/i18n/fa.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 
diff --git a/addons/account_accountant/i18n/fi.po b/addons/account_accountant/i18n/fi.po
index c9aee02fb2e..31076cc0e75 100644
--- a/addons/account_accountant/i18n/fi.po
+++ b/addons/account_accountant/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #~ msgid "Accountant"
 #~ msgstr "Kirjanpitäjä"
diff --git a/addons/account_accountant/i18n/fr.po b/addons/account_accountant/i18n/fr.po
index 7768fc7c2c2..37c8afc6b30 100644
--- a/addons/account_accountant/i18n/fr.po
+++ b/addons/account_accountant/i18n/fr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #~ msgid "Accountant"
 #~ msgstr "Comptable"
diff --git a/addons/account_accountant/i18n/gl.po b/addons/account_accountant/i18n/gl.po
index f4844253397..df81ec438bd 100644
--- a/addons/account_accountant/i18n/gl.po
+++ b/addons/account_accountant/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #~ msgid ""
 #~ "\n"
diff --git a/addons/account_accountant/i18n/he.po b/addons/account_accountant/i18n/he.po
index 7beaa0bcd5a..e4d220bac27 100644
--- a/addons/account_accountant/i18n/he.po
+++ b/addons/account_accountant/i18n/he.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 
diff --git a/addons/account_accountant/i18n/hi.po b/addons/account_accountant/i18n/hi.po
index 46f602268d8..ad4818a68a7 100644
--- a/addons/account_accountant/i18n/hi.po
+++ b/addons/account_accountant/i18n/hi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #~ msgid "Accountant"
 #~ msgstr "लेखापाल"
diff --git a/addons/account_accountant/i18n/hr.po b/addons/account_accountant/i18n/hr.po
index 1dc507ba3e6..124491a62b8 100644
--- a/addons/account_accountant/i18n/hr.po
+++ b/addons/account_accountant/i18n/hr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #~ msgid ""
 #~ "\n"
diff --git a/addons/account_accountant/i18n/hu.po b/addons/account_accountant/i18n/hu.po
index d7eeee039f6..99e68f935bc 100644
--- a/addons/account_accountant/i18n/hu.po
+++ b/addons/account_accountant/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #~ msgid "Accountant"
 #~ msgstr "Könyvelő"
diff --git a/addons/account_accountant/i18n/id.po b/addons/account_accountant/i18n/id.po
index 4229109eaba..0c72cc7002f 100644
--- a/addons/account_accountant/i18n/id.po
+++ b/addons/account_accountant/i18n/id.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #~ msgid "Accountant"
 #~ msgstr "Akuntan"
diff --git a/addons/account_accountant/i18n/it.po b/addons/account_accountant/i18n/it.po
index 909ecde299f..94bb21a6764 100644
--- a/addons/account_accountant/i18n/it.po
+++ b/addons/account_accountant/i18n/it.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #~ msgid "Accountant"
 #~ msgstr "Contabile"
diff --git a/addons/account_accountant/i18n/ja.po b/addons/account_accountant/i18n/ja.po
index b921378d6cb..79883ac25ea 100644
--- a/addons/account_accountant/i18n/ja.po
+++ b/addons/account_accountant/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #~ msgid ""
 #~ "\n"
diff --git a/addons/account_accountant/i18n/ko.po b/addons/account_accountant/i18n/ko.po
index 132d86d6012..6571723fc41 100644
--- a/addons/account_accountant/i18n/ko.po
+++ b/addons/account_accountant/i18n/ko.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #~ msgid ""
 #~ "\n"
diff --git a/addons/account_accountant/i18n/lo.po b/addons/account_accountant/i18n/lo.po
index b968e6c0727..6d1cf41729b 100644
--- a/addons/account_accountant/i18n/lo.po
+++ b/addons/account_accountant/i18n/lo.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #~ msgid "Accountant"
 #~ msgstr "ນາຍບັນຊີ"
diff --git a/addons/account_accountant/i18n/lt.po b/addons/account_accountant/i18n/lt.po
index 9750e53db88..c130bdcc8c2 100644
--- a/addons/account_accountant/i18n/lt.po
+++ b/addons/account_accountant/i18n/lt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #~ msgid ""
 #~ "\n"
diff --git a/addons/account_accountant/i18n/lv.po b/addons/account_accountant/i18n/lv.po
index 274e1fb1b47..f347f908c2e 100644
--- a/addons/account_accountant/i18n/lv.po
+++ b/addons/account_accountant/i18n/lv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #~ msgid "Accountant"
 #~ msgstr "Grāmatvedis"
diff --git a/addons/account_accountant/i18n/mk.po b/addons/account_accountant/i18n/mk.po
index 14331362518..e4962e2a254 100644
--- a/addons/account_accountant/i18n/mk.po
+++ b/addons/account_accountant/i18n/mk.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #~ msgid ""
 #~ "\n"
diff --git a/addons/account_accountant/i18n/mn.po b/addons/account_accountant/i18n/mn.po
index 1e212202f03..7a50e408e63 100644
--- a/addons/account_accountant/i18n/mn.po
+++ b/addons/account_accountant/i18n/mn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #~ msgid "Accountant"
 #~ msgstr "Нягтлан бодогч"
diff --git a/addons/account_accountant/i18n/nb.po b/addons/account_accountant/i18n/nb.po
index 6129dcb8f3d..9de175978b5 100644
--- a/addons/account_accountant/i18n/nb.po
+++ b/addons/account_accountant/i18n/nb.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #~ msgid ""
 #~ "\n"
diff --git a/addons/account_accountant/i18n/nl.po b/addons/account_accountant/i18n/nl.po
index 547fec8eba9..302395e1c95 100644
--- a/addons/account_accountant/i18n/nl.po
+++ b/addons/account_accountant/i18n/nl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #~ msgid "Accountant"
 #~ msgstr "Accountant"
diff --git a/addons/account_accountant/i18n/nl_BE.po b/addons/account_accountant/i18n/nl_BE.po
index eaa91948d4d..6305574ea5b 100644
--- a/addons/account_accountant/i18n/nl_BE.po
+++ b/addons/account_accountant/i18n/nl_BE.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #~ msgid "Accountant"
 #~ msgstr "Accountant"
diff --git a/addons/account_accountant/i18n/oc.po b/addons/account_accountant/i18n/oc.po
index 1c828d35aa2..fda777b5b91 100644
--- a/addons/account_accountant/i18n/oc.po
+++ b/addons/account_accountant/i18n/oc.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #~ msgid ""
 #~ "\n"
diff --git a/addons/account_accountant/i18n/pl.po b/addons/account_accountant/i18n/pl.po
index febd6ec355d..0676608adda 100644
--- a/addons/account_accountant/i18n/pl.po
+++ b/addons/account_accountant/i18n/pl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #~ msgid ""
 #~ "\n"
diff --git a/addons/account_accountant/i18n/pt.po b/addons/account_accountant/i18n/pt.po
index a13ea02f620..cc8c6ad859f 100644
--- a/addons/account_accountant/i18n/pt.po
+++ b/addons/account_accountant/i18n/pt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #~ msgid "Accountant"
 #~ msgstr "Contabilista"
diff --git a/addons/account_accountant/i18n/pt_BR.po b/addons/account_accountant/i18n/pt_BR.po
index 8d29705a690..eac3877800f 100644
--- a/addons/account_accountant/i18n/pt_BR.po
+++ b/addons/account_accountant/i18n/pt_BR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #~ msgid "Accountant"
 #~ msgstr "Contador"
diff --git a/addons/account_accountant/i18n/ro.po b/addons/account_accountant/i18n/ro.po
index 31defc2e3bc..ce2ee9ca936 100644
--- a/addons/account_accountant/i18n/ro.po
+++ b/addons/account_accountant/i18n/ro.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #~ msgid "Accountant"
 #~ msgstr "Contabil"
diff --git a/addons/account_accountant/i18n/ru.po b/addons/account_accountant/i18n/ru.po
index c6ebd572f67..c06a8504349 100644
--- a/addons/account_accountant/i18n/ru.po
+++ b/addons/account_accountant/i18n/ru.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #~ msgid "Accountant"
 #~ msgstr "Бухгалтер"
diff --git a/addons/account_accountant/i18n/sk.po b/addons/account_accountant/i18n/sk.po
index fefe396cde1..97eea403114 100644
--- a/addons/account_accountant/i18n/sk.po
+++ b/addons/account_accountant/i18n/sk.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #~ msgid "Accountant"
 #~ msgstr "Účtovník"
diff --git a/addons/account_accountant/i18n/sl.po b/addons/account_accountant/i18n/sl.po
index b0000a2a54f..0724060a4fd 100644
--- a/addons/account_accountant/i18n/sl.po
+++ b/addons/account_accountant/i18n/sl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #~ msgid "Accountant"
 #~ msgstr "Računovodja"
diff --git a/addons/account_accountant/i18n/sq.po b/addons/account_accountant/i18n/sq.po
index 453df9cf171..62e03c03248 100644
--- a/addons/account_accountant/i18n/sq.po
+++ b/addons/account_accountant/i18n/sq.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 
diff --git a/addons/account_accountant/i18n/sr.po b/addons/account_accountant/i18n/sr.po
index eeaae783bfe..f7a4260a5df 100644
--- a/addons/account_accountant/i18n/sr.po
+++ b/addons/account_accountant/i18n/sr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #~ msgid "Accountant"
 #~ msgstr "Књиговођа"
diff --git a/addons/account_accountant/i18n/sr@latin.po b/addons/account_accountant/i18n/sr@latin.po
index f178834f7cc..73f17882a34 100644
--- a/addons/account_accountant/i18n/sr@latin.po
+++ b/addons/account_accountant/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #~ msgid ""
 #~ "\n"
diff --git a/addons/account_accountant/i18n/sv.po b/addons/account_accountant/i18n/sv.po
index 1e641201d0d..7e54d716f00 100644
--- a/addons/account_accountant/i18n/sv.po
+++ b/addons/account_accountant/i18n/sv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #~ msgid "Accountant"
 #~ msgstr "Revisor"
diff --git a/addons/account_accountant/i18n/ta.po b/addons/account_accountant/i18n/ta.po
index ff44ef7440f..da0b9015d93 100644
--- a/addons/account_accountant/i18n/ta.po
+++ b/addons/account_accountant/i18n/ta.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #~ msgid ""
 #~ "\n"
diff --git a/addons/account_accountant/i18n/th.po b/addons/account_accountant/i18n/th.po
index e1176a5209f..30817212e24 100644
--- a/addons/account_accountant/i18n/th.po
+++ b/addons/account_accountant/i18n/th.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #~ msgid "Accountant"
 #~ msgstr "ผู้ทำบัญชี"
diff --git a/addons/account_accountant/i18n/tr.po b/addons/account_accountant/i18n/tr.po
index 997bd93ee47..d24466fcce0 100644
--- a/addons/account_accountant/i18n/tr.po
+++ b/addons/account_accountant/i18n/tr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #~ msgid ""
 #~ "\n"
diff --git a/addons/account_accountant/i18n/uk.po b/addons/account_accountant/i18n/uk.po
index 83aa90e0b84..d29ea26f035 100644
--- a/addons/account_accountant/i18n/uk.po
+++ b/addons/account_accountant/i18n/uk.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 
diff --git a/addons/account_accountant/i18n/vi.po b/addons/account_accountant/i18n/vi.po
index e24850f558c..909fa203f46 100644
--- a/addons/account_accountant/i18n/vi.po
+++ b/addons/account_accountant/i18n/vi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #~ msgid "Accountant"
 #~ msgstr "Kế toán viên"
diff --git a/addons/account_accountant/i18n/zh_CN.po b/addons/account_accountant/i18n/zh_CN.po
index 4561c598cbd..1d5a5d93724 100644
--- a/addons/account_accountant/i18n/zh_CN.po
+++ b/addons/account_accountant/i18n/zh_CN.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #~ msgid "Accountant"
 #~ msgstr "会计人员管理"
diff --git a/addons/account_accountant/i18n/zh_TW.po b/addons/account_accountant/i18n/zh_TW.po
index f304c0a0799..f339deabf73 100644
--- a/addons/account_accountant/i18n/zh_TW.po
+++ b/addons/account_accountant/i18n/zh_TW.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #~ msgid "Accountant"
 #~ msgstr "會計師"
diff --git a/addons/account_analytic_analysis/__openerp__.py b/addons/account_analytic_analysis/__openerp__.py
index e0bec840467..40b67289fb1 100644
--- a/addons/account_analytic_analysis/__openerp__.py
+++ b/addons/account_analytic_analysis/__openerp__.py
@@ -28,22 +28,22 @@
 This module is for modifying account analytic view to show important data to project manager of services companies.
 ===================================================================================================================
 
-Adds menu to show relevant information to each manager.
-You can also view the report of account analytic summary
-user-wise as well as month-wise.
+Adds menu to show relevant information to each manager.You can also view the report of account analytic summary user-wise as well as month-wise.
 """,
-    "author": "Camptocamp",
-    "website": "http://www.camptocamp.com/",
-    "images": ["images/bill_tasks_works.jpeg","images/overpassed_accounts.jpeg"],
-    "depends": ["hr_timesheet_invoice", "sale"], #although sale is technically not required to install this module, all menuitems are located under 'Sales' application
-    "init_xml": [],
-    "update_xml": [
-                    "security/ir.model.access.csv",
-                    "account_analytic_analysis_view.xml",
-                    "account_analytic_analysis_menu.xml",
-                    "account_analytic_analysis_cron.xml",
-                    ],
-    'demo_xml': [],
+    'author': 'Camptocamp',
+    'website': 'http://www.camptocamp.com/',
+    'images': ['images/bill_tasks_works.jpeg','images/overpassed_accounts.jpeg'],
+    'depends': ['hr_timesheet_invoice', 'sale'], #although sale is technically not required to install this module, all menuitems are located under 'Sales' application
+    'data': [
+        'security/ir.model.access.csv',
+        'account_analytic_analysis_view.xml',
+        'account_analytic_analysis_menu.xml',
+        'account_analytic_analysis_cron.xml',
+    ],
+    'css': [
+        'static/src/css/analytic.css'
+    ],
+    'demo': [],
     'installable': True,
     'auto_install': False,
     'certificate': '0042927202589',
diff --git a/addons/account_analytic_analysis/account_analytic_analysis.py b/addons/account_analytic_analysis/account_analytic_analysis.py
index c84b311f307..1b4da45c30f 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis.py
+++ b/addons/account_analytic_analysis/account_analytic_analysis.py
@@ -451,8 +451,8 @@ class account_analytic_account(osv.osv):
         'real_margin_rate': fields.function(_real_margin_rate_calc, type='float', string='Real Margin Rate (%)',
             help="Computes using the formula: (Real Margin / Total Costs) * 100.",
             digits_compute=dp.get_precision('Account')),
-        'fix_price_invoices' : fields.boolean('Fix Price Invoices'),
-        'invoice_on_timesheets' : fields.boolean("Invoice On Timesheets"),
+        'fix_price_invoices' : fields.boolean('Fixed Price'),
+        'invoice_on_timesheets' : fields.boolean("On Timesheets"),
         'month_ids': fields.function(_analysis_all, multi='analytic_analysis', type='many2many', relation='account_analytic_analysis.summary.month', string='Month'),
         'user_ids': fields.function(_analysis_all, multi='analytic_analysis', type="many2many", relation='account_analytic_analysis.summary.user', string='User'),
         'hours_qtt_est': fields.float('Estimation of Hours to Invoice'),
diff --git a/addons/account_analytic_analysis/account_analytic_analysis_view.xml b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
index cd043749309..12d8fad1b95 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis_view.xml
+++ b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
@@ -6,12 +6,11 @@
         Analytic Account form
         -->
 
-        <act_window
-            id="action_sales_order"
-            name="Sales Orders"
-            res_model="sale.order"
-            src_model="account.analytic.account"
-        />
+        <record model="ir.actions.act_window" id="action_sales_order">
+            <field name="name">Sales Orders</field>
+            <field name="res_model">sale.order</field>
+            <field name="src_model">account.analytic.account</field>
+        </record>
 
         <record id="account_analytic_account_form_form" model="ir.ui.view">
             <field name="name">account.analytic.account.invoice.form.inherit</field>
@@ -22,30 +21,27 @@
                 <xpath expr='//div[@name="duration"]' position="after" version="7.0">
                     <label for="quantity_max"/>
                     <div>
-                        <field name="quantity_max" class="oe_inline"/> / Remaining: <field name="remaining_hours" class="oe_inline"/> 
+                        <field name="quantity_max" class="oe_inline"/>
                     </div>
                 </xpath>
                 <xpath expr='//group[@name="invoice_on_timesheets"]' position="replace">
-                    <group name='invoice_on_timesheets' string="Invoice on Timesheets Options" attrs="{'invisible': [('invoice_on_timesheets','=',False)]}" col="4">
-                        <field name="pricelist_id" attrs="{'required': [('invoice_on_timesheets', '=', True)]}"/>
-                        <field name="to_invoice" widget="selection" attrs="{'required': [('invoice_on_timesheets', '=', True)]}"/>
-                    </group>
                 </xpath>
-                <xpath expr='//group[@name="master"]' position='after'>
+                <xpath expr='//separator[@name="description"]' position='before'>
                     <separator name="toinvoice" string="Invoicing"/>
-                    <table width="100%%">
+                    <table class="oe_form_analytic_account">
                         <tr>
-                            <th></th>
-                            <th></th>
-                            <th><label string="Est.Tot"/></th>
-                            <th><label string="Invoiced"/></th>
-                            <th><label string="Remaining"/></th>
-                            <th><label string="To Invoice"/></th>
+                            <th class="oe_grey" width="160px"></th>
+                            <th class="oe_grey" width="25px"></th>
+                            <th class="oe_grey" width="100px"><label string="Expected"/></th>
+                            <th class="oe_grey" width="100px"><label string="Invoiced"/></th>
+                            <th class="oe_grey" width="100px"><label string="Remaining"/></th>
+                            <th class="oe_grey" width="100px"><label string="To Invoice"/></th>
+                            <th width="30px"></th>
                             <th></th>
                         </tr><tr>
-                            <td>
+                            <td class="oe_grey">
                                 <label for="fix_price_invoices"/>
-                            </td><td>
+                            </td><td class="oe_grey">
                                 <field name="fix_price_invoices" class="oe_inline"/>
                             </td><td>
                                 <field class="oe_inline" name="amount_max" attrs="{'invisible': [('fix_price_invoices','=',False)]}"/>
@@ -56,13 +52,22 @@
                             </td><td>
                                 <field class="oe_inline" name="fix_price_to_invoice" attrs="{'invisible': [('fix_price_invoices','=',False)]}"/>
                             </td><td>
-                                <button name="%(action_sales_order)d" string="All Sales" type="action" context="{'default_partner_id': [partner_id], 'search_default_partner_id': [partner_id],'search_default_project_id': [active_id],'default_project_id': [active_id]}" attrs="{'invisible': [('fix_price_invoices','=',False)]}"/>
-                                <button name="open_sale_order_lines" string="Lines To Invoice" type="object" context="{'default_partner_id': [partner_id],'default_project_id': active_id,'search_default_uninvoiced': 1,'search_default_project_id': active_id,'search_default_partner_id': [partner_id]}" attrs="{'invisible': [('fix_price_invoices','=',False)]}"/>
-                            </td>
-                        </tr><tr attrs="{'invisible':[('use_timesheets','=',False)]}">
-                            <td>
-                                <label for="invoice_on_timesheets"/>
+                                <button name="open_sale_order_lines"
+                                    class="oe_link oe_e"
+                                    string="/" type="object"
+                                    context="{'default_partner_id': [partner_id],'default_project_id': active_id,'search_default_uninvoiced': 1,'search_default_project_id': active_id,'search_default_partner_id': [partner_id]}"
+                                    attrs="{'invisible': [('fix_price_to_invoice','=',0)]}"/>
                             </td><td>
+                                <button name="%(action_sales_order)d" string="Sale Orders"
+                                    type="action"
+                                    class="oe_link"
+                                    context="{'default_partner_id': [partner_id], 'search_default_partner_id': [partner_id],'search_default_project_id': [active_id],'default_project_id': [active_id]}"
+                                    attrs="{'invisible': [('fix_price_invoices','=',False)]}"/>
+                            </td>
+                        </tr><tr>
+                            <td class="oe_grey">
+                                <label for="invoice_on_timesheets"/>
+                            </td><td class="oe_grey">
                                 <field name="invoice_on_timesheets"/>
                             </td><td>
                                 <field class="oe_inline" name="hours_qtt_est" attrs="{'invisible': [('invoice_on_timesheets','=',False)]}"/>
@@ -73,25 +78,44 @@
                             </td><td>
                                 <field class="oe_inline" name="ca_to_invoice" attrs="{'invisible': [('invoice_on_timesheets','=',False)]}"/>
                             </td><td>
-                                <button name="%(hr_timesheet.act_hr_timesheet_line_evry1_all_form)d" string="All Timesheets" type="action" attrs="{'invisible': [('invoice_on_timesheets','=',False)]}" context="{'default_account_id': active_id,'search_default_account_id': active_id}"/>
-                                <button name="%(hr_timesheet_invoice.act_acc_analytic_acc_2_report_acc_analytic_line_to_invoice)d" string="Timesheets to Invoice" type="action" attrs="{'invisible': [('invoice_on_timesheets','=',False)]}"/>
+                                <button name="%(hr_timesheet_invoice.act_acc_analytic_acc_2_report_acc_analytic_line_to_invoice)d"
+                                    type="action"
+                                    class="oe_link oe_e"
+                                    string="/"
+                                    attrs="{'invisible': [('ca_to_invoice','=',0.0)]}"/>
+
+                            </td><td>
+                                <button name="%(hr_timesheet.act_hr_timesheet_line_evry1_all_form)d"
+                                    string="Timesheets" type="action"
+                                    class="oe_link"
+                                    attrs="{'invisible': [('invoice_on_timesheets','=',False)]}"
+                                    context="{'default_account_id': active_id,'search_default_account_id': active_id}"/>
                             </td>
                         </tr><tr name='total'>
-                            <th>
+                            <th class="oe_grey">
                                 <label string="Total"/>
-                            </th><td>
-                            </td><td>
+                            </th><td class="oe_grey">
+                            </td><td class="oe_grey">
                                 <field name="est_total" class="oe_inline" attrs="{'invisible': [('invoice_on_timesheets','=',False)]}"/>
-                            </td><td>
+                            </td><td class="oe_grey">
                                 <field name="invoiced_total" class="oe_inline"/>
-                            </td><td>
+                            </td><td class="oe_grey">
                                 <field name="remaining_total" class="oe_inline"/>
-                            </td><td>
+                            </td><td class="oe_grey">
                                 <field name="toinvoice_total" class="oe_inline"/>
                             </td><td>
                             </td>
                         </tr>
                     </table>
+                    <group name='invoice_on_timesheets' attrs="{'invisible': [('invoice_on_timesheets','=',False)]}">
+                        <field name="pricelist_id"
+                            class="oe_inline"
+                            attrs="{'required': [('invoice_on_timesheets', '=', True)]}"/>
+                        <field name="to_invoice"
+                            class="oe_inline"
+                            widget="selection"
+                            attrs="{'required': [('invoice_on_timesheets', '=', True)]}"/>
+                    </group>
                  </xpath>
             </field>
         </record>
diff --git a/addons/account_analytic_analysis/i18n/ar.po b/addons/account_analytic_analysis/i18n/ar.po
index 740d5f8ede4..e0f635dc99b 100644
--- a/addons/account_analytic_analysis/i18n/ar.po
+++ b/addons/account_analytic_analysis/i18n/ar.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:14+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:19+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,revenue_per_hour:0
diff --git a/addons/account_analytic_analysis/i18n/bg.po b/addons/account_analytic_analysis/i18n/bg.po
index a213c766584..9a7f2a36329 100644
--- a/addons/account_analytic_analysis/i18n/bg.po
+++ b/addons/account_analytic_analysis/i18n/bg.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:14+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:19+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,revenue_per_hour:0
diff --git a/addons/account_analytic_analysis/i18n/bs.po b/addons/account_analytic_analysis/i18n/bs.po
index 2cc4d488965..850cdfbf5b9 100644
--- a/addons/account_analytic_analysis/i18n/bs.po
+++ b/addons/account_analytic_analysis/i18n/bs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:14+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:19+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,revenue_per_hour:0
diff --git a/addons/account_analytic_analysis/i18n/ca.po b/addons/account_analytic_analysis/i18n/ca.po
index 1b0281506fd..b6d09b30e22 100644
--- a/addons/account_analytic_analysis/i18n/ca.po
+++ b/addons/account_analytic_analysis/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:14+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:19+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,revenue_per_hour:0
diff --git a/addons/account_analytic_analysis/i18n/cs.po b/addons/account_analytic_analysis/i18n/cs.po
index f8e54e2b70f..9dd34c1fbfa 100644
--- a/addons/account_analytic_analysis/i18n/cs.po
+++ b/addons/account_analytic_analysis/i18n/cs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:14+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:19+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,revenue_per_hour:0
diff --git a/addons/account_analytic_analysis/i18n/da.po b/addons/account_analytic_analysis/i18n/da.po
index 8ba1cbef74b..1a97358e36d 100644
--- a/addons/account_analytic_analysis/i18n/da.po
+++ b/addons/account_analytic_analysis/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:14+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:19+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,revenue_per_hour:0
diff --git a/addons/account_analytic_analysis/i18n/de.po b/addons/account_analytic_analysis/i18n/de.po
index 734c7d2409e..9d2147858c7 100644
--- a/addons/account_analytic_analysis/i18n/de.po
+++ b/addons/account_analytic_analysis/i18n/de.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:14+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:19+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,revenue_per_hour:0
diff --git a/addons/account_analytic_analysis/i18n/el.po b/addons/account_analytic_analysis/i18n/el.po
index 3b6c447fc73..e29cbee5114 100644
--- a/addons/account_analytic_analysis/i18n/el.po
+++ b/addons/account_analytic_analysis/i18n/el.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:14+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:19+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,revenue_per_hour:0
diff --git a/addons/account_analytic_analysis/i18n/en_GB.po b/addons/account_analytic_analysis/i18n/en_GB.po
index bb41e5bca07..437071b1b85 100644
--- a/addons/account_analytic_analysis/i18n/en_GB.po
+++ b/addons/account_analytic_analysis/i18n/en_GB.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:14+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:19+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,revenue_per_hour:0
diff --git a/addons/account_analytic_analysis/i18n/es.po b/addons/account_analytic_analysis/i18n/es.po
index f5a8a7b3ddd..72970ec5f59 100644
--- a/addons/account_analytic_analysis/i18n/es.po
+++ b/addons/account_analytic_analysis/i18n/es.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:14+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:19+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,revenue_per_hour:0
diff --git a/addons/account_analytic_analysis/i18n/es_AR.po b/addons/account_analytic_analysis/i18n/es_AR.po
index 7069d4fb8b9..fd8563d9edd 100644
--- a/addons/account_analytic_analysis/i18n/es_AR.po
+++ b/addons/account_analytic_analysis/i18n/es_AR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:14+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:19+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,revenue_per_hour:0
diff --git a/addons/account_analytic_analysis/i18n/es_CR.po b/addons/account_analytic_analysis/i18n/es_CR.po
index ccf33604b95..895b58fc5e1 100644
--- a/addons/account_analytic_analysis/i18n/es_CR.po
+++ b/addons/account_analytic_analysis/i18n/es_CR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:14+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:19+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 "Language: \n"
 
 #. module: account_analytic_analysis
diff --git a/addons/account_analytic_analysis/i18n/es_EC.po b/addons/account_analytic_analysis/i18n/es_EC.po
index e94bdf72af4..bae7c293ecd 100644
--- a/addons/account_analytic_analysis/i18n/es_EC.po
+++ b/addons/account_analytic_analysis/i18n/es_EC.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:14+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:19+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,revenue_per_hour:0
diff --git a/addons/account_analytic_analysis/i18n/es_PY.po b/addons/account_analytic_analysis/i18n/es_PY.po
index 0734052feb2..6819ca43bbf 100644
--- a/addons/account_analytic_analysis/i18n/es_PY.po
+++ b/addons/account_analytic_analysis/i18n/es_PY.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:14+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:19+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,revenue_per_hour:0
diff --git a/addons/account_analytic_analysis/i18n/et.po b/addons/account_analytic_analysis/i18n/et.po
index 8a4585b58d5..b40a2245a0a 100644
--- a/addons/account_analytic_analysis/i18n/et.po
+++ b/addons/account_analytic_analysis/i18n/et.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:14+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:19+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,revenue_per_hour:0
diff --git a/addons/account_analytic_analysis/i18n/fa.po b/addons/account_analytic_analysis/i18n/fa.po
index f2a8daec85a..7bb3513db18 100644
--- a/addons/account_analytic_analysis/i18n/fa.po
+++ b/addons/account_analytic_analysis/i18n/fa.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:14+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:19+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,revenue_per_hour:0
diff --git a/addons/account_analytic_analysis/i18n/fi.po b/addons/account_analytic_analysis/i18n/fi.po
index a424186f3c9..fc3a6d71b6c 100644
--- a/addons/account_analytic_analysis/i18n/fi.po
+++ b/addons/account_analytic_analysis/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:14+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:19+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,revenue_per_hour:0
diff --git a/addons/account_analytic_analysis/i18n/fr.po b/addons/account_analytic_analysis/i18n/fr.po
index e59b85cd6bc..dbc356aca5f 100644
--- a/addons/account_analytic_analysis/i18n/fr.po
+++ b/addons/account_analytic_analysis/i18n/fr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:14+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:19+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,revenue_per_hour:0
diff --git a/addons/account_analytic_analysis/i18n/gl.po b/addons/account_analytic_analysis/i18n/gl.po
index 2569860e3fb..7f3ef5d8e42 100644
--- a/addons/account_analytic_analysis/i18n/gl.po
+++ b/addons/account_analytic_analysis/i18n/gl.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:14+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:19+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,revenue_per_hour:0
diff --git a/addons/account_analytic_analysis/i18n/gu.po b/addons/account_analytic_analysis/i18n/gu.po
index 212a48dd001..9adf4008c1e 100644
--- a/addons/account_analytic_analysis/i18n/gu.po
+++ b/addons/account_analytic_analysis/i18n/gu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:14+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:19+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,revenue_per_hour:0
diff --git a/addons/account_analytic_analysis/i18n/hr.po b/addons/account_analytic_analysis/i18n/hr.po
index 57f925bb0ae..e79b757cec5 100644
--- a/addons/account_analytic_analysis/i18n/hr.po
+++ b/addons/account_analytic_analysis/i18n/hr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:14+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:19+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,revenue_per_hour:0
diff --git a/addons/account_analytic_analysis/i18n/hu.po b/addons/account_analytic_analysis/i18n/hu.po
index 540510fdad5..8c4869e9e03 100644
--- a/addons/account_analytic_analysis/i18n/hu.po
+++ b/addons/account_analytic_analysis/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:14+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:19+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,revenue_per_hour:0
diff --git a/addons/account_analytic_analysis/i18n/id.po b/addons/account_analytic_analysis/i18n/id.po
index 3793439a6f5..d7aa244c6b9 100644
--- a/addons/account_analytic_analysis/i18n/id.po
+++ b/addons/account_analytic_analysis/i18n/id.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:14+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:19+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,revenue_per_hour:0
diff --git a/addons/account_analytic_analysis/i18n/it.po b/addons/account_analytic_analysis/i18n/it.po
index 8ccf91b1fd3..ed127f22783 100644
--- a/addons/account_analytic_analysis/i18n/it.po
+++ b/addons/account_analytic_analysis/i18n/it.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-02-08 00:35+0000\n"
-"PO-Revision-Date: 2011-01-13 18:03+0000\n"
-"Last-Translator: Nicola Riolini - Micronaet <Unknown>\n"
+"PO-Revision-Date: 2012-08-16 09:05+0000\n"
+"Last-Translator: gagarin <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: 2012-08-07 05:14+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:19+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,revenue_per_hour:0
 msgid "Revenue per Time (real)"
-msgstr ""
+msgstr "Ricavo orario (reale)"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,remaining_ca:0
@@ -38,11 +38,13 @@ msgid ""
 "The contracts to be renewed because the deadline is passed or the working "
 "hours are higher than the allocated hours"
 msgstr ""
+"I contratti da rinnovare perchè la scadenza è passata o le ore lavorate sono "
+"maggiori delle ore allocate"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Pending contracts to renew with your customer"
-msgstr ""
+msgstr "Contratti in sospeso da rinnovare con il cliente"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,hours_qtt_non_invoiced:0
@@ -50,6 +52,8 @@ msgid ""
 "Number of time (hours/days) (from journal of type 'general') that can be "
 "invoiced if you invoice based on analytic account."
 msgstr ""
+"Tempo fatturabile (in ore/giorni, dal giornale di tipo 'generale') se si "
+"fattura tramite conto analitico"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
@@ -59,17 +63,17 @@ msgstr ""
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Group By..."
-msgstr ""
+msgstr "Raggruppa per..."
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "End Date"
-msgstr ""
+msgstr "Data fine"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Create Invoice"
-msgstr ""
+msgstr "Crea Fattura"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,last_invoice_date:0
@@ -87,16 +91,18 @@ msgid ""
 "Number of time you spent on the analytic account (from timesheet). It "
 "computes quantities on all journal of type 'general'."
 msgstr ""
+"Costi orari da attribuire al conto analitico (da timesheet). Calcola "
+"quantità su tutti i sezionali di tipo 'generale'."
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Contracts in progress"
-msgstr ""
+msgstr "Contratti attivi"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,is_overdue_quantity:0
 msgid "Overdue Quantity"
-msgstr ""
+msgstr "Quantità Scadute"
 
 #. module: account_analytic_analysis
 #: model:ir.actions.act_window,help:account_analytic_analysis.action_account_analytic_overdue
@@ -108,16 +114,22 @@ msgid ""
 "pending accounts and reopen or close the according to the negotiation with "
 "the customer."
 msgstr ""
+"Qui troverai i contratti da rinnovare in quanto scaduti o le ore lavorate "
+"sono maggiori di quelle allocate. OpenERP imposta automaticamente questi "
+"conti analitici in stato sospeso, in modo da notificare un avviso durante la "
+"fase di inserimento dei timesheet. I commerciali dovrebbero ricontrollare "
+"tutti i contratti sospesi e riaprirli/chiuderli coerentemente con quanto il "
+"cliente vuole rinegoziare."
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,ca_theorical:0
 msgid "Theoretical Revenue"
-msgstr "Ricavo teorico"
+msgstr "Ricavo Teorico"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,hours_qtt_non_invoiced:0
 msgid "Uninvoiced Time"
-msgstr ""
+msgstr "Tempo non fatturato"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,last_worked_invoiced_date:0
@@ -131,7 +143,7 @@ msgstr ""
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "To Renew"
-msgstr ""
+msgstr "Da Rinnovare"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,last_worked_date:0
@@ -141,24 +153,25 @@ msgstr "Data dell'ultimo costo/lavoro"
 #. module: account_analytic_analysis
 #: field:account.analytic.account,hours_qtt_invoiced:0
 msgid "Invoiced Time"
-msgstr ""
+msgstr "Tempo Fatturato"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid ""
 "A contract in OpenERP is an analytic account having a partner set on it."
 msgstr ""
+"Un contratto in OpenERP è un conto analitico associato ad un partner."
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,remaining_hours:0
 msgid "Remaining Time"
-msgstr ""
+msgstr "Tempo rimanente"
 
 #. module: account_analytic_analysis
 #: model:ir.actions.act_window,name:account_analytic_analysis.action_account_analytic_overdue
 #: model:ir.ui.menu,name:account_analytic_analysis.menu_action_account_analytic_overdue
 msgid "Contracts to Renew"
-msgstr ""
+msgstr "Contratti da Rinnovare"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,theorical_margin:0
@@ -168,7 +181,7 @@ msgstr "Margine teorico"
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid " +1 Month"
-msgstr ""
+msgstr " +1 Mese"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,ca_theorical:0
@@ -184,7 +197,7 @@ msgstr ""
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Pending"
-msgstr ""
+msgstr "In sospeso"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,ca_to_invoice:0
@@ -199,7 +212,7 @@ msgstr "Calcolato utilizzando la formula: importo fatturato - totale costi"
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Parent"
-msgstr ""
+msgstr "Mastro"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,user_ids:0
@@ -231,7 +244,7 @@ msgstr "Data dell'ultimo costo fatturato"
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Contract"
-msgstr ""
+msgstr "Contratto"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,real_margin_rate:0
@@ -266,14 +279,14 @@ msgstr "Reddito rimanente"
 #. module: account_analytic_analysis
 #: help:account.analytic.account,remaining_hours:0
 msgid "Computed using the formula: Maximum Time - Total Time"
-msgstr ""
+msgstr "Calcolato usando la formula: Tempo Massimo - Tempo Totale"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,hours_qtt_invoiced:0
 msgid ""
 "Number of time (hours/days) that can be invoiced plus those that already "
 "have been invoiced."
-msgstr ""
+msgstr "Tempo (ore/giorni) fatturabile più tempo già fatturato."
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,ca_to_invoice:0
@@ -287,7 +300,7 @@ msgstr ""
 #. module: account_analytic_analysis
 #: help:account.analytic.account,revenue_per_hour:0
 msgid "Computed using the formula: Invoiced Amount / Total Time"
-msgstr ""
+msgstr "Calcolato usando la formula: Fatturato / Tempo Totale"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,total_cost:0
@@ -312,12 +325,12 @@ msgstr "Contabilità Analitica"
 #: model:ir.actions.act_window,name:account_analytic_analysis.action_account_analytic_overdue_all
 #: model:ir.ui.menu,name:account_analytic_analysis.menu_action_account_analytic_overdue_all
 msgid "Contracts"
-msgstr ""
+msgstr "Contratti"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Manager"
-msgstr ""
+msgstr "Manager"
 
 #. module: account_analytic_analysis
 #: model:ir.actions.act_window,name:account_analytic_analysis.action_hr_tree_invoiced_all
@@ -328,12 +341,12 @@ msgstr "Voci da Fatturare"
 #. module: account_analytic_analysis
 #: help:account.analytic.account,last_invoice_date:0
 msgid "If invoice from the costs, this is the date of the latest invoiced."
-msgstr ""
+msgstr "Se si fattura dai costi, questa è la data dell'ultima fattura."
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Associated Partner"
-msgstr ""
+msgstr "Partner Associato"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
@@ -343,7 +356,7 @@ msgstr ""
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Contracts that are not assigned to an account manager."
-msgstr ""
+msgstr "Contratti non assegnati ad un responsabile del cliente"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,hours_quantity:0
diff --git a/addons/account_analytic_analysis/i18n/ja.po b/addons/account_analytic_analysis/i18n/ja.po
index 0717c254d76..2ceb30de1bc 100644
--- a/addons/account_analytic_analysis/i18n/ja.po
+++ b/addons/account_analytic_analysis/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:14+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:19+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,revenue_per_hour:0
diff --git a/addons/account_analytic_analysis/i18n/ko.po b/addons/account_analytic_analysis/i18n/ko.po
index faf5ae7b8d9..0631b7715e8 100644
--- a/addons/account_analytic_analysis/i18n/ko.po
+++ b/addons/account_analytic_analysis/i18n/ko.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:14+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:19+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,revenue_per_hour:0
diff --git a/addons/account_analytic_analysis/i18n/lt.po b/addons/account_analytic_analysis/i18n/lt.po
index 916436f53ba..27b0e7f8821 100644
--- a/addons/account_analytic_analysis/i18n/lt.po
+++ b/addons/account_analytic_analysis/i18n/lt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:14+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:19+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,revenue_per_hour:0
diff --git a/addons/account_analytic_analysis/i18n/lv.po b/addons/account_analytic_analysis/i18n/lv.po
index e7ab9f18f3d..7212e0fc768 100644
--- a/addons/account_analytic_analysis/i18n/lv.po
+++ b/addons/account_analytic_analysis/i18n/lv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:14+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:19+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,revenue_per_hour:0
diff --git a/addons/account_analytic_analysis/i18n/mk.po b/addons/account_analytic_analysis/i18n/mk.po
index 08e4b31724a..d1a2a455677 100644
--- a/addons/account_analytic_analysis/i18n/mk.po
+++ b/addons/account_analytic_analysis/i18n/mk.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:14+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:19+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,revenue_per_hour:0
diff --git a/addons/account_analytic_analysis/i18n/mn.po b/addons/account_analytic_analysis/i18n/mn.po
index 422f50d7512..d65b6de5813 100644
--- a/addons/account_analytic_analysis/i18n/mn.po
+++ b/addons/account_analytic_analysis/i18n/mn.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:14+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:19+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,revenue_per_hour:0
diff --git a/addons/account_analytic_analysis/i18n/nb.po b/addons/account_analytic_analysis/i18n/nb.po
index 5d31ae76b14..cce81d2b999 100644
--- a/addons/account_analytic_analysis/i18n/nb.po
+++ b/addons/account_analytic_analysis/i18n/nb.po
@@ -14,13 +14,13 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:14+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:19+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,revenue_per_hour:0
 msgid "Revenue per Time (real)"
-msgstr ""
+msgstr "Omsetning per Tid (ekte)"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,remaining_ca:0
@@ -38,11 +38,13 @@ msgid ""
 "The contracts to be renewed because the deadline is passed or the working "
 "hours are higher than the allocated hours"
 msgstr ""
+"Kontraktene som skal fornyes, fordi fristen er passert eller arbeidstiden er "
+"høyere enn de tildelte timene"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Pending contracts to renew with your customer"
-msgstr ""
+msgstr "Ventende kontrakter til å fornye med dine kunder"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,hours_qtt_non_invoiced:0
@@ -50,26 +52,28 @@ msgid ""
 "Number of time (hours/days) (from journal of type 'general') that can be "
 "invoiced if you invoice based on analytic account."
 msgstr ""
+"Antall tid (timer / dager) (fra tidsskrift av typen generell') som kan "
+"faktureres dersom du faktura basert på analytiske konto."
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Analytic Accounts with a past deadline in one month."
-msgstr ""
+msgstr "Analytiske Kontoer med en fortid frist på én måned."
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Group By..."
-msgstr ""
+msgstr "Grupper etter ..."
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "End Date"
-msgstr ""
+msgstr "Sluttdato"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Create Invoice"
-msgstr ""
+msgstr "Lag faktura"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,last_invoice_date:0
@@ -87,16 +91,18 @@ msgid ""
 "Number of time you spent on the analytic account (from timesheet). It "
 "computes quantities on all journal of type 'general'."
 msgstr ""
+"Antall tid du brukte på den analytiske konto (fra timeliste). Det beregner "
+"mengder på alle tidsskrift av typen 'slekter"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Contracts in progress"
-msgstr ""
+msgstr "Kontrakter i fremgang"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,is_overdue_quantity:0
 msgid "Overdue Quantity"
-msgstr ""
+msgstr "Forfalt Antall"
 
 #. module: account_analytic_analysis
 #: model:ir.actions.act_window,help:account_analytic_analysis.action_account_analytic_overdue
@@ -108,6 +114,11 @@ msgid ""
 "pending accounts and reopen or close the according to the negotiation with "
 "the customer."
 msgstr ""
+"Du vil finne kontraktene som skal fornyes fordi fristen er passert eller "
+"arbeidstiden er høyere enn de tildelte timene. OpenERP setter automatisk "
+"disse analytiske kontoer til den ventende tilstand, for å heve en advarsel "
+"under timelister opptaket. Selgere bør gjennomgå alle ventende kontoer og "
+"åpne eller lukke henhold til forhandlinger med kunden."
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,ca_theorical:0
@@ -117,7 +128,7 @@ msgstr "Teoretisk omsetning"
 #. module: account_analytic_analysis
 #: field:account.analytic.account,hours_qtt_non_invoiced:0
 msgid "Uninvoiced Time"
-msgstr ""
+msgstr "fakturerte Tid"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,last_worked_invoiced_date:0
@@ -131,7 +142,7 @@ msgstr ""
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "To Renew"
-msgstr ""
+msgstr "Å fornye"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,last_worked_date:0
@@ -141,24 +152,25 @@ msgstr "Dato for siste kostnad/arbeid"
 #. module: account_analytic_analysis
 #: field:account.analytic.account,hours_qtt_invoiced:0
 msgid "Invoiced Time"
-msgstr ""
+msgstr "Fakturert tid"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid ""
 "A contract in OpenERP is an analytic account having a partner set on it."
 msgstr ""
+"En kontrakt i OpenERP er et analytisk konto med en partner sett på den."
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,remaining_hours:0
 msgid "Remaining Time"
-msgstr ""
+msgstr "Gjenstående tid"
 
 #. module: account_analytic_analysis
 #: model:ir.actions.act_window,name:account_analytic_analysis.action_account_analytic_overdue
 #: model:ir.ui.menu,name:account_analytic_analysis.menu_action_account_analytic_overdue
 msgid "Contracts to Renew"
-msgstr ""
+msgstr "Kontrakter til å fornye"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,theorical_margin:0
@@ -168,7 +180,7 @@ msgstr "Teoretisk margin"
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid " +1 Month"
-msgstr ""
+msgstr " +1 Måned"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,ca_theorical:0
@@ -184,7 +196,7 @@ msgstr ""
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Pending"
-msgstr ""
+msgstr "Venter"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,ca_to_invoice:0
@@ -199,7 +211,7 @@ msgstr "Beregnet med formelen: Fakturert beløp - totalkostnader"
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Parent"
-msgstr ""
+msgstr "Overordnet"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,user_ids:0
@@ -230,7 +242,7 @@ msgstr "Dato for siste fakturerte kostnad"
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Contract"
-msgstr ""
+msgstr "Kontrakt"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,real_margin_rate:0
@@ -265,7 +277,7 @@ msgstr "Gjenstående inntekt"
 #. module: account_analytic_analysis
 #: help:account.analytic.account,remaining_hours:0
 msgid "Computed using the formula: Maximum Time - Total Time"
-msgstr ""
+msgstr "Beregnet ved hjelp av formelen: Maksimal tid - Total tid"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,hours_qtt_invoiced:0
@@ -273,6 +285,8 @@ msgid ""
 "Number of time (hours/days) that can be invoiced plus those that already "
 "have been invoiced."
 msgstr ""
+"Antall (timer / dager) som kan faktureres pluss de som allerede har blitt "
+"fakturert."
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,ca_to_invoice:0
@@ -286,7 +300,7 @@ msgstr ""
 #. module: account_analytic_analysis
 #: help:account.analytic.account,revenue_per_hour:0
 msgid "Computed using the formula: Invoiced Amount / Total Time"
-msgstr ""
+msgstr "Beregnet ved hjelp av formelen: Fakturert beløp / Total tid"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,total_cost:0
@@ -311,12 +325,12 @@ msgstr "Analytisk konto"
 #: model:ir.actions.act_window,name:account_analytic_analysis.action_account_analytic_overdue_all
 #: model:ir.ui.menu,name:account_analytic_analysis.menu_action_account_analytic_overdue_all
 msgid "Contracts"
-msgstr ""
+msgstr "Kontrakter"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Manager"
-msgstr ""
+msgstr "Manager"
 
 #. module: account_analytic_analysis
 #: model:ir.actions.act_window,name:account_analytic_analysis.action_hr_tree_invoiced_all
@@ -328,21 +342,22 @@ msgstr "Alle ufakturerte oppføringer"
 #: help:account.analytic.account,last_invoice_date:0
 msgid "If invoice from the costs, this is the date of the latest invoiced."
 msgstr ""
+"Hvis faktura fra kostnadene, er dette tidspunktet for den senest fakturerte."
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Associated Partner"
-msgstr ""
+msgstr "Samarbeidspartner"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Open"
-msgstr ""
+msgstr "Åpen"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Contracts that are not assigned to an account manager."
-msgstr ""
+msgstr "Kontrakter som ikke er tilordnet til en konto manager."
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,hours_quantity:0
diff --git a/addons/account_analytic_analysis/i18n/nl.po b/addons/account_analytic_analysis/i18n/nl.po
index 41cd7577dae..ba44efd7376 100644
--- a/addons/account_analytic_analysis/i18n/nl.po
+++ b/addons/account_analytic_analysis/i18n/nl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:14+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:19+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,revenue_per_hour:0
diff --git a/addons/account_analytic_analysis/i18n/nl_BE.po b/addons/account_analytic_analysis/i18n/nl_BE.po
index 78ccf4f7b73..095d272ba41 100644
--- a/addons/account_analytic_analysis/i18n/nl_BE.po
+++ b/addons/account_analytic_analysis/i18n/nl_BE.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:14+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:19+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,revenue_per_hour:0
diff --git a/addons/account_analytic_analysis/i18n/oc.po b/addons/account_analytic_analysis/i18n/oc.po
index 7a559c97a49..168cc442b69 100644
--- a/addons/account_analytic_analysis/i18n/oc.po
+++ b/addons/account_analytic_analysis/i18n/oc.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:14+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:19+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,revenue_per_hour:0
diff --git a/addons/account_analytic_analysis/i18n/pl.po b/addons/account_analytic_analysis/i18n/pl.po
index 3749a4bf4a8..7d97671b4ec 100644
--- a/addons/account_analytic_analysis/i18n/pl.po
+++ b/addons/account_analytic_analysis/i18n/pl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:14+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:19+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,revenue_per_hour:0
diff --git a/addons/account_analytic_analysis/i18n/pt.po b/addons/account_analytic_analysis/i18n/pt.po
index 2698d90410f..e41d13b6c02 100644
--- a/addons/account_analytic_analysis/i18n/pt.po
+++ b/addons/account_analytic_analysis/i18n/pt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:14+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:19+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,revenue_per_hour:0
diff --git a/addons/account_analytic_analysis/i18n/pt_BR.po b/addons/account_analytic_analysis/i18n/pt_BR.po
index 7ad7dc9a04e..e5caa78a898 100644
--- a/addons/account_analytic_analysis/i18n/pt_BR.po
+++ b/addons/account_analytic_analysis/i18n/pt_BR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:14+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:19+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,revenue_per_hour:0
diff --git a/addons/account_analytic_analysis/i18n/ro.po b/addons/account_analytic_analysis/i18n/ro.po
index 32ca1857539..2585a053e5d 100644
--- a/addons/account_analytic_analysis/i18n/ro.po
+++ b/addons/account_analytic_analysis/i18n/ro.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:14+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:19+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,revenue_per_hour:0
diff --git a/addons/account_analytic_analysis/i18n/ru.po b/addons/account_analytic_analysis/i18n/ru.po
index 5303f4b0448..c3522cb5c1d 100644
--- a/addons/account_analytic_analysis/i18n/ru.po
+++ b/addons/account_analytic_analysis/i18n/ru.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:14+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:19+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,revenue_per_hour:0
diff --git a/addons/account_analytic_analysis/i18n/sl.po b/addons/account_analytic_analysis/i18n/sl.po
index 1bf86b75a84..50855afb62d 100644
--- a/addons/account_analytic_analysis/i18n/sl.po
+++ b/addons/account_analytic_analysis/i18n/sl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:14+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:19+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,revenue_per_hour:0
diff --git a/addons/account_analytic_analysis/i18n/sq.po b/addons/account_analytic_analysis/i18n/sq.po
index 8d58b51f016..c15fd5014df 100644
--- a/addons/account_analytic_analysis/i18n/sq.po
+++ b/addons/account_analytic_analysis/i18n/sq.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:14+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:19+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,revenue_per_hour:0
diff --git a/addons/account_analytic_analysis/i18n/sr.po b/addons/account_analytic_analysis/i18n/sr.po
index 68c33736dfc..069453e960e 100644
--- a/addons/account_analytic_analysis/i18n/sr.po
+++ b/addons/account_analytic_analysis/i18n/sr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:14+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:19+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,revenue_per_hour:0
diff --git a/addons/account_analytic_analysis/i18n/sr@latin.po b/addons/account_analytic_analysis/i18n/sr@latin.po
index 83f976f32e4..d2ffe4db29e 100644
--- a/addons/account_analytic_analysis/i18n/sr@latin.po
+++ b/addons/account_analytic_analysis/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:14+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:19+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,revenue_per_hour:0
diff --git a/addons/account_analytic_analysis/i18n/sv.po b/addons/account_analytic_analysis/i18n/sv.po
index 45ed8ae67fd..19eb9d5ffb3 100644
--- a/addons/account_analytic_analysis/i18n/sv.po
+++ b/addons/account_analytic_analysis/i18n/sv.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:14+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:19+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,revenue_per_hour:0
diff --git a/addons/account_analytic_analysis/i18n/tlh.po b/addons/account_analytic_analysis/i18n/tlh.po
index 8d403a7bb8c..2a359080d29 100644
--- a/addons/account_analytic_analysis/i18n/tlh.po
+++ b/addons/account_analytic_analysis/i18n/tlh.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:14+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:19+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,revenue_per_hour:0
diff --git a/addons/account_analytic_analysis/i18n/tr.po b/addons/account_analytic_analysis/i18n/tr.po
index 644cad27dd7..5567c1c2064 100644
--- a/addons/account_analytic_analysis/i18n/tr.po
+++ b/addons/account_analytic_analysis/i18n/tr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:14+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:19+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,revenue_per_hour:0
diff --git a/addons/account_analytic_analysis/i18n/uk.po b/addons/account_analytic_analysis/i18n/uk.po
index 4cfba6eddf2..ec5b5ff6d38 100644
--- a/addons/account_analytic_analysis/i18n/uk.po
+++ b/addons/account_analytic_analysis/i18n/uk.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:14+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:19+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,revenue_per_hour:0
diff --git a/addons/account_analytic_analysis/i18n/vi.po b/addons/account_analytic_analysis/i18n/vi.po
index b9d12dde4ec..521b6b86e74 100644
--- a/addons/account_analytic_analysis/i18n/vi.po
+++ b/addons/account_analytic_analysis/i18n/vi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:14+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:19+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,revenue_per_hour:0
diff --git a/addons/account_analytic_analysis/i18n/zh_CN.po b/addons/account_analytic_analysis/i18n/zh_CN.po
index 2cf07ab0d43..b7002da8a2e 100644
--- a/addons/account_analytic_analysis/i18n/zh_CN.po
+++ b/addons/account_analytic_analysis/i18n/zh_CN.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:14+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:19+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,revenue_per_hour:0
diff --git a/addons/account_analytic_analysis/i18n/zh_TW.po b/addons/account_analytic_analysis/i18n/zh_TW.po
index a98e5b58f96..3052cccd08b 100644
--- a/addons/account_analytic_analysis/i18n/zh_TW.po
+++ b/addons/account_analytic_analysis/i18n/zh_TW.po
@@ -7,95 +7,95 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 00:35+0000\n"
-"PO-Revision-Date: 2009-09-08 14:56+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2012-08-18 10:55+0000\n"
+"Last-Translator: Eric Huang <eh@cenoq.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:14+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:19+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,revenue_per_hour:0
 msgid "Revenue per Time (real)"
-msgstr ""
+msgstr "每小時收入（實際）"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,remaining_ca:0
 msgid "Computed using the formula: Max Invoice Price - Invoiced Amount."
-msgstr "使用以下公式計算: 最大發票價格-已開發票總計"
+msgstr "計算公式為:最大發票價格- 已開票金額"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,last_worked_date:0
 msgid "Date of the latest work done on this account."
-msgstr ""
+msgstr "這項目的最近的工作完成日期"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid ""
 "The contracts to be renewed because the deadline is passed or the working "
 "hours are higher than the allocated hours"
-msgstr ""
+msgstr "合約需要續簽，因為最後期限已過，或者實際工時超過了計劃工時。"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Pending contracts to renew with your customer"
-msgstr ""
+msgstr "需要與客戶續簽的合約"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,hours_qtt_non_invoiced:0
 msgid ""
 "Number of time (hours/days) (from journal of type 'general') that can be "
 "invoiced if you invoice based on analytic account."
-msgstr ""
+msgstr "如果您按成本科目開票，這裡是可以開立發票的工時。"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Analytic Accounts with a past deadline in one month."
-msgstr ""
+msgstr "在一個月內到期的成本科目"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Group By..."
-msgstr ""
+msgstr "分類分式..."
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "End Date"
-msgstr ""
+msgstr "截止日期"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Create Invoice"
-msgstr ""
+msgstr "建立發票"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,last_invoice_date:0
 msgid "Last Invoice Date"
-msgstr "最近發票日期"
+msgstr "最近開立發票日期"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,theorical_margin:0
 msgid "Computed using the formula: Theorial Revenue - Total Costs"
-msgstr ""
+msgstr "計算公式：理論收入 - 總費用"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,hours_quantity:0
 msgid ""
 "Number of time you spent on the analytic account (from timesheet). It "
 "computes quantities on all journal of type 'general'."
-msgstr ""
+msgstr "你在這個成本科目上花費的時間總數（數據來自工時表）。僅計算類型為“普通”的憑證簿。"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Contracts in progress"
-msgstr ""
+msgstr "正在執行的合約"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,is_overdue_quantity:0
 msgid "Overdue Quantity"
-msgstr ""
+msgstr "超期數量"
 
 #. module: account_analytic_analysis
 #: model:ir.actions.act_window,help:account_analytic_analysis.action_account_analytic_overdue
@@ -107,65 +107,67 @@ msgid ""
 "pending accounts and reopen or close the according to the negotiation with "
 "the customer."
 msgstr ""
+"這裡列出需要續簽的合約，原因可能是最後期限已過或者實際工數超出了合同規定的工數。OpenERP自動把這些成本科目設置為“待處理”狀態，目的是在輸入工時表的"
+"時候給出一個警告。銷售員應該查看所有待處理的成本科目並與客戶協商後重新打開或關閉它。"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,ca_theorical:0
 msgid "Theoretical Revenue"
-msgstr "理論營業額"
+msgstr "理論收入"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,hours_qtt_non_invoiced:0
 msgid "Uninvoiced Time"
-msgstr ""
+msgstr "未開立發票的工時"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,last_worked_invoiced_date:0
 msgid ""
 "If invoice from the costs, this is the date of the latest work or cost that "
 "have been invoiced."
-msgstr ""
+msgstr "如果發票來自費用, 這是最近工作日期或已開立發票的費用"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "To Renew"
-msgstr ""
+msgstr "要續簽的"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,last_worked_date:0
 msgid "Date of Last Cost/Work"
-msgstr ""
+msgstr "最近日期的工作成本"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,hours_qtt_invoiced:0
 msgid "Invoiced Time"
-msgstr ""
+msgstr "已開立發票的工時"
 
 #. module: account_analytic_analysis
 #: 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
 #: field:account.analytic.account,remaining_hours:0
 msgid "Remaining Time"
-msgstr ""
+msgstr "剩餘時間"
 
 #. module: account_analytic_analysis
 #: model:ir.actions.act_window,name:account_analytic_analysis.action_account_analytic_overdue
 #: model:ir.ui.menu,name:account_analytic_analysis.menu_action_account_analytic_overdue
 msgid "Contracts to Renew"
-msgstr ""
+msgstr "要續簽的合約"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,theorical_margin:0
 msgid "Theoretical Margin"
-msgstr ""
+msgstr "理論的差額"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid " +1 Month"
-msgstr ""
+msgstr " 下個月"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,ca_theorical:0
@@ -173,27 +175,27 @@ msgid ""
 "Based on the costs you had on the project, what would have been the revenue "
 "if all these costs have been invoiced at the normal sale price provided by "
 "the pricelist."
-msgstr ""
+msgstr "如果所有成本按正常的銷售價格開票那這項目的成本基於未來的收入."
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Pending"
-msgstr ""
+msgstr "等待中"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,ca_to_invoice:0
 msgid "Uninvoiced Amount"
-msgstr ""
+msgstr "未開票金額"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,real_margin:0
 msgid "Computed using the formula: Invoiced Amount - Total Costs."
-msgstr ""
+msgstr "計算公式為:發票金額 - 總成本"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Parent"
-msgstr ""
+msgstr "上層"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,user_ids:0
@@ -204,81 +206,81 @@ msgstr "使用者"
 #. module: account_analytic_analysis
 #: help:account.analytic.account,real_margin_rate:0
 msgid "Computes using the formula: (Real Margin / Total Costs) * 100."
-msgstr ""
+msgstr "計算公式為:(實際利潤/總成本×100)"
 
 #. module: account_analytic_analysis
 #: model:ir.model,name:account_analytic_analysis.model_account_analytic_analysis_summary_user
 msgid "Hours Summary by User"
-msgstr ""
+msgstr "按使用者匯總時間"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,ca_invoiced:0
 msgid "Invoiced Amount"
-msgstr ""
+msgstr "已開立發票金額"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,last_worked_invoiced_date:0
 msgid "Date of Last Invoiced Cost"
-msgstr ""
+msgstr "最近的已開立發票日期"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Contract"
-msgstr ""
+msgstr "合約"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,real_margin_rate:0
 msgid "Real Margin Rate (%)"
-msgstr ""
+msgstr "實際利潤(%)"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,real_margin:0
 msgid "Real Margin"
-msgstr ""
+msgstr "實際利潤"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,ca_invoiced:0
 msgid "Total customer invoiced amount for this account."
-msgstr ""
+msgstr "這科目的客戶發票合計"
 
 #. module: account_analytic_analysis
 #: model:ir.model,name:account_analytic_analysis.model_account_analytic_analysis_summary_month
 msgid "Hours summary by month"
-msgstr ""
+msgstr "月的小時數合計"
 
 #. module: account_analytic_analysis
 #: constraint:account.analytic.account:0
 msgid "Error! You can not create recursive analytic accounts."
-msgstr ""
+msgstr "錯誤! 你不能建立遞歸的輔助核算項目"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,remaining_ca:0
 msgid "Remaining Revenue"
-msgstr ""
+msgstr "剩餘的收入"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,remaining_hours:0
 msgid "Computed using the formula: Maximum Time - Total Time"
-msgstr ""
+msgstr "計算公式：最大時數 - 總時數"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,hours_qtt_invoiced:0
 msgid ""
 "Number of time (hours/days) that can be invoiced plus those that already "
 "have been invoiced."
-msgstr ""
+msgstr "可以開立發票的工時加上已經開立發票的工時"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,ca_to_invoice:0
 msgid ""
 "If invoice from analytic account, the remaining amount you can invoice to "
 "the customer based on the total costs."
-msgstr ""
+msgstr "如果是輔助核算項目的發票, 剩餘金額你能給客戶開基於總成本的發票"
 
 #. 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.account,total_cost:0
@@ -297,58 +299,58 @@ msgstr "月"
 #: field:account_analytic_analysis.summary.user,account_id:0
 #: model:ir.model,name:account_analytic_analysis.model_account_analytic_account
 msgid "Analytic Account"
-msgstr ""
+msgstr "輔助核算項"
 
 #. module: account_analytic_analysis
 #: model:ir.actions.act_window,name:account_analytic_analysis.action_account_analytic_overdue_all
 #: model:ir.ui.menu,name:account_analytic_analysis.menu_action_account_analytic_overdue_all
 msgid "Contracts"
-msgstr ""
+msgstr "合約"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Manager"
-msgstr ""
+msgstr "主管"
 
 #. module: account_analytic_analysis
 #: 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 "All Uninvoiced Entries"
-msgstr ""
+msgstr "所有未開發票"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,last_invoice_date:0
 msgid "If invoice from the costs, this is the date of the latest invoiced."
-msgstr ""
+msgstr "如按實際成本開票，這是最末開票日期"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Associated Partner"
-msgstr ""
+msgstr "相關業務夥伴"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Open"
-msgstr ""
+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
 #: field:account.analytic.account,hours_quantity:0
 #: field:account_analytic_analysis.summary.month,unit_amount:0
 #: field:account_analytic_analysis.summary.user,unit_amount:0
 msgid "Total Time"
-msgstr ""
+msgstr "總時間"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,total_cost:0
 msgid ""
 "Total of costs for this account. It includes real costs (from invoices) and "
 "indirect costs, like time spent on timesheets."
-msgstr ""
+msgstr "這項的成本合計,它包括實際成本(發票)和間接成本,如花費的時間表"
 
 #~ msgid "Computed using the formula: Maximum Quantity - Hours Tot."
 #~ msgstr "使用以下公式計算: 最大數量 - 總時間(小時)"
diff --git a/addons/account_analytic_analysis/static/src/css/Makefile b/addons/account_analytic_analysis/static/src/css/Makefile
new file mode 100644
index 00000000000..21462c06dcc
--- /dev/null
+++ b/addons/account_analytic_analysis/static/src/css/Makefile
@@ -0,0 +1,3 @@
+analytic.css: analytic.sass
+	sass -t expanded analytic.sass analytic.css
+
diff --git a/addons/account_analytic_analysis/static/src/css/analytic.css b/addons/account_analytic_analysis/static/src/css/analytic.css
new file mode 100644
index 00000000000..c6513cc6321
--- /dev/null
+++ b/addons/account_analytic_analysis/static/src/css/analytic.css
@@ -0,0 +1,15 @@
+@charset "utf-8";
+.openerp .oe_form table.oe_form_analytic_account tr {
+  height: 28px;
+}
+.openerp .oe_form table.oe_form_analytic_account tr td, .openerp .oe_form table.oe_form_analytic_account tr th {
+  vertical-align: middle;
+}
+.openerp .oe_form table.oe_form_analytic_account tr td .oe_form_field_float, .openerp .oe_form table.oe_form_analytic_account tr th .oe_form_field_float {
+  float: right;
+  width: auto !important;
+}
+.openerp .oe_form table.oe_form_analytic_account .oe_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
new file mode 100644
index 00000000000..1db81fb61b9
--- /dev/null
+++ b/addons/account_analytic_analysis/static/src/css/analytic.sass
@@ -0,0 +1,15 @@
+@charset "utf-8"
+
+.openerp .oe_form
+    table.oe_form_analytic_account
+        tr
+            height: 28px
+            td,th
+                vertical-align: middle
+                .oe_form_field_float
+                    float: right
+                    width: auto !important
+        .oe_grey
+            background-color: #eeeeee
+            color: #404040
+        
diff --git a/addons/account_analytic_default/__openerp__.py b/addons/account_analytic_default/__openerp__.py
index 5ec1fc66c73..ef01867983a 100644
--- a/addons/account_analytic_default/__openerp__.py
+++ b/addons/account_analytic_default/__openerp__.py
@@ -20,12 +20,12 @@
 ##############################################################################
 
 {
-    'name'      : 'Account Analytic Defaults',
-    'version'   : '1.0',
-    "category": 'Accounting & Finance',
+    'name': 'Account Analytic Defaults',
+    'version': '1.0',
+    'category': 'Accounting & Finance',
     'description': """
 Set default values for your analytic accounts.
-=============================================
+==============================================
 
 Allows to automatically select analytic accounts based on criterions:
 ---------------------------------------------------------------------
@@ -35,17 +35,16 @@ Allows to automatically select analytic accounts based on criterions:
     * Company
     * Date
     """,
-    'author'    : 'OpenERP SA',
-    'website'   : 'http://www.openerp.com',
-    'images'   : ['images/analytic_defaults.jpeg'],
-    'depends'   : ['sale'],
-    'init_xml'  : [],
-    'update_xml': [
+    'author': 'OpenERP SA',
+    'website': 'http://www.openerp.com',
+    'images': ['images/analytic_defaults.jpeg'],
+    'depends': ['sale'],
+    'data': [
         'security/ir.model.access.csv', 
         'security/account_analytic_default_security.xml', 
         'account_analytic_default_view.xml'
     ],
-    'demo_xml'  : [],
+    'demo': [],
     'installable': True,
     'auto_install': False,
     'certificate': '0074229833581',
diff --git a/addons/account_analytic_default/i18n/ar.po b/addons/account_analytic_default/i18n/ar.po
index cbb0d991f5d..50fe4847c02 100644
--- a/addons/account_analytic_default/i18n/ar.po
+++ b/addons/account_analytic_default/i18n/ar.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:17+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:22+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_analytic_default
 #: help:account.analytic.default,partner_id:0
diff --git a/addons/account_analytic_default/i18n/bg.po b/addons/account_analytic_default/i18n/bg.po
index bed7f93c408..0fe2e333c66 100644
--- a/addons/account_analytic_default/i18n/bg.po
+++ b/addons/account_analytic_default/i18n/bg.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:17+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:22+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_analytic_default
 #: help:account.analytic.default,partner_id:0
diff --git a/addons/account_analytic_default/i18n/bs.po b/addons/account_analytic_default/i18n/bs.po
index 0ec1004acb4..7643ef4aaf2 100644
--- a/addons/account_analytic_default/i18n/bs.po
+++ b/addons/account_analytic_default/i18n/bs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:17+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:22+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_analytic_default
 #: help:account.analytic.default,partner_id:0
diff --git a/addons/account_analytic_default/i18n/ca.po b/addons/account_analytic_default/i18n/ca.po
index 7a59aedd279..d288a716c4e 100644
--- a/addons/account_analytic_default/i18n/ca.po
+++ b/addons/account_analytic_default/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:17+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:22+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_analytic_default
 #: help:account.analytic.default,partner_id:0
diff --git a/addons/account_analytic_default/i18n/cs.po b/addons/account_analytic_default/i18n/cs.po
index 300fd81ca47..24d9fece03b 100644
--- a/addons/account_analytic_default/i18n/cs.po
+++ b/addons/account_analytic_default/i18n/cs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:17+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:22+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_analytic_default
 #: help:account.analytic.default,partner_id:0
diff --git a/addons/account_analytic_default/i18n/da.po b/addons/account_analytic_default/i18n/da.po
index 34f0d395237..b97dd8b6437 100644
--- a/addons/account_analytic_default/i18n/da.po
+++ b/addons/account_analytic_default/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:17+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:22+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_analytic_default
 #: help:account.analytic.default,partner_id:0
diff --git a/addons/account_analytic_default/i18n/de.po b/addons/account_analytic_default/i18n/de.po
index ac36c7b96c3..e2dc6849fcb 100644
--- a/addons/account_analytic_default/i18n/de.po
+++ b/addons/account_analytic_default/i18n/de.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:17+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:22+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_analytic_default
 #: help:account.analytic.default,partner_id:0
diff --git a/addons/account_analytic_default/i18n/el.po b/addons/account_analytic_default/i18n/el.po
index 4678413377c..9e1779348de 100644
--- a/addons/account_analytic_default/i18n/el.po
+++ b/addons/account_analytic_default/i18n/el.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:17+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:22+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_analytic_default
 #: help:account.analytic.default,partner_id:0
diff --git a/addons/account_analytic_default/i18n/es.po b/addons/account_analytic_default/i18n/es.po
index 1bc2980c771..bb15958b538 100644
--- a/addons/account_analytic_default/i18n/es.po
+++ b/addons/account_analytic_default/i18n/es.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:17+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:22+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_analytic_default
 #: help:account.analytic.default,partner_id:0
diff --git a/addons/account_analytic_default/i18n/es_AR.po b/addons/account_analytic_default/i18n/es_AR.po
index 443454467b5..a16fe26bfa4 100644
--- a/addons/account_analytic_default/i18n/es_AR.po
+++ b/addons/account_analytic_default/i18n/es_AR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:17+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:22+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_analytic_default
 #: help:account.analytic.default,partner_id:0
diff --git a/addons/account_analytic_default/i18n/es_CR.po b/addons/account_analytic_default/i18n/es_CR.po
index 7fca98d5cec..fdbe0442d85 100644
--- a/addons/account_analytic_default/i18n/es_CR.po
+++ b/addons/account_analytic_default/i18n/es_CR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:17+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:22+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 "Language: \n"
 
 #. module: account_analytic_default
diff --git a/addons/account_analytic_default/i18n/es_EC.po b/addons/account_analytic_default/i18n/es_EC.po
index 3f2ec8ceb24..add941886ec 100644
--- a/addons/account_analytic_default/i18n/es_EC.po
+++ b/addons/account_analytic_default/i18n/es_EC.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:17+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:22+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_analytic_default
 #: help:account.analytic.default,partner_id:0
diff --git a/addons/account_analytic_default/i18n/es_PY.po b/addons/account_analytic_default/i18n/es_PY.po
index 1d561b24f37..2faa17dea4d 100644
--- a/addons/account_analytic_default/i18n/es_PY.po
+++ b/addons/account_analytic_default/i18n/es_PY.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:17+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:22+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_analytic_default
 #: help:account.analytic.default,partner_id:0
diff --git a/addons/account_analytic_default/i18n/et.po b/addons/account_analytic_default/i18n/et.po
index 63ca6937609..b82207da972 100644
--- a/addons/account_analytic_default/i18n/et.po
+++ b/addons/account_analytic_default/i18n/et.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:17+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:22+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_analytic_default
 #: help:account.analytic.default,partner_id:0
diff --git a/addons/account_analytic_default/i18n/fa.po b/addons/account_analytic_default/i18n/fa.po
index 07759348276..f9075e2ed33 100644
--- a/addons/account_analytic_default/i18n/fa.po
+++ b/addons/account_analytic_default/i18n/fa.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:17+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:22+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_analytic_default
 #: help:account.analytic.default,partner_id:0
diff --git a/addons/account_analytic_default/i18n/fi.po b/addons/account_analytic_default/i18n/fi.po
index e94cec3c9db..b3b5fc3fd89 100644
--- a/addons/account_analytic_default/i18n/fi.po
+++ b/addons/account_analytic_default/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:17+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:22+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_analytic_default
 #: help:account.analytic.default,partner_id:0
diff --git a/addons/account_analytic_default/i18n/fr.po b/addons/account_analytic_default/i18n/fr.po
index 3a9153eb912..62e8a90ddd6 100644
--- a/addons/account_analytic_default/i18n/fr.po
+++ b/addons/account_analytic_default/i18n/fr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:17+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:22+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_analytic_default
 #: help:account.analytic.default,partner_id:0
diff --git a/addons/account_analytic_default/i18n/gl.po b/addons/account_analytic_default/i18n/gl.po
index 3169e64b82b..199d298df8e 100644
--- a/addons/account_analytic_default/i18n/gl.po
+++ b/addons/account_analytic_default/i18n/gl.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:17+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:22+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_analytic_default
 #: help:account.analytic.default,partner_id:0
diff --git a/addons/account_analytic_default/i18n/gu.po b/addons/account_analytic_default/i18n/gu.po
index 7d97395002f..67606056bcb 100644
--- a/addons/account_analytic_default/i18n/gu.po
+++ b/addons/account_analytic_default/i18n/gu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:17+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:22+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_analytic_default
 #: help:account.analytic.default,partner_id:0
diff --git a/addons/account_analytic_default/i18n/hr.po b/addons/account_analytic_default/i18n/hr.po
index 576580899da..217b8bf8f1c 100644
--- a/addons/account_analytic_default/i18n/hr.po
+++ b/addons/account_analytic_default/i18n/hr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:17+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:22+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_analytic_default
 #: help:account.analytic.default,partner_id:0
diff --git a/addons/account_analytic_default/i18n/hu.po b/addons/account_analytic_default/i18n/hu.po
index eddd988d95d..557aa2e66f5 100644
--- a/addons/account_analytic_default/i18n/hu.po
+++ b/addons/account_analytic_default/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:17+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:22+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_analytic_default
 #: help:account.analytic.default,partner_id:0
diff --git a/addons/account_analytic_default/i18n/id.po b/addons/account_analytic_default/i18n/id.po
index 7cda56ff0e8..751f709d7ad 100644
--- a/addons/account_analytic_default/i18n/id.po
+++ b/addons/account_analytic_default/i18n/id.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:17+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:22+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_analytic_default
 #: help:account.analytic.default,partner_id:0
diff --git a/addons/account_analytic_default/i18n/it.po b/addons/account_analytic_default/i18n/it.po
index 2f85f7aa08c..2245d6ab3c9 100644
--- a/addons/account_analytic_default/i18n/it.po
+++ b/addons/account_analytic_default/i18n/it.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:17+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:22+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_analytic_default
 #: help:account.analytic.default,partner_id:0
diff --git a/addons/account_analytic_default/i18n/ja.po b/addons/account_analytic_default/i18n/ja.po
index 3eb6e820d0e..58d2cc0e69b 100644
--- a/addons/account_analytic_default/i18n/ja.po
+++ b/addons/account_analytic_default/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:17+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:22+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_analytic_default
 #: help:account.analytic.default,partner_id:0
diff --git a/addons/account_analytic_default/i18n/ko.po b/addons/account_analytic_default/i18n/ko.po
index 0aed6e33c19..a73639b2a71 100644
--- a/addons/account_analytic_default/i18n/ko.po
+++ b/addons/account_analytic_default/i18n/ko.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:17+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:22+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_analytic_default
 #: help:account.analytic.default,partner_id:0
diff --git a/addons/account_analytic_default/i18n/lt.po b/addons/account_analytic_default/i18n/lt.po
index 030ee8a2cdc..42646e4e522 100644
--- a/addons/account_analytic_default/i18n/lt.po
+++ b/addons/account_analytic_default/i18n/lt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:17+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:22+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_analytic_default
 #: help:account.analytic.default,partner_id:0
diff --git a/addons/account_analytic_default/i18n/lv.po b/addons/account_analytic_default/i18n/lv.po
index 88517d3b8af..4b5e2a8efff 100644
--- a/addons/account_analytic_default/i18n/lv.po
+++ b/addons/account_analytic_default/i18n/lv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:17+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:22+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_analytic_default
 #: help:account.analytic.default,partner_id:0
diff --git a/addons/account_analytic_default/i18n/mn.po b/addons/account_analytic_default/i18n/mn.po
index c9cb3548d5a..2a6a12038f0 100644
--- a/addons/account_analytic_default/i18n/mn.po
+++ b/addons/account_analytic_default/i18n/mn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:17+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:22+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_analytic_default
 #: help:account.analytic.default,partner_id:0
diff --git a/addons/account_analytic_default/i18n/nb.po b/addons/account_analytic_default/i18n/nb.po
index f068865cd1c..df42baa7237 100644
--- a/addons/account_analytic_default/i18n/nb.po
+++ b/addons/account_analytic_default/i18n/nb.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:17+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:22+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_analytic_default
 #: help:account.analytic.default,partner_id:0
diff --git a/addons/account_analytic_default/i18n/nl.po b/addons/account_analytic_default/i18n/nl.po
index 7ed094507a2..9211d0b4cad 100644
--- a/addons/account_analytic_default/i18n/nl.po
+++ b/addons/account_analytic_default/i18n/nl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:17+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:22+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_analytic_default
 #: help:account.analytic.default,partner_id:0
@@ -118,7 +118,7 @@ msgstr "Einddatum"
 msgid ""
 "select a user which will use analytical account specified in analytic default"
 msgstr ""
-"selecteer een gebruiker die kostenplaats gebruikt in standaard kostenplaats"
+"Selecteer een gebruiker die kostenplaats gebruikt in standaard kostenplaats."
 
 #. module: account_analytic_default
 #: view:account.analytic.default:0
diff --git a/addons/account_analytic_default/i18n/nl_BE.po b/addons/account_analytic_default/i18n/nl_BE.po
index a4f37d5d8d8..6d3a32ea7cd 100644
--- a/addons/account_analytic_default/i18n/nl_BE.po
+++ b/addons/account_analytic_default/i18n/nl_BE.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:17+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:22+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_analytic_default
 #: help:account.analytic.default,partner_id:0
diff --git a/addons/account_analytic_default/i18n/oc.po b/addons/account_analytic_default/i18n/oc.po
index 58707b8aec0..b91b19eac98 100644
--- a/addons/account_analytic_default/i18n/oc.po
+++ b/addons/account_analytic_default/i18n/oc.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:17+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:22+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_analytic_default
 #: help:account.analytic.default,partner_id:0
diff --git a/addons/account_analytic_default/i18n/pl.po b/addons/account_analytic_default/i18n/pl.po
index 43e60c0e863..1dda44b0ce8 100644
--- a/addons/account_analytic_default/i18n/pl.po
+++ b/addons/account_analytic_default/i18n/pl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:17+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:22+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_analytic_default
 #: help:account.analytic.default,partner_id:0
diff --git a/addons/account_analytic_default/i18n/pt.po b/addons/account_analytic_default/i18n/pt.po
index 8f6c178bcfc..076a5d4ff26 100644
--- a/addons/account_analytic_default/i18n/pt.po
+++ b/addons/account_analytic_default/i18n/pt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:17+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:22+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_analytic_default
 #: help:account.analytic.default,partner_id:0
diff --git a/addons/account_analytic_default/i18n/pt_BR.po b/addons/account_analytic_default/i18n/pt_BR.po
index 5e3b41ffd53..93f984de550 100644
--- a/addons/account_analytic_default/i18n/pt_BR.po
+++ b/addons/account_analytic_default/i18n/pt_BR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:17+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:22+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_analytic_default
 #: help:account.analytic.default,partner_id:0
diff --git a/addons/account_analytic_default/i18n/ro.po b/addons/account_analytic_default/i18n/ro.po
index f0ff19b1c6e..92c312f6d9b 100644
--- a/addons/account_analytic_default/i18n/ro.po
+++ b/addons/account_analytic_default/i18n/ro.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:17+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:22+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_analytic_default
 #: help:account.analytic.default,partner_id:0
diff --git a/addons/account_analytic_default/i18n/ru.po b/addons/account_analytic_default/i18n/ru.po
index 98ee2f439c2..a6ee142d2e1 100644
--- a/addons/account_analytic_default/i18n/ru.po
+++ b/addons/account_analytic_default/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-02-08 00:35+0000\n"
-"PO-Revision-Date: 2010-12-23 13:10+0000\n"
+"PO-Revision-Date: 2012-08-17 10:54+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: 2012-08-07 05:17+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:22+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_analytic_default
 #: help:account.analytic.default,partner_id:0
@@ -133,7 +133,7 @@ msgstr "Аналитика по умолчанию"
 #. module: account_analytic_default
 #: sql_constraint:stock.picking:0
 msgid "Reference must be unique per Company!"
-msgstr ""
+msgstr "Ссылка должна быть уникальна для каждой компании!"
 
 #. module: account_analytic_default
 #: view:account.analytic.default:0
diff --git a/addons/account_analytic_default/i18n/sk.po b/addons/account_analytic_default/i18n/sk.po
index 82388991170..d7c1160202a 100644
--- a/addons/account_analytic_default/i18n/sk.po
+++ b/addons/account_analytic_default/i18n/sk.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:17+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:22+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_analytic_default
 #: help:account.analytic.default,partner_id:0
diff --git a/addons/account_analytic_default/i18n/sl.po b/addons/account_analytic_default/i18n/sl.po
index 9fe866eb6bf..8138abd91da 100644
--- a/addons/account_analytic_default/i18n/sl.po
+++ b/addons/account_analytic_default/i18n/sl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:17+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:22+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_analytic_default
 #: help:account.analytic.default,partner_id:0
diff --git a/addons/account_analytic_default/i18n/sq.po b/addons/account_analytic_default/i18n/sq.po
index 60c9b41fd8a..22375b9e4e1 100644
--- a/addons/account_analytic_default/i18n/sq.po
+++ b/addons/account_analytic_default/i18n/sq.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:17+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:22+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_analytic_default
 #: help:account.analytic.default,partner_id:0
diff --git a/addons/account_analytic_default/i18n/sr.po b/addons/account_analytic_default/i18n/sr.po
index c436b26cc8e..e20d5eca49a 100644
--- a/addons/account_analytic_default/i18n/sr.po
+++ b/addons/account_analytic_default/i18n/sr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:17+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:22+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_analytic_default
 #: help:account.analytic.default,partner_id:0
diff --git a/addons/account_analytic_default/i18n/sr@latin.po b/addons/account_analytic_default/i18n/sr@latin.po
index e0718a0aaca..e0a99ca3bbd 100644
--- a/addons/account_analytic_default/i18n/sr@latin.po
+++ b/addons/account_analytic_default/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:17+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:22+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_analytic_default
 #: help:account.analytic.default,partner_id:0
diff --git a/addons/account_analytic_default/i18n/sv.po b/addons/account_analytic_default/i18n/sv.po
index 88d57b2e912..1e4a3df4253 100644
--- a/addons/account_analytic_default/i18n/sv.po
+++ b/addons/account_analytic_default/i18n/sv.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:17+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:22+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_analytic_default
 #: help:account.analytic.default,partner_id:0
diff --git a/addons/account_analytic_default/i18n/tlh.po b/addons/account_analytic_default/i18n/tlh.po
index 3174c7894d8..c3916ddc3f3 100644
--- a/addons/account_analytic_default/i18n/tlh.po
+++ b/addons/account_analytic_default/i18n/tlh.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:17+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:22+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_analytic_default
 #: help:account.analytic.default,partner_id:0
diff --git a/addons/account_analytic_default/i18n/tr.po b/addons/account_analytic_default/i18n/tr.po
index e063d01f312..3243c178c1f 100644
--- a/addons/account_analytic_default/i18n/tr.po
+++ b/addons/account_analytic_default/i18n/tr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:17+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:22+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_analytic_default
 #: help:account.analytic.default,partner_id:0
diff --git a/addons/account_analytic_default/i18n/uk.po b/addons/account_analytic_default/i18n/uk.po
index f1ea5a471d4..66283b996a0 100644
--- a/addons/account_analytic_default/i18n/uk.po
+++ b/addons/account_analytic_default/i18n/uk.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:17+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:22+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_analytic_default
 #: help:account.analytic.default,partner_id:0
diff --git a/addons/account_analytic_default/i18n/vi.po b/addons/account_analytic_default/i18n/vi.po
index 2190e37d7d8..9d474a3e0ef 100644
--- a/addons/account_analytic_default/i18n/vi.po
+++ b/addons/account_analytic_default/i18n/vi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:17+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:22+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_analytic_default
 #: help:account.analytic.default,partner_id:0
diff --git a/addons/account_analytic_default/i18n/zh_CN.po b/addons/account_analytic_default/i18n/zh_CN.po
index e5d6de0c553..ef7fa5c7251 100644
--- a/addons/account_analytic_default/i18n/zh_CN.po
+++ b/addons/account_analytic_default/i18n/zh_CN.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:17+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:22+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_analytic_default
 #: help:account.analytic.default,partner_id:0
diff --git a/addons/account_analytic_default/i18n/zh_TW.po b/addons/account_analytic_default/i18n/zh_TW.po
index d35c6caff39..cd322f7438b 100644
--- a/addons/account_analytic_default/i18n/zh_TW.po
+++ b/addons/account_analytic_default/i18n/zh_TW.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 00:35+0000\n"
-"PO-Revision-Date: 2009-09-08 12:47+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2012-08-18 11:11+0000\n"
+"Last-Translator: Eric Huang <eh@cenoq.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:17+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:22+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_analytic_default
 #: help:account.analytic.default,partner_id:0
@@ -23,43 +23,44 @@ msgid ""
 "default (eg. create new cutomer invoice or Sale order if we select this "
 "partner, it will automatically take this as an analytical account)"
 msgstr ""
+"\"選擇一個合作夥伴，這將使用輔助核算預設指定的帳戶（如建立新客戶。客戶遍布發票或銷售訂單，如果我們選擇這個合作夥伴，它會自動輔助核算項目）。"
 
 #. module: account_analytic_default
 #: model:ir.actions.act_window,name:account_analytic_default.analytic_rule_action_partner
 #: model:ir.actions.act_window,name:account_analytic_default.analytic_rule_action_product
 #: model:ir.actions.act_window,name:account_analytic_default.analytic_rule_action_user
 msgid "Analytic Rules"
-msgstr ""
+msgstr "輔助核算規則"
 
 #. module: account_analytic_default
 #: help:account.analytic.default,analytic_id:0
 msgid "Analytical Account"
-msgstr ""
+msgstr "輔助核算項目"
 
 #. module: account_analytic_default
 #: view:account.analytic.default:0
 msgid "Current"
-msgstr ""
+msgstr "使用中"
 
 #. module: account_analytic_default
 #: view:account.analytic.default:0
 msgid "Group By..."
-msgstr ""
+msgstr "分類分式..."
 
 #. module: account_analytic_default
 #: help:account.analytic.default,date_stop:0
 msgid "Default end date for this Analytical Account"
-msgstr ""
+msgstr "這種輔助核算項目的預設結束日期"
 
 #. module: account_analytic_default
 #: model:ir.model,name:account_analytic_default.model_stock_picking
 msgid "Picking List"
-msgstr ""
+msgstr "提貨清單"
 
 #. module: account_analytic_default
 #: view:account.analytic.default:0
 msgid "Conditions"
-msgstr ""
+msgstr "條件"
 
 #. module: account_analytic_default
 #: help:account.analytic.default,company_id:0
@@ -67,23 +68,23 @@ msgid ""
 "select a company which will use analytical account specified in analytic "
 "default (eg. create new cutomer invoice or Sale order if we select this "
 "company, it will automatically take this as an analytical account)"
-msgstr ""
+msgstr "公司將使用輔助核算預設指定的帳戶（如建立新客戶。客戶遍布發票或銷售訂單，如果我們選擇了這家公司，它會自動輔助核算項目）。"
 
 #. module: account_analytic_default
 #: help:account.analytic.default,date_start:0
 msgid "Default start date for this Analytical Account"
-msgstr ""
+msgstr "這種輔助核算項目的預設開始日期"
 
 #. module: account_analytic_default
 #: view:account.analytic.default:0
 #: field:account.analytic.default,product_id:0
 msgid "Product"
-msgstr "商品"
+msgstr "產品"
 
 #. module: account_analytic_default
 #: model:ir.model,name:account_analytic_default.model_account_analytic_default
 msgid "Analytic Distribution"
-msgstr ""
+msgstr "輔助核算分配"
 
 #. module: account_analytic_default
 #: view:account.analytic.default:0
@@ -111,24 +112,24 @@ msgstr "結束日期"
 #: help:account.analytic.default,user_id:0
 msgid ""
 "select a user which will use analytical account specified in analytic default"
-msgstr ""
+msgstr "選擇一個使用者將使用輔助核算預設指定的項目。"
 
 #. module: account_analytic_default
 #: view:account.analytic.default:0
 #: model:ir.actions.act_window,name:account_analytic_default.action_analytic_default_list
 #: model:ir.ui.menu,name:account_analytic_default.menu_analytic_default_list
 msgid "Analytic Defaults"
-msgstr ""
+msgstr "輔助核算預設"
 
 #. module: account_analytic_default
 #: sql_constraint:stock.picking:0
 msgid "Reference must be unique per Company!"
-msgstr ""
+msgstr "編號必須在公司內唯一！"
 
 #. module: account_analytic_default
 #: view:account.analytic.default:0
 msgid "Analytical defaults whose end date is greater than today or None"
-msgstr ""
+msgstr "輔助核算預設的結束日期大於今天“或”無“"
 
 #. module: account_analytic_default
 #: help:account.analytic.default,product_id:0
@@ -136,12 +137,12 @@ msgid ""
 "select a product which will use analytical account specified in analytic "
 "default (eg. create new cutomer invoice or Sale order if we select this "
 "product, it will automatically take this as an analytical account)"
-msgstr ""
+msgstr "選擇一個產品，這將使用輔助核算預設指定的帳戶（如建立新客戶。客戶遍布發票或銷售訂單，如果我們選擇了這個產品，它會自動輔助核算項目）。"
 
 #. module: account_analytic_default
 #: field:account.analytic.default,sequence:0
 msgid "Sequence"
-msgstr ""
+msgstr "序列"
 
 #. module: account_analytic_default
 #: model:ir.model,name:account_analytic_default.model_account_invoice_line
@@ -152,18 +153,18 @@ msgstr "發票明細"
 #: view:account.analytic.default:0
 #: field:account.analytic.default,analytic_id:0
 msgid "Analytic Account"
-msgstr "分析科目"
+msgstr "輔助核算項目"
 
 #. module: account_analytic_default
 #: view:account.analytic.default:0
 msgid "Accounts"
-msgstr "帳號"
+msgstr "帳戶"
 
 #. module: account_analytic_default
 #: view:account.analytic.default:0
 #: field:account.analytic.default,partner_id:0
 msgid "Partner"
-msgstr "伙伴"
+msgstr "業務夥伴"
 
 #. module: account_analytic_default
 #: field:account.analytic.default,date_start:0
@@ -174,7 +175,7 @@ msgstr "開始日期"
 #: help:account.analytic.default,sequence:0
 msgid ""
 "Gives the sequence order when displaying a list of analytic distribution"
-msgstr ""
+msgstr "顯示輔助核算分佈列表時，給出的順序。"
 
 #. module: account_analytic_default
 #: model:ir.model,name:account_analytic_default.model_sale_order_line
diff --git a/addons/account_analytic_plans/__openerp__.py b/addons/account_analytic_plans/__openerp__.py
index a9000cfa490..675723f423a 100644
--- a/addons/account_analytic_plans/__openerp__.py
+++ b/addons/account_analytic_plans/__openerp__.py
@@ -26,45 +26,48 @@
     'category': 'Accounting & Finance',
     'description': """
 This module allows to use several analytic plans according to the general journal.
-===================================================================================
+==================================================================================
 
 Here multiple analytic lines are created when the invoice or the entries
 are confirmed.
 
 For example, you can define the following analytic structure:
-  Projects
-      Project 1
-          SubProj 1.1
-          SubProj 1.2
+-------------------------------------------------------------
+  * **Projects**
+      * Project 1
+          + SubProj 1.1
+          
+          + SubProj 1.2
 
-      Project 2
-  Salesman
-      Eric
-      Fabien
+      * Project 2
+      
+  * **Salesman**
+      * Eric
+      
+      * Fabien
 
-Here, we have two plans: Projects and Salesman. An invoice line must
-be able to write analytic entries in the 2 plans: SubProj 1.1 and
-Fabien. The amount can also be split. The following example is for
-an invoice that touches the two subproject and assigned to one salesman:
+Here, we have two plans: Projects and Salesman. An invoice line must be able to write analytic entries in the 2 plans: SubProj 1.1 and Fabien. The amount can also be split.
+ 
+The following example is for an invoice that touches the two subprojects and assigned to one salesman:
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+**Plan1:**
 
-Plan1:
-    SubProject 1.1 : 50%
-    SubProject 1.2 : 50%
-Plan2:
+    * SubProject 1.1 : 50%
+    
+    * SubProject 1.2 : 50%
+    
+**Plan2:**
     Eric: 100%
 
-So when this line of invoice will be confirmed, it will generate 3 analytic lines,
-for one account entry.
+So when this line of invoice will be confirmed, it will generate 3 analytic lines,for one account entry.
 
-The analytic plan validates the minimum and maximum percentage at the time of creation
-of distribution models.
+The analytic plan validates the minimum and maximum percentage at the time of creation of distribution models.
         """,
     'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
     'images': ['images/analytic_plan.jpeg'],
     'depends': ['account', 'account_analytic_default'],
-    'init_xml': [],
-    'update_xml': [
+    'data': [
         'security/account_analytic_plan_security.xml',
         'security/ir.model.access.csv',
         'account_analytic_plans_view.xml',
@@ -72,7 +75,7 @@ of distribution models.
         'wizard/analytic_plan_create_model_view.xml',
         'wizard/account_crossovered_analytic_view.xml',
     ],
-    'demo_xml': [],
+    'demo': [],
     'test': ['test/acount_analytic_plans_report.yml'],
     'installable': True,
     'auto_install': False,
diff --git a/addons/account_analytic_plans/i18n/ar.po b/addons/account_analytic_plans/i18n/ar.po
index 09a183a75f6..27515bcdd3c 100644
--- a/addons/account_analytic_plans/i18n/ar.po
+++ b/addons/account_analytic_plans/i18n/ar.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:19+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_analytic_plans
 #: view:analytic.plan.create.model:0
diff --git a/addons/account_analytic_plans/i18n/bg.po b/addons/account_analytic_plans/i18n/bg.po
index c0af63270d5..6d5c0301882 100644
--- a/addons/account_analytic_plans/i18n/bg.po
+++ b/addons/account_analytic_plans/i18n/bg.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:19+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_analytic_plans
 #: view:analytic.plan.create.model:0
diff --git a/addons/account_analytic_plans/i18n/bs.po b/addons/account_analytic_plans/i18n/bs.po
index f15def73e16..52415e429eb 100644
--- a/addons/account_analytic_plans/i18n/bs.po
+++ b/addons/account_analytic_plans/i18n/bs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:19+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_analytic_plans
 #: view:analytic.plan.create.model:0
diff --git a/addons/account_analytic_plans/i18n/ca.po b/addons/account_analytic_plans/i18n/ca.po
index e68f9c39f0d..3ae47b314ad 100644
--- a/addons/account_analytic_plans/i18n/ca.po
+++ b/addons/account_analytic_plans/i18n/ca.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:19+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_analytic_plans
 #: view:analytic.plan.create.model:0
diff --git a/addons/account_analytic_plans/i18n/cs.po b/addons/account_analytic_plans/i18n/cs.po
index 2ddb3695d78..c44081c795f 100644
--- a/addons/account_analytic_plans/i18n/cs.po
+++ b/addons/account_analytic_plans/i18n/cs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:19+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_analytic_plans
 #: view:analytic.plan.create.model:0
diff --git a/addons/account_analytic_plans/i18n/da.po b/addons/account_analytic_plans/i18n/da.po
index a9489556bb9..037fc281fe1 100644
--- a/addons/account_analytic_plans/i18n/da.po
+++ b/addons/account_analytic_plans/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:19+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_analytic_plans
 #: view:analytic.plan.create.model:0
diff --git a/addons/account_analytic_plans/i18n/de.po b/addons/account_analytic_plans/i18n/de.po
index 9eb1ffd8635..a2ecd5177dd 100644
--- a/addons/account_analytic_plans/i18n/de.po
+++ b/addons/account_analytic_plans/i18n/de.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:19+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_analytic_plans
 #: view:analytic.plan.create.model:0
diff --git a/addons/account_analytic_plans/i18n/el.po b/addons/account_analytic_plans/i18n/el.po
index 2244480a865..312109d384d 100644
--- a/addons/account_analytic_plans/i18n/el.po
+++ b/addons/account_analytic_plans/i18n/el.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:19+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_analytic_plans
 #: view:analytic.plan.create.model:0
diff --git a/addons/account_analytic_plans/i18n/es.po b/addons/account_analytic_plans/i18n/es.po
index e8d2aa61bea..7c6cab3ab1b 100644
--- a/addons/account_analytic_plans/i18n/es.po
+++ b/addons/account_analytic_plans/i18n/es.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:20+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_analytic_plans
 #: view:analytic.plan.create.model:0
diff --git a/addons/account_analytic_plans/i18n/es_AR.po b/addons/account_analytic_plans/i18n/es_AR.po
index 4b10fbc08aa..77dde9df82c 100644
--- a/addons/account_analytic_plans/i18n/es_AR.po
+++ b/addons/account_analytic_plans/i18n/es_AR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:20+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_analytic_plans
 #: view:analytic.plan.create.model:0
diff --git a/addons/account_analytic_plans/i18n/es_CR.po b/addons/account_analytic_plans/i18n/es_CR.po
index d74368577ca..f4a8b0ec033 100644
--- a/addons/account_analytic_plans/i18n/es_CR.po
+++ b/addons/account_analytic_plans/i18n/es_CR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:20+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 "Language: \n"
 
 #. module: account_analytic_plans
diff --git a/addons/account_analytic_plans/i18n/es_EC.po b/addons/account_analytic_plans/i18n/es_EC.po
index 060c2981488..606ac4e39e3 100644
--- a/addons/account_analytic_plans/i18n/es_EC.po
+++ b/addons/account_analytic_plans/i18n/es_EC.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:20+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_analytic_plans
 #: view:analytic.plan.create.model:0
diff --git a/addons/account_analytic_plans/i18n/es_PY.po b/addons/account_analytic_plans/i18n/es_PY.po
index 1c6e35c2583..b6c0f6d0e63 100644
--- a/addons/account_analytic_plans/i18n/es_PY.po
+++ b/addons/account_analytic_plans/i18n/es_PY.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:20+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_analytic_plans
 #: view:analytic.plan.create.model:0
diff --git a/addons/account_analytic_plans/i18n/et.po b/addons/account_analytic_plans/i18n/et.po
index 9fb798a4905..11a22345ca0 100644
--- a/addons/account_analytic_plans/i18n/et.po
+++ b/addons/account_analytic_plans/i18n/et.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:19+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #~ msgid "Printing date:"
 #~ msgstr "Trükkimise kuupäev:"
diff --git a/addons/account_analytic_plans/i18n/fa.po b/addons/account_analytic_plans/i18n/fa.po
index ac18d42a208..e671618339d 100644
--- a/addons/account_analytic_plans/i18n/fa.po
+++ b/addons/account_analytic_plans/i18n/fa.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:19+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_analytic_plans
 #: view:analytic.plan.create.model:0
diff --git a/addons/account_analytic_plans/i18n/fi.po b/addons/account_analytic_plans/i18n/fi.po
index 193c2bc55a4..165396a6670 100644
--- a/addons/account_analytic_plans/i18n/fi.po
+++ b/addons/account_analytic_plans/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:19+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_analytic_plans
 #: view:analytic.plan.create.model:0
diff --git a/addons/account_analytic_plans/i18n/fr.po b/addons/account_analytic_plans/i18n/fr.po
index 2bbfdf89760..55a02e741f9 100644
--- a/addons/account_analytic_plans/i18n/fr.po
+++ b/addons/account_analytic_plans/i18n/fr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:19+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_analytic_plans
 #: view:analytic.plan.create.model:0
diff --git a/addons/account_analytic_plans/i18n/gl.po b/addons/account_analytic_plans/i18n/gl.po
index a10cf6c8016..9957046de60 100644
--- a/addons/account_analytic_plans/i18n/gl.po
+++ b/addons/account_analytic_plans/i18n/gl.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:19+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_analytic_plans
 #: view:analytic.plan.create.model:0
diff --git a/addons/account_analytic_plans/i18n/gu.po b/addons/account_analytic_plans/i18n/gu.po
index 2c90bd64d77..d260e069767 100644
--- a/addons/account_analytic_plans/i18n/gu.po
+++ b/addons/account_analytic_plans/i18n/gu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:19+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_analytic_plans
 #: view:analytic.plan.create.model:0
diff --git a/addons/account_analytic_plans/i18n/hr.po b/addons/account_analytic_plans/i18n/hr.po
index 4b9abfdbd68..bcebed4a6a7 100644
--- a/addons/account_analytic_plans/i18n/hr.po
+++ b/addons/account_analytic_plans/i18n/hr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:20+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_analytic_plans
 #: view:analytic.plan.create.model:0
diff --git a/addons/account_analytic_plans/i18n/hu.po b/addons/account_analytic_plans/i18n/hu.po
index 037e1fab1cc..6c0055af633 100644
--- a/addons/account_analytic_plans/i18n/hu.po
+++ b/addons/account_analytic_plans/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:19+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_analytic_plans
 #: view:analytic.plan.create.model:0
diff --git a/addons/account_analytic_plans/i18n/id.po b/addons/account_analytic_plans/i18n/id.po
index e32abfa4dbe..c4ad47d3eb8 100644
--- a/addons/account_analytic_plans/i18n/id.po
+++ b/addons/account_analytic_plans/i18n/id.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:19+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_analytic_plans
 #: view:analytic.plan.create.model:0
diff --git a/addons/account_analytic_plans/i18n/it.po b/addons/account_analytic_plans/i18n/it.po
index 5e473fdcbff..366c9ef781c 100644
--- a/addons/account_analytic_plans/i18n/it.po
+++ b/addons/account_analytic_plans/i18n/it.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:19+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_analytic_plans
 #: view:analytic.plan.create.model:0
diff --git a/addons/account_analytic_plans/i18n/ja.po b/addons/account_analytic_plans/i18n/ja.po
index e9bba1aba2b..e283927505e 100644
--- a/addons/account_analytic_plans/i18n/ja.po
+++ b/addons/account_analytic_plans/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:19+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_analytic_plans
 #: view:analytic.plan.create.model:0
diff --git a/addons/account_analytic_plans/i18n/ko.po b/addons/account_analytic_plans/i18n/ko.po
index b4a0cc152db..9980b91247f 100644
--- a/addons/account_analytic_plans/i18n/ko.po
+++ b/addons/account_analytic_plans/i18n/ko.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:19+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_analytic_plans
 #: view:analytic.plan.create.model:0
diff --git a/addons/account_analytic_plans/i18n/lt.po b/addons/account_analytic_plans/i18n/lt.po
index 59b4a1e5c9c..f46c2104887 100644
--- a/addons/account_analytic_plans/i18n/lt.po
+++ b/addons/account_analytic_plans/i18n/lt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:19+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_analytic_plans
 #: view:analytic.plan.create.model:0
diff --git a/addons/account_analytic_plans/i18n/lv.po b/addons/account_analytic_plans/i18n/lv.po
index 069e0c09311..9d080282104 100644
--- a/addons/account_analytic_plans/i18n/lv.po
+++ b/addons/account_analytic_plans/i18n/lv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:19+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_analytic_plans
 #: view:analytic.plan.create.model:0
diff --git a/addons/account_analytic_plans/i18n/mn.po b/addons/account_analytic_plans/i18n/mn.po
index b1fdc3ef6d9..9c77dd1cd1b 100644
--- a/addons/account_analytic_plans/i18n/mn.po
+++ b/addons/account_analytic_plans/i18n/mn.po
@@ -14,15 +14,15 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:19+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_analytic_plans
 #: view:analytic.plan.create.model:0
 msgid ""
 "This distribution model has been saved.You will be able to reuse it later."
 msgstr ""
-"This distribution model has been saved.You will be able to reuse it later."
+"Энэ тархалтын загвар хадгалагдлаа. Та үүнийг дараа давтан ашиглах боломжтой."
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance.line,plan_id:0
@@ -32,7 +32,7 @@ msgstr "Төлөвлөгөөний дугаар"
 #. module: account_analytic_plans
 #: report:account.analytic.account.crossovered.analytic:0
 msgid "From Date"
-msgstr "From Date"
+msgstr "Эхлэх Огноо"
 
 #. module: account_analytic_plans
 #: report:account.analytic.account.crossovered.analytic:0
@@ -40,7 +40,7 @@ msgstr "From Date"
 #: model:ir.actions.act_window,name:account_analytic_plans.action_account_crossovered_analytic
 #: model:ir.actions.report.xml,name:account_analytic_plans.account_analytic_account_crossovered_analytic
 msgid "Crossovered Analytic"
-msgstr "Crossovered Analytic"
+msgstr "Хөндлөн хамаарлын шинжилгээ"
 
 #. module: account_analytic_plans
 #: view:account.analytic.plan:0
@@ -50,31 +50,31 @@ msgstr "Crossovered Analytic"
 #: model:ir.model,name:account_analytic_plans.model_account_analytic_plan
 #: model:ir.ui.menu,name:account_analytic_plans.menu_account_analytic_plan_action
 msgid "Analytic Plan"
-msgstr "Аналитик төлөвлөгөө"
+msgstr "Шинжилгээний Төлөвлөгөө"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance,journal_id:0
 #: view:account.crossovered.analytic:0
 #: field:account.crossovered.analytic,journal_ids:0
 msgid "Analytic Journal"
-msgstr "Аналитик Журнал"
+msgstr "Шинжилгээний журнал"
 
 #. module: account_analytic_plans
 #: view:account.analytic.plan.line:0
 #: model:ir.model,name:account_analytic_plans.model_account_analytic_plan_line
 msgid "Analytic Plan Line"
-msgstr "Analytic Plan Line"
+msgstr "Шинжилгээний Төлөвлөгөөний Мөр"
 
 #. module: account_analytic_plans
 #: code:addons/account_analytic_plans/wizard/account_crossovered_analytic.py:61
 #, python-format
 msgid "User Error"
-msgstr "User Error"
+msgstr "Хэрэглэгчийн алдаа"
 
 #. module: account_analytic_plans
 #: model:ir.model,name:account_analytic_plans.model_account_analytic_plan_instance
 msgid "Analytic Plan Instance"
-msgstr "Analytic Plan Instance"
+msgstr "Шинжилгээний Төлөвлөгөөний Тухайн тохиолдол"
 
 #. module: account_analytic_plans
 #: view:analytic.plan.create.model:0
diff --git a/addons/account_analytic_plans/i18n/nb.po b/addons/account_analytic_plans/i18n/nb.po
new file mode 100644
index 00000000000..27a6c0d9e24
--- /dev/null
+++ b/addons/account_analytic_plans/i18n/nb.po
@@ -0,0 +1,546 @@
+# Norwegian Bokmal 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-02-08 00:35+0000\n"
+"PO-Revision-Date: 2012-09-02 09:46+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Norwegian Bokmal <nb@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-09-03 05:21+0000\n"
+"X-Generator: Launchpad (build 15890)\n"
+
+#. module: account_analytic_plans
+#: view:analytic.plan.create.model:0
+msgid ""
+"This distribution model has been saved.You will be able to reuse it later."
+msgstr ""
+"Denne fordeling modellen har vært lagret. Du vil kunne bruke den senere."
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.instance.line,plan_id:0
+msgid "Plan Id"
+msgstr "Plan ID"
+
+#. module: account_analytic_plans
+#: report:account.analytic.account.crossovered.analytic:0
+msgid "From Date"
+msgstr "Fra dato"
+
+#. module: account_analytic_plans
+#: report:account.analytic.account.crossovered.analytic:0
+#: view:account.crossovered.analytic:0
+#: model:ir.actions.act_window,name:account_analytic_plans.action_account_crossovered_analytic
+#: model:ir.actions.report.xml,name:account_analytic_plans.account_analytic_account_crossovered_analytic
+msgid "Crossovered Analytic"
+msgstr "Krysset Analyse"
+
+#. module: account_analytic_plans
+#: view:account.analytic.plan:0
+#: field:account.analytic.plan,name:0
+#: field:account.analytic.plan.line,plan_id:0
+#: model:ir.actions.act_window,name:account_analytic_plans.account_analytic_plan_form_action
+#: model:ir.model,name:account_analytic_plans.model_account_analytic_plan
+#: model:ir.ui.menu,name:account_analytic_plans.menu_account_analytic_plan_action
+msgid "Analytic Plan"
+msgstr "Analytisk Plan"
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.instance,journal_id:0
+#: view:account.crossovered.analytic:0
+#: field:account.crossovered.analytic,journal_ids:0
+msgid "Analytic Journal"
+msgstr "Analytisk journal"
+
+#. module: account_analytic_plans
+#: view:account.analytic.plan.line:0
+#: model:ir.model,name:account_analytic_plans.model_account_analytic_plan_line
+msgid "Analytic Plan Line"
+msgstr "Analytisk plan linje"
+
+#. module: account_analytic_plans
+#: code:addons/account_analytic_plans/wizard/account_crossovered_analytic.py:61
+#, python-format
+msgid "User Error"
+msgstr "Brukerfeil"
+
+#. module: account_analytic_plans
+#: model:ir.model,name:account_analytic_plans.model_account_analytic_plan_instance
+msgid "Analytic Plan Instance"
+msgstr "Analytisk Plan forekomst"
+
+#. module: account_analytic_plans
+#: view:analytic.plan.create.model:0
+msgid "Ok"
+msgstr "Ok"
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.instance,plan_id:0
+msgid "Model's Plan"
+msgstr "Modell Plan"
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.instance,account2_ids:0
+msgid "Account2 Id"
+msgstr "Konto2 ID"
+
+#. module: account_analytic_plans
+#: sql_constraint:account.invoice:0
+msgid "Invoice Number must be unique per Company!"
+msgstr "Fakturanummer må være unik pr. firma!"
+
+#. module: account_analytic_plans
+#: report:account.analytic.account.crossovered.analytic:0
+msgid "Amount"
+msgstr "Beløp"
+
+#. module: account_analytic_plans
+#: constraint:account.journal:0
+msgid ""
+"Configuration error! The currency chosen should be shared by the default "
+"accounts too."
+msgstr ""
+"Konfigurasjon feil! Den valgte valutaen bør deles av standard kontoer også."
+
+#. module: account_analytic_plans
+#: sql_constraint:account.move.line:0
+msgid "Wrong credit or debit value in accounting entry !"
+msgstr "Feil kredit eller debet beløp i regnskaps oppføringen !"
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.instance,account6_ids:0
+msgid "Account6 Id"
+msgstr "Konto6 ID"
+
+#. module: account_analytic_plans
+#: model:ir.ui.menu,name:account_analytic_plans.menu_account_analytic_multi_plan_action
+msgid "Multi Plans"
+msgstr "Multi Planer"
+
+#. module: account_analytic_plans
+#: model:ir.model,name:account_analytic_plans.model_account_bank_statement_line
+msgid "Bank Statement Line"
+msgstr "Kontoutskriftlinje"
+
+#. module: account_analytic_plans
+#: model:ir.actions.act_window,name:account_analytic_plans.account_analytic_plan_form_action_installer
+msgid "Define your Analytic Plans"
+msgstr "Definer dine analytiske planer."
+
+#. module: account_analytic_plans
+#: constraint:account.invoice:0
+msgid "Invalid BBA Structured Communication !"
+msgstr "Ugyldig BBA Strukturert Kommunikasjon!"
+
+#. module: account_analytic_plans
+#: constraint:account.bank.statement:0
+msgid "The journal and period chosen have to belong to the same company."
+msgstr "Tidsskriftet og perioden valgt å tilhøre samme selskap."
+
+#. module: account_analytic_plans
+#: 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 ""
+"Datoen for din bilagsregistrering ikke er i den definerte perioden! Du bør "
+"endre datoen eller fjerne denne begrensningen fra tidsskriftet."
+
+#. module: account_analytic_plans
+#: sql_constraint:account.journal:0
+msgid "The code of the journal must be unique per company !"
+msgstr "Journalkoden må være unik pr firma!"
+
+#. module: account_analytic_plans
+#: field:account.crossovered.analytic,ref:0
+msgid "Analytic Account Reference"
+msgstr "Analytisk konto Referanse."
+
+#. module: account_analytic_plans
+#: model:ir.model,name:account_analytic_plans.model_sale_order_line
+msgid "Sales Order Line"
+msgstr "Salgsordrelinje"
+
+#. module: account_analytic_plans
+#: code:addons/account_analytic_plans/wizard/analytic_plan_create_model.py:47
+#: view:analytic.plan.create.model:0
+#, python-format
+msgid "Distribution Model Saved"
+msgstr "Distribusjon Model Lagret"
+
+#. module: account_analytic_plans
+#: model:ir.actions.act_window,name:account_analytic_plans.account_analytic_plan_instance_action
+msgid "Analytic Distribution's Models"
+msgstr "Analytisk distribusjon modeller"
+
+#. module: account_analytic_plans
+#: view:account.crossovered.analytic:0
+msgid "Print"
+msgstr "Skriv ut"
+
+#. module: account_analytic_plans
+#: report:account.analytic.account.crossovered.analytic:0
+#: field:account.analytic.line,percentage:0
+msgid "Percentage"
+msgstr "Prosentdel"
+
+#. module: account_analytic_plans
+#: code:addons/account_analytic_plans/account_analytic_plans.py:221
+#, python-format
+msgid "A model having this name and code already exists !"
+msgstr ""
+
+#. module: account_analytic_plans
+#: code:addons/account_analytic_plans/wizard/analytic_plan_create_model.py:41
+#, python-format
+msgid "No analytic plan defined !"
+msgstr ""
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.instance.line,rate:0
+msgid "Rate (%)"
+msgstr ""
+
+#. module: account_analytic_plans
+#: view:account.analytic.plan:0
+#: field:account.analytic.plan,plan_ids:0
+#: field:account.journal,plan_id:0
+msgid "Analytic Plans"
+msgstr ""
+
+#. module: account_analytic_plans
+#: report:account.analytic.account.crossovered.analytic:0
+msgid "Perc(%)"
+msgstr ""
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.line,max_required:0
+msgid "Maximum Allowed (%)"
+msgstr ""
+
+#. module: account_analytic_plans
+#: report:account.analytic.account.crossovered.analytic:0
+msgid "Printing date"
+msgstr ""
+
+#. module: account_analytic_plans
+#: view:account.analytic.plan.line:0
+msgid "Analytic Plan Lines"
+msgstr ""
+
+#. module: account_analytic_plans
+#: constraint:account.bank.statement.line:0
+msgid ""
+"The amount of the voucher must be the same amount as the one on the "
+"statement line"
+msgstr ""
+
+#. module: account_analytic_plans
+#: model:ir.model,name:account_analytic_plans.model_account_invoice_line
+msgid "Invoice Line"
+msgstr ""
+
+#. module: account_analytic_plans
+#: 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_analytic_plans
+#: report:account.analytic.account.crossovered.analytic:0
+msgid "Currency"
+msgstr ""
+
+#. module: account_analytic_plans
+#: field:account.crossovered.analytic,date1:0
+msgid "Start Date"
+msgstr ""
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.instance,account_ids:0
+msgid "Account Id"
+msgstr ""
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.instance,account5_ids:0
+msgid "Account5 Id"
+msgstr ""
+
+#. module: account_analytic_plans
+#: model:ir.model,name:account_analytic_plans.model_account_analytic_plan_instance_line
+msgid "Analytic Instance Line"
+msgstr ""
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.line,root_analytic_id:0
+msgid "Root Account"
+msgstr ""
+
+#. module: account_analytic_plans
+#: report:account.analytic.account.crossovered.analytic:0
+msgid "To Date"
+msgstr ""
+
+#. module: account_analytic_plans
+#: code:addons/account_analytic_plans/account_analytic_plans.py:341
+#: code:addons/account_analytic_plans/account_analytic_plans.py:485
+#, python-format
+msgid "You have to define an analytic journal on the '%s' journal!"
+msgstr ""
+
+#. module: account_analytic_plans
+#: field:account.crossovered.analytic,empty_line:0
+msgid "Dont show empty lines"
+msgstr ""
+
+#. module: account_analytic_plans
+#: model:ir.actions.act_window,name:account_analytic_plans.action_analytic_plan_create_model
+msgid "analytic.plan.create.model.action"
+msgstr ""
+
+#. module: account_analytic_plans
+#: model:ir.model,name:account_analytic_plans.model_account_analytic_line
+msgid "Analytic Line"
+msgstr ""
+
+#. module: account_analytic_plans
+#: report:account.analytic.account.crossovered.analytic:0
+msgid "Analytic Account :"
+msgstr ""
+
+#. module: account_analytic_plans
+#: report:account.analytic.account.crossovered.analytic:0
+msgid "Analytic Account Reference:"
+msgstr ""
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.line,name:0
+msgid "Plan Name"
+msgstr ""
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan,default_instance_id:0
+msgid "Default Entries"
+msgstr ""
+
+#. module: account_analytic_plans
+#: model:ir.model,name:account_analytic_plans.model_account_move_line
+msgid "Journal Items"
+msgstr ""
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.instance,account1_ids:0
+msgid "Account1 Id"
+msgstr ""
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.line,min_required:0
+msgid "Minimum Allowed (%)"
+msgstr ""
+
+#. module: account_analytic_plans
+#: help:account.analytic.plan.line,root_analytic_id:0
+msgid "Root account of this plan."
+msgstr ""
+
+#. module: account_analytic_plans
+#: code:addons/account_analytic_plans/account_analytic_plans.py:221
+#: code:addons/account_analytic_plans/wizard/analytic_plan_create_model.py:38
+#: code:addons/account_analytic_plans/wizard/analytic_plan_create_model.py:41
+#, python-format
+msgid "Error"
+msgstr ""
+
+#. module: account_analytic_plans
+#: view:analytic.plan.create.model:0
+msgid "Save This Distribution as a Model"
+msgstr ""
+
+#. module: account_analytic_plans
+#: constraint:account.move.line:0
+msgid "You can not create journal items on an account of type view."
+msgstr ""
+
+#. module: account_analytic_plans
+#: report:account.analytic.account.crossovered.analytic:0
+msgid "Quantity"
+msgstr ""
+
+#. module: account_analytic_plans
+#: code:addons/account_analytic_plans/wizard/analytic_plan_create_model.py:38
+#, python-format
+msgid "Please put a name and a code before saving the model !"
+msgstr ""
+
+#. module: account_analytic_plans
+#: model:ir.model,name:account_analytic_plans.model_account_crossovered_analytic
+msgid "Print Crossovered Analytic"
+msgstr ""
+
+#. module: account_analytic_plans
+#: code:addons/account_analytic_plans/account_analytic_plans.py:341
+#: code:addons/account_analytic_plans/account_analytic_plans.py:485
+#, python-format
+msgid "No Analytic Journal !"
+msgstr ""
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.instance.line,analytic_account_id:0
+msgid "Analytic Account"
+msgstr ""
+
+#. module: account_analytic_plans
+#: model:ir.model,name:account_analytic_plans.model_account_bank_statement
+msgid "Bank Statement"
+msgstr ""
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.instance,account3_ids:0
+msgid "Account3 Id"
+msgstr ""
+
+#. module: account_analytic_plans
+#: constraint:account.analytic.line:0
+msgid "You can not create analytic line on view account."
+msgstr ""
+
+#. module: account_analytic_plans
+#: model:ir.model,name:account_analytic_plans.model_account_invoice
+msgid "Invoice"
+msgstr ""
+
+#. module: account_analytic_plans
+#: view:account.crossovered.analytic:0
+#: view:analytic.plan.create.model:0
+msgid "Cancel"
+msgstr ""
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.instance,account4_ids:0
+msgid "Account4 Id"
+msgstr ""
+
+#. module: account_analytic_plans
+#: constraint:account.move.line:0
+msgid "Company must be the same for its related account and period."
+msgstr ""
+
+#. module: account_analytic_plans
+#: view:account.analytic.plan.instance.line:0
+msgid "Analytic Distribution Lines"
+msgstr ""
+
+#. module: account_analytic_plans
+#: code:addons/account_analytic_plans/account_analytic_plans.py:234
+#, python-format
+msgid "The Total Should be Between %s and %s"
+msgstr ""
+
+#. module: account_analytic_plans
+#: report:account.analytic.account.crossovered.analytic:0
+msgid "at"
+msgstr ""
+
+#. module: account_analytic_plans
+#: report:account.analytic.account.crossovered.analytic:0
+msgid "Account Name"
+msgstr ""
+
+#. module: account_analytic_plans
+#: view:account.analytic.plan.instance.line:0
+msgid "Analytic Distribution Line"
+msgstr ""
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.instance,code:0
+msgid "Distribution Code"
+msgstr ""
+
+#. module: account_analytic_plans
+#: report:account.analytic.account.crossovered.analytic:0
+msgid "%"
+msgstr ""
+
+#. module: account_analytic_plans
+#: report:account.analytic.account.crossovered.analytic:0
+msgid "100.00%"
+msgstr ""
+
+#. module: account_analytic_plans
+#: field:account.analytic.default,analytics_id:0
+#: view:account.analytic.plan.instance:0
+#: field:account.analytic.plan.instance,name:0
+#: field:account.bank.statement.line,analytics_id:0
+#: field:account.invoice.line,analytics_id:0
+#: field:account.move.line,analytics_id:0
+#: model:ir.model,name:account_analytic_plans.model_account_analytic_default
+msgid "Analytic Distribution"
+msgstr ""
+
+#. module: account_analytic_plans
+#: model:ir.model,name:account_analytic_plans.model_account_journal
+msgid "Journal"
+msgstr ""
+
+#. module: account_analytic_plans
+#: report:account.analytic.account.crossovered.analytic:0
+msgid "Code"
+msgstr ""
+
+#. module: account_analytic_plans
+#: model:ir.model,name:account_analytic_plans.model_analytic_plan_create_model
+msgid "analytic.plan.create.model"
+msgstr ""
+
+#. module: account_analytic_plans
+#: field:account.crossovered.analytic,date2:0
+msgid "End Date"
+msgstr ""
+
+#. module: account_analytic_plans
+#: model:ir.actions.act_window,name:account_analytic_plans.account_analytic_instance_model_open
+msgid "Distribution Models"
+msgstr ""
+
+#. module: account_analytic_plans
+#: model:ir.actions.act_window,help:account_analytic_plans.account_analytic_plan_form_action_installer
+msgid ""
+"To setup a multiple analytic plans environment, you must define the root "
+"analytic accounts for each plan set. Then, you must attach a plan set to "
+"your account journals."
+msgstr ""
+
+#. module: account_analytic_plans
+#: constraint:account.move.line:0
+msgid "You can not create journal items on closed account."
+msgstr ""
+
+#. module: account_analytic_plans
+#: report:account.analytic.account.crossovered.analytic:0
+msgid "Company"
+msgstr ""
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.line,sequence:0
+msgid "Sequence"
+msgstr ""
+
+#. module: account_analytic_plans
+#: sql_constraint:account.journal:0
+msgid "The name of the journal must be unique per company !"
+msgstr ""
+
+#. module: account_analytic_plans
+#: code:addons/account_analytic_plans/account_analytic_plans.py:234
+#, python-format
+msgid "Value Error"
+msgstr ""
diff --git a/addons/account_analytic_plans/i18n/nl.po b/addons/account_analytic_plans/i18n/nl.po
index 38b049504f6..694e43b9568 100644
--- a/addons/account_analytic_plans/i18n/nl.po
+++ b/addons/account_analytic_plans/i18n/nl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:19+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_analytic_plans
 #: view:analytic.plan.create.model:0
diff --git a/addons/account_analytic_plans/i18n/nl_BE.po b/addons/account_analytic_plans/i18n/nl_BE.po
index feaba980b61..56e935c7170 100644
--- a/addons/account_analytic_plans/i18n/nl_BE.po
+++ b/addons/account_analytic_plans/i18n/nl_BE.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:20+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_analytic_plans
 #: view:analytic.plan.create.model:0
diff --git a/addons/account_analytic_plans/i18n/oc.po b/addons/account_analytic_plans/i18n/oc.po
index 0bf8c06514f..f8c49d90573 100644
--- a/addons/account_analytic_plans/i18n/oc.po
+++ b/addons/account_analytic_plans/i18n/oc.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:19+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_analytic_plans
 #: view:analytic.plan.create.model:0
diff --git a/addons/account_analytic_plans/i18n/pl.po b/addons/account_analytic_plans/i18n/pl.po
index 101c44c6cbb..4841064a179 100644
--- a/addons/account_analytic_plans/i18n/pl.po
+++ b/addons/account_analytic_plans/i18n/pl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:19+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_analytic_plans
 #: view:analytic.plan.create.model:0
diff --git a/addons/account_analytic_plans/i18n/pt.po b/addons/account_analytic_plans/i18n/pt.po
index 7c7294f348f..bb3f7404b27 100644
--- a/addons/account_analytic_plans/i18n/pt.po
+++ b/addons/account_analytic_plans/i18n/pt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:19+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_analytic_plans
 #: view:analytic.plan.create.model:0
diff --git a/addons/account_analytic_plans/i18n/pt_BR.po b/addons/account_analytic_plans/i18n/pt_BR.po
index 6a436b361d4..d01f0ad2ab7 100644
--- a/addons/account_analytic_plans/i18n/pt_BR.po
+++ b/addons/account_analytic_plans/i18n/pt_BR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:20+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_analytic_plans
 #: view:analytic.plan.create.model:0
diff --git a/addons/account_analytic_plans/i18n/ro.po b/addons/account_analytic_plans/i18n/ro.po
index 9d84d1326ec..cb8df119302 100644
--- a/addons/account_analytic_plans/i18n/ro.po
+++ b/addons/account_analytic_plans/i18n/ro.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:19+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_analytic_plans
 #: view:analytic.plan.create.model:0
diff --git a/addons/account_analytic_plans/i18n/ru.po b/addons/account_analytic_plans/i18n/ru.po
index e8031d92cca..7d90dbcb8cf 100644
--- a/addons/account_analytic_plans/i18n/ru.po
+++ b/addons/account_analytic_plans/i18n/ru.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:20+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_analytic_plans
 #: view:analytic.plan.create.model:0
diff --git a/addons/account_analytic_plans/i18n/sl.po b/addons/account_analytic_plans/i18n/sl.po
index bba0b20f1ab..78dd78650b4 100644
--- a/addons/account_analytic_plans/i18n/sl.po
+++ b/addons/account_analytic_plans/i18n/sl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:20+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_analytic_plans
 #: view:analytic.plan.create.model:0
diff --git a/addons/account_analytic_plans/i18n/sq.po b/addons/account_analytic_plans/i18n/sq.po
index ad220a722bd..b2ad033b00e 100644
--- a/addons/account_analytic_plans/i18n/sq.po
+++ b/addons/account_analytic_plans/i18n/sq.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:19+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_analytic_plans
 #: view:analytic.plan.create.model:0
diff --git a/addons/account_analytic_plans/i18n/sr.po b/addons/account_analytic_plans/i18n/sr.po
index d09eb9ee4f6..4ebfe22f43a 100644
--- a/addons/account_analytic_plans/i18n/sr.po
+++ b/addons/account_analytic_plans/i18n/sr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:20+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_analytic_plans
 #: view:analytic.plan.create.model:0
diff --git a/addons/account_analytic_plans/i18n/sr@latin.po b/addons/account_analytic_plans/i18n/sr@latin.po
index d40b0db6ea5..681f3f30ecb 100644
--- a/addons/account_analytic_plans/i18n/sr@latin.po
+++ b/addons/account_analytic_plans/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:20+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_analytic_plans
 #: view:analytic.plan.create.model:0
diff --git a/addons/account_analytic_plans/i18n/sv.po b/addons/account_analytic_plans/i18n/sv.po
index 0664ccf65ac..d38713d74d5 100644
--- a/addons/account_analytic_plans/i18n/sv.po
+++ b/addons/account_analytic_plans/i18n/sv.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:20+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_analytic_plans
 #: view:analytic.plan.create.model:0
diff --git a/addons/account_analytic_plans/i18n/tlh.po b/addons/account_analytic_plans/i18n/tlh.po
index 2ec43c63ecc..728bd349618 100644
--- a/addons/account_analytic_plans/i18n/tlh.po
+++ b/addons/account_analytic_plans/i18n/tlh.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:20+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_analytic_plans
 #: view:analytic.plan.create.model:0
diff --git a/addons/account_analytic_plans/i18n/tr.po b/addons/account_analytic_plans/i18n/tr.po
index 9c0f62cfcb3..1e15d2da061 100644
--- a/addons/account_analytic_plans/i18n/tr.po
+++ b/addons/account_analytic_plans/i18n/tr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:20+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_analytic_plans
 #: view:analytic.plan.create.model:0
diff --git a/addons/account_analytic_plans/i18n/uk.po b/addons/account_analytic_plans/i18n/uk.po
index fadf2c2100c..ab96810eca3 100644
--- a/addons/account_analytic_plans/i18n/uk.po
+++ b/addons/account_analytic_plans/i18n/uk.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:20+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_analytic_plans
 #: view:analytic.plan.create.model:0
diff --git a/addons/account_analytic_plans/i18n/vi.po b/addons/account_analytic_plans/i18n/vi.po
index d31062f84eb..190ed306793 100644
--- a/addons/account_analytic_plans/i18n/vi.po
+++ b/addons/account_analytic_plans/i18n/vi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:20+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_analytic_plans
 #: view:analytic.plan.create.model:0
diff --git a/addons/account_analytic_plans/i18n/zh_CN.po b/addons/account_analytic_plans/i18n/zh_CN.po
index fcf9539949d..ca1e507d9b6 100644
--- a/addons/account_analytic_plans/i18n/zh_CN.po
+++ b/addons/account_analytic_plans/i18n/zh_CN.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:20+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_analytic_plans
 #: view:analytic.plan.create.model:0
diff --git a/addons/account_analytic_plans/i18n/zh_TW.po b/addons/account_analytic_plans/i18n/zh_TW.po
index c96de9287a2..a4716d17e0c 100644
--- a/addons/account_analytic_plans/i18n/zh_TW.po
+++ b/addons/account_analytic_plans/i18n/zh_TW.po
@@ -7,30 +7,30 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 00:35+0000\n"
-"PO-Revision-Date: 2009-01-30 12:43+0000\n"
-"Last-Translator: <>\n"
+"PO-Revision-Date: 2012-08-20 01:47+0000\n"
+"Last-Translator: Eric Huang <eh@cenoq.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:20+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_analytic_plans
 #: view:analytic.plan.create.model:0
 msgid ""
 "This distribution model has been saved.You will be able to reuse it later."
-msgstr ""
+msgstr "此分配模式已儲存，你將可以稍後使用它。"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance.line,plan_id:0
 msgid "Plan Id"
-msgstr ""
+msgstr "計劃名稱"
 
 #. module: account_analytic_plans
 #: report:account.analytic.account.crossovered.analytic:0
 msgid "From Date"
-msgstr ""
+msgstr "從日期"
 
 #. module: account_analytic_plans
 #: report:account.analytic.account.crossovered.analytic:0
@@ -38,7 +38,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:account_analytic_plans.action_account_crossovered_analytic
 #: model:ir.actions.report.xml,name:account_analytic_plans.account_analytic_account_crossovered_analytic
 msgid "Crossovered Analytic"
-msgstr ""
+msgstr "交叉輔助核算"
 
 #. module: account_analytic_plans
 #: view:account.analytic.plan:0
@@ -48,137 +48,137 @@ msgstr ""
 #: model:ir.model,name:account_analytic_plans.model_account_analytic_plan
 #: model:ir.ui.menu,name:account_analytic_plans.menu_account_analytic_plan_action
 msgid "Analytic Plan"
-msgstr ""
+msgstr "輔助核算計劃"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance,journal_id:0
 #: view:account.crossovered.analytic:0
 #: field:account.crossovered.analytic,journal_ids:0
 msgid "Analytic Journal"
-msgstr ""
+msgstr "輔助核算帳簿"
 
 #. module: account_analytic_plans
 #: view:account.analytic.plan.line:0
 #: model:ir.model,name:account_analytic_plans.model_account_analytic_plan_line
 msgid "Analytic Plan Line"
-msgstr ""
+msgstr "輔助核算計劃明細"
 
 #. module: account_analytic_plans
 #: code:addons/account_analytic_plans/wizard/account_crossovered_analytic.py:61
 #, python-format
 msgid "User Error"
-msgstr ""
+msgstr "使用者錯誤"
 
 #. module: account_analytic_plans
 #: model:ir.model,name:account_analytic_plans.model_account_analytic_plan_instance
 msgid "Analytic Plan Instance"
-msgstr ""
+msgstr "輔助核算計劃實例"
 
 #. module: account_analytic_plans
 #: view:analytic.plan.create.model:0
 msgid "Ok"
-msgstr ""
+msgstr "確定"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance,plan_id:0
 msgid "Model's Plan"
-msgstr ""
+msgstr "模型的計劃"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance,account2_ids:0
 msgid "Account2 Id"
-msgstr ""
+msgstr "帳戶2名稱"
 
 #. module: account_analytic_plans
 #: sql_constraint:account.invoice:0
 msgid "Invoice Number must be unique per Company!"
-msgstr ""
+msgstr "每間公司的發票號碼必須是唯一的"
 
 #. module: account_analytic_plans
 #: report:account.analytic.account.crossovered.analytic:0
 msgid "Amount"
-msgstr ""
+msgstr "數量"
 
 #. module: account_analytic_plans
 #: constraint:account.journal:0
 msgid ""
 "Configuration error! The currency chosen should be shared by the default "
 "accounts too."
-msgstr ""
+msgstr "設置錯誤！所選幣別應與默認科目共享。"
 
 #. module: account_analytic_plans
 #: sql_constraint:account.move.line:0
 msgid "Wrong credit or debit value in accounting entry !"
-msgstr ""
+msgstr "會計分錄中包含錯誤的借貸數值！"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance,account6_ids:0
 msgid "Account6 Id"
-msgstr ""
+msgstr "帳戶2名稱"
 
 #. module: account_analytic_plans
 #: model:ir.ui.menu,name:account_analytic_plans.menu_account_analytic_multi_plan_action
 msgid "Multi Plans"
-msgstr ""
+msgstr "多元計劃"
 
 #. module: account_analytic_plans
 #: model:ir.model,name:account_analytic_plans.model_account_bank_statement_line
 msgid "Bank Statement Line"
-msgstr ""
+msgstr "銀行對賬單明細"
 
 #. module: account_analytic_plans
 #: model:ir.actions.act_window,name:account_analytic_plans.account_analytic_plan_form_action_installer
 msgid "Define your Analytic Plans"
-msgstr ""
+msgstr "定義你的輔助核算計劃"
 
 #. module: account_analytic_plans
 #: constraint:account.invoice:0
 msgid "Invalid BBA Structured Communication !"
-msgstr ""
+msgstr "BBA傳輸結構有誤！"
 
 #. module: account_analytic_plans
 #: constraint:account.bank.statement:0
 msgid "The journal and period chosen have to belong to the same company."
-msgstr ""
+msgstr "所選的帳簿和期間必須屬於相同公司。"
 
 #. module: account_analytic_plans
 #: 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 ""
+msgstr "分錄日期不在所選期間內！可以修改憑證日期或在帳簿上去掉這個檢查項。"
 
 #. module: account_analytic_plans
 #: sql_constraint:account.journal:0
 msgid "The code of the journal must be unique per company !"
-msgstr ""
+msgstr "每個公司的帳簿編碼必須唯一！"
 
 #. module: account_analytic_plans
 #: field:account.crossovered.analytic,ref:0
 msgid "Analytic Account Reference"
-msgstr ""
+msgstr "輔助核算項目參考"
 
 #. module: account_analytic_plans
 #: model:ir.model,name:account_analytic_plans.model_sale_order_line
 msgid "Sales Order Line"
-msgstr "銷貨單明㚼"
+msgstr "銷售訂單明細"
 
 #. module: account_analytic_plans
 #: code:addons/account_analytic_plans/wizard/analytic_plan_create_model.py:47
 #: view:analytic.plan.create.model:0
 #, python-format
 msgid "Distribution Model Saved"
-msgstr ""
+msgstr "保存分佈模型"
 
 #. module: account_analytic_plans
 #: model:ir.actions.act_window,name:account_analytic_plans.account_analytic_plan_instance_action
 msgid "Analytic Distribution's Models"
-msgstr ""
+msgstr "輔助核算分配模式"
 
 #. module: account_analytic_plans
 #: view:account.crossovered.analytic:0
 msgid "Print"
-msgstr ""
+msgstr "列印"
 
 #. module: account_analytic_plans
 #: report:account.analytic.account.crossovered.analytic:0
@@ -190,52 +190,52 @@ msgstr "百分比"
 #: code:addons/account_analytic_plans/account_analytic_plans.py:221
 #, python-format
 msgid "A model having this name and code already exists !"
-msgstr ""
+msgstr "這個名稱和代碼的模型已經存在！"
 
 #. module: account_analytic_plans
 #: code:addons/account_analytic_plans/wizard/analytic_plan_create_model.py:41
 #, python-format
 msgid "No analytic plan defined !"
-msgstr ""
+msgstr "沒有定義的輔助核算計劃！"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance.line,rate:0
 msgid "Rate (%)"
-msgstr ""
+msgstr "比率 (%)"
 
 #. module: account_analytic_plans
 #: view:account.analytic.plan:0
 #: field:account.analytic.plan,plan_ids:0
 #: field:account.journal,plan_id:0
 msgid "Analytic Plans"
-msgstr ""
+msgstr "輔助核算計劃"
 
 #. module: account_analytic_plans
 #: report:account.analytic.account.crossovered.analytic:0
 msgid "Perc(%)"
-msgstr ""
+msgstr "百分比(%)"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.line,max_required:0
 msgid "Maximum Allowed (%)"
-msgstr ""
+msgstr "充許的最大值 (%)"
 
 #. module: account_analytic_plans
 #: report:account.analytic.account.crossovered.analytic:0
 msgid "Printing date"
-msgstr ""
+msgstr "列印日期"
 
 #. module: account_analytic_plans
 #: view:account.analytic.plan.line:0
 msgid "Analytic Plan Lines"
-msgstr ""
+msgstr "輔助核算計劃明細"
 
 #. module: account_analytic_plans
 #: constraint:account.bank.statement.line:0
 msgid ""
 "The amount of the voucher must be the same amount as the one on the "
 "statement line"
-msgstr ""
+msgstr "憑證金額必須和對賬單明細上的金額一致"
 
 #. module: account_analytic_plans
 #: model:ir.model,name:account_analytic_plans.model_account_invoice_line
@@ -248,7 +248,7 @@ 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 ""
+msgstr "分錄上的科目要求輸入一個外幣。你可以在科目設置中去掉這個外幣或在帳簿設置上選擇一個支持多幣別的輸入界面。"
 
 #. module: account_analytic_plans
 #: report:account.analytic.account.crossovered.analytic:0
@@ -263,89 +263,89 @@ msgstr "開始日期"
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance,account_ids:0
 msgid "Account Id"
-msgstr ""
+msgstr "帳戶名稱"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance,account5_ids:0
 msgid "Account5 Id"
-msgstr ""
+msgstr "帳戶5名稱"
 
 #. module: account_analytic_plans
 #: model:ir.model,name:account_analytic_plans.model_account_analytic_plan_instance_line
 msgid "Analytic Instance Line"
-msgstr ""
+msgstr "輔助核算實例明細"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.line,root_analytic_id:0
 msgid "Root Account"
-msgstr ""
+msgstr "子帳戶"
 
 #. module: account_analytic_plans
 #: report:account.analytic.account.crossovered.analytic:0
 msgid "To Date"
-msgstr ""
+msgstr "到日期"
 
 #. module: account_analytic_plans
 #: code:addons/account_analytic_plans/account_analytic_plans.py:341
 #: code:addons/account_analytic_plans/account_analytic_plans.py:485
 #, python-format
 msgid "You have to define an analytic journal on the '%s' journal!"
-msgstr ""
+msgstr "你必須在'%s'帳簿上去定義輔助核算帳簿!"
 
 #. module: account_analytic_plans
 #: field:account.crossovered.analytic,empty_line:0
 msgid "Dont show empty lines"
-msgstr ""
+msgstr "不顯示空白行"
 
 #. module: account_analytic_plans
 #: model:ir.actions.act_window,name:account_analytic_plans.action_analytic_plan_create_model
 msgid "analytic.plan.create.model.action"
-msgstr ""
+msgstr "analytic.plan.create.model.action"
 
 #. module: account_analytic_plans
 #: model:ir.model,name:account_analytic_plans.model_account_analytic_line
 msgid "Analytic Line"
-msgstr ""
+msgstr "輔助核算明細"
 
 #. module: account_analytic_plans
 #: report:account.analytic.account.crossovered.analytic:0
 msgid "Analytic Account :"
-msgstr ""
+msgstr "輔助核算項目 :"
 
 #. module: account_analytic_plans
 #: report:account.analytic.account.crossovered.analytic:0
 msgid "Analytic Account Reference:"
-msgstr ""
+msgstr "輔助核算項目參考:"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.line,name:0
 msgid "Plan Name"
-msgstr ""
+msgstr "計劃名稱"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan,default_instance_id:0
 msgid "Default Entries"
-msgstr ""
+msgstr "默認分錄"
 
 #. module: account_analytic_plans
 #: model:ir.model,name:account_analytic_plans.model_account_move_line
 msgid "Journal Items"
-msgstr ""
+msgstr "借貸項"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance,account1_ids:0
 msgid "Account1 Id"
-msgstr ""
+msgstr "帳戶名稱"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.line,min_required:0
 msgid "Minimum Allowed (%)"
-msgstr ""
+msgstr "允許的最小值 (%)"
 
 #. module: account_analytic_plans
 #: help:account.analytic.plan.line,root_analytic_id:0
 msgid "Root account of this plan."
-msgstr ""
+msgstr "這個計劃的子帳戶."
 
 #. module: account_analytic_plans
 #: code:addons/account_analytic_plans/account_analytic_plans.py:221
@@ -353,17 +353,17 @@ msgstr ""
 #: code:addons/account_analytic_plans/wizard/analytic_plan_create_model.py:41
 #, python-format
 msgid "Error"
-msgstr ""
+msgstr "錯誤"
 
 #. module: account_analytic_plans
 #: view:analytic.plan.create.model:0
 msgid "Save This Distribution as a Model"
-msgstr ""
+msgstr "儲存這個分佈作為模型"
 
 #. module: account_analytic_plans
 #: constraint:account.move.line:0
 msgid "You can not create journal items on an account of type view."
-msgstr ""
+msgstr "借貸項不能使用視圖類型的科目"
 
 #. module: account_analytic_plans
 #: report:account.analytic.account.crossovered.analytic:0
@@ -374,39 +374,39 @@ msgstr "數量"
 #: code:addons/account_analytic_plans/wizard/analytic_plan_create_model.py:38
 #, python-format
 msgid "Please put a name and a code before saving the model !"
-msgstr ""
+msgstr "保存模型前，請放入一個名稱和代碼！"
 
 #. module: account_analytic_plans
 #: model:ir.model,name:account_analytic_plans.model_account_crossovered_analytic
 msgid "Print Crossovered Analytic"
-msgstr ""
+msgstr "列印交叉輔助核算"
 
 #. module: account_analytic_plans
 #: code:addons/account_analytic_plans/account_analytic_plans.py:341
 #: code:addons/account_analytic_plans/account_analytic_plans.py:485
 #, python-format
 msgid "No Analytic Journal !"
-msgstr ""
+msgstr "沒有輔助核算帳簿 !"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance.line,analytic_account_id:0
 msgid "Analytic Account"
-msgstr ""
+msgstr "輔助核算項目"
 
 #. module: account_analytic_plans
 #: model:ir.model,name:account_analytic_plans.model_account_bank_statement
 msgid "Bank Statement"
-msgstr ""
+msgstr "銀行對賬單"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance,account3_ids:0
 msgid "Account3 Id"
-msgstr ""
+msgstr "帳戶3名稱"
 
 #. module: account_analytic_plans
 #: constraint:account.analytic.line:0
 msgid "You can not create analytic line on view account."
-msgstr ""
+msgstr "無法在視圖類型的項目上建立輔助核算項目明細"
 
 #. module: account_analytic_plans
 #: model:ir.model,name:account_analytic_plans.model_account_invoice
@@ -417,58 +417,58 @@ msgstr "發票"
 #: view:account.crossovered.analytic:0
 #: view:analytic.plan.create.model:0
 msgid "Cancel"
-msgstr "取消"
+msgstr "刪除"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance,account4_ids:0
 msgid "Account4 Id"
-msgstr ""
+msgstr "帳戶4名稱"
 
 #. module: account_analytic_plans
 #: constraint:account.move.line:0
 msgid "Company must be the same for its related account and period."
-msgstr ""
+msgstr "科目和期間必須屬於同一個公司"
 
 #. module: account_analytic_plans
 #: view:account.analytic.plan.instance.line:0
 msgid "Analytic Distribution Lines"
-msgstr ""
+msgstr "輔助核算分配明細"
 
 #. module: account_analytic_plans
 #: code:addons/account_analytic_plans/account_analytic_plans.py:234
 #, python-format
 msgid "The Total Should be Between %s and %s"
-msgstr ""
+msgstr "總合應該介於 %s 和 %s 之間"
 
 #. module: account_analytic_plans
 #: report:account.analytic.account.crossovered.analytic:0
 msgid "at"
-msgstr "於"
+msgstr "在"
 
 #. module: account_analytic_plans
 #: report:account.analytic.account.crossovered.analytic:0
 msgid "Account Name"
-msgstr "帳號名稱"
+msgstr "帳戶名稱"
 
 #. module: account_analytic_plans
 #: view:account.analytic.plan.instance.line:0
 msgid "Analytic Distribution Line"
-msgstr ""
+msgstr "輔助核算分配明細"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance,code:0
 msgid "Distribution Code"
-msgstr ""
+msgstr "分配代碼"
 
 #. module: account_analytic_plans
 #: report:account.analytic.account.crossovered.analytic:0
 msgid "%"
-msgstr ""
+msgstr "%"
 
 #. module: account_analytic_plans
 #: report:account.analytic.account.crossovered.analytic:0
 msgid "100.00%"
-msgstr ""
+msgstr "100.00%"
 
 #. module: account_analytic_plans
 #: field:account.analytic.default,analytics_id:0
@@ -479,22 +479,22 @@ msgstr ""
 #: field:account.move.line,analytics_id:0
 #: model:ir.model,name:account_analytic_plans.model_account_analytic_default
 msgid "Analytic Distribution"
-msgstr ""
+msgstr "輔助核算分配"
 
 #. module: account_analytic_plans
 #: model:ir.model,name:account_analytic_plans.model_account_journal
 msgid "Journal"
-msgstr ""
+msgstr "帳簿"
 
 #. module: account_analytic_plans
 #: report:account.analytic.account.crossovered.analytic:0
 msgid "Code"
-msgstr ""
+msgstr "代碼"
 
 #. module: account_analytic_plans
 #: model:ir.model,name:account_analytic_plans.model_analytic_plan_create_model
 msgid "analytic.plan.create.model"
-msgstr ""
+msgstr "analytic.plan.create.model"
 
 #. module: account_analytic_plans
 #: field:account.crossovered.analytic,date2:0
@@ -504,7 +504,7 @@ msgstr "結束日期"
 #. module: account_analytic_plans
 #: model:ir.actions.act_window,name:account_analytic_plans.account_analytic_instance_model_open
 msgid "Distribution Models"
-msgstr ""
+msgstr "分配模型"
 
 #. module: account_analytic_plans
 #: model:ir.actions.act_window,help:account_analytic_plans.account_analytic_plan_form_action_installer
@@ -512,12 +512,12 @@ msgid ""
 "To setup a multiple analytic plans environment, you must define the root "
 "analytic accounts for each plan set. Then, you must attach a plan set to "
 "your account journals."
-msgstr ""
+msgstr "要設置多個環境輔助核算計劃，你必須為每個計劃設定的子輔助核算項目定義。然後，你必須附上計劃設定到您的帳戶帳簿。"
 
 #. module: account_analytic_plans
 #: constraint:account.move.line:0
 msgid "You can not create journal items on closed account."
-msgstr ""
+msgstr "憑證上不能使用已關閉的科目"
 
 #. module: account_analytic_plans
 #: report:account.analytic.account.crossovered.analytic:0
@@ -527,15 +527,19 @@ msgstr "公司"
 #. module: account_analytic_plans
 #: field:account.analytic.plan.line,sequence:0
 msgid "Sequence"
-msgstr ""
+msgstr "序列"
 
 #. module: account_analytic_plans
 #: sql_constraint:account.journal:0
 msgid "The name of the journal must be unique per company !"
-msgstr ""
+msgstr "每個公司的帳簿名稱必須唯一！"
 
 #. module: account_analytic_plans
 #: code:addons/account_analytic_plans/account_analytic_plans.py:234
 #, python-format
 msgid "Value Error"
-msgstr ""
+msgstr "數值錯誤"
+
+#~ msgid ""
+#~ "This distribution model has been saved. You will be able to reuse it later."
+#~ msgstr "這種分配模式已被保存。你以後將能夠重複使用它。"
diff --git a/addons/account_anglo_saxon/__openerp__.py b/addons/account_anglo_saxon/__openerp__.py
index 5073d6522e3..330d0df0000 100644
--- a/addons/account_anglo_saxon/__openerp__.py
+++ b/addons/account_anglo_saxon/__openerp__.py
@@ -19,32 +19,34 @@
 ##############################################################################
 
 {
-    "name": "Anglo-Saxon Accounting",
-    "version": "1.2",
-    "author": "OpenERP SA, Veritos",
-    "website": "http://openerp.com - http://veritos.nl",
-    "description": """
+    'name': 'Anglo-Saxon Accounting',
+    'version': '1.2',
+    'author': 'OpenERP SA, Veritos',
+    'website': 'http://openerp.com - http://veritos.nl',
+    'description': """
 This module supports the Anglo-Saxon accounting methodology by changing the accounting logic with stock transactions.
 =====================================================================================================================
 
-The difference between the Anglo-Saxon accounting countries and the Rhine (or also called 
-Continental accounting) countries is the moment of taking the Cost of Goods Sold versus 
-Cost of Sales. Anglo-Saxons accounting does take the cost when sales invoice is created, 
-Continental accounting will take the cost at the moment the goods are shipped.
+The difference between the Anglo-Saxon accounting countries and the Rhine 
+(or also called Continental accounting) countries is the moment of taking 
+the Cost of Goods Sold versus Cost of Sales. Anglo-Saxons accounting does 
+take the cost when sales invoice is created, Continental accounting will 
+take the cost at the moment the goods are shipped.
 
-This module will add this functionality by using a interim account, to store the value of 
-shipped goods and will contra book this interim account when the invoice is created to 
-transfer this amount to the debtor or creditor account. Secondly, price differences between 
-actual purchase price and fixed product standard price are booked on a separate account.""",
-    "images": ["images/account_anglo_saxon.jpeg"],
-    "depends": ["product", "purchase"],
-    "category": "Accounting & Finance",
-    "init_xml": [],
-    "demo_xml": [],
-    "update_xml": ["product_view.xml",],
-    "auto_install": False,
-    "installable": True,
-    "certificate":"00557423080410733581",
+This module will add this functionality by using a interim account, to 
+store the value of shipped goods and will contra book this interim 
+account when the invoice is created to transfer this amount to the 
+debtor or creditor account. Secondly, price differences between actual 
+purchase price and fixed product standard price are booked on a separate 
+account.""",
+    'images': ['images/account_anglo_saxon.jpeg'],
+    'depends': ['product', 'purchase'],
+    'category': 'Accounting & Finance',
+    'demo': [],
+    'data': ['product_view.xml',],
+    'auto_install': False,
+    'installable': True,
+    'certificate':'00557423080410733581',
 }
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account_anglo_saxon/i18n/ar.po b/addons/account_anglo_saxon/i18n/ar.po
index c505a035f63..9f7d8a45659 100644
--- a/addons/account_anglo_saxon/i18n/ar.po
+++ b/addons/account_anglo_saxon/i18n/ar.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:26+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:31+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_anglo_saxon
 #: sql_constraint:purchase.order:0
diff --git a/addons/account_anglo_saxon/i18n/bg.po b/addons/account_anglo_saxon/i18n/bg.po
index 8a286fe612c..71856266633 100644
--- a/addons/account_anglo_saxon/i18n/bg.po
+++ b/addons/account_anglo_saxon/i18n/bg.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:26+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:31+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_anglo_saxon
 #: sql_constraint:purchase.order:0
diff --git a/addons/account_anglo_saxon/i18n/ca.po b/addons/account_anglo_saxon/i18n/ca.po
index 70742ee8e8c..695e8eebada 100644
--- a/addons/account_anglo_saxon/i18n/ca.po
+++ b/addons/account_anglo_saxon/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:26+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:31+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_anglo_saxon
 #: sql_constraint:purchase.order:0
diff --git a/addons/account_anglo_saxon/i18n/da.po b/addons/account_anglo_saxon/i18n/da.po
index aea4b6a02ba..f3963a65e87 100644
--- a/addons/account_anglo_saxon/i18n/da.po
+++ b/addons/account_anglo_saxon/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:26+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:31+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_anglo_saxon
 #: sql_constraint:purchase.order:0
diff --git a/addons/account_anglo_saxon/i18n/de.po b/addons/account_anglo_saxon/i18n/de.po
index 6796e4e9f92..27eae995015 100644
--- a/addons/account_anglo_saxon/i18n/de.po
+++ b/addons/account_anglo_saxon/i18n/de.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:26+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:31+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_anglo_saxon
 #: sql_constraint:purchase.order:0
diff --git a/addons/account_anglo_saxon/i18n/el.po b/addons/account_anglo_saxon/i18n/el.po
index 99d813cfa80..94016db88c1 100644
--- a/addons/account_anglo_saxon/i18n/el.po
+++ b/addons/account_anglo_saxon/i18n/el.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:26+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:31+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_anglo_saxon
 #: sql_constraint:purchase.order:0
diff --git a/addons/account_anglo_saxon/i18n/en_GB.po b/addons/account_anglo_saxon/i18n/en_GB.po
index 9347028d3b2..142ab7db389 100644
--- a/addons/account_anglo_saxon/i18n/en_GB.po
+++ b/addons/account_anglo_saxon/i18n/en_GB.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:26+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:31+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_anglo_saxon
 #: sql_constraint:purchase.order:0
diff --git a/addons/account_anglo_saxon/i18n/es.po b/addons/account_anglo_saxon/i18n/es.po
index 48709ef712b..0e39ad37a6f 100644
--- a/addons/account_anglo_saxon/i18n/es.po
+++ b/addons/account_anglo_saxon/i18n/es.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:26+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:31+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_anglo_saxon
 #: sql_constraint:purchase.order:0
diff --git a/addons/account_anglo_saxon/i18n/es_CR.po b/addons/account_anglo_saxon/i18n/es_CR.po
index 83c1143f963..db80c45faa5 100644
--- a/addons/account_anglo_saxon/i18n/es_CR.po
+++ b/addons/account_anglo_saxon/i18n/es_CR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:26+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:31+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 "Language: es\n"
 
 #. module: account_anglo_saxon
diff --git a/addons/account_anglo_saxon/i18n/es_EC.po b/addons/account_anglo_saxon/i18n/es_EC.po
index 6dd4d142ff5..fdf792385f1 100644
--- a/addons/account_anglo_saxon/i18n/es_EC.po
+++ b/addons/account_anglo_saxon/i18n/es_EC.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:26+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:31+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_anglo_saxon
 #: sql_constraint:purchase.order:0
diff --git a/addons/account_anglo_saxon/i18n/es_PY.po b/addons/account_anglo_saxon/i18n/es_PY.po
index 90a5fda44c9..b57571fa3a6 100644
--- a/addons/account_anglo_saxon/i18n/es_PY.po
+++ b/addons/account_anglo_saxon/i18n/es_PY.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:26+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:31+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_anglo_saxon
 #: sql_constraint:purchase.order:0
diff --git a/addons/account_anglo_saxon/i18n/et.po b/addons/account_anglo_saxon/i18n/et.po
index f9c394c0a91..47042c1aa22 100644
--- a/addons/account_anglo_saxon/i18n/et.po
+++ b/addons/account_anglo_saxon/i18n/et.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:26+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:31+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_anglo_saxon
 #: sql_constraint:purchase.order:0
diff --git a/addons/account_anglo_saxon/i18n/fa.po b/addons/account_anglo_saxon/i18n/fa.po
index e1698b7e3ab..8b1c1db8ccb 100644
--- a/addons/account_anglo_saxon/i18n/fa.po
+++ b/addons/account_anglo_saxon/i18n/fa.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:26+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:31+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_anglo_saxon
 #: sql_constraint:purchase.order:0
diff --git a/addons/account_anglo_saxon/i18n/fi.po b/addons/account_anglo_saxon/i18n/fi.po
index b950aaeb708..32386cedf65 100644
--- a/addons/account_anglo_saxon/i18n/fi.po
+++ b/addons/account_anglo_saxon/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:26+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:31+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_anglo_saxon
 #: sql_constraint:purchase.order:0
diff --git a/addons/account_anglo_saxon/i18n/fr.po b/addons/account_anglo_saxon/i18n/fr.po
index aacada8d9d7..e41f73ad89e 100644
--- a/addons/account_anglo_saxon/i18n/fr.po
+++ b/addons/account_anglo_saxon/i18n/fr.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:26+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:31+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_anglo_saxon
 #: sql_constraint:purchase.order:0
diff --git a/addons/account_anglo_saxon/i18n/gl.po b/addons/account_anglo_saxon/i18n/gl.po
index 2c296b1a3ef..2549455a93a 100644
--- a/addons/account_anglo_saxon/i18n/gl.po
+++ b/addons/account_anglo_saxon/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:26+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:31+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_anglo_saxon
 #: sql_constraint:purchase.order:0
diff --git a/addons/account_anglo_saxon/i18n/gu.po b/addons/account_anglo_saxon/i18n/gu.po
index 36feb24c82c..cf55f111556 100644
--- a/addons/account_anglo_saxon/i18n/gu.po
+++ b/addons/account_anglo_saxon/i18n/gu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:26+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:31+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_anglo_saxon
 #: sql_constraint:purchase.order:0
diff --git a/addons/account_anglo_saxon/i18n/hi.po b/addons/account_anglo_saxon/i18n/hi.po
index 8ad0d5efe9f..d375944ead6 100644
--- a/addons/account_anglo_saxon/i18n/hi.po
+++ b/addons/account_anglo_saxon/i18n/hi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:26+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:31+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_anglo_saxon
 #: sql_constraint:purchase.order:0
diff --git a/addons/account_anglo_saxon/i18n/hr.po b/addons/account_anglo_saxon/i18n/hr.po
index 3c89cf6add7..b55f347b79b 100644
--- a/addons/account_anglo_saxon/i18n/hr.po
+++ b/addons/account_anglo_saxon/i18n/hr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:26+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:31+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_anglo_saxon
 #: sql_constraint:purchase.order:0
diff --git a/addons/account_anglo_saxon/i18n/hu.po b/addons/account_anglo_saxon/i18n/hu.po
index 267f43fcd9d..a77821ed0ae 100644
--- a/addons/account_anglo_saxon/i18n/hu.po
+++ b/addons/account_anglo_saxon/i18n/hu.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:26+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:31+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_anglo_saxon
 #: sql_constraint:purchase.order:0
diff --git a/addons/account_anglo_saxon/i18n/id.po b/addons/account_anglo_saxon/i18n/id.po
index 1c91019d009..4e66e0a3146 100644
--- a/addons/account_anglo_saxon/i18n/id.po
+++ b/addons/account_anglo_saxon/i18n/id.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:26+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:31+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_anglo_saxon
 #: sql_constraint:purchase.order:0
diff --git a/addons/account_anglo_saxon/i18n/it.po b/addons/account_anglo_saxon/i18n/it.po
index 697274406ac..6445d8addff 100644
--- a/addons/account_anglo_saxon/i18n/it.po
+++ b/addons/account_anglo_saxon/i18n/it.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:26+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:31+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_anglo_saxon
 #: sql_constraint:purchase.order:0
diff --git a/addons/account_anglo_saxon/i18n/ja.po b/addons/account_anglo_saxon/i18n/ja.po
index ce8621c0f5c..a738944f3c6 100644
--- a/addons/account_anglo_saxon/i18n/ja.po
+++ b/addons/account_anglo_saxon/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:26+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:31+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_anglo_saxon
 #: sql_constraint:purchase.order:0
diff --git a/addons/account_anglo_saxon/i18n/lv.po b/addons/account_anglo_saxon/i18n/lv.po
index 06b97bab881..6a6c78fe3e1 100644
--- a/addons/account_anglo_saxon/i18n/lv.po
+++ b/addons/account_anglo_saxon/i18n/lv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:26+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:31+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_anglo_saxon
 #: sql_constraint:purchase.order:0
diff --git a/addons/account_anglo_saxon/i18n/mn.po b/addons/account_anglo_saxon/i18n/mn.po
index 2962ac11237..f4bd7ff4379 100644
--- a/addons/account_anglo_saxon/i18n/mn.po
+++ b/addons/account_anglo_saxon/i18n/mn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:26+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:31+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_anglo_saxon
 #: sql_constraint:purchase.order:0
diff --git a/addons/account_anglo_saxon/i18n/nb.po b/addons/account_anglo_saxon/i18n/nb.po
new file mode 100644
index 00000000000..e9e92a341f9
--- /dev/null
+++ b/addons/account_anglo_saxon/i18n/nb.po
@@ -0,0 +1,101 @@
+# Norwegian Bokmal 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-02-08 00:35+0000\n"
+"PO-Revision-Date: 2012-08-27 15:41+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Norwegian Bokmal <nb@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:31+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
+
+#. module: account_anglo_saxon
+#: sql_constraint:purchase.order:0
+msgid "Order Reference must be unique per Company!"
+msgstr "Ordrereferanse må være unik pr. firma!"
+
+#. module: account_anglo_saxon
+#: view:product.category:0
+msgid " Accounting Property"
+msgstr " Regnskapsmessig Eiendom"
+
+#. module: account_anglo_saxon
+#: model:ir.model,name:account_anglo_saxon.model_product_category
+msgid "Product Category"
+msgstr "Produktkategori"
+
+#. module: account_anglo_saxon
+#: sql_constraint:stock.picking:0
+msgid "Reference must be unique per Company!"
+msgstr "Referanse må være unik pr firma!"
+
+#. module: account_anglo_saxon
+#: constraint:product.category:0
+msgid "Error ! You cannot create recursive categories."
+msgstr "Feil! Du kan ikke lage uendelig struktur med uendelige kategorier."
+
+#. module: account_anglo_saxon
+#: constraint:account.invoice:0
+msgid "Invalid BBA Structured Communication !"
+msgstr "Ugyldig BBA Strukturert Kommunikasjon!"
+
+#. module: account_anglo_saxon
+#: constraint:product.template:0
+msgid ""
+"Error: The default UOM and the purchase UOM must be in the same category."
+msgstr ""
+"Feil: Standard målenheter og kjøp målenheter må være i samme kategori."
+
+#. module: account_anglo_saxon
+#: model:ir.model,name:account_anglo_saxon.model_account_invoice_line
+msgid "Invoice Line"
+msgstr "Fakturalinje"
+
+#. module: account_anglo_saxon
+#: model:ir.model,name:account_anglo_saxon.model_purchase_order
+msgid "Purchase Order"
+msgstr "Innkjøpsordre"
+
+#. module: account_anglo_saxon
+#: model:ir.model,name:account_anglo_saxon.model_product_template
+msgid "Product Template"
+msgstr "Produktmal"
+
+#. module: account_anglo_saxon
+#: field:product.category,property_account_creditor_price_difference_categ:0
+#: field:product.template,property_account_creditor_price_difference:0
+msgid "Price Difference Account"
+msgstr "Pris forskjell konto"
+
+#. module: account_anglo_saxon
+#: model:ir.model,name:account_anglo_saxon.model_account_invoice
+msgid "Invoice"
+msgstr "Faktura"
+
+#. module: account_anglo_saxon
+#: model:ir.model,name:account_anglo_saxon.model_stock_picking
+msgid "Picking List"
+msgstr "Plukkliste"
+
+#. module: account_anglo_saxon
+#: sql_constraint:account.invoice:0
+msgid "Invoice Number must be unique per Company!"
+msgstr "Fakturanummer må være unik pr. firma!"
+
+#. module: account_anglo_saxon
+#: help:product.category,property_account_creditor_price_difference_categ:0
+#: help:product.template,property_account_creditor_price_difference:0
+msgid ""
+"This account will be used to value price difference between purchase price "
+"and cost price."
+msgstr ""
+"Denne kontoen vil bli brukt til verdi prisforskjellen mellom kjøpesum og "
+"kostpris."
diff --git a/addons/account_anglo_saxon/i18n/nl.po b/addons/account_anglo_saxon/i18n/nl.po
index 244499ff008..d862118bde2 100644
--- a/addons/account_anglo_saxon/i18n/nl.po
+++ b/addons/account_anglo_saxon/i18n/nl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:26+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:31+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_anglo_saxon
 #: sql_constraint:purchase.order:0
diff --git a/addons/account_anglo_saxon/i18n/nl_BE.po b/addons/account_anglo_saxon/i18n/nl_BE.po
index 9f518d20355..9bf9907a43b 100644
--- a/addons/account_anglo_saxon/i18n/nl_BE.po
+++ b/addons/account_anglo_saxon/i18n/nl_BE.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:26+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:31+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_anglo_saxon
 #: sql_constraint:purchase.order:0
diff --git a/addons/account_anglo_saxon/i18n/oc.po b/addons/account_anglo_saxon/i18n/oc.po
index c3c4fb03061..97a706fa5a3 100644
--- a/addons/account_anglo_saxon/i18n/oc.po
+++ b/addons/account_anglo_saxon/i18n/oc.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:26+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:31+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_anglo_saxon
 #: sql_constraint:purchase.order:0
diff --git a/addons/account_anglo_saxon/i18n/pl.po b/addons/account_anglo_saxon/i18n/pl.po
index e89cd0dff5b..334e625ddef 100644
--- a/addons/account_anglo_saxon/i18n/pl.po
+++ b/addons/account_anglo_saxon/i18n/pl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:26+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:31+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_anglo_saxon
 #: sql_constraint:purchase.order:0
diff --git a/addons/account_anglo_saxon/i18n/pt.po b/addons/account_anglo_saxon/i18n/pt.po
index 0f645953378..54d8ec8d7fe 100644
--- a/addons/account_anglo_saxon/i18n/pt.po
+++ b/addons/account_anglo_saxon/i18n/pt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:26+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:31+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_anglo_saxon
 #: sql_constraint:purchase.order:0
diff --git a/addons/account_anglo_saxon/i18n/pt_BR.po b/addons/account_anglo_saxon/i18n/pt_BR.po
index e576ba95ef4..2afc77d792a 100644
--- a/addons/account_anglo_saxon/i18n/pt_BR.po
+++ b/addons/account_anglo_saxon/i18n/pt_BR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:26+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:31+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_anglo_saxon
 #: sql_constraint:purchase.order:0
diff --git a/addons/account_anglo_saxon/i18n/ro.po b/addons/account_anglo_saxon/i18n/ro.po
index abaf7111b6a..d3f089c941c 100644
--- a/addons/account_anglo_saxon/i18n/ro.po
+++ b/addons/account_anglo_saxon/i18n/ro.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:26+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:31+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_anglo_saxon
 #: sql_constraint:purchase.order:0
diff --git a/addons/account_anglo_saxon/i18n/ru.po b/addons/account_anglo_saxon/i18n/ru.po
index aae5f408fd0..a18c98a330f 100644
--- a/addons/account_anglo_saxon/i18n/ru.po
+++ b/addons/account_anglo_saxon/i18n/ru.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:26+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:31+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_anglo_saxon
 #: sql_constraint:purchase.order:0
diff --git a/addons/account_anglo_saxon/i18n/sl.po b/addons/account_anglo_saxon/i18n/sl.po
index c156f35a491..b5a3ef825d9 100644
--- a/addons/account_anglo_saxon/i18n/sl.po
+++ b/addons/account_anglo_saxon/i18n/sl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:26+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:31+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_anglo_saxon
 #: sql_constraint:purchase.order:0
diff --git a/addons/account_anglo_saxon/i18n/sq.po b/addons/account_anglo_saxon/i18n/sq.po
index 7e5bd0d6573..5212edc3d28 100644
--- a/addons/account_anglo_saxon/i18n/sq.po
+++ b/addons/account_anglo_saxon/i18n/sq.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:26+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:31+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_anglo_saxon
 #: sql_constraint:purchase.order:0
diff --git a/addons/account_anglo_saxon/i18n/sr@latin.po b/addons/account_anglo_saxon/i18n/sr@latin.po
index 9e7c64c6b6b..b04c266f425 100644
--- a/addons/account_anglo_saxon/i18n/sr@latin.po
+++ b/addons/account_anglo_saxon/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:26+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:31+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_anglo_saxon
 #: sql_constraint:purchase.order:0
diff --git a/addons/account_anglo_saxon/i18n/sv.po b/addons/account_anglo_saxon/i18n/sv.po
index a5dc819ae9f..d42bc34bcc8 100644
--- a/addons/account_anglo_saxon/i18n/sv.po
+++ b/addons/account_anglo_saxon/i18n/sv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:26+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:31+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_anglo_saxon
 #: sql_constraint:purchase.order:0
diff --git a/addons/account_anglo_saxon/i18n/ta.po b/addons/account_anglo_saxon/i18n/ta.po
index 3aac0850d5c..556796e3da9 100644
--- a/addons/account_anglo_saxon/i18n/ta.po
+++ b/addons/account_anglo_saxon/i18n/ta.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:26+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:31+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_anglo_saxon
 #: sql_constraint:purchase.order:0
diff --git a/addons/account_anglo_saxon/i18n/tr.po b/addons/account_anglo_saxon/i18n/tr.po
index 96e340bf356..6553aaca34c 100644
--- a/addons/account_anglo_saxon/i18n/tr.po
+++ b/addons/account_anglo_saxon/i18n/tr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:26+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:31+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_anglo_saxon
 #: sql_constraint:purchase.order:0
diff --git a/addons/account_anglo_saxon/i18n/zh_CN.po b/addons/account_anglo_saxon/i18n/zh_CN.po
index 196d205fa70..52fc63c139a 100644
--- a/addons/account_anglo_saxon/i18n/zh_CN.po
+++ b/addons/account_anglo_saxon/i18n/zh_CN.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:26+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:31+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_anglo_saxon
 #: sql_constraint:purchase.order:0
diff --git a/addons/account_anglo_saxon/i18n/zh_TW.po b/addons/account_anglo_saxon/i18n/zh_TW.po
index 811eba4ac06..b50e8e4b827 100644
--- a/addons/account_anglo_saxon/i18n/zh_TW.po
+++ b/addons/account_anglo_saxon/i18n/zh_TW.po
@@ -8,24 +8,24 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:35+0000\n"
-"PO-Revision-Date: 2011-09-27 10:28+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2012-08-18 11:26+0000\n"
+"Last-Translator: Eric Huang <eh@cenoq.com>\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: 2012-08-07 05:26+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:31+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_anglo_saxon
 #: sql_constraint:purchase.order:0
 msgid "Order Reference must be unique per Company!"
-msgstr ""
+msgstr "訂單編號在同一公司內必需唯一!"
 
 #. module: account_anglo_saxon
 #: view:product.category:0
 msgid " Accounting Property"
-msgstr ""
+msgstr " 會計屬性"
 
 #. module: account_anglo_saxon
 #: model:ir.model,name:account_anglo_saxon.model_product_category
@@ -35,23 +35,23 @@ msgstr "產品分類"
 #. module: account_anglo_saxon
 #: sql_constraint:stock.picking:0
 msgid "Reference must be unique per Company!"
-msgstr ""
+msgstr "編號必須在同一公司內唯一！"
 
 #. module: account_anglo_saxon
 #: constraint:product.category:0
 msgid "Error ! You cannot create recursive categories."
-msgstr ""
+msgstr "錯誤！您不能建立循環分類。"
 
 #. module: account_anglo_saxon
 #: constraint:account.invoice:0
 msgid "Invalid BBA Structured Communication !"
-msgstr ""
+msgstr "Invalid BBA Structured Communication !"
 
 #. module: account_anglo_saxon
 #: constraint:product.template:0
 msgid ""
 "Error: The default UOM and the purchase UOM must be in the same category."
-msgstr ""
+msgstr "錯誤:預設的計量單位和採購的計量單位必須是同一類型."
 
 #. module: account_anglo_saxon
 #: model:ir.model,name:account_anglo_saxon.model_account_invoice_line
@@ -61,7 +61,7 @@ msgstr "發票明細"
 #. module: account_anglo_saxon
 #: model:ir.model,name:account_anglo_saxon.model_purchase_order
 msgid "Purchase Order"
-msgstr "購貨單"
+msgstr "採購單"
 
 #. module: account_anglo_saxon
 #: model:ir.model,name:account_anglo_saxon.model_product_template
@@ -72,7 +72,7 @@ msgstr "產品範本"
 #: field:product.category,property_account_creditor_price_difference_categ:0
 #: field:product.template,property_account_creditor_price_difference:0
 msgid "Price Difference Account"
-msgstr ""
+msgstr "價格差異帳戶"
 
 #. module: account_anglo_saxon
 #: model:ir.model,name:account_anglo_saxon.model_account_invoice
@@ -87,7 +87,7 @@ msgstr "提貨清單"
 #. module: account_anglo_saxon
 #: sql_constraint:account.invoice:0
 msgid "Invoice Number must be unique per Company!"
-msgstr ""
+msgstr "發票號碼必須在同一公司內唯一!"
 
 #. module: account_anglo_saxon
 #: help:product.category,property_account_creditor_price_difference_categ:0
@@ -95,7 +95,7 @@ msgstr ""
 msgid ""
 "This account will be used to value price difference between purchase price "
 "and cost price."
-msgstr ""
+msgstr "此帳戶將被使用於衡量採購價及成本價之間的價差。"
 
 #~ msgid "Order Reference must be unique !"
 #~ msgstr "訂單參考不能重覆！"
diff --git a/addons/account_asset/__openerp__.py b/addons/account_asset/__openerp__.py
index 2cf79e9d30d..93bfd18a7cb 100644
--- a/addons/account_asset/__openerp__.py
+++ b/addons/account_asset/__openerp__.py
@@ -20,42 +20,40 @@
 ##############################################################################
 
 {
-    "name" : "Assets Management",
-    "version" : "1.0",
-    "depends" : ["account"],
-    "author" : "OpenERP S.A.",
-    "description": """
+    'name': 'Assets Management',
+    'version': '1.0',
+    'depends': ['account'],
+    'author': 'OpenERP S.A.',
+    'description': """
 Financial and accounting asset management.
 ==========================================
 
-This Module manages the assets owned by a company or an individual. It will keep track of depreciation's occurred on those assets.
-And it allows to create Move's of the depreciation lines.
+This Module manages the assets owned by a company or an individual. It will keep 
+track of depreciation's occurred on those assets. And it allows to create Move's 
+of the depreciation lines.
 
     """,
-    "website" : "http://www.openerp.com",
-    "category" : "Accounting & Finance",
-    "sequence": 32,
-    "init_xml" : [
-    ],
-    "demo_xml" : [ 'account_asset_demo.xml'
-    ],
+    'website': 'http://www.openerp.com',
+    'category': 'Accounting & Finance',
+    'sequence': 32,
+    'demo': [ 'account_asset_demo.xml'],
     'test': [
         'test/account_asset_demo.yml',
         'test/account_asset.yml',
         'test/account_asset_wizard.yml',
     ],
-    "update_xml" : [
-        "security/account_asset_security.xml",
-        "security/ir.model.access.csv",
-        "wizard/account_asset_change_duration_view.xml",
-        "wizard/wizard_asset_compute_view.xml",
-        "account_asset_view.xml",
-        "account_asset_invoice_view.xml",
-        "report/account_asset_report_view.xml",
+    'data': [
+        'security/account_asset_security.xml',
+        'security/ir.model.access.csv',
+        'wizard/account_asset_change_duration_view.xml',
+        'wizard/wizard_asset_compute_view.xml',
+        'account_asset_view.xml',
+        'account_asset_invoice_view.xml',
+        'report/account_asset_report_view.xml',
     ],
-    "auto_install": False,
-    "installable": True,
-    "application": False,
+    'auto_install': False,
+    'installable': True,
+    'application': False,
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/account_asset/i18n/ar.po b/addons/account_asset/i18n/ar.po
index ae66d61ebbe..b0f2f7103d3 100644
--- a/addons/account_asset/i18n/ar.po
+++ b/addons/account_asset/i18n/ar.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_asset
 #: view:account.asset.asset:0
diff --git a/addons/account_asset/i18n/ca.po b/addons/account_asset/i18n/ca.po
index a7bc0eb372f..fe82638da7e 100755
--- a/addons/account_asset/i18n/ca.po
+++ b/addons/account_asset/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_asset
 #: view:account.asset.asset:0
diff --git a/addons/account_asset/i18n/cs.po b/addons/account_asset/i18n/cs.po
index 197a3751fc0..6979b5ca339 100644
--- a/addons/account_asset/i18n/cs.po
+++ b/addons/account_asset/i18n/cs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 "X-Poedit-Language: Czech\n"
 
 #. module: account_asset
diff --git a/addons/account_asset/i18n/da.po b/addons/account_asset/i18n/da.po
index 2796fd1a85f..7c85014534e 100644
--- a/addons/account_asset/i18n/da.po
+++ b/addons/account_asset/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_asset
 #: view:account.asset.asset:0
diff --git a/addons/account_asset/i18n/de.po b/addons/account_asset/i18n/de.po
index 07f094ed24c..53622d1ccfb 100755
--- a/addons/account_asset/i18n/de.po
+++ b/addons/account_asset/i18n/de.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_asset
 #: view:account.asset.asset:0
diff --git a/addons/account_asset/i18n/es.po b/addons/account_asset/i18n/es.po
index 0d098e93c1c..fe9c3376fed 100755
--- a/addons/account_asset/i18n/es.po
+++ b/addons/account_asset/i18n/es.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_asset
 #: view:account.asset.asset:0
diff --git a/addons/account_asset/i18n/es_AR.po b/addons/account_asset/i18n/es_AR.po
index 173bed5f355..95a4e62cc3d 100644
--- a/addons/account_asset/i18n/es_AR.po
+++ b/addons/account_asset/i18n/es_AR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_asset
 #: view:account.asset.asset:0
diff --git a/addons/account_asset/i18n/es_CR.po b/addons/account_asset/i18n/es_CR.po
index 5a814afb640..3f46cab758e 100755
--- a/addons/account_asset/i18n/es_CR.po
+++ b/addons/account_asset/i18n/es_CR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 "Language: es\n"
 
 #. module: account_asset
diff --git a/addons/account_asset/i18n/es_EC.po b/addons/account_asset/i18n/es_EC.po
index fde61116e0c..593d2c44d82 100644
--- a/addons/account_asset/i18n/es_EC.po
+++ b/addons/account_asset/i18n/es_EC.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_asset
 #: view:account.asset.asset:0
diff --git a/addons/account_asset/i18n/et.po b/addons/account_asset/i18n/et.po
index 567f7223177..68cf9b80823 100644
--- a/addons/account_asset/i18n/et.po
+++ b/addons/account_asset/i18n/et.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_asset
 #: view:account.asset.asset:0
diff --git a/addons/account_asset/i18n/fi.po b/addons/account_asset/i18n/fi.po
index dd067444993..c39bb444346 100644
--- a/addons/account_asset/i18n/fi.po
+++ b/addons/account_asset/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_asset
 #: view:account.asset.asset:0
diff --git a/addons/account_asset/i18n/fr.po b/addons/account_asset/i18n/fr.po
index e660a078653..f10d034fc11 100755
--- a/addons/account_asset/i18n/fr.po
+++ b/addons/account_asset/i18n/fr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_asset
 #: view:account.asset.asset:0
diff --git a/addons/account_asset/i18n/gu.po b/addons/account_asset/i18n/gu.po
index b8b437094a6..056221d0cf1 100644
--- a/addons/account_asset/i18n/gu.po
+++ b/addons/account_asset/i18n/gu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_asset
 #: view:account.asset.asset:0
diff --git a/addons/account_asset/i18n/hr.po b/addons/account_asset/i18n/hr.po
index b01e487b053..f298e54e65d 100644
--- a/addons/account_asset/i18n/hr.po
+++ b/addons/account_asset/i18n/hr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_asset
 #: view:account.asset.asset:0
diff --git a/addons/account_asset/i18n/id.po b/addons/account_asset/i18n/id.po
index 2cc9adb97ae..2601cb5b85f 100644
--- a/addons/account_asset/i18n/id.po
+++ b/addons/account_asset/i18n/id.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_asset
 #: view:account.asset.asset:0
diff --git a/addons/account_asset/i18n/ja.po b/addons/account_asset/i18n/ja.po
index 6b303942324..53accadf4fd 100644
--- a/addons/account_asset/i18n/ja.po
+++ b/addons/account_asset/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_asset
 #: view:account.asset.asset:0
diff --git a/addons/account_asset/i18n/lt.po b/addons/account_asset/i18n/lt.po
index 859ef9e2065..2c56a841855 100644
--- a/addons/account_asset/i18n/lt.po
+++ b/addons/account_asset/i18n/lt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_asset
 #: view:account.asset.asset:0
diff --git a/addons/account_asset/i18n/mn.po b/addons/account_asset/i18n/mn.po
index af6b4e278ee..a777f4f4e32 100644
--- a/addons/account_asset/i18n/mn.po
+++ b/addons/account_asset/i18n/mn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_asset
 #: view:account.asset.asset:0
diff --git a/addons/account_asset/i18n/nb.po b/addons/account_asset/i18n/nb.po
new file mode 100644
index 00000000000..891a7979735
--- /dev/null
+++ b/addons/account_asset/i18n/nb.po
@@ -0,0 +1,839 @@
+# Norwegian Bokmal 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-02-08 01:37+0100\n"
+"PO-Revision-Date: 2012-08-28 14:30+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Norwegian Bokmal <nb@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-08-29 05:05+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Assets in draft and open states"
+msgstr "Eiendeler i utkastet og åpen stater"
+
+#. 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 "Slutt dato"
+
+#. module: account_asset
+#: field:account.asset.asset,value_residual:0
+msgid "Residual Value"
+msgstr "restverdi"
+
+#. module: account_asset
+#: field:account.asset.category,account_expense_depreciation_id:0
+msgid "Depr. Expense Account"
+msgstr "Avskr. utgiftskonto"
+
+#. module: account_asset
+#: view:asset.depreciation.confirmation.wizard:0
+msgid "Compute Asset"
+msgstr "Beregn eiendel"
+
+#. module: account_asset
+#: view:asset.asset.report:0
+msgid "Group By..."
+msgstr "Grupper etter ..."
+
+#. module: account_asset
+#: field:asset.asset.report,gross_value:0
+msgid "Gross Amount"
+msgstr "bruttobeløp"
+
+#. module: account_asset
+#: view:account.asset.asset:0 field:account.asset.asset,name: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 "Eiendel"
+
+#. 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 ""
+"Angir at den første avskrivninger oppføring for denne eiendelen må gjøres "
+"fra kjøpsdato i stedet for første januar"
+
+#. module: account_asset
+#: field:account.asset.history,name:0
+msgid "History name"
+msgstr "Historie navn"
+
+#. 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 "Firma"
+
+#. module: account_asset
+#: view:asset.modify:0
+msgid "Modify"
+msgstr "Modifiser"
+
+#. module: account_asset
+#: selection:account.asset.asset,state:0 view:asset.asset.report:0
+#: selection:asset.asset.report,state:0
+msgid "Running"
+msgstr "Løper"
+
+#. module: account_asset
+#: field:account.asset.depreciation.line,amount:0
+msgid "Depreciation Amount"
+msgstr "avskrivningsbeløpet"
+
+#. 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 "eiendeler Analyse"
+
+#. module: account_asset
+#: field:asset.modify,name:0
+msgid "Reason"
+msgstr "Grunn"
+
+#. module: account_asset
+#: field:account.asset.asset,method_progress_factor:0
+#: field:account.asset.category,method_progress_factor:0
+msgid "Degressive Factor"
+msgstr "degressive faktor"
+
+#. 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 "Eiendel kategorier"
+
+#. module: account_asset
+#: view:asset.depreciation.confirmation.wizard:0
+msgid ""
+"This wizard will post the depreciation lines of running assets that belong "
+"to the selected period."
+msgstr ""
+"Denne veiviseren vil legge inn avskrivning linjer som kjører eiendeler som "
+"tilhører den valgte perioden."
+
+#. module: account_asset
+#: 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 "Inngang"
+
+#. module: account_asset
+#: view:account.asset.asset:0
+#: field:account.asset.asset,depreciation_line_ids:0
+msgid "Depreciation Lines"
+msgstr "Avskrivninger linjer"
+
+#. module: account_asset
+#: help:account.asset.asset,salvage_value:0
+msgid "It is the amount you plan to have that you cannot depreciate."
+msgstr "det er mengden du har tenkt å ha du ikke kan avskrive."
+
+#. 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 "Avskrivninger  Dato"
+
+#. module: account_asset
+#: field:account.asset.category,account_asset_id:0
+msgid "Asset Account"
+msgstr "Eiendel Konto"
+
+#. module: account_asset
+#: field:asset.asset.report,posted_value:0
+msgid "Posted Amount"
+msgstr "Skrevet Beløp"
+
+#. 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 "Eiendeler"
+
+#. module: account_asset
+#: field:account.asset.category,account_depreciation_id:0
+msgid "Depreciation Account"
+msgstr "avskrivnings konto"
+
+#. 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 "Notater"
+
+#. module: account_asset
+#: field:account.asset.depreciation.line,move_id:0
+msgid "Depreciation Entry"
+msgstr "Avskrivnings Inngang"
+
+#. module: account_asset
+#: sql_constraint:account.move.line:0
+msgid "Wrong credit or debit value in accounting entry !"
+msgstr "Feil kredit eller debet beløp i regnskaps oppføringen !"
+
+#. module: account_asset
+#: view:asset.asset.report:0 field:asset.asset.report,nbr:0
+msgid "# of Depreciation Lines"
+msgstr "Ant. Avskrivninger linjer"
+
+#. module: account_asset
+#: view:asset.asset.report:0
+msgid "Assets in draft state"
+msgstr "Eiendeler i utkast"
+
+#. 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 "Sluttdato"
+
+#. module: account_asset
+#: field:account.asset.asset,code:0
+msgid "Reference"
+msgstr "Referanse"
+
+#. module: account_asset
+#: constraint:account.invoice:0
+msgid "Invalid BBA Structured Communication !"
+msgstr "Ugyldig BBA Strukturert Kommunikasjon!"
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Account Asset"
+msgstr "Konto Eiendel"
+
+#. 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 "Beregn Eiendeler"
+
+#. module: account_asset
+#: field:account.asset.depreciation.line,sequence:0
+msgid "Sequence of the depreciation"
+msgstr "Sekvens av svekkelsen"
+
+#. module: account_asset
+#: field:account.asset.asset,method_period:0
+#: field:account.asset.category,method_period:0
+#: field:account.asset.history,method_period:0
+#: field:asset.modify,method_period:0
+msgid "Period Length"
+msgstr "Periode lengde"
+
+#. module: account_asset
+#: selection:account.asset.asset,state:0 view:asset.asset.report:0
+#: selection:asset.asset.report,state:0
+msgid "Draft"
+msgstr "Kladd"
+
+#. module: account_asset
+#: view:asset.asset.report:0
+msgid "Date of asset purchase"
+msgstr "Dato for kjøpsavtalen"
+
+#. module: account_asset
+#: help:account.asset.asset,method_number:0
+msgid "Calculates Depreciation within specified interval"
+msgstr "Beregner Avskrivninger innen angitt intervall"
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Change Duration"
+msgstr "Endre Varighet"
+
+#. module: account_asset
+#: field:account.asset.category,account_analytic_id:0
+msgid "Analytic account"
+msgstr "Analytisk konto"
+
+#. module: account_asset
+#: field:account.asset.asset,method:0 field:account.asset.category,method:0
+msgid "Computation Method"
+msgstr "Beregningsmetoden"
+
+#. module: account_asset
+#: help:account.asset.asset,method_period:0
+msgid "State here the time during 2 depreciations, in months"
+msgstr "Oppgi her tiden under 2 avskrivninger, i måneder."
+
+#. module: account_asset
+#: constraint:account.asset.asset:0
+msgid ""
+"Prorata temporis can be applied only for time method \"number of "
+"depreciations\"."
+msgstr ""
+"Prorata temporis kan bare brukes for tiden metoden \"antall avskrivninger\"."
+
+#. 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 ""
+"Metode for å beregne datoene og antall avskrivninger linjer.\n"
+"Antall Avskrivninger: Fest antall avskrivninger linjer og tiden mellom to "
+"avskrivninger.\n"
+"Sluttdato: Velg mellom 2 avskrivninger og datoen avskrivninger vil ikke gå "
+"utover."
+
+#. module: account_asset
+#: field:account.asset.asset,purchase_value:0
+msgid "Gross value "
+msgstr "Bruttoverdi "
+
+#. module: account_asset
+#: constraint:account.asset.asset:0
+msgid "Error ! You can not create recursive assets."
+msgstr "Feil! Du kan ikke lage rekrusive eiendeler."
+
+#. module: account_asset
+#: help:account.asset.history,method_period:0
+msgid "Time in month between two depreciations"
+msgstr "Tiden i måneden mellom to avskrivninger"
+
+#. module: account_asset
+#: view:asset.asset.report:0 field:asset.asset.report,name:0
+msgid "Year"
+msgstr "År"
+
+#. 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 "Endre eiendel"
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Other Information"
+msgstr "Annen informasjon"
+
+#. module: account_asset
+#: field:account.asset.asset,salvage_value:0
+msgid "Salvage Value"
+msgstr "Restverdi"
+
+#. module: account_asset
+#: field:account.invoice.line,asset_category_id:0 view:asset.asset.report:0
+msgid "Asset Category"
+msgstr "Eiendel kategori"
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Set to Close"
+msgstr "Satt til Lukk."
+
+#. module: account_asset
+#: model:ir.actions.wizard,name:account_asset.wizard_asset_compute
+msgid "Compute assets"
+msgstr "Beregn eiendeler"
+
+#. module: account_asset
+#: model:ir.actions.wizard,name:account_asset.wizard_asset_modify
+msgid "Modify asset"
+msgstr "Endre eiendel."
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Assets in closed state"
+msgstr "Eiendeler i lukket tilstand"
+
+#. module: account_asset
+#: field:account.asset.asset,parent_id:0
+msgid "Parent Asset"
+msgstr "overordnede Eiendel"
+
+#. module: account_asset
+#: view:account.asset.history:0
+#: model:ir.model,name:account_asset.model_account_asset_history
+msgid "Asset history"
+msgstr "Eiendel historie"
+
+#. module: account_asset
+#: view:asset.asset.report:0
+msgid "Assets purchased in current year"
+msgstr "Eiendeler som er kjøpt i inneværende år"
+
+#. module: account_asset
+#: field:account.asset.asset,state:0 field:asset.asset.report,state:0
+msgid "State"
+msgstr "Stat"
+
+#. module: account_asset
+#: model:ir.model,name:account_asset.model_account_invoice_line
+msgid "Invoice Line"
+msgstr "Fakturalinje"
+
+#. module: account_asset
+#: 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 ""
+"Den valgte kontoen av dine Bilagsregistrering blir tvunget for å gi en "
+"sekundær valuta. Du bør fjerne den sekundære valuta på konto eller velg en "
+"flervaluta syn på tidsskriftet."
+
+#. module: account_asset
+#: view:asset.asset.report:0
+msgid "Month"
+msgstr "Måned"
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Depreciation Board"
+msgstr "Avskrivninger Styret"
+
+#. module: account_asset
+#: model:ir.model,name:account_asset.model_account_move_line
+msgid "Journal Items"
+msgstr "Journal Elementer"
+
+#. module: account_asset
+#: field:asset.asset.report,unposted_value:0
+msgid "Unposted Amount"
+msgstr "Ikke resultatført beløp"
+
+#. 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 "tid Metode"
+
+#. module: account_asset
+#: view:account.asset.category:0
+msgid "Analytic Information"
+msgstr ""
+
+#. module: account_asset
+#: view:asset.modify:0
+msgid "Asset Durations to Modify"
+msgstr ""
+
+#. module: account_asset
+#: 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 ""
+"Datoen for din bilagsregistrering ikke er i den definerte perioden! Du bør "
+"endre datoen eller fjerne denne begrensningen fra tidsskriftet."
+
+#. module: account_asset
+#: field:account.asset.asset,note:0 field:account.asset.category,note:0
+#: field:account.asset.history,note:0
+msgid "Note"
+msgstr "Notat"
+
+#. 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: Remaining Value * Degressive Factor"
+msgstr ""
+"Velg metoden som skal brukes for å beregne mengden av avskrivninger linjer.\n"
+"* Lineær: Beregnet på grunnlag av: bruttoverdi / Antall Avskrivninger\n"
+"* Degressiv: Beregnet på grunnlag av: restverdi * degressiv faktor"
+
+#. 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 ""
+"Velg metoden som skal brukes for å beregne datoene og antall avskrivninger "
+"linjer.\n"
+" * Antall Avskrivninger: Fest antall avskrivninger linjer og tiden mellom to "
+"avskrivninger.\n"
+" * Sluttdato: Velg mellom 2 avskrivninger og datoen avskrivninger vil ikke "
+"gå utover."
+
+#. module: account_asset
+#: view:asset.asset.report:0
+msgid "Assets in running state"
+msgstr "Eiendeler i rennende staten"
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Closed"
+msgstr "Lukket"
+
+#. 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 field:asset.asset.report,depreciation_value:0
+msgid "Amount of Depreciation Lines"
+msgstr "Størrelsen på avskrivningene linjer"
+
+#. module: account_asset
+#: view:asset.asset.report:0
+msgid "Posted depreciation lines"
+msgstr "Postet avskrivninger linjer"
+
+#. module: account_asset
+#: constraint:account.move.line:0
+msgid "Company must be the same for its related account and period."
+msgstr "Selskapet må være den samme for tilhørende konto og periode"
+
+#. module: account_asset
+#: field:account.asset.asset,child_ids:0
+msgid "Children Assets"
+msgstr "Barn Eiendeler"
+
+#. module: account_asset
+#: view:asset.asset.report:0
+msgid "Date of depreciation"
+msgstr "Dato av avskrivninger"
+
+#. module: account_asset
+#: field:account.asset.history,user_id:0
+msgid "User"
+msgstr "Bruker"
+
+#. module: account_asset
+#: field:account.asset.history,date:0
+msgid "Date"
+msgstr "Dato"
+
+#. module: account_asset
+#: view:asset.asset.report:0
+msgid "Assets purchased in current month"
+msgstr "Eiendeler som er kjøpt i inneværende måned"
+
+#. module: account_asset
+#: constraint:account.move.line:0
+msgid "You can not create journal items on an account of type view."
+msgstr "Du kan ikke lage journalregistreringer på konto av typen vis"
+
+#. module: account_asset
+#: view:asset.asset.report:0
+msgid "Extended Filters..."
+msgstr "Utvidet Filtere ..."
+
+#. module: account_asset
+#: view:account.asset.asset:0 view:asset.depreciation.confirmation.wizard:0
+msgid "Compute"
+msgstr "Beregn"
+
+#. module: account_asset
+#: view:account.asset.category:0
+msgid "Search Asset Category"
+msgstr "Søk eiendel Kategori"
+
+#. module: account_asset
+#: model:ir.model,name:account_asset.model_asset_depreciation_confirmation_wizard
+msgid "asset.depreciation.confirmation.wizard"
+msgstr "eiendel.avskrivninger.bekreftelse.veiviseren"
+
+#. module: account_asset
+#: field:account.asset.asset,active:0
+msgid "Active"
+msgstr "Aktiv"
+
+#. module: account_asset
+#: model:ir.actions.wizard,name:account_asset.wizard_asset_close
+msgid "Close asset"
+msgstr "Lukket eiendel"
+
+#. module: account_asset
+#: field:account.asset.depreciation.line,parent_state:0
+msgid "State of Asset"
+msgstr "State av eiendel."
+
+#. module: account_asset
+#: field:account.asset.depreciation.line,name:0
+msgid "Depreciation Name"
+msgstr "Avskrivninger Navn"
+
+#. module: account_asset
+#: view:account.asset.asset:0 field:account.asset.asset,history_ids:0
+msgid "History"
+msgstr "Historie"
+
+#. module: account_asset
+#: sql_constraint:account.invoice:0
+msgid "Invoice Number must be unique per Company!"
+msgstr "Fakturanummer må være unik pr. firma!"
+
+#. module: account_asset
+#: field:asset.depreciation.confirmation.wizard,period_id:0
+msgid "Period"
+msgstr "Periode"
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "General"
+msgstr "Genrelt"
+
+#. module: account_asset
+#: field:account.asset.asset,prorata:0 field:account.asset.category,prorata:0
+msgid "Prorata Temporis"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.category:0
+msgid "Accounting Information"
+msgstr ""
+
+#. module: account_asset
+#: model:ir.model,name:account_asset.model_account_invoice
+msgid "Invoice"
+msgstr "Faktura"
+
+#. module: account_asset
+#: model:ir.actions.act_window,name:account_asset.action_account_asset_asset_form_normal
+msgid "Review Asset Categories"
+msgstr "Gjennomgå eiendel kategorier"
+
+#. module: account_asset
+#: view:asset.depreciation.confirmation.wizard:0 view:asset.modify:0
+msgid "Cancel"
+msgstr "Avbryt"
+
+#. module: account_asset
+#: selection:account.asset.asset,state:0 selection:asset.asset.report,state:0
+msgid "Close"
+msgstr "Lukke"
+
+#. module: account_asset
+#: view:account.asset.asset:0 view:account.asset.category:0
+msgid "Depreciation Method"
+msgstr "Avskrivningsmetode"
+
+#. 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 "Kjøpsdato"
+
+#. module: account_asset
+#: selection:account.asset.asset,method:0
+#: selection:account.asset.category,method:0
+msgid "Degressive"
+msgstr ""
+
+#. module: account_asset
+#: help:asset.depreciation.confirmation.wizard,period_id:0
+msgid ""
+"Choose the period for which you want to automatically post the depreciation "
+"lines of running assets"
+msgstr ""
+"Velg den perioden du ønsker å automatisk legge inn avskrivninger linjer av "
+"kjører eiendeler."
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Current"
+msgstr "Nåværende"
+
+#. module: account_asset
+#: field:account.asset.depreciation.line,remaining_value:0
+msgid "Amount to Depreciate"
+msgstr "Beløp å avskrive"
+
+#. module: account_asset
+#: field:account.asset.category,open_asset:0
+msgid "Skip Draft State"
+msgstr "Hopp over Utkast stat"
+
+#. module: account_asset
+#: view:account.asset.asset:0 view:account.asset.category:0
+#: view:account.asset.history:0
+msgid "Depreciation Dates"
+msgstr "Avskrivninger datoer"
+
+#. module: account_asset
+#: field:account.asset.asset,currency_id:0
+msgid "Currency"
+msgstr "Valuta"
+
+#. module: account_asset
+#: field:account.asset.category,journal_id:0
+msgid "Journal"
+msgstr "Journal"
+
+#. module: account_asset
+#: field:account.asset.depreciation.line,depreciated_value:0
+msgid "Amount Already Depreciated"
+msgstr "Beløp Allerede Avskrives"
+
+#. 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 "Lagt inn"
+
+#. module: account_asset
+#: help:account.asset.asset,state:0
+msgid ""
+"When an asset is created, the state is 'Draft'.\n"
+"If the asset is confirmed, the state 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 state."
+msgstr ""
+"Når en eiendel er opprettet, er staten \"Kladd\".\n"
+"Dersom eiendelen er bekreftet, går staten i 'Running' og avskrivninger "
+"linjer kan bli lagt i regnskapssystemet.\n"
+"Du kan manuelt lukke et aktivum når avskrivningen er over. Hvis den siste "
+"linjen av avskrivninger er lagt ut, går eiendelen automatisk i den "
+"tilstanden."
+
+#. module: account_asset
+#: field:account.asset.category,name:0
+msgid "Name"
+msgstr "Navn"
+
+#. 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 ""
+"Sjekk dette hvis du ønsker å automatisk bekrefte eiendeler i denne "
+"kategorien når laget av fakturaer."
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Set to Draft"
+msgstr "Sett som utkast"
+
+#. module: account_asset
+#: selection:account.asset.asset,method:0
+#: selection:account.asset.category,method:0
+msgid "Linear"
+msgstr "Lineær"
+
+#. module: account_asset
+#: view:asset.asset.report:0
+msgid "Month-1"
+msgstr "Måned-1"
+
+#. module: account_asset
+#: model:ir.model,name:account_asset.model_account_asset_depreciation_line
+msgid "Asset depreciation line"
+msgstr "Eiendel avskrinings linje"
+
+#. module: account_asset
+#: field:account.asset.asset,category_id:0 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 "Eiendel kategori"
+
+#. module: account_asset
+#: view:asset.asset.report:0
+msgid "Assets purchased in last month"
+msgstr "Eiendeler som er kjøpt i forrige måned."
+
+#. module: account_asset
+#: code:addons/account_asset/wizard/wizard_asset_compute.py:49
+#, python-format
+msgid "Created Asset Moves"
+msgstr "Opprettet eiendel trekk."
+
+#. module: account_asset
+#: constraint:account.move.line:0
+msgid "You can not create journal items on closed account."
+msgstr "Du kan ikke lage journal elementer på en lukket konto."
+
+#. module: account_asset
+#: model:ir.actions.act_window,help:account_asset.action_asset_asset_report
+msgid ""
+"From this report, you can have an overview on all depreciation. The tool "
+"search can also be used to personalise your Assets reports and so, match "
+"this analysis to your needs;"
+msgstr ""
+"Fra denne rapporten, kan du ha en oversikt over alle avskrivninger. "
+"Verktøyet søk kan også brukes til å tilpasse dine eiendeler rapporter og så "
+"matche denne analysen til dine behov;"
+
+#. module: account_asset
+#: help:account.asset.category,method_period:0
+msgid "State here the time between 2 depreciations, in months"
+msgstr "Angi tiden mellom to avskrivninger, i måneder"
+
+#. 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 "Antall Avskrivninger"
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Create Move"
+msgstr ""
+
+#. module: account_asset
+#: view:asset.depreciation.confirmation.wizard:0
+msgid "Post Depreciation Lines"
+msgstr "Innlegg Avskrivninger linjer"
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Confirm Asset"
+msgstr "Bekreft eiendel"
+
+#. 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 "Eiendel Hierarki."
+
+#~ msgid "Asset durations to modify"
+#~ msgstr "Eiendel lengder å endre"
+
+#~ msgid "Analytic information"
+#~ msgstr "analytisk informasjon"
+
+#~ msgid "Accounting information"
+#~ msgstr "Regnskapsopplysninger"
diff --git a/addons/account_asset/i18n/nl.po b/addons/account_asset/i18n/nl.po
index bced4186945..2e3901ac0d6 100644
--- a/addons/account_asset/i18n/nl.po
+++ b/addons/account_asset/i18n/nl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_asset
 #: view:account.asset.asset:0
diff --git a/addons/account_asset/i18n/nl_BE.po b/addons/account_asset/i18n/nl_BE.po
index b608dd8ff05..0d1fd721e85 100644
--- a/addons/account_asset/i18n/nl_BE.po
+++ b/addons/account_asset/i18n/nl_BE.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_asset
 #: view:account.asset.asset:0
diff --git a/addons/account_asset/i18n/pl.po b/addons/account_asset/i18n/pl.po
index 9805c996047..b463d3e9088 100755
--- a/addons/account_asset/i18n/pl.po
+++ b/addons/account_asset/i18n/pl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_asset
 #: view:account.asset.asset:0
diff --git a/addons/account_asset/i18n/pt.po b/addons/account_asset/i18n/pt.po
index bbd480b263c..07a9bb42e44 100755
--- a/addons/account_asset/i18n/pt.po
+++ b/addons/account_asset/i18n/pt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_asset
 #: view:account.asset.asset:0
diff --git a/addons/account_asset/i18n/pt_BR.po b/addons/account_asset/i18n/pt_BR.po
index 36ae09d2b8e..4f0c8b67457 100644
--- a/addons/account_asset/i18n/pt_BR.po
+++ b/addons/account_asset/i18n/pt_BR.po
@@ -9,13 +9,14 @@ msgstr ""
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 01:37+0100\n"
 "PO-Revision-Date: 2012-07-28 14:07+0000\n"
-"Last-Translator: Fábio Martinelli <webmaster@guaru.net>\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: 2012-08-09 05:00+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_asset
 #: view:account.asset.asset:0
@@ -828,6 +829,24 @@ msgstr "Confirmar Ativo"
 msgid "Asset Hierarchy"
 msgstr "Hierarquia do ativo"
 
+#~ msgid "Open Assets"
+#~ msgstr "Ativos em aberto"
+
+#~ msgid "Progressive"
+#~ msgstr "Progressivo"
+
+#~ msgid "Open entries"
+#~ msgstr "Entradas em aberto"
+
+#~ msgid "Method"
+#~ msgstr "Método"
+
+#~ msgid "General info"
+#~ msgstr "Informações gerais"
+
+#~ msgid "View"
+#~ msgstr "Visualizar"
+
 #~ msgid "Asset durations to modify"
 #~ msgstr "Ativos para modificar durações"
 
@@ -836,3 +855,12 @@ msgstr "Hierarquia do ativo"
 
 #~ msgid "Accounting information"
 #~ msgstr "Informações Contábeis"
+
+#~ msgid "Normal"
+#~ msgstr "Normal"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "XML inválido para Arquitetura da View"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nome do modelo Inválido na definição da ação"
diff --git a/addons/account_asset/i18n/ro.po b/addons/account_asset/i18n/ro.po
index a8b18ebc985..70cbf186849 100644
--- a/addons/account_asset/i18n/ro.po
+++ b/addons/account_asset/i18n/ro.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_asset
 #: view:account.asset.asset:0
@@ -486,11 +486,11 @@ msgid ""
 "depreciations won't go beyond."
 msgstr ""
 "Alegeti metoda care va fi folosita pentru a calcula datele si numarul "
-"liniilor devalorizarii.\n"
-"  * Numarul Devalorizarilor: Fixati numarul liniilor devalorizarii si "
-"perioada dintre 2 devalorizari.\n"
-"  * Data de sfarsit: Alegeti perioada dintre 2 devalorizari si data pe care "
-"devalorizarile nu o vor depasi."
+"liniilor amortizarii.\n"
+"* Numarul Amortizarilor: Fixati numarul liniilor amortizarii si perioada "
+"dintre 2 amortizari.\n"
+"* Data de sfarsit: Alegeti perioada dintre 2 amortizari si data pe care "
+"amortizarile nu o vor depasi."
 
 #. module: account_asset
 #: view:asset.asset.report:0
diff --git a/addons/account_asset/i18n/ru.po b/addons/account_asset/i18n/ru.po
index accd427cfd2..588881b6a19 100644
--- a/addons/account_asset/i18n/ru.po
+++ b/addons/account_asset/i18n/ru.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_asset
 #: view:account.asset.asset:0
diff --git a/addons/account_asset/i18n/sl.po b/addons/account_asset/i18n/sl.po
index 7e1c5324747..cf3b395003b 100644
--- a/addons/account_asset/i18n/sl.po
+++ b/addons/account_asset/i18n/sl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_asset
 #: view:account.asset.asset:0
diff --git a/addons/account_asset/i18n/sr@latin.po b/addons/account_asset/i18n/sr@latin.po
index 687d211dad9..c16892ee2d5 100644
--- a/addons/account_asset/i18n/sr@latin.po
+++ b/addons/account_asset/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_asset
 #: view:account.asset.asset:0
diff --git a/addons/account_asset/i18n/sv.po b/addons/account_asset/i18n/sv.po
index bd58ffc7e57..4f1f74900cd 100755
--- a/addons/account_asset/i18n/sv.po
+++ b/addons/account_asset/i18n/sv.po
@@ -13,13 +13,13 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_asset
 #: view:account.asset.asset:0
 msgid "Assets in draft and open states"
-msgstr "Tillgångar i preleminär eller öppen status"
+msgstr "Inventarier i preleminär eller öppen status"
 
 #. module: account_asset
 #: field:account.asset.category,method_end:0
@@ -129,8 +129,8 @@ msgid ""
 "This wizard will post the depreciation lines of running assets that belong "
 "to the selected period."
 msgstr ""
-"Denna guide vill lagra avskrivningsrader för aktuella tillgångar som tillhör "
-"vald period."
+"Denna guide vill lagra avskrivningsrader för aktuella inventarier som "
+"tillhör vald period."
 
 #. module: account_asset
 #: field:account.asset.asset,account_move_line_ids:0
@@ -173,7 +173,7 @@ msgstr "Bokfört belopp"
 #: model:ir.ui.menu,name:account_asset.menu_finance_assets
 #: model:ir.ui.menu,name:account_asset.menu_finance_config_assets
 msgid "Assets"
-msgstr "Tillgångar"
+msgstr "Inventarier"
 
 #. module: account_asset
 #: field:account.asset.category,account_depreciation_id:0
@@ -204,7 +204,7 @@ msgstr "# avskrivningsrader"
 #. module: account_asset
 #: view:asset.asset.report:0
 msgid "Assets in draft state"
-msgstr "Tillgångar i preleminär status"
+msgstr "Inventarier i preleminär status"
 
 #. module: account_asset
 #: field:account.asset.asset,method_end:0
@@ -316,7 +316,7 @@ msgstr "Brutto värde "
 #. module: account_asset
 #: constraint:account.asset.asset:0
 msgid "Error ! You can not create recursive assets."
-msgstr "Fel! Du kan inte skapa tillgångar rekursivt."
+msgstr "Fel! Du kan inte skapa inventarier rekursivt."
 
 #. module: account_asset
 #: help:account.asset.history,method_period:0
@@ -368,7 +368,7 @@ msgstr "Ändra tillgång"
 #. module: account_asset
 #: view:account.asset.asset:0
 msgid "Assets in closed state"
-msgstr "Tillgångar i status \"stängd\""
+msgstr "Inventarier i status \"stängd\""
 
 #. module: account_asset
 #: field:account.asset.asset,parent_id:0
@@ -384,7 +384,7 @@ msgstr "Tillgångshistorik"
 #. module: account_asset
 #: view:asset.asset.report:0
 msgid "Assets purchased in current year"
-msgstr "Tillgångar införskaffade innehvarande år"
+msgstr "Inventarier införskaffade innehvarande år"
 
 #. module: account_asset
 #: field:account.asset.asset,state:0 field:asset.asset.report,state:0
@@ -489,7 +489,7 @@ msgstr ""
 #. module: account_asset
 #: view:asset.asset.report:0
 msgid "Assets in running state"
-msgstr "Aktiva tillgångar"
+msgstr "Aktiva inventarier"
 
 #. module: account_asset
 #: view:account.asset.asset:0
@@ -520,7 +520,7 @@ msgstr "Bolaget måste överenstämma för alla konton och perioder."
 #. module: account_asset
 #: field:account.asset.asset,child_ids:0
 msgid "Children Assets"
-msgstr "Undertillgångar"
+msgstr "Underinventarier"
 
 #. module: account_asset
 #: view:asset.asset.report:0
@@ -540,7 +540,7 @@ msgstr "Datum"
 #. module: account_asset
 #: view:asset.asset.report:0
 msgid "Assets purchased in current month"
-msgstr "Tillgångar som anskaffats innevarande månad"
+msgstr "Inventarier som anskaffats innevarande månad"
 
 #. module: account_asset
 #: constraint:account.move.line:0
@@ -661,7 +661,7 @@ msgid ""
 "lines of running assets"
 msgstr ""
 "Välj period för vilken du vill automatiskt bokföra avskrivningsrader för "
-"aktuella tillgångar"
+"aktuella inventarier"
 
 #. module: account_asset
 #: view:account.asset.asset:0
@@ -731,7 +731,7 @@ msgid ""
 "Check this if you want to automatically confirm the assets of this category "
 "when created by invoices."
 msgstr ""
-"Kryssa denna ruta om du automatiskt vill bekräfta tillgångar i denna "
+"Kryssa denna ruta om du automatiskt vill bekräfta inventarier i denna "
 "kategori när det skapas via leverantörsfakturor."
 
 #. module: account_asset
@@ -765,7 +765,7 @@ msgstr "Tillgångskategori"
 #. module: account_asset
 #: view:asset.asset.report:0
 msgid "Assets purchased in last month"
-msgstr "Tillgångar inköpta under senaste månaden"
+msgstr "Inventarier inköpta under senaste månaden"
 
 #. module: account_asset
 #: code:addons/account_asset/wizard/wizard_asset_compute.py:49
diff --git a/addons/account_asset/i18n/tr.po b/addons/account_asset/i18n/tr.po
index acf1738c717..58da62d80af 100644
--- a/addons/account_asset/i18n/tr.po
+++ b/addons/account_asset/i18n/tr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_asset
 #: view:account.asset.asset:0
diff --git a/addons/account_asset/i18n/vi.po b/addons/account_asset/i18n/vi.po
index 4a8f6634164..fc232eddbb6 100644
--- a/addons/account_asset/i18n/vi.po
+++ b/addons/account_asset/i18n/vi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_asset
 #: view:account.asset.asset:0
diff --git a/addons/account_asset/i18n/zh_CN.po b/addons/account_asset/i18n/zh_CN.po
index fe6952fc69e..0ef6721bd65 100644
--- a/addons/account_asset/i18n/zh_CN.po
+++ b/addons/account_asset/i18n/zh_CN.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_asset
 #: view:account.asset.asset:0
diff --git a/addons/account_asset/i18n/zh_TW.po b/addons/account_asset/i18n/zh_TW.po
new file mode 100644
index 00000000000..7866d371ff8
--- /dev/null
+++ b/addons/account_asset/i18n/zh_TW.po
@@ -0,0 +1,814 @@
+# Chinese (Traditional) 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-02-08 01:37+0100\n"
+"PO-Revision-Date: 2012-08-20 01:50+0000\n"
+"Last-Translator: Eric Huang <eh@cenoq.com>\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: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\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.depreciation.confirmation.wizard:0
+msgid "Compute Asset"
+msgstr "計算資產"
+
+#. module: account_asset
+#: view:asset.asset.report:0
+msgid "Group By..."
+msgstr "群組依據..."
+
+#. module: account_asset
+#: field:asset.asset.report,gross_value:0
+msgid "Gross Amount"
+msgstr "總額"
+
+#. module: account_asset
+#: view:account.asset.asset:0 field:account.asset.asset,name:0
+#: field:account.asset.depreciation.line,asset_id:0
+#: field:account.asset.history,asset_id:0 field:account.move.line,asset_id:0
+#: view:asset.asset.report:0 field:asset.asset.report,asset_id:0
+#: model:ir.model,name:account_asset.model_account_asset_asset
+msgid "Asset"
+msgstr "資產"
+
+#. module: account_asset
+#: help:account.asset.asset,prorata:0 help:account.asset.category,prorata:0
+msgid ""
+"Indicates that the first depreciation entry for this asset have to be done "
+"from the purchase date instead of the first January"
+msgstr "顯示固定資產的第一筆折舊分錄必須是以採購日期開始而不是一月一日"
+
+#. module: account_asset
+#: field:account.asset.history,name:0
+msgid "History name"
+msgstr "歷史名稱"
+
+#. module: account_asset
+#: field:account.asset.asset,company_id:0
+#: field:account.asset.category,company_id:0 view:asset.asset.report:0
+#: field:asset.asset.report,company_id:0
+msgid "Company"
+msgstr "公司"
+
+#. module: account_asset
+#: view:asset.modify:0
+msgid "Modify"
+msgstr "變動"
+
+#. module: account_asset
+#: selection:account.asset.asset,state:0 view:asset.asset.report:0
+#: selection:asset.asset.report,state:0
+msgid "Running"
+msgstr "運行"
+
+#. module: account_asset
+#: field:account.asset.depreciation.line,amount:0
+msgid "Depreciation Amount"
+msgstr "折舊金額"
+
+#. module: account_asset
+#: view:asset.asset.report:0
+#: model:ir.actions.act_window,name:account_asset.action_asset_asset_report
+#: model:ir.model,name:account_asset.model_asset_asset_report
+#: model:ir.ui.menu,name:account_asset.menu_action_asset_asset_report
+msgid "Assets Analysis"
+msgstr "資產分析"
+
+#. module: account_asset
+#: field:asset.modify,name:0
+msgid "Reason"
+msgstr "原因"
+
+#. module: account_asset
+#: field:account.asset.asset,method_progress_factor:0
+#: field:account.asset.category,method_progress_factor:0
+msgid "Degressive Factor"
+msgstr "遞減因素"
+
+#. module: account_asset
+#: model:ir.actions.act_window,name:account_asset.action_account_asset_asset_list_normal
+#: model:ir.ui.menu,name:account_asset.menu_action_account_asset_asset_list_normal
+msgid "Asset Categories"
+msgstr "資產類別"
+
+#. module: account_asset
+#: view:asset.depreciation.confirmation.wizard:0
+msgid ""
+"This wizard will post the depreciation lines of running assets that belong "
+"to the selected period."
+msgstr "此精靈將所選擇期間使用中固定資產的資產折舊計算入帳。"
+
+#. module: account_asset
+#: field:account.asset.asset,account_move_line_ids:0
+#: field:account.move.line,entry_ids:0
+#: model:ir.actions.act_window,name:account_asset.act_entries_open
+msgid "Entries"
+msgstr "分錄"
+
+#. module: account_asset
+#: view:account.asset.asset:0
+#: field:account.asset.asset,depreciation_line_ids:0
+msgid "Depreciation Lines"
+msgstr "折舊明細"
+
+#. module: account_asset
+#: help:account.asset.asset,salvage_value:0
+msgid "It is the amount you plan to have that you cannot depreciate."
+msgstr "這是你已計劃好的金額，你可以不折舊。"
+
+#. module: account_asset
+#: field:account.asset.depreciation.line,depreciation_date:0
+#: view:asset.asset.report:0 field:asset.asset.report,depreciation_date:0
+msgid "Depreciation Date"
+msgstr "折舊日期"
+
+#. module: account_asset
+#: field:account.asset.category,account_asset_id:0
+msgid "Asset Account"
+msgstr "資產科目"
+
+#. module: account_asset
+#: field:asset.asset.report,posted_value:0
+msgid "Posted Amount"
+msgstr "發佈金額"
+
+#. module: account_asset
+#: view:account.asset.asset:0 view:asset.asset.report:0
+#: model:ir.actions.act_window,name:account_asset.action_account_asset_asset_form
+#: model:ir.ui.menu,name:account_asset.menu_action_account_asset_asset_form
+#: model:ir.ui.menu,name:account_asset.menu_finance_assets
+#: model:ir.ui.menu,name:account_asset.menu_finance_config_assets
+msgid "Assets"
+msgstr "資產"
+
+#. module: account_asset
+#: field:account.asset.category,account_depreciation_id:0
+msgid "Depreciation Account"
+msgstr "折舊科目"
+
+#. module: account_asset
+#: view:account.asset.asset:0 view:account.asset.category:0
+#: view:account.asset.history:0 view:asset.modify:0 field:asset.modify,note:0
+msgid "Notes"
+msgstr "備註"
+
+#. module: account_asset
+#: field:account.asset.depreciation.line,move_id:0
+msgid "Depreciation Entry"
+msgstr "折舊分錄"
+
+#. module: account_asset
+#: sql_constraint:account.move.line:0
+msgid "Wrong credit or debit value in accounting entry !"
+msgstr "會計分錄中包含錯誤的借貸數值！"
+
+#. module: account_asset
+#: view:asset.asset.report:0 field:asset.asset.report,nbr:0
+msgid "# of Depreciation Lines"
+msgstr "# 折舊明細"
+
+#. module: account_asset
+#: view:asset.asset.report:0
+msgid "Assets in draft state"
+msgstr "在草稿狀態的資產"
+
+#. module: account_asset
+#: field:account.asset.asset,method_end:0
+#: selection:account.asset.asset,method_time:0
+#: selection:account.asset.category,method_time:0
+#: selection:account.asset.history,method_time:0
+msgid "Ending Date"
+msgstr "結束日期"
+
+#. module: account_asset
+#: field:account.asset.asset,code:0
+msgid "Reference"
+msgstr "參考"
+
+#. module: account_asset
+#: constraint:account.invoice:0
+msgid "Invalid BBA Structured Communication !"
+msgstr "BBA傳輸結構有誤！"
+
+#. 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.depreciation.line,sequence:0
+msgid "Sequence of the depreciation"
+msgstr "序列的折舊"
+
+#. module: account_asset
+#: field:account.asset.asset,method_period:0
+#: field:account.asset.category,method_period:0
+#: field:account.asset.history,method_period:0
+#: field:asset.modify,method_period:0
+msgid "Period Length"
+msgstr "週期長度"
+
+#. module: account_asset
+#: selection:account.asset.asset,state:0 view:asset.asset.report:0
+#: selection:asset.asset.report,state:0
+msgid "Draft"
+msgstr "草稿"
+
+#. module: account_asset
+#: view:asset.asset.report:0
+msgid "Date of asset purchase"
+msgstr "資產購買日期"
+
+#. module: account_asset
+#: help:account.asset.asset,method_number:0
+msgid "Calculates Depreciation within specified interval"
+msgstr "在指定的時間間隔計算折舊"
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Change Duration"
+msgstr "更改時間"
+
+#. module: account_asset
+#: field:account.asset.category,account_analytic_id:0
+msgid "Analytic account"
+msgstr "分析科目"
+
+#. module: account_asset
+#: field:account.asset.asset,method:0 field:account.asset.category,method:0
+msgid "Computation Method"
+msgstr "計算方法"
+
+#. module: account_asset
+#: help:account.asset.asset,method_period:0
+msgid "State here the time during 2 depreciations, in months"
+msgstr "在這裡說明2個折舊期間的月份"
+
+#. 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
+#: 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 ""
+"使用的方法來計算折舊線的日期和數量。\n"
+"數量折舊。修正折舊明細的數量和時間之間折舊\n"
+"結束日期：選擇2折舊，折舊將無法超越的日期之間的時間。"
+
+#. module: account_asset
+#: field:account.asset.asset,purchase_value:0
+msgid "Gross value "
+msgstr "總值 "
+
+#. module: account_asset
+#: constraint:account.asset.asset:0
+msgid "Error ! You can not create recursive assets."
+msgstr "錯誤！你不能建立遞延資產。"
+
+#. module: account_asset
+#: help:account.asset.history,method_period:0
+msgid "Time in month between two depreciations"
+msgstr "兩個折舊方法中的月份"
+
+#. module: account_asset
+#: view:asset.asset.report:0 field:asset.asset.report,name:0
+msgid "Year"
+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
+#: view:account.asset.asset:0
+msgid "Other Information"
+msgstr "其他資訊"
+
+#. module: account_asset
+#: field:account.asset.asset,salvage_value:0
+msgid "Salvage Value"
+msgstr "殘值"
+
+#. module: account_asset
+#: field:account.invoice.line,asset_category_id:0 view:asset.asset.report:0
+msgid "Asset Category"
+msgstr "資產類別"
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Set to Close"
+msgstr "設置為關閉"
+
+#. module: account_asset
+#: model:ir.actions.wizard,name:account_asset.wizard_asset_compute
+msgid "Compute assets"
+msgstr "計算資產"
+
+#. module: account_asset
+#: model:ir.actions.wizard,name:account_asset.wizard_asset_modify
+msgid "Modify asset"
+msgstr "修改資產"
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Assets in closed state"
+msgstr "在封閉狀態的資產"
+
+#. module: account_asset
+#: field:account.asset.asset,parent_id:0
+msgid "Parent Asset"
+msgstr "母公司資產"
+
+#. module: account_asset
+#: view:account.asset.history:0
+#: model:ir.model,name:account_asset.model_account_asset_history
+msgid "Asset history"
+msgstr "資產曆史記錄"
+
+#. module: account_asset
+#: view:asset.asset.report:0
+msgid "Assets purchased in current year"
+msgstr "在本年度購買的資產"
+
+#. module: account_asset
+#: field:account.asset.asset,state:0 field:asset.asset.report,state:0
+msgid "State"
+msgstr "狀態"
+
+#. module: account_asset
+#: model:ir.model,name:account_asset.model_account_invoice_line
+msgid "Invoice Line"
+msgstr "發票明細"
+
+#. module: account_asset
+#: 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_asset
+#: view:asset.asset.report:0
+msgid "Month"
+msgstr "月"
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Depreciation Board"
+msgstr "折舊板"
+
+#. module: account_asset
+#: model:ir.model,name:account_asset.model_account_move_line
+msgid "Journal Items"
+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:account.asset.category:0
+msgid "Analytic Information"
+msgstr "輔助核算資訊"
+
+#. module: account_asset
+#: view:asset.modify:0
+msgid "Asset Durations to Modify"
+msgstr "待修改的資產年限"
+
+#. module: account_asset
+#: 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_asset
+#: field:account.asset.asset,note:0 field:account.asset.category,note:0
+#: field:account.asset.history,note:0
+msgid "Note"
+msgstr "備註"
+
+#. module: account_asset
+#: help:account.asset.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: Remaining Value * Degressive Factor"
+msgstr ""
+"選擇使用的方法來計算折舊明細的數量。\n"
+"  * 線性：計算基礎：總值/數量折舊\n"
+"  * 遞減的基礎上計算：剩餘價值遞減因素"
+
+#. 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 ""
+"選擇使用的方法來計算折舊方法的日期和數量。\n"
+"  * 折舊數量: 修正兩個折舊方法間的時間與數量\n"
+"  * 結束日期：選擇兩個折舊方法間無法超越的日期的時間。"
+
+#. module: account_asset
+#: view:asset.asset.report:0
+msgid "Assets in running state"
+msgstr "資產運行狀態"
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Closed"
+msgstr "關閉"
+
+#. module: account_asset
+#: field:account.asset.asset,partner_id:0
+#: field:asset.asset.report,partner_id:0
+msgid "Partner"
+msgstr "夥伴"
+
+#. module: account_asset
+#: view:asset.asset.report:0 field:asset.asset.report,depreciation_value:0
+msgid "Amount of Depreciation Lines"
+msgstr "折舊明細的金額"
+
+#. module: account_asset
+#: view:asset.asset.report:0
+msgid "Posted depreciation lines"
+msgstr "發表折舊明細"
+
+#. module: account_asset
+#: constraint:account.move.line:0
+msgid "Company must be the same for its related account and period."
+msgstr "科目和期間必須屬於同一個公司"
+
+#. module: account_asset
+#: field:account.asset.asset,child_ids:0
+msgid "Children Assets"
+msgstr "子資產"
+
+#. module: account_asset
+#: view:asset.asset.report:0
+msgid "Date of depreciation"
+msgstr "折舊日期"
+
+#. module: account_asset
+#: field:account.asset.history,user_id:0
+msgid "User"
+msgstr "使用者"
+
+#. module: account_asset
+#: field:account.asset.history,date:0
+msgid "Date"
+msgstr "日期"
+
+#. module: account_asset
+#: view:asset.asset.report:0
+msgid "Assets purchased in current month"
+msgstr "當月購買的資產"
+
+#. module: account_asset
+#: constraint:account.move.line:0
+msgid "You can not create journal items on an account of type view."
+msgstr "借貸項不能使用視圖類型的科目"
+
+#. module: account_asset
+#: view:asset.asset.report:0
+msgid "Extended Filters..."
+msgstr "延長篩選..."
+
+#. module: account_asset
+#: view:account.asset.asset:0 view:asset.depreciation.confirmation.wizard:0
+msgid "Compute"
+msgstr "計算"
+
+#. module: account_asset
+#: view:account.asset.category:0
+msgid "Search Asset Category"
+msgstr "搜索資產類別"
+
+#. module: account_asset
+#: model:ir.model,name:account_asset.model_asset_depreciation_confirmation_wizard
+msgid "asset.depreciation.confirmation.wizard"
+msgstr "asset.depreciation.confirmation.wizard"
+
+#. module: account_asset
+#: field:account.asset.asset,active:0
+msgid "Active"
+msgstr "活躍"
+
+#. module: account_asset
+#: model:ir.actions.wizard,name:account_asset.wizard_asset_close
+msgid "Close asset"
+msgstr "報廢資產"
+
+#. module: account_asset
+#: field:account.asset.depreciation.line,parent_state:0
+msgid "State of Asset"
+msgstr "資產狀態"
+
+#. module: account_asset
+#: field:account.asset.depreciation.line,name:0
+msgid "Depreciation Name"
+msgstr "折舊名稱"
+
+#. module: account_asset
+#: view:account.asset.asset:0 field:account.asset.asset,history_ids:0
+msgid "History"
+msgstr "歷史記錄"
+
+#. module: account_asset
+#: sql_constraint:account.invoice:0
+msgid "Invoice Number must be unique per Company!"
+msgstr "每家公司的發票號碼必須是唯一的!"
+
+#. module: account_asset
+#: field:asset.depreciation.confirmation.wizard,period_id:0
+msgid "Period"
+msgstr "期間"
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "General"
+msgstr "一般"
+
+#. module: account_asset
+#: field:account.asset.asset,prorata:0 field:account.asset.category,prorata:0
+msgid "Prorata Temporis"
+msgstr "按時間比例"
+
+#. module: account_asset
+#: view:account.asset.category:0
+msgid "Accounting Information"
+msgstr "會計資訊"
+
+#. module: account_asset
+#: model:ir.model,name:account_asset.model_account_invoice
+msgid "Invoice"
+msgstr "發票"
+
+#. module: account_asset
+#: model:ir.actions.act_window,name:account_asset.action_account_asset_asset_form_normal
+msgid "Review Asset Categories"
+msgstr "檢視資產類別"
+
+#. module: account_asset
+#: view:asset.depreciation.confirmation.wizard:0 view:asset.modify:0
+msgid "Cancel"
+msgstr "刪除"
+
+#. module: account_asset
+#: selection:account.asset.asset,state:0 selection:asset.asset.report,state:0
+msgid "Close"
+msgstr "關閉"
+
+#. module: account_asset
+#: view:account.asset.asset:0 view:account.asset.category:0
+msgid "Depreciation Method"
+msgstr "折舊方法"
+
+#. module: account_asset
+#: field:account.asset.asset,purchase_date:0 view:asset.asset.report:0
+#: field:asset.asset.report,purchase_date:0
+msgid "Purchase Date"
+msgstr "採購日期"
+
+#. module: account_asset
+#: selection:account.asset.asset,method:0
+#: selection:account.asset.category,method:0
+msgid "Degressive"
+msgstr "遞減"
+
+#. module: account_asset
+#: help:asset.depreciation.confirmation.wizard,period_id:0
+msgid ""
+"Choose the period for which you want to automatically post the depreciation "
+"lines of running assets"
+msgstr "選擇您要自動過帳使用固定資產折舊費用的期間"
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Current"
+msgstr "當前"
+
+#. module: account_asset
+#: field:account.asset.depreciation.line,remaining_value:0
+msgid "Amount to Depreciate"
+msgstr "折舊的金額"
+
+#. module: account_asset
+#: field:account.asset.category,open_asset:0
+msgid "Skip Draft State"
+msgstr "跳過草稿狀態"
+
+#. module: account_asset
+#: view:account.asset.asset:0 view:account.asset.category:0
+#: view:account.asset.history:0
+msgid "Depreciation Dates"
+msgstr "折舊日期"
+
+#. module: account_asset
+#: field:account.asset.asset,currency_id:0
+msgid "Currency"
+msgstr "貨幣"
+
+#. module: account_asset
+#: field:account.asset.category,journal_id:0
+msgid "Journal"
+msgstr "帳簿"
+
+#. module: account_asset
+#: field:account.asset.depreciation.line,depreciated_value:0
+msgid "Amount Already Depreciated"
+msgstr "已折舊金額"
+
+#. module: account_asset
+#: field:account.asset.depreciation.line,move_check:0
+#: view:asset.asset.report:0 field:asset.asset.report,move_check:0
+msgid "Posted"
+msgstr "過帳"
+
+#. module: account_asset
+#: help:account.asset.asset,state:0
+msgid ""
+"When an asset is created, the state is 'Draft'.\n"
+"If the asset is confirmed, the state 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 state."
+msgstr ""
+"當資產被建立時，狀態是'草稿'.\n"
+"如果該資產被確認，其狀態改為“運行中”，並過帳入會計折舊明細裏。\n"
+"如果折舊的最後一次已經過帳，該資產自動歸到該狀態，當折舊完畢時，你可以手動關閉資產​​。"
+
+#. module: account_asset
+#: field:account.asset.category,name:0
+msgid "Name"
+msgstr "名稱"
+
+#. module: account_asset
+#: help:account.asset.category,open_asset:0
+msgid ""
+"Check this if you want to automatically confirm the assets of this category "
+"when created by invoices."
+msgstr "當你在建立發票時，如果你想要自動確認固定資產類別，必須先檢查這個"
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Set to Draft"
+msgstr "設置為草稿"
+
+#. module: account_asset
+#: selection:account.asset.asset,method:0
+#: selection:account.asset.category,method:0
+msgid "Linear"
+msgstr "直線"
+
+#. module: account_asset
+#: view:asset.asset.report:0
+msgid "Month-1"
+msgstr "月-1"
+
+#. module: account_asset
+#: model:ir.model,name:account_asset.model_account_asset_depreciation_line
+msgid "Asset depreciation line"
+msgstr "資產折舊明細"
+
+#. module: account_asset
+#: field:account.asset.asset,category_id:0 view:account.asset.category:0
+#: field:asset.asset.report,asset_category_id:0
+#: model:ir.model,name:account_asset.model_account_asset_category
+msgid "Asset category"
+msgstr "資產類別"
+
+#. module: account_asset
+#: view:asset.asset.report:0
+msgid "Assets purchased in last month"
+msgstr "在上個月購買的資產"
+
+#. module: account_asset
+#: code:addons/account_asset/wizard/wizard_asset_compute.py:49
+#, python-format
+msgid "Created Asset Moves"
+msgstr "建立資產轉移"
+
+#. module: account_asset
+#: constraint:account.move.line:0
+msgid "You can not create journal items on closed account."
+msgstr "你不能在新建的帳簿項目上使用已關閉的帳戶"
+
+#. module: account_asset
+#: model:ir.actions.act_window,help:account_asset.action_asset_asset_report
+msgid ""
+"From this report, you can have an overview on all depreciation. The tool "
+"search can also be used to personalise your Assets reports and so, match "
+"this analysis to your needs;"
+msgstr "從這個報表，您可以總覽所有的資產折舊。搜尋工具可以符合您的分析需求，用來個人化您的資產報表;"
+
+#. module: account_asset
+#: help:account.asset.category,method_period:0
+msgid "State here the time between 2 depreciations, in months"
+msgstr "在這裏說明這幾個月內，兩個已提折舊之間的時間"
+
+#. module: account_asset
+#: field:account.asset.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:asset.depreciation.confirmation.wizard:0
+msgid "Post Depreciation Lines"
+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 "資產層級"
+
+#~ msgid "Analytic information"
+#~ msgstr "分析資訊"
+
+#~ msgid "Asset durations to modify"
+#~ msgstr "資產期間修改"
+
+#~ msgid "Accounting information"
+#~ msgstr "會計資訊"
diff --git a/addons/account_bank_statement_extensions/__openerp__.py b/addons/account_bank_statement_extensions/__openerp__.py
index a3765d33622..7571eef3e54 100644
--- a/addons/account_bank_statement_extensions/__openerp__.py
+++ b/addons/account_bank_statement_extensions/__openerp__.py
@@ -30,19 +30,20 @@ Module that extends the standard account_bank_statement_line object for improved
 ===================================================================================================
 
 This module adds:
+-----------------
     - valuta date
     - batch payments
     - traceability of changes to bank statement lines
     - bank statement line views
     - bank statements balances report
-    - performance improvements for digital import of bank statement (via 'ebanking_import' context flag)
-    - name_search on res.partner.bank enhanced to allow search on bank and iban account numbers
+    - performance improvements for digital import of bank statement (via 
+      'ebanking_import' context flag)
+    - name_search on res.partner.bank enhanced to allow search on bank 
+      and iban account numbers
     ''',
     'depends': ['account'],
-    'demo_xml': [],
-    'init_xml': [
-    ],
-    'update_xml' : [
+    'demo': [],
+    'data' : [
         'security/ir.model.access.csv',
         'account_bank_statement_view.xml',
         'account_bank_statement_report.xml',
diff --git a/addons/account_bank_statement_extensions/i18n/ar.po b/addons/account_bank_statement_extensions/i18n/ar.po
index b5f820bb0af..b80173a8878 100644
--- a/addons/account_bank_statement_extensions/i18n/ar.po
+++ b/addons/account_bank_statement_extensions/i18n/ar.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:43+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_bank_statement_extensions
 #: view:account.bank.statement.line:0
diff --git a/addons/account_bank_statement_extensions/i18n/de.po b/addons/account_bank_statement_extensions/i18n/de.po
index 708ae0a932e..2394c35cd95 100644
--- a/addons/account_bank_statement_extensions/i18n/de.po
+++ b/addons/account_bank_statement_extensions/i18n/de.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:43+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_bank_statement_extensions
 #: view:account.bank.statement.line:0
diff --git a/addons/account_bank_statement_extensions/i18n/es.po b/addons/account_bank_statement_extensions/i18n/es.po
index 19c05e3dc1c..eb2a0ebe186 100644
--- a/addons/account_bank_statement_extensions/i18n/es.po
+++ b/addons/account_bank_statement_extensions/i18n/es.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:43+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_bank_statement_extensions
 #: view:account.bank.statement.line:0
diff --git a/addons/account_bank_statement_extensions/i18n/es_CR.po b/addons/account_bank_statement_extensions/i18n/es_CR.po
index 2fc4c48ee6f..92950f78ced 100644
--- a/addons/account_bank_statement_extensions/i18n/es_CR.po
+++ b/addons/account_bank_statement_extensions/i18n/es_CR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:43+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_bank_statement_extensions
 #: view:account.bank.statement.line:0
diff --git a/addons/account_bank_statement_extensions/i18n/es_EC.po b/addons/account_bank_statement_extensions/i18n/es_EC.po
index 56a742bca4a..947c3d6af03 100644
--- a/addons/account_bank_statement_extensions/i18n/es_EC.po
+++ b/addons/account_bank_statement_extensions/i18n/es_EC.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:43+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_bank_statement_extensions
 #: view:account.bank.statement.line:0
diff --git a/addons/account_bank_statement_extensions/i18n/fi.po b/addons/account_bank_statement_extensions/i18n/fi.po
index 9874186c1e9..eac77d39629 100644
--- a/addons/account_bank_statement_extensions/i18n/fi.po
+++ b/addons/account_bank_statement_extensions/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:43+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_bank_statement_extensions
 #: view:account.bank.statement.line:0
diff --git a/addons/account_bank_statement_extensions/i18n/fr.po b/addons/account_bank_statement_extensions/i18n/fr.po
index 4ca607db81e..5e998273c6b 100644
--- a/addons/account_bank_statement_extensions/i18n/fr.po
+++ b/addons/account_bank_statement_extensions/i18n/fr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:43+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_bank_statement_extensions
 #: view:account.bank.statement.line:0
diff --git a/addons/account_bank_statement_extensions/i18n/gu.po b/addons/account_bank_statement_extensions/i18n/gu.po
index e2e1d0827da..940ae1db54c 100644
--- a/addons/account_bank_statement_extensions/i18n/gu.po
+++ b/addons/account_bank_statement_extensions/i18n/gu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:43+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_bank_statement_extensions
 #: view:account.bank.statement.line:0
diff --git a/addons/account_bank_statement_extensions/i18n/it.po b/addons/account_bank_statement_extensions/i18n/it.po
index d1df722e511..fc507a412bf 100644
--- a/addons/account_bank_statement_extensions/i18n/it.po
+++ b/addons/account_bank_statement_extensions/i18n/it.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:43+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_bank_statement_extensions
 #: view:account.bank.statement.line:0
diff --git a/addons/account_bank_statement_extensions/i18n/ja.po b/addons/account_bank_statement_extensions/i18n/ja.po
index cc44aaa19db..53d4001d062 100644
--- a/addons/account_bank_statement_extensions/i18n/ja.po
+++ b/addons/account_bank_statement_extensions/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:43+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_bank_statement_extensions
 #: view:account.bank.statement.line:0
diff --git a/addons/account_bank_statement_extensions/i18n/mn.po b/addons/account_bank_statement_extensions/i18n/mn.po
index c120bd90901..a63c9359d77 100644
--- a/addons/account_bank_statement_extensions/i18n/mn.po
+++ b/addons/account_bank_statement_extensions/i18n/mn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:43+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_bank_statement_extensions
 #: view:account.bank.statement.line:0
diff --git a/addons/account_bank_statement_extensions/i18n/nb.po b/addons/account_bank_statement_extensions/i18n/nb.po
new file mode 100644
index 00000000000..a8ab466cee3
--- /dev/null
+++ b/addons/account_bank_statement_extensions/i18n/nb.po
@@ -0,0 +1,382 @@
+# Norwegian Bokmal 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-02-08 00:35+0000\n"
+"PO-Revision-Date: 2012-08-28 12:44+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Norwegian Bokmal <nb@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-08-29 05:05+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Search Bank Transactions"
+msgstr "Søk Bank Transaksjon"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+#: selection:account.bank.statement.line,state:0
+msgid "Confirmed"
+msgstr "Bekreftet"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement:0
+#: view:account.bank.statement.line:0
+msgid "Glob. Id"
+msgstr "Glob. Id"
+
+#. module: account_bank_statement_extensions
+#: selection:account.bank.statement.line.global,type:0
+msgid "CODA"
+msgstr "CODA"
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line.global,parent_id:0
+msgid "Parent Code"
+msgstr "overordnede kode"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Debit"
+msgstr "Debet"
+
+#. 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 "Avbryt valgte setning linjer"
+
+#. module: account_bank_statement_extensions
+#: constraint:res.partner.bank:0
+msgid "The RIB and/or IBAN is not valid"
+msgstr "RIB og / eller IBAN er ikke gyldig"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Group By..."
+msgstr "Grupper etter ..."
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line,state:0
+msgid "State"
+msgstr "Stat"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+#: selection:account.bank.statement.line,state:0
+msgid "Draft"
+msgstr "Kladd"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Statement"
+msgstr "Uttalelse"
+
+#. 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 "Bekreft utvalgte uttalelse linjer"
+
+#. module: account_bank_statement_extensions
+#: report:bank.statement.balance.report:0
+#: model:ir.actions.report.xml,name:account_bank_statement_extensions.bank_statement_balance_report
+msgid "Bank Statement Balances Report"
+msgstr "Bank erklæring Balanserer Rapporter"
+
+#. module: account_bank_statement_extensions
+#: view:cancel.statement.line:0
+msgid "Cancel Lines"
+msgstr "Avbryt linjer"
+
+#. 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 "Satsvis Betalingsinformasjon"
+
+#. module: account_bank_statement_extensions
+#: view:confirm.statement.line:0
+msgid "Confirm Lines"
+msgstr "Bekreft linjer."
+
+#. module: account_bank_statement_extensions
+#: code:addons/account_bank_statement_extensions/account_bank_statement.py:130
+#, python-format
+msgid ""
+"Delete operation not allowed !             Please go to the associated bank "
+"statement in order to delete and/or modify this bank statement line"
+msgstr ""
+"Slett operasjonen ikke tillatt! Vennligst gå til den tilknyttede "
+"kontoutskrift for å slette og / eller endre denne kontoutskrift linjen."
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line.global,type:0
+msgid "Type"
+msgstr "Type"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+#: field:account.bank.statement.line,journal_id:0
+#: report:bank.statement.balance.report:0
+msgid "Journal"
+msgstr "Journal"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Confirmed Statement Lines."
+msgstr "Bekreftet erklæring linjer."
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Credit Transactions."
+msgstr "Kreditt transaksjoner."
+
+#. 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 "Avbryte utvalgte uttalelse linjer."
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line,counterparty_number:0
+msgid "Counterparty Number"
+msgstr "Motpart nummer"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line.global:0
+msgid "Transactions"
+msgstr "Transaksjoner"
+
+#. module: account_bank_statement_extensions
+#: code:addons/account_bank_statement_extensions/account_bank_statement.py:130
+#, python-format
+msgid "Warning"
+msgstr "Advarsel"
+
+#. module: account_bank_statement_extensions
+#: report:bank.statement.balance.report:0
+msgid "Closing Balance"
+msgstr "Sluttsaldo"
+
+#. module: account_bank_statement_extensions
+#: report:bank.statement.balance.report:0
+msgid "Date"
+msgstr "Dato"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+#: field:account.bank.statement.line,globalisation_amount:0
+msgid "Glob. Amount"
+msgstr "glob Beløp"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Debit Transactions."
+msgstr "Debet transaksjoner."
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Extended Filters..."
+msgstr "Utvidet Filtere ..."
+
+#. module: account_bank_statement_extensions
+#: view:confirm.statement.line:0
+msgid "Confirmed lines cannot be changed anymore."
+msgstr "Bekreftet samband kan ikke lenger endres."
+
+#. module: account_bank_statement_extensions
+#: constraint:res.partner.bank:0
+msgid ""
+"\n"
+"Please define BIC/Swift code on bank for bank type IBAN Account to make "
+"valid payments"
+msgstr ""
+"\n"
+"Vennligst definere BIC / Swift-kode på bank for bank typen IBAN-konto for å "
+"fatte gyldige betalinger"
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line,val_date:0
+msgid "Valuta Date"
+msgstr "Valuta dato"
+
+#. module: account_bank_statement_extensions
+#: model:ir.actions.act_window,help:account_bank_statement_extensions.action_confirm_statement_line
+msgid "Confirm selected statement lines."
+msgstr "Bekreft utvalgte uttalelse linjer"
+
+#. module: account_bank_statement_extensions
+#: view:cancel.statement.line:0
+msgid "Are you sure you want to cancel the selected Bank Statement lines ?"
+msgstr "Er du sikker på at du vil avbryte de valgte kontoutskrift linjer?"
+
+#. module: account_bank_statement_extensions
+#: report:bank.statement.balance.report:0
+msgid "Name"
+msgstr "Navn"
+
+#. 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 "Notater"
+
+#. module: account_bank_statement_extensions
+#: selection:account.bank.statement.line.global,type:0
+msgid "Manual"
+msgstr "Manuell"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Credit"
+msgstr "Kredit"
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line.global,amount:0
+msgid "Amount"
+msgstr "Beløp"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Fin.Account"
+msgstr "Fin.Konto"
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line,counterparty_currency:0
+msgid "Counterparty Currency"
+msgstr "Motpart Valuta"
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line,counterparty_bic:0
+msgid "Counterparty BIC"
+msgstr "Motpart BIC"
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line.global,child_ids:0
+msgid "Child Codes"
+msgstr "Underordnet kode"
+
+#. module: account_bank_statement_extensions
+#: view:confirm.statement.line:0
+msgid "Are you sure you want to confirm the selected Bank Statement lines ?"
+msgstr "Er du sikker på at du vil bekrefte de valgte kontoutskrift linjer?"
+
+#. module: account_bank_statement_extensions
+#: constraint:account.bank.statement.line:0
+msgid ""
+"The amount of the voucher must be the same amount as the one on the "
+"statement line"
+msgstr ""
+"Mengden av bilaget må være det samme beløp som den på setningen linje"
+
+#. 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 ""
+"Kode for å identifisere transaksjoner tilhører samme globalisering nivå "
+"innenfor en batch betaling"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Draft Statement Lines."
+msgstr "Utkast linjer."
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Glob. Am."
+msgstr "Glob.Am."
+
+#. module: account_bank_statement_extensions
+#: model:ir.model,name:account_bank_statement_extensions.model_account_bank_statement_line
+msgid "Bank Statement Line"
+msgstr "Kontoutskriftlinje"
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line.global,code:0
+msgid "Code"
+msgstr "Kode"
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line,counterparty_name:0
+msgid "Counterparty Name"
+msgstr "Motpartens navn"
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line.global,name:0
+msgid "Communication"
+msgstr "Kommunikasjon"
+
+#. module: account_bank_statement_extensions
+#: model:ir.model,name:account_bank_statement_extensions.model_res_partner_bank
+msgid "Bank Accounts"
+msgstr "Bankkontoer"
+
+#. module: account_bank_statement_extensions
+#: constraint:account.bank.statement:0
+msgid "The journal and period chosen have to belong to the same company."
+msgstr "Tidsskriftet og perioden valgt å tilhøre samme selskap."
+
+#. module: account_bank_statement_extensions
+#: model:ir.model,name:account_bank_statement_extensions.model_account_bank_statement
+msgid "Bank Statement"
+msgstr "Kontoutskrift"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Statement Line"
+msgstr "erklæring Linje"
+
+#. module: account_bank_statement_extensions
+#: sql_constraint:account.bank.statement.line.global:0
+msgid "The code must be unique !"
+msgstr "Koden må være unik!"
+
+#. 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 "Kontoutskrift linjer."
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line.global:0
+msgid "Child Batch Payments"
+msgstr "Underholdene Batch Betalinger."
+
+#. module: account_bank_statement_extensions
+#: view:cancel.statement.line:0
+#: view:confirm.statement.line:0
+msgid "Cancel"
+msgstr "Avbryt"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Statement Lines"
+msgstr "Erklæring linjer"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Total Amount"
+msgstr "Totalt beløp"
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line,globalisation_id:0
+msgid "Globalisation ID"
+msgstr "Globalisering ID"
diff --git a/addons/account_bank_statement_extensions/i18n/nl.po b/addons/account_bank_statement_extensions/i18n/nl.po
index 98ddcaf1384..5de40b3a4fc 100644
--- a/addons/account_bank_statement_extensions/i18n/nl.po
+++ b/addons/account_bank_statement_extensions/i18n/nl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:43+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_bank_statement_extensions
 #: view:account.bank.statement.line:0
diff --git a/addons/account_bank_statement_extensions/i18n/pl.po b/addons/account_bank_statement_extensions/i18n/pl.po
index d8099b40e2d..b948b24bdc9 100644
--- a/addons/account_bank_statement_extensions/i18n/pl.po
+++ b/addons/account_bank_statement_extensions/i18n/pl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:43+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_bank_statement_extensions
 #: view:account.bank.statement.line:0
diff --git a/addons/account_bank_statement_extensions/i18n/pt.po b/addons/account_bank_statement_extensions/i18n/pt.po
index 7125c58ac79..e037fa7f109 100644
--- a/addons/account_bank_statement_extensions/i18n/pt.po
+++ b/addons/account_bank_statement_extensions/i18n/pt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:43+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_bank_statement_extensions
 #: view:account.bank.statement.line:0
diff --git a/addons/account_bank_statement_extensions/i18n/ro.po b/addons/account_bank_statement_extensions/i18n/ro.po
index 2562c1e3531..1720ade16d2 100644
--- a/addons/account_bank_statement_extensions/i18n/ro.po
+++ b/addons/account_bank_statement_extensions/i18n/ro.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:43+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_bank_statement_extensions
 #: view:account.bank.statement.line:0
diff --git a/addons/account_bank_statement_extensions/i18n/sr@latin.po b/addons/account_bank_statement_extensions/i18n/sr@latin.po
index 6218b46876b..603d0816133 100644
--- a/addons/account_bank_statement_extensions/i18n/sr@latin.po
+++ b/addons/account_bank_statement_extensions/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:43+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_bank_statement_extensions
 #: view:account.bank.statement.line:0
diff --git a/addons/account_bank_statement_extensions/i18n/sv.po b/addons/account_bank_statement_extensions/i18n/sv.po
index dabc9a40c41..82e8b21123c 100644
--- a/addons/account_bank_statement_extensions/i18n/sv.po
+++ b/addons/account_bank_statement_extensions/i18n/sv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:43+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_bank_statement_extensions
 #: view:account.bank.statement.line:0
diff --git a/addons/account_bank_statement_extensions/i18n/tr.po b/addons/account_bank_statement_extensions/i18n/tr.po
index b49b2b49ab1..413d0d934a9 100644
--- a/addons/account_bank_statement_extensions/i18n/tr.po
+++ b/addons/account_bank_statement_extensions/i18n/tr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:43+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_bank_statement_extensions
 #: view:account.bank.statement.line:0
diff --git a/addons/account_bank_statement_extensions/i18n/zh_CN.po b/addons/account_bank_statement_extensions/i18n/zh_CN.po
index cb519388417..13784387d54 100644
--- a/addons/account_bank_statement_extensions/i18n/zh_CN.po
+++ b/addons/account_bank_statement_extensions/i18n/zh_CN.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:43+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_bank_statement_extensions
 #: view:account.bank.statement.line:0
diff --git a/addons/account_bank_statement_extensions/i18n/zh_TW.po b/addons/account_bank_statement_extensions/i18n/zh_TW.po
new file mode 100644
index 00000000000..466d8eef473
--- /dev/null
+++ b/addons/account_bank_statement_extensions/i18n/zh_TW.po
@@ -0,0 +1,376 @@
+# Chinese (Traditional) 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-02-08 00:35+0000\n"
+"PO-Revision-Date: 2012-08-22 02:20+0000\n"
+"Last-Translator: Eric Huang <eh@cenoq.com>\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: 2012-08-28 06:43+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Search Bank Transactions"
+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 "全球ID"
+
+#. module: account_bank_statement_extensions
+#: selection:account.bank.statement.line.global,type:0
+msgid "CODA"
+msgstr "CODA"
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line.global,parent_id:0
+msgid "Parent Code"
+msgstr "上層代碼"
+
+#. 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
+#: constraint:res.partner.bank:0
+msgid "The RIB and/or IBAN is not valid"
+msgstr "RIB/IBAN 無效"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Group By..."
+msgstr "分類方式..."
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line,state:0
+msgid "State"
+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
+#: view:confirm.statement.line:0
+msgid "Confirm Lines"
+msgstr "確認明細"
+
+#. module: account_bank_statement_extensions
+#: code:addons/account_bank_statement_extensions/account_bank_statement.py:130
+#, python-format
+msgid ""
+"Delete operation not allowed !             Please go to the associated bank "
+"statement in order to delete and/or modify this bank statement line"
+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
+#: field:account.bank.statement.line,journal_id: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
+#: view:account.bank.statement.line.global:0
+msgid "Transactions"
+msgstr "交易"
+
+#. module: account_bank_statement_extensions
+#: code:addons/account_bank_statement_extensions/account_bank_statement.py:130
+#, python-format
+msgid "Warning"
+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
+#: constraint:res.partner.bank:0
+msgid ""
+"\n"
+"Please define BIC/Swift code on bank for bank type IBAN Account to make "
+"valid payments"
+msgstr ""
+"\n"
+"請為 IBAN類型的銀行指定 BIC/Swift代碼，以便自動付款。"
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line,val_date:0
+msgid "Valuta Date"
+msgstr "幣值日期"
+
+#. module: account_bank_statement_extensions
+#: model:ir.actions.act_window,help:account_bank_statement_extensions.action_confirm_statement_line
+msgid "Confirm selected statement lines."
+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
+#: 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 "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 "Fin.Account"
+
+#. 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 "交易對方 BIC"
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line.global,child_ids:0
+msgid "Child Codes"
+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
+#: constraint:account.bank.statement.line:0
+msgid ""
+"The amount of the voucher must be the same amount as the one on the "
+"statement line"
+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 "Glob. Am."
+
+#. 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
+#: field:account.bank.statement.line.global,name:0
+msgid "Communication"
+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
+#: constraint:account.bank.statement:0
+msgid "The journal and period chosen have to belong to the same company."
+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
+#: view:account.bank.statement.line.global:0
+msgid "Child Batch Payments"
+msgstr "下級批次付款"
+
+#. module: account_bank_statement_extensions
+#: view:cancel.statement.line:0
+#: 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 "全球化 ID"
diff --git a/addons/account_budget/__openerp__.py b/addons/account_budget/__openerp__.py
index e03c66c2132..928e87f1202 100644
--- a/addons/account_budget/__openerp__.py
+++ b/addons/account_budget/__openerp__.py
@@ -32,23 +32,26 @@ Once the Budgets are defined (in Invoicing/Budgets/Budgets), the Project Manager
 can set the planned amount on each Analytic Account.
 
 The accountant has the possibility to see the total of amount planned for each
-Budget in order to ensure the total planned is not greater/lower than what he planned
-for this Budget. Each list of record can also be switched to a graphical view of it.
+Budget in order to ensure the total planned is not greater/lower than what he 
+planned for this Budget. Each list of record can also be switched to a graphical 
+view of it.
 
 Three reports are available:
+----------------------------
+    1. The first is available from a list of Budgets. It gives the spreading, for 
+       these Budgets, of the Analytic Accounts.
 
-    1. The first is available from a list of Budgets. It gives the spreading, for these Budgets, of the Analytic Accounts.
+    2. The second is a summary of the previous one, it only gives the spreading, 
+       for the selected Budgets, of the Analytic Accounts.
 
-    2. The second is a summary of the previous one, it only gives the spreading, for the selected Budgets, of the Analytic Accounts.
-
-    3. The last one is available from the Analytic Chart of Accounts. It gives the spreading, for the selected Analytic Accounts of Budgets.
+    3. The last one is available from the Analytic Chart of Accounts. It gives 
+       the spreading, for the selected Analytic Accounts of Budgets.
 """,
     'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
     'images': ['images/budget.jpeg','images/budgetary_position.jpeg'],
     'depends': ['account'],
-    'init_xml': [],
-    'update_xml': [
+    'data': [
         'security/ir.model.access.csv',
         'security/account_budget_security.xml',
         'account_budget_view.xml',
@@ -59,11 +62,11 @@ Three reports are available:
         'wizard/account_budget_crossovered_summary_report_view.xml',
         'wizard/account_budget_crossovered_report_view.xml',
     ],
-    'demo_xml': ['account_budget_demo.xml'],
+    'demo': ['account_budget_demo.xml'],
     'test':[
-            'test/account_budget.yml',
-            'test/account_budget_report.yml',
-            ],
+        'test/account_budget.yml',
+        'test/account_budget_report.yml',
+    ],
     'installable': True,
     'auto_install': False,
     'certificate': '0043819694157',
diff --git a/addons/account_budget/i18n/ar.po b/addons/account_budget/i18n/ar.po
index 7d1f78a5233..070caad9a61 100644
--- a/addons/account_budget/i18n/ar.po
+++ b/addons/account_budget/i18n/ar.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_budget
 #: field:crossovered.budget,creating_user_id:0
diff --git a/addons/account_budget/i18n/bg.po b/addons/account_budget/i18n/bg.po
index bce91c3e4bd..31cfbb05b88 100644
--- a/addons/account_budget/i18n/bg.po
+++ b/addons/account_budget/i18n/bg.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_budget
 #: field:crossovered.budget,creating_user_id:0
diff --git a/addons/account_budget/i18n/bs.po b/addons/account_budget/i18n/bs.po
index 6d96d1e8f02..919b17fe3cb 100644
--- a/addons/account_budget/i18n/bs.po
+++ b/addons/account_budget/i18n/bs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_budget
 #: field:crossovered.budget,creating_user_id:0
diff --git a/addons/account_budget/i18n/ca.po b/addons/account_budget/i18n/ca.po
index 1c65cf8ae38..d010ceec329 100644
--- a/addons/account_budget/i18n/ca.po
+++ b/addons/account_budget/i18n/ca.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_budget
 #: field:crossovered.budget,creating_user_id:0
diff --git a/addons/account_budget/i18n/cs.po b/addons/account_budget/i18n/cs.po
index b8b009210e2..fd780b4eb4f 100644
--- a/addons/account_budget/i18n/cs.po
+++ b/addons/account_budget/i18n/cs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_budget
 #: field:crossovered.budget,creating_user_id:0
diff --git a/addons/account_budget/i18n/da.po b/addons/account_budget/i18n/da.po
index ada307c7b39..b7dbe996f5d 100644
--- a/addons/account_budget/i18n/da.po
+++ b/addons/account_budget/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_budget
 #: field:crossovered.budget,creating_user_id:0
diff --git a/addons/account_budget/i18n/de.po b/addons/account_budget/i18n/de.po
index 19a03edd6a9..5b0ce47b933 100644
--- a/addons/account_budget/i18n/de.po
+++ b/addons/account_budget/i18n/de.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_budget
 #: field:crossovered.budget,creating_user_id:0
diff --git a/addons/account_budget/i18n/el.po b/addons/account_budget/i18n/el.po
index b68d0cd9c7b..22c70408d4c 100644
--- a/addons/account_budget/i18n/el.po
+++ b/addons/account_budget/i18n/el.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_budget
 #: field:crossovered.budget,creating_user_id:0
diff --git a/addons/account_budget/i18n/en_GB.po b/addons/account_budget/i18n/en_GB.po
index e927af2641f..efa78b52e82 100644
--- a/addons/account_budget/i18n/en_GB.po
+++ b/addons/account_budget/i18n/en_GB.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_budget
 #: field:crossovered.budget,creating_user_id:0
diff --git a/addons/account_budget/i18n/es.po b/addons/account_budget/i18n/es.po
index f0e2c52498b..7a1c650c8b6 100644
--- a/addons/account_budget/i18n/es.po
+++ b/addons/account_budget/i18n/es.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_budget
 #: field:crossovered.budget,creating_user_id:0
diff --git a/addons/account_budget/i18n/es_AR.po b/addons/account_budget/i18n/es_AR.po
index 00ffd590e27..c0fce8323c5 100644
--- a/addons/account_budget/i18n/es_AR.po
+++ b/addons/account_budget/i18n/es_AR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_budget
 #: field:crossovered.budget,creating_user_id:0
diff --git a/addons/account_budget/i18n/es_CR.po b/addons/account_budget/i18n/es_CR.po
index 6838f94b8a2..c0c664e01a7 100644
--- a/addons/account_budget/i18n/es_CR.po
+++ b/addons/account_budget/i18n/es_CR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:23+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 "Language: \n"
 
 #. module: account_budget
diff --git a/addons/account_budget/i18n/es_EC.po b/addons/account_budget/i18n/es_EC.po
index ae3d9e74cfd..6beb29a44d6 100644
--- a/addons/account_budget/i18n/es_EC.po
+++ b/addons/account_budget/i18n/es_EC.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:23+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_budget
 #: field:crossovered.budget,creating_user_id:0
diff --git a/addons/account_budget/i18n/es_PY.po b/addons/account_budget/i18n/es_PY.po
index 68cd637fce9..d7aaba18939 100644
--- a/addons/account_budget/i18n/es_PY.po
+++ b/addons/account_budget/i18n/es_PY.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:23+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_budget
 #: field:crossovered.budget,creating_user_id:0
diff --git a/addons/account_budget/i18n/et.po b/addons/account_budget/i18n/et.po
index a3a1b81f150..1a5c4d8f12e 100644
--- a/addons/account_budget/i18n/et.po
+++ b/addons/account_budget/i18n/et.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_budget
 #: field:crossovered.budget,creating_user_id:0
diff --git a/addons/account_budget/i18n/fa.po b/addons/account_budget/i18n/fa.po
index 0985fd3efe5..fb2ef240e2a 100644
--- a/addons/account_budget/i18n/fa.po
+++ b/addons/account_budget/i18n/fa.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_budget
 #: field:crossovered.budget,creating_user_id:0
diff --git a/addons/account_budget/i18n/fi.po b/addons/account_budget/i18n/fi.po
index 4ca1190e2da..39dff83fb9a 100644
--- a/addons/account_budget/i18n/fi.po
+++ b/addons/account_budget/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_budget
 #: view:account.budget.post:0
diff --git a/addons/account_budget/i18n/fr.po b/addons/account_budget/i18n/fr.po
index 08dd6eaf6e1..eabf0c47607 100644
--- a/addons/account_budget/i18n/fr.po
+++ b/addons/account_budget/i18n/fr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_budget
 #: field:crossovered.budget,creating_user_id:0
diff --git a/addons/account_budget/i18n/gl.po b/addons/account_budget/i18n/gl.po
index 16270e6a307..f8b85d8008d 100644
--- a/addons/account_budget/i18n/gl.po
+++ b/addons/account_budget/i18n/gl.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_budget
 #: field:crossovered.budget,creating_user_id:0
diff --git a/addons/account_budget/i18n/gu.po b/addons/account_budget/i18n/gu.po
index ed80865e3ea..83ff28313bf 100644
--- a/addons/account_budget/i18n/gu.po
+++ b/addons/account_budget/i18n/gu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_budget
 #: field:crossovered.budget,creating_user_id:0
diff --git a/addons/account_budget/i18n/he.po b/addons/account_budget/i18n/he.po
index 58e75184fd7..79985229c7f 100644
--- a/addons/account_budget/i18n/he.po
+++ b/addons/account_budget/i18n/he.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_budget
 #: field:crossovered.budget,creating_user_id:0
diff --git a/addons/account_budget/i18n/hi.po b/addons/account_budget/i18n/hi.po
index f1c3473eaa2..7f75f68432f 100644
--- a/addons/account_budget/i18n/hi.po
+++ b/addons/account_budget/i18n/hi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_budget
 #: field:crossovered.budget,creating_user_id:0
diff --git a/addons/account_budget/i18n/hr.po b/addons/account_budget/i18n/hr.po
index 722ca409217..2d034b97a4e 100644
--- a/addons/account_budget/i18n/hr.po
+++ b/addons/account_budget/i18n/hr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_budget
 #: field:crossovered.budget,creating_user_id:0
diff --git a/addons/account_budget/i18n/hu.po b/addons/account_budget/i18n/hu.po
index e8da9e6e80b..c48392c7c8a 100644
--- a/addons/account_budget/i18n/hu.po
+++ b/addons/account_budget/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_budget
 #: field:crossovered.budget,creating_user_id:0
diff --git a/addons/account_budget/i18n/id.po b/addons/account_budget/i18n/id.po
index d305feced1a..6652e3cb988 100644
--- a/addons/account_budget/i18n/id.po
+++ b/addons/account_budget/i18n/id.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_budget
 #: field:crossovered.budget,creating_user_id:0
diff --git a/addons/account_budget/i18n/it.po b/addons/account_budget/i18n/it.po
index 6b1a8109371..25b998a0d65 100644
--- a/addons/account_budget/i18n/it.po
+++ b/addons/account_budget/i18n/it.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_budget
 #: field:crossovered.budget,creating_user_id:0
diff --git a/addons/account_budget/i18n/ja.po b/addons/account_budget/i18n/ja.po
index 8566153ce98..cfd4f1e4e5d 100644
--- a/addons/account_budget/i18n/ja.po
+++ b/addons/account_budget/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_budget
 #: field:crossovered.budget,creating_user_id:0
diff --git a/addons/account_budget/i18n/ko.po b/addons/account_budget/i18n/ko.po
index 2df1f164632..4021d2a7bac 100644
--- a/addons/account_budget/i18n/ko.po
+++ b/addons/account_budget/i18n/ko.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_budget
 #: field:crossovered.budget,creating_user_id:0
diff --git a/addons/account_budget/i18n/lo.po b/addons/account_budget/i18n/lo.po
index 620bb714962..daa39b8a6e6 100644
--- a/addons/account_budget/i18n/lo.po
+++ b/addons/account_budget/i18n/lo.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_budget
 #: field:crossovered.budget,creating_user_id:0
diff --git a/addons/account_budget/i18n/lt.po b/addons/account_budget/i18n/lt.po
index 89af4fa4fef..2dd7b63a495 100644
--- a/addons/account_budget/i18n/lt.po
+++ b/addons/account_budget/i18n/lt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_budget
 #: field:crossovered.budget,creating_user_id:0
diff --git a/addons/account_budget/i18n/lv.po b/addons/account_budget/i18n/lv.po
index 6efe0bc9d85..4551de948ee 100644
--- a/addons/account_budget/i18n/lv.po
+++ b/addons/account_budget/i18n/lv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_budget
 #: field:crossovered.budget,creating_user_id:0
diff --git a/addons/account_budget/i18n/mn.po b/addons/account_budget/i18n/mn.po
index 4b76fbe062b..a99bb6f5803 100644
--- a/addons/account_budget/i18n/mn.po
+++ b/addons/account_budget/i18n/mn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_budget
 #: field:crossovered.budget,creating_user_id:0
diff --git a/addons/account_budget/i18n/nb.po b/addons/account_budget/i18n/nb.po
index e3fff9e6d91..d7d2ca27152 100644
--- a/addons/account_budget/i18n/nb.po
+++ b/addons/account_budget/i18n/nb.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_budget
 #: field:crossovered.budget,creating_user_id:0
diff --git a/addons/account_budget/i18n/nl.po b/addons/account_budget/i18n/nl.po
index 798d32be1d9..fde6808499b 100644
--- a/addons/account_budget/i18n/nl.po
+++ b/addons/account_budget/i18n/nl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_budget
 #: field:crossovered.budget,creating_user_id:0
diff --git a/addons/account_budget/i18n/nl_BE.po b/addons/account_budget/i18n/nl_BE.po
index de8d867f2c8..ac1d30d0dbb 100644
--- a/addons/account_budget/i18n/nl_BE.po
+++ b/addons/account_budget/i18n/nl_BE.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_budget
 #: field:crossovered.budget,creating_user_id:0
diff --git a/addons/account_budget/i18n/oc.po b/addons/account_budget/i18n/oc.po
index 8cf503c4e81..aa9fb073110 100644
--- a/addons/account_budget/i18n/oc.po
+++ b/addons/account_budget/i18n/oc.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_budget
 #: field:crossovered.budget,creating_user_id:0
diff --git a/addons/account_budget/i18n/pl.po b/addons/account_budget/i18n/pl.po
index 9fdc8fe1040..ace711e9d15 100644
--- a/addons/account_budget/i18n/pl.po
+++ b/addons/account_budget/i18n/pl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_budget
 #: field:crossovered.budget,creating_user_id:0
diff --git a/addons/account_budget/i18n/pt.po b/addons/account_budget/i18n/pt.po
index 32648e3c01a..84da9564415 100644
--- a/addons/account_budget/i18n/pt.po
+++ b/addons/account_budget/i18n/pt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_budget
 #: field:crossovered.budget,creating_user_id:0
diff --git a/addons/account_budget/i18n/pt_BR.po b/addons/account_budget/i18n/pt_BR.po
index 4b78fd586eb..15eedc72f0c 100644
--- a/addons/account_budget/i18n/pt_BR.po
+++ b/addons/account_budget/i18n/pt_BR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_budget
 #: field:crossovered.budget,creating_user_id:0
diff --git a/addons/account_budget/i18n/ro.po b/addons/account_budget/i18n/ro.po
index a2c04140666..8b95cb02907 100644
--- a/addons/account_budget/i18n/ro.po
+++ b/addons/account_budget/i18n/ro.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_budget
 #: field:crossovered.budget,creating_user_id:0
diff --git a/addons/account_budget/i18n/ru.po b/addons/account_budget/i18n/ru.po
index 33e71223201..129aa5c4480 100644
--- a/addons/account_budget/i18n/ru.po
+++ b/addons/account_budget/i18n/ru.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_budget
 #: field:crossovered.budget,creating_user_id:0
diff --git a/addons/account_budget/i18n/sl.po b/addons/account_budget/i18n/sl.po
index 4215930aac6..3d8262c39bc 100644
--- a/addons/account_budget/i18n/sl.po
+++ b/addons/account_budget/i18n/sl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_budget
 #: field:crossovered.budget,creating_user_id:0
diff --git a/addons/account_budget/i18n/sq.po b/addons/account_budget/i18n/sq.po
index 69de997a85c..7c5f7fedd2d 100644
--- a/addons/account_budget/i18n/sq.po
+++ b/addons/account_budget/i18n/sq.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_budget
 #: field:crossovered.budget,creating_user_id:0
diff --git a/addons/account_budget/i18n/sr.po b/addons/account_budget/i18n/sr.po
index ec6710033d0..6b5fee7995b 100644
--- a/addons/account_budget/i18n/sr.po
+++ b/addons/account_budget/i18n/sr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_budget
 #: field:crossovered.budget,creating_user_id:0
diff --git a/addons/account_budget/i18n/sr@latin.po b/addons/account_budget/i18n/sr@latin.po
index a00e25952be..0d9c68201a6 100644
--- a/addons/account_budget/i18n/sr@latin.po
+++ b/addons/account_budget/i18n/sr@latin.po
@@ -9,13 +9,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:35+0000\n"
 "PO-Revision-Date: 2012-04-17 05:29+0000\n"
-"Last-Translator: Maroje Delibasic <Unknown>\n"
+"Last-Translator: MD <Unknown>\n"
 "Language-Team: Serbian latin <sr@latin@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:23+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:28+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_budget
 #: field:crossovered.budget,creating_user_id:0
diff --git a/addons/account_budget/i18n/sv.po b/addons/account_budget/i18n/sv.po
index dbffb445368..fbad1952709 100644
--- a/addons/account_budget/i18n/sv.po
+++ b/addons/account_budget/i18n/sv.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_budget
 #: field:crossovered.budget,creating_user_id:0
diff --git a/addons/account_budget/i18n/tlh.po b/addons/account_budget/i18n/tlh.po
index b766b767335..d6e4bd8aa96 100644
--- a/addons/account_budget/i18n/tlh.po
+++ b/addons/account_budget/i18n/tlh.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_budget
 #: field:crossovered.budget,creating_user_id:0
diff --git a/addons/account_budget/i18n/tr.po b/addons/account_budget/i18n/tr.po
index 23b3ffff6d5..1944925c371 100644
--- a/addons/account_budget/i18n/tr.po
+++ b/addons/account_budget/i18n/tr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_budget
 #: field:crossovered.budget,creating_user_id:0
diff --git a/addons/account_budget/i18n/uk.po b/addons/account_budget/i18n/uk.po
index d5018a2f05e..d328d88a7e4 100644
--- a/addons/account_budget/i18n/uk.po
+++ b/addons/account_budget/i18n/uk.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_budget
 #: field:crossovered.budget,creating_user_id:0
diff --git a/addons/account_budget/i18n/vi.po b/addons/account_budget/i18n/vi.po
index fa381a172ef..3eeb7ff8aaf 100644
--- a/addons/account_budget/i18n/vi.po
+++ b/addons/account_budget/i18n/vi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_budget
 #: field:crossovered.budget,creating_user_id:0
diff --git a/addons/account_budget/i18n/zh_CN.po b/addons/account_budget/i18n/zh_CN.po
index d3d13c788f2..b32d81c5f8f 100644
--- a/addons/account_budget/i18n/zh_CN.po
+++ b/addons/account_budget/i18n/zh_CN.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:23+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_budget
 #: field:crossovered.budget,creating_user_id:0
diff --git a/addons/account_budget/i18n/zh_TW.po b/addons/account_budget/i18n/zh_TW.po
index 037621ffbbc..e4001b9f397 100644
--- a/addons/account_budget/i18n/zh_TW.po
+++ b/addons/account_budget/i18n/zh_TW.po
@@ -7,35 +7,35 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 00:35+0000\n"
-"PO-Revision-Date: 2009-01-23 17:15+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2012-08-22 03:26+0000\n"
+"Last-Translator: Eric Huang <eh@cenoq.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:23+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_budget
 #: field:crossovered.budget,creating_user_id:0
 msgid "Responsible User"
-msgstr "負責用戶"
+msgstr "負責的使用者"
 
 #. module: account_budget
 #: selection:crossovered.budget,state:0
 msgid "Confirmed"
-msgstr "確認"
+msgstr "已確認"
 
 #. module: account_budget
 #: model:ir.actions.act_window,name:account_budget.open_budget_post_form
 #: model:ir.ui.menu,name:account_budget.menu_budget_post_form
 msgid "Budgetary Positions"
-msgstr ""
+msgstr "預算狀況"
 
 #. module: account_budget
 #: report:account.budget:0
 msgid "Printed at:"
-msgstr ""
+msgstr "列印在:"
 
 #. module: account_budget
 #: view:crossovered.budget:0
@@ -45,17 +45,17 @@ msgstr "確認"
 #. module: account_budget
 #: field:crossovered.budget,validating_user_id:0
 msgid "Validate User"
-msgstr ""
+msgstr "驗證使用者"
 
 #. module: account_budget
 #: model:ir.actions.act_window,name:account_budget.action_account_budget_crossvered_summary_report
 msgid "Print Summary"
-msgstr ""
+msgstr "列印摘要"
 
 #. module: account_budget
 #: field:crossovered.budget.lines,paid_date:0
 msgid "Paid Date"
-msgstr "付款日期"
+msgstr "支付日期"
 
 #. module: account_budget
 #: field:account.budget.analytic,date_to:0
@@ -63,7 +63,7 @@ msgstr "付款日期"
 #: field:account.budget.crossvered.summary.report,date_to:0
 #: field:account.budget.report,date_to:0
 msgid "End of period"
-msgstr ""
+msgstr "期末"
 
 #. module: account_budget
 #: view:crossovered.budget:0
@@ -74,14 +74,14 @@ msgstr "草稿"
 #. module: account_budget
 #: report:account.budget:0
 msgid "at"
-msgstr "於"
+msgstr "在"
 
 #. module: account_budget
 #: view:account.budget.report:0
 #: model:ir.actions.act_window,name:account_budget.action_account_budget_analytic
 #: model:ir.actions.act_window,name:account_budget.action_account_budget_crossvered_report
 msgid "Print Budgets"
-msgstr ""
+msgstr "列印預算"
 
 #. module: account_budget
 #: report:account.budget:0
@@ -91,12 +91,12 @@ msgstr "貨幣:"
 #. module: account_budget
 #: model:ir.model,name:account_budget.model_account_budget_crossvered_report
 msgid "Account Budget crossvered report"
-msgstr ""
+msgstr "帳戶混合預算報表"
 
 #. module: account_budget
 #: selection:crossovered.budget,state:0
 msgid "Validated"
-msgstr "已驗證"
+msgstr "驗證"
 
 #. module: account_budget
 #: field:crossovered.budget.lines,percentage:0
@@ -106,7 +106,7 @@ msgstr "百分比"
 #. module: account_budget
 #: report:crossovered.budget.report:0
 msgid "to"
-msgstr "至"
+msgstr "到"
 
 #. module: account_budget
 #: field:crossovered.budget,state:0
@@ -125,24 +125,26 @@ msgid ""
 "revenue per analytic account and monitor its evolution based on the actuals "
 "realised during that period."
 msgstr ""
+"預算是未來期間公司的預期損益表。在預算中，公司可以小心觀察特定期間的現金，並思考將其區分成不同類別的最好方法。藉著現金流的規劃記錄，您比較不會超支，因而比"
+"較可能達到公司的財務目標。按分析帳戶的收入細項預測預算並在該期間監控其實際發生過程。"
 
 #. module: account_budget
 #: code:addons/account_budget/account_budget.py:119
 #, python-format
 msgid "The Budget '%s' has no accounts!"
-msgstr ""
+msgstr "預算裏 '%s' 沒有科目!"
 
 #. module: account_budget
 #: report:account.budget:0
 #: report:crossovered.budget.report:0
 msgid "%"
-msgstr ""
+msgstr "%"
 
 #. module: account_budget
 #: report:account.budget:0
 #: report:crossovered.budget.report:0
 msgid "Description"
-msgstr "說明"
+msgstr "描述"
 
 #. module: account_budget
 #: report:crossovered.budget.report:0
@@ -164,25 +166,25 @@ msgstr "公司"
 #. module: account_budget
 #: view:crossovered.budget:0
 msgid "To Approve"
-msgstr ""
+msgstr "批准"
 
 #. module: account_budget
 #: view:crossovered.budget:0
 msgid "Reset to Draft"
-msgstr "退回至草案"
+msgstr "重設為草稿"
 
 #. module: account_budget
 #: view:account.budget.post:0
 #: view:crossovered.budget:0
 #: field:crossovered.budget.lines,planned_amount:0
 msgid "Planned Amount"
-msgstr ""
+msgstr "計劃金額"
 
 #. module: account_budget
 #: report:account.budget:0
 #: report:crossovered.budget.report:0
 msgid "Perc(%)"
-msgstr ""
+msgstr "百分比(%)"
 
 #. module: account_budget
 #: view:crossovered.budget:0
@@ -194,7 +196,7 @@ msgstr "完成"
 #: report:account.budget:0
 #: report:crossovered.budget.report:0
 msgid "Practical Amt"
-msgstr ""
+msgstr "實際金額"
 
 #. module: account_budget
 #: view:account.analytic.account:0
@@ -202,7 +204,7 @@ msgstr ""
 #: view:crossovered.budget:0
 #: field:crossovered.budget.lines,practical_amount:0
 msgid "Practical Amount"
-msgstr ""
+msgstr "實際金額"
 
 #. module: account_budget
 #: field:crossovered.budget,date_to:0
@@ -214,12 +216,12 @@ msgstr "結束日期"
 #: model:ir.model,name:account_budget.model_account_budget_analytic
 #: model:ir.model,name:account_budget.model_account_budget_report
 msgid "Account Budget report for analytic account"
-msgstr ""
+msgstr "輔助核算項目的預算報告"
 
 #. module: account_budget
 #: view:account.analytic.account:0
 msgid "Theoritical Amount"
-msgstr ""
+msgstr "理論金額"
 
 #. module: account_budget
 #: field:account.budget.post,name:0
@@ -251,7 +253,7 @@ msgstr "預算"
 #. module: account_budget
 #: view:crossovered.budget:0
 msgid "To Approve Budgets"
-msgstr ""
+msgstr "通過預算"
 
 #. module: account_budget
 #: code:addons/account_budget/account_budget.py:119
@@ -263,13 +265,13 @@ msgstr "錯誤!"
 #: field:account.budget.post,code:0
 #: field:crossovered.budget,code:0
 msgid "Code"
-msgstr ""
+msgstr "代碼"
 
 #. module: account_budget
 #: view:account.budget.analytic:0
 #: view:account.budget.crossvered.report:0
 msgid "This wizard is used to print budget"
-msgstr ""
+msgstr "這個精靈被使用在列印預算"
 
 #. module: account_budget
 #: model:ir.actions.act_window,name:account_budget.act_crossovered_budget_view
@@ -286,17 +288,17 @@ msgstr "預算"
 #. module: account_budget
 #: view:account.budget.crossvered.summary.report:0
 msgid "This wizard is used to print summary of budgets"
-msgstr ""
+msgstr "這個精靈被使用在列印彙總預算"
 
 #. module: account_budget
 #: selection:crossovered.budget,state:0
 msgid "Cancelled"
-msgstr "取消"
+msgstr "已刪除"
 
 #. module: account_budget
 #: view:crossovered.budget:0
 msgid "Approve"
-msgstr ""
+msgstr "核準"
 
 #. module: account_budget
 #: field:crossovered.budget,date_from:0
@@ -309,7 +311,7 @@ msgstr "開始日期"
 #: field:crossovered.budget.lines,general_budget_id:0
 #: model:ir.model,name:account_budget.model_account_budget_post
 msgid "Budgetary Position"
-msgstr ""
+msgstr "財政狀況"
 
 #. module: account_budget
 #: field:account.budget.analytic,date_from:0
@@ -317,18 +319,18 @@ msgstr ""
 #: field:account.budget.crossvered.summary.report,date_from:0
 #: field:account.budget.report,date_from:0
 msgid "Start of period"
-msgstr ""
+msgstr "開始期間"
 
 #. module: account_budget
 #: model:ir.model,name:account_budget.model_account_budget_crossvered_summary_report
 msgid "Account Budget  crossvered summary report"
-msgstr ""
+msgstr "科目預算混合彙總報表"
 
 #. module: account_budget
 #: report:account.budget:0
 #: report:crossovered.budget.report:0
 msgid "Theoretical Amt"
-msgstr ""
+msgstr "理論金額"
 
 #. module: account_budget
 #: view:account.budget.analytic:0
@@ -336,7 +338,7 @@ msgstr ""
 #: view:account.budget.crossvered.summary.report:0
 #: view:account.budget.report:0
 msgid "Select Dates Period"
-msgstr ""
+msgstr "選擇日期期間"
 
 #. module: account_budget
 #: view:account.budget.analytic:0
@@ -344,20 +346,20 @@ msgstr ""
 #: view:account.budget.crossvered.summary.report:0
 #: view:account.budget.report:0
 msgid "Print"
-msgstr ""
+msgstr "列印"
 
 #. module: account_budget
 #: view:account.budget.post:0
 #: view:crossovered.budget:0
 #: field:crossovered.budget.lines,theoritical_amount:0
 msgid "Theoretical Amount"
-msgstr ""
+msgstr "理論金額"
 
 #. module: account_budget
 #: field:crossovered.budget.lines,analytic_account_id:0
 #: model:ir.model,name:account_budget.model_account_analytic_account
 msgid "Analytic Account"
-msgstr "分析科目"
+msgstr "核助核算項目"
 
 #. module: account_budget
 #: report:account.budget:0
@@ -368,13 +370,13 @@ msgstr "預算 :"
 #: report:account.budget:0
 #: report:crossovered.budget.report:0
 msgid "Planned Amt"
-msgstr ""
+msgstr "計畫金額"
 
 #. module: account_budget
 #: view:account.budget.post:0
 #: field:account.budget.post,account_ids:0
 msgid "Accounts"
-msgstr ""
+msgstr "科目"
 
 #. module: account_budget
 #: view:account.analytic.account:0
@@ -397,23 +399,23 @@ msgstr "預算明細"
 #: view:account.budget.report:0
 #: view:crossovered.budget:0
 msgid "Cancel"
-msgstr "取消"
+msgstr "刪除"
 
 #. module: account_budget
 #: constraint:account.analytic.account:0
 msgid "Error! You can not create recursive analytic accounts."
-msgstr ""
+msgstr "錯誤！您不能建立循環的輔助核算項目"
 
 #. module: account_budget
 #: report:account.budget:0
 #: report:crossovered.budget.report:0
 msgid "Analysis from"
-msgstr ""
+msgstr "分析從"
 
 #. module: account_budget
 #: view:crossovered.budget:0
 msgid "Draft Budgets"
-msgstr ""
+msgstr "草稿預算"
 
 #~ msgid "Budget Management"
 #~ msgstr "預算管理"
diff --git a/addons/account_cancel/__openerp__.py b/addons/account_cancel/__openerp__.py
index c616cc9d5e0..b1feedda55a 100644
--- a/addons/account_cancel/__openerp__.py
+++ b/addons/account_cancel/__openerp__.py
@@ -20,26 +20,25 @@
 ##############################################################################
 
 {
-    "name" : "Cancel Journal Entries",
-    "version" : "1.1",
-    "author" : "OpenERP SA",
-    "category": 'Accounting & Finance',
-    "description": """
-Allows cancelling accounting entries.
-=====================================
+    'name': 'Cancel Journal Entries',
+    'version': '1.1',
+    'author': 'OpenERP SA',
+    'category': 'Accounting & Finance',
+    'description': """
+Allows canceling accounting entries.
+====================================
 
-This module adds 'Allow Cancelling Entries' field on form view of account journal.
+This module adds 'Allow Canceling Entries' field on form view of account journal.
 If set to true it allows user to cancel entries & invoices.
     """,
     'website': 'http://www.openerp.com',
-    "images" : ["images/account_cancel.jpeg"],
-    "depends" : ["account"],
-    'init_xml': [],
-    'update_xml': ['account_cancel_view.xml' ],
-    'demo_xml': [],
+    'images': ['images/account_cancel.jpeg'],
+    'depends' : ['account'],
+    'data': ['account_cancel_view.xml' ],
+    'demo': [],
     'installable': True,
     'auto_install': False,
-    "certificate" : "001101250473177981989",
+    'certificate': '001101250473177981989',
 
 
 }
diff --git a/addons/account_cancel/i18n/ar.po b/addons/account_cancel/i18n/ar.po
index aaa31957565..ef9306434e7 100644
--- a/addons/account_cancel/i18n/ar.po
+++ b/addons/account_cancel/i18n/ar.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:35+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_cancel
 #: view:account.invoice:0
diff --git a/addons/account_cancel/i18n/bg.po b/addons/account_cancel/i18n/bg.po
index 9c19f451b5f..6d598e0f422 100644
--- a/addons/account_cancel/i18n/bg.po
+++ b/addons/account_cancel/i18n/bg.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:35+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_cancel
 #: view:account.invoice:0
diff --git a/addons/account_cancel/i18n/bn.po b/addons/account_cancel/i18n/bn.po
index ae1b51ddce6..701a1b1b596 100644
--- a/addons/account_cancel/i18n/bn.po
+++ b/addons/account_cancel/i18n/bn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:35+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_cancel
 #: view:account.invoice:0
diff --git a/addons/account_cancel/i18n/br.po b/addons/account_cancel/i18n/br.po
index 407e2433827..f0c867b5934 100644
--- a/addons/account_cancel/i18n/br.po
+++ b/addons/account_cancel/i18n/br.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:35+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_cancel
 #: view:account.invoice:0
diff --git a/addons/account_cancel/i18n/bs.po b/addons/account_cancel/i18n/bs.po
index 68a9d3b3aa7..604c70bdf0f 100644
--- a/addons/account_cancel/i18n/bs.po
+++ b/addons/account_cancel/i18n/bs.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:35+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_cancel
 #: view:account.invoice:0
diff --git a/addons/account_cancel/i18n/ca.po b/addons/account_cancel/i18n/ca.po
index 911a5238e29..5bc941373e8 100644
--- a/addons/account_cancel/i18n/ca.po
+++ b/addons/account_cancel/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:35+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_cancel
 #: view:account.invoice:0
diff --git a/addons/account_cancel/i18n/cs.po b/addons/account_cancel/i18n/cs.po
index 69e6499ebd1..0660efda952 100644
--- a/addons/account_cancel/i18n/cs.po
+++ b/addons/account_cancel/i18n/cs.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:35+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_cancel
 #: view:account.invoice:0
diff --git a/addons/account_cancel/i18n/da.po b/addons/account_cancel/i18n/da.po
index 4b3a78448c1..a43d106514f 100644
--- a/addons/account_cancel/i18n/da.po
+++ b/addons/account_cancel/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:35+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_cancel
 #: view:account.invoice:0
diff --git a/addons/account_cancel/i18n/de.po b/addons/account_cancel/i18n/de.po
index 3e1348293a2..f36285a8639 100644
--- a/addons/account_cancel/i18n/de.po
+++ b/addons/account_cancel/i18n/de.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:35+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_cancel
 #: view:account.invoice:0
diff --git a/addons/account_cancel/i18n/el.po b/addons/account_cancel/i18n/el.po
index 57befebdd3e..8a59da09f8f 100644
--- a/addons/account_cancel/i18n/el.po
+++ b/addons/account_cancel/i18n/el.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:35+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_cancel
 #: view:account.invoice:0
diff --git a/addons/account_cancel/i18n/en_GB.po b/addons/account_cancel/i18n/en_GB.po
index 42adc32b6c3..d1bb9ba26dd 100644
--- a/addons/account_cancel/i18n/en_GB.po
+++ b/addons/account_cancel/i18n/en_GB.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:35+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_cancel
 #: view:account.invoice:0
diff --git a/addons/account_cancel/i18n/es.po b/addons/account_cancel/i18n/es.po
index e25cb036437..7ea1debef10 100644
--- a/addons/account_cancel/i18n/es.po
+++ b/addons/account_cancel/i18n/es.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:35+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_cancel
 #: view:account.invoice:0
diff --git a/addons/account_cancel/i18n/es_CL.po b/addons/account_cancel/i18n/es_CL.po
index 096b94248ae..15cf9fabd76 100644
--- a/addons/account_cancel/i18n/es_CL.po
+++ b/addons/account_cancel/i18n/es_CL.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:35+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_cancel
 #: view:account.invoice:0
diff --git a/addons/account_cancel/i18n/es_CR.po b/addons/account_cancel/i18n/es_CR.po
index 171087774ec..be74a11fb2c 100644
--- a/addons/account_cancel/i18n/es_CR.po
+++ b/addons/account_cancel/i18n/es_CR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:35+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 "Language: es\n"
 
 #. module: account_cancel
diff --git a/addons/account_cancel/i18n/es_EC.po b/addons/account_cancel/i18n/es_EC.po
index 1398dd1f2e1..315b59acabf 100644
--- a/addons/account_cancel/i18n/es_EC.po
+++ b/addons/account_cancel/i18n/es_EC.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:35+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_cancel
 #: view:account.invoice:0
diff --git a/addons/account_cancel/i18n/es_PY.po b/addons/account_cancel/i18n/es_PY.po
index f1aac7d58de..7b05ae0a235 100644
--- a/addons/account_cancel/i18n/es_PY.po
+++ b/addons/account_cancel/i18n/es_PY.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:35+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_cancel
 #: view:account.invoice:0
diff --git a/addons/account_cancel/i18n/fa.po b/addons/account_cancel/i18n/fa.po
index 8048b6b3b33..53e17bc7003 100644
--- a/addons/account_cancel/i18n/fa.po
+++ b/addons/account_cancel/i18n/fa.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:35+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_cancel
 #: view:account.invoice:0
diff --git a/addons/account_cancel/i18n/fi.po b/addons/account_cancel/i18n/fi.po
index fb1cf13b684..77ca14cccae 100644
--- a/addons/account_cancel/i18n/fi.po
+++ b/addons/account_cancel/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:35+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_cancel
 #: view:account.invoice:0
diff --git a/addons/account_cancel/i18n/fr.po b/addons/account_cancel/i18n/fr.po
index 1b1784d8ad2..1ddd71fab8f 100644
--- a/addons/account_cancel/i18n/fr.po
+++ b/addons/account_cancel/i18n/fr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:35+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_cancel
 #: view:account.invoice:0
diff --git a/addons/account_cancel/i18n/gl.po b/addons/account_cancel/i18n/gl.po
index 86797d2dde7..2b82870f4e9 100644
--- a/addons/account_cancel/i18n/gl.po
+++ b/addons/account_cancel/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:35+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_cancel
 #: view:account.invoice:0
diff --git a/addons/account_cancel/i18n/gu.po b/addons/account_cancel/i18n/gu.po
index 58480f941a2..baafb4b5418 100644
--- a/addons/account_cancel/i18n/gu.po
+++ b/addons/account_cancel/i18n/gu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:35+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_cancel
 #: view:account.invoice:0
diff --git a/addons/account_cancel/i18n/hi.po b/addons/account_cancel/i18n/hi.po
index 7aa3d8aa80c..a807150442d 100644
--- a/addons/account_cancel/i18n/hi.po
+++ b/addons/account_cancel/i18n/hi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:35+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_cancel
 #: view:account.invoice:0
diff --git a/addons/account_cancel/i18n/hr.po b/addons/account_cancel/i18n/hr.po
index db58a966eec..325c4ab1571 100644
--- a/addons/account_cancel/i18n/hr.po
+++ b/addons/account_cancel/i18n/hr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:35+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_cancel
 #: view:account.invoice:0
diff --git a/addons/account_cancel/i18n/hu.po b/addons/account_cancel/i18n/hu.po
index 3ca0f0d8769..6de55617bd5 100644
--- a/addons/account_cancel/i18n/hu.po
+++ b/addons/account_cancel/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:35+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_cancel
 #: view:account.invoice:0
diff --git a/addons/account_cancel/i18n/id.po b/addons/account_cancel/i18n/id.po
index bfc7fb7aaad..b5504fc7a57 100644
--- a/addons/account_cancel/i18n/id.po
+++ b/addons/account_cancel/i18n/id.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:35+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_cancel
 #: view:account.invoice:0
diff --git a/addons/account_cancel/i18n/it.po b/addons/account_cancel/i18n/it.po
index 40560c332b1..c063c2c2c9c 100644
--- a/addons/account_cancel/i18n/it.po
+++ b/addons/account_cancel/i18n/it.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:35+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_cancel
 #: view:account.invoice:0
diff --git a/addons/account_cancel/i18n/ja.po b/addons/account_cancel/i18n/ja.po
index c8b8fa11289..350ea5497f5 100644
--- a/addons/account_cancel/i18n/ja.po
+++ b/addons/account_cancel/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:35+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_cancel
 #: view:account.invoice:0
diff --git a/addons/account_cancel/i18n/kk.po b/addons/account_cancel/i18n/kk.po
index ebafa545e91..5b061886b5f 100644
--- a/addons/account_cancel/i18n/kk.po
+++ b/addons/account_cancel/i18n/kk.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:35+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_cancel
 #: view:account.invoice:0
diff --git a/addons/account_cancel/i18n/lo.po b/addons/account_cancel/i18n/lo.po
index fae207db983..191d055c9b5 100644
--- a/addons/account_cancel/i18n/lo.po
+++ b/addons/account_cancel/i18n/lo.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-02-08 00:35+0000\n"
-"PO-Revision-Date: 2011-01-17 13:43+0000\n"
+"PO-Revision-Date: 2012-08-20 18:45+0000\n"
 "Last-Translator: Brice Muangkhot ສຸພາ ເມືອງໂຄຕ <bmuangkhot@gmail.com>\n"
 "Language-Team: Lao <lo@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:35+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_cancel
 #: view:account.invoice:0
 msgid "Cancel"
-msgstr ""
+msgstr "ຍົກເລີກ"
 
 #~ msgid "Account Cancel"
 #~ msgstr "ລົບລ້າງບັນຊີ"
diff --git a/addons/account_cancel/i18n/lt.po b/addons/account_cancel/i18n/lt.po
index 3a0c1b085b0..4bdd9ed330c 100644
--- a/addons/account_cancel/i18n/lt.po
+++ b/addons/account_cancel/i18n/lt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:35+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_cancel
 #: view:account.invoice:0
diff --git a/addons/account_cancel/i18n/lv.po b/addons/account_cancel/i18n/lv.po
index 8ca194c5283..0449cdc513c 100644
--- a/addons/account_cancel/i18n/lv.po
+++ b/addons/account_cancel/i18n/lv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:35+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_cancel
 #: view:account.invoice:0
diff --git a/addons/account_cancel/i18n/mk.po b/addons/account_cancel/i18n/mk.po
index 59020fc5fa0..44499e680d5 100644
--- a/addons/account_cancel/i18n/mk.po
+++ b/addons/account_cancel/i18n/mk.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:35+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_cancel
 #: view:account.invoice:0
diff --git a/addons/account_cancel/i18n/mn.po b/addons/account_cancel/i18n/mn.po
index cc370b08354..92af31695b4 100644
--- a/addons/account_cancel/i18n/mn.po
+++ b/addons/account_cancel/i18n/mn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:35+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_cancel
 #: view:account.invoice:0
diff --git a/addons/account_cancel/i18n/nb.po b/addons/account_cancel/i18n/nb.po
index 4e9abc32573..ed375c85782 100644
--- a/addons/account_cancel/i18n/nb.po
+++ b/addons/account_cancel/i18n/nb.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:35+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_cancel
 #: view:account.invoice:0
diff --git a/addons/account_cancel/i18n/nl.po b/addons/account_cancel/i18n/nl.po
index 6cee73e6711..69c92eaa06b 100644
--- a/addons/account_cancel/i18n/nl.po
+++ b/addons/account_cancel/i18n/nl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:35+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_cancel
 #: view:account.invoice:0
diff --git a/addons/account_cancel/i18n/nl_BE.po b/addons/account_cancel/i18n/nl_BE.po
index a4477070dce..27e4156bab9 100644
--- a/addons/account_cancel/i18n/nl_BE.po
+++ b/addons/account_cancel/i18n/nl_BE.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:35+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_cancel
 #: view:account.invoice:0
diff --git a/addons/account_cancel/i18n/oc.po b/addons/account_cancel/i18n/oc.po
index e29ad650d46..69849b81cff 100644
--- a/addons/account_cancel/i18n/oc.po
+++ b/addons/account_cancel/i18n/oc.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:35+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_cancel
 #: view:account.invoice:0
diff --git a/addons/account_cancel/i18n/pl.po b/addons/account_cancel/i18n/pl.po
index 4b66b2cc888..f801a4956c2 100644
--- a/addons/account_cancel/i18n/pl.po
+++ b/addons/account_cancel/i18n/pl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:35+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_cancel
 #: view:account.invoice:0
diff --git a/addons/account_cancel/i18n/pt.po b/addons/account_cancel/i18n/pt.po
index 20282eb195c..10e0e7de010 100644
--- a/addons/account_cancel/i18n/pt.po
+++ b/addons/account_cancel/i18n/pt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:35+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_cancel
 #: view:account.invoice:0
diff --git a/addons/account_cancel/i18n/pt_BR.po b/addons/account_cancel/i18n/pt_BR.po
index 57d1cc13292..3d130833ecf 100644
--- a/addons/account_cancel/i18n/pt_BR.po
+++ b/addons/account_cancel/i18n/pt_BR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:35+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_cancel
 #: view:account.invoice:0
diff --git a/addons/account_cancel/i18n/ro.po b/addons/account_cancel/i18n/ro.po
index 6a09a8ee9cd..a07884327d3 100644
--- a/addons/account_cancel/i18n/ro.po
+++ b/addons/account_cancel/i18n/ro.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:35+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_cancel
 #: view:account.invoice:0
diff --git a/addons/account_cancel/i18n/ru.po b/addons/account_cancel/i18n/ru.po
index 86ba63bb88f..da3e3aa5736 100644
--- a/addons/account_cancel/i18n/ru.po
+++ b/addons/account_cancel/i18n/ru.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:35+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_cancel
 #: view:account.invoice:0
diff --git a/addons/account_cancel/i18n/sl.po b/addons/account_cancel/i18n/sl.po
index d5f8531e17f..0cde8412de3 100644
--- a/addons/account_cancel/i18n/sl.po
+++ b/addons/account_cancel/i18n/sl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:35+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_cancel
 #: view:account.invoice:0
diff --git a/addons/account_cancel/i18n/sq.po b/addons/account_cancel/i18n/sq.po
index 614bca851ca..1bac103ff82 100644
--- a/addons/account_cancel/i18n/sq.po
+++ b/addons/account_cancel/i18n/sq.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:35+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_cancel
 #: view:account.invoice:0
diff --git a/addons/account_cancel/i18n/sr.po b/addons/account_cancel/i18n/sr.po
index 64736104a78..6532d9f92ed 100644
--- a/addons/account_cancel/i18n/sr.po
+++ b/addons/account_cancel/i18n/sr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:35+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_cancel
 #: view:account.invoice:0
diff --git a/addons/account_cancel/i18n/sr@latin.po b/addons/account_cancel/i18n/sr@latin.po
index 8b4f06a7198..d4d380cc0bb 100644
--- a/addons/account_cancel/i18n/sr@latin.po
+++ b/addons/account_cancel/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:35+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_cancel
 #: view:account.invoice:0
diff --git a/addons/account_cancel/i18n/sv.po b/addons/account_cancel/i18n/sv.po
index 2ba466f1ac3..ba1b2456b83 100644
--- a/addons/account_cancel/i18n/sv.po
+++ b/addons/account_cancel/i18n/sv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:35+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_cancel
 #: view:account.invoice:0
diff --git a/addons/account_cancel/i18n/ta.po b/addons/account_cancel/i18n/ta.po
index 2b560da88ef..dbd3e770609 100644
--- a/addons/account_cancel/i18n/ta.po
+++ b/addons/account_cancel/i18n/ta.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:35+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_cancel
 #: view:account.invoice:0
diff --git a/addons/account_cancel/i18n/tr.po b/addons/account_cancel/i18n/tr.po
index cfa6e01ef02..2bdc04d71db 100644
--- a/addons/account_cancel/i18n/tr.po
+++ b/addons/account_cancel/i18n/tr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:35+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_cancel
 #: view:account.invoice:0
diff --git a/addons/account_cancel/i18n/vi.po b/addons/account_cancel/i18n/vi.po
index fb5ef52a296..0a4334356a4 100644
--- a/addons/account_cancel/i18n/vi.po
+++ b/addons/account_cancel/i18n/vi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:35+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_cancel
 #: view:account.invoice:0
diff --git a/addons/account_cancel/i18n/zh_CN.po b/addons/account_cancel/i18n/zh_CN.po
index e278b7de7e8..2c4812757bc 100644
--- a/addons/account_cancel/i18n/zh_CN.po
+++ b/addons/account_cancel/i18n/zh_CN.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:35+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_cancel
 #: view:account.invoice:0
diff --git a/addons/account_cancel/i18n/zh_TW.po b/addons/account_cancel/i18n/zh_TW.po
new file mode 100644
index 00000000000..b0d7a08d385
--- /dev/null
+++ b/addons/account_cancel/i18n/zh_TW.po
@@ -0,0 +1,23 @@
+# Chinese (Traditional) 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-02-08 00:35+0000\n"
+"PO-Revision-Date: 2012-08-18 11:29+0000\n"
+"Last-Translator: Eric Huang <eh@cenoq.com>\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: 2012-08-28 06:35+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
+
+#. module: account_cancel
+#: view:account.invoice:0
+msgid "Cancel"
+msgstr "取消"
diff --git a/addons/account_chart/__openerp__.py b/addons/account_chart/__openerp__.py
index c0c9245a477..2c458ceb49f 100644
--- a/addons/account_chart/__openerp__.py
+++ b/addons/account_chart/__openerp__.py
@@ -23,7 +23,7 @@
 {
     'name': 'Template of Charts of Accounts',
     'version': '1.1',
-    "category": 'Hidden/Dependency',
+    'category': 'Hidden/Dependency',
     'description': """
 Remove minimal account chart.
 =============================
@@ -33,9 +33,8 @@ Deactivates minimal chart of accounts.
     'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
     'depends': ['account'],
-    'init_xml': [],
-    'update_xml': [],
-    'demo_xml': [],
+    'data': [],
+    'demo': [],
     'installable': True,
     'certificate': '0073332443901',
 }
diff --git a/addons/account_chart/i18n/ar.po b/addons/account_chart/i18n/ar.po
index c25e6004b77..56a3516f5c9 100644
--- a/addons/account_chart/i18n/ar.po
+++ b/addons/account_chart/i18n/ar.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:29+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_chart
 #: model:ir.module.module,description:account_chart.module_meta_information
diff --git a/addons/account_chart/i18n/bg.po b/addons/account_chart/i18n/bg.po
index dc705fe1696..cd5fc9de1ba 100644
--- a/addons/account_chart/i18n/bg.po
+++ b/addons/account_chart/i18n/bg.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:29+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_chart
 #: model:ir.module.module,description:account_chart.module_meta_information
diff --git a/addons/account_chart/i18n/bs.po b/addons/account_chart/i18n/bs.po
index a58f592929f..874c2172897 100644
--- a/addons/account_chart/i18n/bs.po
+++ b/addons/account_chart/i18n/bs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:29+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_chart
 #: model:ir.module.module,description:account_chart.module_meta_information
diff --git a/addons/account_chart/i18n/ca.po b/addons/account_chart/i18n/ca.po
index 1654e9e1d37..633e5093d15 100644
--- a/addons/account_chart/i18n/ca.po
+++ b/addons/account_chart/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:29+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_chart
 #: model:ir.module.module,description:account_chart.module_meta_information
diff --git a/addons/account_chart/i18n/cs.po b/addons/account_chart/i18n/cs.po
index f0273cbec36..d9ce074a241 100644
--- a/addons/account_chart/i18n/cs.po
+++ b/addons/account_chart/i18n/cs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:29+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_chart
 #: model:ir.module.module,description:account_chart.module_meta_information
diff --git a/addons/account_chart/i18n/da.po b/addons/account_chart/i18n/da.po
index e553aecee56..bf13e91fb50 100644
--- a/addons/account_chart/i18n/da.po
+++ b/addons/account_chart/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:29+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_chart
 #: model:ir.module.module,description:account_chart.module_meta_information
diff --git a/addons/account_chart/i18n/de.po b/addons/account_chart/i18n/de.po
index f11f2590e9e..94f5b9301c1 100644
--- a/addons/account_chart/i18n/de.po
+++ b/addons/account_chart/i18n/de.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:29+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_chart
 #: model:ir.module.module,description:account_chart.module_meta_information
diff --git a/addons/account_chart/i18n/el.po b/addons/account_chart/i18n/el.po
index 9bf602bd2cb..cb1aab602f3 100644
--- a/addons/account_chart/i18n/el.po
+++ b/addons/account_chart/i18n/el.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:29+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_chart
 #: model:ir.module.module,description:account_chart.module_meta_information
diff --git a/addons/account_chart/i18n/en_GB.po b/addons/account_chart/i18n/en_GB.po
index 56e729bdfb3..343c617cd9d 100644
--- a/addons/account_chart/i18n/en_GB.po
+++ b/addons/account_chart/i18n/en_GB.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:29+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_chart
 #: model:ir.module.module,description:account_chart.module_meta_information
diff --git a/addons/account_chart/i18n/es.po b/addons/account_chart/i18n/es.po
index c4c4c3b22b9..77d32654ad6 100644
--- a/addons/account_chart/i18n/es.po
+++ b/addons/account_chart/i18n/es.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:29+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_chart
 #: model:ir.module.module,description:account_chart.module_meta_information
diff --git a/addons/account_chart/i18n/es_AR.po b/addons/account_chart/i18n/es_AR.po
index 5b70e32423c..8fb9fc7e8cb 100644
--- a/addons/account_chart/i18n/es_AR.po
+++ b/addons/account_chart/i18n/es_AR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:29+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_chart
 #: model:ir.module.module,description:account_chart.module_meta_information
diff --git a/addons/account_chart/i18n/es_CL.po b/addons/account_chart/i18n/es_CL.po
index cebdead21f5..85e35739073 100644
--- a/addons/account_chart/i18n/es_CL.po
+++ b/addons/account_chart/i18n/es_CL.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:29+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_chart
 #: model:ir.module.module,description:account_chart.module_meta_information
diff --git a/addons/account_chart/i18n/es_CR.po b/addons/account_chart/i18n/es_CR.po
index 065d5207e5a..8c20fcad520 100644
--- a/addons/account_chart/i18n/es_CR.po
+++ b/addons/account_chart/i18n/es_CR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:29+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 "Language: \n"
 
 #. module: account_chart
diff --git a/addons/account_chart/i18n/es_EC.po b/addons/account_chart/i18n/es_EC.po
index 3b3375869a1..51b06fc3f0a 100644
--- a/addons/account_chart/i18n/es_EC.po
+++ b/addons/account_chart/i18n/es_EC.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:29+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_chart
 #: model:ir.module.module,description:account_chart.module_meta_information
diff --git a/addons/account_chart/i18n/es_PY.po b/addons/account_chart/i18n/es_PY.po
index 16f91edc4a3..e7f11dd0436 100644
--- a/addons/account_chart/i18n/es_PY.po
+++ b/addons/account_chart/i18n/es_PY.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:29+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_chart
 #: model:ir.module.module,description:account_chart.module_meta_information
diff --git a/addons/account_chart/i18n/et.po b/addons/account_chart/i18n/et.po
index 89bd135b95d..1c1f2b849d6 100644
--- a/addons/account_chart/i18n/et.po
+++ b/addons/account_chart/i18n/et.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:29+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_chart
 #: model:ir.module.module,description:account_chart.module_meta_information
diff --git a/addons/account_chart/i18n/eu.po b/addons/account_chart/i18n/eu.po
index ed67ea33b5c..8d1e19e9912 100644
--- a/addons/account_chart/i18n/eu.po
+++ b/addons/account_chart/i18n/eu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:29+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_chart
 #: model:ir.module.module,description:account_chart.module_meta_information
diff --git a/addons/account_chart/i18n/fa.po b/addons/account_chart/i18n/fa.po
index 8fd549fdb60..b26a6fde1fe 100644
--- a/addons/account_chart/i18n/fa.po
+++ b/addons/account_chart/i18n/fa.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:29+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_chart
 #: model:ir.module.module,description:account_chart.module_meta_information
diff --git a/addons/account_chart/i18n/fi.po b/addons/account_chart/i18n/fi.po
index 82a04e98ad9..18993e098d8 100644
--- a/addons/account_chart/i18n/fi.po
+++ b/addons/account_chart/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:29+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_chart
 #: model:ir.module.module,description:account_chart.module_meta_information
diff --git a/addons/account_chart/i18n/fr.po b/addons/account_chart/i18n/fr.po
index 5762d356fa8..d7064fdca85 100644
--- a/addons/account_chart/i18n/fr.po
+++ b/addons/account_chart/i18n/fr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:29+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_chart
 #: model:ir.module.module,description:account_chart.module_meta_information
diff --git a/addons/account_chart/i18n/gl.po b/addons/account_chart/i18n/gl.po
index 51ad708bf68..dff3fe7b04a 100644
--- a/addons/account_chart/i18n/gl.po
+++ b/addons/account_chart/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:29+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_chart
 #: model:ir.module.module,description:account_chart.module_meta_information
diff --git a/addons/account_chart/i18n/gu.po b/addons/account_chart/i18n/gu.po
index 490fd165563..44f6105807c 100644
--- a/addons/account_chart/i18n/gu.po
+++ b/addons/account_chart/i18n/gu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:29+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_chart
 #: model:ir.module.module,description:account_chart.module_meta_information
diff --git a/addons/account_chart/i18n/hi.po b/addons/account_chart/i18n/hi.po
index c4ff39bbc1f..ee4989731c4 100644
--- a/addons/account_chart/i18n/hi.po
+++ b/addons/account_chart/i18n/hi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:29+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_chart
 #: model:ir.module.module,description:account_chart.module_meta_information
diff --git a/addons/account_chart/i18n/hr.po b/addons/account_chart/i18n/hr.po
index 0d8d213c408..d5b2ebcd451 100644
--- a/addons/account_chart/i18n/hr.po
+++ b/addons/account_chart/i18n/hr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:29+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_chart
 #: model:ir.module.module,description:account_chart.module_meta_information
diff --git a/addons/account_chart/i18n/hu.po b/addons/account_chart/i18n/hu.po
index 642590879a8..311ab4c2a07 100644
--- a/addons/account_chart/i18n/hu.po
+++ b/addons/account_chart/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:29+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_chart
 #: model:ir.module.module,description:account_chart.module_meta_information
diff --git a/addons/account_chart/i18n/id.po b/addons/account_chart/i18n/id.po
index 0d366426840..7598da2d9b8 100644
--- a/addons/account_chart/i18n/id.po
+++ b/addons/account_chart/i18n/id.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:29+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_chart
 #: model:ir.module.module,description:account_chart.module_meta_information
diff --git a/addons/account_chart/i18n/it.po b/addons/account_chart/i18n/it.po
index e015b6fe89a..30273df528e 100644
--- a/addons/account_chart/i18n/it.po
+++ b/addons/account_chart/i18n/it.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:29+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_chart
 #: model:ir.module.module,description:account_chart.module_meta_information
diff --git a/addons/account_chart/i18n/ja.po b/addons/account_chart/i18n/ja.po
index 2e1c282d1ce..b0acf11fc68 100644
--- a/addons/account_chart/i18n/ja.po
+++ b/addons/account_chart/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:29+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_chart
 #: model:ir.module.module,description:account_chart.module_meta_information
diff --git a/addons/account_chart/i18n/ko.po b/addons/account_chart/i18n/ko.po
index bd21b86a513..984b5d4f26c 100644
--- a/addons/account_chart/i18n/ko.po
+++ b/addons/account_chart/i18n/ko.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:29+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_chart
 #: model:ir.module.module,description:account_chart.module_meta_information
diff --git a/addons/account_chart/i18n/lo.po b/addons/account_chart/i18n/lo.po
index d01a6edd1d0..aea6fda41ca 100644
--- a/addons/account_chart/i18n/lo.po
+++ b/addons/account_chart/i18n/lo.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:29+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_chart
 #: model:ir.module.module,description:account_chart.module_meta_information
diff --git a/addons/account_chart/i18n/lt.po b/addons/account_chart/i18n/lt.po
index ce7044729be..d6632c8397a 100644
--- a/addons/account_chart/i18n/lt.po
+++ b/addons/account_chart/i18n/lt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:29+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_chart
 #: model:ir.module.module,description:account_chart.module_meta_information
diff --git a/addons/account_chart/i18n/lv.po b/addons/account_chart/i18n/lv.po
index af93ab5aa37..bfc6e1b4c22 100644
--- a/addons/account_chart/i18n/lv.po
+++ b/addons/account_chart/i18n/lv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:29+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_chart
 #: model:ir.module.module,description:account_chart.module_meta_information
diff --git a/addons/account_chart/i18n/mk.po b/addons/account_chart/i18n/mk.po
index d49b49e0ed7..cd6717dc8b8 100644
--- a/addons/account_chart/i18n/mk.po
+++ b/addons/account_chart/i18n/mk.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:29+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_chart
 #: model:ir.module.module,description:account_chart.module_meta_information
diff --git a/addons/account_chart/i18n/mn.po b/addons/account_chart/i18n/mn.po
index b2435368dde..3d1724a5be5 100644
--- a/addons/account_chart/i18n/mn.po
+++ b/addons/account_chart/i18n/mn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:29+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_chart
 #: model:ir.module.module,description:account_chart.module_meta_information
diff --git a/addons/account_chart/i18n/nb.po b/addons/account_chart/i18n/nb.po
index 5bb30d8fb30..f594c38d810 100644
--- a/addons/account_chart/i18n/nb.po
+++ b/addons/account_chart/i18n/nb.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:29+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_chart
 #: model:ir.module.module,description:account_chart.module_meta_information
diff --git a/addons/account_chart/i18n/nl.po b/addons/account_chart/i18n/nl.po
index b429d58d918..c5eaa80dbec 100644
--- a/addons/account_chart/i18n/nl.po
+++ b/addons/account_chart/i18n/nl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:29+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_chart
 #: model:ir.module.module,description:account_chart.module_meta_information
diff --git a/addons/account_chart/i18n/nl_BE.po b/addons/account_chart/i18n/nl_BE.po
index 24196d565e6..c8b56b9055f 100644
--- a/addons/account_chart/i18n/nl_BE.po
+++ b/addons/account_chart/i18n/nl_BE.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:29+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_chart
 #: model:ir.module.module,description:account_chart.module_meta_information
diff --git a/addons/account_chart/i18n/oc.po b/addons/account_chart/i18n/oc.po
index 40e8189b421..df61b7397b4 100644
--- a/addons/account_chart/i18n/oc.po
+++ b/addons/account_chart/i18n/oc.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:29+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_chart
 #: model:ir.module.module,description:account_chart.module_meta_information
diff --git a/addons/account_chart/i18n/pl.po b/addons/account_chart/i18n/pl.po
index 097f475ffe7..04b64337cc5 100644
--- a/addons/account_chart/i18n/pl.po
+++ b/addons/account_chart/i18n/pl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:29+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_chart
 #: model:ir.module.module,description:account_chart.module_meta_information
diff --git a/addons/account_chart/i18n/pt.po b/addons/account_chart/i18n/pt.po
index 7559575fa21..b82c860eeb6 100644
--- a/addons/account_chart/i18n/pt.po
+++ b/addons/account_chart/i18n/pt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:29+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_chart
 #: model:ir.module.module,description:account_chart.module_meta_information
diff --git a/addons/account_chart/i18n/pt_BR.po b/addons/account_chart/i18n/pt_BR.po
index 3d4c53d8dbb..3c64359e5f8 100644
--- a/addons/account_chart/i18n/pt_BR.po
+++ b/addons/account_chart/i18n/pt_BR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:29+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_chart
 #: model:ir.module.module,description:account_chart.module_meta_information
diff --git a/addons/account_chart/i18n/ro.po b/addons/account_chart/i18n/ro.po
index 60eae200f69..0c67bf8b3ff 100644
--- a/addons/account_chart/i18n/ro.po
+++ b/addons/account_chart/i18n/ro.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:29+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_chart
 #: model:ir.module.module,description:account_chart.module_meta_information
diff --git a/addons/account_chart/i18n/ru.po b/addons/account_chart/i18n/ru.po
index 6ceec3b8e46..c3d1ade0bb4 100644
--- a/addons/account_chart/i18n/ru.po
+++ b/addons/account_chart/i18n/ru.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:29+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_chart
 #: model:ir.module.module,description:account_chart.module_meta_information
diff --git a/addons/account_chart/i18n/sk.po b/addons/account_chart/i18n/sk.po
index 90c4c32ef51..2c715e9d808 100644
--- a/addons/account_chart/i18n/sk.po
+++ b/addons/account_chart/i18n/sk.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:29+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_chart
 #: model:ir.module.module,description:account_chart.module_meta_information
diff --git a/addons/account_chart/i18n/sl.po b/addons/account_chart/i18n/sl.po
index 1319b05553b..32eb863f1f1 100644
--- a/addons/account_chart/i18n/sl.po
+++ b/addons/account_chart/i18n/sl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:29+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_chart
 #: model:ir.module.module,description:account_chart.module_meta_information
diff --git a/addons/account_chart/i18n/sq.po b/addons/account_chart/i18n/sq.po
index 91f467ebee7..6dcc3de2ae4 100644
--- a/addons/account_chart/i18n/sq.po
+++ b/addons/account_chart/i18n/sq.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:29+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_chart
 #: model:ir.module.module,description:account_chart.module_meta_information
diff --git a/addons/account_chart/i18n/sr.po b/addons/account_chart/i18n/sr.po
index 7b0c32a1d9d..9aa4d5d0669 100644
--- a/addons/account_chart/i18n/sr.po
+++ b/addons/account_chart/i18n/sr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:29+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_chart
 #: model:ir.module.module,description:account_chart.module_meta_information
diff --git a/addons/account_chart/i18n/sr@latin.po b/addons/account_chart/i18n/sr@latin.po
index 1d017b3b4fb..2ef5a4cfabc 100644
--- a/addons/account_chart/i18n/sr@latin.po
+++ b/addons/account_chart/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:30+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_chart
 #: model:ir.module.module,description:account_chart.module_meta_information
diff --git a/addons/account_chart/i18n/sv.po b/addons/account_chart/i18n/sv.po
index 5b185db92a0..cc56b90e7e4 100644
--- a/addons/account_chart/i18n/sv.po
+++ b/addons/account_chart/i18n/sv.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:29+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_chart
 #: model:ir.module.module,description:account_chart.module_meta_information
diff --git a/addons/account_chart/i18n/ta.po b/addons/account_chart/i18n/ta.po
index afecfd5b6d9..b6cbac2611a 100644
--- a/addons/account_chart/i18n/ta.po
+++ b/addons/account_chart/i18n/ta.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:29+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_chart
 #: model:ir.module.module,description:account_chart.module_meta_information
diff --git a/addons/account_chart/i18n/th.po b/addons/account_chart/i18n/th.po
index ff26a0dde5a..cfb703f2f7c 100644
--- a/addons/account_chart/i18n/th.po
+++ b/addons/account_chart/i18n/th.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:29+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_chart
 #: model:ir.module.module,description:account_chart.module_meta_information
diff --git a/addons/account_chart/i18n/tr.po b/addons/account_chart/i18n/tr.po
index 0663f7790c4..b02f10a2388 100644
--- a/addons/account_chart/i18n/tr.po
+++ b/addons/account_chart/i18n/tr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:29+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_chart
 #: model:ir.module.module,description:account_chart.module_meta_information
diff --git a/addons/account_chart/i18n/uk.po b/addons/account_chart/i18n/uk.po
index 20b356bfe15..e0895791db3 100644
--- a/addons/account_chart/i18n/uk.po
+++ b/addons/account_chart/i18n/uk.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:29+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_chart
 #: model:ir.module.module,description:account_chart.module_meta_information
diff --git a/addons/account_chart/i18n/vi.po b/addons/account_chart/i18n/vi.po
index 6a87602d75a..4b63080f3b7 100644
--- a/addons/account_chart/i18n/vi.po
+++ b/addons/account_chart/i18n/vi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:29+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_chart
 #: model:ir.module.module,description:account_chart.module_meta_information
diff --git a/addons/account_chart/i18n/zh_CN.po b/addons/account_chart/i18n/zh_CN.po
index 06300cd388f..dfa16a7b6ba 100644
--- a/addons/account_chart/i18n/zh_CN.po
+++ b/addons/account_chart/i18n/zh_CN.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:29+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_chart
 #: model:ir.module.module,description:account_chart.module_meta_information
diff --git a/addons/account_chart/i18n/zh_TW.po b/addons/account_chart/i18n/zh_TW.po
index 35ffaa07200..60734e8ced5 100644
--- a/addons/account_chart/i18n/zh_TW.po
+++ b/addons/account_chart/i18n/zh_TW.po
@@ -7,21 +7,21 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2009-04-10 14:08+0000\n"
-"Last-Translator: <>\n"
+"PO-Revision-Date: 2012-08-19 10:21+0000\n"
+"Last-Translator: Eric Huang <eh@cenoq.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:29+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_chart
 #: model:ir.module.module,description:account_chart.module_meta_information
 msgid "Remove minimal account chart"
-msgstr ""
+msgstr "移除小的會計科目表"
 
 #. module: account_chart
 #: model:ir.module.module,shortdesc:account_chart.module_meta_information
 msgid "Charts of Accounts"
-msgstr ""
+msgstr "會計科目表"
diff --git a/addons/account_check_writing/__openerp__.py b/addons/account_check_writing/__openerp__.py
index faba82928ed..f5a2355b002 100644
--- a/addons/account_check_writing/__openerp__.py
+++ b/addons/account_check_writing/__openerp__.py
@@ -19,29 +19,24 @@
 #
 ##############################################################################
 {
-    "name" : "Check Writing",
-    "version" : "1.1",
-    "author" : "OpenERP SA, NovaPoint Group",
-    "category": "Generic Modules/Accounting",
-    "description": """
+    'name': 'Check Writing',
+    'version': '1.1',
+    'author': 'OpenERP SA, NovaPoint Group',
+    'category': 'Generic Modules/Accounting',
+    'description': """
 Module for the Check Writing and Check Printing.
+================================================
     """,
     'website': 'http://www.openerp.com',
-    'init_xml': [],
-    "depends" : [
-        "account_voucher",
-        ],
-    'update_xml': [
+    'depends' : ['account_voucher'],
+    'data': [
         'account_check_writing_report.xml',
         'account_view.xml',
         'account_voucher_view.xml',
         'account_check_writing_data.xml',
     ],
-    'demo_xml': [
-        'account_demo.xml',
-    ],
-    'test': [
-    ],
+    'demo': ['account_demo.xml'],
+    'test': [],
     'installable': True,
     'active': False,
 }
diff --git a/addons/account_check_writing/i18n/ar.po b/addons/account_check_writing/i18n/ar.po
index f24f4ba35e4..3b0c1f34354 100644
--- a/addons/account_check_writing/i18n/ar.po
+++ b/addons/account_check_writing/i18n/ar.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:39+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:43+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_check_writing
 #: selection:res.company,check_layout:0
diff --git a/addons/account_check_writing/i18n/de.po b/addons/account_check_writing/i18n/de.po
index 782d10fa9b4..65bcb8babc0 100644
--- a/addons/account_check_writing/i18n/de.po
+++ b/addons/account_check_writing/i18n/de.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:39+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:43+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_check_writing
 #: selection:res.company,check_layout:0
diff --git a/addons/account_check_writing/i18n/es.po b/addons/account_check_writing/i18n/es.po
index 9cd3327c821..1d64d221438 100644
--- a/addons/account_check_writing/i18n/es.po
+++ b/addons/account_check_writing/i18n/es.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:39+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:43+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_check_writing
 #: selection:res.company,check_layout:0
diff --git a/addons/account_check_writing/i18n/es_CR.po b/addons/account_check_writing/i18n/es_CR.po
index 151bd209860..d19dce3f34d 100644
--- a/addons/account_check_writing/i18n/es_CR.po
+++ b/addons/account_check_writing/i18n/es_CR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:39+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:43+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_check_writing
 #: selection:res.company,check_layout:0
diff --git a/addons/account_check_writing/i18n/fi.po b/addons/account_check_writing/i18n/fi.po
index 1386d61bc8f..1638f46d437 100644
--- a/addons/account_check_writing/i18n/fi.po
+++ b/addons/account_check_writing/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:39+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:43+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_check_writing
 #: selection:res.company,check_layout:0
diff --git a/addons/account_check_writing/i18n/fr.po b/addons/account_check_writing/i18n/fr.po
index a60704a6499..852c9def971 100644
--- a/addons/account_check_writing/i18n/fr.po
+++ b/addons/account_check_writing/i18n/fr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:39+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:43+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_check_writing
 #: selection:res.company,check_layout:0
diff --git a/addons/account_check_writing/i18n/gu.po b/addons/account_check_writing/i18n/gu.po
index 5fd6d7190cd..6a0a80ae316 100644
--- a/addons/account_check_writing/i18n/gu.po
+++ b/addons/account_check_writing/i18n/gu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:39+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:43+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_check_writing
 #: selection:res.company,check_layout:0
diff --git a/addons/account_check_writing/i18n/ja.po b/addons/account_check_writing/i18n/ja.po
index f9b91b98418..cadc41647b5 100644
--- a/addons/account_check_writing/i18n/ja.po
+++ b/addons/account_check_writing/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:39+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:43+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_check_writing
 #: selection:res.company,check_layout:0
diff --git a/addons/account_check_writing/i18n/mn.po b/addons/account_check_writing/i18n/mn.po
index fb86e3b5cc6..8d923c5e256 100644
--- a/addons/account_check_writing/i18n/mn.po
+++ b/addons/account_check_writing/i18n/mn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:39+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:43+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_check_writing
 #: selection:res.company,check_layout:0
diff --git a/addons/account_check_writing/i18n/nb.po b/addons/account_check_writing/i18n/nb.po
new file mode 100644
index 00000000000..31368e86a64
--- /dev/null
+++ b/addons/account_check_writing/i18n/nb.po
@@ -0,0 +1,210 @@
+# Norwegian Bokmal 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-02-08 00:35+0000\n"
+"PO-Revision-Date: 2012-08-27 15:48+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Norwegian Bokmal <nb@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:43+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
+
+#. module: account_check_writing
+#: selection:res.company,check_layout:0
+msgid "Check on Top"
+msgstr "Sjekk på topp"
+
+#. module: account_check_writing
+#: model:ir.actions.act_window,help:account_check_writing.action_write_check
+msgid ""
+"The check payment form allows you to track the payment you do to your "
+"suppliers specially by check. When you select a supplier, the payment method "
+"and an amount for the payment, OpenERP will propose to reconcile your "
+"payment with the open supplier invoices or bills.You can print the check"
+msgstr ""
+"Sjekk betaling skjema kan du spore betalingen du gjør til dine leverandører "
+"spesielt med sjekk. Når du velger en leverandør, betalingsmetode og et beløp "
+"for betalingen, vil OpenERP foreslå å forene betalingen med åpne "
+"leverandørfakturaer eller bills.You kan skrive ut sjekken"
+
+#. module: account_check_writing
+#: view:account.voucher:0
+#: model:ir.actions.report.xml,name:account_check_writing.account_print_check_bottom
+#: model:ir.actions.report.xml,name:account_check_writing.account_print_check_middle
+#: model:ir.actions.report.xml,name:account_check_writing.account_print_check_top
+msgid "Print Check"
+msgstr "Skriv ut sjekk"
+
+#. module: account_check_writing
+#: selection:res.company,check_layout:0
+msgid "Check in middle"
+msgstr "Skjekk i midten"
+
+#. 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 ""
+"Sjekk på toppen er kompatibel med Quicken, QuickBooks og Microsoft Penger. "
+"Sjekk i midten er kompatibel med Peachtree, ACCPAC og DacEasy. Sjekk på "
+"bunnen er kompatibel med Peachtree, ACCPAC og DacEasy bare"
+
+#. module: account_check_writing
+#: selection:res.company,check_layout:0
+msgid "Check on bottom"
+msgstr "Skjekk på bunnen"
+
+#. module: account_check_writing
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr "Feil ! Du kan ikke lage rekursive firmaer."
+
+#. 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 "Sjekk dette hvis journalen skal brukes til å skrive sjekker."
+
+#. module: account_check_writing
+#: field:account.journal,allow_check_writing:0
+msgid "Allow Check writing"
+msgstr "Tillat skjekk skriving"
+
+#. 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 "Beskrivelse:"
+
+#. module: account_check_writing
+#: model:ir.model,name:account_check_writing.model_account_journal
+msgid "Journal"
+msgstr "Journal"
+
+#. 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 "Skive skjekker"
+
+#. 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 "Rabatt"
+
+#. 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 "Opprinnelig beløp"
+
+#. module: account_check_writing
+#: view:res.company:0
+msgid "Configuration"
+msgstr "Konfigurasjon"
+
+#. module: account_check_writing
+#: field:account.voucher,allow_check:0
+msgid "Allow Check Writing"
+msgstr "Tillat å skrive skjekk"
+
+#. 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 "Betaling"
+
+#. module: account_check_writing
+#: field:account.journal,use_preprint_check:0
+msgid "Use Preprinted Check"
+msgstr "Bruk Forhåndstrykt Sjekk"
+
+#. module: account_check_writing
+#: sql_constraint:res.company:0
+msgid "The company name must be unique !"
+msgstr "Firmanavn må være unikt !"
+
+#. 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 "Utløps Dato"
+
+#. module: account_check_writing
+#: model:ir.model,name:account_check_writing.model_res_company
+msgid "Companies"
+msgstr "Firmaer"
+
+#. module: account_check_writing
+#: view:res.company:0
+msgid "Default Check Layout"
+msgstr ""
+
+#. module: account_check_writing
+#: constraint:account.journal:0
+msgid ""
+"Configuration error! The currency chosen should be shared by the default "
+"accounts too."
+msgstr ""
+"Konfigurasjon feil! Den valgte valutaen bør deles av standard kontoer også."
+
+#. module: account_check_writing
+#: report:account.print.check.bottom:0
+#: report:account.print.check.middle:0
+msgid "Balance Due"
+msgstr "balanse grunn"
+
+#. 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 "Sjekk Beløp"
+
+#. module: account_check_writing
+#: model:ir.model,name:account_check_writing.model_account_voucher
+msgid "Accounting Voucher"
+msgstr "Regnskapsmessig kupong"
+
+#. module: account_check_writing
+#: sql_constraint:account.journal:0
+msgid "The name of the journal must be unique per company !"
+msgstr "Navnet på journalen må være unikt per firma !"
+
+#. module: account_check_writing
+#: sql_constraint:account.journal:0
+msgid "The code of the journal must be unique per company !"
+msgstr "Journalkoden må være unik pr firma!"
+
+#. module: account_check_writing
+#: field:account.voucher,amount_in_word:0
+msgid "Amount in Word"
+msgstr "Beløp i Ord"
+
+#. module: account_check_writing
+#: report:account.print.check.top:0
+msgid "Open Balance"
+msgstr "Åpen balanse"
+
+#. module: account_check_writing
+#: field:res.company,check_layout:0
+msgid "Choose Check layout"
+msgstr "Velg Sjekk oppsettet"
+
+#~ msgid "Default Check layout"
+#~ msgstr "Standard Sjekk oppsettet"
diff --git a/addons/account_check_writing/i18n/nl.po b/addons/account_check_writing/i18n/nl.po
index 6b033259e8e..e0465559887 100644
--- a/addons/account_check_writing/i18n/nl.po
+++ b/addons/account_check_writing/i18n/nl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:39+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:43+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_check_writing
 #: selection:res.company,check_layout:0
diff --git a/addons/account_check_writing/i18n/pt.po b/addons/account_check_writing/i18n/pt.po
index 4eb8ddbd42f..1a9431afee9 100644
--- a/addons/account_check_writing/i18n/pt.po
+++ b/addons/account_check_writing/i18n/pt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:39+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:43+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_check_writing
 #: selection:res.company,check_layout:0
diff --git a/addons/account_check_writing/i18n/pt_BR.po b/addons/account_check_writing/i18n/pt_BR.po
index eafd011d5db..18eb68f8afe 100644
--- a/addons/account_check_writing/i18n/pt_BR.po
+++ b/addons/account_check_writing/i18n/pt_BR.po
@@ -9,13 +9,14 @@ msgstr ""
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:35+0000\n"
 "PO-Revision-Date: 2012-07-28 21:24+0000\n"
-"Last-Translator: Fábio Martinelli <webmaster@guaru.net>\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: 2012-08-07 05:39+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:43+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_check_writing
 #: selection:res.company,check_layout:0
diff --git a/addons/account_check_writing/i18n/ro.po b/addons/account_check_writing/i18n/ro.po
index 03611eeeeac..0dc0a90cd9c 100644
--- a/addons/account_check_writing/i18n/ro.po
+++ b/addons/account_check_writing/i18n/ro.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:39+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:43+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_check_writing
 #: selection:res.company,check_layout:0
diff --git a/addons/account_check_writing/i18n/sr@latin.po b/addons/account_check_writing/i18n/sr@latin.po
index 33f05183ed9..fa9745c9ab8 100644
--- a/addons/account_check_writing/i18n/sr@latin.po
+++ b/addons/account_check_writing/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:39+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:43+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_check_writing
 #: selection:res.company,check_layout:0
diff --git a/addons/account_check_writing/i18n/sv.po b/addons/account_check_writing/i18n/sv.po
index 8e23e6fc1cc..acc5fbf57eb 100644
--- a/addons/account_check_writing/i18n/sv.po
+++ b/addons/account_check_writing/i18n/sv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:39+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:43+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_check_writing
 #: selection:res.company,check_layout:0
diff --git a/addons/account_check_writing/i18n/tr.po b/addons/account_check_writing/i18n/tr.po
index 1bcae9fcdbe..1adff67eb62 100644
--- a/addons/account_check_writing/i18n/tr.po
+++ b/addons/account_check_writing/i18n/tr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:39+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:43+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_check_writing
 #: selection:res.company,check_layout:0
diff --git a/addons/account_check_writing/i18n/zh_CN.po b/addons/account_check_writing/i18n/zh_CN.po
index 8ddc5956799..34b624d2c06 100644
--- a/addons/account_check_writing/i18n/zh_CN.po
+++ b/addons/account_check_writing/i18n/zh_CN.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:39+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:43+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_check_writing
 #: selection:res.company,check_layout:0
diff --git a/addons/account_check_writing/i18n/zh_TW.po b/addons/account_check_writing/i18n/zh_TW.po
new file mode 100644
index 00000000000..2efe8575877
--- /dev/null
+++ b/addons/account_check_writing/i18n/zh_TW.po
@@ -0,0 +1,205 @@
+# Chinese (Traditional) 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-02-08 00:35+0000\n"
+"PO-Revision-Date: 2012-08-22 06:48+0000\n"
+"Last-Translator: Eric Huang <eh@cenoq.com>\n"
+"Language-Team: Cenoq\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:43+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
+
+#. module: account_check_writing
+#: selection:res.company,check_layout:0
+msgid "Check on Top"
+msgstr "支票位於頂部"
+
+#. module: account_check_writing
+#: model:ir.actions.act_window,help:account_check_writing.action_write_check
+msgid ""
+"The check payment form allows you to track the payment you do to your "
+"suppliers specially by check. When you select a supplier, the payment method "
+"and an amount for the payment, OpenERP will propose to reconcile your "
+"payment with the open supplier invoices or bills.You can print the check"
+msgstr ""
+"付款支票表單用來跟蹤你對供應商的支票付款。選擇了一個供應商、付款方式、付款金額以後，OpenERP會建議你對未核銷的供應商發票進行核銷。你可以列印支票。"
+
+#. module: account_check_writing
+#: view:account.voucher:0
+#: model:ir.actions.report.xml,name:account_check_writing.account_print_check_bottom
+#: model:ir.actions.report.xml,name:account_check_writing.account_print_check_middle
+#: model:ir.actions.report.xml,name:account_check_writing.account_print_check_top
+msgid "Print Check"
+msgstr "列印支票"
+
+#. module: account_check_writing
+#: selection:res.company,check_layout:0
+msgid "Check in middle"
+msgstr "支票位於中間"
+
+#. 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 ""
+"支票位於頂部與Quicken, QuickBooks 和 Microsoft Money兼容。支票位於中間與Peachtree, ACCPAC 和 "
+"DacEasy兼容。支票位於底部只與Peachtree, ACCPAC 和 DacEasy兼容。"
+
+#. module: account_check_writing
+#: selection:res.company,check_layout:0
+msgid "Check on bottom"
+msgstr "支票位於底部"
+
+#. module: account_check_writing
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr "錯誤！您不能創建遞歸公司."
+
+#. 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 "如果這個帳簿用於開支票，請勾選這裡。"
+
+#. module: account_check_writing
+#: field:account.journal,allow_check_writing:0
+msgid "Allow Check writing"
+msgstr "允許開支票"
+
+#. 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 "描述"
+
+#. module: account_check_writing
+#: model:ir.model,name:account_check_writing.model_account_journal
+msgid "Journal"
+msgstr "帳簿"
+
+#. 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 "開支票"
+
+#. 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 "折扣"
+
+#. 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 "原始金額"
+
+#. module: account_check_writing
+#: view:res.company:0
+msgid "Configuration"
+msgstr "設置"
+
+#. module: account_check_writing
+#: field:account.voucher,allow_check:0
+msgid "Allow Check Writing"
+msgstr "允許開支票"
+
+#. 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 "付款"
+
+#. module: account_check_writing
+#: field:account.journal,use_preprint_check:0
+msgid "Use Preprinted Check"
+msgstr "使用套表列印的支票"
+
+#. module: account_check_writing
+#: sql_constraint:res.company:0
+msgid "The company name must be unique !"
+msgstr "公司名稱必須唯一！"
+
+#. 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 "到期日期"
+
+#. module: account_check_writing
+#: model:ir.model,name:account_check_writing.model_res_company
+msgid "Companies"
+msgstr "公司"
+
+#. module: account_check_writing
+#: view:res.company:0
+msgid "Default Check Layout"
+msgstr "預設支票版型"
+
+#. module: account_check_writing
+#: constraint:account.journal:0
+msgid ""
+"Configuration error! The currency chosen should be shared by the default "
+"accounts too."
+msgstr "設置錯誤！所選幣種應與默認科目共享。"
+
+#. module: account_check_writing
+#: report:account.print.check.bottom:0
+#: report:account.print.check.middle:0
+msgid "Balance Due"
+msgstr "截止餘額"
+
+#. 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 "支票金額"
+
+#. module: account_check_writing
+#: model:ir.model,name:account_check_writing.model_account_voucher
+msgid "Accounting Voucher"
+msgstr "手工憑證"
+
+#. module: account_check_writing
+#: sql_constraint:account.journal:0
+msgid "The name of the journal must be unique per company !"
+msgstr "每個公司的帳簿名稱必須唯一！"
+
+#. module: account_check_writing
+#: sql_constraint:account.journal:0
+msgid "The code of the journal must be unique per company !"
+msgstr "每個公司的帳簿編碼必須唯一！"
+
+#. module: account_check_writing
+#: field:account.voucher,amount_in_word:0
+msgid "Amount in Word"
+msgstr "金額大寫"
+
+#. module: account_check_writing
+#: report:account.print.check.top:0
+msgid "Open Balance"
+msgstr "期初餘額"
+
+#. module: account_check_writing
+#: field:res.company,check_layout:0
+msgid "Choose Check layout"
+msgstr "選擇支票版型"
+
+#~ msgid "Default Check layout"
+#~ msgstr "默認支票格式"
diff --git a/addons/account_coda/__openerp__.py b/addons/account_coda/__openerp__.py
index 094ab45acc0..03527eaa2ec 100644
--- a/addons/account_coda/__openerp__.py
+++ b/addons/account_coda/__openerp__.py
@@ -20,74 +20,92 @@
 #
 ##############################################################################
 {
-    "name": 'Belgium - Import Bank CODA Statements',
-    "version": '2.1',
-    "author": 'Noviat',
-    "category": 'Accounting & Finance',
-    "description": '''
+    'name': 'Belgium - Import Bank CODA Statements',
+    'version': '2.1',
+    'author': 'Noviat',
+    'category': 'Accounting & Finance',
+    'description': '''
 Module to import CODA bank statements.
 ======================================
 
 Supported are CODA flat files in V2 format from Belgian bank accounts.
+----------------------------------------------------------------------
     * CODA v1 support.
     * CODA v2.2 support.
     * Foreign Currency support.
     * Support for all data record types (0, 1, 2, 3, 4, 8, 9).
-    * Parsing & logging of all Transaction Codes and Structured Format Communications.
+    * Parsing & logging of all Transaction Codes and Structured Format 
+      Communications.
     * Automatic Financial Journal assignment via CODA configuration parameters.
     * Support for multiple Journals per Bank Account Number.
-    * Support for multiple statements from different bank accounts in a single CODA file.
-    * Support for 'parsing only' CODA Bank Accounts (defined as type='info' in the CODA Bank Account configuration records).
-    * Multi-language CODA parsing, parsing configuration data provided for EN, NL, FR.
+    * Support for multiple statements from different bank accounts in a single 
+      CODA file.
+    * Support for 'parsing only' CODA Bank Accounts (defined as type='info' in 
+      the CODA Bank Account configuration records).
+    * Multi-language CODA parsing, parsing configuration data provided for EN, 
+      NL, FR.
 
 The machine readable CODA Files are parsed and stored in human readable format in 
 CODA Bank Statements. Also Bank Statements are generated containing a subset of 
-the CODA information (only those transaction lines that are required for the creation 
-of the Financial Accounting records). The CODA Bank Statement is a 'read-only' 
-object, hence remaining a reliable representation of the original CODA file whereas 
-the Bank Statement will get modified as required by accounting business processes.
+the CODA information (only those transaction lines that are required for the 
+creation of the Financial Accounting records). The CODA Bank Statement is a 
+'read-only' object, hence remaining a reliable representation of the original
+CODA file whereas the Bank Statement will get modified as required by accounting 
+business processes.
 
 CODA Bank Accounts configured as type 'Info' will only generate CODA Bank Statements.
 
-A removal of one object in the CODA processing results in the removal of the associated 
-objects. The removal of a CODA File containing multiple Bank Statements will also 
-remove those associated statements.
+A removal of one object in the CODA processing results in the removal of the 
+associated objects. The removal of a CODA File containing multiple Bank 
+Statements will also remove those associated statements.
 
 The following reconciliation logic has been implemented in the CODA processing:
-
-1) The Company's Bank Account Number of the CODA statement is compared against the Bank Account Number field of the Company's CODA Bank Account configuration records (whereby bank accounts defined in type='info' configuration records are ignored). If this is the case an 'internal transfer' transaction is generated using the 'Internal Transfer Account' field of the CODA File Import wizard.
-2) As a second step the 'Structured Communication' field of the CODA transaction line is matched against the reference field of in- and outgoing invoices (supported : Belgian Structured Communication Type).
-3) When the previous step doesn't find a match, the transaction counterparty is located via the Bank Account Number configured on the OpenERP Customer and Supplier records.
-4) In case the previous steps are not successful, the transaction is generated by using the 'Default Account for Unrecognized Movement' field of the CODA File Import wizard in order to allow further manual processing.
+-------------------------------------------------------------------------------
+    1) The Company's Bank Account Number of the CODA statement is compared against 
+       the Bank Account Number field of the Company's CODA Bank Account 
+       configuration records (whereby bank accounts defined in type='info' 
+       configuration records are ignored). If this is the case an 'internal transfer'
+       transaction is generated using the 'Internal Transfer Account' field of the 
+       CODA File Import wizard.
+    2) As a second step the 'Structured Communication' field of the CODA transaction
+       line is matched against the reference field of in- and outgoing invoices 
+       (supported : Belgian Structured Communication Type).
+    3) When the previous step doesn't find a match, the transaction counterparty is 
+       located via the Bank Account Number configured on the OpenERP Customer and 
+       Supplier records.
+    4) In case the previous steps are not successful, the transaction is generated 
+       by using the 'Default Account for Unrecognized Movement' field of the CODA 
+       File Import wizard in order to allow further manual processing.
 
 In stead of a manual adjustment of the generated Bank Statements, you can also 
 re-import the CODA after updating the OpenERP database with the information that 
 was missing to allow automatic reconciliation.
 
 Remark on CODA V1 support:
-In some cases a transaction code, transaction category or structured communication code has been given a new or clearer description in CODA V2.
-The description provided by the CODA configuration tables is based upon the CODA V2.2 specifications.
+~~~~~~~~~~~~~~~~~~~~~~~~~~
+In some cases a transaction code, transaction category or structured 
+communication code has been given a new or clearer description in CODA V2.The
+description provided by the CODA configuration tables is based upon the CODA 
+V2.2 specifications.
 If required, you can manually adjust the descriptions via the CODA configuration menu.
 ''',
-    "images"   : ["images/coda_logs.jpeg","images/import_coda_logs.jpeg"],
-    "depends": ['account_voucher','base_iban', 'l10n_be_invoice_bba', 'account_bank_statement_extensions'],
-    "demo_xml": [],
-    "init_xml": [
+    'images'   : ['images/coda_logs.jpeg','images/import_coda_logs.jpeg'],
+    'depends': ['account_voucher','base_iban', 'l10n_be_invoice_bba', 'account_bank_statement_extensions'],
+    'demo': [],
+    'data': [
         'account_coda_trans_type.xml',
         'account_coda_trans_code.xml',
         'account_coda_trans_category.xml',
         'account_coda_comm_type.xml',
-    ],
-    "update_xml" : [
         'security/ir.model.access.csv',
         'security/account_security.xml',
         'account_coda_wizard.xml',
         'account_coda_view.xml',
     ],
-    "auto_install": False,
-    "installable": True,
-    "license": 'AGPL-3',
-    "certificate" : "001237207321716002029",
+    'auto_install': False,
+    'installable': True,
+    'license': 'AGPL-3',
+    'certificate' : '001237207321716002029',
 }
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account_coda/i18n/ar.po b/addons/account_coda/i18n/ar.po
index 409ebef1aca..ff41c707eb6 100644
--- a/addons/account_coda/i18n/ar.po
+++ b/addons/account_coda/i18n/ar.po
@@ -14,13 +14,13 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:26+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:31+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_09_21
 msgid "Cash withdrawal on card (PROTON)"
-msgstr ""
+msgstr "السحب النقدي على البطاقة (بروتون)"
 
 #. module: account_coda
 #: model:account.coda.trans.category,description:account_coda.actrca_412
@@ -30,12 +30,12 @@ msgstr "تحذير بغرامات نهاية الصلاحية"
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_09_11
 msgid "Your purchase of luncheon vouchers"
-msgstr ""
+msgstr "مشترواتك من بدل التغذية"
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_11_05
 msgid "Partial payment subscription"
-msgstr ""
+msgstr "إشتراك الدفع الجزئي"
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_01_54
@@ -50,22 +50,22 @@ msgstr "أمر نقل فردي من المصرف"
 #. module: account_coda
 #: model:account.coda.trans.code,comment:account_coda.actcc_80_21
 msgid "Charges for preparing pay packets"
-msgstr ""
+msgstr "تكاليف لإعداد حزم الأجور"
 
 #. module: account_coda
 #: model:account.coda.trans.type,description:account_coda.actt_9
 msgid "Detail of 7. The records in a separate application keep type 9."
-msgstr ""
+msgstr "التفاصيل من ٧. السجلات في التطبيق المنفصل تبقى على نوع ٩."
 
 #. module: account_coda
 #: model:account.coda.trans.category,description:account_coda.actrca_426
 msgid "Belgian broker's commission"
-msgstr ""
+msgstr "لجنة الوسيط البلجيى"
 
 #. module: account_coda
 #: model:account.coda.trans.category,description:account_coda.actrca_031
 msgid "Charges foreign cheque"
-msgstr ""
+msgstr "ثمن الشيك الخارجى"
 
 #. module: account_coda
 #: model:account.coda.trans.category,description:account_coda.actrca_002
@@ -83,11 +83,13 @@ msgid ""
 "cheques debited on account, but debit cancelled afterwards for lack of cover "
 "(double debit/contra-entry of transaction 01 or 05)"
 msgstr ""
+"خصم الشيكات على حساب، لكن تم الإلغاء بعد ذلك لعدم التغطية (ضعف الخصم/  قيد "
+"عكسي للعملية ٠١ - ٠٥)"
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_47_05
 msgid "Bill claimed back"
-msgstr ""
+msgstr "تم إسترداد الفاتورة"
 
 #. module: account_coda
 #: model:account.coda.trans.category,description:account_coda.actrca_016
@@ -103,12 +105,12 @@ msgstr "تم إستيراد ملف CODA:"
 #. module: account_coda
 #: model:account.coda.trans.category,description:account_coda.actrca_066
 msgid "Fixed loan advance - reimbursement"
-msgstr ""
+msgstr "القرض ثابت مقدما - السداد"
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_09_05
 msgid "Purchase of foreign bank notes"
-msgstr ""
+msgstr "مشتريات أوراق نقد أجنبية"
 
 #. module: account_coda
 #: code:addons/account_coda/wizard/account_coda_import.py:277
@@ -127,7 +129,7 @@ msgstr "حساب التأمين"
 #. module: account_coda
 #: model:account.coda.trans.category,description:account_coda.actrca_042
 msgid "Payment card costs"
-msgstr ""
+msgstr "تكاليف بطاقة الدفع"
 
 #. module: account_coda
 #: model:account.coda.trans.category,description:account_coda.actrca_212
@@ -146,17 +148,17 @@ msgstr ""
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_01_66
 msgid "Financial centralization"
-msgstr ""
+msgstr "المركزية المالية"
 
 #. module: account_coda
 #: model:account.coda.trans.category,description:account_coda.actrca_420
 msgid "Retention charges"
-msgstr ""
+msgstr "استبقاء الرسوم"
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_01_50
 msgid "Transfer in your favour"
-msgstr ""
+msgstr "نقل في صالحك"
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_01_87
@@ -172,17 +174,17 @@ msgstr ""
 #: model:account.coda.trans.code,description:account_coda.actcc_43_87
 #: model:account.coda.trans.code,description:account_coda.actcc_47_87
 msgid "Reimbursement of costs"
-msgstr ""
+msgstr "سداد التكاليف"
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_07_56
 msgid "Remittance of supplier's bill with guarantee"
-msgstr ""
+msgstr "التحويلات المالية من فاتورة المورد مع الضمان"
 
 #. module: account_coda
 #: model:account.coda.comm.type,description:account_coda.acct_002
 msgid "Communication of the bank"
-msgstr ""
+msgstr "إتصالات البنك"
 
 #. module: account_coda
 #: field:coda.bank.statement.line,amount:0
@@ -197,12 +199,12 @@ msgstr ""
 #. module: account_coda
 #: model:account.coda.trans.category,description:account_coda.actrca_413
 msgid "Acceptance charges"
-msgstr ""
+msgstr "قبول الثمن"
 
 #. module: account_coda
 #: field:coda.bank.statement.line,counterparty_bic:0
 msgid "Counterparty BIC"
-msgstr ""
+msgstr "رقم كود البنك (BIC) للطرف الآخر"
 
 #. module: account_coda
 #: help:coda.bank.account,def_receivable:0
@@ -269,12 +271,12 @@ msgstr ""
 #. module: account_coda
 #: model:account.coda.trans.category,description:account_coda.actrca_207
 msgid "Non-conformity fee"
-msgstr ""
+msgstr "رسوم عدم المطابقة"
 
 #. module: account_coda
 #: model:account.coda.trans.category,description:account_coda.actrca_022
 msgid "Priority costs"
-msgstr ""
+msgstr "أولوية التكاليف"
 
 #. module: account_coda
 #: code:addons/account_coda/wizard/account_coda_import.py:268
@@ -288,7 +290,7 @@ msgstr ""
 #. module: account_coda
 #: model:account.coda.trans.category,description:account_coda.actrca_045
 msgid "Handling costs"
-msgstr ""
+msgstr "التعامل مع التكاليف"
 
 #. module: account_coda
 #: model:account.coda.trans.code,comment:account_coda.actcc_47_13
@@ -303,38 +305,38 @@ msgstr "تاريخ الاستيراد"
 #. module: account_coda
 #: model:account.coda.trans.category,description:account_coda.actrca_039
 msgid "Telecommunications"
-msgstr ""
+msgstr "الاتصالات السلكية واللاسلكية"
 
 #. module: account_coda
 #: field:coda.bank.statement.line,globalisation_id:0
 msgid "Globalisation ID"
-msgstr ""
+msgstr "معرف العولمة"
 
 #. module: account_coda
 #: code:addons/account_coda/account_coda.py:399
 #, python-format
 msgid "Delete operation not allowed !"
-msgstr ""
+msgstr "حذف العملية غير مسموح !"
 
 #. module: account_coda
 #: model:account.coda.trans.category,description:account_coda.actrca_000
 msgid "Net amount"
-msgstr ""
+msgstr "صافي القيمة"
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_03_11
 msgid "Department store cheque"
-msgstr ""
+msgstr "إدارة الشيكات"
 
 #. module: account_coda
 #: model:account.coda.trans.category,description:account_coda.actrca_206
 msgid "Surety fee/payment under reserve"
-msgstr ""
+msgstr "رسوم الضمان / الدفع بموجب الاحتياطي"
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_04_53
 msgid "Cash deposit at an ATM"
-msgstr ""
+msgstr "الإيداع النقدي من أجهزة الصرف الآلي"
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_30_52
@@ -350,13 +352,13 @@ msgstr ""
 #. module: account_coda
 #: model:ir.model,name:account_coda.model_account_bank_statement_line_global
 msgid "Batch Payment Info"
-msgstr ""
+msgstr "معلومات دفعة السداد"
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_00_33
 #: model:account.coda.trans.code,description:account_coda.actcc_00_83
 msgid "Value correction"
-msgstr ""
+msgstr "تصحيح القيمة"
 
 #. module: account_coda
 #: model:account.coda.trans.code,comment:account_coda.actcc_80_27
@@ -366,17 +368,17 @@ msgstr ""
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_47_01
 msgid "Payment of foreign bill"
-msgstr ""
+msgstr "مدفوعات فواتير أجنبية"
 
 #. module: account_coda
 #: model:account.coda.trans.category,description:account_coda.actrca_024
 msgid "Growth premium"
-msgstr ""
+msgstr "علاوة نمو"
 
 #. module: account_coda
 #: selection:account.coda.trans.code,type:0
 msgid "Transaction Code"
-msgstr ""
+msgstr "رسم الحركة"
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_47_13
@@ -386,17 +388,17 @@ msgstr ""
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcf_05
 msgid "Direct debit"
-msgstr ""
+msgstr "الخصم المباشر"
 
 #. module: account_coda
 #: model:account.coda.trans.code,comment:account_coda.actcc_47_11
 msgid "Bills of lading"
-msgstr ""
+msgstr "فواتير الشحن"
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcf_00
 msgid "Undefined transactions"
-msgstr ""
+msgstr "معاملات غير معرفة"
 
 #. module: account_coda
 #: model:account.coda.trans.code,comment:account_coda.actcc_11_62
@@ -426,7 +428,7 @@ msgstr ""
 #. module: account_coda
 #: constraint:account.bank.statement:0
 msgid "The journal and period chosen have to belong to the same company."
-msgstr ""
+msgstr "يجب أن يكون اليومية و الفترة مرتبطين لشركة واحدة."
 
 #. module: account_coda
 #: model:account.coda.comm.type,description:account_coda.acct_115
@@ -467,7 +469,7 @@ msgstr "التواصل"
 #: model:account.coda.trans.code,description:account_coda.actcc_00_35
 #: model:account.coda.trans.code,description:account_coda.actcc_00_85
 msgid "Correction"
-msgstr ""
+msgstr "تصحيح"
 
 #. module: account_coda
 #: code:addons/account_coda/wizard/account_coda_import.py:404
@@ -486,7 +488,7 @@ msgstr ""
 #: model:account.coda.trans.code,description:account_coda.actcc_30_33
 #: model:account.coda.trans.code,description:account_coda.actcc_30_83
 msgid "Value (date) correction"
-msgstr ""
+msgstr "تصحيح قيم التاريخ"
 
 #. module: account_coda
 #: model:account.coda.trans.category,description:account_coda.actrca_063
@@ -523,18 +525,18 @@ msgstr "معلومات إضافية"
 #. module: account_coda
 #: model:account.coda.comm.type,description:account_coda.acct_120
 msgid "Correction of a transaction"
-msgstr ""
+msgstr "تصحيح المعاملة"
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_01_64
 #: model:account.coda.trans.code,description:account_coda.actcc_41_64
 msgid "Transfer to your account"
-msgstr ""
+msgstr "نقلها لحسابك"
 
 #. module: account_coda
 #: model:account.coda.comm.type,description:account_coda.acct_124
 msgid "Number of the credit card"
-msgstr ""
+msgstr "عدد كروت الإئتمان"
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_80_13
@@ -550,7 +552,7 @@ msgstr ""
 #. module: account_coda
 #: model:account.coda.comm.type,description:account_coda.acct_104
 msgid "Equivalent in EUR"
-msgstr ""
+msgstr "المساوي لليورو"
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_47_50
@@ -560,7 +562,7 @@ msgstr ""
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_03_03
 msgid "Your purchase by payment card"
-msgstr ""
+msgstr "مشترواتك بكارت الإئتمان"
 
 #. module: account_coda
 #: model:account.coda.trans.type,description:account_coda.actt_1
@@ -584,12 +586,12 @@ msgstr ""
 #. module: account_coda
 #: view:coda.bank.statement.line:0
 msgid "Credit Transactions."
-msgstr ""
+msgstr "العمليات الائتمانية."
 
 #. module: account_coda
 #: field:account.coda.trans.type,type:0
 msgid "Transaction Type"
-msgstr ""
+msgstr "نوع المعاملة"
 
 #. module: account_coda
 #: model:ir.model,name:account_coda.model_account_coda
@@ -599,18 +601,18 @@ msgstr ""
 #. module: account_coda
 #: model:account.coda.trans.category,description:account_coda.actrca_029
 msgid "Protest charges"
-msgstr ""
+msgstr "رسوم الإعتراض"
 
 #. module: account_coda
 #: model:account.coda.trans.category,description:account_coda.actrca_053
 #: model:account.coda.trans.code,description:account_coda.actcc_80_43
 msgid "Printing of forms"
-msgstr ""
+msgstr "طباعة النماذج"
 
 #. module: account_coda
 #: model:account.coda.trans.category,description:account_coda.actrca_003
 msgid "Credit commission"
-msgstr ""
+msgstr "لجنة الائتمان"
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_43_58
@@ -637,7 +639,7 @@ msgstr ""
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_11_50
 msgid "Sale of securities"
-msgstr ""
+msgstr "مبيعات الأوراق المالية"
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_01_51
@@ -718,7 +720,7 @@ msgstr ""
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_13_01
 msgid "Short-term loan"
-msgstr ""
+msgstr "قروض قصيرة الأمد"
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcf_01
@@ -733,30 +735,30 @@ msgstr ""
 #. module: account_coda
 #: model:account.coda.trans.category,description:account_coda.actrca_402
 msgid "Certification costs"
-msgstr ""
+msgstr "شهادة التكاليف"
 
 #. module: account_coda
 #: model:account.coda.trans.category,description:account_coda.actrca_015
 msgid "Correspondent charges"
-msgstr ""
+msgstr "أثمان متوافقة"
 
 #. module: account_coda
 #: model:account.coda.trans.category,description:account_coda.actrca_415
 #: model:account.coda.trans.code,description:account_coda.actcc_80_39
 msgid "Surety fee"
-msgstr ""
+msgstr "رسوم الضمان"
 
 #. module: account_coda
 #: model:account.coda.trans.category,description:account_coda.actrca_017
 #: model:account.coda.trans.code,description:account_coda.actcc_80_23
 #: model:account.coda.trans.code,description:account_coda.actcc_80_41
 msgid "Research costs"
-msgstr ""
+msgstr "تكاليف البحث"
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_01_07
 msgid "Collective transfer"
-msgstr ""
+msgstr "نقل تجميعي"
 
 #. module: account_coda
 #: code:addons/account_coda/wizard/account_coda_import.py:912
@@ -787,7 +789,7 @@ msgstr ""
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_01_52
 msgid "Payment in your favour"
-msgstr ""
+msgstr "مدفوعات لصالحك"
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_80_08
@@ -824,7 +826,7 @@ msgstr ""
 #. module: account_coda
 #: model:account.coda.trans.code,comment:account_coda.actcc_01_52
 msgid "Payment by a third person"
-msgstr ""
+msgstr "مدفوعات من شخص ثالث"
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_47_60
@@ -846,12 +848,12 @@ msgstr "ملاحظات"
 #. module: account_coda
 #: field:coda.bank.statement,balance_end_real:0
 msgid "Ending Balance"
-msgstr ""
+msgstr "رصيد ختامي"
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_11_64
 msgid "Your issue"
-msgstr ""
+msgstr "إصدارك"
 
 #. module: account_coda
 #: code:addons/account_coda/wizard/account_coda_import.py:870
@@ -871,7 +873,7 @@ msgstr ""
 #. module: account_coda
 #: field:coda.bank.statement.line,val_date:0
 msgid "Valuta Date"
-msgstr ""
+msgstr "تاريخ سعر العملة"
 
 #. module: account_coda
 #: model:account.coda.trans.code,comment:account_coda.actcc_11_01
@@ -929,7 +931,7 @@ msgstr "شركة"
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_03_35
 msgid "Cash advance"
-msgstr ""
+msgstr "نقدية كمقدم"
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcf_47
@@ -996,17 +998,17 @@ msgstr "مورِّد"
 #. module: account_coda
 #: model:account.coda.trans.category,description:account_coda.actrca_009
 msgid "Travelling expenses"
-msgstr ""
+msgstr "نفقات السفر"
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcf_30
 msgid "Various transactions"
-msgstr ""
+msgstr "معاملات متنوعة"
 
 #. module: account_coda
 #: model:account.coda.trans.category,description:account_coda.actrca_406
 msgid "Collection charges"
-msgstr ""
+msgstr "رسوم إنتقاء"
 
 #. module: account_coda
 #: view:coda.bank.statement:0
@@ -1021,7 +1023,7 @@ msgstr "دفع نقدي"
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_80_27
 msgid "Subscription fee"
-msgstr ""
+msgstr "رسوم إشتراك"
 
 #. module: account_coda
 #: model:account.coda.trans.category,description:account_coda.actrca_036
@@ -1123,6 +1125,7 @@ msgid ""
 "Code to identify transactions belonging to the same globalisation level "
 "within a batch payment"
 msgstr ""
+"كود تعريف المعاملات التى تنتمى الى نفس مستوى العالمي من خلال دفعة السداد"
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_07_05
@@ -1634,7 +1637,7 @@ msgstr "كشف حساب بنك"
 #. module: account_coda
 #: field:coda.bank.statement.line,counterparty_name:0
 msgid "Counterparty Name"
-msgstr ""
+msgstr "اسم الطرف الآخر"
 
 #. module: account_coda
 #: model:account.coda.trans.category,description:account_coda.actrca_006
@@ -2048,7 +2051,7 @@ msgstr ""
 #. module: account_coda
 #: view:coda.bank.statement.line:0
 msgid "Glob. Am."
-msgstr ""
+msgstr "القيمة الإجمالية"
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_80_17
@@ -2714,7 +2717,7 @@ msgstr ""
 #: view:coda.bank.statement:0
 #: view:coda.bank.statement.line:0
 msgid "Glob. Amount"
-msgstr ""
+msgstr "المبلغ الإجمالي"
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_09_58
@@ -2876,7 +2879,7 @@ msgstr ""
 #. module: account_coda
 #: field:coda.bank.statement.line,counterparty_number:0
 msgid "Counterparty Number"
-msgstr ""
+msgstr "رقم الطرف الآخر"
 
 #. module: account_coda
 #: view:account.coda.import:0
@@ -3079,7 +3082,7 @@ msgstr ""
 #. module: account_coda
 #: sql_constraint:account.bank.statement.line.global:0
 msgid "The code must be unique !"
-msgstr ""
+msgstr "يجب أن يكون الكود مميزاً !"
 
 #. module: account_coda
 #: help:coda.bank.account,currency:0
@@ -3297,7 +3300,7 @@ msgstr ""
 #. module: account_coda
 #: field:coda.bank.statement.line,counterparty_currency:0
 msgid "Counterparty Currency"
-msgstr ""
+msgstr "عملة الطرف الآخر"
 
 #. module: account_coda
 #: model:account.coda.trans.category,description:account_coda.actrca_202
diff --git a/addons/account_coda/i18n/bg.po b/addons/account_coda/i18n/bg.po
index 82c333d4a07..ab70a689bce 100644
--- a/addons/account_coda/i18n/bg.po
+++ b/addons/account_coda/i18n/bg.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:26+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:31+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_09_21
diff --git a/addons/account_coda/i18n/ca.po b/addons/account_coda/i18n/ca.po
index 0176dd77e22..025b0e8b3de 100644
--- a/addons/account_coda/i18n/ca.po
+++ b/addons/account_coda/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:26+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:31+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_09_21
diff --git a/addons/account_coda/i18n/da.po b/addons/account_coda/i18n/da.po
index a1e55dffaa7..326f161053d 100644
--- a/addons/account_coda/i18n/da.po
+++ b/addons/account_coda/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:26+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:31+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_09_21
diff --git a/addons/account_coda/i18n/de.po b/addons/account_coda/i18n/de.po
index 21387895d18..69734f33073 100644
--- a/addons/account_coda/i18n/de.po
+++ b/addons/account_coda/i18n/de.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:26+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:31+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_09_21
diff --git a/addons/account_coda/i18n/el.po b/addons/account_coda/i18n/el.po
index f97b7d2c908..4dc165df765 100644
--- a/addons/account_coda/i18n/el.po
+++ b/addons/account_coda/i18n/el.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:26+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:31+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_09_21
diff --git a/addons/account_coda/i18n/en_GB.po b/addons/account_coda/i18n/en_GB.po
index 34877f12e4a..cf5adf963e3 100644
--- a/addons/account_coda/i18n/en_GB.po
+++ b/addons/account_coda/i18n/en_GB.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:27+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:32+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_09_21
diff --git a/addons/account_coda/i18n/es.po b/addons/account_coda/i18n/es.po
index 5b25f024134..97c53948db9 100644
--- a/addons/account_coda/i18n/es.po
+++ b/addons/account_coda/i18n/es.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:27+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:32+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_09_21
diff --git a/addons/account_coda/i18n/es_CR.po b/addons/account_coda/i18n/es_CR.po
index c2e39055856..0a8d3fd36fb 100644
--- a/addons/account_coda/i18n/es_CR.po
+++ b/addons/account_coda/i18n/es_CR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:27+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:32+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 "Language: es\n"
 
 #. module: account_coda
diff --git a/addons/account_coda/i18n/es_EC.po b/addons/account_coda/i18n/es_EC.po
index bf0190949f8..a54086b3a47 100644
--- a/addons/account_coda/i18n/es_EC.po
+++ b/addons/account_coda/i18n/es_EC.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:27+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:32+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_09_21
diff --git a/addons/account_coda/i18n/es_PY.po b/addons/account_coda/i18n/es_PY.po
index 61e1c70cd00..25dfc601801 100644
--- a/addons/account_coda/i18n/es_PY.po
+++ b/addons/account_coda/i18n/es_PY.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:27+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:32+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_09_21
diff --git a/addons/account_coda/i18n/et.po b/addons/account_coda/i18n/et.po
index 58a5306722b..f2a628a9b6f 100644
--- a/addons/account_coda/i18n/et.po
+++ b/addons/account_coda/i18n/et.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:26+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:31+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_09_21
diff --git a/addons/account_coda/i18n/fa.po b/addons/account_coda/i18n/fa.po
index 52e3fd35f17..581f1dd1135 100644
--- a/addons/account_coda/i18n/fa.po
+++ b/addons/account_coda/i18n/fa.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:27+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:32+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_09_21
diff --git a/addons/account_coda/i18n/fi.po b/addons/account_coda/i18n/fi.po
index 4b19bec3304..35326f14129 100644
--- a/addons/account_coda/i18n/fi.po
+++ b/addons/account_coda/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:26+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:31+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_09_21
diff --git a/addons/account_coda/i18n/fr.po b/addons/account_coda/i18n/fr.po
index fd16b59661d..d94508963bf 100644
--- a/addons/account_coda/i18n/fr.po
+++ b/addons/account_coda/i18n/fr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:26+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:31+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_09_21
diff --git a/addons/account_coda/i18n/gl.po b/addons/account_coda/i18n/gl.po
index 8c3fb121484..f4f23076851 100644
--- a/addons/account_coda/i18n/gl.po
+++ b/addons/account_coda/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:26+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:31+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_09_21
diff --git a/addons/account_coda/i18n/hr.po b/addons/account_coda/i18n/hr.po
index 3a5bfaa8744..76d310c97c1 100644
--- a/addons/account_coda/i18n/hr.po
+++ b/addons/account_coda/i18n/hr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:27+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:32+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_09_21
diff --git a/addons/account_coda/i18n/hu.po b/addons/account_coda/i18n/hu.po
index 8ea46c0b4f8..f4b9eb3b99f 100644
--- a/addons/account_coda/i18n/hu.po
+++ b/addons/account_coda/i18n/hu.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:26+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:31+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_09_21
diff --git a/addons/account_coda/i18n/it.po b/addons/account_coda/i18n/it.po
index da1085e1ebc..301969ee5a3 100644
--- a/addons/account_coda/i18n/it.po
+++ b/addons/account_coda/i18n/it.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:26+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:32+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_09_21
diff --git a/addons/account_coda/i18n/ja.po b/addons/account_coda/i18n/ja.po
index f00e380c995..966108f723f 100644
--- a/addons/account_coda/i18n/ja.po
+++ b/addons/account_coda/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:27+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:32+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_09_21
diff --git a/addons/account_coda/i18n/lv.po b/addons/account_coda/i18n/lv.po
index c79bcc98ff6..b9248a496d9 100644
--- a/addons/account_coda/i18n/lv.po
+++ b/addons/account_coda/i18n/lv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:27+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:32+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_09_21
diff --git a/addons/account_coda/i18n/mn.po b/addons/account_coda/i18n/mn.po
index 998797c671f..7fbac7e3d52 100644
--- a/addons/account_coda/i18n/mn.po
+++ b/addons/account_coda/i18n/mn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:27+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:32+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_09_21
@@ -25,12 +25,12 @@ msgstr ""
 #. module: account_coda
 #: model:account.coda.trans.category,description:account_coda.actrca_412
 msgid "Advice of expiry charges"
-msgstr ""
+msgstr "Хугацаа дууссаныг өөрчлөх заавар"
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_09_11
 msgid "Your purchase of luncheon vouchers"
-msgstr ""
+msgstr "Чиний өглөөний хоолны худалдан авах ваучер"
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_11_05
@@ -103,7 +103,7 @@ msgstr ""
 #. module: account_coda
 #: model:account.coda.trans.category,description:account_coda.actrca_066
 msgid "Fixed loan advance - reimbursement"
-msgstr ""
+msgstr "Үндсэн зээлийн урьдчилгаа - нөхөн төлбөр"
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_09_05
@@ -197,7 +197,7 @@ msgstr ""
 #. module: account_coda
 #: model:account.coda.trans.category,description:account_coda.actrca_413
 msgid "Acceptance charges"
-msgstr ""
+msgstr "Өөрчлөлтийг хүлээн авах"
 
 #. module: account_coda
 #: field:coda.bank.statement.line,counterparty_bic:0
@@ -227,7 +227,7 @@ msgstr ""
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_07_39
 msgid "Return of an irregular bill of exchange"
-msgstr ""
+msgstr "Арилжааны нэхэмжлэлийг буруу буцаасан"
 
 #. module: account_coda
 #: model:account.coda.trans.category,description:account_coda.actrca_011
@@ -298,7 +298,7 @@ msgstr ""
 #. module: account_coda
 #: field:account.coda,date:0
 msgid "Import Date"
-msgstr ""
+msgstr "Импортлох огноо"
 
 #. module: account_coda
 #: model:account.coda.trans.category,description:account_coda.actrca_039
@@ -411,7 +411,7 @@ msgstr ""
 #. module: account_coda
 #: model:account.coda.trans.category,description:account_coda.actrca_067
 msgid "Fixed loan advance - extension"
-msgstr ""
+msgstr "Зээлийн үндсэн урьдчилгаа-нэмэлт"
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_13_07
@@ -456,7 +456,7 @@ msgstr ""
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_47_62
 msgid "Remittance of documents abroad - credit after collection"
-msgstr ""
+msgstr "Мөнгөн гуйвуулгыг баримтаар илгээх - кредитийн дараах тусламж"
 
 #. module: account_coda
 #: field:coda.bank.statement.line,name:0
@@ -513,7 +513,7 @@ msgstr ""
 #. module: account_coda
 #: model:account.coda.trans.code,comment:account_coda.actcc_03_17
 msgid "Amount of the cheque; if any, charges receive code 37"
-msgstr ""
+msgstr "Чекийн дүн; Хэрвээ ямар нэг зардал илгээх бол код 37"
 
 #. module: account_coda
 #: view:account.coda:0
@@ -679,7 +679,7 @@ msgstr ""
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_43_37
 msgid "Costs relating to payment of foreign cheques"
-msgstr ""
+msgstr "Чекийн гадаад зардалын холболт"
 
 #. module: account_coda
 #: field:account.coda.trans.code,parent_id:0
@@ -929,7 +929,7 @@ msgstr ""
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_03_35
 msgid "Cash advance"
-msgstr ""
+msgstr "Бэлэн мөнгөний урьдчилгаа"
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcf_47
@@ -955,7 +955,7 @@ msgstr ""
 #. module: account_coda
 #: field:account.coda.trans.category,category:0
 msgid "Transaction Category"
-msgstr ""
+msgstr "Бүлэг ангилал"
 
 #. module: account_coda
 #: field:account.coda,statement_ids:0
@@ -1256,7 +1256,7 @@ msgstr "Үндсэн дансны тодорхойлолт"
 #. module: account_coda
 #: model:account.coda.comm.type,description:account_coda.acct_126
 msgid "Term investments"
-msgstr ""
+msgstr "Хөрөнгө оруулалтын хугацаа"
 
 #. module: account_coda
 #: model:account.coda.comm.type,description:account_coda.acct_100
@@ -1357,7 +1357,7 @@ msgstr ""
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_04_05
 msgid "Loading Proton"
-msgstr ""
+msgstr "Протон унших"
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_80_21
@@ -1498,7 +1498,7 @@ msgstr ""
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_09_54
 msgid "Your payment ATM"
-msgstr ""
+msgstr "Таны ATM-н төлбөр"
 
 #. module: account_coda
 #: model:account.coda.comm.type,description:account_coda.acct_123
diff --git a/addons/account_coda/i18n/nb.po b/addons/account_coda/i18n/nb.po
index 4ea23bb7363..1cf83112c68 100644
--- a/addons/account_coda/i18n/nb.po
+++ b/addons/account_coda/i18n/nb.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:27+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:32+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_09_21
diff --git a/addons/account_coda/i18n/nl.po b/addons/account_coda/i18n/nl.po
index 09d94e628b4..16ade0959be 100644
--- a/addons/account_coda/i18n/nl.po
+++ b/addons/account_coda/i18n/nl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:26+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:31+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_09_21
diff --git a/addons/account_coda/i18n/nl_BE.po b/addons/account_coda/i18n/nl_BE.po
index 3eb846c99f5..eeaf5f8b390 100644
--- a/addons/account_coda/i18n/nl_BE.po
+++ b/addons/account_coda/i18n/nl_BE.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:27+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:32+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_09_21
diff --git a/addons/account_coda/i18n/pl.po b/addons/account_coda/i18n/pl.po
index eb058fe3156..bea064ede8c 100644
--- a/addons/account_coda/i18n/pl.po
+++ b/addons/account_coda/i18n/pl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:27+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:32+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_09_21
diff --git a/addons/account_coda/i18n/pt.po b/addons/account_coda/i18n/pt.po
index 9e9d37db04b..23067828058 100644
--- a/addons/account_coda/i18n/pt.po
+++ b/addons/account_coda/i18n/pt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:27+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:32+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_09_21
diff --git a/addons/account_coda/i18n/pt_BR.po b/addons/account_coda/i18n/pt_BR.po
index 0595eb4a099..206867b7883 100644
--- a/addons/account_coda/i18n/pt_BR.po
+++ b/addons/account_coda/i18n/pt_BR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:27+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:32+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_09_21
diff --git a/addons/account_coda/i18n/ro.po b/addons/account_coda/i18n/ro.po
index a783e720443..1cffea4dcae 100644
--- a/addons/account_coda/i18n/ro.po
+++ b/addons/account_coda/i18n/ro.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:27+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:32+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_09_21
diff --git a/addons/account_coda/i18n/ru.po b/addons/account_coda/i18n/ru.po
index 882a1b678f5..71ae1f08f0e 100644
--- a/addons/account_coda/i18n/ru.po
+++ b/addons/account_coda/i18n/ru.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:27+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:32+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_09_21
diff --git a/addons/account_coda/i18n/sl.po b/addons/account_coda/i18n/sl.po
index 35f91ad711c..158d2473d02 100644
--- a/addons/account_coda/i18n/sl.po
+++ b/addons/account_coda/i18n/sl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:27+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:32+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_09_21
diff --git a/addons/account_coda/i18n/sq.po b/addons/account_coda/i18n/sq.po
index 9374162f3c1..35ccfab0318 100644
--- a/addons/account_coda/i18n/sq.po
+++ b/addons/account_coda/i18n/sq.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:26+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:31+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_09_21
diff --git a/addons/account_coda/i18n/sr.po b/addons/account_coda/i18n/sr.po
index 24de0938b50..34bda7f5a7e 100644
--- a/addons/account_coda/i18n/sr.po
+++ b/addons/account_coda/i18n/sr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:27+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:32+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_09_21
diff --git a/addons/account_coda/i18n/sr@latin.po b/addons/account_coda/i18n/sr@latin.po
index 12ae7182144..3012358cd53 100644
--- a/addons/account_coda/i18n/sr@latin.po
+++ b/addons/account_coda/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:27+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:32+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_09_21
diff --git a/addons/account_coda/i18n/sv.po b/addons/account_coda/i18n/sv.po
index dcf16fa5d41..7e0dd077e0c 100644
--- a/addons/account_coda/i18n/sv.po
+++ b/addons/account_coda/i18n/sv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:27+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:32+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_09_21
diff --git a/addons/account_coda/i18n/tr.po b/addons/account_coda/i18n/tr.po
index 2442192cc39..ee1de51f805 100644
--- a/addons/account_coda/i18n/tr.po
+++ b/addons/account_coda/i18n/tr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:27+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:32+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_09_21
diff --git a/addons/account_coda/i18n/vi.po b/addons/account_coda/i18n/vi.po
index d6bfd44b355..39e6fcd2f52 100644
--- a/addons/account_coda/i18n/vi.po
+++ b/addons/account_coda/i18n/vi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:27+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:32+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_09_21
diff --git a/addons/account_coda/i18n/zh_CN.po b/addons/account_coda/i18n/zh_CN.po
index 16883f70c71..459a535dd2d 100644
--- a/addons/account_coda/i18n/zh_CN.po
+++ b/addons/account_coda/i18n/zh_CN.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:27+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:32+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_09_21
diff --git a/addons/account_coda/i18n/zh_TW.po b/addons/account_coda/i18n/zh_TW.po
index ca129f53305..175da4eb6d2 100644
--- a/addons/account_coda/i18n/zh_TW.po
+++ b/addons/account_coda/i18n/zh_TW.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:27+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:32+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_09_21
diff --git a/addons/account_followup/__openerp__.py b/addons/account_followup/__openerp__.py
index e8724b01b4e..43b1c4b2859 100644
--- a/addons/account_followup/__openerp__.py
+++ b/addons/account_followup/__openerp__.py
@@ -28,30 +28,27 @@ Module to automate letters for unpaid invoices, with multi-level recalls.
 ==========================================================================
 
 You can define your multiple levels of recall through the menu:
+---------------------------------------------------------------
+    **Invoicing** / **Configuration** / **Miscellaneous** / **Follow-ups**
 
-    Invoicing/Configuration/Miscellaneous/Follow-ups
-
-Once it is defined, you can automatically print recalls every day through simply 
-clicking on the menu:
-
-    Invoicing/Periodical Processing/Billing/Send follow-ups
+Once it is defined, you can automatically print recalls every day through simply clicking on the menu:
+------------------------------------------------------------------------------------------------------
+    **Invoicing** / **Periodical Processing** / **Billing** / **Send follow-ups**
 
 It will generate a PDF with all the letters according to the the different levels 
 of recall defined. You can define different policies for different companies. You 
 can also send mail to the customer.
 
-Note that if you want to check the follow-up level for a given partner/account 
-entry, you can do from in the menu:
-
-    Invoicing/Reporting/Generic Reporting/Partners/Follow-ups Sent
+Note that if you want to check the follow-up level for a given partner/account entry, you can do from in the menu:
+------------------------------------------------------------------------------------------------------------------
+    **Invoicing** / **Reporting** / **Generic Reporting** / **Partners** / **Follow-ups Sent**
 
 """,
     'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
     'images': ['images/follow_ups.jpeg','images/send_followups.jpeg'],
     'depends': ['account_accountant', 'mail'],
-    'init_xml': [],
-    'update_xml': [
+    'data': [
         'security/account_followup_security.xml',
         'security/ir.model.access.csv',
         'wizard/account_followup_print_view.xml',
@@ -60,7 +57,7 @@ entry, you can do from in the menu:
         'account_followup_view.xml',
         'account_followup_data.xml',
     ],
-    'demo_xml': [],
+    'demo': [],
     'test': [
         'test/account_followup.yml',
         'test/account_followup_report.yml',
diff --git a/addons/account_followup/i18n/ar.po b/addons/account_followup/i18n/ar.po
index 4dd27dbfc9c..567253c4c02 100644
--- a/addons/account_followup/i18n/ar.po
+++ b/addons/account_followup/i18n/ar.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_followup
 #: view:account_followup.followup:0
diff --git a/addons/account_followup/i18n/bg.po b/addons/account_followup/i18n/bg.po
index 89c9dcd52d0..8904097b692 100644
--- a/addons/account_followup/i18n/bg.po
+++ b/addons/account_followup/i18n/bg.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_followup
 #: view:account_followup.followup:0
diff --git a/addons/account_followup/i18n/bs.po b/addons/account_followup/i18n/bs.po
index 73ab7f81ded..73c3ff326ba 100644
--- a/addons/account_followup/i18n/bs.po
+++ b/addons/account_followup/i18n/bs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_followup
 #: view:account_followup.followup:0
diff --git a/addons/account_followup/i18n/ca.po b/addons/account_followup/i18n/ca.po
index f0985aebde3..eea7bbc5ba6 100644
--- a/addons/account_followup/i18n/ca.po
+++ b/addons/account_followup/i18n/ca.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_followup
 #: view:account_followup.followup:0
diff --git a/addons/account_followup/i18n/cs.po b/addons/account_followup/i18n/cs.po
index 2bc4d4a49af..264832decff 100644
--- a/addons/account_followup/i18n/cs.po
+++ b/addons/account_followup/i18n/cs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_followup
 #: view:account_followup.followup:0
diff --git a/addons/account_followup/i18n/da.po b/addons/account_followup/i18n/da.po
index 70a6db009aa..2964b5bae13 100644
--- a/addons/account_followup/i18n/da.po
+++ b/addons/account_followup/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_followup
 #: view:account_followup.followup:0
diff --git a/addons/account_followup/i18n/de.po b/addons/account_followup/i18n/de.po
index 88884a45119..f1c51901362 100644
--- a/addons/account_followup/i18n/de.po
+++ b/addons/account_followup/i18n/de.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_followup
 #: view:account_followup.followup:0
diff --git a/addons/account_followup/i18n/el.po b/addons/account_followup/i18n/el.po
index 3457209c5bd..4447f841987 100644
--- a/addons/account_followup/i18n/el.po
+++ b/addons/account_followup/i18n/el.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_followup
 #: view:account_followup.followup:0
diff --git a/addons/account_followup/i18n/es.po b/addons/account_followup/i18n/es.po
index f71af7f30c8..509b9211851 100644
--- a/addons/account_followup/i18n/es.po
+++ b/addons/account_followup/i18n/es.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:02+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:08+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_followup
 #: view:account_followup.followup:0
diff --git a/addons/account_followup/i18n/es_AR.po b/addons/account_followup/i18n/es_AR.po
index 7119654c183..3c536dd8930 100644
--- a/addons/account_followup/i18n/es_AR.po
+++ b/addons/account_followup/i18n/es_AR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:02+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:08+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_followup
 #: view:account_followup.followup:0
diff --git a/addons/account_followup/i18n/es_CR.po b/addons/account_followup/i18n/es_CR.po
index 3cb7b90e91f..2c148f38368 100644
--- a/addons/account_followup/i18n/es_CR.po
+++ b/addons/account_followup/i18n/es_CR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:02+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:08+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 "Language: \n"
 
 #. module: account_followup
diff --git a/addons/account_followup/i18n/es_EC.po b/addons/account_followup/i18n/es_EC.po
index 6832ef0c9a0..b6689523e1f 100644
--- a/addons/account_followup/i18n/es_EC.po
+++ b/addons/account_followup/i18n/es_EC.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:02+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:08+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_followup
 #: view:account_followup.followup:0
diff --git a/addons/account_followup/i18n/es_PY.po b/addons/account_followup/i18n/es_PY.po
index 9ac76a3af75..c8de87358f3 100644
--- a/addons/account_followup/i18n/es_PY.po
+++ b/addons/account_followup/i18n/es_PY.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:02+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:08+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_followup
 #: view:account_followup.followup:0
diff --git a/addons/account_followup/i18n/et.po b/addons/account_followup/i18n/et.po
index 4b91eb4715e..40c243498d3 100644
--- a/addons/account_followup/i18n/et.po
+++ b/addons/account_followup/i18n/et.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_followup
 #: view:account_followup.followup:0
diff --git a/addons/account_followup/i18n/fa.po b/addons/account_followup/i18n/fa.po
index 8cba255bb1b..8856c0471a1 100644
--- a/addons/account_followup/i18n/fa.po
+++ b/addons/account_followup/i18n/fa.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:08+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_followup
 #: view:account_followup.followup:0
diff --git a/addons/account_followup/i18n/fi.po b/addons/account_followup/i18n/fi.po
index 43090136ab0..9f03dd6086d 100644
--- a/addons/account_followup/i18n/fi.po
+++ b/addons/account_followup/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_followup
 #: view:account_followup.followup:0
diff --git a/addons/account_followup/i18n/fr.po b/addons/account_followup/i18n/fr.po
index 360351250ad..e3cbfe1c27f 100644
--- a/addons/account_followup/i18n/fr.po
+++ b/addons/account_followup/i18n/fr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_followup
 #: view:account_followup.followup:0
diff --git a/addons/account_followup/i18n/gl.po b/addons/account_followup/i18n/gl.po
index f5c36ba0af8..ea7a5ae392a 100644
--- a/addons/account_followup/i18n/gl.po
+++ b/addons/account_followup/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_followup
 #: view:account_followup.followup:0
diff --git a/addons/account_followup/i18n/hr.po b/addons/account_followup/i18n/hr.po
index 5b119e6ec86..00bb16cd55e 100644
--- a/addons/account_followup/i18n/hr.po
+++ b/addons/account_followup/i18n/hr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:02+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:08+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_followup
 #: view:account_followup.followup:0
diff --git a/addons/account_followup/i18n/hu.po b/addons/account_followup/i18n/hu.po
index b435383f9ab..f9da6b58274 100644
--- a/addons/account_followup/i18n/hu.po
+++ b/addons/account_followup/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_followup
 #: view:account_followup.followup:0
diff --git a/addons/account_followup/i18n/id.po b/addons/account_followup/i18n/id.po
index 6d76ba2772d..f4e980e5d12 100644
--- a/addons/account_followup/i18n/id.po
+++ b/addons/account_followup/i18n/id.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_followup
 #: view:account_followup.followup:0
diff --git a/addons/account_followup/i18n/it.po b/addons/account_followup/i18n/it.po
index 29c50145039..b1e40a611f3 100644
--- a/addons/account_followup/i18n/it.po
+++ b/addons/account_followup/i18n/it.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_followup
 #: view:account_followup.followup:0
diff --git a/addons/account_followup/i18n/ja.po b/addons/account_followup/i18n/ja.po
index 74fd6764a0b..2a9d9cf03f0 100644
--- a/addons/account_followup/i18n/ja.po
+++ b/addons/account_followup/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:08+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_followup
 #: view:account_followup.followup:0
diff --git a/addons/account_followup/i18n/ko.po b/addons/account_followup/i18n/ko.po
index efb0aeb8001..e6d5ad5c343 100644
--- a/addons/account_followup/i18n/ko.po
+++ b/addons/account_followup/i18n/ko.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:08+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_followup
 #: view:account_followup.followup:0
diff --git a/addons/account_followup/i18n/lt.po b/addons/account_followup/i18n/lt.po
index 74135010f80..d51022ac71b 100644
--- a/addons/account_followup/i18n/lt.po
+++ b/addons/account_followup/i18n/lt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:08+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_followup
 #: view:account_followup.followup:0
diff --git a/addons/account_followup/i18n/mn.po b/addons/account_followup/i18n/mn.po
index 728a4c80c16..b7be43d7639 100644
--- a/addons/account_followup/i18n/mn.po
+++ b/addons/account_followup/i18n/mn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:08+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_followup
 #: view:account_followup.followup:0
@@ -133,7 +133,7 @@ msgstr ""
 #. module: account_followup
 #: view:account_followup.stat.by.partner:0
 msgid "Balance > 0"
-msgstr ""
+msgstr "Баланс > 0"
 
 #. module: account_followup
 #: view:account.move.line:0
@@ -183,7 +183,7 @@ msgstr "Харилцагч"
 #: code:addons/account_followup/wizard/account_followup_print.py:142
 #, python-format
 msgid "Invoices Reminder"
-msgstr ""
+msgstr "Үнийн нэхэмжлэл сануулах"
 
 #. module: account_followup
 #: model:ir.model,name:account_followup.model_account_followup_followup
@@ -258,7 +258,7 @@ msgstr ""
 #. module: account_followup
 #: view:account.followup.print.all:0
 msgid "Partner Selection"
-msgstr ""
+msgstr "Харилцагч сонгох"
 
 #. module: account_followup
 #: model:account_followup.followup.line,description:account_followup.demo_followup_line1
@@ -329,7 +329,7 @@ msgstr ""
 #. module: account_followup
 #: view:account.followup.print.all:0
 msgid "Send Mails"
-msgstr ""
+msgstr "Мэйлүүд илгээх"
 
 #. module: account_followup
 #: model:ir.model,name:account_followup.model_account_followup_stat_by_partner
@@ -372,12 +372,12 @@ msgstr ""
 #: code:addons/account_followup/wizard/account_followup_print.py:56
 #, python-format
 msgid "Select Partners"
-msgstr ""
+msgstr "Сонгосон харилцагч"
 
 #. module: account_followup
 #: view:account.followup.print.all:0
 msgid "Email Settings"
-msgstr ""
+msgstr "Имэйл тохируулах"
 
 #. module: account_followup
 #: view:account.followup.print.all:0
@@ -655,7 +655,7 @@ msgstr ""
 #. module: account_followup
 #: report:account_followup.followup.print:0
 msgid "Document : Customer account statement"
-msgstr ""
+msgstr "Баримт: Үйлчлүүлэгчийн дансны тодорхойлолт"
 
 #. module: account_followup
 #: view:account.move.line:0
diff --git a/addons/account_followup/i18n/nb.po b/addons/account_followup/i18n/nb.po
index cb7879bff40..ea68003d3f0 100644
--- a/addons/account_followup/i18n/nb.po
+++ b/addons/account_followup/i18n/nb.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:08+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_followup
 #: view:account_followup.followup:0
diff --git a/addons/account_followup/i18n/nl.po b/addons/account_followup/i18n/nl.po
index 8f250461157..d4aea88e0d1 100644
--- a/addons/account_followup/i18n/nl.po
+++ b/addons/account_followup/i18n/nl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_followup
 #: view:account_followup.followup:0
@@ -709,7 +709,7 @@ msgstr "Eerste boeking"
 #. module: account_followup
 #: report:account_followup.followup.print:0
 msgid "Li."
-msgstr "Li."
+msgstr "Bt."
 
 #. module: account_followup
 #: view:account.followup.print:0
diff --git a/addons/account_followup/i18n/nl_BE.po b/addons/account_followup/i18n/nl_BE.po
index 573ac7385a5..6fda71b318c 100644
--- a/addons/account_followup/i18n/nl_BE.po
+++ b/addons/account_followup/i18n/nl_BE.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:02+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:08+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_followup
 #: view:account_followup.followup:0
diff --git a/addons/account_followup/i18n/oc.po b/addons/account_followup/i18n/oc.po
index bb4a625e9b3..691ab14cf0c 100644
--- a/addons/account_followup/i18n/oc.po
+++ b/addons/account_followup/i18n/oc.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:08+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_followup
 #: view:account_followup.followup:0
diff --git a/addons/account_followup/i18n/pl.po b/addons/account_followup/i18n/pl.po
index adb74c73554..f6b3d8c6ac4 100644
--- a/addons/account_followup/i18n/pl.po
+++ b/addons/account_followup/i18n/pl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:08+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_followup
 #: view:account_followup.followup:0
diff --git a/addons/account_followup/i18n/pt.po b/addons/account_followup/i18n/pt.po
index c7493dc9a03..0021d377e68 100644
--- a/addons/account_followup/i18n/pt.po
+++ b/addons/account_followup/i18n/pt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:08+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_followup
 #: view:account_followup.followup:0
diff --git a/addons/account_followup/i18n/pt_BR.po b/addons/account_followup/i18n/pt_BR.po
index c251dd4b15f..7a093a34521 100644
--- a/addons/account_followup/i18n/pt_BR.po
+++ b/addons/account_followup/i18n/pt_BR.po
@@ -8,13 +8,14 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 00:35+0000\n"
 "PO-Revision-Date: 2012-07-28 20:47+0000\n"
-"Last-Translator: Fábio Martinelli <webmaster@guaru.net>\n"
+"Last-Translator: Fábio Martinelli - http://zupy.com.br "
+"<webmaster@guaru.net>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:02+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:08+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_followup
 #: view:account_followup.followup:0
diff --git a/addons/account_followup/i18n/ro.po b/addons/account_followup/i18n/ro.po
index db0d29d4500..00cc8629b92 100644
--- a/addons/account_followup/i18n/ro.po
+++ b/addons/account_followup/i18n/ro.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:02+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:08+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_followup
 #: view:account_followup.followup:0
diff --git a/addons/account_followup/i18n/ru.po b/addons/account_followup/i18n/ru.po
index bd5ba04e76f..f63c5de49df 100644
--- a/addons/account_followup/i18n/ru.po
+++ b/addons/account_followup/i18n/ru.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:02+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:08+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_followup
 #: view:account_followup.followup:0
diff --git a/addons/account_followup/i18n/sl.po b/addons/account_followup/i18n/sl.po
index 1e71c4cb125..b3eec130b48 100644
--- a/addons/account_followup/i18n/sl.po
+++ b/addons/account_followup/i18n/sl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:02+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:08+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_followup
 #: view:account_followup.followup:0
diff --git a/addons/account_followup/i18n/sq.po b/addons/account_followup/i18n/sq.po
index b44cd5c6f58..0d13fae669d 100644
--- a/addons/account_followup/i18n/sq.po
+++ b/addons/account_followup/i18n/sq.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_followup
 #: view:account_followup.followup:0
diff --git a/addons/account_followup/i18n/sr.po b/addons/account_followup/i18n/sr.po
index 863e1ae1bbe..7d961b687a6 100644
--- a/addons/account_followup/i18n/sr.po
+++ b/addons/account_followup/i18n/sr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:02+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:08+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_followup
 #: view:account_followup.followup:0
diff --git a/addons/account_followup/i18n/sr@latin.po b/addons/account_followup/i18n/sr@latin.po
index 5c5304b7509..dad304bc7fa 100644
--- a/addons/account_followup/i18n/sr@latin.po
+++ b/addons/account_followup/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:02+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:08+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_followup
 #: view:account_followup.followup:0
diff --git a/addons/account_followup/i18n/sv.po b/addons/account_followup/i18n/sv.po
index 5fff49b0020..7b296ea88d4 100644
--- a/addons/account_followup/i18n/sv.po
+++ b/addons/account_followup/i18n/sv.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:02+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:08+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_followup
 #: view:account_followup.followup:0
diff --git a/addons/account_followup/i18n/tlh.po b/addons/account_followup/i18n/tlh.po
index 087c721d2f2..2ac68bbf7e2 100644
--- a/addons/account_followup/i18n/tlh.po
+++ b/addons/account_followup/i18n/tlh.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:02+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:08+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_followup
 #: view:account_followup.followup:0
diff --git a/addons/account_followup/i18n/tr.po b/addons/account_followup/i18n/tr.po
index f896cda953c..c492e187a9c 100644
--- a/addons/account_followup/i18n/tr.po
+++ b/addons/account_followup/i18n/tr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:02+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:08+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_followup
 #: view:account_followup.followup:0
diff --git a/addons/account_followup/i18n/uk.po b/addons/account_followup/i18n/uk.po
index 29812d27719..573c61a0f79 100644
--- a/addons/account_followup/i18n/uk.po
+++ b/addons/account_followup/i18n/uk.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:02+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:08+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_followup
 #: view:account_followup.followup:0
diff --git a/addons/account_followup/i18n/vi.po b/addons/account_followup/i18n/vi.po
index 47338e5fe08..ead3294bf51 100644
--- a/addons/account_followup/i18n/vi.po
+++ b/addons/account_followup/i18n/vi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:02+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:08+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_followup
 #: view:account_followup.followup:0
diff --git a/addons/account_followup/i18n/zh_CN.po b/addons/account_followup/i18n/zh_CN.po
index 460aefa1e9b..b02e7aeb1da 100644
--- a/addons/account_followup/i18n/zh_CN.po
+++ b/addons/account_followup/i18n/zh_CN.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:02+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:08+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_followup
 #: view:account_followup.followup:0
diff --git a/addons/account_followup/i18n/zh_TW.po b/addons/account_followup/i18n/zh_TW.po
index 98081712fa6..f429b083431 100644
--- a/addons/account_followup/i18n/zh_TW.po
+++ b/addons/account_followup/i18n/zh_TW.po
@@ -7,42 +7,42 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 00:35+0000\n"
-"PO-Revision-Date: 2009-01-30 12:43+0000\n"
-"Last-Translator: <>\n"
+"PO-Revision-Date: 2012-08-24 12:49+0000\n"
+"Last-Translator: Eric Huang <eh@cenoq.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:02+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:08+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_followup
 #: view:account_followup.followup:0
 msgid "Search Followup"
-msgstr ""
+msgstr "搜尋催款"
 
 #. module: account_followup
 #: view:account_followup.stat:0
 msgid "Group By..."
-msgstr ""
+msgstr "分類方式..."
 
 #. module: account_followup
 #: view:res.company:0
 #: field:res.company,follow_up_msg:0
 msgid "Follow-up Message"
-msgstr "跟進訊息"
+msgstr "催款訊息"
 
 #. module: account_followup
 #: view:account_followup.followup:0
 #: field:account_followup.followup,followup_line:0
 msgid "Follow-Up"
-msgstr "跟進"
+msgstr "催款"
 
 #. module: account_followup
 #: help:account.followup.print.all,test_print:0
 msgid ""
 "Check if you want to print followups without changing followups level."
-msgstr ""
+msgstr "檢查催款等級沒有改變，如果你想要列印催款"
 
 #. module: account_followup
 #: model:account_followup.followup.line,description:account_followup.demo_followup_line2
@@ -67,6 +67,20 @@ msgid ""
 "\n"
 "Best Regards,\n"
 msgstr ""
+"\n"
+"親愛的 %(partner_name)s,\n"
+"\n"
+"我們遺憾的看到，儘管已發送提醒，您的帳戶現在是嚴重逾期。\n"
+"\n"
+"重要的是立即付款，否則我們將不得不考慮將停止對您的帳戶，這意味著我們將不再能夠提供與貴公司（產品/服務）。\n"
+"\n"
+"請採取適當的措施，在未來的8天內付款\n"
+"\n"
+"如果有支付發票的問題，我們都沒有意識到，不要猶豫，聯繫我們的會計部門 (+32).10.68.94.39. 因此，我們可以迅速解決問題。\n"
+"\n"
+"下面印到期付款的細節。\n"
+"\n"
+"最好的問候，\n"
 
 #. module: account_followup
 #: field:account_followup.followup,company_id:0
@@ -84,89 +98,89 @@ msgstr "發票日期"
 #. module: account_followup
 #: field:account.followup.print.all,email_subject:0
 msgid "Email Subject"
-msgstr "電郵主旨"
+msgstr "電子郵件主題"
 
 #. module: account_followup
 #: model:ir.actions.act_window,help:account_followup.action_followup_stat
 msgid ""
 "Follow up on the reminders sent over to your partners for unpaid invoices."
-msgstr ""
+msgstr "您的業務夥伴發送提醒後續未付發票."
 
 #. module: account_followup
 #: view:account.followup.print.all:0
 #: view:account_followup.followup.line:0
 msgid "Legend"
-msgstr ""
+msgstr "圖表"
 
 #. module: account_followup
 #: view:account_followup.stat:0
 msgid "Follow up Entries with period in current year"
-msgstr ""
+msgstr "在本年度期間跟分錄"
 
 #. module: account_followup
 #: view:account.followup.print.all:0
 msgid "Ok"
-msgstr ""
+msgstr "確定"
 
 #. module: account_followup
 #: report:account_followup.followup.print:0
 msgid "Amount"
-msgstr ""
+msgstr "金額"
 
 #. module: account_followup
 #: sql_constraint:account.move.line:0
 msgid "Wrong credit or debit value in accounting entry !"
-msgstr ""
+msgstr "會計分錄中包含錯誤的借貸值！"
 
 #. module: account_followup
 #: selection:account_followup.followup.line,start:0
 msgid "Net Days"
-msgstr "淨日數"
+msgstr "淨天數"
 
 #. module: account_followup
 #: model:ir.actions.act_window,name:account_followup.action_account_followup_definition_form
 #: model:ir.ui.menu,name:account_followup.account_followup_menu
 msgid "Follow-Ups"
-msgstr "跟進"
+msgstr "催款"
 
 #. module: account_followup
 #: view:account_followup.stat.by.partner:0
 msgid "Balance > 0"
-msgstr ""
+msgstr "差額 > 0"
 
 #. module: account_followup
 #: view:account.move.line:0
 msgid "Total debit"
-msgstr ""
+msgstr "借方合計"
 
 #. module: account_followup
 #: 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 ""
+msgstr "分錄日期不在所選期間內！可以修改憑證日期或在簿帳上去掉這個檢查項。"
 
 #. module: account_followup
 #: view:account.followup.print.all:0
 msgid "%(heading)s: Move line header"
-msgstr ""
+msgstr "%(heading)s: 移動抬頭"
 
 #. module: account_followup
 #: field:account.followup.print,followup_id:0
 msgid "Follow-up"
-msgstr "跟進"
+msgstr "催款"
 
 #. module: account_followup
 #: report:account_followup.followup.print:0
 msgid "VAT:"
-msgstr "增埴稅(VAT):"
+msgstr "增值稅:"
 
 #. module: account_followup
 #: view:account_followup.stat:0
 #: field:account_followup.stat,partner_id:0
 #: field:account_followup.stat.by.partner,partner_id:0
 msgid "Partner"
-msgstr "伙伴"
+msgstr "合夥人"
 
 #. module: account_followup
 #: report:account_followup.followup.print:0
@@ -176,18 +190,18 @@ msgstr "日期 :"
 #. module: account_followup
 #: field:account.followup.print.all,partner_ids:0
 msgid "Partners"
-msgstr "伙伴"
+msgstr "合夥人"
 
 #. module: account_followup
 #: code:addons/account_followup/wizard/account_followup_print.py:142
 #, python-format
 msgid "Invoices Reminder"
-msgstr ""
+msgstr "發票提醒"
 
 #. module: account_followup
 #: model:ir.model,name:account_followup.model_account_followup_followup
 msgid "Account Follow Up"
-msgstr ""
+msgstr "帳戶催款"
 
 #. module: account_followup
 #: selection:account_followup.followup.line,start:0
@@ -202,12 +216,12 @@ msgstr "非訴訟"
 #. module: account_followup
 #: view:account.followup.print.all:0
 msgid "%(user_signature)s: User name"
-msgstr ""
+msgstr "%(user_signature)s: 用戶名"
 
 #. module: account_followup
 #: field:account_followup.stat,debit:0
 msgid "Debit"
-msgstr ""
+msgstr "借方"
 
 #. module: account_followup
 #: view:account.followup.print:0
@@ -215,49 +229,49 @@ msgid ""
 "This feature allows you to send reminders to partners with pending invoices. "
 "You can send them the default message for unpaid invoices or manually enter "
 "a message should you need to remind them of a specific information."
-msgstr ""
+msgstr "如果您需要一個特定的資訊此功能允許您向業務夥伴發送未付發票提醒，你可以向他們發送預設的訊息，或手動輸入訊息以提醒他們。"
 
 #. module: account_followup
 #: report:account_followup.followup.print:0
 msgid "Ref"
-msgstr "參考"
+msgstr "編號"
 
 #. module: account_followup
 #: help:account_followup.followup.line,sequence:0
 msgid "Gives the sequence order when displaying a list of follow-up lines."
-msgstr ""
+msgstr "輸入序列用於顯示催款列表."
 
 #. module: account_followup
 #: view:account.followup.print.all:0
 #: field:account.followup.print.all,email_body:0
 msgid "Email body"
-msgstr "電郵內容"
+msgstr "電子郵件內容"
 
 #. module: account_followup
 #: field:account.move.line,followup_line_id:0
 msgid "Follow-up Level"
-msgstr "跟進層次"
+msgstr "催款等級"
 
 #. module: account_followup
 #: field:account_followup.stat,date_followup:0
 #: field:account_followup.stat.by.partner,date_followup:0
 msgid "Latest followup"
-msgstr "最新跟進"
+msgstr "最近的催款"
 
 #. module: account_followup
 #: view:account.followup.print.all:0
 msgid "Select Partners to Remind"
-msgstr ""
+msgstr "選擇業務夥伴，以提醒"
 
 #. module: account_followup
 #: field:account.followup.print.all,partner_lang:0
 msgid "Send Email in Partner Language"
-msgstr ""
+msgstr "用業務夥伴的語言發送的電子郵件"
 
 #. module: account_followup
 #: view:account.followup.print.all:0
 msgid "Partner Selection"
-msgstr ""
+msgstr "業務夥伴的選擇"
 
 #. module: account_followup
 #: model:account_followup.followup.line,description:account_followup.demo_followup_line1
@@ -275,11 +289,18 @@ msgid ""
 "\n"
 "Best Regards,\n"
 msgstr ""
+"\n"
+"尊敬的 %(partner_name)s,\n"
+"\n"
+"下列金額尚未付款，如屬例外，那就是我們的錯誤. 請採取適當的措施，在未來的8天內付款\n"
+"\n"
+"如果您在收到此信前已經付款了，請忽略這封信。並與我們的會計部門聯繫。\n"
+"最好的祝福,\n"
 
 #. module: account_followup
 #: field:account_followup.followup.line,description:0
 msgid "Printed Message"
-msgstr ""
+msgstr "Printed Message"
 
 #. module: account_followup
 #: view:account.followup.print:0
@@ -288,18 +309,18 @@ msgstr ""
 #: model:ir.actions.act_window,name:account_followup.action_account_followup_print_all
 #: model:ir.ui.menu,name:account_followup.account_followup_print_menu
 msgid "Send followups"
-msgstr ""
+msgstr "發送催款"
 
 #. module: account_followup
 #: view:account_followup.stat.by.partner:0
 msgid "Partner to Remind"
-msgstr ""
+msgstr "提醒業務夥伴"
 
 #. module: account_followup
 #: field:account_followup.followup.line,followup_id:0
 #: field:account_followup.stat,followup_id:0
 msgid "Follow Ups"
-msgstr "跟進"
+msgstr "催款"
 
 #. module: account_followup
 #: code:addons/account_followup/wizard/account_followup_print.py:296
@@ -309,6 +330,9 @@ msgid ""
 "\n"
 "%s"
 msgstr ""
+"所有的郵件已成功發送至合作傢伴:.\n"
+"\n"
+"%s"
 
 #. module: account_followup
 #: constraint:account_followup.followup.line:0
@@ -316,6 +340,8 @@ msgid ""
 "Your description is invalid, use the right legend or %% if you want to use "
 "the percent character."
 msgstr ""
+"Your description is invalid, use the right legend or %% if you want to use "
+"the percent character."
 
 #. module: account_followup
 #: constraint:account.move.line:0
@@ -323,7 +349,7 @@ 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 ""
+msgstr "分錄上的科目要求輸入一個外幣。你可以在科目設置中去掉這個外幣或在帳簿設置上選擇一個支持多幣別的輸入界面。"
 
 #. module: account_followup
 #: view:account.followup.print.all:0
@@ -333,17 +359,17 @@ msgstr "發送郵件"
 #. module: account_followup
 #: model:ir.model,name:account_followup.model_account_followup_stat_by_partner
 msgid "Followup Statistics by Partner"
-msgstr ""
+msgstr "通過夥伴的催款統計"
 
 #. module: account_followup
 #: view:account_followup.followup.line:0
 msgid "Message"
-msgstr ""
+msgstr "訊息"
 
 #. module: account_followup
 #: field:account_followup.stat,blocked:0
 msgid "Blocked"
-msgstr "封鎖"
+msgstr "已封鎖"
 
 #. module: account_followup
 #: code:addons/account_followup/wizard/account_followup_print.py:299
@@ -355,78 +381,83 @@ msgid ""
 "\n"
 "%s"
 msgstr ""
+"\n"
+"\n"
+"郵件成功發送至以下合作傢伴 !\n"
+"\n"
+"%s"
 
 #. module: account_followup
 #: help:account.followup.print,date:0
 msgid ""
 "This field allow you to select a forecast date to plan your follow-ups"
-msgstr ""
+msgstr "此欄位，讓你選擇一個計劃催款的預測日期"
 
 #. module: account_followup
 #: field:account.followup.print,date:0
 msgid "Follow-up Sending Date"
-msgstr ""
+msgstr "催款發送日期"
 
 #. module: account_followup
 #: code:addons/account_followup/wizard/account_followup_print.py:56
 #, python-format
 msgid "Select Partners"
-msgstr ""
+msgstr "選擇業務夥伴"
 
 #. module: account_followup
 #: view:account.followup.print.all:0
 msgid "Email Settings"
-msgstr "電郵設定"
+msgstr "設置電子郵件"
 
 #. module: account_followup
 #: view:account.followup.print.all:0
 msgid "Print Follow Ups"
-msgstr ""
+msgstr "列印催款"
 
 #. module: account_followup
 #: field:account.move.line,followup_date:0
 msgid "Latest Follow-up"
-msgstr "最新跟進"
+msgstr "最近的催款"
 
 #. module: account_followup
 #: model:ir.model,name:account_followup.model_account_followup_stat
 msgid "Followup Statistics"
-msgstr "跟進統計"
+msgstr "催款統計"
 
 #. module: account_followup
 #: view:account_followup.followup.line:0
 msgid "%(user_signature)s: User Name"
-msgstr ""
+msgstr "%(user_signature)s: 用戶名"
 
 #. module: account_followup
 #: model:ir.model,name:account_followup.model_account_move_line
 msgid "Journal Items"
-msgstr ""
+msgstr "借貸項"
 
 #. module: account_followup
 #: constraint:account.move.line:0
 msgid "You can not create journal items on an account of type view."
-msgstr ""
+msgstr "借貸項不能使用視圖類型的科目"
 
 #. module: account_followup
 #: field:account.followup.print.all,email_conf:0
 msgid "Send email confirmation"
-msgstr "發送電郵確認"
+msgstr "確認發送電子郵件"
 
 #. module: account_followup
 #: report:account_followup.followup.print:0
 msgid "Total:"
-msgstr ""
+msgstr "總計:"
 
 #. module: account_followup
 #: constraint:res.company:0
 msgid "Error! You can not create recursive companies."
-msgstr ""
+msgstr "錯誤！您不能建立循環的公司."
 
 #. module: account_followup
 #: view:account.followup.print.all:0
 msgid "%(company_name)s: User's Company name"
-msgstr ""
+msgstr "%(company_name)s: 使用者公司名稱"
 
 #. module: account_followup
 #: model:ir.model,name:account_followup.model_res_company
@@ -442,72 +473,72 @@ msgstr "摘要"
 #. module: account_followup
 #: field:account_followup.stat,credit:0
 msgid "Credit"
-msgstr ""
+msgstr "貸方"
 
 #. module: account_followup
 #: report:account_followup.followup.print:0
 msgid "Maturity Date"
-msgstr ""
+msgstr "到期日"
 
 #. module: account_followup
 #: view:account_followup.followup.line:0
 msgid "%(partner_name)s: Partner Name"
-msgstr ""
+msgstr "%(partner_name)s: 業務夥伴名稱"
 
 #. module: account_followup
 #: view:account_followup.stat:0
 msgid "Follow-Up lines"
-msgstr "跟進明細"
+msgstr "催款明細"
 
 #. module: account_followup
 #: view:account.followup.print.all:0
 msgid "%(company_currency)s: User's Company Currency"
-msgstr ""
+msgstr "%(company_currency)s: 使用者公司貨幣"
 
 #. module: account_followup
 #: view:account_followup.stat:0
 #: field:account_followup.stat,balance:0
 #: field:account_followup.stat.by.partner,balance:0
 msgid "Balance"
-msgstr "結餘"
+msgstr "餘額"
 
 #. module: account_followup
 #: field:account_followup.followup.line,start:0
 msgid "Type of Term"
-msgstr "條款類型"
+msgstr "條件類型"
 
 #. module: account_followup
 #: model:ir.model,name:account_followup.model_account_followup_print
 #: model:ir.model,name:account_followup.model_account_followup_print_all
 msgid "Print Followup & Send Mail to Customers"
-msgstr ""
+msgstr "列印催款和發送郵件給客戶"
 
 #. module: account_followup
 #: field:account_followup.stat,date_move_last:0
 #: field:account_followup.stat.by.partner,date_move_last:0
 msgid "Last move"
-msgstr "最後行動"
+msgstr "最近"
 
 #. module: account_followup
 #: model:ir.actions.report.xml,name:account_followup.account_followup_followup_report
 msgid "Followup Report"
-msgstr "跟進報告"
+msgstr "催款報表"
 
 #. module: account_followup
 #: view:account_followup.followup.line:0
 msgid "Follow-Up Steps"
-msgstr ""
+msgstr "催款步驟"
 
 #. module: account_followup
 #: field:account_followup.stat,period_id:0
 msgid "Period"
-msgstr ""
+msgstr "會計期間"
 
 #. module: account_followup
 #: code:addons/account_followup/wizard/account_followup_print.py:307
 #, python-format
 msgid "Followup Summary"
-msgstr ""
+msgstr "催款摘要"
 
 #. module: account_followup
 #: view:account.followup.print:0
@@ -518,22 +549,22 @@ msgstr "取消"
 #. module: account_followup
 #: view:account_followup.stat:0
 msgid "Litigation"
-msgstr "訴訟"
+msgstr "有爭議"
 
 #. module: account_followup
 #: field:account_followup.stat.by.partner,max_followup_id:0
 msgid "Max Follow Up Level"
-msgstr "最高跟進層次"
+msgstr "最高催款等級"
 
 #. module: account_followup
 #: model:ir.actions.act_window,name:account_followup.action_view_account_followup_followup_form
 msgid "Review Invoicing Follow-Ups"
-msgstr ""
+msgstr "檢視發票催款"
 
 #. module: account_followup
 #: constraint:account.move.line:0
 msgid "Company must be the same for its related account and period."
-msgstr ""
+msgstr "科目和期間必須屬於同一個公司"
 
 #. module: account_followup
 #: model:ir.actions.act_window,help:account_followup.action_account_followup_definition_form
@@ -543,11 +574,13 @@ msgid ""
 "code to adapt the email content to the good context (good name, good date) "
 "and you can manage the multi language of messages."
 msgstr ""
+"定義催款等級和他們相關訊息和延遲。對於每個步驟，指定延遲的訊息和天數。使用圖例以了解使用的代碼，以適應電子郵件內容的良好環境（好名字，好日期），你可以管理"
+"多國語言的郵件。"
 
 #. module: account_followup
 #: model:ir.actions.act_window,name:account_followup.act_account_partner_account_move_payable_all
 msgid "Payable Items"
-msgstr ""
+msgstr "應付款"
 
 #. module: account_followup
 #: code:addons/account_followup/wizard/account_followup_print.py:298
@@ -557,27 +590,30 @@ msgid ""
 "\n"
 "%s"
 msgstr ""
+"電子郵件無法發送給以下的業務夥伴, 電子郵件尚未提供 !\n"
+"\n"
+"%s"
 
 #. module: account_followup
 #: view:account.followup.print.all:0
 msgid "%(followup_amount)s: Total Amount Due"
-msgstr ""
+msgstr "%(followup_amount)s: 總應付金額"
 
 #. module: account_followup
 #: view:account.followup.print.all:0
 #: view:account_followup.followup.line:0
 msgid "%(date)s: Current Date"
-msgstr "%(date)s: 當前日期"
+msgstr "%(date)s: 現在日期"
 
 #. module: account_followup
 #: view:account_followup.stat:0
 msgid "Including journal entries marked as a litigation"
-msgstr ""
+msgstr "包括訴訟標記的帳簿分錄"
 
 #. module: account_followup
 #: view:account_followup.stat:0
 msgid "Followup Level"
-msgstr "跟進層次"
+msgstr "催款等級"
 
 #. module: account_followup
 #: field:account_followup.followup,description:0
@@ -588,41 +624,41 @@ msgstr "說明"
 #. module: account_followup
 #: constraint:account_followup.followup:0
 msgid "Only One Followup by Company."
-msgstr ""
+msgstr "公司目前只有一筆催款."
 
 #. module: account_followup
 #: view:account_followup.stat:0
 msgid "This Fiscal year"
-msgstr "本財政年度"
+msgstr "本會計年度"
 
 #. module: account_followup
 #: view:account.move.line:0
 msgid "Partner entries"
-msgstr ""
+msgstr "業務夥伴分錄"
 
 #. module: account_followup
 #: help:account.followup.print.all,partner_lang:0
 msgid ""
 "Do not change message text, if you want to send email in partner language, "
 "or configure from company"
-msgstr ""
+msgstr "不要改變訊息文字，如果你想要在公司用業務夥伴的語言或設置發送電子郵件"
 
 #. module: account_followup
 #: model:ir.actions.act_window,name:account_followup.act_account_partner_account_move_all
 msgid "Receivable Items"
-msgstr ""
+msgstr "應收款"
 
 #. module: account_followup
 #: view:account_followup.stat:0
 #: model:ir.actions.act_window,name:account_followup.action_followup_stat
 #: model:ir.ui.menu,name:account_followup.menu_action_followup_stat_follow
 msgid "Follow-ups Sent"
-msgstr ""
+msgstr "發送催款"
 
 #. module: account_followup
 #: sql_constraint:res.company:0
 msgid "The company name must be unique !"
-msgstr ""
+msgstr "公司名稱必須唯一！"
 
 #. module: account_followup
 #: field:account_followup.followup,name:0
@@ -634,32 +670,32 @@ msgstr "名稱"
 #: field:account_followup.stat,date_move:0
 #: field:account_followup.stat.by.partner,date_move:0
 msgid "First move"
-msgstr "首個行動"
+msgstr "首先"
 
 #. module: account_followup
 #: report:account_followup.followup.print:0
 msgid "Li."
-msgstr "訴訟"
+msgstr "Li."
 
 #. module: account_followup
 #: view:account.followup.print:0
 msgid "Continue"
-msgstr "繼續"
+msgstr "下一步"
 
 #. module: account_followup
 #: field:account_followup.followup.line,delay:0
 msgid "Days of delay"
-msgstr "延誤日子"
+msgstr "拖延天數"
 
 #. module: account_followup
 #: report:account_followup.followup.print:0
 msgid "Document : Customer account statement"
-msgstr ""
+msgstr "文件 : 客戶帳戶對帳單"
 
 #. module: account_followup
 #: view:account.move.line:0
 msgid "Total credit"
-msgstr ""
+msgstr "貸方合計"
 
 #. module: account_followup
 #: model:account_followup.followup.line,description:account_followup.demo_followup_line3
@@ -680,51 +716,63 @@ msgid ""
 "\n"
 "Best Regards,\n"
 msgstr ""
+"\n"
+"親愛的 %(partner_name)s,\n"
+"\n"
+"儘管多次提醒，您的帳戶仍然沒有得到解決。\n"
+"\n"
+"除非在接下來的8天內全額付款，不然將採取法律行動追討債務，恕不另行通知。\n"
+"\n"
+"我相信，這一行動將被證明是不必要的，下面列印已到期付款的明細。\n"
+"\n"
+"在有關此事的任何疑問的情況下，不要猶豫，聯繫我們的會計部門 (+32).10.68.94.39.\n"
+"\n"
+"最好的祝福,\n"
 
 #. module: account_followup
 #: constraint:account.move.line:0
 msgid "You can not create journal items on closed account."
-msgstr ""
+msgstr "憑證上不能使用已關閉的科目"
 
 #. module: account_followup
 #: view:account.followup.print.all:0
 msgid "%(line)s: Ledger Posting lines"
-msgstr ""
+msgstr "%(line)s: 分類帳過帳明細"
 
 #. module: account_followup
 #: field:account_followup.followup.line,sequence:0
 msgid "Sequence"
-msgstr "次序"
+msgstr "序列"
 
 #. module: account_followup
 #: view:account_followup.followup.line:0
 msgid "%(company_name)s: User's Company Name"
-msgstr ""
+msgstr "%(company_name)s: 用戶的公司名稱"
 
 #. module: account_followup
 #: report:account_followup.followup.print:0
 msgid "Customer Ref :"
-msgstr "客戶參考 :"
+msgstr "客戶 :"
 
 #. module: account_followup
 #: field:account.followup.print.all,test_print:0
 msgid "Test Print"
-msgstr ""
+msgstr "測試列印"
 
 #. module: account_followup
 #: view:account.followup.print.all:0
 msgid "%(partner_name)s: Partner name"
-msgstr "%(partner_name)s: 伙伴名稱"
+msgstr "%(partner_name)s: 業務夥伴名稱"
 
 #. module: account_followup
 #: view:account_followup.stat:0
 msgid "Latest Followup Date"
-msgstr "最後跟進日期"
+msgstr "最近催款日期"
 
 #. module: account_followup
 #: model:ir.model,name:account_followup.model_account_followup_followup_line
 msgid "Follow-Up Criteria"
-msgstr ""
+msgstr "催款標準"
 
 #~ msgid "Currency"
 #~ msgstr "貨幣"
diff --git a/addons/account_followup/wizard/account_followup_print.py b/addons/account_followup/wizard/account_followup_print.py
index d151d2171a4..1e84681b1ea 100644
--- a/addons/account_followup/wizard/account_followup_print.py
+++ b/addons/account_followup/wizard/account_followup_print.py
@@ -213,8 +213,6 @@ class account_followup_print_all(osv.osv_memory):
         mod_obj = self.pool.get('ir.model.data')
         move_obj = self.pool.get('account.move.line')
         user_obj = self.pool.get('res.users')
-        line_obj = self.pool.get('account_followup.stat')
-        mail_message = self.pool.get('mail.message')
 
         if context is None:
             context = {}
@@ -235,13 +233,7 @@ class account_followup_print_all(osv.osv_memory):
                     total_amt += line.debit - line.credit
                 dest = False
                 if partner:
-                    if partner.type=='contact':
-                        if adr.email:
-                            dest = [partner.email]
-                    if (not dest) and partner.type=='default':
-                        if partner.email:
-                            dest = [partner.email]
-                src = tools.config.options['email_from']
+                    dest = [partner.email]
                 if not data.partner_lang:
                     body = data.email_body
                 else:
@@ -281,7 +273,12 @@ class account_followup_print_all(osv.osv_memory):
                 msg = ''
                 if dest:
                     try:
-                        mail_message.schedule_with_attach(cr, uid, src, dest, sub, body, context=context)
+                        vals = {'state': 'outgoing',
+                                'subject': sub,
+                                'body_html': '<pre>%s</pre>' % body,
+                                'email_to': dest,
+                                'email_from': data_user.email or tools.config.options['email_from']}
+                        self.pool.get('mail.mail').create(cr, uid, vals, context=context)
                         msg_sent += partner.name + '\n'
                     except Exception, e:
                         raise osv.except_osv('Error !', e )
diff --git a/addons/account_payment/__openerp__.py b/addons/account_payment/__openerp__.py
index 9e7209a348e..dd08386b064 100644
--- a/addons/account_payment/__openerp__.py
+++ b/addons/account_payment/__openerp__.py
@@ -20,26 +20,31 @@
 ##############################################################################
 
 {
-    "name": "Suppliers Payment Management",
-    "version": "1.1",
-    "author": "OpenERP SA",
-    "category": "Accounting & Finance",
-    "description": """
+    'name': 'Suppliers Payment Management',
+    'version': '1.1',
+    'author': 'OpenERP SA',
+    'category': 'Accounting & Finance',
+    'description': """
 Module to manage the payment of your supplier invoices.
 =======================================================
 
-This module allows you to create and manage your payment orders, with purposes to 
+This module allows you to create and manage your payment orders, with purposes to
+--------------------------------------------------------------------------------- 
     * serve as base for an easy plug-in of various automated payment mechanisms.
     * provide a more efficient way to manage invoice payment.
 
 Warning:
---------
-The confirmation of a payment order does _not_ create accounting entries, it just records the fact that you gave your payment order to your bank. The booking of your order must be encoded as usual through a bank statement. Indeed, it's only when you get the confirmation from your bank that your order has been accepted that you can book it in your accounting. To help you with that operation, you have a new option to import payment orders as bank statement lines.
+~~~~~~~~
+The confirmation of a payment order does _not_ create accounting entries, it just 
+records the fact that you gave your payment order to your bank. The booking of 
+your order must be encoded as usual through a bank statement. Indeed, it's only 
+when you get the confirmation from your bank that your order has been accepted 
+that you can book it in your accounting. To help you with that operation, you 
+have a new option to import payment orders as bank statement lines.
     """,
     'images': ['images/payment_mode.jpeg','images/payment_order.jpeg'],
     'depends': ['account','account_voucher'],
-    'init_xml': [],
-    'update_xml': [
+    'data': [
         'security/account_payment_security.xml',
         'security/ir.model.access.csv',
         'wizard/account_payment_pay_view.xml',
@@ -51,7 +56,7 @@ The confirmation of a payment order does _not_ create accounting entries, it jus
         'account_invoice_view.xml',
         'account_payment_report.xml',
     ],
-    'demo_xml': ['account_payment_demo.xml'],
+    'demo': ['account_payment_demo.xml'],
     'test': [
         'test/account_payment_demo.yml',
         'test/cancel_payment_order.yml',
diff --git a/addons/account_payment/i18n/am.po b/addons/account_payment/i18n/am.po
index cdff07a1d48..4b7f6231d05 100644
--- a/addons/account_payment/i18n/am.po
+++ b/addons/account_payment/i18n/am.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:20+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_payment
 #: field:payment.order,date_scheduled:0
diff --git a/addons/account_payment/i18n/ar.po b/addons/account_payment/i18n/ar.po
index 4da0565ae04..b3636216d33 100644
--- a/addons/account_payment/i18n/ar.po
+++ b/addons/account_payment/i18n/ar.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:20+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_payment
 #: field:payment.order,date_scheduled:0
diff --git a/addons/account_payment/i18n/bg.po b/addons/account_payment/i18n/bg.po
index 383f94a8dd3..6ba280b7d6b 100644
--- a/addons/account_payment/i18n/bg.po
+++ b/addons/account_payment/i18n/bg.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:20+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_payment
 #: field:payment.order,date_scheduled:0
diff --git a/addons/account_payment/i18n/bs.po b/addons/account_payment/i18n/bs.po
index efe3f38cad6..ae25e46d423 100644
--- a/addons/account_payment/i18n/bs.po
+++ b/addons/account_payment/i18n/bs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:20+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_payment
 #: field:payment.order,date_scheduled:0
diff --git a/addons/account_payment/i18n/ca.po b/addons/account_payment/i18n/ca.po
index a84f8012838..f29c6bc9c67 100644
--- a/addons/account_payment/i18n/ca.po
+++ b/addons/account_payment/i18n/ca.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:20+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_payment
 #: field:payment.order,date_scheduled:0
diff --git a/addons/account_payment/i18n/cs.po b/addons/account_payment/i18n/cs.po
index 3c75dc1f81d..b765cfbc207 100644
--- a/addons/account_payment/i18n/cs.po
+++ b/addons/account_payment/i18n/cs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:20+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_payment
 #: field:payment.order,date_scheduled:0
diff --git a/addons/account_payment/i18n/da.po b/addons/account_payment/i18n/da.po
index 06a360cf94b..2722e0e6558 100644
--- a/addons/account_payment/i18n/da.po
+++ b/addons/account_payment/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:20+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_payment
 #: field:payment.order,date_scheduled:0
diff --git a/addons/account_payment/i18n/de.po b/addons/account_payment/i18n/de.po
index 336eb3e41cc..f4d01fe1153 100644
--- a/addons/account_payment/i18n/de.po
+++ b/addons/account_payment/i18n/de.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:20+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_payment
 #: field:payment.order,date_scheduled:0
diff --git a/addons/account_payment/i18n/el.po b/addons/account_payment/i18n/el.po
index e14c3ec9369..4b5930832ca 100644
--- a/addons/account_payment/i18n/el.po
+++ b/addons/account_payment/i18n/el.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:20+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_payment
 #: field:payment.order,date_scheduled:0
diff --git a/addons/account_payment/i18n/es.po b/addons/account_payment/i18n/es.po
index af303b2da58..6523ffec8ac 100644
--- a/addons/account_payment/i18n/es.po
+++ b/addons/account_payment/i18n/es.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:49+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:20+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_payment
 #: field:payment.order,date_scheduled:0
diff --git a/addons/account_payment/i18n/es_AR.po b/addons/account_payment/i18n/es_AR.po
index 43eccde767e..8d9ff45aa10 100644
--- a/addons/account_payment/i18n/es_AR.po
+++ b/addons/account_payment/i18n/es_AR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:49+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:20+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_payment
 #: field:payment.order,date_scheduled:0
diff --git a/addons/account_payment/i18n/es_CL.po b/addons/account_payment/i18n/es_CL.po
index 5bcfc3c3402..892a0ff6f1c 100644
--- a/addons/account_payment/i18n/es_CL.po
+++ b/addons/account_payment/i18n/es_CL.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:49+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:20+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_payment
 #: field:payment.order,date_scheduled:0
diff --git a/addons/account_payment/i18n/es_CR.po b/addons/account_payment/i18n/es_CR.po
index 2fc5e479428..eb17401624e 100644
--- a/addons/account_payment/i18n/es_CR.po
+++ b/addons/account_payment/i18n/es_CR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:49+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:20+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 "Language: \n"
 
 #. module: account_payment
diff --git a/addons/account_payment/i18n/es_EC.po b/addons/account_payment/i18n/es_EC.po
index 91ee05f2c15..08de7503ed9 100644
--- a/addons/account_payment/i18n/es_EC.po
+++ b/addons/account_payment/i18n/es_EC.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:49+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:20+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_payment
 #: field:payment.order,date_scheduled:0
diff --git a/addons/account_payment/i18n/es_PY.po b/addons/account_payment/i18n/es_PY.po
index 0e9907a9b2c..da820728484 100644
--- a/addons/account_payment/i18n/es_PY.po
+++ b/addons/account_payment/i18n/es_PY.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:49+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:20+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_payment
 #: field:payment.order,date_scheduled:0
diff --git a/addons/account_payment/i18n/et.po b/addons/account_payment/i18n/et.po
index 6d602e1afc7..16d03631f16 100644
--- a/addons/account_payment/i18n/et.po
+++ b/addons/account_payment/i18n/et.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:20+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_payment
 #: field:payment.order,date_scheduled:0
diff --git a/addons/account_payment/i18n/fa.po b/addons/account_payment/i18n/fa.po
index 589d0d70800..dbf7a1ed216 100644
--- a/addons/account_payment/i18n/fa.po
+++ b/addons/account_payment/i18n/fa.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:49+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:20+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_payment
 #: field:payment.order,date_scheduled:0
diff --git a/addons/account_payment/i18n/fi.po b/addons/account_payment/i18n/fi.po
index 1047ad36f80..fc7452f1570 100644
--- a/addons/account_payment/i18n/fi.po
+++ b/addons/account_payment/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:20+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_payment
 #: field:payment.order,date_scheduled:0
diff --git a/addons/account_payment/i18n/fr.po b/addons/account_payment/i18n/fr.po
index 8103582191f..98b5ce8979c 100644
--- a/addons/account_payment/i18n/fr.po
+++ b/addons/account_payment/i18n/fr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:20+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_payment
 #: view:account.move.line:0
diff --git a/addons/account_payment/i18n/gl.po b/addons/account_payment/i18n/gl.po
index 58612b36752..788338f879f 100644
--- a/addons/account_payment/i18n/gl.po
+++ b/addons/account_payment/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:20+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_payment
 #: field:payment.order,date_scheduled:0
diff --git a/addons/account_payment/i18n/hi.po b/addons/account_payment/i18n/hi.po
index fad17d86886..44617a4d08b 100644
--- a/addons/account_payment/i18n/hi.po
+++ b/addons/account_payment/i18n/hi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:20+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_payment
 #: field:payment.order,date_scheduled:0
diff --git a/addons/account_payment/i18n/hr.po b/addons/account_payment/i18n/hr.po
index 1d3b242fcfe..f3a58d5d3a8 100644
--- a/addons/account_payment/i18n/hr.po
+++ b/addons/account_payment/i18n/hr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:49+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:20+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_payment
 #: field:payment.order,date_scheduled:0
diff --git a/addons/account_payment/i18n/hu.po b/addons/account_payment/i18n/hu.po
index 5dde8ca6903..7d776af1750 100644
--- a/addons/account_payment/i18n/hu.po
+++ b/addons/account_payment/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:20+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_payment
 #: field:payment.order,date_scheduled:0
diff --git a/addons/account_payment/i18n/id.po b/addons/account_payment/i18n/id.po
index e8c991b1d4b..48be403fe3b 100644
--- a/addons/account_payment/i18n/id.po
+++ b/addons/account_payment/i18n/id.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:20+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_payment
 #: field:payment.order,date_scheduled:0
diff --git a/addons/account_payment/i18n/it.po b/addons/account_payment/i18n/it.po
index 6baa529016d..1bc25f4e52f 100644
--- a/addons/account_payment/i18n/it.po
+++ b/addons/account_payment/i18n/it.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:20+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_payment
 #: field:payment.order,date_scheduled:0
diff --git a/addons/account_payment/i18n/ja.po b/addons/account_payment/i18n/ja.po
index 43a2ad83c8f..514747484df 100644
--- a/addons/account_payment/i18n/ja.po
+++ b/addons/account_payment/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:20+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_payment
 #: field:payment.order,date_scheduled:0
diff --git a/addons/account_payment/i18n/ko.po b/addons/account_payment/i18n/ko.po
index 7667f77ed96..09367801c82 100644
--- a/addons/account_payment/i18n/ko.po
+++ b/addons/account_payment/i18n/ko.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:20+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_payment
 #: field:payment.order,date_scheduled:0
diff --git a/addons/account_payment/i18n/lt.po b/addons/account_payment/i18n/lt.po
index 4df5a8fb489..6f59ba13c55 100644
--- a/addons/account_payment/i18n/lt.po
+++ b/addons/account_payment/i18n/lt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:20+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_payment
 #: field:payment.order,date_scheduled:0
diff --git a/addons/account_payment/i18n/lv.po b/addons/account_payment/i18n/lv.po
index a8592eb846e..b929bdb713f 100644
--- a/addons/account_payment/i18n/lv.po
+++ b/addons/account_payment/i18n/lv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:20+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_payment
 #: field:payment.order,date_scheduled:0
diff --git a/addons/account_payment/i18n/mn.po b/addons/account_payment/i18n/mn.po
index 3a9951574bc..d841aafa268 100644
--- a/addons/account_payment/i18n/mn.po
+++ b/addons/account_payment/i18n/mn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:20+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_payment
 #: field:payment.order,date_scheduled:0
diff --git a/addons/account_payment/i18n/nb.po b/addons/account_payment/i18n/nb.po
index 13f0b550741..e346117162f 100644
--- a/addons/account_payment/i18n/nb.po
+++ b/addons/account_payment/i18n/nb.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:49+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:20+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_payment
 #: field:payment.order,date_scheduled:0
diff --git a/addons/account_payment/i18n/nl.po b/addons/account_payment/i18n/nl.po
index 16e3e01c755..ceaeea65027 100644
--- a/addons/account_payment/i18n/nl.po
+++ b/addons/account_payment/i18n/nl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:20+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_payment
 #: field:payment.order,date_scheduled:0
diff --git a/addons/account_payment/i18n/nl_BE.po b/addons/account_payment/i18n/nl_BE.po
index 12cd63f1aa6..f49e7134872 100644
--- a/addons/account_payment/i18n/nl_BE.po
+++ b/addons/account_payment/i18n/nl_BE.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:49+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:20+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_payment
 #: field:payment.order,date_scheduled:0
diff --git a/addons/account_payment/i18n/oc.po b/addons/account_payment/i18n/oc.po
index 456a4e969a6..f77f83f6e05 100644
--- a/addons/account_payment/i18n/oc.po
+++ b/addons/account_payment/i18n/oc.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:49+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:20+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_payment
 #: field:payment.order,date_scheduled:0
diff --git a/addons/account_payment/i18n/pl.po b/addons/account_payment/i18n/pl.po
index 551912364f1..57ab7a07e91 100644
--- a/addons/account_payment/i18n/pl.po
+++ b/addons/account_payment/i18n/pl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:49+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:20+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_payment
 #: field:payment.order,date_scheduled:0
diff --git a/addons/account_payment/i18n/pt.po b/addons/account_payment/i18n/pt.po
index 5ca50badccc..245c9bff399 100644
--- a/addons/account_payment/i18n/pt.po
+++ b/addons/account_payment/i18n/pt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:49+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:20+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_payment
 #: field:payment.order,date_scheduled:0
diff --git a/addons/account_payment/i18n/pt_BR.po b/addons/account_payment/i18n/pt_BR.po
index 46bb3fb57ab..71c86a2f930 100644
--- a/addons/account_payment/i18n/pt_BR.po
+++ b/addons/account_payment/i18n/pt_BR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:49+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:20+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_payment
 #: field:payment.order,date_scheduled:0
diff --git a/addons/account_payment/i18n/ro.po b/addons/account_payment/i18n/ro.po
index 582c7f104c3..89ad8c979b4 100644
--- a/addons/account_payment/i18n/ro.po
+++ b/addons/account_payment/i18n/ro.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:49+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:20+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_payment
 #: field:payment.order,date_scheduled:0
diff --git a/addons/account_payment/i18n/ru.po b/addons/account_payment/i18n/ru.po
index 7a3ff827f36..d7d38cd79d3 100644
--- a/addons/account_payment/i18n/ru.po
+++ b/addons/account_payment/i18n/ru.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:49+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:20+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_payment
 #: field:payment.order,date_scheduled:0
diff --git a/addons/account_payment/i18n/sl.po b/addons/account_payment/i18n/sl.po
index 638aefdaf6b..63939f38e56 100644
--- a/addons/account_payment/i18n/sl.po
+++ b/addons/account_payment/i18n/sl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:49+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:20+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_payment
 #: field:payment.order,date_scheduled:0
diff --git a/addons/account_payment/i18n/sq.po b/addons/account_payment/i18n/sq.po
index 8a899514680..23416f47e35 100644
--- a/addons/account_payment/i18n/sq.po
+++ b/addons/account_payment/i18n/sq.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:20+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_payment
 #: field:payment.order,date_scheduled:0
diff --git a/addons/account_payment/i18n/sr.po b/addons/account_payment/i18n/sr.po
index 3725ee94d91..4f487e7213f 100644
--- a/addons/account_payment/i18n/sr.po
+++ b/addons/account_payment/i18n/sr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:49+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:20+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_payment
 #: field:payment.order,date_scheduled:0
diff --git a/addons/account_payment/i18n/sr@latin.po b/addons/account_payment/i18n/sr@latin.po
index c940641dc25..8fbb7a29ce0 100644
--- a/addons/account_payment/i18n/sr@latin.po
+++ b/addons/account_payment/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:49+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:20+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_payment
 #: field:payment.order,date_scheduled:0
diff --git a/addons/account_payment/i18n/sv.po b/addons/account_payment/i18n/sv.po
index 4e5d59101a9..0cca8a1cb80 100644
--- a/addons/account_payment/i18n/sv.po
+++ b/addons/account_payment/i18n/sv.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:49+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:20+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_payment
 #: field:payment.order,date_scheduled:0
diff --git a/addons/account_payment/i18n/tlh.po b/addons/account_payment/i18n/tlh.po
index d7d47640709..626873048b0 100644
--- a/addons/account_payment/i18n/tlh.po
+++ b/addons/account_payment/i18n/tlh.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:49+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:20+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_payment
 #: field:payment.order,date_scheduled:0
diff --git a/addons/account_payment/i18n/tr.po b/addons/account_payment/i18n/tr.po
index 2af566ccefd..963860a587e 100644
--- a/addons/account_payment/i18n/tr.po
+++ b/addons/account_payment/i18n/tr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:49+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:20+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_payment
 #: field:payment.order,date_scheduled:0
diff --git a/addons/account_payment/i18n/uk.po b/addons/account_payment/i18n/uk.po
index 649f2523ce8..67b4b2c4d3f 100644
--- a/addons/account_payment/i18n/uk.po
+++ b/addons/account_payment/i18n/uk.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:49+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:20+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_payment
 #: field:payment.order,date_scheduled:0
diff --git a/addons/account_payment/i18n/vi.po b/addons/account_payment/i18n/vi.po
index 2ab557ace0a..c662d80320e 100644
--- a/addons/account_payment/i18n/vi.po
+++ b/addons/account_payment/i18n/vi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:49+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:20+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_payment
 #: field:payment.order,date_scheduled:0
diff --git a/addons/account_payment/i18n/zh_CN.po b/addons/account_payment/i18n/zh_CN.po
index b331766a5fd..0ea27db394e 100644
--- a/addons/account_payment/i18n/zh_CN.po
+++ b/addons/account_payment/i18n/zh_CN.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:49+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:20+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_payment
 #: field:payment.order,date_scheduled:0
diff --git a/addons/account_payment/i18n/zh_TW.po b/addons/account_payment/i18n/zh_TW.po
index b492a307642..ebdc6e63f7c 100644
--- a/addons/account_payment/i18n/zh_TW.po
+++ b/addons/account_payment/i18n/zh_TW.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 00:35+0000\n"
-"PO-Revision-Date: 2009-01-30 12:43+0000\n"
-"Last-Translator: <>\n"
+"PO-Revision-Date: 2012-08-29 15:27+0000\n"
+"Last-Translator: Eric Huang <eh@cenoq.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:49+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-30 05:12+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_payment
 #: field:payment.order,date_scheduled:0
@@ -24,7 +24,7 @@ msgstr ""
 #. module: account_payment
 #: field:payment.line,currency:0
 msgid "Partner Currency"
-msgstr "伙伴貨幣"
+msgstr "業務夥伴貨幣"
 
 #. module: account_payment
 #: view:payment.order:0
@@ -40,7 +40,7 @@ msgstr "選取要應用之付款模式。"
 #: view:payment.mode:0
 #: view:payment.order:0
 msgid "Group By..."
-msgstr "分組根據..."
+msgstr "分類方式..."
 
 #. module: account_payment
 #: field:payment.order,line_ids:0
@@ -84,7 +84,7 @@ msgstr "首選日期"
 #. module: account_payment
 #: model:res.groups,name:account_payment.group_account_payment
 msgid "Accounting / Payments"
-msgstr ""
+msgstr "會計/付款"
 
 #. module: account_payment
 #: selection:payment.line,state:0
@@ -111,7 +111,7 @@ msgstr "到期日"
 #. module: account_payment
 #: view:account.move.line:0
 msgid "Account Entry Line"
-msgstr ""
+msgstr "會計分錄明細"
 
 #. module: account_payment
 #: view:payment.order.create:0
@@ -222,7 +222,7 @@ msgstr ""
 #: view:payment.order:0
 #: field:payment.order,state:0
 msgid "State"
-msgstr ""
+msgstr "狀態"
 
 #. module: account_payment
 #: view:payment.line:0
@@ -307,7 +307,7 @@ msgstr ""
 #. module: account_payment
 #: view:payment.order:0
 msgid "Select Invoices to Pay"
-msgstr ""
+msgstr "選擇要付款的發票"
 
 #. module: account_payment
 #: view:payment.line:0
@@ -329,12 +329,12 @@ msgstr "通訊類型"
 #: field:payment.mode,partner_id:0
 #: report:payment.order:0
 msgid "Partner"
-msgstr "伙伴"
+msgstr "業務夥伴"
 
 #. module: account_payment
 #: field:payment.line,bank_statement_line_id:0
 msgid "Bank statement line"
-msgstr ""
+msgstr "銀行對帳單明細"
 
 #. module: account_payment
 #: selection:payment.order,date_prefered:0
@@ -399,7 +399,7 @@ msgstr "付款類型"
 #. module: account_payment
 #: help:payment.line,amount_currency:0
 msgid "Payment amount in the partner currency"
-msgstr "以伙伴貨幣計算之付款總額"
+msgstr "以業務夥伴貨幣計算之付款總額"
 
 #. module: account_payment
 #: view:payment.order:0
@@ -441,7 +441,7 @@ msgstr ""
 #. module: account_payment
 #: field:payment.order,user_id:0
 msgid "User"
-msgstr ""
+msgstr "使用者"
 
 #. module: account_payment
 #: field:account.payment.populate.statement,lines:0
@@ -504,7 +504,7 @@ msgstr "匯入付款明細"
 #. module: account_payment
 #: field:account.move.line,amount_to_pay:0
 msgid "Amount to pay"
-msgstr "要付總額"
+msgstr "應付總額"
 
 #. module: account_payment
 #: field:payment.line,amount:0
diff --git a/addons/account_sequence/__openerp__.py b/addons/account_sequence/__openerp__.py
index 0f860d400e9..16f13dc5178 100644
--- a/addons/account_sequence/__openerp__.py
+++ b/addons/account_sequence/__openerp__.py
@@ -22,7 +22,7 @@
 {
     'name': 'Entries Sequence Numbering',
     'version': '1.1',
-    "category": 'Accounting & Finance',
+    'category': 'Accounting & Finance',
     'description': """
 This module maintains internal sequence number for accounting entries.
 ======================================================================
@@ -30,6 +30,7 @@ This module maintains internal sequence number for accounting entries.
 Allows you to configure the accounting sequences to be maintained.
 
 You can customize the following attributes of the sequence:
+-----------------------------------------------------------
     * Prefix
     * Suffix
     * Next Number
@@ -40,13 +41,12 @@ You can customize the following attributes of the sequence:
     'website': 'http://www.openerp.com',
     'images': ['images/internal_sequence_number.jpeg'],
     'depends': ['account'],
-    'init_xml': [],
-    'update_xml': [
+    'data': [
         'account_sequence_data.xml',
         'account_sequence_installer_view.xml',
         'account_sequence.xml'
     ],
-    'demo_xml': [],
+    'demo': [],
     'installable': True,
     'auto_install': False,
     'certificate': '00475376442024623469',
diff --git a/addons/account_sequence/i18n/ar.po b/addons/account_sequence/i18n/ar.po
index 62ce83132eb..b8c6d6a14dc 100644
--- a/addons/account_sequence/i18n/ar.po
+++ b/addons/account_sequence/i18n/ar.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_sequence
 #: view:account.sequence.installer:0
diff --git a/addons/account_sequence/i18n/bg.po b/addons/account_sequence/i18n/bg.po
index 2204c1a5bcc..0a58e969e6e 100644
--- a/addons/account_sequence/i18n/bg.po
+++ b/addons/account_sequence/i18n/bg.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_sequence
 #: view:account.sequence.installer:0
diff --git a/addons/account_sequence/i18n/ca.po b/addons/account_sequence/i18n/ca.po
index da884f1f9d2..a1b0cd866ff 100644
--- a/addons/account_sequence/i18n/ca.po
+++ b/addons/account_sequence/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_sequence
 #: view:account.sequence.installer:0
diff --git a/addons/account_sequence/i18n/da.po b/addons/account_sequence/i18n/da.po
index 680949241ad..2189591e1c7 100644
--- a/addons/account_sequence/i18n/da.po
+++ b/addons/account_sequence/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_sequence
 #: view:account.sequence.installer:0
diff --git a/addons/account_sequence/i18n/de.po b/addons/account_sequence/i18n/de.po
index 718541ec268..cf0847863bf 100644
--- a/addons/account_sequence/i18n/de.po
+++ b/addons/account_sequence/i18n/de.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_sequence
 #: view:account.sequence.installer:0
diff --git a/addons/account_sequence/i18n/es.po b/addons/account_sequence/i18n/es.po
index 8bc9c2a9e15..acd3273a408 100644
--- a/addons/account_sequence/i18n/es.po
+++ b/addons/account_sequence/i18n/es.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_sequence
 #: view:account.sequence.installer:0
diff --git a/addons/account_sequence/i18n/es_CR.po b/addons/account_sequence/i18n/es_CR.po
index 537710a59de..f749b4ee015 100644
--- a/addons/account_sequence/i18n/es_CR.po
+++ b/addons/account_sequence/i18n/es_CR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 "Language: es\n"
 
 #. module: account_sequence
diff --git a/addons/account_sequence/i18n/es_PY.po b/addons/account_sequence/i18n/es_PY.po
index 84ae36d039a..650b5cb32f0 100644
--- a/addons/account_sequence/i18n/es_PY.po
+++ b/addons/account_sequence/i18n/es_PY.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_sequence
 #: view:account.sequence.installer:0
diff --git a/addons/account_sequence/i18n/fa.po b/addons/account_sequence/i18n/fa.po
index c4b7d24c412..e3b0bbfb873 100644
--- a/addons/account_sequence/i18n/fa.po
+++ b/addons/account_sequence/i18n/fa.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_sequence
 #: view:account.sequence.installer:0
diff --git a/addons/account_sequence/i18n/fr.po b/addons/account_sequence/i18n/fr.po
index 0983f50e322..1021e285e86 100644
--- a/addons/account_sequence/i18n/fr.po
+++ b/addons/account_sequence/i18n/fr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_sequence
 #: view:account.sequence.installer:0
diff --git a/addons/account_sequence/i18n/gl.po b/addons/account_sequence/i18n/gl.po
index 9a578eee3ce..8c9a9608f80 100644
--- a/addons/account_sequence/i18n/gl.po
+++ b/addons/account_sequence/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_sequence
 #: view:account.sequence.installer:0
diff --git a/addons/account_sequence/i18n/hr.po b/addons/account_sequence/i18n/hr.po
index a8c9281bdc3..30531822db0 100644
--- a/addons/account_sequence/i18n/hr.po
+++ b/addons/account_sequence/i18n/hr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_sequence
 #: view:account.sequence.installer:0
diff --git a/addons/account_sequence/i18n/hu.po b/addons/account_sequence/i18n/hu.po
index d7bb6b461ac..4d144bf738b 100644
--- a/addons/account_sequence/i18n/hu.po
+++ b/addons/account_sequence/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_sequence
 #: view:account.sequence.installer:0
diff --git a/addons/account_sequence/i18n/id.po b/addons/account_sequence/i18n/id.po
index 1d36c808b78..d6c3a129739 100644
--- a/addons/account_sequence/i18n/id.po
+++ b/addons/account_sequence/i18n/id.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_sequence
 #: view:account.sequence.installer:0
diff --git a/addons/account_sequence/i18n/it.po b/addons/account_sequence/i18n/it.po
index 600c451df17..5506b679588 100644
--- a/addons/account_sequence/i18n/it.po
+++ b/addons/account_sequence/i18n/it.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_sequence
 #: view:account.sequence.installer:0
diff --git a/addons/account_sequence/i18n/ja.po b/addons/account_sequence/i18n/ja.po
index facdcb8035a..bf46caa8c32 100644
--- a/addons/account_sequence/i18n/ja.po
+++ b/addons/account_sequence/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_sequence
 #: view:account.sequence.installer:0
diff --git a/addons/account_sequence/i18n/lv.po b/addons/account_sequence/i18n/lv.po
index c20737eb1d3..565d4dc95cf 100644
--- a/addons/account_sequence/i18n/lv.po
+++ b/addons/account_sequence/i18n/lv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_sequence
 #: view:account.sequence.installer:0
diff --git a/addons/account_sequence/i18n/nb.po b/addons/account_sequence/i18n/nb.po
index c2dd186a39b..e4bcbb4b0bc 100644
--- a/addons/account_sequence/i18n/nb.po
+++ b/addons/account_sequence/i18n/nb.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_sequence
 #: view:account.sequence.installer:0
diff --git a/addons/account_sequence/i18n/nl.po b/addons/account_sequence/i18n/nl.po
index d0535129425..87ceb9d49c5 100644
--- a/addons/account_sequence/i18n/nl.po
+++ b/addons/account_sequence/i18n/nl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_sequence
 #: view:account.sequence.installer:0
@@ -161,7 +161,7 @@ msgstr "Voorvoegsel voor het record voor de reeks"
 #. module: account_sequence
 #: model:ir.model,name:account_sequence.model_account_move
 msgid "Account Entry"
-msgstr "Boeking"
+msgstr "Journaalpost"
 
 #. module: account_sequence
 #: field:account.sequence.installer,suffix:0
diff --git a/addons/account_sequence/i18n/nl_BE.po b/addons/account_sequence/i18n/nl_BE.po
index 8259d9264b7..b2ba2080caf 100644
--- a/addons/account_sequence/i18n/nl_BE.po
+++ b/addons/account_sequence/i18n/nl_BE.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_sequence
 #: view:account.sequence.installer:0
diff --git a/addons/account_sequence/i18n/pl.po b/addons/account_sequence/i18n/pl.po
index a0e060edec3..d869a2ecbf1 100644
--- a/addons/account_sequence/i18n/pl.po
+++ b/addons/account_sequence/i18n/pl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_sequence
 #: view:account.sequence.installer:0
diff --git a/addons/account_sequence/i18n/pt.po b/addons/account_sequence/i18n/pt.po
index 62d979afd35..42a344fae03 100644
--- a/addons/account_sequence/i18n/pt.po
+++ b/addons/account_sequence/i18n/pt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_sequence
 #: view:account.sequence.installer:0
diff --git a/addons/account_sequence/i18n/pt_BR.po b/addons/account_sequence/i18n/pt_BR.po
index 155b3f73640..c27e1033ec9 100644
--- a/addons/account_sequence/i18n/pt_BR.po
+++ b/addons/account_sequence/i18n/pt_BR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_sequence
 #: view:account.sequence.installer:0
diff --git a/addons/account_sequence/i18n/ro.po b/addons/account_sequence/i18n/ro.po
index e27178ec962..4f0391394f3 100644
--- a/addons/account_sequence/i18n/ro.po
+++ b/addons/account_sequence/i18n/ro.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_sequence
 #: view:account.sequence.installer:0
diff --git a/addons/account_sequence/i18n/ru.po b/addons/account_sequence/i18n/ru.po
index b41afaf6a43..8f6d25d43e6 100644
--- a/addons/account_sequence/i18n/ru.po
+++ b/addons/account_sequence/i18n/ru.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_sequence
 #: view:account.sequence.installer:0
diff --git a/addons/account_sequence/i18n/sq.po b/addons/account_sequence/i18n/sq.po
index 269cf8c9e29..cc69790d6de 100644
--- a/addons/account_sequence/i18n/sq.po
+++ b/addons/account_sequence/i18n/sq.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_sequence
 #: view:account.sequence.installer:0
diff --git a/addons/account_sequence/i18n/sr@latin.po b/addons/account_sequence/i18n/sr@latin.po
index 1c5a8bc5d56..fc96e2a43d5 100644
--- a/addons/account_sequence/i18n/sr@latin.po
+++ b/addons/account_sequence/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_sequence
 #: view:account.sequence.installer:0
diff --git a/addons/account_sequence/i18n/sv.po b/addons/account_sequence/i18n/sv.po
index 16b52fb84f8..bf7d3f932f8 100644
--- a/addons/account_sequence/i18n/sv.po
+++ b/addons/account_sequence/i18n/sv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_sequence
 #: view:account.sequence.installer:0
diff --git a/addons/account_sequence/i18n/tr.po b/addons/account_sequence/i18n/tr.po
index 7ec22c1ca6b..75790c1d4b3 100644
--- a/addons/account_sequence/i18n/tr.po
+++ b/addons/account_sequence/i18n/tr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_sequence
 #: view:account.sequence.installer:0
diff --git a/addons/account_sequence/i18n/vi.po b/addons/account_sequence/i18n/vi.po
index 9a751c9d442..7621c94e23c 100644
--- a/addons/account_sequence/i18n/vi.po
+++ b/addons/account_sequence/i18n/vi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_sequence
 #: view:account.sequence.installer:0
diff --git a/addons/account_sequence/i18n/zh_CN.po b/addons/account_sequence/i18n/zh_CN.po
index e5a2aa297e8..ed8db20e473 100644
--- a/addons/account_sequence/i18n/zh_CN.po
+++ b/addons/account_sequence/i18n/zh_CN.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_sequence
 #: view:account.sequence.installer:0
diff --git a/addons/account_sequence/i18n/zh_TW.po b/addons/account_sequence/i18n/zh_TW.po
index 98f81b11053..4a88a5a47a3 100644
--- a/addons/account_sequence/i18n/zh_TW.po
+++ b/addons/account_sequence/i18n/zh_TW.po
@@ -8,31 +8,31 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:35+0000\n"
-"PO-Revision-Date: 2011-09-27 11:32+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2012-08-28 02:48+0000\n"
+"Last-Translator: Eric Huang <eh@cenoq.com>\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: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-29 05:05+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_sequence
 #: view:account.sequence.installer:0
 #: model:ir.actions.act_window,name:account_sequence.action_account_seq_installer
 msgid "Account Sequence Application Configuration"
-msgstr ""
+msgstr "帳戶序列的應用配置"
 
 #. module: account_sequence
 #: constraint:account.move:0
 msgid ""
 "You can not create more than one move per period on centralized journal"
-msgstr ""
+msgstr "餘額憑證簿每個期間只能有一張會計憑證"
 
 #. module: account_sequence
 #: constraint:account.move.line:0
 msgid "Company must be the same for its related account and period."
-msgstr ""
+msgstr "科目和期間必須屬於同一個公司"
 
 #. module: account_sequence
 #: help:account.move,internal_sequence_number:0
@@ -43,12 +43,12 @@ msgstr "內部序列號碼"
 #. module: account_sequence
 #: help:account.sequence.installer,number_next:0
 msgid "Next number of this sequence"
-msgstr "本序列下個號碼"
+msgstr "本序列下一個編號"
 
 #. module: account_sequence
 #: field:account.sequence.installer,number_next:0
 msgid "Next Number"
-msgstr "下個號碼"
+msgstr "下一個編號"
 
 #. module: account_sequence
 #: field:account.sequence.installer,number_increment:0
@@ -58,22 +58,22 @@ msgstr "編號增量"
 #. module: account_sequence
 #: help:account.sequence.installer,number_increment:0
 msgid "The next number of the sequence will be incremented by this number"
-msgstr "序列下個號碼按此數字遞增"
+msgstr "這序列的下一編號將以此數增加"
 
 #. module: account_sequence
 #: view:account.sequence.installer:0
 msgid "Configure Your Account Sequence Application"
-msgstr ""
+msgstr "設置會計序列應用程式"
 
 #. module: account_sequence
 #: view:account.sequence.installer:0
 msgid "Configure"
-msgstr "設定"
+msgstr "設置"
 
 #. module: account_sequence
 #: help:account.sequence.installer,suffix:0
 msgid "Suffix value of the record for the sequence"
-msgstr ""
+msgstr "序號的後綴"
 
 #. module: account_sequence
 #: field:account.sequence.installer,company_id:0
@@ -85,7 +85,7 @@ msgstr "公司"
 msgid ""
 "This sequence will be used to maintain the internal number for the journal "
 "entries related to this journal."
-msgstr ""
+msgstr "此序列用於當前帳簿的所有會計分錄。"
 
 #. module: account_sequence
 #: field:account.sequence.installer,padding:0
@@ -95,25 +95,25 @@ msgstr "數字位數"
 #. module: account_sequence
 #: model:ir.model,name:account_sequence.model_account_move_line
 msgid "Journal Items"
-msgstr ""
+msgstr "借貸項"
 
 #. module: account_sequence
 #: field:account.move,internal_sequence_number:0
 #: field:account.move.line,internal_sequence_number:0
 msgid "Internal Number"
-msgstr "內部號碼"
+msgstr "內部編號"
 
 #. module: account_sequence
 #: constraint:account.move.line:0
 msgid "You can not create journal items on an account of type view."
-msgstr ""
+msgstr "借貸項不能使用視圖類型的科目"
 
 #. module: account_sequence
 #: help:account.sequence.installer,padding:0
 msgid ""
 "OpenERP will automatically adds some '0' on the left of the 'Next Number' to "
 "get the required padding size."
-msgstr ""
+msgstr "OpenERP將自動新增幾個“0”在“下一個數字”左側滿足填充要求."
 
 #. module: account_sequence
 #: field:account.sequence.installer,name:0
@@ -123,19 +123,19 @@ msgstr "名稱"
 #. module: account_sequence
 #: constraint:account.move.line:0
 msgid "You can not create journal items on closed account."
-msgstr ""
+msgstr "你不能在已關閉的會計科目建立分錄"
 
 #. module: account_sequence
 #: constraint:account.journal:0
 msgid ""
 "Configuration error! The currency chosen should be shared by the default "
 "accounts too."
-msgstr ""
+msgstr "設置錯誤！所選幣別應與預設科目共享。"
 
 #. module: account_sequence
 #: sql_constraint:account.move.line:0
 msgid "Wrong credit or debit value in accounting entry !"
-msgstr ""
+msgstr "會計分錄中包含錯誤的借貸值！"
 
 #. module: account_sequence
 #: field:account.journal,internal_sequence_id:0
@@ -145,32 +145,32 @@ msgstr "內部序列"
 #. module: account_sequence
 #: help:account.sequence.installer,prefix:0
 msgid "Prefix value of the record for the sequence"
-msgstr ""
+msgstr "序列號的前綴"
 
 #. module: account_sequence
 #: model:ir.model,name:account_sequence.model_account_move
 msgid "Account Entry"
-msgstr ""
+msgstr "會計分錄"
 
 #. module: account_sequence
 #: field:account.sequence.installer,suffix:0
 msgid "Suffix"
-msgstr ""
+msgstr "後綴"
 
 #. module: account_sequence
 #: field:account.sequence.installer,config_logo:0
 msgid "Image"
-msgstr "圖像"
+msgstr "圖片"
 
 #. module: account_sequence
 #: view:account.sequence.installer:0
 msgid "title"
-msgstr ""
+msgstr "標題"
 
 #. module: account_sequence
 #: sql_constraint:account.journal:0
 msgid "The name of the journal must be unique per company !"
-msgstr ""
+msgstr "每個公司的帳簿名稱必須唯一！"
 
 #. module: account_sequence
 #: constraint:account.move.line:0
@@ -178,39 +178,39 @@ 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 ""
+msgstr "分錄上的科目要求輸入一個外幣。你可以在科目設置中去掉這個外幣或在日記帳設置上選擇一個支持多幣種的輸入界面。"
 
 #. module: account_sequence
 #: 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 ""
+msgstr "分錄日期不在所選期間內！可以修改憑證日期或在日記帳上去掉這個檢查項。"
 
 #. module: account_sequence
 #: field:account.sequence.installer,prefix:0
 msgid "Prefix"
-msgstr ""
+msgstr "前綴"
 
 #. module: account_sequence
 #: sql_constraint:account.journal:0
 msgid "The code of the journal must be unique per company !"
-msgstr ""
+msgstr "每個公司的帳簿編碼必須唯一！"
 
 #. module: account_sequence
 #: model:ir.model,name:account_sequence.model_account_sequence_installer
 msgid "account.sequence.installer"
-msgstr ""
+msgstr "account.sequence.installer"
 
 #. module: account_sequence
 #: model:ir.model,name:account_sequence.model_account_journal
 msgid "Journal"
-msgstr ""
+msgstr "帳簿"
 
 #. module: account_sequence
 #: view:account.sequence.installer:0
 msgid "You can enhance the Account Sequence Application by installing ."
-msgstr ""
+msgstr "你可以用安裝的方式來擴充會計序列應用程式"
 
 #~ msgid "Configuration Progress"
 #~ msgstr "配置進度"
diff --git a/addons/account_voucher/__openerp__.py b/addons/account_voucher/__openerp__.py
index 16ea771d123..03befcc3acd 100644
--- a/addons/account_voucher/__openerp__.py
+++ b/addons/account_voucher/__openerp__.py
@@ -20,12 +20,12 @@
 ##############################################################################
 
 {
-    "name" : "eInvoicing & Payments",
-    "version" : "1.0",
-    "author" : 'OpenERP SA',
-    "summary": 'Send Invoices and Track Payments',
-    "description": """
-eInvoicing & Payments module manage all Voucher Entries such as "Reconciliation Entries", "Adjustment Entries", "Closing or Opening Entries" for Sales, Purchase, Bank, Cash, Expense, Contra.
+    'name' : 'eInvoicing & Payments',
+    'version' : '1.0',
+    'author' : 'OpenERP SA',
+    'summary': 'Send Invoices and Track Payments',
+    'description': """
+eInvoicing & Payments module manage all Voucher Entries such as 'Reconciliation Entries', 'Adjustment Entries', 'Closing or Opening Entries' for Sales, Purchase, Bank, Cash, Expense, Contra.
 ==============================================================================================================================================================================================
 
     * Voucher Entry
@@ -33,47 +33,43 @@ eInvoicing & Payments module manage all Voucher Entries such as "Reconciliation
     * Voucher Payment [Customer & Supplier]
     * Cheque Register
     """,
-    "category": 'Accounting & Finance',
-    "sequence": 4,
-    "website" : "http://openerp.com",
-    "images" : ["images/customer_payment.jpeg","images/journal_voucher.jpeg","images/sales_receipt.jpeg","images/supplier_voucher.jpeg"],
-    "depends" : ["account"],
-    "init_xml" : [
+    'category': 'Accounting & Finance',
+    'sequence': 4,
+    'website' : 'http://openerp.com',
+    'images' : ['images/customer_payment.jpeg','images/journal_voucher.jpeg','images/sales_receipt.jpeg','images/supplier_voucher.jpeg'],
+    'depends' : ['account'],
+    'demo' : [],
+    'data' : [
+        'security/ir.model.access.csv',
+        'account_voucher_sequence.xml',
+        'account_voucher_workflow.xml',
+        'account_voucher_report.xml',
+        'wizard/account_statement_from_invoice_view.xml',
+        'account_voucher_view.xml',
+        'voucher_payment_receipt_view.xml',
+        'voucher_sales_purchase_view.xml',
+        'account_voucher_wizard.xml',
+        'account_voucher_pay_invoice.xml',
+        'report/account_voucher_sales_receipt_view.xml',
+        'security/account_voucher_security.xml',
         'account_voucher_data.xml',
     ],
-
-    "demo_xml" : [],
-
-    "update_xml" : [
-        "security/ir.model.access.csv",
-        "account_voucher_sequence.xml",
-        "account_voucher_workflow.xml",
-        "account_voucher_report.xml",
-        "wizard/account_statement_from_invoice_view.xml",
-        "account_voucher_view.xml",
-        "voucher_payment_receipt_view.xml",
-        "voucher_sales_purchase_view.xml",
-        "account_voucher_wizard.xml",
-        "account_voucher_pay_invoice.xml",
-        "report/account_voucher_sales_receipt_view.xml",
-        "security/account_voucher_security.xml"
-    ],
-    "test" : [
-        "test/account_voucher.yml",
-        "test/sales_receipt.yml",
-        "test/sales_payment.yml",
-        "test/account_voucher_report.yml",
-        "test/case1_usd_usd.yml",
-        "test/case2_usd_eur_debtor_in_eur.yml",
-        "test/case2_usd_eur_debtor_in_usd.yml",
-        "test/case3_eur_eur.yml",
-        "test/case4_cad_chf.yml",
-        "test/case_eur_usd.yml",
+    'test' : [
+        'test/account_voucher.yml',
+        'test/sales_receipt.yml',
+        'test/sales_payment.yml',
+        'test/account_voucher_report.yml',
+        'test/case1_usd_usd.yml',
+        'test/case2_usd_eur_debtor_in_eur.yml',
+        'test/case2_usd_eur_debtor_in_usd.yml',
+        'test/case3_eur_eur.yml',
+        'test/case4_cad_chf.yml',
+        'test/case_eur_usd.yml',
     ],
     'certificate': '0037580727101',
-    "auto_install": False,
-    "application": True,
-    "installable": True,
+    'auto_install': False,
+    'application': True,
+    'installable': True,
 }
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account_voucher/account_voucher.py b/addons/account_voucher/account_voucher.py
index 1287c7b3c18..f75cda8cdde 100644
--- a/addons/account_voucher/account_voucher.py
+++ b/addons/account_voucher/account_voucher.py
@@ -1106,7 +1106,8 @@ class account_voucher(osv.osv):
                         # otherwise we use the rates of the system (giving the voucher date in the context)
                         amount_currency = currency_obj.compute(cr, uid, company_currency, line.move_line_id.currency_id.id, move_line['debit']-move_line['credit'], context=ctx)
                 if line.amount == line.amount_unreconciled and line.move_line_id.currency_id.id == voucher_currency:
-                    foreign_currency_diff = line.move_line_id.amount_residual_currency + amount_currency
+                    sign = voucher_brw.type in ('payment', 'purchase') and -1 or 1
+                    foreign_currency_diff = sign * line.move_line_id.amount_residual_currency + amount_currency
 
             move_line['amount_currency'] = amount_currency
             voucher_line = move_line_obj.create(cr, uid, move_line)
@@ -1292,17 +1293,17 @@ class account_voucher(osv.osv):
     def create_send_note(self, cr, uid, ids, context=None):
         for obj in self.browse(cr, uid, ids, context=context):
             message = "%s <b>created</b>." % self._document_type[obj.type or False]
-            self.message_append_note(cr, uid, [obj.id], body=message, context=context)
+            self.message_post(cr, uid, [obj.id], body=message, context=context)
 
     def post_send_note(self, cr, uid, ids, context=None):
         for obj in self.browse(cr, uid, ids, context=context):
             message = "%s '%s' is <b>posted</b>." % (self._document_type[obj.type or False], obj.move_id.name)
-            self.message_append_note(cr, uid, [obj.id], body=message, context=context)
+            self.message_post(cr, uid, [obj.id], body=message, context=context)
 
     def reconcile_send_note(self, cr, uid, ids, context=None):
         for obj in self.browse(cr, uid, ids, context=context):
             message = "%s <b>reconciled</b>." % self._document_type[obj.type or False]
-            self.message_append_note(cr, uid, [obj.id], body=message, context=context)
+            self.message_post(cr, uid, [obj.id], body=message, context=context)
 
 account_voucher()
 
diff --git a/addons/account_voucher/account_voucher_data.xml b/addons/account_voucher/account_voucher_data.xml
index 8be2851a434..656d2c2cd91 100644
--- a/addons/account_voucher/account_voucher_data.xml
+++ b/addons/account_voucher/account_voucher_data.xml
@@ -2,15 +2,16 @@
 <openerp>
     <data noupdate="1">
         <!-- notify all employees of module installation -->
-        <function model="mail.group" name="message_append_note">
-            <!-- ids, subject, body, parent_id=False, type='notification', content_subtype='html' -->
-            <value eval="[ref('mail.group_all_employees')]"/>
-            <value>Module eInvoicing &amp; Payments has been installed.</value>
-            <value>OpenERP's electronic invoicing allows to ease and fasten the creation of invoices and collection of customer payments. Invoices are created in a few clicks and your customers receive them by email. They can pay online and/or import them in their own system.
+        <record model="mail.message" id="module_install_notification">
+            <field name="model">mail.group</field>
+            <field name="res_id" ref="mail.group_all_employees"/>
+            <field name="type">notification</field>
+            <field name="subject">eInvoicing &amp; Payments application installed!</field>
+            <field name="body">OpenERP's electronic invoicing accelerates the creation of invoices and collection of customer payments. Invoices are created in a few clicks and your customers receive them by email. They can pay online and/or import them in their own system.
 
-You can track customer payments easily and automate the reminders. You get an overview of the discussion with your customers on each invoice to ensure a full traceability.
+You can track customer payments easily and automate follow-ups. You get an overview of the discussion with your customers on each invoice for easier traceability.
 
-If you want to use advanced accounting features, you should install the "Accounting and Finance" module.</value>
-        </function>
+For advanced accounting features, you should install the "Accounting and Finance" module.</field>
+        </record>
     </data>
 </openerp>
diff --git a/addons/account_voucher/i18n/ar.po b/addons/account_voucher/i18n/ar.po
index 19cc4dd6199..c3fedb292d7 100644
--- a/addons/account_voucher/i18n/ar.po
+++ b/addons/account_voucher/i18n/ar.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:53+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:26+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_voucher
 #: view:sale.receipt.report:0
diff --git a/addons/account_voucher/i18n/bg.po b/addons/account_voucher/i18n/bg.po
index a418dfdb58e..897aa73f7e6 100644
--- a/addons/account_voucher/i18n/bg.po
+++ b/addons/account_voucher/i18n/bg.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:53+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:26+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_voucher
 #: view:sale.receipt.report:0
diff --git a/addons/account_voucher/i18n/bs.po b/addons/account_voucher/i18n/bs.po
index 74b2a07705c..2aef6be254a 100644
--- a/addons/account_voucher/i18n/bs.po
+++ b/addons/account_voucher/i18n/bs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:53+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:26+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_voucher
 #: view:sale.receipt.report:0
diff --git a/addons/account_voucher/i18n/ca.po b/addons/account_voucher/i18n/ca.po
index 0cf64a1c698..5d905843c35 100644
--- a/addons/account_voucher/i18n/ca.po
+++ b/addons/account_voucher/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:53+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:26+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_voucher
 #: view:sale.receipt.report:0
diff --git a/addons/account_voucher/i18n/cs.po b/addons/account_voucher/i18n/cs.po
index 45b4d271ba9..4ca7e5a1ca0 100644
--- a/addons/account_voucher/i18n/cs.po
+++ b/addons/account_voucher/i18n/cs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:53+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:26+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_voucher
 #: view:sale.receipt.report:0
diff --git a/addons/account_voucher/i18n/da.po b/addons/account_voucher/i18n/da.po
index 593276c4514..c59df5a120b 100644
--- a/addons/account_voucher/i18n/da.po
+++ b/addons/account_voucher/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:53+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:26+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_voucher
 #: view:sale.receipt.report:0
diff --git a/addons/account_voucher/i18n/de.po b/addons/account_voucher/i18n/de.po
index 3a4899d4d60..4cf7a832b9a 100644
--- a/addons/account_voucher/i18n/de.po
+++ b/addons/account_voucher/i18n/de.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:53+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:26+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_voucher
 #: view:sale.receipt.report:0
diff --git a/addons/account_voucher/i18n/el.po b/addons/account_voucher/i18n/el.po
index aa7bf516124..f70666420f8 100644
--- a/addons/account_voucher/i18n/el.po
+++ b/addons/account_voucher/i18n/el.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:53+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:26+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_voucher
 #: view:sale.receipt.report:0
diff --git a/addons/account_voucher/i18n/es.po b/addons/account_voucher/i18n/es.po
index 9feae6b279b..04c6ce746c9 100644
--- a/addons/account_voucher/i18n/es.po
+++ b/addons/account_voucher/i18n/es.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:54+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:26+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_voucher
 #: view:sale.receipt.report:0
diff --git a/addons/account_voucher/i18n/es_AR.po b/addons/account_voucher/i18n/es_AR.po
index 1982a854a6f..dd4b1f38498 100644
--- a/addons/account_voucher/i18n/es_AR.po
+++ b/addons/account_voucher/i18n/es_AR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:54+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:26+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_voucher
 #: view:sale.receipt.report:0
diff --git a/addons/account_voucher/i18n/es_CR.po b/addons/account_voucher/i18n/es_CR.po
index 3a229d2d315..34f4202f8f6 100644
--- a/addons/account_voucher/i18n/es_CR.po
+++ b/addons/account_voucher/i18n/es_CR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:54+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:26+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 "Language: \n"
 
 #. module: account_voucher
diff --git a/addons/account_voucher/i18n/es_EC.po b/addons/account_voucher/i18n/es_EC.po
index 8e0d12a48a4..9ed0077d932 100644
--- a/addons/account_voucher/i18n/es_EC.po
+++ b/addons/account_voucher/i18n/es_EC.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:54+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:26+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_voucher
 #: view:sale.receipt.report:0
diff --git a/addons/account_voucher/i18n/es_PY.po b/addons/account_voucher/i18n/es_PY.po
index 27d715405af..93b9fb604ac 100644
--- a/addons/account_voucher/i18n/es_PY.po
+++ b/addons/account_voucher/i18n/es_PY.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:54+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:26+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_voucher
 #: view:sale.receipt.report:0
diff --git a/addons/account_voucher/i18n/et.po b/addons/account_voucher/i18n/et.po
index 2677094f960..1bcb315668b 100644
--- a/addons/account_voucher/i18n/et.po
+++ b/addons/account_voucher/i18n/et.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:53+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:26+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #~ msgid "Bank Receipt Voucher"
 #~ msgstr "Panga sissetulekuorder"
diff --git a/addons/account_voucher/i18n/fa.po b/addons/account_voucher/i18n/fa.po
index e4bc1a135fe..0cc995fa387 100644
--- a/addons/account_voucher/i18n/fa.po
+++ b/addons/account_voucher/i18n/fa.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:54+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:26+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_voucher
 #: view:sale.receipt.report:0
diff --git a/addons/account_voucher/i18n/fr.po b/addons/account_voucher/i18n/fr.po
index ce3d56b353c..e89165925fb 100644
--- a/addons/account_voucher/i18n/fr.po
+++ b/addons/account_voucher/i18n/fr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:53+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:26+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_voucher
 #: view:sale.receipt.report:0
diff --git a/addons/account_voucher/i18n/gl.po b/addons/account_voucher/i18n/gl.po
index 736234b7473..fb2fe6f526b 100644
--- a/addons/account_voucher/i18n/gl.po
+++ b/addons/account_voucher/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:53+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:26+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_voucher
 #: view:sale.receipt.report:0
diff --git a/addons/account_voucher/i18n/gu.po b/addons/account_voucher/i18n/gu.po
index bbb554b0c58..f75c080bffb 100644
--- a/addons/account_voucher/i18n/gu.po
+++ b/addons/account_voucher/i18n/gu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:53+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:26+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_voucher
 #: view:sale.receipt.report:0
diff --git a/addons/account_voucher/i18n/hi.po b/addons/account_voucher/i18n/hi.po
index 0b1daa131f6..2af49bd4700 100644
--- a/addons/account_voucher/i18n/hi.po
+++ b/addons/account_voucher/i18n/hi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:53+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:26+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_voucher
 #: view:sale.receipt.report:0
diff --git a/addons/account_voucher/i18n/hr.po b/addons/account_voucher/i18n/hr.po
index 0a4281ac06f..81ab95de535 100644
--- a/addons/account_voucher/i18n/hr.po
+++ b/addons/account_voucher/i18n/hr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:54+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:26+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_voucher
 #: view:sale.receipt.report:0
diff --git a/addons/account_voucher/i18n/hu.po b/addons/account_voucher/i18n/hu.po
index 485789f3010..8efb993607b 100644
--- a/addons/account_voucher/i18n/hu.po
+++ b/addons/account_voucher/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:53+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:26+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_voucher
 #: view:sale.receipt.report:0
diff --git a/addons/account_voucher/i18n/id.po b/addons/account_voucher/i18n/id.po
index 894b99594f5..324c182d82f 100644
--- a/addons/account_voucher/i18n/id.po
+++ b/addons/account_voucher/i18n/id.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:53+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:26+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_voucher
 #: view:sale.receipt.report:0
diff --git a/addons/account_voucher/i18n/it.po b/addons/account_voucher/i18n/it.po
index 6b9cf4fa9ac..e2959a16465 100644
--- a/addons/account_voucher/i18n/it.po
+++ b/addons/account_voucher/i18n/it.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:53+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:26+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_voucher
 #: view:sale.receipt.report:0
diff --git a/addons/account_voucher/i18n/ja.po b/addons/account_voucher/i18n/ja.po
index 651f5bbb2eb..89307203121 100644
--- a/addons/account_voucher/i18n/ja.po
+++ b/addons/account_voucher/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:53+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:26+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_voucher
 #: view:sale.receipt.report:0
diff --git a/addons/account_voucher/i18n/ko.po b/addons/account_voucher/i18n/ko.po
index 6e165dc2e53..15edf32310b 100644
--- a/addons/account_voucher/i18n/ko.po
+++ b/addons/account_voucher/i18n/ko.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:53+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:26+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_voucher
 #: view:sale.receipt.report:0
diff --git a/addons/account_voucher/i18n/lt.po b/addons/account_voucher/i18n/lt.po
index 8518eb45f47..55e636fc0ce 100644
--- a/addons/account_voucher/i18n/lt.po
+++ b/addons/account_voucher/i18n/lt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:53+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:26+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_voucher
 #: view:sale.receipt.report:0
diff --git a/addons/account_voucher/i18n/mn.po b/addons/account_voucher/i18n/mn.po
index ae448ef37db..8af2c6a8b21 100644
--- a/addons/account_voucher/i18n/mn.po
+++ b/addons/account_voucher/i18n/mn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:53+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:26+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_voucher
 #: view:sale.receipt.report:0
diff --git a/addons/account_voucher/i18n/nl.po b/addons/account_voucher/i18n/nl.po
index 5056ef787c3..f28f51967d1 100644
--- a/addons/account_voucher/i18n/nl.po
+++ b/addons/account_voucher/i18n/nl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:53+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:26+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_voucher
 #: view:sale.receipt.report:0
@@ -683,7 +683,7 @@ msgstr "Betaald"
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Payment Terms"
-msgstr "Betalingsconditie"
+msgstr "Betalingscondities"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -1106,7 +1106,7 @@ msgstr "Boekingen veroorzaakt door facturen"
 #. module: account_voucher
 #: field:account.voucher,move_id:0
 msgid "Account Entry"
-msgstr "Boeking"
+msgstr "Journaalpost"
 
 #. module: account_voucher
 #: field:account.voucher,reference:0
diff --git a/addons/account_voucher/i18n/nl_BE.po b/addons/account_voucher/i18n/nl_BE.po
index 58d4e69d483..9effe5f9c9e 100644
--- a/addons/account_voucher/i18n/nl_BE.po
+++ b/addons/account_voucher/i18n/nl_BE.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:54+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:26+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_voucher
 #: view:sale.receipt.report:0
diff --git a/addons/account_voucher/i18n/oc.po b/addons/account_voucher/i18n/oc.po
index 4193ece4e67..c6a09dd948f 100644
--- a/addons/account_voucher/i18n/oc.po
+++ b/addons/account_voucher/i18n/oc.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:53+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:26+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_voucher
 #: view:sale.receipt.report:0
diff --git a/addons/account_voucher/i18n/pl.po b/addons/account_voucher/i18n/pl.po
index b735102ea05..e6d883fe8bd 100644
--- a/addons/account_voucher/i18n/pl.po
+++ b/addons/account_voucher/i18n/pl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:54+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:26+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_voucher
 #: view:sale.receipt.report:0
diff --git a/addons/account_voucher/i18n/pt.po b/addons/account_voucher/i18n/pt.po
index f26bff523f2..0a7ec90ea6a 100644
--- a/addons/account_voucher/i18n/pt.po
+++ b/addons/account_voucher/i18n/pt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:54+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:26+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_voucher
 #: view:sale.receipt.report:0
diff --git a/addons/account_voucher/i18n/pt_BR.po b/addons/account_voucher/i18n/pt_BR.po
index 4b7e48e402b..3131f5fedd3 100644
--- a/addons/account_voucher/i18n/pt_BR.po
+++ b/addons/account_voucher/i18n/pt_BR.po
@@ -8,13 +8,14 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 01:37+0100\n"
 "PO-Revision-Date: 2012-07-28 14:28+0000\n"
-"Last-Translator: Fábio Martinelli <webmaster@guaru.net>\n"
+"Last-Translator: Fábio Martinelli - http://zupy.com.br "
+"<webmaster@guaru.net>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:54+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:26+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_voucher
 #: view:sale.receipt.report:0
diff --git a/addons/account_voucher/i18n/ro.po b/addons/account_voucher/i18n/ro.po
index 5ac64605365..5c693096094 100644
--- a/addons/account_voucher/i18n/ro.po
+++ b/addons/account_voucher/i18n/ro.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:54+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:26+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_voucher
 #: view:sale.receipt.report:0
diff --git a/addons/account_voucher/i18n/ru.po b/addons/account_voucher/i18n/ru.po
index 24e3372b721..8bd828cc262 100644
--- a/addons/account_voucher/i18n/ru.po
+++ b/addons/account_voucher/i18n/ru.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:54+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:26+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_voucher
 #: view:sale.receipt.report:0
diff --git a/addons/account_voucher/i18n/sl.po b/addons/account_voucher/i18n/sl.po
index 61cbdba273e..467e745ced0 100644
--- a/addons/account_voucher/i18n/sl.po
+++ b/addons/account_voucher/i18n/sl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:54+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:26+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_voucher
 #: view:sale.receipt.report:0
diff --git a/addons/account_voucher/i18n/sq.po b/addons/account_voucher/i18n/sq.po
index becd149d89c..68f975c7f75 100644
--- a/addons/account_voucher/i18n/sq.po
+++ b/addons/account_voucher/i18n/sq.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:53+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:26+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_voucher
 #: view:sale.receipt.report:0
diff --git a/addons/account_voucher/i18n/sr.po b/addons/account_voucher/i18n/sr.po
index 24752cb25ad..bac1fa4c710 100644
--- a/addons/account_voucher/i18n/sr.po
+++ b/addons/account_voucher/i18n/sr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:54+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:26+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_voucher
 #: view:sale.receipt.report:0
diff --git a/addons/account_voucher/i18n/sr@latin.po b/addons/account_voucher/i18n/sr@latin.po
index 58b7807f0fd..1d14c58f590 100644
--- a/addons/account_voucher/i18n/sr@latin.po
+++ b/addons/account_voucher/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:54+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:26+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_voucher
 #: view:sale.receipt.report:0
diff --git a/addons/account_voucher/i18n/sv.po b/addons/account_voucher/i18n/sv.po
index efee133f1e8..a0dd0e88d2d 100644
--- a/addons/account_voucher/i18n/sv.po
+++ b/addons/account_voucher/i18n/sv.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:54+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:26+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_voucher
 #: view:sale.receipt.report:0
diff --git a/addons/account_voucher/i18n/tlh.po b/addons/account_voucher/i18n/tlh.po
index 0b19d5de81a..dae9bb1207c 100644
--- a/addons/account_voucher/i18n/tlh.po
+++ b/addons/account_voucher/i18n/tlh.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:54+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:26+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_voucher
 #: view:sale.receipt.report:0
diff --git a/addons/account_voucher/i18n/tr.po b/addons/account_voucher/i18n/tr.po
index 0ba9b64c052..6d6f4847cf7 100644
--- a/addons/account_voucher/i18n/tr.po
+++ b/addons/account_voucher/i18n/tr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:54+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:26+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_voucher
 #: view:sale.receipt.report:0
diff --git a/addons/account_voucher/i18n/uk.po b/addons/account_voucher/i18n/uk.po
index 26404f7c9da..1710fc21bfd 100644
--- a/addons/account_voucher/i18n/uk.po
+++ b/addons/account_voucher/i18n/uk.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:54+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:26+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_voucher
 #: view:sale.receipt.report:0
diff --git a/addons/account_voucher/i18n/vi.po b/addons/account_voucher/i18n/vi.po
index 7ba805aae58..0b1f59cc3e2 100644
--- a/addons/account_voucher/i18n/vi.po
+++ b/addons/account_voucher/i18n/vi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:54+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:26+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_voucher
 #: view:sale.receipt.report:0
diff --git a/addons/account_voucher/i18n/zh_CN.po b/addons/account_voucher/i18n/zh_CN.po
index c884902bb63..8e71d0b7144 100644
--- a/addons/account_voucher/i18n/zh_CN.po
+++ b/addons/account_voucher/i18n/zh_CN.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:54+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:26+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_voucher
 #: view:sale.receipt.report:0
diff --git a/addons/account_voucher/i18n/zh_TW.po b/addons/account_voucher/i18n/zh_TW.po
index 24835701ca5..e73d8e3cd81 100644
--- a/addons/account_voucher/i18n/zh_TW.po
+++ b/addons/account_voucher/i18n/zh_TW.po
@@ -7,35 +7,35 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 01:37+0100\n"
-"PO-Revision-Date: 2009-01-23 17:15+0000\n"
-"Last-Translator: <>\n"
+"PO-Revision-Date: 2012-08-28 02:30+0000\n"
+"Last-Translator: Eric Huang <eh@cenoq.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:54+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-29 05:05+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_voucher
 #: view:sale.receipt.report:0
 msgid "last month"
-msgstr ""
+msgstr "上個月"
 
 #. module: account_voucher
 #: view:account.voucher.unreconcile:0
 msgid "Unreconciliation Transactions"
-msgstr ""
+msgstr "反核銷"
 
 #. module: account_voucher
 #: code:addons/account_voucher/account_voucher.py:324
 #, python-format
 msgid "Write-Off"
-msgstr "注銷"
+msgstr "補差額"
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Payment Ref"
-msgstr "付款參考"
+msgstr "付款單編號"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -45,25 +45,25 @@ msgstr "總額"
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Open Customer Journal Entries"
-msgstr ""
+msgstr "未對帳客戶憑證"
 
 #. module: account_voucher
 #: code:addons/account_voucher/account_voucher.py:1063
 #, python-format
 msgid ""
 "You have to configure account base code and account tax code on the '%s' tax!"
-msgstr ""
+msgstr "必須设置\"%s\"的科目和稅碼"
 
 #. module: account_voucher
 #: view:account.voucher:0 view:sale.receipt.report:0
 msgid "Group By..."
-msgstr "分組根據..."
+msgstr "分類方式..."
 
 #. module: account_voucher
 #: code:addons/account_voucher/account_voucher.py:797
 #, python-format
 msgid "Cannot delete Voucher(s) which are already opened or paid !"
-msgstr ""
+msgstr "不能删除已經過帳或對帳的憑證!"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -74,7 +74,7 @@ msgstr "供應商"
 #: view:account.voucher:0
 #: model:ir.actions.act_window,name:account_voucher.act_pay_bills
 msgid "Bill Payment"
-msgstr "賬單付款"
+msgstr "帳單付款"
 
 #. module: account_voucher
 #: view:account.statement.from.invoice.lines:0
@@ -87,7 +87,7 @@ msgstr "匯入項目"
 #. module: account_voucher
 #: model:ir.model,name:account_voucher.model_account_voucher_unreconcile
 msgid "Account voucher unreconcile"
-msgstr ""
+msgstr "未對帳的會計憑證"
 
 #. module: account_voucher
 #: selection:sale.receipt.report,month:0
@@ -101,7 +101,7 @@ msgid ""
 "invoice. When the sales receipt is confirmed, it creates journal items "
 "automatically and you can record the customer payment related to this sales "
 "receipt."
-msgstr ""
+msgstr "銷售產品給客戶時，可以給客戶一張收據或者發票。如果收據已確認，會創建相應的會計憑證。你可以基於這個收據記錄客戶付款。"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -127,12 +127,12 @@ msgstr "交易參考號碼。"
 #. module: account_voucher
 #: view:sale.receipt.report:0
 msgid "Group by year of Invoice Date"
-msgstr ""
+msgstr "依發票年份分組"
 
 #. module: account_voucher
 #: model:ir.actions.act_window,name:account_voucher.action_view_account_voucher_unreconcile
 msgid "Unreconcile entries"
-msgstr ""
+msgstr "未對帳條目"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -157,7 +157,7 @@ msgstr "搜尋換領券"
 #. module: account_voucher
 #: field:account.voucher,writeoff_acc_id:0
 msgid "Counterpart Account"
-msgstr ""
+msgstr "對方科目"
 
 #. module: account_voucher
 #: field:account.voucher,account_id:0 field:account.voucher.line,account_id:0
@@ -168,17 +168,17 @@ msgstr "帳號"
 #. module: account_voucher
 #: field:account.voucher,line_dr_ids:0
 msgid "Debits"
-msgstr ""
+msgstr "借方"
 
 #. module: account_voucher
 #: view:account.statement.from.invoice.lines:0
 msgid "Ok"
-msgstr ""
+msgstr "確定"
 
 #. module: account_voucher
 #: field:account.voucher.line,reconcile:0
 msgid "Full Reconcile"
-msgstr ""
+msgstr "全部核銷"
 
 #. module: account_voucher
 #: field:account.voucher,date_due:0 field:account.voucher.line,date_due:0
@@ -199,7 +199,7 @@ msgid ""
 "payment method (=the journal) and the payment amount. OpenERP will propose "
 "to you automatically the reconciliation of this payment with the open "
 "invoices or sales receipts."
-msgstr ""
+msgstr "銷售付款使你能夠輸入你的客戶付過來的款。輸入付款過程中你要輸入客戶、付款方式和金額。系統會自動提示你要和哪張發票或收據對賬。"
 
 #. module: account_voucher
 #: selection:account.voucher,type:0 selection:sale.receipt.report,type:0
@@ -209,12 +209,12 @@ msgstr "減價"
 #. module: account_voucher
 #: field:account.voucher.line,move_line_id:0
 msgid "Journal Item"
-msgstr ""
+msgstr "會計憑證行"
 
 #. module: account_voucher
 #: field:account.voucher,is_multi_currency:0
 msgid "Multi Currency Voucher"
-msgstr ""
+msgstr "多幣種憑證"
 
 #. module: account_voucher
 #: field:account.voucher.line,amount:0
@@ -244,17 +244,17 @@ msgstr "日期付款"
 #. module: account_voucher
 #: model:ir.model,name:account_voucher.model_account_bank_statement_line
 msgid "Bank Statement Line"
-msgstr ""
+msgstr "銀行對賬單明細"
 
 #. module: account_voucher
 #: view:account.voucher:0 view:account.voucher.unreconcile:0
 msgid "Unreconcile"
-msgstr ""
+msgstr "未對帳"
 
 #. module: account_voucher
 #: constraint:account.invoice:0
 msgid "Invalid BBA Structured Communication !"
-msgstr ""
+msgstr "BBA傳輸結構有誤！"
 
 #. module: account_voucher
 #: field:account.voucher,tax_id:0
@@ -264,24 +264,24 @@ msgstr "稅"
 #. module: account_voucher
 #: constraint:account.bank.statement:0
 msgid "The journal and period chosen have to belong to the same company."
-msgstr ""
+msgstr "所選的憑證簿和期間必須屬於相同公司。"
 
 #. module: account_voucher
 #: field:account.voucher,comment:0
 msgid "Counterpart Comment"
-msgstr ""
+msgstr "對應備註"
 
 #. module: account_voucher
 #: field:account.voucher.line,account_analytic_id:0
 msgid "Analytic Account"
-msgstr ""
+msgstr "輔助核算項目"
 
 #. module: account_voucher
 #: code:addons/account_voucher/account_voucher.py:927
 #: code:addons/account_voucher/account_voucher.py:931
 #, python-format
 msgid "Warning"
-msgstr ""
+msgstr "警告"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -306,14 +306,14 @@ msgstr "匯入發票"
 #. module: account_voucher
 #: selection:account.voucher,pay_now:0 selection:sale.receipt.report,pay_now:0
 msgid "Pay Later or Group Funds"
-msgstr ""
+msgstr "稍後付款或團購"
 
 #. module: account_voucher
 #: help:account.voucher,writeoff_amount:0
 msgid ""
 "Computed as the difference between the amount stated in the voucher and the "
 "sum of allocation on the voucher lines."
-msgstr ""
+msgstr "計算公式 ： 憑證上输入的金额 - 憑證行的金额合計."
 
 #. module: account_voucher
 #: selection:account.voucher,type:0 selection:sale.receipt.report,type:0
@@ -328,38 +328,38 @@ msgstr "銷售明細"
 #. module: account_voucher
 #: constraint:res.company:0
 msgid "Error! You can not create recursive companies."
-msgstr ""
+msgstr "錯誤！您不能建立遞歸公司."
 
 #. module: account_voucher
 #: view:sale.receipt.report:0
 msgid "current month"
-msgstr ""
+msgstr "本月"
 
 #. module: account_voucher
 #: view:account.voucher:0 field:account.voucher,period_id:0
 msgid "Period"
-msgstr ""
+msgstr "會計期間"
 
 #. module: account_voucher
 #: view:account.voucher:0 field:account.voucher,state:0
 #: view:sale.receipt.report:0
 msgid "State"
-msgstr ""
+msgstr "狀態"
 
 #. module: account_voucher
 #: selection:account.voucher.line,type:0
 msgid "Debit"
-msgstr ""
+msgstr "借方"
 
 #. module: account_voucher
 #: sql_constraint:res.company:0
 msgid "The company name must be unique !"
-msgstr ""
+msgstr "公司名稱必須唯一！"
 
 #. module: account_voucher
 #: view:sale.receipt.report:0 field:sale.receipt.report,nbr:0
 msgid "# of Voucher Lines"
-msgstr ""
+msgstr "憑證明細"
 
 #. module: account_voucher
 #: view:sale.receipt.report:0 field:sale.receipt.report,type:0
@@ -369,12 +369,12 @@ msgstr "類型"
 #. module: account_voucher
 #: field:account.voucher.unreconcile,remove:0
 msgid "Want to remove accounting entries too ?"
-msgstr ""
+msgstr "要刪除會計憑證嗎?"
 
 #. module: account_voucher
 #: view:sale.receipt.report:0
 msgid "Pro-forma Vouchers"
-msgstr ""
+msgstr "收據"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -387,7 +387,7 @@ msgstr "換領券項目"
 #: code:addons/account_voucher/account_voucher.py:894
 #, python-format
 msgid "Error !"
-msgstr ""
+msgstr "錯誤 !"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -408,12 +408,12 @@ msgstr "備忘錄"
 #: view:account.invoice:0 code:addons/account_voucher/invoice.py:32
 #, python-format
 msgid "Pay Invoice"
-msgstr "付發票"
+msgstr "付款"
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Are you sure to unreconcile and cancel this record ?"
-msgstr ""
+msgstr "你確定要反核銷並作廢這條記錄嗎?"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -426,7 +426,7 @@ msgstr "銷售收據"
 #: code:addons/account_voucher/account_voucher.py:797
 #, python-format
 msgid "Invalid action !"
-msgstr ""
+msgstr "無效操作 !"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -441,12 +441,12 @@ msgstr "七月"
 #. module: account_voucher
 #: view:account.voucher.unreconcile:0
 msgid "Unreconciliation"
-msgstr ""
+msgstr "取消對帳"
 
 #. module: account_voucher
 #: field:account.voucher,writeoff_amount:0
 msgid "Difference Amount"
-msgstr ""
+msgstr "差異金額"
 
 #. module: account_voucher
 #: view:sale.receipt.report:0 field:sale.receipt.report,due_delay:0
@@ -456,13 +456,13 @@ msgstr "平均到期延誤"
 #. module: account_voucher
 #: field:res.company,income_currency_exchange_account_id:0
 msgid "Income Currency Rate"
-msgstr ""
+msgstr "收款幣種匯率"
 
 #. module: account_voucher
 #: code:addons/account_voucher/account_voucher.py:1063
 #, python-format
 msgid "No Account Base Code and Account Tax Code!"
-msgstr ""
+msgstr "沒有科目和稅碼!"
 
 #. module: account_voucher
 #: field:account.voucher,tax_amount:0
@@ -472,7 +472,7 @@ msgstr "稅金總額"
 #. module: account_voucher
 #: view:sale.receipt.report:0
 msgid "Validated Vouchers"
-msgstr ""
+msgstr "以覆核的憑證"
 
 #. module: account_voucher
 #: field:account.voucher,line_ids:0 view:account.voucher.line:0
@@ -495,19 +495,19 @@ msgstr "伙伴"
 #. module: account_voucher
 #: field:account.voucher,payment_option:0
 msgid "Payment Difference"
-msgstr ""
+msgstr "付款差額"
 
 #. module: account_voucher
 #: constraint:account.bank.statement.line:0
 msgid ""
 "The amount of the voucher must be the same amount as the one on the "
 "statement line"
-msgstr ""
+msgstr "憑證金額必須和對賬單明細上的金額一致"
 
 #. module: account_voucher
 #: view:account.voucher:0 field:account.voucher,audit:0
 msgid "To Review"
-msgstr ""
+msgstr "待審查"
 
 #. module: account_voucher
 #: code:addons/account_voucher/account_voucher.py:938
@@ -515,7 +515,7 @@ msgstr ""
 #: code:addons/account_voucher/account_voucher.py:1103
 #, python-format
 msgid "change"
-msgstr ""
+msgstr "變更"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -527,7 +527,7 @@ msgstr "支出明細"
 msgid ""
 "Fields with internal purpose only that depicts if the voucher is a multi "
 "currency one or not"
-msgstr ""
+msgstr "此字段由系統內部使用，區分該憑證是否涉及外幣"
 
 #. module: account_voucher
 #: field:account.statement.from.invoice,line_ids:0
@@ -543,7 +543,7 @@ msgstr "十二月"
 #. module: account_voucher
 #: view:sale.receipt.report:0
 msgid "Group by month of Invoice Date"
-msgstr ""
+msgstr "依發票月份分組"
 
 #. module: account_voucher
 #: view:sale.receipt.report:0 field:sale.receipt.report,month:0
@@ -560,7 +560,7 @@ msgstr "貨幣"
 #. module: account_voucher
 #: view:account.statement.from.invoice.lines:0
 msgid "Payable and Receivables"
-msgstr ""
+msgstr "應收應付"
 
 #. module: account_voucher
 #: model:ir.actions.act_window,help:account_voucher.action_vendor_payment
@@ -569,7 +569,7 @@ msgid ""
 "suppliers. When you select a supplier, the payment method and an amount for "
 "the payment, OpenERP will propose to reconcile your payment with the open "
 "supplier invoices or bills."
-msgstr ""
+msgstr "付款單用於跟踪你對供應商的付款。選擇供應商、付款方式和付款金額，OpenERP會自動提示你要針對哪張供應商發票付款."
 
 #. module: account_voucher
 #: view:sale.receipt.report:0 field:sale.receipt.report,user_id:0
@@ -584,12 +584,12 @@ msgstr "平均付款延誤"
 #. module: account_voucher
 #: help:account.voucher,paid:0
 msgid "The Voucher has been totally paid."
-msgstr ""
+msgstr "這張憑證已全部付完."
 
 #. module: account_voucher
 #: selection:account.voucher,payment_option:0
 msgid "Reconcile Payment Balance"
-msgstr ""
+msgstr "核銷付款餘額"
 
 #. module: account_voucher
 #: view:account.voucher:0 selection:account.voucher,state:0
@@ -603,12 +603,12 @@ msgstr "草稿"
 msgid ""
 "Unable to create accounting entry for currency rate difference. You have to "
 "configure the field 'Income Currency Rate' on the company! "
-msgstr ""
+msgstr "無法創建匯兌損益會計憑證。你要在公司設置頁面上輸入“收款貨幣匯率” 字段! "
 
 #. module: account_voucher
 #: view:account.voucher:0 view:sale.receipt.report:0
 msgid "Draft Vouchers"
-msgstr ""
+msgstr "草稿憑證"
 
 #. module: account_voucher
 #: view:sale.receipt.report:0 field:sale.receipt.report,price_total_tax:0
@@ -618,7 +618,7 @@ msgstr "連稅總額"
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Allocation"
-msgstr ""
+msgstr "分配"
 
 #. module: account_voucher
 #: selection:sale.receipt.report,month:0
@@ -630,7 +630,7 @@ msgstr "八月"
 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 ""
+msgstr "請勾選，如果您不確定分錄而且標記為\"待審核\"給會計專員。"
 
 #. module: account_voucher
 #: selection:sale.receipt.report,month:0
@@ -645,12 +645,12 @@ msgstr "六月"
 #. module: account_voucher
 #: field:account.voucher,payment_rate_currency_id:0
 msgid "Payment Rate Currency"
-msgstr ""
+msgstr "付款匯率貨幣"
 
 #. module: account_voucher
 #: field:account.voucher,paid:0
 msgid "Paid"
-msgstr ""
+msgstr "已付款"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -660,7 +660,7 @@ msgstr "付款條件"
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Are you sure to unreconcile this record ?"
-msgstr ""
+msgstr "確定要對此記錄反對賬嗎?"
 
 #. module: account_voucher
 #: field:account.voucher,date:0 field:account.voucher.line,date_original:0
@@ -676,22 +676,22 @@ msgstr "十一月"
 #. module: account_voucher
 #: view:sale.receipt.report:0
 msgid "Extended Filters..."
-msgstr ""
+msgstr "增加篩選條件..."
 
 #. module: account_voucher
 #: field:account.voucher,paid_amount_in_company_currency:0
 msgid "Paid Amount in Company Currency"
-msgstr ""
+msgstr "按公司本位幣計的付款金額"
 
 #. module: account_voucher
 #: field:account.bank.statement.line,amount_reconciled:0
 msgid "Amount reconciled"
-msgstr ""
+msgstr "已對帳金額"
 
 #. module: account_voucher
 #: field:account.voucher,analytic_id:0
 msgid "Write-Off Analytic Account"
-msgstr ""
+msgstr "註銷輔助核算項目"
 
 #. module: account_voucher
 #: selection:account.voucher,pay_now:0 selection:sale.receipt.report,pay_now:0
@@ -701,12 +701,12 @@ msgstr "直接付款"
 #. module: account_voucher
 #: field:account.voucher.line,type:0
 msgid "Dr/Cr"
-msgstr ""
+msgstr "借/貸"
 
 #. module: account_voucher
 #: field:account.voucher,pre_line:0
 msgid "Previous Payments ?"
-msgstr ""
+msgstr "預付款?"
 
 #. module: account_voucher
 #: selection:sale.receipt.report,month:0
@@ -717,7 +717,7 @@ msgstr "一月"
 #: model:ir.actions.act_window,name:account_voucher.action_voucher_list
 #: model:ir.ui.menu,name:account_voucher.menu_encode_entries_by_voucher
 msgid "Journal Vouchers"
-msgstr ""
+msgstr "傳票"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -727,44 +727,44 @@ msgstr "計算稅項"
 #. module: account_voucher
 #: model:ir.model,name:account_voucher.model_res_company
 msgid "Companies"
-msgstr ""
+msgstr "公司"
 
 #. module: account_voucher
 #: code:addons/account_voucher/account_voucher.py:462
 #, python-format
 msgid "Please define default credit/debit accounts on the journal \"%s\" !"
-msgstr ""
+msgstr "請為憑​​證簿\"%s\" 設置默認借方科目和默認貸方科目"
 
 #. module: account_voucher
 #: selection:account.voucher.line,type:0
 msgid "Credit"
-msgstr ""
+msgstr "貸方"
 
 #. module: account_voucher
 #: code:addons/account_voucher/account_voucher.py:895
 #, python-format
 msgid "Please define a sequence on the journal !"
-msgstr ""
+msgstr "在該賬簿請定義一個序列 !"
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Open Supplier Journal Entries"
-msgstr ""
+msgstr "打開供應商的分錄"
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Total Allocation"
-msgstr ""
+msgstr "憑證總額"
 
 #. module: account_voucher
 #: view:sale.receipt.report:0
 msgid "Group by Invoice Date"
-msgstr ""
+msgstr "依發票日期分組"
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Post"
-msgstr ""
+msgstr "過帳"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -774,12 +774,12 @@ msgstr "發票及未完成交易"
 #. module: account_voucher
 #: field:res.company,expense_currency_exchange_account_id:0
 msgid "Expense Currency Rate"
-msgstr ""
+msgstr "費用外幣匯率"
 
 #. module: account_voucher
 #: sql_constraint:account.invoice:0
 msgid "Invoice Number must be unique per Company!"
-msgstr ""
+msgstr "發票號必須在公司範圍內唯一"
 
 #. module: account_voucher
 #: view:sale.receipt.report:0 field:sale.receipt.report,price_total:0
@@ -803,12 +803,16 @@ msgid ""
 "\n"
 "* The 'Cancelled' state is used when user cancel voucher."
 msgstr ""
+" 新建的憑證是草稿狀態\n"
+"當憑證沒有編號的時候是形式放票狀態\n"
+"當憑證有了編號並生成了會計憑證時是已過帳狀態\n"
+"當用戶作廢了憑證後是作廢狀態"
 
 #. module: account_voucher
 #: view:account.voucher:0
 #: model:ir.model,name:account_voucher.model_account_voucher
 msgid "Accounting Voucher"
-msgstr ""
+msgstr "會計憑證"
 
 #. module: account_voucher
 #: field:account.voucher,number:0
@@ -818,7 +822,7 @@ msgstr "編號"
 #. module: account_voucher
 #: model:ir.model,name:account_voucher.model_account_bank_statement
 msgid "Bank Statement"
-msgstr ""
+msgstr "銀行對賬單"
 
 #. module: account_voucher
 #: selection:sale.receipt.report,month:0
@@ -864,12 +868,12 @@ msgstr "取消"
 #: selection:account.voucher,state:0 view:sale.receipt.report:0
 #: selection:sale.receipt.report,state:0
 msgid "Pro-forma"
-msgstr ""
+msgstr "形式發票"
 
 #. module: account_voucher
 #: view:account.voucher:0 field:account.voucher,move_ids:0
 msgid "Journal Items"
-msgstr ""
+msgstr "帳簿明細"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -883,7 +887,7 @@ msgstr "客戶付款"
 #: view:account.statement.from.invoice:0
 #: model:ir.actions.act_window,name:account_voucher.action_view_account_statement_from_invoice
 msgid "Import Invoices in Statement"
-msgstr ""
+msgstr "在銀行單據裡導入發票"
 
 #. module: account_voucher
 #: selection:account.voucher,type:0 selection:sale.receipt.report,type:0
@@ -898,12 +902,12 @@ msgstr "付款"
 #. module: account_voucher
 #: view:sale.receipt.report:0
 msgid "year"
-msgstr ""
+msgstr "年"
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Currency Options"
-msgstr ""
+msgstr "外幣選項"
 
 #. module: account_voucher
 #: help:account.voucher,payment_option:0
@@ -912,12 +916,12 @@ msgid ""
 "difference between the paid amount and the sum of allocated amounts. You can "
 "either choose to keep open this difference on the partner's account, or "
 "reconcile it with the payment(s)"
-msgstr ""
+msgstr "此字段用於選擇對已支付金額和已分配金額的差異如何處理。可以選擇保持欠款狀態，也可以用其他付款來核銷。"
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Are you sure to confirm this record ?"
-msgstr ""
+msgstr "你要確認這條紀錄嗎 ?"
 
 #. module: account_voucher
 #: model:ir.actions.act_window,help:account_voucher.action_sale_receipt_report_all
@@ -925,17 +929,17 @@ msgid ""
 "From this report, you can have an overview of the amount invoiced to your "
 "customer as well as payment delays. The tool search can also be used to "
 "personalise your Invoices reports and so, match this analysis to your needs."
-msgstr ""
+msgstr "在這報表中，您能了解到給您的客戶開發票的金額以及拖欠款項。這工具也可以用於搜索您特定的發票報表等。"
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Posted Vouchers"
-msgstr ""
+msgstr "已過帳憑證"
 
 #. module: account_voucher
 #: field:account.voucher,payment_rate:0
 msgid "Exchange Rate"
-msgstr ""
+msgstr "匯率"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -957,7 +961,7 @@ msgstr "五月"
 #: field:account.voucher,journal_id:0 view:sale.receipt.report:0
 #: field:sale.receipt.report,journal_id:0
 msgid "Journal"
-msgstr ""
+msgstr "帳簿"
 
 #. module: account_voucher
 #: model:ir.actions.act_window,name:account_voucher.action_vendor_payment
@@ -973,7 +977,7 @@ msgstr "內部備註"
 #. module: account_voucher
 #: view:account.voucher:0 field:account.voucher,line_cr_ids:0
 msgid "Credits"
-msgstr ""
+msgstr "貸方"
 
 #. module: account_voucher
 #: field:account.voucher.line,amount_original:0
@@ -984,14 +988,14 @@ msgstr "原總額"
 #: model:ir.actions.act_window,name:account_voucher.action_purchase_receipt
 #: model:ir.ui.menu,name:account_voucher.menu_action_purchase_receipt
 msgid "Purchase Receipt"
-msgstr ""
+msgstr "採購付款"
 
 #. module: account_voucher
 #: help:account.voucher,payment_rate:0
 msgid ""
 "The specific rate that will be used, in this voucher, between the selected "
 "currency (in 'Payment Rate Currency' field)  and the voucher currency."
-msgstr ""
+msgstr "用於特定的匯率，適用於這張憑證，用於轉換所選貨幣（在“付款匯率貨幣”字段輸入）和憑證貨幣。"
 
 #. module: account_voucher
 #: field:account.bank.statement.line,voucher_id:0 view:account.invoice:0
@@ -1004,7 +1008,7 @@ msgstr "付款"
 #: view:account.voucher:0 selection:account.voucher,state:0
 #: view:sale.receipt.report:0 selection:sale.receipt.report,state:0
 msgid "Posted"
-msgstr ""
+msgstr "已登帳"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -1024,7 +1028,7 @@ msgstr "供應商發票及未完成交易"
 #. module: account_voucher
 #: view:sale.receipt.report:0
 msgid "Month-1"
-msgstr ""
+msgstr "上月"
 
 #. module: account_voucher
 #: selection:sale.receipt.report,month:0
@@ -1034,7 +1038,7 @@ msgstr "四月"
 #. module: account_voucher
 #: help:account.voucher,tax_id:0
 msgid "Only for tax excluded from price"
-msgstr ""
+msgstr "僅針對價外稅"
 
 #. module: account_voucher
 #: code:addons/account_voucher/account_voucher.py:931
@@ -1042,7 +1046,7 @@ msgstr ""
 msgid ""
 "Unable to create accounting entry for currency rate difference. You have to "
 "configure the field 'Expense Currency Rate' on the company! "
-msgstr ""
+msgstr "無法為匯兌損益創建會計憑證。你必須在公司設置裡輸入“費用貨幣匯率”字段! "
 
 #. module: account_voucher
 #: field:account.voucher,type:0
@@ -1053,12 +1057,12 @@ msgstr "預設類型"
 #: model:ir.model,name:account_voucher.model_account_statement_from_invoice
 #: model:ir.model,name:account_voucher.model_account_statement_from_invoice_lines
 msgid "Entries by Statement from Invoices"
-msgstr ""
+msgstr "按發票收付款的憑證行"
 
 #. module: account_voucher
 #: field:account.voucher,move_id:0
 msgid "Account Entry"
-msgstr ""
+msgstr "分錄"
 
 #. module: account_voucher
 #: field:account.voucher,reference:0
@@ -1073,7 +1077,7 @@ msgstr "換領券狀態"
 #. module: account_voucher
 #: help:account.voucher,date:0
 msgid "Effective date for accounting entries"
-msgstr ""
+msgstr "會計分錄的生效日期"
 
 #. module: account_voucher
 #: selection:account.voucher,payment_option:0
@@ -1085,7 +1089,7 @@ msgstr "保持開啟"
 msgid ""
 "If you unreconciliate transactions, you must also verify all the actions "
 "that are linked to those transactions because they will not be disable"
-msgstr ""
+msgstr "如果進行取消對賬處理你必須檢驗處理的所有操作。因為他們不會被禁止"
 
 #. module: account_voucher
 #: field:account.voucher.line,untax_amount:0
@@ -1105,7 +1109,7 @@ msgstr "年份"
 #. module: account_voucher
 #: field:account.voucher.line,amount_unreconciled:0
 msgid "Open Balance"
-msgstr ""
+msgstr "未結餘額"
 
 #. module: account_voucher
 #: view:account.voucher:0 field:account.voucher,amount:0
@@ -1150,3 +1154,6 @@ msgstr "總計"
 
 #~ msgid "Write-Off Comment"
 #~ msgstr "注銷評語"
+
+#~ msgid "Unreconciliation transactions"
+#~ msgstr "取消對帳交易"
diff --git a/addons/account_voucher/test/account_voucher.yml b/addons/account_voucher/test/account_voucher.yml
index 9cfb9d61229..2ea6c0b7890 100644
--- a/addons/account_voucher/test/account_voucher.yml
+++ b/addons/account_voucher/test/account_voucher.yml
@@ -54,7 +54,7 @@
     currency_id: base.EUR
     journal_id: account.bank_journal
     name: Voucher Axelor
-    narration: Basic PC
+    narration: PC Assemble SC234
     line_dr_ids:
       - account_id: account.cash
         amount: 1000.0
diff --git a/addons/account_voucher/test/account_voucher_report.yml b/addons/account_voucher/test/account_voucher_report.yml
index 85432f747aa..3996e0c27e4 100644
--- a/addons/account_voucher/test/account_voucher_report.yml
+++ b/addons/account_voucher/test/account_voucher_report.yml
@@ -6,7 +6,7 @@
     company_id: base.main_company
     journal_id: account.bank_journal
     name: Voucher Axelor
-    narration: Basic PC
+    narration: PC Assemble SC234
     amount: 1000.0
     line_ids:
       - account_id: account.cash
diff --git a/addons/account_voucher/test/case1_usd_usd.yml b/addons/account_voucher/test/case1_usd_usd.yml
index 45c352955f4..b706e6f0644 100644
--- a/addons/account_voucher/test/case1_usd_usd.yml
+++ b/addons/account_voucher/test/case1_usd_usd.yml
@@ -79,7 +79,7 @@
     period_id: account.period_1
     invoice_line:
       - account_id: account.a_sale
-        name: '[PC1] Basic PC'
+        name: '[PCSC234] PC Assemble SC234'
         price_unit: 200.0
         quantity: 1.0
         product_id: product.product_product_3
@@ -112,7 +112,7 @@
     period_id: account.period_2
     invoice_line:
       - account_id: account.a_sale
-        name: '[PC1] Basic PC'
+        name: '[PCSC234] PC Assemble SC234'
         price_unit: 100.0
         quantity: 1.0
         product_id: product.product_product_3
diff --git a/addons/account_voucher/test/case2_suppl_usd_eur.yml b/addons/account_voucher/test/case2_suppl_usd_eur.yml
index cc4c238aaaf..1a0c250395e 100644
--- a/addons/account_voucher/test/case2_suppl_usd_eur.yml
+++ b/addons/account_voucher/test/case2_suppl_usd_eur.yml
@@ -50,7 +50,7 @@
     period_id: account.period_1
     invoice_line:
       - account_id: account.a_expense
-        name: '[PC1] Basic PC'
+        name: '[PCSC234] PC Assemble SC234'
         price_unit: 200.0
         quantity: 1.0
         product_id: product.product_product_3
@@ -85,7 +85,7 @@
     type : in_invoice
     invoice_line:
       - account_id: account.a_expense
-        name: '[PC1] Basic PC'
+        name: '[PCSC234] PC Assemble SC234'
         price_unit: 100.0
         quantity: 1.0
         product_id: product.product_product_3
diff --git a/addons/account_voucher/test/case2_usd_eur_debtor_in_eur.yml b/addons/account_voucher/test/case2_usd_eur_debtor_in_eur.yml
index c37783247db..91f8a629cbb 100644
--- a/addons/account_voucher/test/case2_usd_eur_debtor_in_eur.yml
+++ b/addons/account_voucher/test/case2_usd_eur_debtor_in_eur.yml
@@ -85,7 +85,7 @@
     period_id: account.period_1
     invoice_line:
       - account_id: account.a_sale
-        name: '[PC1] Basic PC'
+        name: '[PCSC234] PC Assemble SC234'
         price_unit: 200.0
         quantity: 1.0
         product_id: product.product_product_3
@@ -118,7 +118,7 @@
     period_id: account.period_2
     invoice_line:
       - account_id: account.a_sale
-        name: '[PC1] Basic PC'
+        name: '[PCSC234] PC Assemble SC234'
         price_unit: 100.0
         quantity: 1.0
         product_id: product.product_product_3
diff --git a/addons/account_voucher/test/case2_usd_eur_debtor_in_usd.yml b/addons/account_voucher/test/case2_usd_eur_debtor_in_usd.yml
index 36593a2b9cd..cc5e819af30 100644
--- a/addons/account_voucher/test/case2_usd_eur_debtor_in_usd.yml
+++ b/addons/account_voucher/test/case2_usd_eur_debtor_in_usd.yml
@@ -85,7 +85,7 @@
     period_id: account.period_1
     invoice_line:
       - account_id: account.a_sale
-        name: '[PC1] Basic PC'
+        name: '[PCSC234] PC Assemble SC234'
         price_unit: 200.0
         quantity: 1.0
         product_id: product.product_product_3
@@ -118,7 +118,7 @@
     period_id: account.period_2
     invoice_line:
       - account_id: account.a_sale
-        name: '[PC1] Basic PC'
+        name: '[PCSC234] PC Assemble SC234'
         price_unit: 100.0
         quantity: 1.0
         product_id: product.product_product_3
diff --git a/addons/account_voucher/test/case3_eur_eur.yml b/addons/account_voucher/test/case3_eur_eur.yml
index d70bd41a2ff..37ea7ea981a 100644
--- a/addons/account_voucher/test/case3_eur_eur.yml
+++ b/addons/account_voucher/test/case3_eur_eur.yml
@@ -39,7 +39,7 @@
     period_id: account.period_1
     invoice_line:
       - account_id: account.a_sale
-        name: '[PC1] Basic PC'
+        name: '[PCSC234] PC Assemble SC234'
         price_unit: 150.0
         quantity: 1.0
         product_id: product.product_product_3
@@ -72,7 +72,7 @@
     period_id: account.period_1
     invoice_line:
       - account_id: account.a_sale
-        name: '[PC1] Basic PC'
+        name: '[PCSC234] PC Assemble SC234'
         price_unit: 80.0
         quantity: 1.0
         product_id: product.product_product_3
diff --git a/addons/account_voucher/test/case4_cad_chf.yml b/addons/account_voucher/test/case4_cad_chf.yml
index 5ca901cdbca..a78669c95ef 100644
--- a/addons/account_voucher/test/case4_cad_chf.yml
+++ b/addons/account_voucher/test/case4_cad_chf.yml
@@ -73,7 +73,7 @@
     period_id: account.period_1
     invoice_line:
       - account_id: account.a_sale
-        name: '[PC1] Basic PC'
+        name: '[PCSC234] PC Assemble SC234'
         price_unit: 200.0
         quantity: 1.0
         product_id: product.product_product_3
diff --git a/addons/account_voucher/test/case_eur_usd.yml b/addons/account_voucher/test/case_eur_usd.yml
index 2ca2ded1a72..125277191cb 100644
--- a/addons/account_voucher/test/case_eur_usd.yml
+++ b/addons/account_voucher/test/case_eur_usd.yml
@@ -52,7 +52,7 @@
     period_id: account.period_1
     invoice_line:
       - account_id: account.a_sale
-        name: '[PC1] Basic PC'
+        name: '[PCSC234] PC Assemble SC234'
         price_unit: 1000.0
         quantity: 1.0
         product_id: product.product_product_3
diff --git a/addons/account_voucher/test/sales_payment.yml b/addons/account_voucher/test/sales_payment.yml
index 585ce23aace..88f10e55918 100644
--- a/addons/account_voucher/test/sales_payment.yml
+++ b/addons/account_voucher/test/sales_payment.yml
@@ -7,7 +7,7 @@
     currency_id: base.EUR
     invoice_line:
       - account_id: account.a_sale
-        name: '[PC1] Basic PC'
+        name: '[PCSC234] PC Assemble SC234'
         price_unit: 450.0
         quantity: 1.0
         product_id: product.product_product_3
diff --git a/addons/analytic/__openerp__.py b/addons/analytic/__openerp__.py
index 859a65e7856..10762a1d2be 100644
--- a/addons/analytic/__openerp__.py
+++ b/addons/analytic/__openerp__.py
@@ -20,13 +20,13 @@
 ##############################################################################
 
 {
-    "name" : "Analytic Accounting",
-    "version": "1.1",
-    "author" : "OpenERP SA",
-    "website" : "http://www.openerp.com",
-    "category": 'Hidden/Dependency',
-    "depends" : ["base", "decimal_precision", "mail"],
-    "description": """
+    'name' : 'Analytic Accounting',
+    'version': '1.1',
+    'author' : 'OpenERP SA',
+    'website' : 'http://www.openerp.com',
+    'category': 'Hidden/Dependency',
+    'depends' : ['base', 'decimal_precision', 'mail'],
+    'description': """
 Module for defining analytic accounting object.
 ===============================================
 
@@ -34,16 +34,15 @@ In OpenERP, analytic accounts are linked to general accounts but are treated
 totally independently. So, you can enter various different analytic operations
 that have no counterpart in the general financial accounts.
     """,
-    "init_xml" : [],
-    "update_xml": ['security/analytic_security.xml',
-                   "security/ir.model.access.csv",
-                   "analytic_sequence.xml",
-                   "analytic_view.xml"
-    ],
-    'demo_xml': [
+    'data': [
+        'security/analytic_security.xml',
+        'security/ir.model.access.csv',
+        'analytic_sequence.xml',
+        'analytic_view.xml'
     ],
+    'demo': [],
     'installable': True,
     'auto_install': False,
-    'certificate' : "00462253285027988541",
+    'certificate' : '00462253285027988541',
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/analytic/analytic.py b/addons/analytic/analytic.py
index 3231b1e6d95..d90e2006a71 100644
--- a/addons/analytic/analytic.py
+++ b/addons/analytic/analytic.py
@@ -153,9 +153,9 @@ class account_analytic_account(osv.osv):
         return result
 
     _columns = {
-        'name': fields.char('Account Name', size=128, required=True),
+        'name': fields.char('Account/Contract Name', size=128, required=True),
         'complete_name': fields.function(_complete_name_calc, type='char', string='Full Account Name'),
-        'code': fields.char('Code/Reference', size=24, select=True),
+        'code': fields.char('Reference', size=24, select=True),
         'type': fields.selection([('view','Analytic View'), ('normal','Analytic Account'),('contract','Contract or Project'),('template','Template of Project')], 'Type of Account', required=True, 
                                  help="If you select the View Type, it means you won\'t allow to create journal entries using that account.\n"\
                                   "The type 'Analytic account' stands for usual accounts that you only want to use in accounting.\n"\
@@ -171,7 +171,7 @@ class account_analytic_account(osv.osv):
         'debit': fields.function(_debit_credit_bal_qtty, type='float', string='Debit', multi='debit_credit_bal_qtty', digits_compute=dp.get_precision('Account')),
         'credit': fields.function(_debit_credit_bal_qtty, type='float', string='Credit', multi='debit_credit_bal_qtty', digits_compute=dp.get_precision('Account')),
         'quantity': fields.function(_debit_credit_bal_qtty, type='float', string='Quantity', multi='debit_credit_bal_qtty'),
-        'quantity_max': fields.float('Maximum Time', help='Sets the higher limit of time to work on the contract.'),
+        'quantity_max': fields.float('Prepaid Units', help='Sets the higher limit of time to work on the contract.'),
         'partner_id': fields.many2one('res.partner', 'Customer'),
         'user_id': fields.many2one('res.users', 'Project Manager'),
         'manager_id': fields.many2one('res.users', 'Account Manager'),
@@ -297,7 +297,7 @@ class account_analytic_account(osv.osv):
 
     def create_send_note(self, cr, uid, ids, context=None):
         for obj in self.browse(cr, uid, ids, context=context):
-            self.message_append_note(cr, uid, [obj.id], body=_("Contract for <em>%s</em> has been <b>created</b>.") % (obj.partner_id.name), context=context)
+            self.message_post(cr, uid, [obj.id], body=_("Contract for <em>%s</em> has been <b>created</b>.") % (obj.partner_id.name), context=context)
 
 account_analytic_account()
 
diff --git a/addons/analytic/analytic_view.xml b/addons/analytic/analytic_view.xml
index 16100e73fff..704d9bb8244 100644
--- a/addons/analytic/analytic_view.xml
+++ b/addons/analytic/analytic_view.xml
@@ -8,35 +8,43 @@
             <field name="arch" type="xml">
                 <form string="Analytic Account" version="7.0">
                     <sheet string="Analytic Account">
+                        <div class="oe_right oe_button_box" name="buttons">
+                        </div>
+
+                        <div class="oe_title">
                         <label for="name" class="oe_edit_only"/>
-                        <h1>
-                            <field name="name"/>
-                        </h1>
-                        <group>
+                            <h1>
+                                <field name="name" class="oe_inline"/>
+                            </h1>
+                            <div name="project"/>
+                        </div>
+
+                        <group name="main">
                             <group>
                                 <field name="partner_id" on_change="on_change_partner_id(partner_id, name)" attrs="{'required':[('type','=','contract')]}"/>
-                                <field name="parent_id" on_change="on_change_parent(parent_id)" attrs="{'invisible': [('type','in',['contract','template'])]}"/>
-                                <field name="type"/>
-                                <field name="template_id" on_change="on_change_template(template_id,context)" domain="[('type','=','template')]" attrs="{'invisible': [('type','in',['view', 'normal','template'])]}" context="{'default_type' : 'template'}"/>
+                                <field name="manager_id"/>
+                                <field name="code"/>
                             </group>
                             <group>
-                                <field name="code"/>
-                                <field name="manager_id"/>
+                                <field name="type"/>
+                                <field name="parent_id" on_change="on_change_parent(parent_id)" attrs="{'invisible': [('type','in',['contract','template'])]}"/>
+                                <field name="template_id" on_change="on_change_template(template_id,context)" domain="[('type','=','template')]" attrs="{'invisible': [('type','in',['view', 'normal','template'])]}" context="{'default_type' : 'template'}"/>
                                 <field name="company_id" on_change="on_change_company(company_id)" widget="selection" groups="base.group_multi_company" attrs="{'required': [('type','&lt;&gt;','view')]}"/>
                             </group>
                         </group>
                         <notebook>
                             <page string="Contract Information" name="contract_page" attrs="{'invisible':[('type','not in',['contract', 'template'])]}">
-                                <group name="master">
-                                    <group string="Validity" name="contract">
-                                        <label for="date_start" string="Duration"/>
-                                        <div name="duration">
-                                            <field name="date_start" class="oe_inline"/> - <field name="date" class="oe_inline"/>
-                                        </div>
-                                    </group>
-                                    <group name="project">
-                                        <separator string="Project Management" name="project_sep" invisible="1"/>
-                                    </group>
+                                <group string="Renewal" name="contract">
+                                    <p colspan="2" class="oe_grey oe_edit_only">
+                                        Once the end date of the contract is
+                                        passed or the maximum number of service
+                                        units is reached, the account manager
+                                        is warned by email to renew the contract.
+                                    </p>
+                                    <label for="date" string="End Date"/>
+                                    <div name="duration">
+                                        <field name="date" class="oe_inline"/>
+                                    </div>
                                 </group>
                                 <separator string="Terms and Conditions" name="description"/>
                                 <field name="description"/>
diff --git a/addons/analytic/i18n/ar.po b/addons/analytic/i18n/ar.po
index b7cd840f440..7f7040b8b89 100644
--- a/addons/analytic/i18n/ar.po
+++ b/addons/analytic/i18n/ar.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: analytic
 #: field:account.analytic.account,child_ids:0
diff --git a/addons/analytic/i18n/bg.po b/addons/analytic/i18n/bg.po
index 6768c478979..baee790124a 100644
--- a/addons/analytic/i18n/bg.po
+++ b/addons/analytic/i18n/bg.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: analytic
 #: field:account.analytic.account,child_ids:0
diff --git a/addons/analytic/i18n/bs.po b/addons/analytic/i18n/bs.po
index 947ff88bdb5..0394af4c73e 100644
--- a/addons/analytic/i18n/bs.po
+++ b/addons/analytic/i18n/bs.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: analytic
 #: field:account.analytic.account,child_ids:0
diff --git a/addons/analytic/i18n/ca.po b/addons/analytic/i18n/ca.po
index 6f0583b2a98..2a6219d19bf 100644
--- a/addons/analytic/i18n/ca.po
+++ b/addons/analytic/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: analytic
 #: field:account.analytic.account,child_ids:0
diff --git a/addons/analytic/i18n/cs.po b/addons/analytic/i18n/cs.po
index 999adb6d2b9..9d21c45574f 100644
--- a/addons/analytic/i18n/cs.po
+++ b/addons/analytic/i18n/cs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 "X-Poedit-Language: czech\n"
 
 #. module: analytic
diff --git a/addons/analytic/i18n/da.po b/addons/analytic/i18n/da.po
index 9d6a4e1d27a..b1dde8d5968 100644
--- a/addons/analytic/i18n/da.po
+++ b/addons/analytic/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: analytic
 #: field:account.analytic.account,child_ids:0
diff --git a/addons/analytic/i18n/de.po b/addons/analytic/i18n/de.po
index e46c0bec121..7d24bcc23cd 100644
--- a/addons/analytic/i18n/de.po
+++ b/addons/analytic/i18n/de.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: analytic
 #: field:account.analytic.account,child_ids:0
diff --git a/addons/analytic/i18n/el.po b/addons/analytic/i18n/el.po
index ee8ecd6d43f..0f045dc5521 100644
--- a/addons/analytic/i18n/el.po
+++ b/addons/analytic/i18n/el.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: analytic
 #: field:account.analytic.account,child_ids:0
diff --git a/addons/analytic/i18n/es.po b/addons/analytic/i18n/es.po
index 846dfbb5d02..632c2e32078 100644
--- a/addons/analytic/i18n/es.po
+++ b/addons/analytic/i18n/es.po
@@ -9,13 +9,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:35+0000\n"
 "PO-Revision-Date: 2012-02-10 17:16+0000\n"
-"Last-Translator: Carlos @ smile-iberia <Unknown>\n"
+"Last-Translator: Carlos Ch. <Unknown>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: analytic
 #: field:account.analytic.account,child_ids:0
diff --git a/addons/analytic/i18n/es_CR.po b/addons/analytic/i18n/es_CR.po
index baad6a17199..acb05ae0ac2 100644
--- a/addons/analytic/i18n/es_CR.po
+++ b/addons/analytic/i18n/es_CR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 "Language: es\n"
 
 #. module: analytic
diff --git a/addons/analytic/i18n/es_EC.po b/addons/analytic/i18n/es_EC.po
index 594954729f1..9bfb9b18257 100644
--- a/addons/analytic/i18n/es_EC.po
+++ b/addons/analytic/i18n/es_EC.po
@@ -9,8 +9,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: analytic
 #: field:account.analytic.account,child_ids:0
diff --git a/addons/analytic/i18n/es_PY.po b/addons/analytic/i18n/es_PY.po
index 3bec4348cea..0382ab08b08 100644
--- a/addons/analytic/i18n/es_PY.po
+++ b/addons/analytic/i18n/es_PY.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: analytic
 #: field:account.analytic.account,child_ids:0
diff --git a/addons/analytic/i18n/et.po b/addons/analytic/i18n/et.po
index 0001246b7f9..76e40f64aa2 100644
--- a/addons/analytic/i18n/et.po
+++ b/addons/analytic/i18n/et.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: analytic
 #: field:account.analytic.account,child_ids:0
diff --git a/addons/analytic/i18n/fa.po b/addons/analytic/i18n/fa.po
index 3a28ddedcb5..1491157723d 100644
--- a/addons/analytic/i18n/fa.po
+++ b/addons/analytic/i18n/fa.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: analytic
 #: field:account.analytic.account,child_ids:0
diff --git a/addons/analytic/i18n/fi.po b/addons/analytic/i18n/fi.po
index 74f8c72c4eb..04d98c1b076 100644
--- a/addons/analytic/i18n/fi.po
+++ b/addons/analytic/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: analytic
 #: field:account.analytic.account,child_ids:0
diff --git a/addons/analytic/i18n/fr.po b/addons/analytic/i18n/fr.po
index 1760034fed5..fe7edeca2c1 100644
--- a/addons/analytic/i18n/fr.po
+++ b/addons/analytic/i18n/fr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: analytic
 #: field:account.analytic.account,child_ids:0
diff --git a/addons/analytic/i18n/gl.po b/addons/analytic/i18n/gl.po
index f3adeee448c..dc59647da80 100644
--- a/addons/analytic/i18n/gl.po
+++ b/addons/analytic/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: analytic
 #: field:account.analytic.account,child_ids:0
diff --git a/addons/analytic/i18n/hr.po b/addons/analytic/i18n/hr.po
index 4e9fd216d01..6171782a070 100644
--- a/addons/analytic/i18n/hr.po
+++ b/addons/analytic/i18n/hr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: analytic
 #: field:account.analytic.account,child_ids:0
diff --git a/addons/analytic/i18n/hu.po b/addons/analytic/i18n/hu.po
index c62ee27292e..37a010a0739 100644
--- a/addons/analytic/i18n/hu.po
+++ b/addons/analytic/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: analytic
 #: field:account.analytic.account,child_ids:0
diff --git a/addons/analytic/i18n/it.po b/addons/analytic/i18n/it.po
index c85ac4b20bd..e5fccaadccc 100644
--- a/addons/analytic/i18n/it.po
+++ b/addons/analytic/i18n/it.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: analytic
 #: field:account.analytic.account,child_ids:0
diff --git a/addons/analytic/i18n/ja.po b/addons/analytic/i18n/ja.po
index ee9719d71eb..1b7a3eddaae 100644
--- a/addons/analytic/i18n/ja.po
+++ b/addons/analytic/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: analytic
 #: field:account.analytic.account,child_ids:0
diff --git a/addons/analytic/i18n/lv.po b/addons/analytic/i18n/lv.po
index dee1412d4e1..0da88c64db4 100644
--- a/addons/analytic/i18n/lv.po
+++ b/addons/analytic/i18n/lv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: analytic
 #: field:account.analytic.account,child_ids:0
diff --git a/addons/analytic/i18n/mn.po b/addons/analytic/i18n/mn.po
index e4c42c35164..995a954686d 100644
--- a/addons/analytic/i18n/mn.po
+++ b/addons/analytic/i18n/mn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: analytic
 #: field:account.analytic.account,child_ids:0
diff --git a/addons/analytic/i18n/nb.po b/addons/analytic/i18n/nb.po
index 9f25e95f47b..cfedd0089ec 100644
--- a/addons/analytic/i18n/nb.po
+++ b/addons/analytic/i18n/nb.po
@@ -14,13 +14,13 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: analytic
 #: field:account.analytic.account,child_ids:0
 msgid "Child Accounts"
-msgstr ""
+msgstr "underordnede kontoer"
 
 #. module: analytic
 #: field:account.analytic.account,name:0
@@ -30,7 +30,7 @@ msgstr "Kontonavn"
 #. module: analytic
 #: help:account.analytic.line,unit_amount:0
 msgid "Specifies the amount of quantity to count."
-msgstr ""
+msgstr "Angir mengden avnkvantitet å telle."
 
 #. module: analytic
 #: field:account.analytic.account,state:0
@@ -40,7 +40,7 @@ msgstr "Status"
 #. module: analytic
 #: field:account.analytic.account,user_id:0
 msgid "Account Manager"
-msgstr ""
+msgstr "kontofører"
 
 #. module: analytic
 #: selection:account.analytic.account,state:0
@@ -70,11 +70,21 @@ msgid ""
 " If it is to be reviewed then the state is 'Pending'.\n"
 " When the project is completed the state is set to 'Done'."
 msgstr ""
+"Når en konto er opprettet sin i \"Kladd\" tilstand.\n"
+"* Hvis noen assosiert partner er der, kan det være i 'åpen' tilstand.\n"
+"* Hvis noen ventende balanse er det det kan være i 'Pending \".\n"
+"* Og til slutt når alle transaksjoner er over, kan det være i \"Lukk\" "
+"tilstand.\n"
+"* Prosjektet kan være enten hvis statenes mal \"og\" Running \".\n"
+"  Hvis det er malen så kan vi lage prosjekter basert på mal prosjekter. Hvis "
+"det i 'Running' tilstand er det en normal prosjekt.\n"
+"  Hvis det er å bli vurdert så staten \"Venter\".\n"
+"  Når prosjektet er fullført staten er satt til 'Ferdig'"
 
 #. module: analytic
 #: selection:account.analytic.account,state:0
 msgid "New"
-msgstr ""
+msgstr "Ny"
 
 #. module: analytic
 #: field:account.analytic.account,type:0
@@ -84,12 +94,12 @@ msgstr "Kontotype"
 #. module: analytic
 #: selection:account.analytic.account,state:0
 msgid "Pending"
-msgstr ""
+msgstr "Venter"
 
 #. module: analytic
 #: model:ir.model,name:analytic.model_account_analytic_line
 msgid "Analytic Line"
-msgstr ""
+msgstr "Analytisk linje"
 
 #. module: analytic
 #: field:account.analytic.account,description:0
@@ -119,6 +129,12 @@ msgid ""
 "consolidation purposes of several companies charts with different "
 "currencies, for example."
 msgstr ""
+"Hvis du angir et selskap, har valutaen valgt å være det samme som det er "
+"valuta.\n"
+"Du kan fjerne selskap som tilhører, og dermed endre valutaen, bare på "
+"analytisk grunn av type 'view'. Dette kan være veldig nyttig for "
+"konsolideringsformål av flere selskaper diagrammer med ulike valutaer, for "
+"eksempel."
 
 #. module: analytic
 #: field:account.analytic.line,user_id:0
@@ -158,12 +174,12 @@ msgstr ""
 #. module: analytic
 #: field:account.analytic.account,child_complete_ids:0
 msgid "Account Hierarchy"
-msgstr ""
+msgstr "konto hierarkiet"
 
 #. module: analytic
 #: help:account.analytic.account,quantity_max:0
 msgid "Sets the higher limit of time to work on the contract."
-msgstr ""
+msgstr "Setter høyere grense av tid til å jobbe på kontrakten."
 
 #. module: analytic
 #: field:account.analytic.account,credit:0
@@ -183,7 +199,7 @@ msgstr "Kontakt"
 #. module: analytic
 #: field:account.analytic.account,code:0
 msgid "Code/Reference"
-msgstr ""
+msgstr "Kode/Referanse"
 
 #. module: analytic
 #: selection:account.analytic.account,state:0
@@ -194,7 +210,7 @@ msgstr "Annulert"
 #: code:addons/analytic/analytic.py:138
 #, python-format
 msgid "Error !"
-msgstr ""
+msgstr "Feil !"
 
 #. module: analytic
 #: field:account.analytic.account,balance:0
@@ -204,7 +220,7 @@ msgstr "Saldo"
 #. module: analytic
 #: constraint:account.analytic.account:0
 msgid "Error! You can not create recursive analytic accounts."
-msgstr ""
+msgstr "Feil! Du kan ikke opprette rekursive analytiske kontoer."
 
 #. module: analytic
 #: help:account.analytic.account,type:0
@@ -212,26 +228,28 @@ msgid ""
 "If you select the View Type, it means you won't allow to create journal "
 "entries using that account."
 msgstr ""
+"Hvis du velger View type, betyr det at du ikke vil tillate å lage "
+"bilagsregistreringer med denne kontoen."
 
 #. module: analytic
 #: field:account.analytic.account,date:0
 msgid "Date End"
-msgstr ""
+msgstr "Sluttdato"
 
 #. module: analytic
 #: field:account.analytic.account,quantity_max:0
 msgid "Maximum Time"
-msgstr ""
+msgstr "Max tid"
 
 #. module: analytic
 #: model:res.groups,name:analytic.group_analytic_accounting
 msgid "Analytic Accounting"
-msgstr ""
+msgstr "Analytisk bokføring"
 
 #. module: analytic
 #: field:account.analytic.account,complete_name:0
 msgid "Full Account Name"
-msgstr ""
+msgstr "Fullt kontonavn"
 
 #. module: analytic
 #: field:account.analytic.line,account_id:0
@@ -242,17 +260,17 @@ msgstr "Analytisk konto"
 #. module: analytic
 #: field:account.analytic.account,currency_id:0
 msgid "Currency"
-msgstr ""
+msgstr "Valuta"
 
 #. module: analytic
 #: constraint:account.analytic.line:0
 msgid "You can not create analytic line on view account."
-msgstr ""
+msgstr "Du kan ikke opprette analytisk linje på visning konto."
 
 #. module: analytic
 #: selection:account.analytic.account,type:0
 msgid "View"
-msgstr ""
+msgstr "Vis"
 
 #. module: analytic
 #: field:account.analytic.account,partner_id:0
@@ -272,7 +290,7 @@ msgstr "Åpen"
 #. module: analytic
 #: field:account.analytic.account,line_ids:0
 msgid "Analytic Entries"
-msgstr ""
+msgstr "Analytiske registreringer"
 
 #~ msgid "Draft"
 #~ msgstr "Utkast"
diff --git a/addons/analytic/i18n/nl.po b/addons/analytic/i18n/nl.po
index d19b5d26470..48ee15952f5 100644
--- a/addons/analytic/i18n/nl.po
+++ b/addons/analytic/i18n/nl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: analytic
 #: field:account.analytic.account,child_ids:0
diff --git a/addons/analytic/i18n/nl_BE.po b/addons/analytic/i18n/nl_BE.po
index 6d31b36e315..fcb3399db11 100644
--- a/addons/analytic/i18n/nl_BE.po
+++ b/addons/analytic/i18n/nl_BE.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: analytic
 #: field:account.analytic.account,child_ids:0
diff --git a/addons/analytic/i18n/pl.po b/addons/analytic/i18n/pl.po
index c854ae1a33e..b1cf4d2c222 100644
--- a/addons/analytic/i18n/pl.po
+++ b/addons/analytic/i18n/pl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: analytic
 #: field:account.analytic.account,child_ids:0
diff --git a/addons/analytic/i18n/pt.po b/addons/analytic/i18n/pt.po
index 921be39e2ea..31475784b66 100644
--- a/addons/analytic/i18n/pt.po
+++ b/addons/analytic/i18n/pt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: analytic
 #: field:account.analytic.account,child_ids:0
diff --git a/addons/analytic/i18n/pt_BR.po b/addons/analytic/i18n/pt_BR.po
index 7e832d8925d..32ad4dcee67 100644
--- a/addons/analytic/i18n/pt_BR.po
+++ b/addons/analytic/i18n/pt_BR.po
@@ -9,13 +9,14 @@ msgstr ""
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:35+0000\n"
 "PO-Revision-Date: 2012-07-28 15:08+0000\n"
-"Last-Translator: Fábio Martinelli <webmaster@guaru.net>\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: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: analytic
 #: field:account.analytic.account,child_ids:0
diff --git a/addons/analytic/i18n/ro.po b/addons/analytic/i18n/ro.po
index cc5b1b6fd6a..43d7884eaff 100644
--- a/addons/analytic/i18n/ro.po
+++ b/addons/analytic/i18n/ro.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: analytic
 #: field:account.analytic.account,child_ids:0
diff --git a/addons/analytic/i18n/ru.po b/addons/analytic/i18n/ru.po
index 40563755163..51555fdc0ea 100644
--- a/addons/analytic/i18n/ru.po
+++ b/addons/analytic/i18n/ru.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: analytic
 #: field:account.analytic.account,child_ids:0
diff --git a/addons/analytic/i18n/sl.po b/addons/analytic/i18n/sl.po
index 121eb8043ad..6469f85ca68 100644
--- a/addons/analytic/i18n/sl.po
+++ b/addons/analytic/i18n/sl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: analytic
 #: field:account.analytic.account,child_ids:0
diff --git a/addons/analytic/i18n/sq.po b/addons/analytic/i18n/sq.po
index 823d2f6d6e9..07fac60c26a 100644
--- a/addons/analytic/i18n/sq.po
+++ b/addons/analytic/i18n/sq.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: analytic
 #: field:account.analytic.account,child_ids:0
diff --git a/addons/analytic/i18n/sr.po b/addons/analytic/i18n/sr.po
index bf1a0a64df7..6172e62dea1 100644
--- a/addons/analytic/i18n/sr.po
+++ b/addons/analytic/i18n/sr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: analytic
 #: field:account.analytic.account,child_ids:0
diff --git a/addons/analytic/i18n/sr@latin.po b/addons/analytic/i18n/sr@latin.po
index e9cfafd8b60..d72c8fea22a 100644
--- a/addons/analytic/i18n/sr@latin.po
+++ b/addons/analytic/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: analytic
 #: field:account.analytic.account,child_ids:0
diff --git a/addons/analytic/i18n/sv.po b/addons/analytic/i18n/sv.po
index 81b99c9271f..792a5ef959f 100644
--- a/addons/analytic/i18n/sv.po
+++ b/addons/analytic/i18n/sv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: analytic
 #: field:account.analytic.account,child_ids:0
diff --git a/addons/analytic/i18n/tr.po b/addons/analytic/i18n/tr.po
index cab1f9f84b3..a8eee667a30 100644
--- a/addons/analytic/i18n/tr.po
+++ b/addons/analytic/i18n/tr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: analytic
 #: field:account.analytic.account,child_ids:0
diff --git a/addons/analytic/i18n/vi.po b/addons/analytic/i18n/vi.po
index b40698bab4e..d1733b28051 100644
--- a/addons/analytic/i18n/vi.po
+++ b/addons/analytic/i18n/vi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: analytic
 #: field:account.analytic.account,child_ids:0
diff --git a/addons/analytic/i18n/zh_CN.po b/addons/analytic/i18n/zh_CN.po
index 8ca8867d7e8..d6b25253abf 100644
--- a/addons/analytic/i18n/zh_CN.po
+++ b/addons/analytic/i18n/zh_CN.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: analytic
 #: field:account.analytic.account,child_ids:0
diff --git a/addons/analytic/i18n/zh_TW.po b/addons/analytic/i18n/zh_TW.po
new file mode 100644
index 00000000000..4beedb8d91d
--- /dev/null
+++ b/addons/analytic/i18n/zh_TW.po
@@ -0,0 +1,283 @@
+# Chinese (Traditional) 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-02-08 00:35+0000\n"
+"PO-Revision-Date: 2012-08-27 12:22+0000\n"
+"Last-Translator: Eric Huang <eh@cenoq.com>\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: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
+
+#. module: analytic
+#: field:account.analytic.account,child_ids:0
+msgid "Child Accounts"
+msgstr "子科目"
+
+#. module: analytic
+#: field:account.analytic.account,name:0
+msgid "Account Name"
+msgstr "科目名稱"
+
+#. module: analytic
+#: help:account.analytic.line,unit_amount:0
+msgid "Specifies the amount of quantity to count."
+msgstr "指定金額的數量用來計算"
+
+#. module: analytic
+#: field:account.analytic.account,state:0
+msgid "State"
+msgstr "狀態"
+
+#. module: analytic
+#: field:account.analytic.account,user_id:0
+msgid "Account Manager"
+msgstr "科目管理"
+
+#. module: analytic
+#: selection:account.analytic.account,state:0
+msgid "Closed"
+msgstr "已關閉"
+
+#. module: analytic
+#: field:account.analytic.account,debit:0
+msgid "Debit"
+msgstr "借方"
+
+#. module: analytic
+#: help:account.analytic.account,state:0
+msgid ""
+"* When an account is created its in 'Draft' state.                           "
+"       \n"
+"* If any associated partner is there, it can be in 'Open' state.             "
+"                     \n"
+"* If any pending balance is there it can be in 'Pending'.                    "
+"               \n"
+"* And finally when all the transactions are over, it can be in 'Close' "
+"state.                                   \n"
+"* The project can be in either if the states 'Template' and 'Running'.\n"
+" If it is template then we can make projects based on the template projects. "
+"If its in 'Running' state it is a normal project.                            "
+"     \n"
+" If it is to be reviewed then the state is 'Pending'.\n"
+" When the project is completed the state is set to 'Done'."
+msgstr ""
+"*當建立這科目時為'草稿'狀態.\n"
+"*如果有任何相關的業務夥伴它是'待處理'狀態.\n"
+"*如果有任何懸而未決的差額它為'懸而未決'狀態.\n"
+"*當所有交易已結束, 它是'關閉'狀態\n"
+"\n"
+"*該專案狀態可為其中之一, 如果是'模板'狀態我們能按專案模板來建造專案, 如果為'運行中'它是一正常專案\n"
+"如果需要審查則狀態為'懸而未決'\n"
+"當專案結束狀態為'完成'"
+
+#. module: analytic
+#: selection:account.analytic.account,state:0
+msgid "New"
+msgstr "新增"
+
+#. module: analytic
+#: field:account.analytic.account,type:0
+msgid "Account Type"
+msgstr "科目類型"
+
+#. module: analytic
+#: selection:account.analytic.account,state:0
+msgid "Pending"
+msgstr "待處理"
+
+#. module: analytic
+#: model:ir.model,name:analytic.model_account_analytic_line
+msgid "Analytic Line"
+msgstr "輔助核算項目明細"
+
+#. module: analytic
+#: field:account.analytic.account,description:0
+#: field:account.analytic.line,name:0
+msgid "Description"
+msgstr "說明"
+
+#. module: analytic
+#: selection:account.analytic.account,type:0
+msgid "Normal"
+msgstr "一般"
+
+#. module: analytic
+#: field:account.analytic.account,company_id:0
+#: field:account.analytic.line,company_id:0
+msgid "Company"
+msgstr "公司"
+
+#. module: analytic
+#: code:addons/analytic/analytic.py:138
+#, python-format
+msgid ""
+"If you set a company, the currency selected has to be the same as it's "
+"currency. \n"
+"You can remove the company belonging, and thus change the currency, only on "
+"analytic account of type 'view'. This can be really usefull for "
+"consolidation purposes of several companies charts with different "
+"currencies, for example."
+msgstr ""
+"如果選擇公司，請注意保持成本科目貨幣與公司貨幣一致。\n"
+"針對視圖類型的成本科目，你可以把公司字段留空，並修改幣種。這樣你就可以把多個公司不同貨幣的成本科目合併起來。"
+
+#. module: analytic
+#: field:account.analytic.line,user_id:0
+msgid "User"
+msgstr "使用者"
+
+#. module: analytic
+#: field:account.analytic.account,parent_id:0
+msgid "Parent Analytic Account"
+msgstr "上級輔助核算項"
+
+#. module: analytic
+#: field:account.analytic.line,date:0
+msgid "Date"
+msgstr "日期"
+
+#. module: analytic
+#: selection:account.analytic.account,state:0
+msgid "Template"
+msgstr "模板"
+
+#. module: analytic
+#: field:account.analytic.account,quantity:0
+#: field:account.analytic.line,unit_amount:0
+msgid "Quantity"
+msgstr "數量"
+
+#. module: analytic
+#: help:account.analytic.line,amount:0
+msgid ""
+"Calculated by multiplying the quantity and the price given in the Product's "
+"cost price. Always expressed in the company main currency."
+msgstr "計算公式是數量乘以產品成本價。幣別是公司主要幣別。"
+
+#. module: analytic
+#: field:account.analytic.account,child_complete_ids:0
+msgid "Account Hierarchy"
+msgstr "科目階層"
+
+#. module: analytic
+#: help:account.analytic.account,quantity_max:0
+msgid "Sets the higher limit of time to work on the contract."
+msgstr "設置在這個合約上工作的最高時限。"
+
+#. module: analytic
+#: field:account.analytic.account,credit:0
+msgid "Credit"
+msgstr "貸方"
+
+#. module: analytic
+#: field:account.analytic.line,amount:0
+msgid "Amount"
+msgstr "金額"
+
+#. module: analytic
+#: field:account.analytic.account,contact_id:0
+msgid "Contact"
+msgstr "聯繫"
+
+#. module: analytic
+#: field:account.analytic.account,code:0
+msgid "Code/Reference"
+msgstr "編碼/統一編號"
+
+#. module: analytic
+#: selection:account.analytic.account,state:0
+msgid "Cancelled"
+msgstr "已取消"
+
+#. module: analytic
+#: code:addons/analytic/analytic.py:138
+#, python-format
+msgid "Error !"
+msgstr "錯誤！"
+
+#. module: analytic
+#: field:account.analytic.account,balance:0
+msgid "Balance"
+msgstr "差額"
+
+#. module: analytic
+#: constraint:account.analytic.account:0
+msgid "Error! You can not create recursive analytic accounts."
+msgstr "錯誤! 你不能建立遞歸的輔助覈算專案"
+
+#. module: analytic
+#: help:account.analytic.account,type:0
+msgid ""
+"If you select the View Type, it means you won't allow to create journal "
+"entries using that account."
+msgstr "如果選擇了 視圖 類型，則你不能在這個輔助核算項上建立輔助覈算憑證"
+
+#. module: analytic
+#: field:account.analytic.account,date:0
+msgid "Date End"
+msgstr "結束日期"
+
+#. module: analytic
+#: field:account.analytic.account,quantity_max:0
+msgid "Maximum Time"
+msgstr "最長時間"
+
+#. module: analytic
+#: model:res.groups,name:analytic.group_analytic_accounting
+msgid "Analytic Accounting"
+msgstr "輔助核算會計"
+
+#. module: analytic
+#: field:account.analytic.account,complete_name:0
+msgid "Full Account Name"
+msgstr "所有科目名稱"
+
+#. module: analytic
+#: field:account.analytic.line,account_id:0
+#: model:ir.model,name:analytic.model_account_analytic_account
+msgid "Analytic Account"
+msgstr "輔助核算項"
+
+#. module: analytic
+#: field:account.analytic.account,currency_id:0
+msgid "Currency"
+msgstr "貨幣"
+
+#. module: analytic
+#: constraint:account.analytic.line:0
+msgid "You can not create analytic line on view account."
+msgstr "無法在視圖類型的科目上建立輔助核算項目明細"
+
+#. module: analytic
+#: selection:account.analytic.account,type:0
+msgid "View"
+msgstr "視圖"
+
+#. module: analytic
+#: field:account.analytic.account,partner_id:0
+msgid "Partner"
+msgstr "業務夥伴"
+
+#. module: analytic
+#: field:account.analytic.account,date_start:0
+msgid "Date Start"
+msgstr "開始日期"
+
+#. module: analytic
+#: selection:account.analytic.account,state:0
+msgid "Open"
+msgstr "待處理"
+
+#. module: analytic
+#: field:account.analytic.account,line_ids:0
+msgid "Analytic Entries"
+msgstr "輔助核算分錄"
diff --git a/addons/analytic_contract_expense_project/analytic_contract_expense_project.py b/addons/analytic_contract_expense_project/analytic_contract_expense_project.py
deleted file mode 100644
index efbb8b75a9e..00000000000
--- a/addons/analytic_contract_expense_project/analytic_contract_expense_project.py
+++ /dev/null
@@ -1,37 +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 osv import osv
-
-class project_project(osv.osv):
-    _inherit = "project.project"
-
-    def open_hr_expense(self, cr, uid, ids, context=None):
-        account_ids = [x.analytic_account_id.id for x in self.browse(cr, uid, ids, context=context)]
-        return self.pool.get('account.analytic.account').open_hr_expense(cr, uid, account_ids, context=context)
-
-    def hr_to_invoice_expense(self, cr, uid, ids, context=None):
-        account_ids = [x.analytic_account_id.id for x in self.browse(cr, uid, ids, context=context)]
-        return self.pool.get('account.analytic.account').hr_to_invoice_expense(cr, uid, account_ids, context=context)
-
-project_project()
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/analytic_contract_expense_project/analytic_contract_expense_project_view.xml b/addons/analytic_contract_expense_project/analytic_contract_expense_project_view.xml
deleted file mode 100644
index f461ed224b8..00000000000
--- a/addons/analytic_contract_expense_project/analytic_contract_expense_project_view.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-        <record id="project_form_expense_form" model="ir.ui.view">
-            <field name="name">project.project.form.expense.inherit</field>
-            <field name="model">project.project</field>
-            <field name="inherit_id" ref="analytic_contract_project.project_account_analytic_account_form"/>
-            <field eval="20" name="priority"/>
-            <field name="arch" type="xml">
-                <xpath expr='//tr[@name="total"]' position='before'>
-                    <tr>
-                        <td>
-                            <label for="charge_expenses"/>
-                        </td><td>
-                            <field name="charge_expenses"/>
-                        </td><td>
-                            <field class="oe_inline" name="est_expenses" attrs="{'invisible': [('charge_expenses','=',False)]}"/>
-                        </td><td>
-                            <field class="oe_inline" name="expense_invoiced" attrs="{'invisible': [('charge_expenses','=',False)]}"/>
-                        </td><td>
-                            <field class="oe_inline" name="remaining_expense" attrs="{'invisible': [('charge_expenses','=',False)]}"/>
-                        </td><td>
-                            <field class="oe_inline" name="expense_to_invoice" attrs="{'invisible': [('charge_expenses','=',False)]}"/>
-                        </td><td>
-                            <button name="open_hr_expense" string="All Expenses" type="object" attrs="{'invisible': [('charge_expenses','=',False)]}"/>
-                            <button name="hr_to_invoice_expense" string="Expenses to Invoice" type="object" attrs="{'invisible': [('charge_expenses','=',False)]}"/>
-                        </td>
-                    </tr>
-                </xpath>
-            </field>
-        </record>
-    </data>
-</openerp>
diff --git a/addons/analytic_contract_hr_expense/__openerp__.py b/addons/analytic_contract_hr_expense/__openerp__.py
index 6d5cca8b574..8e807923550 100644
--- a/addons/analytic_contract_hr_expense/__openerp__.py
+++ b/addons/analytic_contract_hr_expense/__openerp__.py
@@ -26,18 +26,14 @@
     'category': 'Hidden',
     'description': """
 This module is for modifying account analytic view to show some data related to the hr_expense module.
-
+======================================================================================================
 """,
-    "author": "OpenERP S.A.",
-    "website": "http://www.openerp.com/",
-    "depends": ["hr_expense","account_analytic_analysis"],
-    "init_xml": [],
-    "update_xml": [
-                    "analytic_contract_hr_expense_view.xml",
-                    ],
-    'demo_xml': [],
-    "css" : [
-             ],
+    'author': 'OpenERP S.A.',
+    'website': 'http://www.openerp.com/',
+    'depends': ['hr_expense','account_analytic_analysis'],
+    'data': ['analytic_contract_hr_expense_view.xml'],
+    'demo': [],
+    'css' : [],
     'installable': True,
     'auto_install': True,
 }
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 2869eaed86d..8d0f470df86 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
@@ -5,12 +5,13 @@
             <field name="name">account.analytic.account.form.expense.inherit</field>
             <field name="model">account.analytic.account</field>
             <field eval="60" name="priority"/>
+            <field name="inherit_id" ref="account_analytic_analysis.account_analytic_account_form_form"/>
             <field name="arch" type="xml">
                 <xpath expr='//tr[@name="total"]' position='before'>
                     <tr>
-                        <td>
+                        <td class="oe_grey">
                             <label for="charge_expenses"/>
-                        </td><td>
+                        </td><td class="oe_grey">
                             <field name="charge_expenses"/>
                         </td><td>
                             <field class="oe_form_inline" name="est_expenses" attrs="{'invisible': [('charge_expenses','=',False)]}"/>
@@ -21,10 +22,16 @@
                         </td><td>
                             <field class="oe_form_inline" name="expense_to_invoice" attrs="{'invisible': [('charge_expenses','=',False)]}"/>
                         </td><td>
-                            <group>
-                                <button name="open_hr_expense" string="All Expenses" type="object" attrs="{'invisible': [('charge_expenses','=',False)]}"/>
-                                <button name="hr_to_invoice_expense" string="Expenses to Invoice" type="object" attrs="{'invisible': [('charge_expenses','=',False)]}"/>
-                            </group>
+                            <button
+                                name="hr_to_invoice_expense"
+                                class="oe_link oe_e"
+                                string="/" type="object"
+                                attrs="{'invisible': [('expense_to_invoice','=',0)]}"/>
+                        </td><td>
+                            <button
+                                name="open_hr_expense"
+                                class="oe_link"
+                                string="Expenses" type="object" attrs="{'invisible': [('charge_expenses','=',False)]}"/>
                         </td>
                     </tr>
                 </xpath>
diff --git a/addons/analytic_contract_project/analytic_contract_project.py b/addons/analytic_contract_project/analytic_contract_project.py
deleted file mode 100644
index 1ffab1246c9..00000000000
--- a/addons/analytic_contract_project/analytic_contract_project.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 osv import fields, osv
-from tools.translate import _
-
-class project_project(osv.osv):
-    _inherit = 'project.project'
-
-    _defaults = {
-        'use_timesheets': True,
-    }
-
-    def open_sale_order_lines(self,cr,uid,ids,context=None):
-        account_ids = [x.analytic_account_id.id for x in self.browse(cr, uid, ids, context=context)]
-        return self.pool.get('account.analytic.account').open_sale_order_lines(cr, uid, account_ids, context=context)
-
-    def open_timesheets_to_invoice(self,cr,uid,ids,context=None):
-        if context is None:
-            context = {}
-        analytic_account_id = self.browse(cr, uid, ids[0], context=context).analytic_account_id.id
-        context.update({'search_default_account_id': analytic_account_id, 'default_account_id': analytic_account_id, 'search_default_to_invoice': 1})
-        return {
-            'type': 'ir.actions.act_window',
-            'name': _('Timesheet Lines to Invoice'),
-            'view_type': 'form',
-            'view_mode': 'tree,form',
-            'context': context,
-            'domain' : [('invoice_id','=',False),('to_invoice','!=',False), ('journal_id.type', '=', 'general')],
-            'res_model': 'account.analytic.line',
-            'nodestroy': True,
-        }
-
-    def open_timesheets(self, cr, uid, ids, context=None):
-        """ open Timesheets view """
-        project = self.browse(cr, uid, ids[0], context)
-        try:
-            journal_id = self.pool.get('ir.model.data').get_object(cr, uid, 'hr_timesheet', 'analytic_journal').id
-        except ValueError:
-            journal_id = False
-        view_context = {
-            'search_default_account_id': [project.analytic_account_id.id],
-            'default_account_id': project.analytic_account_id.id,
-            'default_journal_id': journal_id,
-        }
-        return {
-            'type': 'ir.actions.act_window',
-            'name': _('Bill Tasks Works'),
-            'res_model': 'account.analytic.line',
-            'view_type': 'form',
-            'view_mode': 'tree,form',
-            'context': view_context,
-            'nodestroy': True,
-        }
-project_project()
-
-class task(osv.osv):
-    _inherit = "project.task"
-    
-    def create(self, cr, uid, vals, context=None):
-        task_id = super(task, self).create(cr, uid, vals, context=context)
-        task_browse = self.browse(cr, uid, task_id, context=context)
-        if task_browse.project_id.analytic_account_id:
-            self.pool.get('account.analytic.account').message_append_note(cr, uid, [task_browse.project_id.analytic_account_id.id], body=_("Task <em>%s</em> has been <b>created</b>.") % (task_browse.name), context=context)
-        return task_id
-task()
diff --git a/addons/analytic_contract_project/analytic_contract_project_view.xml b/addons/analytic_contract_project/analytic_contract_project_view.xml
deleted file mode 100644
index 84f01e19643..00000000000
--- a/addons/analytic_contract_project/analytic_contract_project_view.xml
+++ /dev/null
@@ -1,127 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-
-        <record id="project_account_analytic_account_form" model="ir.ui.view">
-            <field name="name">project.project.form.inherit</field>
-            <field name="model">project.project</field>
-            <field name="inherit_id" ref="project.edit_project"/>
-            <field eval="18" name="priority"/>
-            <field name="arch" type="xml">
-                <xpath expr='//page[@name="team"]' position='after'>
-                    <page string="Contract Data">
-                        <group>
-                            <group string="Validity">
-                                <label for="date_start" string="Duration"/>
-                                <div name="duration">
-                                    <field name="date_start" class="oe_inline"/> 
-                                    <label attrs="{'invisible':[('date','=',False)]}" class="oe_inline" string=" - "/>
-                                    <field name="date" class="oe_inline"/>
-                                </div>
-                                <label for="quantity_max"/>
-                                <div>
-                                    <field name="quantity_max" class="oe_inline"/>
-                                    <field name="company_uom_id" readonly="1" class="oe_inline"/> / Remaining: 
-                                    <field name="remaining_hours" class="oe_inline"/> 
-                                    <field name="company_uom_id" readonly="1" class="oe_inline"/>
-                                </div>
-                            </group>
-                            <group string="Invoice Options">
-                                <field name="manager_id" />
-                                <field name="pricelist_id" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/>
-                                <field name="to_invoice" widget="selection" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/>
-                            </group>
-                        </group>
-                    <separator name="toinvoice" string="Invoicing"/>
-                    <table width="100%%">
-                        <tr>
-                            <th></th>
-                            <th></th>
-                            <th><label string="Est.Tot"/></th>
-                            <th><label string="Invoiced"/></th>
-                            <th><label string="Remaining"/></th>
-                            <th><label string="To Invoice"/></th>
-                            <th></th>
-                        </tr><tr>
-                            <td>
-                                <label for="fix_price_invoices"/>
-                            </td><td>
-                                <field name="fix_price_invoices" class="oe_inline"/>
-                            </td><td>
-                                <field class="oe_inline" name="amount_max" attrs="{'invisible': [('fix_price_invoices','=',False)]}"/>
-                            </td><td>
-                                <field class="oe_inline" name="ca_invoiced" attrs="{'invisible': [('fix_price_invoices','=',False)]}"/>
-                            </td><td>
-                                <field class="oe_inline" name="remaining_ca" attrs="{'invisible': [('fix_price_invoices','=',False)]}"/>
-                            </td><td>
-                                <field class="oe_inline" name="fix_price_to_invoice" attrs="{'invisible': [('fix_price_invoices','=',False)]}"/>
-                            </td><td>
-                                <button name="%(account_analytic_analysis.action_sales_order)d" string="All Sales" type="action" context="{'default_partner_id': [partner_id], 'search_default_partner_id': [partner_id], 'default_project_id': analytic_account_id, 'search_default_project_id': analytic_account_id}" attrs="{'invisible': [('fix_price_invoices','=',False)]}"/>
-                                <button name="open_sale_order_lines" string="Lines To Invoice" type="object" context="{'default_partner_id': [partner_id],'default_project_id': analytic_account_id,'search_default_uninvoiced': 1,'search_default_project_id': analytic_account_id,'search_default_partner_id': [partner_id]}" attrs="{'invisible': [('fix_price_invoices','=',False)]}"/></td>
-                        </tr><tr attrs="{'invisible':[('use_timesheets','=',False)]}">
-                            <td>
-                                <label for="invoice_on_timesheets"/>
-                            </td><td>
-                                <field name="invoice_on_timesheets"/>
-                            </td><td>
-                                <field class="oe_inline" name="hours_qtt_est" attrs="{'invisible': [('invoice_on_timesheets','=',False)]}"/>
-                            </td><td>
-                                <field class="oe_inline" name="timesheet_ca_invoiced" attrs="{'invisible': [('invoice_on_timesheets','=',False)]}"/>
-                            </td><td>
-                                <field class="oe_inline" name="remaining_hours_to_invoice" attrs="{'invisible': [('invoice_on_timesheets','=',False)]}"/>
-                            </td><td>
-                                <field class="oe_inline" name="ca_to_invoice" attrs="{'invisible': [('fix_price_invoices','=',False)]}"/>
-                            </td><td>
-                                <button name="%(hr_timesheet.act_hr_timesheet_line_evry1_all_form)d" string="All Timesheets" type="action" attrs="{'invisible': [('invoice_on_timesheets','=',False)]}" context="{'default_account_id': analytic_account_id,'search_default_account_id': analytic_account_id}"/>
-                                <button name="open_timesheets_to_invoice" string="Timesheets to Invoice" type="object" attrs="{'invisible': [('invoice_on_timesheets','=',False)]}"/>
-                            </td>
-                        </tr><tr name="total">
-                            <th>
-                                <label string="Total"/>
-                            </th><td>
-                            </td><td>
-                                <field name="est_total" class="oe_inline" attrs="{'invisible': [('invoice_on_timesheets','=',False)]}"/>
-                            </td><td>
-                                <field name="invoiced_total" class="oe_inline"/>
-                            </td><td>
-                                <field name="remaining_total" class="oe_inline"/>
-                            </td><td>
-                                <field name="toinvoice_total" class="oe_inline"/>
-                            </td><td>
-                            </td>
-                        </tr>
-                    </table>
-                    <separator string="Terms and Conditions" name="description"/>
-                    <field name="description"/>
-                    </page>
-                </xpath>
-            </field>
-        </record>
-
-        <record id="project_invoice_form" model="ir.ui.view">
-            <field name="name">Inherit project form : Invoicing Data</field>
-            <field name="model">project.project</field>
-            <field name="inherit_id" ref="project.edit_project"/>
-            <field name="arch" type="xml">
-                <xpath expr='//tr[@name="use_tasks_row"]' position='after'>
-                    <tr>
-                        <td><group><field name="use_timesheets"/></group></td>
-                        <td><button icon="terp-gtk-go-back-rtl" name="open_timesheets" string="Timesheets" type="object" attrs="{'invisible':[('use_timesheets','=', 0)]}"/></td>
-                    </tr>
-                </xpath>
-            </field>
-        </record>
-
-        <record id="contract_inherited_form" model="ir.ui.view">
-            <field name="name">Inherit contract form : adding UoM</field>
-            <field name="model">account.analytic.account</field>
-            <field name="inherit_id" ref="analytic.view_account_analytic_account_form"/>
-            <field name="priority">50</field>
-            <field name="arch" type="xml">
-                <xpath expr='//field[@name="remaining_hours"]' position='after'>
-                    <field name="company_uom_id" readonly="1" class="oe_inline"/>
-                </xpath>
-            </field>
-        </record>
-    </data>
-</openerp>
diff --git a/addons/analytic_user_function/__openerp__.py b/addons/analytic_user_function/__openerp__.py
index 1c1f345aca0..f23296012d2 100644
--- a/addons/analytic_user_function/__openerp__.py
+++ b/addons/analytic_user_function/__openerp__.py
@@ -41,9 +41,8 @@ compatible with older configurations.
     'website': 'http://www.openerp.com',
     'images': ['images/analytic_user_function.jpeg'],
     'depends': ['hr_timesheet_sheet'],
-    'init_xml': [],
-    'update_xml': ['analytic_user_function_view.xml', 'security/ir.model.access.csv'],
-    'demo_xml': [],
+    'data': ['analytic_user_function_view.xml', 'security/ir.model.access.csv'],
+    'demo': [],
     'installable': True,
     'auto_install': False,
     'certificate': '0082277138269',
diff --git a/addons/analytic_user_function/i18n/ar.po b/addons/analytic_user_function/i18n/ar.po
index 0946b883f62..d251f888092 100644
--- a/addons/analytic_user_function/i18n/ar.po
+++ b/addons/analytic_user_function/i18n/ar.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: analytic_user_function
 #: field:analytic.user.funct.grid,product_id:0
diff --git a/addons/analytic_user_function/i18n/bg.po b/addons/analytic_user_function/i18n/bg.po
index 292041a6d8a..4c9a22b68ef 100644
--- a/addons/analytic_user_function/i18n/bg.po
+++ b/addons/analytic_user_function/i18n/bg.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: analytic_user_function
 #: field:analytic.user.funct.grid,product_id:0
diff --git a/addons/analytic_user_function/i18n/bs.po b/addons/analytic_user_function/i18n/bs.po
index 4ba2847a997..300d1b9a728 100644
--- a/addons/analytic_user_function/i18n/bs.po
+++ b/addons/analytic_user_function/i18n/bs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: analytic_user_function
 #: field:analytic.user.funct.grid,product_id:0
diff --git a/addons/analytic_user_function/i18n/ca.po b/addons/analytic_user_function/i18n/ca.po
index 75dc02c22a6..5f28555a7d3 100644
--- a/addons/analytic_user_function/i18n/ca.po
+++ b/addons/analytic_user_function/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: analytic_user_function
 #: field:analytic.user.funct.grid,product_id:0
diff --git a/addons/analytic_user_function/i18n/cs.po b/addons/analytic_user_function/i18n/cs.po
index 9d1ee7a2c75..3a6c6288e07 100644
--- a/addons/analytic_user_function/i18n/cs.po
+++ b/addons/analytic_user_function/i18n/cs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: analytic_user_function
 #: field:analytic.user.funct.grid,product_id:0
diff --git a/addons/analytic_user_function/i18n/da.po b/addons/analytic_user_function/i18n/da.po
index 99d349a0ebd..d151dfcc79a 100644
--- a/addons/analytic_user_function/i18n/da.po
+++ b/addons/analytic_user_function/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: analytic_user_function
 #: field:analytic.user.funct.grid,product_id:0
diff --git a/addons/analytic_user_function/i18n/de.po b/addons/analytic_user_function/i18n/de.po
index 3c0240759bd..007ecea8d5e 100644
--- a/addons/analytic_user_function/i18n/de.po
+++ b/addons/analytic_user_function/i18n/de.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: analytic_user_function
 #: field:analytic.user.funct.grid,product_id:0
diff --git a/addons/analytic_user_function/i18n/el.po b/addons/analytic_user_function/i18n/el.po
index 9d17adc90ca..50301d8be4c 100644
--- a/addons/analytic_user_function/i18n/el.po
+++ b/addons/analytic_user_function/i18n/el.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: analytic_user_function
 #: field:analytic.user.funct.grid,product_id:0
diff --git a/addons/analytic_user_function/i18n/en_GB.po b/addons/analytic_user_function/i18n/en_GB.po
index d0da1d90d66..28c540f8036 100644
--- a/addons/analytic_user_function/i18n/en_GB.po
+++ b/addons/analytic_user_function/i18n/en_GB.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: analytic_user_function
 #: field:analytic.user.funct.grid,product_id:0
diff --git a/addons/analytic_user_function/i18n/es.po b/addons/analytic_user_function/i18n/es.po
index 71591e30820..81c4a9a1c2a 100644
--- a/addons/analytic_user_function/i18n/es.po
+++ b/addons/analytic_user_function/i18n/es.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: analytic_user_function
 #: field:analytic.user.funct.grid,product_id:0
diff --git a/addons/analytic_user_function/i18n/es_AR.po b/addons/analytic_user_function/i18n/es_AR.po
index b333e1832b7..1f6b615e005 100644
--- a/addons/analytic_user_function/i18n/es_AR.po
+++ b/addons/analytic_user_function/i18n/es_AR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: analytic_user_function
 #: field:analytic.user.funct.grid,product_id:0
diff --git a/addons/analytic_user_function/i18n/es_CR.po b/addons/analytic_user_function/i18n/es_CR.po
index de924977a01..c76b5076091 100644
--- a/addons/analytic_user_function/i18n/es_CR.po
+++ b/addons/analytic_user_function/i18n/es_CR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 "Language: \n"
 
 #. module: analytic_user_function
diff --git a/addons/analytic_user_function/i18n/es_EC.po b/addons/analytic_user_function/i18n/es_EC.po
index bbfdf51815f..18b93c9c19f 100644
--- a/addons/analytic_user_function/i18n/es_EC.po
+++ b/addons/analytic_user_function/i18n/es_EC.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: analytic_user_function
 #: field:analytic.user.funct.grid,product_id:0
diff --git a/addons/analytic_user_function/i18n/es_PY.po b/addons/analytic_user_function/i18n/es_PY.po
index 678e157161e..5a1536ce192 100644
--- a/addons/analytic_user_function/i18n/es_PY.po
+++ b/addons/analytic_user_function/i18n/es_PY.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: analytic_user_function
 #: field:analytic.user.funct.grid,product_id:0
diff --git a/addons/analytic_user_function/i18n/et.po b/addons/analytic_user_function/i18n/et.po
index 21d307899eb..3d16f93d9e0 100644
--- a/addons/analytic_user_function/i18n/et.po
+++ b/addons/analytic_user_function/i18n/et.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: analytic_user_function
 #: field:analytic.user.funct.grid,product_id:0
diff --git a/addons/analytic_user_function/i18n/fa.po b/addons/analytic_user_function/i18n/fa.po
index 1d436e894ac..f1bb2090653 100644
--- a/addons/analytic_user_function/i18n/fa.po
+++ b/addons/analytic_user_function/i18n/fa.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: analytic_user_function
 #: field:analytic.user.funct.grid,product_id:0
diff --git a/addons/analytic_user_function/i18n/fi.po b/addons/analytic_user_function/i18n/fi.po
index 3f1a147ab6e..8470aaceaad 100644
--- a/addons/analytic_user_function/i18n/fi.po
+++ b/addons/analytic_user_function/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: analytic_user_function
 #: field:analytic.user.funct.grid,product_id:0
diff --git a/addons/analytic_user_function/i18n/fr.po b/addons/analytic_user_function/i18n/fr.po
index a3845b3eb85..2bbb31c75d5 100644
--- a/addons/analytic_user_function/i18n/fr.po
+++ b/addons/analytic_user_function/i18n/fr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: analytic_user_function
 #: field:analytic.user.funct.grid,product_id:0
diff --git a/addons/analytic_user_function/i18n/gl.po b/addons/analytic_user_function/i18n/gl.po
index 545563a4ab1..c71c39607d7 100644
--- a/addons/analytic_user_function/i18n/gl.po
+++ b/addons/analytic_user_function/i18n/gl.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: analytic_user_function
 #: field:analytic.user.funct.grid,product_id:0
diff --git a/addons/analytic_user_function/i18n/gu.po b/addons/analytic_user_function/i18n/gu.po
index 9be3e3d69e2..d21aaeb8e23 100644
--- a/addons/analytic_user_function/i18n/gu.po
+++ b/addons/analytic_user_function/i18n/gu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: analytic_user_function
 #: field:analytic.user.funct.grid,product_id:0
diff --git a/addons/analytic_user_function/i18n/hr.po b/addons/analytic_user_function/i18n/hr.po
index 79487597bd8..252a8a77420 100644
--- a/addons/analytic_user_function/i18n/hr.po
+++ b/addons/analytic_user_function/i18n/hr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 "Language: hr\n"
 
 #. module: analytic_user_function
diff --git a/addons/analytic_user_function/i18n/hu.po b/addons/analytic_user_function/i18n/hu.po
index 70cb460a7b0..fbb7834355a 100644
--- a/addons/analytic_user_function/i18n/hu.po
+++ b/addons/analytic_user_function/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: analytic_user_function
 #: field:analytic.user.funct.grid,product_id:0
diff --git a/addons/analytic_user_function/i18n/id.po b/addons/analytic_user_function/i18n/id.po
index baecedbb305..de39733e135 100644
--- a/addons/analytic_user_function/i18n/id.po
+++ b/addons/analytic_user_function/i18n/id.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: analytic_user_function
 #: field:analytic.user.funct.grid,product_id:0
diff --git a/addons/analytic_user_function/i18n/it.po b/addons/analytic_user_function/i18n/it.po
index 55a4bf92b20..2b8692597b5 100644
--- a/addons/analytic_user_function/i18n/it.po
+++ b/addons/analytic_user_function/i18n/it.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: analytic_user_function
 #: field:analytic.user.funct.grid,product_id:0
diff --git a/addons/analytic_user_function/i18n/ja.po b/addons/analytic_user_function/i18n/ja.po
index e67e257c3c9..fdf0b81b605 100644
--- a/addons/analytic_user_function/i18n/ja.po
+++ b/addons/analytic_user_function/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: analytic_user_function
 #: field:analytic.user.funct.grid,product_id:0
diff --git a/addons/analytic_user_function/i18n/ko.po b/addons/analytic_user_function/i18n/ko.po
index 616b3f155f6..99600d588ad 100644
--- a/addons/analytic_user_function/i18n/ko.po
+++ b/addons/analytic_user_function/i18n/ko.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: analytic_user_function
 #: field:analytic.user.funct.grid,product_id:0
diff --git a/addons/analytic_user_function/i18n/lt.po b/addons/analytic_user_function/i18n/lt.po
index d9eff1daaa5..90ab912925f 100644
--- a/addons/analytic_user_function/i18n/lt.po
+++ b/addons/analytic_user_function/i18n/lt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: analytic_user_function
 #: field:analytic.user.funct.grid,product_id:0
diff --git a/addons/analytic_user_function/i18n/mn.po b/addons/analytic_user_function/i18n/mn.po
index 825f056bf4b..1e843a2c436 100644
--- a/addons/analytic_user_function/i18n/mn.po
+++ b/addons/analytic_user_function/i18n/mn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: analytic_user_function
 #: field:analytic.user.funct.grid,product_id:0
diff --git a/addons/analytic_user_function/i18n/nb.po b/addons/analytic_user_function/i18n/nb.po
new file mode 100644
index 00000000000..7bde01e230b
--- /dev/null
+++ b/addons/analytic_user_function/i18n/nb.po
@@ -0,0 +1,79 @@
+# Norwegian Bokmal 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-02-08 00:35+0000\n"
+"PO-Revision-Date: 2012-08-27 16:17+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Norwegian Bokmal <nb@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
+
+#. module: analytic_user_function
+#: field:analytic.user.funct.grid,product_id:0
+msgid "Product"
+msgstr "Produkt"
+
+#. module: analytic_user_function
+#: model:ir.model,name:analytic_user_function.model_analytic_user_funct_grid
+msgid "Relation table between users and products on a analytic account"
+msgstr "Forhold bordet mellom brukere og produkter på en analytisk konto."
+
+#. module: analytic_user_function
+#: constraint:hr.analytic.timesheet:0
+msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
+msgstr "Du kan ikke endre en oppføring i en Bekreftet / Ferdig timeliste!."
+
+#. module: analytic_user_function
+#: field:analytic.user.funct.grid,account_id:0
+#: model:ir.model,name:analytic_user_function.model_account_analytic_account
+msgid "Analytic Account"
+msgstr "Analytisk konto"
+
+#. module: analytic_user_function
+#: view:account.analytic.account:0
+#: field:account.analytic.account,user_product_ids:0
+msgid "Users/Products Rel."
+msgstr "Brukere / Produkter rel."
+
+#. module: analytic_user_function
+#: field:analytic.user.funct.grid,user_id:0
+msgid "User"
+msgstr "Bruker"
+
+#. module: analytic_user_function
+#: code:addons/analytic_user_function/analytic_user_function.py:96
+#: code:addons/analytic_user_function/analytic_user_function.py:131
+#, python-format
+msgid "There is no expense account define for this product: \"%s\" (id:%d)"
+msgstr "Det er ingen regning definert for dette produktet: \"% s\" (id:% d)"
+
+#. module: analytic_user_function
+#: code:addons/analytic_user_function/analytic_user_function.py:95
+#: code:addons/analytic_user_function/analytic_user_function.py:130
+#, python-format
+msgid "Error !"
+msgstr "Feil !"
+
+#. module: analytic_user_function
+#: constraint:account.analytic.account:0
+msgid "Error! You can not create recursive analytic accounts."
+msgstr "Feil! Du kan ikke opprette rekursive analytiske kontoer."
+
+#. module: analytic_user_function
+#: model:ir.model,name:analytic_user_function.model_hr_analytic_timesheet
+msgid "Timesheet Line"
+msgstr "Timelistelinje"
+
+#. module: analytic_user_function
+#: view:analytic.user.funct.grid:0
+msgid "User's Product for this Analytic Account"
+msgstr "Brukerens produkt for dette Analytisk konto"
diff --git a/addons/analytic_user_function/i18n/nl.po b/addons/analytic_user_function/i18n/nl.po
index 3dd8f59ac51..303c206d55c 100644
--- a/addons/analytic_user_function/i18n/nl.po
+++ b/addons/analytic_user_function/i18n/nl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: analytic_user_function
 #: field:analytic.user.funct.grid,product_id:0
diff --git a/addons/analytic_user_function/i18n/oc.po b/addons/analytic_user_function/i18n/oc.po
index 30c48c81ff0..38f59eb6594 100644
--- a/addons/analytic_user_function/i18n/oc.po
+++ b/addons/analytic_user_function/i18n/oc.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: analytic_user_function
 #: field:analytic.user.funct.grid,product_id:0
diff --git a/addons/analytic_user_function/i18n/pl.po b/addons/analytic_user_function/i18n/pl.po
index 31cf587a6c0..da0572234c7 100644
--- a/addons/analytic_user_function/i18n/pl.po
+++ b/addons/analytic_user_function/i18n/pl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: analytic_user_function
 #: field:analytic.user.funct.grid,product_id:0
diff --git a/addons/analytic_user_function/i18n/pt.po b/addons/analytic_user_function/i18n/pt.po
index 26c39e80ad8..7a239c89357 100644
--- a/addons/analytic_user_function/i18n/pt.po
+++ b/addons/analytic_user_function/i18n/pt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: analytic_user_function
 #: field:analytic.user.funct.grid,product_id:0
diff --git a/addons/analytic_user_function/i18n/pt_BR.po b/addons/analytic_user_function/i18n/pt_BR.po
index 9950eaa62a8..0613e83e526 100644
--- a/addons/analytic_user_function/i18n/pt_BR.po
+++ b/addons/analytic_user_function/i18n/pt_BR.po
@@ -8,13 +8,14 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 00:35+0000\n"
 "PO-Revision-Date: 2012-07-28 16:30+0000\n"
-"Last-Translator: Fábio Martinelli <webmaster@guaru.net>\n"
+"Last-Translator: Fábio Martinelli - http://zupy.com.br "
+"<webmaster@guaru.net>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: analytic_user_function
 #: field:analytic.user.funct.grid,product_id:0
diff --git a/addons/analytic_user_function/i18n/ro.po b/addons/analytic_user_function/i18n/ro.po
index fcd38f38a58..e24ab6757e9 100644
--- a/addons/analytic_user_function/i18n/ro.po
+++ b/addons/analytic_user_function/i18n/ro.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: analytic_user_function
 #: field:analytic.user.funct.grid,product_id:0
diff --git a/addons/analytic_user_function/i18n/ru.po b/addons/analytic_user_function/i18n/ru.po
index f66189888ef..a07a47ab0f5 100644
--- a/addons/analytic_user_function/i18n/ru.po
+++ b/addons/analytic_user_function/i18n/ru.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: analytic_user_function
 #: field:analytic.user.funct.grid,product_id:0
diff --git a/addons/analytic_user_function/i18n/sk.po b/addons/analytic_user_function/i18n/sk.po
index 244d7ed2608..30fbc04e165 100644
--- a/addons/analytic_user_function/i18n/sk.po
+++ b/addons/analytic_user_function/i18n/sk.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: analytic_user_function
 #: field:analytic.user.funct.grid,product_id:0
diff --git a/addons/analytic_user_function/i18n/sl.po b/addons/analytic_user_function/i18n/sl.po
index 1006946ef98..4e3cd47b64f 100644
--- a/addons/analytic_user_function/i18n/sl.po
+++ b/addons/analytic_user_function/i18n/sl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: analytic_user_function
 #: field:analytic.user.funct.grid,product_id:0
diff --git a/addons/analytic_user_function/i18n/sq.po b/addons/analytic_user_function/i18n/sq.po
index 8c37f0b5269..d268f8a71b9 100644
--- a/addons/analytic_user_function/i18n/sq.po
+++ b/addons/analytic_user_function/i18n/sq.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: analytic_user_function
 #: field:analytic.user.funct.grid,product_id:0
diff --git a/addons/analytic_user_function/i18n/sr.po b/addons/analytic_user_function/i18n/sr.po
index 5c0648bfa37..b4b60497f26 100644
--- a/addons/analytic_user_function/i18n/sr.po
+++ b/addons/analytic_user_function/i18n/sr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: analytic_user_function
 #: field:analytic.user.funct.grid,product_id:0
diff --git a/addons/analytic_user_function/i18n/sr@latin.po b/addons/analytic_user_function/i18n/sr@latin.po
index 5f5ab37eb2f..611e0f1fa7f 100644
--- a/addons/analytic_user_function/i18n/sr@latin.po
+++ b/addons/analytic_user_function/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: analytic_user_function
 #: field:analytic.user.funct.grid,product_id:0
diff --git a/addons/analytic_user_function/i18n/sv.po b/addons/analytic_user_function/i18n/sv.po
index b7a9799c3b2..f280564f26f 100644
--- a/addons/analytic_user_function/i18n/sv.po
+++ b/addons/analytic_user_function/i18n/sv.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: analytic_user_function
 #: field:analytic.user.funct.grid,product_id:0
diff --git a/addons/analytic_user_function/i18n/tlh.po b/addons/analytic_user_function/i18n/tlh.po
index d4a648c72db..28939868ced 100644
--- a/addons/analytic_user_function/i18n/tlh.po
+++ b/addons/analytic_user_function/i18n/tlh.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: analytic_user_function
 #: field:analytic.user.funct.grid,product_id:0
diff --git a/addons/analytic_user_function/i18n/tr.po b/addons/analytic_user_function/i18n/tr.po
index 678a7cde6c7..039495d5415 100644
--- a/addons/analytic_user_function/i18n/tr.po
+++ b/addons/analytic_user_function/i18n/tr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: analytic_user_function
 #: field:analytic.user.funct.grid,product_id:0
diff --git a/addons/analytic_user_function/i18n/uk.po b/addons/analytic_user_function/i18n/uk.po
index 9556cdc0cf4..5799e9bdd8f 100644
--- a/addons/analytic_user_function/i18n/uk.po
+++ b/addons/analytic_user_function/i18n/uk.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: analytic_user_function
 #: field:analytic.user.funct.grid,product_id:0
diff --git a/addons/analytic_user_function/i18n/vi.po b/addons/analytic_user_function/i18n/vi.po
index 5065fb93df2..214ad512369 100644
--- a/addons/analytic_user_function/i18n/vi.po
+++ b/addons/analytic_user_function/i18n/vi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: analytic_user_function
 #: field:analytic.user.funct.grid,product_id:0
diff --git a/addons/analytic_user_function/i18n/zh_CN.po b/addons/analytic_user_function/i18n/zh_CN.po
index c74a01fc97d..3e30aaa18dc 100644
--- a/addons/analytic_user_function/i18n/zh_CN.po
+++ b/addons/analytic_user_function/i18n/zh_CN.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: analytic_user_function
 #: field:analytic.user.funct.grid,product_id:0
diff --git a/addons/analytic_user_function/i18n/zh_TW.po b/addons/analytic_user_function/i18n/zh_TW.po
index 1804d354d22..7ffee376498 100644
--- a/addons/analytic_user_function/i18n/zh_TW.po
+++ b/addons/analytic_user_function/i18n/zh_TW.po
@@ -7,72 +7,72 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 00:35+0000\n"
-"PO-Revision-Date: 2009-01-23 16:16+0000\n"
-"Last-Translator: <>\n"
+"PO-Revision-Date: 2012-08-20 03:00+0000\n"
+"Last-Translator: Eric Huang <eh@cenoq.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: analytic_user_function
 #: field:analytic.user.funct.grid,product_id:0
 msgid "Product"
-msgstr ""
+msgstr "產品"
 
 #. module: analytic_user_function
 #: model:ir.model,name:analytic_user_function.model_analytic_user_funct_grid
 msgid "Relation table between users and products on a analytic account"
-msgstr ""
+msgstr "使用者及產品在核助核算項目的關聯資料表"
 
 #. module: analytic_user_function
 #: constraint:hr.analytic.timesheet:0
 msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
-msgstr ""
+msgstr "你不可修改一個已確認/完成的工時表記錄！"
 
 #. module: analytic_user_function
 #: field:analytic.user.funct.grid,account_id:0
 #: model:ir.model,name:analytic_user_function.model_account_analytic_account
 msgid "Analytic Account"
-msgstr ""
+msgstr "輔助核算項目"
 
 #. module: analytic_user_function
 #: view:account.analytic.account:0
 #: field:account.analytic.account,user_product_ids:0
 msgid "Users/Products Rel."
-msgstr ""
+msgstr "使用者/產品 關聯"
 
 #. module: analytic_user_function
 #: field:analytic.user.funct.grid,user_id:0
 msgid "User"
-msgstr ""
+msgstr "使用者"
 
 #. module: analytic_user_function
 #: code:addons/analytic_user_function/analytic_user_function.py:96
 #: code:addons/analytic_user_function/analytic_user_function.py:131
 #, python-format
 msgid "There is no expense account define for this product: \"%s\" (id:%d)"
-msgstr ""
+msgstr "此產品未定義費用科目: \"%s\" (id:%d)"
 
 #. module: analytic_user_function
 #: code:addons/analytic_user_function/analytic_user_function.py:95
 #: code:addons/analytic_user_function/analytic_user_function.py:130
 #, python-format
 msgid "Error !"
-msgstr ""
+msgstr "錯誤！"
 
 #. module: analytic_user_function
 #: constraint:account.analytic.account:0
 msgid "Error! You can not create recursive analytic accounts."
-msgstr ""
+msgstr "錯誤! 你不能建立遞歸的輔助核算項目"
 
 #. module: analytic_user_function
 #: model:ir.model,name:analytic_user_function.model_hr_analytic_timesheet
 msgid "Timesheet Line"
-msgstr ""
+msgstr "工時表明細"
 
 #. module: analytic_user_function
 #: view:analytic.user.funct.grid:0
 msgid "User's Product for this Analytic Account"
-msgstr ""
+msgstr "此輔助核算項目的使用者產品"
diff --git a/addons/anonymization/__openerp__.py b/addons/anonymization/__openerp__.py
index acfc5ac3792..865fb19ea07 100644
--- a/addons/anonymization/__openerp__.py
+++ b/addons/anonymization/__openerp__.py
@@ -40,11 +40,7 @@ anonymization process to recover your previous data.
     'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
     'depends': ['base'],
-    'init_xml': [],
-    'update_xml': [],
-    'demo_xml': [
-        'anonymization_demo.xml',
-    ],
+    'demo': ['anonymization_demo.xml'],
     'data': [
         'ir.model.fields.anonymization.csv',
         'security/ir.model.access.csv',
diff --git a/addons/anonymization/anonymization_view.xml b/addons/anonymization/anonymization_view.xml
index 5aba288d4f8..1a6c6c355d5 100644
--- a/addons/anonymization/anonymization_view.xml
+++ b/addons/anonymization/anonymization_view.xml
@@ -76,7 +76,7 @@
         </field>
     </record>
 
-      <!-- ACTION -->
+    <!-- ACTION -->
 
     <record model="ir.actions.act_window" id="action_ir_model_fields_anonymize_wizard">
         <field name="name">Anonymize Database</field>
@@ -163,4 +163,3 @@
 
 </data>
 </openerp>
-
diff --git a/addons/anonymization/i18n/ar.po b/addons/anonymization/i18n/ar.po
index d9bd622d36a..e4a6675a066 100644
--- a/addons/anonymization/i18n/ar.po
+++ b/addons/anonymization/i18n/ar.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: anonymization
 #: model:ir.model,name:anonymization.model_ir_model_fields_anonymize_wizard
diff --git a/addons/anonymization/i18n/bg.po b/addons/anonymization/i18n/bg.po
index 077997da680..574aef7d0ad 100644
--- a/addons/anonymization/i18n/bg.po
+++ b/addons/anonymization/i18n/bg.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: anonymization
 #: model:ir.model,name:anonymization.model_ir_model_fields_anonymize_wizard
diff --git a/addons/anonymization/i18n/ca.po b/addons/anonymization/i18n/ca.po
index f9d06b7f8f3..452a519d12d 100644
--- a/addons/anonymization/i18n/ca.po
+++ b/addons/anonymization/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: anonymization
 #: model:ir.model,name:anonymization.model_ir_model_fields_anonymize_wizard
diff --git a/addons/anonymization/i18n/da.po b/addons/anonymization/i18n/da.po
index 7591437383f..733a9f93e9f 100644
--- a/addons/anonymization/i18n/da.po
+++ b/addons/anonymization/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: anonymization
 #: model:ir.model,name:anonymization.model_ir_model_fields_anonymize_wizard
diff --git a/addons/anonymization/i18n/de.po b/addons/anonymization/i18n/de.po
index 89a07e43ffd..7df771c48c6 100644
--- a/addons/anonymization/i18n/de.po
+++ b/addons/anonymization/i18n/de.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: anonymization
 #: model:ir.model,name:anonymization.model_ir_model_fields_anonymize_wizard
diff --git a/addons/anonymization/i18n/es.po b/addons/anonymization/i18n/es.po
index e90f7453917..63ac0963996 100644
--- a/addons/anonymization/i18n/es.po
+++ b/addons/anonymization/i18n/es.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: anonymization
 #: model:ir.model,name:anonymization.model_ir_model_fields_anonymize_wizard
diff --git a/addons/anonymization/i18n/es_CR.po b/addons/anonymization/i18n/es_CR.po
index 265374b6027..5935152dd79 100644
--- a/addons/anonymization/i18n/es_CR.po
+++ b/addons/anonymization/i18n/es_CR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 "Language: es\n"
 
 #. module: anonymization
diff --git a/addons/anonymization/i18n/es_EC.po b/addons/anonymization/i18n/es_EC.po
index 8d3f4c026b7..c797004f38e 100644
--- a/addons/anonymization/i18n/es_EC.po
+++ b/addons/anonymization/i18n/es_EC.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: anonymization
 #: model:ir.model,name:anonymization.model_ir_model_fields_anonymize_wizard
diff --git a/addons/anonymization/i18n/es_PY.po b/addons/anonymization/i18n/es_PY.po
index 23a18aebc20..465676880a1 100644
--- a/addons/anonymization/i18n/es_PY.po
+++ b/addons/anonymization/i18n/es_PY.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: anonymization
 #: model:ir.model,name:anonymization.model_ir_model_fields_anonymize_wizard
diff --git a/addons/anonymization/i18n/et.po b/addons/anonymization/i18n/et.po
index 2b6734f332f..33fb48a3e34 100644
--- a/addons/anonymization/i18n/et.po
+++ b/addons/anonymization/i18n/et.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: anonymization
 #: model:ir.model,name:anonymization.model_ir_model_fields_anonymize_wizard
diff --git a/addons/anonymization/i18n/fa.po b/addons/anonymization/i18n/fa.po
index f52798b36ad..a2fe72d3acc 100644
--- a/addons/anonymization/i18n/fa.po
+++ b/addons/anonymization/i18n/fa.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: anonymization
 #: model:ir.model,name:anonymization.model_ir_model_fields_anonymize_wizard
diff --git a/addons/anonymization/i18n/fi.po b/addons/anonymization/i18n/fi.po
index dccb53828db..f957f4eb2a2 100644
--- a/addons/anonymization/i18n/fi.po
+++ b/addons/anonymization/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: anonymization
 #: model:ir.model,name:anonymization.model_ir_model_fields_anonymize_wizard
diff --git a/addons/anonymization/i18n/fr.po b/addons/anonymization/i18n/fr.po
index 8af5d9839da..d6e044ac0e4 100644
--- a/addons/anonymization/i18n/fr.po
+++ b/addons/anonymization/i18n/fr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: anonymization
 #: model:ir.model,name:anonymization.model_ir_model_fields_anonymize_wizard
diff --git a/addons/anonymization/i18n/gl.po b/addons/anonymization/i18n/gl.po
index e176be68d47..05e46351b99 100644
--- a/addons/anonymization/i18n/gl.po
+++ b/addons/anonymization/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: anonymization
 #: model:ir.model,name:anonymization.model_ir_model_fields_anonymize_wizard
diff --git a/addons/anonymization/i18n/hr.po b/addons/anonymization/i18n/hr.po
index 8236c004448..c1caa73bd7d 100644
--- a/addons/anonymization/i18n/hr.po
+++ b/addons/anonymization/i18n/hr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: anonymization
 #: model:ir.model,name:anonymization.model_ir_model_fields_anonymize_wizard
diff --git a/addons/anonymization/i18n/it.po b/addons/anonymization/i18n/it.po
index 02088cfca9d..c53f951d30e 100644
--- a/addons/anonymization/i18n/it.po
+++ b/addons/anonymization/i18n/it.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: anonymization
 #: model:ir.model,name:anonymization.model_ir_model_fields_anonymize_wizard
diff --git a/addons/anonymization/i18n/ja.po b/addons/anonymization/i18n/ja.po
index 022c436ea8b..f6db41666ed 100644
--- a/addons/anonymization/i18n/ja.po
+++ b/addons/anonymization/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: anonymization
 #: model:ir.model,name:anonymization.model_ir_model_fields_anonymize_wizard
diff --git a/addons/anonymization/i18n/nb.po b/addons/anonymization/i18n/nb.po
new file mode 100644
index 00000000000..4c3535f0ef9
--- /dev/null
+++ b/addons/anonymization/i18n/nb.po
@@ -0,0 +1,213 @@
+# Norwegian Bokmal 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-02-08 00:35+0000\n"
+"PO-Revision-Date: 2012-08-28 12:11+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Norwegian Bokmal <nb@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-08-29 05:05+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
+
+#. module: anonymization
+#: model:ir.model,name:anonymization.model_ir_model_fields_anonymize_wizard
+msgid "ir.model.fields.anonymize.wizard"
+msgstr "ir.modell.felt.anonymisere.veiviseren"
+
+#. module: anonymization
+#: field:ir.model.fields.anonymization,field_name:0
+msgid "Field Name"
+msgstr "Feltnavn"
+
+#. module: anonymization
+#: field:ir.model.fields.anonymization,field_id:0
+msgid "Field"
+msgstr "Felt"
+
+#. module: anonymization
+#: field:ir.model.fields.anonymization.history,state:0
+#: field:ir.model.fields.anonymize.wizard,state:0
+msgid "State"
+msgstr "Stat"
+
+#. module: anonymization
+#: field:ir.model.fields.anonymize.wizard,file_import:0
+msgid "Import"
+msgstr "Importer"
+
+#. module: anonymization
+#: model:ir.model,name:anonymization.model_ir_model_fields_anonymization
+msgid "ir.model.fields.anonymization"
+msgstr "ir.modell.felt.anonymisering"
+
+#. module: anonymization
+#: field:ir.model.fields.anonymization.history,direction:0
+msgid "Direction"
+msgstr "Retning"
+
+#. module: anonymization
+#: model:ir.actions.act_window,name:anonymization.action_ir_model_fields_anonymization_tree
+#: view:ir.model.fields.anonymization:0
+#: model:ir.ui.menu,name:anonymization.menu_administration_anonymization_fields
+msgid "Anonymized Fields"
+msgstr "Anonymiserte Felter"
+
+#. module: anonymization
+#: model:ir.ui.menu,name:anonymization.menu_administration_anonymization
+msgid "Database anonymization"
+msgstr "database anonymisering"
+
+#. module: anonymization
+#: selection:ir.model.fields.anonymization.history,direction:0
+msgid "clear -> anonymized"
+msgstr "klar -> anonymiseres"
+
+#. module: anonymization
+#: selection:ir.model.fields.anonymization,state:0
+#: selection:ir.model.fields.anonymize.wizard,state:0
+msgid "Anonymized"
+msgstr "Anonymiseres"
+
+#. module: anonymization
+#: field:ir.model.fields.anonymization,state:0
+msgid "unknown"
+msgstr "ukjent"
+
+#. module: anonymization
+#: field:ir.model.fields.anonymization,model_id:0
+msgid "Object"
+msgstr "Objekt"
+
+#. module: anonymization
+#: field:ir.model.fields.anonymization.history,filepath:0
+msgid "File path"
+msgstr "filbane"
+
+#. module: anonymization
+#: field:ir.model.fields.anonymization.history,date:0
+msgid "Date"
+msgstr "Dato"
+
+#. module: anonymization
+#: field:ir.model.fields.anonymize.wizard,file_export:0
+msgid "Export"
+msgstr "Eksporter"
+
+#. module: anonymization
+#: view:ir.model.fields.anonymize.wizard:0
+msgid "Reverse the Database Anonymization"
+msgstr "Reversere Database anonymisering"
+
+#. module: anonymization
+#: view:ir.model.fields.anonymize.wizard:0
+msgid "Database Anonymization"
+msgstr "database anonymisering"
+
+#. module: anonymization
+#: model:ir.ui.menu,name:anonymization.menu_administration_anonymization_wizard
+msgid "Anonymize database"
+msgstr "anonymisere database"
+
+#. module: anonymization
+#: view:ir.model.fields.anonymization.history:0
+#: field:ir.model.fields.anonymization.history,field_ids:0
+msgid "Fields"
+msgstr "Felter"
+
+#. module: anonymization
+#: selection:ir.model.fields.anonymization,state:0
+#: selection:ir.model.fields.anonymize.wizard,state:0
+msgid "Clear"
+msgstr "fjerne"
+
+#. module: anonymization
+#: view:ir.model.fields.anonymize.wizard:0
+#: field:ir.model.fields.anonymize.wizard,summary:0
+msgid "Summary"
+msgstr "Oppsummering"
+
+#. module: anonymization
+#: view:ir.model.fields.anonymization:0
+msgid "Anonymized Field"
+msgstr "Anonymisert Felt"
+
+#. module: anonymization
+#: selection:ir.model.fields.anonymize.wizard,state:0
+msgid "Unstable"
+msgstr "Ustabil"
+
+#. module: anonymization
+#: selection:ir.model.fields.anonymization.history,state:0
+msgid "Exception occured"
+msgstr "unntak oppstod"
+
+#. module: anonymization
+#: selection:ir.model.fields.anonymization,state:0
+#: selection:ir.model.fields.anonymize.wizard,state:0
+msgid "Not Existing"
+msgstr "Eksisterer ikke"
+
+#. module: anonymization
+#: field:ir.model.fields.anonymization,model_name:0
+msgid "Object Name"
+msgstr "Objektnavn"
+
+#. module: anonymization
+#: model:ir.actions.act_window,name:anonymization.action_ir_model_fields_anonymization_history_tree
+#: view:ir.model.fields.anonymization.history:0
+#: model:ir.ui.menu,name:anonymization.menu_administration_anonymization_history
+msgid "Anonymization History"
+msgstr "Anonymisering Historie"
+
+#. module: anonymization
+#: model:ir.model,name:anonymization.model_ir_model_fields_anonymization_history
+msgid "ir.model.fields.anonymization.history"
+msgstr "ir.modell.felt.anonymisering.historie"
+
+#. module: anonymization
+#: model:ir.actions.act_window,name:anonymization.action_ir_model_fields_anonymize_wizard
+#: view:ir.model.fields.anonymize.wizard:0
+msgid "Anonymize Database"
+msgstr "Anonymisere Database"
+
+#. module: anonymization
+#: field:ir.model.fields.anonymize.wizard,name:0
+msgid "File Name"
+msgstr "Filnavn"
+
+#. module: anonymization
+#: selection:ir.model.fields.anonymization.history,direction:0
+msgid "anonymized -> clear"
+msgstr "Anonymisert -> klart"
+
+#. module: anonymization
+#: selection:ir.model.fields.anonymization.history,state:0
+msgid "Started"
+msgstr "Startet"
+
+#. module: anonymization
+#: selection:ir.model.fields.anonymization.history,state:0
+msgid "Done"
+msgstr "Utført"
+
+#. module: anonymization
+#: view:ir.model.fields.anonymization.history:0
+#: field:ir.model.fields.anonymization.history,msg:0
+#: field:ir.model.fields.anonymize.wizard,msg:0
+msgid "Message"
+msgstr "Beskjed"
+
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:55
+#: sql_constraint:ir.model.fields.anonymization:0
+#, python-format
+msgid "You cannot have two fields with the same name on the same object!"
+msgstr "Du kan ikke ha to felt med samme navn på samme objekt!"
diff --git a/addons/anonymization/i18n/nl.po b/addons/anonymization/i18n/nl.po
index 09475da38de..78dbbe3bc15 100644
--- a/addons/anonymization/i18n/nl.po
+++ b/addons/anonymization/i18n/nl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: anonymization
 #: model:ir.model,name:anonymization.model_ir_model_fields_anonymize_wizard
diff --git a/addons/anonymization/i18n/pl.po b/addons/anonymization/i18n/pl.po
index d5fc9c33235..46fb45a3c96 100644
--- a/addons/anonymization/i18n/pl.po
+++ b/addons/anonymization/i18n/pl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: anonymization
 #: model:ir.model,name:anonymization.model_ir_model_fields_anonymize_wizard
diff --git a/addons/anonymization/i18n/pt.po b/addons/anonymization/i18n/pt.po
index 23891b30f46..67cf40df5d5 100644
--- a/addons/anonymization/i18n/pt.po
+++ b/addons/anonymization/i18n/pt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: anonymization
 #: model:ir.model,name:anonymization.model_ir_model_fields_anonymize_wizard
diff --git a/addons/anonymization/i18n/pt_BR.po b/addons/anonymization/i18n/pt_BR.po
index e4ec1b320bb..79eb8c3771c 100644
--- a/addons/anonymization/i18n/pt_BR.po
+++ b/addons/anonymization/i18n/pt_BR.po
@@ -9,13 +9,14 @@ msgstr ""
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:35+0000\n"
 "PO-Revision-Date: 2012-07-28 16:33+0000\n"
-"Last-Translator: Fábio Martinelli <webmaster@guaru.net>\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: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: anonymization
 #: model:ir.model,name:anonymization.model_ir_model_fields_anonymize_wizard
diff --git a/addons/anonymization/i18n/ro.po b/addons/anonymization/i18n/ro.po
index 427f78aa614..34c030b50d2 100644
--- a/addons/anonymization/i18n/ro.po
+++ b/addons/anonymization/i18n/ro.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: anonymization
 #: model:ir.model,name:anonymization.model_ir_model_fields_anonymize_wizard
diff --git a/addons/anonymization/i18n/ru.po b/addons/anonymization/i18n/ru.po
index 73c64b7945c..af9169bd14b 100644
--- a/addons/anonymization/i18n/ru.po
+++ b/addons/anonymization/i18n/ru.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: anonymization
 #: model:ir.model,name:anonymization.model_ir_model_fields_anonymize_wizard
diff --git a/addons/anonymization/i18n/sq.po b/addons/anonymization/i18n/sq.po
index 076ff9e0f9b..69260567dd6 100644
--- a/addons/anonymization/i18n/sq.po
+++ b/addons/anonymization/i18n/sq.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: anonymization
 #: model:ir.model,name:anonymization.model_ir_model_fields_anonymize_wizard
diff --git a/addons/anonymization/i18n/sr@latin.po b/addons/anonymization/i18n/sr@latin.po
index d0d70657e1e..dd3e72c723f 100644
--- a/addons/anonymization/i18n/sr@latin.po
+++ b/addons/anonymization/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: anonymization
 #: model:ir.model,name:anonymization.model_ir_model_fields_anonymize_wizard
diff --git a/addons/anonymization/i18n/sv.po b/addons/anonymization/i18n/sv.po
index 681b0791fcb..b80a0d4433b 100644
--- a/addons/anonymization/i18n/sv.po
+++ b/addons/anonymization/i18n/sv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: anonymization
 #: model:ir.model,name:anonymization.model_ir_model_fields_anonymize_wizard
diff --git a/addons/anonymization/i18n/tr.po b/addons/anonymization/i18n/tr.po
index 46e2bcd2693..bbc1ab9494d 100644
--- a/addons/anonymization/i18n/tr.po
+++ b/addons/anonymization/i18n/tr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: anonymization
 #: model:ir.model,name:anonymization.model_ir_model_fields_anonymize_wizard
diff --git a/addons/anonymization/i18n/zh_CN.po b/addons/anonymization/i18n/zh_CN.po
index 1894ddd6df0..8ad06d06776 100644
--- a/addons/anonymization/i18n/zh_CN.po
+++ b/addons/anonymization/i18n/zh_CN.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: anonymization
 #: model:ir.model,name:anonymization.model_ir_model_fields_anonymize_wizard
diff --git a/addons/anonymization/i18n/zh_TW.po b/addons/anonymization/i18n/zh_TW.po
new file mode 100644
index 00000000000..c0ed7441c80
--- /dev/null
+++ b/addons/anonymization/i18n/zh_TW.po
@@ -0,0 +1,213 @@
+# Chinese (Traditional) 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-02-08 00:35+0000\n"
+"PO-Revision-Date: 2012-08-29 03:38+0000\n"
+"Last-Translator: Eric Huang <eh@cenoq.com>\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: 2012-08-30 05:12+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
+
+#. module: anonymization
+#: model:ir.model,name:anonymization.model_ir_model_fields_anonymize_wizard
+msgid "ir.model.fields.anonymize.wizard"
+msgstr "ir.model.fields.anonymize.wizard"
+
+#. module: anonymization
+#: field:ir.model.fields.anonymization,field_name:0
+msgid "Field Name"
+msgstr "欄位名稱"
+
+#. module: anonymization
+#: field:ir.model.fields.anonymization,field_id:0
+msgid "Field"
+msgstr "欄位"
+
+#. module: anonymization
+#: field:ir.model.fields.anonymization.history,state:0
+#: field:ir.model.fields.anonymize.wizard,state:0
+msgid "State"
+msgstr "狀態"
+
+#. module: anonymization
+#: field:ir.model.fields.anonymize.wizard,file_import:0
+msgid "Import"
+msgstr "匯入"
+
+#. module: anonymization
+#: model:ir.model,name:anonymization.model_ir_model_fields_anonymization
+msgid "ir.model.fields.anonymization"
+msgstr "ir.model.fields.anonymization"
+
+#. module: anonymization
+#: field:ir.model.fields.anonymization.history,direction:0
+msgid "Direction"
+msgstr "方向"
+
+#. module: anonymization
+#: model:ir.actions.act_window,name:anonymization.action_ir_model_fields_anonymization_tree
+#: view:ir.model.fields.anonymization:0
+#: model:ir.ui.menu,name:anonymization.menu_administration_anonymization_fields
+msgid "Anonymized Fields"
+msgstr "匿名欄位"
+
+#. module: anonymization
+#: model:ir.ui.menu,name:anonymization.menu_administration_anonymization
+msgid "Database anonymization"
+msgstr "資料庫匿名"
+
+#. module: anonymization
+#: selection:ir.model.fields.anonymization.history,direction:0
+msgid "clear -> anonymized"
+msgstr "清楚->匿名"
+
+#. module: anonymization
+#: selection:ir.model.fields.anonymization,state:0
+#: selection:ir.model.fields.anonymize.wizard,state:0
+msgid "Anonymized"
+msgstr "匿名"
+
+#. module: anonymization
+#: field:ir.model.fields.anonymization,state:0
+msgid "unknown"
+msgstr "不明"
+
+#. module: anonymization
+#: field:ir.model.fields.anonymization,model_id:0
+msgid "Object"
+msgstr "物件"
+
+#. module: anonymization
+#: field:ir.model.fields.anonymization.history,filepath:0
+msgid "File path"
+msgstr "檔案路徑"
+
+#. module: anonymization
+#: field:ir.model.fields.anonymization.history,date:0
+msgid "Date"
+msgstr "日期"
+
+#. module: anonymization
+#: field:ir.model.fields.anonymize.wizard,file_export:0
+msgid "Export"
+msgstr "匯出"
+
+#. module: anonymization
+#: view:ir.model.fields.anonymize.wizard:0
+msgid "Reverse the Database Anonymization"
+msgstr "回復資料庫匿名"
+
+#. module: anonymization
+#: view:ir.model.fields.anonymize.wizard:0
+msgid "Database Anonymization"
+msgstr "資料庫匿名"
+
+#. module: anonymization
+#: model:ir.ui.menu,name:anonymization.menu_administration_anonymization_wizard
+msgid "Anonymize database"
+msgstr "匿名資料庫"
+
+#. module: anonymization
+#: view:ir.model.fields.anonymization.history:0
+#: field:ir.model.fields.anonymization.history,field_ids:0
+msgid "Fields"
+msgstr "欄位"
+
+#. module: anonymization
+#: selection:ir.model.fields.anonymization,state:0
+#: selection:ir.model.fields.anonymize.wizard,state:0
+msgid "Clear"
+msgstr "清除"
+
+#. module: anonymization
+#: view:ir.model.fields.anonymize.wizard:0
+#: field:ir.model.fields.anonymize.wizard,summary:0
+msgid "Summary"
+msgstr "摘要"
+
+#. module: anonymization
+#: view:ir.model.fields.anonymization:0
+msgid "Anonymized Field"
+msgstr "匿名欄位"
+
+#. module: anonymization
+#: selection:ir.model.fields.anonymize.wizard,state:0
+msgid "Unstable"
+msgstr "不穩定版"
+
+#. module: anonymization
+#: selection:ir.model.fields.anonymization.history,state:0
+msgid "Exception occured"
+msgstr "發生意外狀況"
+
+#. module: anonymization
+#: selection:ir.model.fields.anonymization,state:0
+#: selection:ir.model.fields.anonymize.wizard,state:0
+msgid "Not Existing"
+msgstr "不存在"
+
+#. module: anonymization
+#: field:ir.model.fields.anonymization,model_name:0
+msgid "Object Name"
+msgstr "物件名稱"
+
+#. module: anonymization
+#: model:ir.actions.act_window,name:anonymization.action_ir_model_fields_anonymization_history_tree
+#: view:ir.model.fields.anonymization.history:0
+#: model:ir.ui.menu,name:anonymization.menu_administration_anonymization_history
+msgid "Anonymization History"
+msgstr "匿名紀錄"
+
+#. module: anonymization
+#: model:ir.model,name:anonymization.model_ir_model_fields_anonymization_history
+msgid "ir.model.fields.anonymization.history"
+msgstr "ir.model.fields.anonymization.history"
+
+#. module: anonymization
+#: model:ir.actions.act_window,name:anonymization.action_ir_model_fields_anonymize_wizard
+#: view:ir.model.fields.anonymize.wizard:0
+msgid "Anonymize Database"
+msgstr "匿名資料庫"
+
+#. module: anonymization
+#: field:ir.model.fields.anonymize.wizard,name:0
+msgid "File Name"
+msgstr "檔案名稱"
+
+#. module: anonymization
+#: selection:ir.model.fields.anonymization.history,direction:0
+msgid "anonymized -> clear"
+msgstr "匿名->清楚"
+
+#. module: anonymization
+#: selection:ir.model.fields.anonymization.history,state:0
+msgid "Started"
+msgstr "開始"
+
+#. module: anonymization
+#: selection:ir.model.fields.anonymization.history,state:0
+msgid "Done"
+msgstr "完成"
+
+#. module: anonymization
+#: view:ir.model.fields.anonymization.history:0
+#: field:ir.model.fields.anonymization.history,msg:0
+#: field:ir.model.fields.anonymize.wizard,msg:0
+msgid "Message"
+msgstr "訊息"
+
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:55
+#: sql_constraint:ir.model.fields.anonymization:0
+#, python-format
+msgid "You cannot have two fields with the same name on the same object!"
+msgstr "在同一個物件不能有二個相同名稱的欄位!"
diff --git a/addons/association/__openerp__.py b/addons/association/__openerp__.py
index 2b7fcab8b12..665968c6613 100644
--- a/addons/association/__openerp__.py
+++ b/addons/association/__openerp__.py
@@ -33,8 +33,8 @@ membership products (schemes).
     """,
     'author': 'OpenERP SA',
     'depends': ['base_setup', 'membership', 'event'],
-    'update_xml': ['security/ir.model.access.csv', 'profile_association.xml'],
-    'demo_xml': [],
+    'data': ['security/ir.model.access.csv', 'profile_association.xml'],
+    'demo': [],
     'installable': True,
     'auto_install': False,
     'certificate': '0078696047261',
diff --git a/addons/association/i18n/ar.po b/addons/association/i18n/ar.po
index 3ff745195b7..45785df0b23 100644
--- a/addons/association/i18n/ar.po
+++ b/addons/association/i18n/ar.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: association
 #: field:profile.association.config.install_modules_wizard,wiki:0
diff --git a/addons/association/i18n/bg.po b/addons/association/i18n/bg.po
index b43607c6d52..cc939017de8 100644
--- a/addons/association/i18n/bg.po
+++ b/addons/association/i18n/bg.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: association
 #: field:profile.association.config.install_modules_wizard,wiki:0
diff --git a/addons/association/i18n/bs.po b/addons/association/i18n/bs.po
index cab2af59465..70070053674 100644
--- a/addons/association/i18n/bs.po
+++ b/addons/association/i18n/bs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: association
 #: field:profile.association.config.install_modules_wizard,wiki:0
diff --git a/addons/association/i18n/ca.po b/addons/association/i18n/ca.po
index bc454bd6e6f..daf29a881ec 100644
--- a/addons/association/i18n/ca.po
+++ b/addons/association/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: association
 #: field:profile.association.config.install_modules_wizard,wiki:0
diff --git a/addons/association/i18n/cs.po b/addons/association/i18n/cs.po
index 27d83e07bb6..7188cd227c6 100644
--- a/addons/association/i18n/cs.po
+++ b/addons/association/i18n/cs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 "X-Poedit-Language: Czech\n"
 
 #. module: association
diff --git a/addons/association/i18n/da.po b/addons/association/i18n/da.po
index 7f6815471fc..265f86ce811 100644
--- a/addons/association/i18n/da.po
+++ b/addons/association/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: association
 #: field:profile.association.config.install_modules_wizard,wiki:0
diff --git a/addons/association/i18n/de.po b/addons/association/i18n/de.po
index d8eb8d897c2..d46b8399d57 100644
--- a/addons/association/i18n/de.po
+++ b/addons/association/i18n/de.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: association
 #: field:profile.association.config.install_modules_wizard,wiki:0
diff --git a/addons/association/i18n/el.po b/addons/association/i18n/el.po
index 1ec0577e364..a2f99b77112 100644
--- a/addons/association/i18n/el.po
+++ b/addons/association/i18n/el.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: association
 #: field:profile.association.config.install_modules_wizard,wiki:0
diff --git a/addons/association/i18n/en_GB.po b/addons/association/i18n/en_GB.po
index 1e9ccd2b3e9..c36a8d886a0 100644
--- a/addons/association/i18n/en_GB.po
+++ b/addons/association/i18n/en_GB.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: association
 #: field:profile.association.config.install_modules_wizard,wiki:0
diff --git a/addons/association/i18n/es.po b/addons/association/i18n/es.po
index 1232ef20d53..083d7c78dde 100644
--- a/addons/association/i18n/es.po
+++ b/addons/association/i18n/es.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: association
 #: field:profile.association.config.install_modules_wizard,wiki:0
diff --git a/addons/association/i18n/es_CR.po b/addons/association/i18n/es_CR.po
index 70ea604c27b..de44b743d25 100644
--- a/addons/association/i18n/es_CR.po
+++ b/addons/association/i18n/es_CR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 "Language: \n"
 
 #. module: association
diff --git a/addons/association/i18n/es_EC.po b/addons/association/i18n/es_EC.po
index 0f05c6cccd4..7b60f12bee5 100644
--- a/addons/association/i18n/es_EC.po
+++ b/addons/association/i18n/es_EC.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: association
 #: field:profile.association.config.install_modules_wizard,wiki:0
diff --git a/addons/association/i18n/es_PY.po b/addons/association/i18n/es_PY.po
index c2fea1d2c2a..5aa299d39a8 100644
--- a/addons/association/i18n/es_PY.po
+++ b/addons/association/i18n/es_PY.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: association
 #: field:profile.association.config.install_modules_wizard,wiki:0
diff --git a/addons/association/i18n/et.po b/addons/association/i18n/et.po
index 90311937b6a..92c20ab509e 100644
--- a/addons/association/i18n/et.po
+++ b/addons/association/i18n/et.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: association
 #: field:profile.association.config.install_modules_wizard,wiki:0
diff --git a/addons/association/i18n/fa.po b/addons/association/i18n/fa.po
index 901bee1b720..e0f656d11c0 100644
--- a/addons/association/i18n/fa.po
+++ b/addons/association/i18n/fa.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: association
 #: field:profile.association.config.install_modules_wizard,wiki:0
diff --git a/addons/association/i18n/fi.po b/addons/association/i18n/fi.po
index ae24b237e2d..ddecc7429d1 100644
--- a/addons/association/i18n/fi.po
+++ b/addons/association/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: association
 #: field:profile.association.config.install_modules_wizard,wiki:0
diff --git a/addons/association/i18n/fr.po b/addons/association/i18n/fr.po
index f46679f7272..c81a70dfb0a 100644
--- a/addons/association/i18n/fr.po
+++ b/addons/association/i18n/fr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: association
 #: field:profile.association.config.install_modules_wizard,wiki:0
diff --git a/addons/association/i18n/gl.po b/addons/association/i18n/gl.po
index 440cfcbb04a..d8673445344 100644
--- a/addons/association/i18n/gl.po
+++ b/addons/association/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: association
 #: field:profile.association.config.install_modules_wizard,wiki:0
diff --git a/addons/association/i18n/gu.po b/addons/association/i18n/gu.po
index 3ea90fde54f..68eebea636d 100644
--- a/addons/association/i18n/gu.po
+++ b/addons/association/i18n/gu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: association
 #: field:profile.association.config.install_modules_wizard,wiki:0
diff --git a/addons/association/i18n/hr.po b/addons/association/i18n/hr.po
index b103525bdb5..e03cac43829 100644
--- a/addons/association/i18n/hr.po
+++ b/addons/association/i18n/hr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: association
 #: field:profile.association.config.install_modules_wizard,wiki:0
diff --git a/addons/association/i18n/hu.po b/addons/association/i18n/hu.po
index 67859c34803..52d9d53225b 100644
--- a/addons/association/i18n/hu.po
+++ b/addons/association/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: association
 #: field:profile.association.config.install_modules_wizard,wiki:0
diff --git a/addons/association/i18n/id.po b/addons/association/i18n/id.po
index cc71b25ec6a..66fd02eab27 100644
--- a/addons/association/i18n/id.po
+++ b/addons/association/i18n/id.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: association
 #: field:profile.association.config.install_modules_wizard,wiki:0
diff --git a/addons/association/i18n/it.po b/addons/association/i18n/it.po
index d334090805c..a564117af86 100644
--- a/addons/association/i18n/it.po
+++ b/addons/association/i18n/it.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: association
 #: field:profile.association.config.install_modules_wizard,wiki:0
diff --git a/addons/association/i18n/ja.po b/addons/association/i18n/ja.po
index 9153d9a74e3..85e11ee1849 100644
--- a/addons/association/i18n/ja.po
+++ b/addons/association/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: association
 #: field:profile.association.config.install_modules_wizard,wiki:0
diff --git a/addons/association/i18n/ko.po b/addons/association/i18n/ko.po
index 57f0c5a94d6..18024148eab 100644
--- a/addons/association/i18n/ko.po
+++ b/addons/association/i18n/ko.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: association
 #: field:profile.association.config.install_modules_wizard,wiki:0
diff --git a/addons/association/i18n/lo.po b/addons/association/i18n/lo.po
index e005e99b83c..b439721f51a 100644
--- a/addons/association/i18n/lo.po
+++ b/addons/association/i18n/lo.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: association
 #: field:profile.association.config.install_modules_wizard,wiki:0
diff --git a/addons/association/i18n/lt.po b/addons/association/i18n/lt.po
index 1043aaf470b..7c0ffedc8b0 100644
--- a/addons/association/i18n/lt.po
+++ b/addons/association/i18n/lt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: association
 #: field:profile.association.config.install_modules_wizard,wiki:0
diff --git a/addons/association/i18n/lv.po b/addons/association/i18n/lv.po
index 739d186cfc0..622da095547 100644
--- a/addons/association/i18n/lv.po
+++ b/addons/association/i18n/lv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: association
 #: field:profile.association.config.install_modules_wizard,wiki:0
diff --git a/addons/association/i18n/mn.po b/addons/association/i18n/mn.po
index 3f6e34d0197..dc55f5a073a 100644
--- a/addons/association/i18n/mn.po
+++ b/addons/association/i18n/mn.po
@@ -14,33 +14,33 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: association
 #: field:profile.association.config.install_modules_wizard,wiki:0
 msgid "Wiki"
-msgstr ""
+msgstr "Вики"
 
 #. module: association
 #: view:profile.association.config.install_modules_wizard:0
 msgid "Event Management"
-msgstr ""
+msgstr "Үйл явдлын менежмент"
 
 #. module: association
 #: field:profile.association.config.install_modules_wizard,project_gtd:0
 msgid "Getting Things Done"
-msgstr ""
+msgstr "Ажлыг Амжуулах"
 
 #. module: association
 #: model:ir.module.module,description:association.module_meta_information
 msgid "This module is to create Profile for Associates"
-msgstr ""
+msgstr "Энэ модуль нь Холбоонуудын хувийн хэрэгийг үүсгэдэг."
 
 #. module: association
 #: field:profile.association.config.install_modules_wizard,progress:0
 msgid "Configuration Progress"
-msgstr ""
+msgstr "Тохиргооны явц"
 
 #. module: association
 #: view:profile.association.config.install_modules_wizard:0
@@ -48,21 +48,23 @@ msgid ""
 "Here are specific applications related to the Association Profile you "
 "selected."
 msgstr ""
+"Энд таны сонгосон Холбооны хувийн хэрэгт холбогдох тусгайлсан хэрэглээний "
+"програмууд байна"
 
 #. module: association
 #: view:profile.association.config.install_modules_wizard:0
 msgid "title"
-msgstr ""
+msgstr "гарчиг"
 
 #. module: association
 #: help:profile.association.config.install_modules_wizard,event_project:0
 msgid "Helps you to manage and organize your events."
-msgstr ""
+msgstr "Үйл явдлаа зохион байгуулж менеж хийхэд тусладаг."
 
 #. module: association
 #: field:profile.association.config.install_modules_wizard,config_logo:0
 msgid "Image"
-msgstr ""
+msgstr "Зураг"
 
 #. module: association
 #: help:profile.association.config.install_modules_wizard,hr_expense:0
@@ -70,6 +72,8 @@ msgid ""
 "Tracks and manages employee expenses, and can automatically re-invoice "
 "clients if the expenses are project-related."
 msgstr ""
+"Зардал нь төсөлтэй холбоотой бол ажилтны зардалыг зохицуулах, хянаж "
+"үйлчлүүлэгчид автоматаар мэдэгдэх боломжтой"
 
 #. module: association
 #: help:profile.association.config.install_modules_wizard,project_gtd:0
@@ -77,6 +81,9 @@ msgid ""
 "GTD is a methodology to efficiently organise yourself and your tasks. This "
 "module fully integrates GTD principle with OpenERP's project management."
 msgstr ""
+"Ажлыг Амжуулах-АА гэдэг нь өөрийгөө болон өөрийн ажлуудаа зохистой менеж "
+"хийх аргачлал юм. Энэ модуль нь OpenERP-н төслийн менежментийн АА зарчимтэй "
+"бүрэн нийцтэй."
 
 #. module: association
 #: view:profile.association.config.install_modules_wizard:0
@@ -86,7 +93,7 @@ msgstr "Нөөцийн менежмент"
 #. module: association
 #: model:ir.module.module,shortdesc:association.module_meta_information
 msgid "Association profile"
-msgstr ""
+msgstr "Холбооны хувийн хэрэг"
 
 #. module: association
 #: field:profile.association.config.install_modules_wizard,hr_expense:0
@@ -97,7 +104,7 @@ msgstr "Зарпал хянах"
 #: model:ir.actions.act_window,name:association.action_config_install_module
 #: view:profile.association.config.install_modules_wizard:0
 msgid "Association Application Configuration"
-msgstr ""
+msgstr "Холбооны хэрэглээний програмын тохиргоо"
 
 #. module: association
 #: help:profile.association.config.install_modules_wizard,wiki:0
@@ -105,6 +112,8 @@ msgid ""
 "Lets you create wiki pages and page groups in order to keep track of "
 "business knowledge and share it with and  between your employees."
 msgstr ""
+"Бусадтай бизнесийн мэдлэгээ хуваалцах, суралцахад зориулан вики хуудас "
+"үүсгэх боломж олгоно."
 
 #. module: association
 #: help:profile.association.config.install_modules_wizard,project:0
@@ -112,24 +121,26 @@ msgid ""
 "Helps you manage your projects and tasks by tracking them, generating "
 "plannings, etc..."
 msgstr ""
+"Даалгаврыг хөтлөх, төлөвлөх зэрэг боломжийн тусламжтайгаар төсөл болон "
+"даалгаврыг менеж хийхэд тусладаг"
 
 #. module: association
 #: model:ir.model,name:association.model_profile_association_config_install_modules_wizard
 msgid "profile.association.config.install_modules_wizard"
-msgstr ""
+msgstr "profile.association.config.install_modules_wizard"
 
 #. module: association
 #: field:profile.association.config.install_modules_wizard,event_project:0
 msgid "Events"
-msgstr ""
+msgstr "Үйл явдлууд"
 
 #. module: association
 #: view:profile.association.config.install_modules_wizard:0
 #: field:profile.association.config.install_modules_wizard,project:0
 msgid "Project Management"
-msgstr ""
+msgstr "Төслийн менежмент"
 
 #. module: association
 #: view:profile.association.config.install_modules_wizard:0
 msgid "Configure"
-msgstr ""
+msgstr "Тохиргоо"
diff --git a/addons/association/i18n/nb.po b/addons/association/i18n/nb.po
new file mode 100644
index 00000000000..7314a14d9ed
--- /dev/null
+++ b/addons/association/i18n/nb.po
@@ -0,0 +1,144 @@
+# Norwegian Bokmal 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: 2011-01-11 11:14+0000\n"
+"PO-Revision-Date: 2012-08-28 11:22+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Norwegian Bokmal <nb@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-08-29 05:05+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
+
+#. module: association
+#: field:profile.association.config.install_modules_wizard,wiki:0
+msgid "Wiki"
+msgstr "Wiki"
+
+#. module: association
+#: view:profile.association.config.install_modules_wizard:0
+msgid "Event Management"
+msgstr "Arrangementsledelse"
+
+#. module: association
+#: field:profile.association.config.install_modules_wizard,project_gtd:0
+msgid "Getting Things Done"
+msgstr "Å få ting gjort"
+
+#. module: association
+#: model:ir.module.module,description:association.module_meta_information
+msgid "This module is to create Profile for Associates"
+msgstr "Denne modulen er å skape profil for Tilknyttede."
+
+#. module: association
+#: field:profile.association.config.install_modules_wizard,progress:0
+msgid "Configuration Progress"
+msgstr "Konfigurasjonsprosess"
+
+#. module: association
+#: view:profile.association.config.install_modules_wizard:0
+msgid ""
+"Here are specific applications related to the Association Profile you "
+"selected."
+msgstr ""
+"Her er spesifikke programmer knyttet til foreningen profil du har valgt."
+
+#. module: association
+#: view:profile.association.config.install_modules_wizard:0
+msgid "title"
+msgstr "tittel"
+
+#. module: association
+#: help:profile.association.config.install_modules_wizard,event_project:0
+msgid "Helps you to manage and organize your events."
+msgstr "Hjelper deg å administrere og organisere hendelser."
+
+#. module: association
+#: field:profile.association.config.install_modules_wizard,config_logo:0
+msgid "Image"
+msgstr "Bilde"
+
+#. module: association
+#: help:profile.association.config.install_modules_wizard,hr_expense:0
+msgid ""
+"Tracks and manages employee expenses, and can automatically re-invoice "
+"clients if the expenses are project-related."
+msgstr ""
+"Spor og styrer ansattes utgifter, og kan automatisk re-faktura klienter "
+"dersom utgiftene prosjekt-relatert."
+
+#. module: association
+#: help:profile.association.config.install_modules_wizard,project_gtd:0
+msgid ""
+"GTD is a methodology to efficiently organise yourself and your tasks. This "
+"module fully integrates GTD principle with OpenERP's project management."
+msgstr ""
+"GTD er en metode for å effektivt organisere deg selv og dine oppgaver. Denne "
+"modulen integrerer fullt GTD prinsippet med OpenERP prosjektledelse."
+
+#. module: association
+#: view:profile.association.config.install_modules_wizard:0
+msgid "Resources Management"
+msgstr "Ressurser ledelse"
+
+#. module: association
+#: model:ir.module.module,shortdesc:association.module_meta_information
+msgid "Association profile"
+msgstr "Tilknytning profilen"
+
+#. module: association
+#: field:profile.association.config.install_modules_wizard,hr_expense:0
+msgid "Expenses Tracking"
+msgstr "Utgift Sporing"
+
+#. module: association
+#: model:ir.actions.act_window,name:association.action_config_install_module
+#: view:profile.association.config.install_modules_wizard:0
+msgid "Association Application Configuration"
+msgstr "Tilknytning applikasjon konfigurasjon"
+
+#. module: association
+#: help:profile.association.config.install_modules_wizard,wiki:0
+msgid ""
+"Lets you create wiki pages and page groups in order to keep track of "
+"business knowledge and share it with and  between your employees."
+msgstr ""
+"Lar deg opprette wikisider og sidegrupper for å holde oversikt over "
+"virksomheten kunnskap og dele den med og mellom de ansatte."
+
+#. module: association
+#: help:profile.association.config.install_modules_wizard,project:0
+msgid ""
+"Helps you manage your projects and tasks by tracking them, generating "
+"plannings, etc..."
+msgstr ""
+"Hjelper deg med å håndtere dine prosjekter og oppgaver ved å spore dem, "
+"generere planer, osv..."
+
+#. module: association
+#: model:ir.model,name:association.model_profile_association_config_install_modules_wizard
+msgid "profile.association.config.install_modules_wizard"
+msgstr "Profil.foreningen.konfigurasjon.installere_moduler_veiviseren"
+
+#. module: association
+#: field:profile.association.config.install_modules_wizard,event_project:0
+msgid "Events"
+msgstr "Arrangementer"
+
+#. module: association
+#: view:profile.association.config.install_modules_wizard:0
+#: field:profile.association.config.install_modules_wizard,project:0
+msgid "Project Management"
+msgstr "Prosjektledelse"
+
+#. module: association
+#: view:profile.association.config.install_modules_wizard:0
+msgid "Configure"
+msgstr "Konfigurer"
diff --git a/addons/association/i18n/nl.po b/addons/association/i18n/nl.po
index 9aa7df5a808..13f057ccced 100644
--- a/addons/association/i18n/nl.po
+++ b/addons/association/i18n/nl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: association
 #: field:profile.association.config.install_modules_wizard,wiki:0
diff --git a/addons/association/i18n/pl.po b/addons/association/i18n/pl.po
index 5a11cda73b5..f37f396dec4 100644
--- a/addons/association/i18n/pl.po
+++ b/addons/association/i18n/pl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: association
 #: field:profile.association.config.install_modules_wizard,wiki:0
diff --git a/addons/association/i18n/pt.po b/addons/association/i18n/pt.po
index 28d21cab5b6..02293ee00c6 100644
--- a/addons/association/i18n/pt.po
+++ b/addons/association/i18n/pt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: association
 #: field:profile.association.config.install_modules_wizard,wiki:0
diff --git a/addons/association/i18n/pt_BR.po b/addons/association/i18n/pt_BR.po
index 3b0e63621fc..242363faff9 100644
--- a/addons/association/i18n/pt_BR.po
+++ b/addons/association/i18n/pt_BR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: association
 #: field:profile.association.config.install_modules_wizard,wiki:0
diff --git a/addons/association/i18n/ro.po b/addons/association/i18n/ro.po
index 3b3a060fcca..cb00986a393 100644
--- a/addons/association/i18n/ro.po
+++ b/addons/association/i18n/ro.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: association
 #: field:profile.association.config.install_modules_wizard,wiki:0
diff --git a/addons/association/i18n/ru.po b/addons/association/i18n/ru.po
index 49c43c618a6..c7cf49eb30e 100644
--- a/addons/association/i18n/ru.po
+++ b/addons/association/i18n/ru.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: association
 #: field:profile.association.config.install_modules_wizard,wiki:0
diff --git a/addons/association/i18n/sl.po b/addons/association/i18n/sl.po
index 8a498a3f53b..c54bce0c29c 100644
--- a/addons/association/i18n/sl.po
+++ b/addons/association/i18n/sl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: association
 #: field:profile.association.config.install_modules_wizard,wiki:0
diff --git a/addons/association/i18n/sq.po b/addons/association/i18n/sq.po
index d68d232b30c..84a88f6a5a0 100644
--- a/addons/association/i18n/sq.po
+++ b/addons/association/i18n/sq.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: association
 #: field:profile.association.config.install_modules_wizard,wiki:0
diff --git a/addons/association/i18n/sr.po b/addons/association/i18n/sr.po
index 27d3633f45e..21c22031253 100644
--- a/addons/association/i18n/sr.po
+++ b/addons/association/i18n/sr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: association
 #: field:profile.association.config.install_modules_wizard,wiki:0
diff --git a/addons/association/i18n/sr@latin.po b/addons/association/i18n/sr@latin.po
index 1b1dc5d30e9..abc9fe68080 100644
--- a/addons/association/i18n/sr@latin.po
+++ b/addons/association/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: association
 #: field:profile.association.config.install_modules_wizard,wiki:0
diff --git a/addons/association/i18n/sv.po b/addons/association/i18n/sv.po
index fab82541ccc..ef899fd3a6a 100644
--- a/addons/association/i18n/sv.po
+++ b/addons/association/i18n/sv.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: association
 #: field:profile.association.config.install_modules_wizard,wiki:0
diff --git a/addons/association/i18n/tlh.po b/addons/association/i18n/tlh.po
index 1043aaf470b..7c0ffedc8b0 100644
--- a/addons/association/i18n/tlh.po
+++ b/addons/association/i18n/tlh.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: association
 #: field:profile.association.config.install_modules_wizard,wiki:0
diff --git a/addons/association/i18n/tr.po b/addons/association/i18n/tr.po
index 43723dd02e9..40fcaac9893 100644
--- a/addons/association/i18n/tr.po
+++ b/addons/association/i18n/tr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: association
 #: field:profile.association.config.install_modules_wizard,wiki:0
diff --git a/addons/association/i18n/uk.po b/addons/association/i18n/uk.po
index d1b94c925f3..a9992eab04a 100644
--- a/addons/association/i18n/uk.po
+++ b/addons/association/i18n/uk.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: association
 #: field:profile.association.config.install_modules_wizard,wiki:0
diff --git a/addons/association/i18n/vi.po b/addons/association/i18n/vi.po
index f7f2e2fefc7..01c49671bfc 100644
--- a/addons/association/i18n/vi.po
+++ b/addons/association/i18n/vi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: association
 #: field:profile.association.config.install_modules_wizard,wiki:0
diff --git a/addons/association/i18n/zh_CN.po b/addons/association/i18n/zh_CN.po
index 571eb74bc80..11ce7fe1bd8 100644
--- a/addons/association/i18n/zh_CN.po
+++ b/addons/association/i18n/zh_CN.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: association
 #: field:profile.association.config.install_modules_wizard,wiki:0
diff --git a/addons/association/i18n/zh_TW.po b/addons/association/i18n/zh_TW.po
index 67fc6de2ce5..164f456dbee 100644
--- a/addons/association/i18n/zh_TW.po
+++ b/addons/association/i18n/zh_TW.po
@@ -7,128 +7,128 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2010-11-12 11:39+0000\n"
-"Last-Translator: <>\n"
+"PO-Revision-Date: 2012-08-28 05:27+0000\n"
+"Last-Translator: Eric Huang <eh@cenoq.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-29 05:05+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: association
 #: field:profile.association.config.install_modules_wizard,wiki:0
 msgid "Wiki"
-msgstr ""
+msgstr "維基 (Wiki)"
 
 #. module: association
 #: view:profile.association.config.install_modules_wizard:0
 msgid "Event Management"
-msgstr ""
+msgstr "事件管理"
 
 #. module: association
 #: field:profile.association.config.install_modules_wizard,project_gtd:0
 msgid "Getting Things Done"
-msgstr ""
+msgstr "Getting Things Done"
 
 #. module: association
 #: model:ir.module.module,description:association.module_meta_information
 msgid "This module is to create Profile for Associates"
-msgstr ""
+msgstr "此模組設置商會管理的功能"
 
 #. module: association
 #: field:profile.association.config.install_modules_wizard,progress:0
 msgid "Configuration Progress"
-msgstr ""
+msgstr "設置進度"
 
 #. module: association
 #: view:profile.association.config.install_modules_wizard:0
 msgid ""
 "Here are specific applications related to the Association Profile you "
 "selected."
-msgstr ""
+msgstr "這裡有與跟商會管理相關的功能"
 
 #. module: association
 #: view:profile.association.config.install_modules_wizard:0
 msgid "title"
-msgstr ""
+msgstr "標題"
 
 #. module: association
 #: help:profile.association.config.install_modules_wizard,event_project:0
 msgid "Helps you to manage and organize your events."
-msgstr ""
+msgstr "幫您管理和組織事件"
 
 #. module: association
 #: field:profile.association.config.install_modules_wizard,config_logo:0
 msgid "Image"
-msgstr ""
+msgstr "圖像"
 
 #. module: association
 #: help:profile.association.config.install_modules_wizard,hr_expense:0
 msgid ""
 "Tracks and manages employee expenses, and can automatically re-invoice "
 "clients if the expenses are project-related."
-msgstr ""
+msgstr "追蹤和管理員工費用，如果此費用和專案相關則可以自動向客戶開發票"
 
 #. module: association
 #: help:profile.association.config.install_modules_wizard,project_gtd:0
 msgid ""
 "GTD is a methodology to efficiently organise yourself and your tasks. This "
 "module fully integrates GTD principle with OpenERP's project management."
-msgstr ""
+msgstr "GTD是一種高效統籌個人的時間和任務的方法。這個模組把GTD方法和OpenERP的專案管理結合在了一起"
 
 #. module: association
 #: view:profile.association.config.install_modules_wizard:0
 msgid "Resources Management"
-msgstr ""
+msgstr "資源管理"
 
 #. module: association
 #: model:ir.module.module,shortdesc:association.module_meta_information
 msgid "Association profile"
-msgstr ""
+msgstr "商會管理"
 
 #. module: association
 #: field:profile.association.config.install_modules_wizard,hr_expense:0
 msgid "Expenses Tracking"
-msgstr ""
+msgstr "費用追蹤"
 
 #. module: association
 #: model:ir.actions.act_window,name:association.action_config_install_module
 #: view:profile.association.config.install_modules_wizard:0
 msgid "Association Application Configuration"
-msgstr ""
+msgstr "商會模組設置"
 
 #. module: association
 #: help:profile.association.config.install_modules_wizard,wiki:0
 msgid ""
 "Lets you create wiki pages and page groups in order to keep track of "
 "business knowledge and share it with and  between your employees."
-msgstr ""
+msgstr "讓您能夠創建維基(wiki)頁面和頁面組來追蹤業務知識並與您的員工們分享。"
 
 #. module: association
 #: help:profile.association.config.install_modules_wizard,project:0
 msgid ""
 "Helps you manage your projects and tasks by tracking them, generating "
 "plannings, etc..."
-msgstr ""
+msgstr "幫助你管理專案，追蹤任務，生成計劃"
 
 #. module: association
 #: model:ir.model,name:association.model_profile_association_config_install_modules_wizard
 msgid "profile.association.config.install_modules_wizard"
-msgstr ""
+msgstr "profile.association.config.install_modules_wizard"
 
 #. module: association
 #: field:profile.association.config.install_modules_wizard,event_project:0
 msgid "Events"
-msgstr ""
+msgstr "事件"
 
 #. module: association
 #: view:profile.association.config.install_modules_wizard:0
 #: field:profile.association.config.install_modules_wizard,project:0
 msgid "Project Management"
-msgstr ""
+msgstr "專案管理"
 
 #. module: association
 #: view:profile.association.config.install_modules_wizard:0
 msgid "Configure"
-msgstr ""
+msgstr "設置"
diff --git a/addons/audittrail/__openerp__.py b/addons/audittrail/__openerp__.py
index 9ba403bcee3..3ba8c59a2f3 100644
--- a/addons/audittrail/__openerp__.py
+++ b/addons/audittrail/__openerp__.py
@@ -34,13 +34,12 @@ and can check logs.
     'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
     'depends': ['base'],
-    'init_xml': [],
-    'update_xml': [
+    'data': [
         'wizard/audittrail_view_log_view.xml',
         'audittrail_view.xml',
         'security/ir.model.access.csv',
     ],
-    'demo_xml': ['audittrail_demo.xml'],
+    'demo': ['audittrail_demo.xml'],
     'installable': True,
     'auto_install': False,
     'certificate': '0062572348749',
diff --git a/addons/audittrail/audittrail.py b/addons/audittrail/audittrail.py
index aee9fbd9305..3dff7c1cb00 100644
--- a/addons/audittrail/audittrail.py
+++ b/addons/audittrail/audittrail.py
@@ -25,6 +25,7 @@ from tools.translate import _
 import pooler
 import time
 import tools
+from openerp import SUPERUSER_ID
 
 class audittrail_rule(osv.osv):
     """
@@ -252,10 +253,10 @@ class audittrail_objects_proxy(object_proxy):
         pool = pooler.get_pool(cr.dbname)
         resource_pool = pool.get(model)
         model_pool = pool.get('ir.model')
-        model_ids = model_pool.search(cr, 1, [('model', '=', model)])
+        model_ids = model_pool.search(cr, SUPERUSER_ID, [('model', '=', model)])
         model_id = model_ids and model_ids[0] or False
         assert model_id, _("'%s' Model does not exist..." %(model))
-        model = model_pool.browse(cr, 1, model_id)
+        model = model_pool.browse(cr, SUPERUSER_ID, model_id)
 
         # fields to log. currently only used by log on read()
         field_list = []
@@ -322,7 +323,7 @@ class audittrail_objects_proxy(object_proxy):
         data = {}
         resource_pool = pool.get(model.model)
         # read all the fields of the given resources in super admin mode
-        for resource in resource_pool.read(cr, 1, res_ids):
+        for resource in resource_pool.read(cr, SUPERUSER_ID, res_ids):
             values = {}
             values_text = {}
             resource_id = resource['id']
@@ -332,19 +333,19 @@ class audittrail_objects_proxy(object_proxy):
                     continue
                 values[field] = resource[field]
                 # get the textual value of that field for this record
-                values_text[field] = self.get_value_text(cr, 1, pool, resource_pool, method, field, resource[field])
+                values_text[field] = self.get_value_text(cr, SUPERUSER_ID, pool, resource_pool, method, field, resource[field])
 
                 field_obj = resource_pool._all_columns.get(field).column
                 if field_obj._type in ('one2many','many2many'):
                     # check if an audittrail rule apply in super admin mode
-                    if self.check_rules(cr, 1, field_obj._obj, method):
+                    if self.check_rules(cr, SUPERUSER_ID, field_obj._obj, method):
                         # check if the model associated to a *2m field exists, in super admin mode
-                        x2m_model_ids = pool.get('ir.model').search(cr, 1, [('model', '=', field_obj._obj)])
+                        x2m_model_ids = pool.get('ir.model').search(cr, SUPERUSER_ID, [('model', '=', field_obj._obj)])
                         x2m_model_id = x2m_model_ids and x2m_model_ids[0] or False
                         assert x2m_model_id, _("'%s' Model does not exist..." %(field_obj._obj))
-                        x2m_model = pool.get('ir.model').browse(cr, 1, x2m_model_id)
+                        x2m_model = pool.get('ir.model').browse(cr, SUPERUSER_ID, x2m_model_id)
                         #recursive call on x2m fields that need to be checked too
-                        data.update(self.get_data(cr, 1, pool, resource[field], x2m_model, method))
+                        data.update(self.get_data(cr, SUPERUSER_ID, pool, resource[field], x2m_model, method))
             data[(model.id, resource_id)] = {'text':values_text, 'value': values}
         return data
 
@@ -389,12 +390,12 @@ class audittrail_objects_proxy(object_proxy):
             field_obj = field_definition.column
             if field_obj._type in ('one2many','many2many'):
                 # checking if an audittrail rule apply in super admin mode
-                if self.check_rules(cr, 1, field_obj._obj, method):
+                if self.check_rules(cr, SUPERUSER_ID, field_obj._obj, method):
                     # checking if the model associated to a *2m field exists, in super admin mode
-                    x2m_model_ids = pool.get('ir.model').search(cr, 1, [('model', '=', field_obj._obj)])
+                    x2m_model_ids = pool.get('ir.model').search(cr, SUPERUSER_ID, [('model', '=', field_obj._obj)])
                     x2m_model_id = x2m_model_ids and x2m_model_ids[0] or False
                     assert x2m_model_id, _("'%s' Model does not exist..." %(field_obj._obj))
-                    x2m_model = pool.get('ir.model').browse(cr, 1, x2m_model_id)
+                    x2m_model = pool.get('ir.model').browse(cr, SUPERUSER_ID, x2m_model_id)
                     # the resource_ids that need to be checked are the sum of both old and previous values (because we
                     # need to log also creation or deletion in those lists).
                     x2m_old_values_ids = old_values.get(key, {'value': {}})['value'].get(field_name, [])
@@ -402,7 +403,7 @@ class audittrail_objects_proxy(object_proxy):
                     # We use list(set(...)) to remove duplicates.
                     res_ids = list(set(x2m_old_values_ids + x2m_new_values_ids))
                     for res_id in res_ids:
-                        lines.update(self.prepare_audittrail_log_line(cr, 1, pool, x2m_model, res_id, method, old_values, new_values, field_list))
+                        lines.update(self.prepare_audittrail_log_line(cr, SUPERUSER_ID, pool, x2m_model, res_id, method, old_values, new_values, field_list))
             # if the value value is different than the old value: record the change
             if key not in old_values or key not in new_values or old_values[key]['value'][field_name] != new_values[key]['value'][field_name]:
                 data = {
@@ -459,9 +460,9 @@ class audittrail_objects_proxy(object_proxy):
                     vals.update({'method': 'unlink'})
                 # create the audittrail log in super admin mode, only if a change has been detected
                 if lines[(model_id, resource_id)]:
-                    log_id = pool.get('audittrail.log').create(cr, 1, vals)
+                    log_id = pool.get('audittrail.log').create(cr, SUPERUSER_ID, vals)
                     model = pool.get('ir.model').browse(cr, uid, model_id)
-                    self.create_log_line(cr, 1, log_id, model, lines[(model_id, resource_id)])
+                    self.create_log_line(cr, SUPERUSER_ID, log_id, model, lines[(model_id, resource_id)])
         return True
 
     def check_rules(self, cr, uid, model, method):
@@ -475,11 +476,11 @@ class audittrail_objects_proxy(object_proxy):
         """
         pool = pooler.get_pool(cr.dbname)
         if 'audittrail.rule' in pool.models:
-            model_ids = pool.get('ir.model').search(cr, 1, [('model', '=', model)])
+            model_ids = pool.get('ir.model').search(cr, SUPERUSER_ID, [('model', '=', model)])
             model_id = model_ids and model_ids[0] or False
             if model_id:
-                rule_ids = pool.get('audittrail.rule').search(cr, 1, [('object_id', '=', model_id), ('state', '=', 'subscribed')])
-                for rule in pool.get('audittrail.rule').read(cr, 1, rule_ids, ['user_id','log_read','log_write','log_create','log_unlink','log_action','log_workflow']):
+                rule_ids = pool.get('audittrail.rule').search(cr, SUPERUSER_ID, [('object_id', '=', model_id), ('state', '=', 'subscribed')])
+                for rule in pool.get('audittrail.rule').read(cr, SUPERUSER_ID, rule_ids, ['user_id','log_read','log_write','log_create','log_unlink','log_action','log_workflow']):
                     if len(rule['user_id']) == 0 or uid in rule['user_id']:
                         if rule.get('log_'+method,0):
                             return True
diff --git a/addons/audittrail/i18n/ar.po b/addons/audittrail/i18n/ar.po
index 1c29a935ce3..2b08714ed63 100644
--- a/addons/audittrail/i18n/ar.po
+++ b/addons/audittrail/i18n/ar.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:25+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: audittrail
 #: code:addons/audittrail/audittrail.py:75
diff --git a/addons/audittrail/i18n/bg.po b/addons/audittrail/i18n/bg.po
index ac347f4d327..3f11decefc3 100644
--- a/addons/audittrail/i18n/bg.po
+++ b/addons/audittrail/i18n/bg.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:25+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: audittrail
 #: code:addons/audittrail/audittrail.py:75
diff --git a/addons/audittrail/i18n/bs.po b/addons/audittrail/i18n/bs.po
index e6b244c76ff..c1a8bceaa3a 100644
--- a/addons/audittrail/i18n/bs.po
+++ b/addons/audittrail/i18n/bs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:25+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: audittrail
 #: code:addons/audittrail/audittrail.py:75
diff --git a/addons/audittrail/i18n/ca.po b/addons/audittrail/i18n/ca.po
index c29d0e9dac8..ce30b3b2356 100644
--- a/addons/audittrail/i18n/ca.po
+++ b/addons/audittrail/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:25+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: audittrail
 #: code:addons/audittrail/audittrail.py:75
diff --git a/addons/audittrail/i18n/cs.po b/addons/audittrail/i18n/cs.po
index 828bf4558b9..db95039fad9 100644
--- a/addons/audittrail/i18n/cs.po
+++ b/addons/audittrail/i18n/cs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:25+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 "X-Poedit-Language: Czech\n"
 
 #. module: audittrail
diff --git a/addons/audittrail/i18n/da.po b/addons/audittrail/i18n/da.po
index 4ff3c27e0a7..acb43d48566 100644
--- a/addons/audittrail/i18n/da.po
+++ b/addons/audittrail/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:25+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: audittrail
 #: code:addons/audittrail/audittrail.py:75
diff --git a/addons/audittrail/i18n/de.po b/addons/audittrail/i18n/de.po
index 50c80e97758..1f27e0a7878 100644
--- a/addons/audittrail/i18n/de.po
+++ b/addons/audittrail/i18n/de.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:25+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: audittrail
 #: code:addons/audittrail/audittrail.py:75
diff --git a/addons/audittrail/i18n/el.po b/addons/audittrail/i18n/el.po
index deb2e1dd569..be5306f8569 100644
--- a/addons/audittrail/i18n/el.po
+++ b/addons/audittrail/i18n/el.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:25+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: audittrail
 #: code:addons/audittrail/audittrail.py:75
diff --git a/addons/audittrail/i18n/es.po b/addons/audittrail/i18n/es.po
index 5441f71fbfc..ca161d85bd5 100644
--- a/addons/audittrail/i18n/es.po
+++ b/addons/audittrail/i18n/es.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:25+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: audittrail
 #: code:addons/audittrail/audittrail.py:75
diff --git a/addons/audittrail/i18n/es_AR.po b/addons/audittrail/i18n/es_AR.po
index e73c31d1964..0551dd0a794 100644
--- a/addons/audittrail/i18n/es_AR.po
+++ b/addons/audittrail/i18n/es_AR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:25+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: audittrail
 #: code:addons/audittrail/audittrail.py:75
diff --git a/addons/audittrail/i18n/es_CR.po b/addons/audittrail/i18n/es_CR.po
index d4cae3fee5c..adbce9dfd93 100644
--- a/addons/audittrail/i18n/es_CR.po
+++ b/addons/audittrail/i18n/es_CR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:25+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 "Language: \n"
 
 #. module: audittrail
diff --git a/addons/audittrail/i18n/es_EC.po b/addons/audittrail/i18n/es_EC.po
index 73d3d55eb91..c8542d652b7 100644
--- a/addons/audittrail/i18n/es_EC.po
+++ b/addons/audittrail/i18n/es_EC.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:25+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: audittrail
 #: code:addons/audittrail/audittrail.py:75
diff --git a/addons/audittrail/i18n/es_PY.po b/addons/audittrail/i18n/es_PY.po
index 6b4f377b52c..9b5a0e546a4 100644
--- a/addons/audittrail/i18n/es_PY.po
+++ b/addons/audittrail/i18n/es_PY.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:25+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: audittrail
 #: code:addons/audittrail/audittrail.py:75
diff --git a/addons/audittrail/i18n/et.po b/addons/audittrail/i18n/et.po
index 47da3f17e49..d7a67574a39 100644
--- a/addons/audittrail/i18n/et.po
+++ b/addons/audittrail/i18n/et.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:25+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: audittrail
 #: code:addons/audittrail/audittrail.py:75
diff --git a/addons/audittrail/i18n/fa.po b/addons/audittrail/i18n/fa.po
index 2daf322c788..870bf7834f1 100644
--- a/addons/audittrail/i18n/fa.po
+++ b/addons/audittrail/i18n/fa.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:25+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: audittrail
 #: code:addons/audittrail/audittrail.py:75
diff --git a/addons/audittrail/i18n/fi.po b/addons/audittrail/i18n/fi.po
index 5c7d85668d2..b8565bcfe08 100644
--- a/addons/audittrail/i18n/fi.po
+++ b/addons/audittrail/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:25+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: audittrail
 #: code:addons/audittrail/audittrail.py:75
diff --git a/addons/audittrail/i18n/fr.po b/addons/audittrail/i18n/fr.po
index f6dc8f994df..cf23bf282b2 100644
--- a/addons/audittrail/i18n/fr.po
+++ b/addons/audittrail/i18n/fr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:25+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: audittrail
 #: code:addons/audittrail/audittrail.py:75
diff --git a/addons/audittrail/i18n/gl.po b/addons/audittrail/i18n/gl.po
index 0acbdb55a05..25033d6db58 100644
--- a/addons/audittrail/i18n/gl.po
+++ b/addons/audittrail/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:25+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: audittrail
 #: code:addons/audittrail/audittrail.py:75
diff --git a/addons/audittrail/i18n/gu.po b/addons/audittrail/i18n/gu.po
index f20d363b426..f9a2fcc11c3 100644
--- a/addons/audittrail/i18n/gu.po
+++ b/addons/audittrail/i18n/gu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:25+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: audittrail
 #: code:addons/audittrail/audittrail.py:75
diff --git a/addons/audittrail/i18n/hr.po b/addons/audittrail/i18n/hr.po
index 0e27f5afac0..1e7875af898 100644
--- a/addons/audittrail/i18n/hr.po
+++ b/addons/audittrail/i18n/hr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:25+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: audittrail
 #: code:addons/audittrail/audittrail.py:75
diff --git a/addons/audittrail/i18n/hu.po b/addons/audittrail/i18n/hu.po
index 66f09a44c1a..d96adbffe16 100644
--- a/addons/audittrail/i18n/hu.po
+++ b/addons/audittrail/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:25+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: audittrail
 #: code:addons/audittrail/audittrail.py:75
diff --git a/addons/audittrail/i18n/id.po b/addons/audittrail/i18n/id.po
index eb3b804cd4d..53cc40ecc5d 100644
--- a/addons/audittrail/i18n/id.po
+++ b/addons/audittrail/i18n/id.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:25+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: audittrail
 #: code:addons/audittrail/audittrail.py:75
diff --git a/addons/audittrail/i18n/it.po b/addons/audittrail/i18n/it.po
index 642b23c436e..c22e6427f01 100644
--- a/addons/audittrail/i18n/it.po
+++ b/addons/audittrail/i18n/it.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:25+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: audittrail
 #: code:addons/audittrail/audittrail.py:75
diff --git a/addons/audittrail/i18n/ja.po b/addons/audittrail/i18n/ja.po
index 61f1fb6bf22..c6af4d2f7e5 100644
--- a/addons/audittrail/i18n/ja.po
+++ b/addons/audittrail/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:25+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: audittrail
 #: code:addons/audittrail/audittrail.py:75
diff --git a/addons/audittrail/i18n/ko.po b/addons/audittrail/i18n/ko.po
index 057cbd33e9f..47bd343e3b4 100644
--- a/addons/audittrail/i18n/ko.po
+++ b/addons/audittrail/i18n/ko.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:25+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: audittrail
 #: code:addons/audittrail/audittrail.py:75
diff --git a/addons/audittrail/i18n/lt.po b/addons/audittrail/i18n/lt.po
index 532fe65610b..7b3fd422635 100644
--- a/addons/audittrail/i18n/lt.po
+++ b/addons/audittrail/i18n/lt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:25+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: audittrail
 #: code:addons/audittrail/audittrail.py:75
diff --git a/addons/audittrail/i18n/lv.po b/addons/audittrail/i18n/lv.po
index 61d6fd9aa3b..22a9c951f22 100644
--- a/addons/audittrail/i18n/lv.po
+++ b/addons/audittrail/i18n/lv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:25+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: audittrail
 #: code:addons/audittrail/audittrail.py:75
diff --git a/addons/audittrail/i18n/mn.po b/addons/audittrail/i18n/mn.po
index eb30f48e60f..b44749f99d4 100644
--- a/addons/audittrail/i18n/mn.po
+++ b/addons/audittrail/i18n/mn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:25+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: audittrail
 #: code:addons/audittrail/audittrail.py:75
diff --git a/addons/audittrail/i18n/nb.po b/addons/audittrail/i18n/nb.po
index 788c4cd57b8..7e301ff3851 100644
--- a/addons/audittrail/i18n/nb.po
+++ b/addons/audittrail/i18n/nb.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:25+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: audittrail
 #: code:addons/audittrail/audittrail.py:75
diff --git a/addons/audittrail/i18n/nl.po b/addons/audittrail/i18n/nl.po
index 553a9c5f171..ae0c1194ce8 100644
--- a/addons/audittrail/i18n/nl.po
+++ b/addons/audittrail/i18n/nl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:25+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: audittrail
 #: code:addons/audittrail/audittrail.py:75
diff --git a/addons/audittrail/i18n/nl_BE.po b/addons/audittrail/i18n/nl_BE.po
index ef6a93515b2..afae46796e9 100644
--- a/addons/audittrail/i18n/nl_BE.po
+++ b/addons/audittrail/i18n/nl_BE.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:25+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: audittrail
 #: code:addons/audittrail/audittrail.py:75
diff --git a/addons/audittrail/i18n/oc.po b/addons/audittrail/i18n/oc.po
index e9d5589d68c..47036c471e9 100644
--- a/addons/audittrail/i18n/oc.po
+++ b/addons/audittrail/i18n/oc.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:25+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: audittrail
 #: code:addons/audittrail/audittrail.py:75
diff --git a/addons/audittrail/i18n/pl.po b/addons/audittrail/i18n/pl.po
index 2dcf385505d..b36563f125d 100644
--- a/addons/audittrail/i18n/pl.po
+++ b/addons/audittrail/i18n/pl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:25+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: audittrail
 #: code:addons/audittrail/audittrail.py:75
diff --git a/addons/audittrail/i18n/pt.po b/addons/audittrail/i18n/pt.po
index b46a69860ea..659c29bbe8c 100644
--- a/addons/audittrail/i18n/pt.po
+++ b/addons/audittrail/i18n/pt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:25+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: audittrail
 #: code:addons/audittrail/audittrail.py:75
diff --git a/addons/audittrail/i18n/pt_BR.po b/addons/audittrail/i18n/pt_BR.po
index e30a3d0374e..0447953d62a 100644
--- a/addons/audittrail/i18n/pt_BR.po
+++ b/addons/audittrail/i18n/pt_BR.po
@@ -8,13 +8,14 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 00:36+0000\n"
 "PO-Revision-Date: 2012-07-28 16:36+0000\n"
-"Last-Translator: Fábio Martinelli <webmaster@guaru.net>\n"
+"Last-Translator: Fábio Martinelli - http://zupy.com.br "
+"<webmaster@guaru.net>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:25+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: audittrail
 #: code:addons/audittrail/audittrail.py:75
diff --git a/addons/audittrail/i18n/ro.po b/addons/audittrail/i18n/ro.po
index 587d60e604d..b5b186914f0 100644
--- a/addons/audittrail/i18n/ro.po
+++ b/addons/audittrail/i18n/ro.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:25+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: audittrail
 #: code:addons/audittrail/audittrail.py:75
diff --git a/addons/audittrail/i18n/ru.po b/addons/audittrail/i18n/ru.po
index 5f2a70a931f..80acf83de3d 100644
--- a/addons/audittrail/i18n/ru.po
+++ b/addons/audittrail/i18n/ru.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:25+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: audittrail
 #: code:addons/audittrail/audittrail.py:75
diff --git a/addons/audittrail/i18n/sl.po b/addons/audittrail/i18n/sl.po
index 1697b86b67a..e5edb35c161 100644
--- a/addons/audittrail/i18n/sl.po
+++ b/addons/audittrail/i18n/sl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:25+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: audittrail
 #: code:addons/audittrail/audittrail.py:75
diff --git a/addons/audittrail/i18n/sq.po b/addons/audittrail/i18n/sq.po
index 389810e086d..007cb54ef3c 100644
--- a/addons/audittrail/i18n/sq.po
+++ b/addons/audittrail/i18n/sq.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:25+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: audittrail
 #: code:addons/audittrail/audittrail.py:75
diff --git a/addons/audittrail/i18n/sr@latin.po b/addons/audittrail/i18n/sr@latin.po
index 00025ee70a0..3c4a4d73589 100644
--- a/addons/audittrail/i18n/sr@latin.po
+++ b/addons/audittrail/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:25+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: audittrail
 #: code:addons/audittrail/audittrail.py:75
diff --git a/addons/audittrail/i18n/sv.po b/addons/audittrail/i18n/sv.po
index e930766d88a..438651f1f64 100644
--- a/addons/audittrail/i18n/sv.po
+++ b/addons/audittrail/i18n/sv.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:25+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: audittrail
 #: code:addons/audittrail/audittrail.py:75
diff --git a/addons/audittrail/i18n/tlh.po b/addons/audittrail/i18n/tlh.po
index e1d4ce64416..9a5757932dc 100644
--- a/addons/audittrail/i18n/tlh.po
+++ b/addons/audittrail/i18n/tlh.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:25+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: audittrail
 #: code:addons/audittrail/audittrail.py:75
diff --git a/addons/audittrail/i18n/tr.po b/addons/audittrail/i18n/tr.po
index 1ff7598fd69..fbb69b1c147 100644
--- a/addons/audittrail/i18n/tr.po
+++ b/addons/audittrail/i18n/tr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:25+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: audittrail
 #: code:addons/audittrail/audittrail.py:75
diff --git a/addons/audittrail/i18n/uk.po b/addons/audittrail/i18n/uk.po
index b875122b1e7..7bb219c669a 100644
--- a/addons/audittrail/i18n/uk.po
+++ b/addons/audittrail/i18n/uk.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:25+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: audittrail
 #: code:addons/audittrail/audittrail.py:75
diff --git a/addons/audittrail/i18n/vi.po b/addons/audittrail/i18n/vi.po
index a568e124e37..cf027b5264b 100644
--- a/addons/audittrail/i18n/vi.po
+++ b/addons/audittrail/i18n/vi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:25+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: audittrail
 #: code:addons/audittrail/audittrail.py:75
diff --git a/addons/audittrail/i18n/zh_CN.po b/addons/audittrail/i18n/zh_CN.po
index 4ce63a2e7f4..eb310733c4f 100644
--- a/addons/audittrail/i18n/zh_CN.po
+++ b/addons/audittrail/i18n/zh_CN.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:25+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: audittrail
 #: code:addons/audittrail/audittrail.py:75
diff --git a/addons/audittrail/i18n/zh_TW.po b/addons/audittrail/i18n/zh_TW.po
index 2d7323fdeef..9da7a569f75 100644
--- a/addons/audittrail/i18n/zh_TW.po
+++ b/addons/audittrail/i18n/zh_TW.po
@@ -7,31 +7,31 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2009-01-23 17:17+0000\n"
-"Last-Translator: <>\n"
+"PO-Revision-Date: 2012-08-30 13:46+0000\n"
+"Last-Translator: Eric Huang <eh@cenoq.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-31 04:56+0000\n"
+"X-Generator: Launchpad (build 15887)\n"
 
 #. module: audittrail
 #: code:addons/audittrail/audittrail.py:75
 #, python-format
 msgid "WARNING: audittrail is not part of the pool"
-msgstr ""
+msgstr "警告：稽核追蹤不屬於此池"
 
 #. module: audittrail
 #: field:audittrail.log.line,log_id:0
 msgid "Log"
-msgstr ""
+msgstr "日誌"
 
 #. module: audittrail
 #: view:audittrail.rule:0
 #: selection:audittrail.rule,state:0
 msgid "Subscribed"
-msgstr ""
+msgstr "已訂閱"
 
 #. module: audittrail
 #: sql_constraint:audittrail.rule:0
@@ -39,330 +39,332 @@ msgid ""
 "There is already a rule defined on this object\n"
 " You cannot define another: please edit the existing one."
 msgstr ""
+"該對象已經定義了稽核規則。\n"
+"您不能再次定義，請直接編輯現有的稽核規則。"
 
 #. module: audittrail
 #: view:audittrail.rule:0
 msgid "Subscribed Rule"
-msgstr ""
+msgstr "已訂閱規則"
 
 #. module: audittrail
 #: model:ir.model,name:audittrail.model_audittrail_rule
 msgid "Audittrail Rule"
-msgstr ""
+msgstr "稽核追蹤規則"
 
 #. module: audittrail
 #: view:audittrail.view.log:0
 #: model:ir.actions.act_window,name:audittrail.action_audittrail_log_tree
 #: model:ir.ui.menu,name:audittrail.menu_action_audittrail_log_tree
 msgid "Audit Logs"
-msgstr ""
+msgstr "稽核日誌"
 
 #. module: audittrail
 #: view:audittrail.log:0
 #: view:audittrail.rule:0
 msgid "Group By..."
-msgstr ""
+msgstr "分類方式..."
 
 #. module: audittrail
 #: view:audittrail.rule:0
 #: field:audittrail.rule,state:0
 msgid "State"
-msgstr ""
+msgstr "狀態"
 
 #. module: audittrail
 #: view:audittrail.rule:0
 msgid "_Subscribe"
-msgstr ""
+msgstr "訂閱(_S)"
 
 #. module: audittrail
 #: view:audittrail.rule:0
 #: selection:audittrail.rule,state:0
 msgid "Draft"
-msgstr ""
+msgstr "草稿"
 
 #. module: audittrail
 #: field:audittrail.log.line,old_value:0
 msgid "Old Value"
-msgstr ""
+msgstr "舊值"
 
 #. module: audittrail
 #: model:ir.actions.act_window,name:audittrail.action_audittrail_view_log
 msgid "View log"
-msgstr ""
+msgstr "查看日誌"
 
 #. module: audittrail
 #: help:audittrail.rule,log_read:0
 msgid ""
 "Select this if you want to keep track of read/open on any record of the "
 "object of this rule"
-msgstr ""
+msgstr "如果你需要追蹤對該對象的任何記錄的讀和打開動作請選擇此項"
 
 #. module: audittrail
 #: field:audittrail.log,method:0
 msgid "Method"
-msgstr ""
+msgstr "方法"
 
 #. module: audittrail
 #: field:audittrail.view.log,from:0
 msgid "Log From"
-msgstr ""
+msgstr "日誌來源"
 
 #. module: audittrail
 #: field:audittrail.log.line,log:0
 msgid "Log ID"
-msgstr ""
+msgstr "日誌標識"
 
 #. module: audittrail
 #: field:audittrail.log,res_id:0
 msgid "Resource Id"
-msgstr ""
+msgstr "資源標識"
 
 #. module: audittrail
 #: help:audittrail.rule,user_id:0
 msgid "if  User is not added then it will applicable for all users"
-msgstr ""
+msgstr "如果未加入使用者則適用於所有使用者"
 
 #. module: audittrail
 #: help:audittrail.rule,log_workflow:0
 msgid ""
 "Select this if you want to keep track of workflow on any record of the "
 "object of this rule"
-msgstr ""
+msgstr "如果您需要追蹤該對象所有記錄的工作流程請選擇此項"
 
 #. module: audittrail
 #: field:audittrail.rule,user_id:0
 msgid "Users"
-msgstr ""
+msgstr "使用者"
 
 #. module: audittrail
 #: view:audittrail.log:0
 msgid "Log Lines"
-msgstr ""
+msgstr "日誌明細"
 
 #. module: audittrail
 #: view:audittrail.log:0
 #: field:audittrail.log,object_id:0
 #: field:audittrail.rule,object_id:0
 msgid "Object"
-msgstr ""
+msgstr "對象"
 
 #. module: audittrail
 #: view:audittrail.rule:0
 msgid "AuditTrail Rule"
-msgstr ""
+msgstr "稽核追蹤規則"
 
 #. module: audittrail
 #: field:audittrail.view.log,to:0
 msgid "Log To"
-msgstr ""
+msgstr "記錄到"
 
 #. module: audittrail
 #: view:audittrail.log:0
 msgid "New Value Text: "
-msgstr ""
+msgstr "新值內容： "
 
 #. module: audittrail
 #: view:audittrail.rule:0
 msgid "Search Audittrail Rule"
-msgstr ""
+msgstr "搜索稽核追蹤規則"
 
 #. module: audittrail
 #: model:ir.actions.act_window,name:audittrail.action_audittrail_rule_tree
 #: model:ir.ui.menu,name:audittrail.menu_action_audittrail_rule_tree
 msgid "Audit Rules"
-msgstr ""
+msgstr "稽核規則"
 
 #. module: audittrail
 #: view:audittrail.log:0
 msgid "Old Value : "
-msgstr ""
+msgstr "舊值： "
 
 #. module: audittrail
 #: field:audittrail.log,name:0
 msgid "Resource Name"
-msgstr ""
+msgstr "資源名稱"
 
 #. module: audittrail
 #: view:audittrail.log:0
 #: field:audittrail.log,timestamp:0
 msgid "Date"
-msgstr ""
+msgstr "日期"
 
 #. module: audittrail
 #: help:audittrail.rule,log_write:0
 msgid ""
 "Select this if you want to keep track of modification on any record of the "
 "object of this rule"
-msgstr ""
+msgstr "如果您要追蹤此對象所有記錄的變更請選擇此項。"
 
 #. module: audittrail
 #: field:audittrail.rule,log_create:0
 msgid "Log Creates"
-msgstr ""
+msgstr "建立日誌"
 
 #. module: audittrail
 #: help:audittrail.rule,object_id:0
 msgid "Select object for which you want to generate log."
-msgstr ""
+msgstr "選擇您要生成稽核日誌的對象"
 
 #. module: audittrail
 #: view:audittrail.log:0
 msgid "Old Value Text : "
-msgstr ""
+msgstr "舊值內容： "
 
 #. module: audittrail
 #: field:audittrail.rule,log_workflow:0
 msgid "Log Workflow"
-msgstr ""
+msgstr "記錄工作流"
 
 #. module: audittrail
 #: field:audittrail.rule,log_read:0
 msgid "Log Reads"
-msgstr ""
+msgstr "記錄讀操作"
 
 #. module: audittrail
 #: code:addons/audittrail/audittrail.py:76
 #, python-format
 msgid "Change audittrail depends -- Setting rule as DRAFT"
-msgstr ""
+msgstr "修改檢查稽核依賴 - 設定規則為草稿"
 
 #. module: audittrail
 #: field:audittrail.log,line_ids:0
 msgid "Log lines"
-msgstr ""
+msgstr "日誌明細"
 
 #. module: audittrail
 #: field:audittrail.log.line,field_id:0
 msgid "Fields"
-msgstr ""
+msgstr "欄位列表"
 
 #. module: audittrail
 #: view:audittrail.rule:0
 msgid "AuditTrail Rules"
-msgstr ""
+msgstr "稽核追蹤規則"
 
 #. module: audittrail
 #: help:audittrail.rule,log_unlink:0
 msgid ""
 "Select this if you want to keep track of deletion on any record of the "
 "object of this rule"
-msgstr ""
+msgstr "如果你要追蹤所有刪除這個對象記錄的操作請選擇此項"
 
 #. module: audittrail
 #: view:audittrail.log:0
 #: field:audittrail.log,user_id:0
 msgid "User"
-msgstr ""
+msgstr "使用者"
 
 #. module: audittrail
 #: field:audittrail.rule,action_id:0
 msgid "Action ID"
-msgstr ""
+msgstr "動作ID"
 
 #. module: audittrail
 #: view:audittrail.rule:0
 msgid "Users (if User is not added then it will applicable for all users)"
-msgstr ""
+msgstr "使用者（如果沒有選擇使用者則適用於所有使用者）"
 
 #. module: audittrail
 #: view:audittrail.rule:0
 msgid "UnSubscribe"
-msgstr ""
+msgstr "取消訂閱"
 
 #. module: audittrail
 #: field:audittrail.rule,log_unlink:0
 msgid "Log Deletes"
-msgstr ""
+msgstr "記錄刪除操作"
 
 #. module: audittrail
 #: field:audittrail.log.line,field_description:0
 msgid "Field Description"
-msgstr ""
+msgstr "欄位說明"
 
 #. module: audittrail
 #: view:audittrail.log:0
 msgid "Search Audittrail Log"
-msgstr ""
+msgstr "搜尋稽核追蹤日誌"
 
 #. module: audittrail
 #: field:audittrail.rule,log_write:0
 msgid "Log Writes"
-msgstr ""
+msgstr "記錄修改操作"
 
 #. module: audittrail
 #: view:audittrail.view.log:0
 msgid "Open Logs"
-msgstr ""
+msgstr "打開日誌"
 
 #. module: audittrail
 #: field:audittrail.log.line,new_value_text:0
 msgid "New value Text"
-msgstr ""
+msgstr "新值內容"
 
 #. module: audittrail
 #: field:audittrail.rule,name:0
 msgid "Rule Name"
-msgstr ""
+msgstr "規則名稱"
 
 #. module: audittrail
 #: field:audittrail.log.line,new_value:0
 msgid "New Value"
-msgstr ""
+msgstr "新值"
 
 #. module: audittrail
 #: view:audittrail.log:0
 msgid "AuditTrail Logs"
-msgstr ""
+msgstr "稽核追蹤日誌"
 
 #. module: audittrail
 #: view:audittrail.rule:0
 msgid "Draft  Rule"
-msgstr ""
+msgstr "草稿規則"
 
 #. module: audittrail
 #: model:ir.model,name:audittrail.model_audittrail_log
 msgid "Audittrail Log"
-msgstr ""
+msgstr "稽核追蹤日誌"
 
 #. module: audittrail
 #: help:audittrail.rule,log_action:0
 msgid ""
 "Select this if you want to keep track of actions on the object of this rule"
-msgstr ""
+msgstr "如果你要追蹤這個對象所有記錄執行的操作請選擇此項"
 
 #. module: audittrail
 #: view:audittrail.log:0
 msgid "New Value : "
-msgstr ""
+msgstr "新值: "
 
 #. module: audittrail
 #: field:audittrail.log.line,old_value_text:0
 msgid "Old value Text"
-msgstr ""
+msgstr "舊值內容"
 
 #. module: audittrail
 #: view:audittrail.view.log:0
 msgid "Cancel"
-msgstr ""
+msgstr "取消"
 
 #. module: audittrail
 #: model:ir.model,name:audittrail.model_audittrail_view_log
 msgid "View Log"
-msgstr ""
+msgstr "查看日誌"
 
 #. module: audittrail
 #: model:ir.model,name:audittrail.model_audittrail_log_line
 msgid "Log Line"
-msgstr ""
+msgstr "日誌明細"
 
 #. module: audittrail
 #: field:audittrail.rule,log_action:0
 msgid "Log Action"
-msgstr ""
+msgstr "記錄動作"
 
 #. module: audittrail
 #: help:audittrail.rule,log_create:0
 msgid ""
 "Select this if you want to keep track of creation on any record of the "
 "object of this rule"
-msgstr ""
+msgstr "如果你想追蹤此對象所有記錄的建立請選擇此項"
diff --git a/addons/auth_anonymous/__openerp__.py b/addons/auth_anonymous/__openerp__.py
index 95d98e65fea..1246850fe04 100644
--- a/addons/auth_anonymous/__openerp__.py
+++ b/addons/auth_anonymous/__openerp__.py
@@ -1,19 +1,16 @@
 {
- 'name': 'Anonymous',
- 'description': 'Allow anonymous access to OpenERP.',
- 'author': 'OpenERP SA',
- 'version': '1.0',
- 'category': 'Authentication',
- 'website': 'http://www.openerp.com',
- 'installable': True,
- 'depends': ['web'],
- 'data': [
-    'auth_anonymous.xml',
- ],
- 'js': [
-    'static/src/js/auth_anonymous.js',
- ],
- 'qweb': [
-     'static/src/xml/auth_anonymous.xml',
- ],
+    'name': 'Anonymous',
+    'description': """
+Allow anonymous access to OpenERP.
+==================================
+ """,
+    'author': 'OpenERP SA',
+    'version': '1.0',
+    'category': 'Authentication',
+    'website': 'http://www.openerp.com',
+    'installable': True,
+    'depends': ['web'],
+    'data': ['auth_anonymous.xml'],
+    'js': ['static/src/js/auth_anonymous.js'],
+    'qweb': ['static/src/xml/auth_anonymous.xml'],
 }
diff --git a/addons/auth_anonymous/static/src/js/auth_anonymous.js b/addons/auth_anonymous/static/src/js/auth_anonymous.js
index fab2be1fd53..55425e26054 100644
--- a/addons/auth_anonymous/static/src/js/auth_anonymous.js
+++ b/addons/auth_anonymous/static/src/js/auth_anonymous.js
@@ -26,10 +26,10 @@ openerp.auth_anonymous = function(instance) {
         start: function() {
             var self = this;
             this._super.apply(this, arguments);
-            this.$element.find('.oe_topbar_anonymous_login').click(function() {
+            this.$el.find('.oe_topbar_anonymous_login').click(function() {
                 var p = self.getParent();
                 var am = p.action_manager;
-                p.$element.find('.oe_leftbar').hide();
+                p.$el.find('.oe_leftbar').hide();
                 am.do_action({
                     type:'ir.actions.client',
                     tag:'login',
diff --git a/addons/auth_ldap/__openerp__.py b/addons/auth_ldap/__openerp__.py
index 4e5bc811dca..aa7c93e4146 100644
--- a/addons/auth_ldap/__openerp__.py
+++ b/addons/auth_ldap/__openerp__.py
@@ -19,18 +19,18 @@
 ##############################################################################
 
 {
-    "name" : "Authentication via LDAP",
-    "version" : "1.0",
-    "depends" : ["base"],
-    "images" : ["images/ldap_configuration.jpeg"],
-    "author" : "OpenERP SA",
-    "description": """
+    'name' : 'Authentication via LDAP',
+    'version' : '1.0',
+    'depends' : ['base'],
+    'images' : ['images/ldap_configuration.jpeg'],
+    'author' : 'OpenERP SA',
+    'description': """
 Adds support for authentication by LDAP server.
 ===============================================
 This module allows users to login with their LDAP username and password, and
 will automatically create OpenERP users for them on the fly.
 
-Note: This module only work on servers who have Python's ``ldap`` module installed.
+**Note:** This module only work on servers who have Python's ``ldap`` module installed.
 
 Configuration:
 --------------
@@ -64,7 +64,7 @@ It is also possible to have local OpenERP users in the database along with
 LDAP-authenticated users (the Administrator account is one obvious example).
 
 Here is how it works:
-
+---------------------
     * The system first attempts to authenticate users against the local OpenERP
       database;
     * if this authentication fails (for example because the user has no local
@@ -84,7 +84,7 @@ Template*. If set, this user will be used as template to create the local users
 whenever someone authenticates for the first time via LDAP authentication. This
 allows pre-setting the default groups and menus of the first-time users.
 
-Warning: if you set a password for the user template, this password will be
+**Warning:** if you set a password for the user template, this password will be
          assigned as local password for each new LDAP user, effectively setting
          a *master password* for these users (until manually changed). You
          usually do not want this. One easy way to setup a template user is to
@@ -98,19 +98,17 @@ 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",
-    "data" : [
-        "users_ldap_view.xml",
-        "user_ldap_installer.xml",
-        "security/ir.model.access.csv",
+    'website' : 'http://www.openerp.com',
+    'category' : 'Authentication',
+    'data' : [
+        'users_ldap_view.xml',
+        'user_ldap_installer.xml',
+        'security/ir.model.access.csv',
     ],
-    "auto_install": False,
-    "installable": True,
-    "certificate" : "001141446349334700221",
-    "external_dependencies" : {
+    'auto_install': False,
+    'installable': True,
+    'certificate' : '001141446349334700221',
+    'external_dependencies' : {
         'python' : ['ldap'],
     }
 }
diff --git a/addons/auth_oauth/__init__.py b/addons/auth_oauth/__init__.py
index c9acce48a16..a56db75633b 100644
--- a/addons/auth_oauth/__init__.py
+++ b/addons/auth_oauth/__init__.py
@@ -1,3 +1,4 @@
 import controllers
 import auth_oauth
 import res_users
+import res_config
diff --git a/addons/auth_oauth/__openerp__.py b/addons/auth_oauth/__openerp__.py
index 6c79bba2151..f0be1234721 100644
--- a/addons/auth_oauth/__openerp__.py
+++ b/addons/auth_oauth/__openerp__.py
@@ -24,26 +24,21 @@
     'name': 'OAuth2 Authentication',
     'version': '1.0',
     'category': 'Tools',
-    'description': """Allow users to login through Google OAuth2.""",
+    'description': """
+Allow users to login through Google OAuth2.
+===========================================
+""",
     'author': 'Victor Tabuenca',
     'maintainer': 'OpenERP s.a.',
     'website': 'http://www.openerp.com',
-    'depends': ['base', 'web'],
+    'depends': ['base', 'web', 'base_setup'],
     'data': [
-        'auth_oauth_data.xml'
-    ],
-    'update_xml': [
+        'auth_oauth_data.xml',
         'auth_oauth_view.xml'
     ],
-    'js': [
-        'static/src/js/auth_oauth.js',
-    ],
-    'css': [
-        'static/lib/zocial/css/zocial.css',
-    ],
-    'qweb': [
-        'static/src/xml/auth_oauth.xml',
-    ],
+    'js': ['static/src/js/auth_oauth.js'],
+    'css': ['static/lib/zocial/css/zocial.css'],
+    'qweb': ['static/src/xml/auth_oauth.xml'],
     'installable': True,
     'auto_install': False,
 }
diff --git a/addons/auth_oauth/auth_oauth.py b/addons/auth_oauth/auth_oauth.py
index e258505868d..34b6aa44936 100644
--- a/addons/auth_oauth/auth_oauth.py
+++ b/addons/auth_oauth/auth_oauth.py
@@ -1,6 +1,6 @@
 from openerp.osv import osv, fields
 
-class auth_oauth_providers(osv.osv):
+class auth_oauth_provider(osv.osv):
     """Class defining the configuration values of an OAuth2 provider"""
 
     _name = 'auth.oauth.provider'
@@ -8,15 +8,17 @@ class auth_oauth_providers(osv.osv):
     _order = 'name'
 
     _columns = {
-        'name' : fields.char('Provider name', required=True),               # Name of the OAuth2 entity, Google, LinkedIn, etc
-        'client_id' : fields.char('Client ID', required=True),              # Our identifier
-        'auth_endpoint' : fields.char('Authentication URL', required=True), # OAuth provider URL to authenticate users
+        'name' : fields.char('Provider name'),               # Name of the OAuth2 entity, Google, LinkedIn, etc
+        'client_id' : fields.char('Client ID'),              # Our identifier
+        'auth_endpoint' : fields.char('Authentication URL'), # OAuth provider URL to authenticate users
         'scope' : fields.char('Scope'),                                     # OAUth user data desired to access
         'validation_endpoint' : fields.char('Validation URL'),              # OAuth provider URL to validate tokens
         'data_endpoint' : fields.char('Data URL'),
+        'enabled' : fields.boolean('Allowed'),
         'css_class' : fields.char('CSS class'),
         'body' : fields.char('Body'),
-        'active' : fields.boolean('Active'),
         'sequence' : fields.integer(),
     }
-
+    _defaults = {
+        'enabled' : False,
+    }
diff --git a/addons/auth_oauth/auth_oauth_data.xml b/addons/auth_oauth/auth_oauth_data.xml
index 021a03b2742..7bb95192e5d 100644
--- a/addons/auth_oauth/auth_oauth_data.xml
+++ b/addons/auth_oauth/auth_oauth_data.xml
@@ -1,38 +1,34 @@
 <?xml version="1.0"?>
 <openerp>
-    <data noupdate="1">
+    <data>
+
         <record id="provider_facebook" model="auth.oauth.provider">
             <field name="name">Facebook Graph</field>
-            <field name="client_id">facebook_client_id</field>
             <field name="auth_endpoint">https://www.facebook.com/dialog/oauth</field>
             <field name="scope"></field>
             <field name="validation_endpoint">https://graph.facebook.com/me/permissions</field>
             <field name="data_endpoint"></field>
             <field name="css_class">zocial facebook</field>
             <field name="body">Sign in with facebook</field>
-            <field name="active">True</field>
         </record>
         <record id="provider_google" model="auth.oauth.provider">
             <field name="name">Google OAuth2</field>
-            <field name="client_id">108010644258-duuhmp6pu7li4tsmnqg7j9rvdeklg0ki.apps.googleusercontent.com</field>
             <field name="auth_endpoint">https://accounts.google.com/o/oauth2/auth</field>
             <field name="scope">https://www.googleapis.com/auth/userinfo.email https://www.googleapis.com/auth/userinfo.profile</field>
             <field name="validation_endpoint">https://www.googleapis.com/oauth2/v1/tokeninfo</field>
             <field name="data_endpoint">https://www.googleapis.com/oauth2/v1/userinfo</field>
             <field name="css_class">zocial google</field>
             <field name="body">Sign in with google</field>
-            <field name="active">True</field>
         </record>
-        <record id="provider_twitter" model="auth.oauth.provider">
-            <field name="name">Twitter OAuth2</field>
-            <field name="client_id">108010644258-duuhmp6pu7li4tsmnqg7j9rvdeklg0ki.apps.twitterusercontent.com</field>
+        <!-- <record id="provider_twitter" model="auth.oauth.provider">
+            <field name="name">Twitter OAuth</field>
             <field name="auth_endpoint">https://api.twitter.com/oauth/request_token</field>
             <field name="scope"></field>
             <field name="validation_endpoint">https://api.twitter.com/oauth/authorize</field>
             <field name="data_endpoint"></field>
             <field name="css_class">zocial twitter</field>
             <field name="body">Sign in with twitter</field>
-            <field name="active">True</field>
-        </record>
+        </record> -->
+        
     </data>
 </openerp>
diff --git a/addons/auth_oauth/auth_oauth_view.xml b/addons/auth_oauth/auth_oauth_view.xml
index 678c347c84d..475720af9fd 100644
--- a/addons/auth_oauth/auth_oauth_view.xml
+++ b/addons/auth_oauth/auth_oauth_view.xml
@@ -11,7 +11,7 @@
                         <group>
                             <field name="name" />
                             <field name="client_id" />
-                            <field name="active" />
+                            <field name="enabled" />
                         </group>
                         <group>
                             <field name="auth_endpoint" />
@@ -22,7 +22,7 @@
                     </sheet>
                 </form>
             </field>
-        </record>
+        </record>        
         <record model="ir.ui.view" id="view_oauth_provider_list">
             <field name="name">auth.oauth.provider.list</field>
             <field name="model">auth.oauth.provider</field>
@@ -31,7 +31,7 @@
                 <tree string="arch" version="7.0">
                     <field name="name" />
                     <field name="client_id" />
-                    <field name="active" />
+                    <field name="enabled" />
                 </tree>
             </field>
         </record>
diff --git a/addons/auth_oauth/controllers/main.py b/addons/auth_oauth/controllers/main.py
index 28f550b4bda..5d939f19db1 100644
--- a/addons/auth_oauth/controllers/main.py
+++ b/addons/auth_oauth/controllers/main.py
@@ -7,6 +7,7 @@ import werkzeug.utils
 import openerp.modules.registry
 import openerp.addons.web.controllers.main
 import openerp.addons.web.common.http as openerpweb
+from openerp import SUPERUSER_ID
 
 _logger = logging.getLogger(__name__)
 
@@ -18,7 +19,7 @@ class OAuthController(openerpweb.Controller):
         registry = openerp.modules.registry.RegistryManager.get(dbname)
         with registry.cursor() as cr:
             providers = registry.get('auth.oauth.provider')
-            l = providers.read(cr, 1, providers.search(cr, 1, []))
+            l = providers.read(cr, SUPERUSER_ID, providers.search(cr, SUPERUSER_ID, [('enabled','=',True)]))
         return l
 
     @openerpweb.httprequest
@@ -30,7 +31,7 @@ class OAuthController(openerpweb.Controller):
         with registry.cursor() as cr:
             try:
                 u = registry.get('res.users')
-                credentials = u.auth_oauth(cr, 1, provider, kw)
+                credentials = u.auth_oauth(cr, SUPERUSER_ID, provider, kw)
                 cr.commit()
                 return openerp.addons.web.controllers.main.login_and_redirect(req, *credentials)
             except AttributeError:
diff --git a/addons/auth_oauth/res_config.py b/addons/auth_oauth/res_config.py
new file mode 100644
index 00000000000..82d79c767f5
--- /dev/null
+++ b/addons/auth_oauth/res_config.py
@@ -0,0 +1,63 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2012-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 General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>
+#
+##############################################################################
+
+from openerp.osv import osv, fields
+
+import logging
+_logger = logging.getLogger(__name__)
+
+class base_config_settings(osv.TransientModel):
+    _inherit = 'base.config.settings'
+
+    _columns = {
+        'auth_oauth_google_enabled' : fields.boolean('Allow users to sign in with Google'),
+        'auth_oauth_google_client_id' : fields.char('Client ID'),
+        'auth_oauth_facebook_enabled' : fields.boolean('Allow users to sign in with Facebook'),
+        'auth_oauth_facebook_client_id' : fields.char('Client ID'),
+    }
+
+    def get_oauth_providers(self, cr, uid, fields, context=None):
+        google_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'auth_oauth', 'provider_google')[1]
+        facebook_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'auth_oauth', 'provider_facebook')[1]
+        rg = self.pool.get('auth.oauth.provider').read(cr, uid, [google_id], ['enabled','client_id'], context=context)
+        rf = self.pool.get('auth.oauth.provider').read(cr, uid, [facebook_id], ['enabled','client_id'], context=context)
+        return {
+            'auth_oauth_google_enabled': rg[0]['enabled'],
+            'auth_oauth_google_client_id': rg[0]['client_id'],
+            'auth_oauth_facebook_enabled': rf[0]['enabled'],
+            'auth_oauth_facebook_client_id': rf[0]['client_id'],
+        }
+
+    def set_oauth_providers(self, cr, uid, ids, context=None):
+        google_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'auth_oauth', 'provider_google')[1]
+        facebook_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'auth_oauth', 'provider_facebook')[1]
+        config = self.browse(cr, uid, ids[0], context=context)
+        rg = {
+            'enabled':config.auth_oauth_google_enabled,
+            'client_id':config.auth_oauth_google_client_id,
+        }
+        rf = {
+            'enabled':config.auth_oauth_facebook_enabled,
+            'client_id':config.auth_oauth_facebook_client_id,
+        }
+        self.pool.get('auth.oauth.provider').write(cr, uid, [google_id], rg)
+        self.pool.get('auth.oauth.provider').write(cr, uid, [facebook_id], rf)
+
diff --git a/addons/auth_oauth/res_config.xml b/addons/auth_oauth/res_config.xml
new file mode 100644
index 00000000000..2b06e05327a
--- /dev/null
+++ b/addons/auth_oauth/res_config.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0"?>
+<openerp>
+    <data>
+        <record model="ir.ui.view" id="view_general_configuration">
+            <field name="name">base.config.settings.oauth</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="//field[@name='module_auth_oauth']/.." position="after">
+                    <div attrs="{'invisible':[('module_auth_oauth','=',False)]}">
+                        <div name="google">
+                            <div>
+                                <field name="auth_oauth_google_enabled" class="oe_inline"/>
+                                <label for="auth_oauth_google_enabled"/>
+                            </div>
+                            <div attrs="{'invisible':[('auth_oauth_google_enabled','=',False)]}">
+                                <blockquote>
+                                    To setup the signin process with Google, first you have to perform the following steps:<br/>
+                                    <br/>
+                                    - Go to the <a href="https://code.google.com/apis/console/">Google APIs console</a><br/>
+                                    - Ceate a new project<br/>
+                                    - Go to Api Access<br/>
+                                    - Create an oauth client_id<br/>
+                                    - Edit settings and set both Authorized Redirect URIs and Authorized JavaScript Origins to your hostname.<br/>
+                                    <br/>
+                                    Now copy paste the client_id here: <field name="auth_oauth_google_client_id" class="oe_inline" placeholder="e.g. 1234-xyz.apps.googleusercontent.com"/>
+                                </blockquote>
+                            </div>
+                        </div>
+                        <div name="facebook">
+                            <div>
+                                <field name="auth_oauth_facebook_enabled" class="oe_inline"/>
+                                <label for="auth_oauth_facebook_enabled"/>
+                            </div>
+                            <div attrs="{'invisible':[('auth_oauth_facebook_enabled','=',False)]}">
+                                <blockquote>
+                                    To setup the signin process with Google, first you have to perform the following steps:<br/>
+                                    <br/>
+                                    Now copy paste the client_id here: <field name="auth_oauth_facebook_client_id" class="oe_inline" placeholder="e.g. 1234-xyz.apps.googleusercontent.com"/>
+                                </blockquote>
+
+                            </div>
+                        </div>
+                    </div>
+                </xpath>
+            </field>
+        </record>
+
+    </data>
+</openerp>
diff --git a/addons/auth_oauth/res_users.py b/addons/auth_oauth/res_users.py
index 3dbab849942..b4f62612746 100644
--- a/addons/auth_oauth/res_users.py
+++ b/addons/auth_oauth/res_users.py
@@ -6,6 +6,7 @@ import simplejson
 
 import openerp
 from openerp.osv import osv, fields
+from openerp import SUPERUSER_ID
 
 _logger = logging.getLogger(__name__)
 
@@ -63,7 +64,7 @@ class res_users(osv.Model):
         try:
             return super(res_users, self).check_credentials(cr, uid, password)
         except openerp.exceptions.AccessDenied:
-            res = self.search(cr, 1, [('id','=',uid),('oauth_access_token','=',password)])
+            res = self.search(cr, SUPERUSER_ID, [('id','=',uid),('oauth_access_token','=',password)])
             if not res:
                 raise
 
diff --git a/addons/auth_oauth/static/src/js/auth_oauth.js b/addons/auth_oauth/static/src/js/auth_oauth.js
index eae423fae1f..4a41e720726 100644
--- a/addons/auth_oauth/static/src/js/auth_oauth.js
+++ b/addons/auth_oauth/static/src/js/auth_oauth.js
@@ -4,7 +4,7 @@ openerp.auth_oauth = function(instance) {
     instance.web.Login = instance.web.Login.extend({
         start: function(parent, params) {
             var d = this._super.apply(this, arguments);
-            this.$element.on('click', 'a.zocial', this.on_oauth_sign_in);
+            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.");
@@ -21,9 +21,7 @@ openerp.auth_oauth = function(instance) {
         },
         on_oauth_loaded: function(result) {
             this.oauth_providers = result;
-            console.log(result);
             var buttons = QWeb.render("auth_oauth.Login.button",{"widget":this});
-            console.log(buttons);
             this.$(".oe_login_pane form ul").after(buttons);
         },
         on_oauth_sign_in: function(ev) {
diff --git a/addons/auth_openid/__openerp__.py b/addons/auth_openid/__openerp__.py
index cd1a12fce7f..10c77f29965 100644
--- a/addons/auth_openid/__openerp__.py
+++ b/addons/auth_openid/__openerp__.py
@@ -24,23 +24,18 @@
     'name': 'OpenID Authentification',
     'version': '2.0',
     'category': 'Tools',
-    'description': """Allow users to login through OpenID.""",
+    'description': """
+Allow users to login through OpenID.
+====================================
+""",
     'author': 'OpenERP s.a.',
     'maintainer': 'OpenERP s.a.',
     'website': 'http://www.openerp.com',
     'depends': ['base', 'web'],
-    'data': [
-        'res_users.xml',
-    ],
-    'js': [
-        'static/src/js/auth_openid.js',
-    ],
-    'css': [
-        'static/src/css/openid.css',
-    ],
-    'qweb': [
-        'static/src/xml/auth_openid.xml',
-    ],
+    'data': ['res_users.xml'],
+    'js': ['static/src/js/auth_openid.js'],
+    'css': ['static/src/css/openid.css'],
+    'qweb': ['static/src/xml/auth_openid.xml'],
     'external_dependencies': {
         'python' : ['openid'],
     },
diff --git a/addons/auth_openid/controllers/main.py b/addons/auth_openid/controllers/main.py
index eba711dae7a..ebcaab4bf25 100644
--- a/addons/auth_openid/controllers/main.py
+++ b/addons/auth_openid/controllers/main.py
@@ -23,6 +23,7 @@ import logging
 import os
 import tempfile
 import urllib
+from openerp import SUPERUSER_ID
 
 import werkzeug.urls
 import werkzeug.exceptions
@@ -176,7 +177,7 @@ class OpenIDController(openerpweb.Controller):
             with registry.cursor() as cr:
                 Modules = registry.get('ir.module.module')
 
-                installed = Modules.search_count(cr, 1, ['&', ('name', '=', 'auth_openid'), ('state', '=', 'installed')]) == 1
+                installed = Modules.search_count(cr, SUPERUSER_ID, ['&', ('name', '=', 'auth_openid'), ('state', '=', 'installed')]) == 1
                 if installed:
 
                     Users = registry.get('res.users')
@@ -196,13 +197,13 @@ class OpenIDController(openerpweb.Controller):
 
                     domain += [('openid_url', '=', openid_url), ('active', '=', True)]
 
-                    ids = Users.search(cr, 1, domain)
+                    ids = Users.search(cr, SUPERUSER_ID, domain)
                     assert len(ids) < 2
                     if ids:
                         user_id = ids[0]
-                        login = Users.browse(cr, 1, user_id).login
+                        login = Users.browse(cr, SUPERUSER_ID, user_id).login
                         key = randomString(utils.KEY_LENGTH, '0123456789abcdef')
-                        Users.write(cr, 1, [user_id], {'openid_key': key})
+                        Users.write(cr, SUPERUSER_ID, [user_id], {'openid_key': key})
                         # TODO fill empty fields with the ones from sreg/ax
                         cr.commit()
 
diff --git a/addons/auth_openid/i18n/ar.po b/addons/auth_openid/i18n/ar.po
index 37e35a4c08c..fa0d035171d 100644
--- a/addons/auth_openid/i18n/ar.po
+++ b/addons/auth_openid/i18n/ar.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:39+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:43+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. #-#-#-#-#  auth_openid.pot (OpenERP Server 6.1rc1)  #-#-#-#-#
 #. module: auth_openid
diff --git a/addons/auth_openid/i18n/de.po b/addons/auth_openid/i18n/de.po
index 73334192d1e..b2de9a906a9 100644
--- a/addons/auth_openid/i18n/de.po
+++ b/addons/auth_openid/i18n/de.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:39+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:43+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. #-#-#-#-#  auth_openid.pot (OpenERP Server 6.1rc1)  #-#-#-#-#
 #. module: auth_openid
@@ -63,7 +63,7 @@ msgstr ""
 #. module: auth_openid
 #: field:res.users,openid_key:0
 msgid "OpenID Key"
-msgstr ""
+msgstr "OpenID Schlüssel"
 
 #. module: auth_openid
 #: model:ir.model,name:auth_openid.model_res_users
@@ -94,7 +94,7 @@ msgstr "Launchpad"
 #. openerp-web
 #: /home/odo/repositories/addons/trunk/auth_openid/static/src/xml/auth_openid.xml:20
 msgid "Google Apps Domain:"
-msgstr ""
+msgstr "Google Apps Domäne:"
 
 #. openerp-web
 #: /home/odo/repositories/addons/trunk/auth_openid/static/src/xml/auth_openid.xml:24
@@ -109,7 +109,7 @@ msgstr "OpenID URL:"
 #. openerp-web
 #: /home/odo/repositories/addons/trunk/auth_openid/static/src/xml/auth_openid.xml:35
 msgid "Google Apps Domain"
-msgstr ""
+msgstr "Google Apps Domäne"
 
 #. openerp-web
 #: /home/odo/repositories/addons/trunk/auth_openid/static/src/xml/auth_openid.xml:41
diff --git a/addons/auth_openid/i18n/es.po b/addons/auth_openid/i18n/es.po
index ad97c7dbef9..0d414cf2698 100644
--- a/addons/auth_openid/i18n/es.po
+++ b/addons/auth_openid/i18n/es.po
@@ -9,13 +9,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 01:37+0100\n"
 "PO-Revision-Date: 2012-02-10 17:21+0000\n"
-"Last-Translator: Carlos @ smile-iberia <Unknown>\n"
+"Last-Translator: Carlos Ch. <Unknown>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:39+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:43+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. #-#-#-#-#  auth_openid.pot (OpenERP Server 6.1rc1)  #-#-#-#-#
 #. module: auth_openid
diff --git a/addons/auth_openid/i18n/es_CR.po b/addons/auth_openid/i18n/es_CR.po
index 1ca8e020155..83419609142 100644
--- a/addons/auth_openid/i18n/es_CR.po
+++ b/addons/auth_openid/i18n/es_CR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:39+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:43+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. #-#-#-#-#  auth_openid.pot (OpenERP Server 6.1rc1)  #-#-#-#-#
 #. module: auth_openid
diff --git a/addons/auth_openid/i18n/fi.po b/addons/auth_openid/i18n/fi.po
index 45ac17fdee5..8334ce11875 100644
--- a/addons/auth_openid/i18n/fi.po
+++ b/addons/auth_openid/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:39+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:43+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. #-#-#-#-#  auth_openid.pot (OpenERP Server 6.1rc1)  #-#-#-#-#
 #. module: auth_openid
diff --git a/addons/auth_openid/i18n/fr.po b/addons/auth_openid/i18n/fr.po
index 681322e566a..f56bae32316 100644
--- a/addons/auth_openid/i18n/fr.po
+++ b/addons/auth_openid/i18n/fr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:39+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:43+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. #-#-#-#-#  auth_openid.pot (OpenERP Server 6.1rc1)  #-#-#-#-#
 #. module: auth_openid
diff --git a/addons/auth_openid/i18n/gu.po b/addons/auth_openid/i18n/gu.po
index 4b973ef8187..1ad23d3971e 100644
--- a/addons/auth_openid/i18n/gu.po
+++ b/addons/auth_openid/i18n/gu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:39+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:43+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. #-#-#-#-#  auth_openid.pot (OpenERP Server 6.1rc1)  #-#-#-#-#
 #. module: auth_openid
diff --git a/addons/auth_openid/i18n/ja.po b/addons/auth_openid/i18n/ja.po
index eca5e247046..e8ab8a16bda 100644
--- a/addons/auth_openid/i18n/ja.po
+++ b/addons/auth_openid/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:39+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:43+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. #-#-#-#-#  auth_openid.pot (OpenERP Server 6.1rc1)  #-#-#-#-#
 #. module: auth_openid
diff --git a/addons/auth_openid/i18n/nb.po b/addons/auth_openid/i18n/nb.po
index ec31859022e..088bd945682 100644
--- a/addons/auth_openid/i18n/nb.po
+++ b/addons/auth_openid/i18n/nb.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:39+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:43+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. #-#-#-#-#  auth_openid.pot (OpenERP Server 6.1rc1)  #-#-#-#-#
 #. module: auth_openid
@@ -33,12 +33,12 @@ msgstr "ÅpenID"
 #: field:res.users,openid_url:0
 #: /home/odo/repositories/addons/trunk/auth_openid/static/src/xml/auth_openid.xml:47
 msgid "OpenID URL"
-msgstr ""
+msgstr "ÅpenID URL"
 
 #. module: auth_openid
 #: help:res.users,openid_email:0
 msgid "Used for disambiguation in case of a shared OpenID URL"
-msgstr ""
+msgstr "Brukes for disambiguering i tilfelle av en felles OpenID URL"
 
 #. module: auth_openid
 #: sql_constraint:res.users:0
@@ -59,7 +59,7 @@ msgstr ""
 #. module: auth_openid
 #: field:res.users,openid_key:0
 msgid "OpenID Key"
-msgstr ""
+msgstr "ÅpenID Nøkkel"
 
 #. module: auth_openid
 #: model:ir.model,name:auth_openid.model_res_users
diff --git a/addons/auth_openid/i18n/nl.po b/addons/auth_openid/i18n/nl.po
index 896c9f1c40a..0aff13c9eb3 100644
--- a/addons/auth_openid/i18n/nl.po
+++ b/addons/auth_openid/i18n/nl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:39+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:43+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. #-#-#-#-#  auth_openid.pot (OpenERP Server 6.1rc1)  #-#-#-#-#
 #. module: auth_openid
diff --git a/addons/auth_openid/i18n/pt.po b/addons/auth_openid/i18n/pt.po
index fd2e3249596..af9b49d1ce3 100644
--- a/addons/auth_openid/i18n/pt.po
+++ b/addons/auth_openid/i18n/pt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:39+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:43+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. #-#-#-#-#  auth_openid.pot (OpenERP Server 6.1rc1)  #-#-#-#-#
 #. module: auth_openid
diff --git a/addons/auth_openid/i18n/pt_BR.po b/addons/auth_openid/i18n/pt_BR.po
index 00f4ccc2bdc..d049fc4d622 100644
--- a/addons/auth_openid/i18n/pt_BR.po
+++ b/addons/auth_openid/i18n/pt_BR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:39+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:43+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. #-#-#-#-#  auth_openid.pot (OpenERP Server 6.1rc1)  #-#-#-#-#
 #. module: auth_openid
diff --git a/addons/auth_openid/i18n/ro.po b/addons/auth_openid/i18n/ro.po
index 56e4cefbdce..5efcf211732 100644
--- a/addons/auth_openid/i18n/ro.po
+++ b/addons/auth_openid/i18n/ro.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:39+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:43+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. #-#-#-#-#  auth_openid.pot (OpenERP Server 6.1rc1)  #-#-#-#-#
 #. module: auth_openid
diff --git a/addons/auth_openid/i18n/sk.po b/addons/auth_openid/i18n/sk.po
index ca958ac9a34..4497f45a697 100644
--- a/addons/auth_openid/i18n/sk.po
+++ b/addons/auth_openid/i18n/sk.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:39+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:43+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. #-#-#-#-#  auth_openid.pot (OpenERP Server 6.1rc1)  #-#-#-#-#
 #. module: auth_openid
diff --git a/addons/auth_openid/i18n/sr@latin.po b/addons/auth_openid/i18n/sr@latin.po
index 2ea006976d1..57dadd4222d 100644
--- a/addons/auth_openid/i18n/sr@latin.po
+++ b/addons/auth_openid/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:39+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:43+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. #-#-#-#-#  auth_openid.pot (OpenERP Server 6.1rc1)  #-#-#-#-#
 #. module: auth_openid
diff --git a/addons/auth_openid/i18n/sv.po b/addons/auth_openid/i18n/sv.po
index 1f3eab314bd..fbabaa2f20b 100644
--- a/addons/auth_openid/i18n/sv.po
+++ b/addons/auth_openid/i18n/sv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:39+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:43+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. #-#-#-#-#  auth_openid.pot (OpenERP Server 6.1rc1)  #-#-#-#-#
 #. module: auth_openid
diff --git a/addons/auth_openid/i18n/tr.po b/addons/auth_openid/i18n/tr.po
index cd60e99c9b1..e010e1fe7c7 100644
--- a/addons/auth_openid/i18n/tr.po
+++ b/addons/auth_openid/i18n/tr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:39+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:43+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. #-#-#-#-#  auth_openid.pot (OpenERP Server 6.1rc1)  #-#-#-#-#
 #. module: auth_openid
diff --git a/addons/auth_openid/i18n/zh_CN.po b/addons/auth_openid/i18n/zh_CN.po
index 0cde8ee06b9..e0ac5c89b7c 100644
--- a/addons/auth_openid/i18n/zh_CN.po
+++ b/addons/auth_openid/i18n/zh_CN.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:39+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:43+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. #-#-#-#-#  auth_openid.pot (OpenERP Server 6.1rc1)  #-#-#-#-#
 #. module: auth_openid
diff --git a/addons/auth_openid/static/src/js/auth_openid.js b/addons/auth_openid/static/src/js/auth_openid.js
index 1417bc471ce..70739e056ed 100644
--- a/addons/auth_openid/static/src/js/auth_openid.js
+++ b/addons/auth_openid/static/src/js/auth_openid.js
@@ -8,7 +8,7 @@ instance.web.Login = instance.web.Login.extend({
         this._super.apply(this, arguments);
         var self = this;
 
-        this._default_error_message = this.$element.find('.oe_login_error_message').text();
+        this._default_error_message = this.$el.find('.oe_login_error_message').text();
 
         this.$openid_selected_button = $();
         this.$openid_selected_input = $();
@@ -32,7 +32,7 @@ instance.web.Login = instance.web.Login.extend({
             this.do_openid_select('a[data-url=""]', 'login,password', true);
         }
 
-        this.$element.find('a[data-url]').click(function (event) {
+        this.$el.find('a[data-url]').click(function (event) {
             event.preventDefault();
             var selected_oidh = $(this).attr('href').substr(1);
             if (selected_oidh != self.$openid_selected_provider) {
@@ -48,10 +48,10 @@ instance.web.Login = instance.web.Login.extend({
         var self = this;
 
             self.$openid_selected_button.add(self.$openid_selected_input).removeClass('selected');
-            self.$openid_selected_button = self.$element.find(button).addClass('selected');
+            self.$openid_selected_button = self.$el.find(button).addClass('selected');
 
             var input = _(provider.split(',')).map(function(p) { return 'li[data-provider="'+p+'"]'; }).join(',');
-            self.$openid_selected_input = self.$element.find(input).addClass('selected');
+            self.$openid_selected_input = self.$el.find(input).addClass('selected');
 
             self.$openid_selected_input.find('input:first').focus();
             self.$openid_selected_provider = (self.$openid_selected_button.attr('href') || '').substr(1);
@@ -61,7 +61,7 @@ instance.web.Login = instance.web.Login.extend({
             }
 
             if (!noautosubmit && self.$openid_selected_input.length == 0) {
-                self.$element.find('form').submit();
+                self.$el.find('form').submit();
             }
 
     },
@@ -96,7 +96,7 @@ instance.web.Login = instance.web.Login.extend({
                 localStorage.setItem('openid-login', id);
             }
 
-            var db = this.$element.find("form [name=db]").val();
+            var db = this.$el.find("form [name=db]").val();
             var openid_url = dataurl.replace('{id}', id);
 
             this.do_openid_login(db, openid_url);
@@ -129,12 +129,12 @@ instance.web.Login = instance.web.Login.extend({
 
     do_warn: function(title, msg) {
         //console.warn(title, msg);
-        this.$element.find('.oe_login_error_message').text(msg).show();
+        this.$el.find('.oe_login_error_message').text(msg).show();
         this._super(title, msg);
     },
 
     reset_error_message: function() {
-        this.$element.find('.oe_login_error_message').text(this._default_error_message);
+        this.$el.find('.oe_login_error_message').text(this._default_error_message);
     }
 
 });
diff --git a/addons/auth_openid/static/src/xml/auth_openid.xml b/addons/auth_openid/static/src/xml/auth_openid.xml
index aa61d161657..6a40439a012 100644
--- a/addons/auth_openid/static/src/xml/auth_openid.xml
+++ b/addons/auth_openid/static/src/xml/auth_openid.xml
@@ -4,7 +4,7 @@
 
     <t t-extend="Login">
         <t t-jquery=".oe_login .oe_login_logo" t-operation="after">
-            <ul class="openid_providers">
+            <ul class="openid_providers oe_semantic_html_override">
                 <li><a href="#login,password" title="Password" data-url="" id="btn_password">Password</a></li>
                 <li><a href="#google" title="Google" data-url="https://www.google.com/accounts/o8/id">Google</a></li>
                 <li><a href="#googleapps" title="Google Apps" data-url="https://www.google.com/accounts/o8/site-xrds?hd={id}">Google</a></li>
diff --git a/addons/auth_reset_password/__openerp__.py b/addons/auth_reset_password/__openerp__.py
index 76528bbfeb8..ccf5ca53a21 100644
--- a/addons/auth_reset_password/__openerp__.py
+++ b/addons/auth_reset_password/__openerp__.py
@@ -1,22 +1,17 @@
 {
- 'name': 'Reset Password',
- 'description': 'Allow users to reset their password from the login page',
- 'author': 'OpenERP SA',
- 'version': '1.0',
- 'category': 'Authentication',
- 'website': 'http://www.openerp.com',
- 'installable': True,
- 'depends': ['auth_anonymous', 'email_template'],
- 'data': [
-     'auth_reset_password.xml',
- ],
- 'js': [
-     'static/src/js/reset_password.js',
- ],
- 'css': [
-     'static/src/css/reset_password.css',
- ],
- 'qweb': [
-     'static/src/xml/reset_password.xml',
- ],
+    'name': 'Reset Password',
+    'description': """
+Allow users to reset their password from the login page.
+========================================================
+""",
+    'author': 'OpenERP SA',
+    'version': '1.0',
+    'category': 'Authentication',
+    'website': 'http://www.openerp.com',
+    'installable': True,
+    'depends': ['auth_anonymous', 'email_template'],
+    'data': ['auth_reset_password.xml'],
+    'js': ['static/src/js/reset_password.js'],
+    'css': ['static/src/css/reset_password.css'],
+    'qweb': ['static/src/xml/reset_password.xml'],
 }
diff --git a/addons/auth_reset_password/auth_reset_password.py b/addons/auth_reset_password/auth_reset_password.py
index 3d1bcbbfa7b..ff208c89b9c 100644
--- a/addons/auth_reset_password/auth_reset_password.py
+++ b/addons/auth_reset_password/auth_reset_password.py
@@ -6,6 +6,7 @@ import urlparse
 
 from openerp.tools import config
 from openerp.osv import osv, fields
+from openerp import SUPERUSER_ID
 
 TWENTY_FOUR_HOURS = 24 * 60 * 60
 
@@ -76,9 +77,9 @@ class res_users(osv.osv):
         MailMessage.send(cr, uid, [msg_id], context=context)
 
     def send_reset_password_request(self, cr, uid, email, context=None):
-        ids = self.pool.get('res.users').search(cr, 1, [('user_email', '=', email)], context=context)
+        ids = self.pool.get('res.users').search(cr, SUPERUSER_ID, [('user_email', '=', email)], context=context)
         if ids:
-            self._auth_reset_password_send_email(cr, 1, email, 'reset_password_email', ids[0], context=context)
+            self._auth_reset_password_send_email(cr, SUPERUSER_ID, email, 'reset_password_email', ids[0], context=context)
             return True
         #else:
         #    _m, company_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'base', 'main_company')
@@ -109,7 +110,7 @@ class auth_reset_password(osv.TransientModel):
         Users = self.pool.get('res.users')
         data = Users._auth_reset_password_check_token(cr, uid, values.get('token', ''))
         if data:
-            Users.write(cr, 1, data['uid'], {'password': pw}, context=context)
+            Users.write(cr, SUPERUSER_ID, data['uid'], {'password': pw}, context=context)
         else:
             raise osv.except_osv('Error', 'Invalid token')
 
diff --git a/addons/auth_reset_password/auth_reset_password.xml b/addons/auth_reset_password/auth_reset_password.xml
index 26ea8878c45..b7d7e0baef6 100644
--- a/addons/auth_reset_password/auth_reset_password.xml
+++ b/addons/auth_reset_password/auth_reset_password.xml
@@ -9,16 +9,13 @@
             <field name="email_from"><![CDATA[${object.company_id.name} <${object.company_id.email}>]]></field>
             <field name="email_to" eval="False"><!--(set by reset_password module)--></field>
             <field name="subject">Password reset</field>
-            <field name="body_text"><![CDATA[
-A password reset was requested the OpenERP account linked to this email on ${object._auth_reset_password_host()}
+            <field name="body_html"><![CDATA[
+<p>A password reset was requested the OpenERP account linked to this email on ${object._auth_reset_password_host()}</p>
 
-You may change your password following this link:
+<p>You may change your password following this <a href="${object._auth_reset_password_link()}">link</a>,
+or by copy-pasting the following URL in your browser: ${object._auth_reset_password_link()}</p>
 
-${object._auth_reset_password_link()}
-
-If you don't have asked for password reset, you can safely ignore this email.
-
-]]></field>
+<p>Note: If you did not ask for a password reset, you can safely ignore this email.</p>]]></field>
         </record>
 
         <!-- TODO get own css -->
diff --git a/addons/auth_reset_password/static/src/js/reset_password.js b/addons/auth_reset_password/static/src/js/reset_password.js
index 13cf070a548..4e09b5c5318 100644
--- a/addons/auth_reset_password/static/src/js/reset_password.js
+++ b/addons/auth_reset_password/static/src/js/reset_password.js
@@ -2,7 +2,7 @@ openerp.auth_reset_password = function(instance) {
     var _t = instance.web._t;
     instance.web.Login.include({
         start: function() {
-            var $e = this.$element;
+            var $e = this.$el;
             $e.find('a.oe_login_switch').click(function() {
                 $e.find('ul.oe_login_switch').toggle();
                 var $m = $e.find('form input[name=is_reset_pw]');
@@ -15,7 +15,7 @@ openerp.auth_reset_password = function(instance) {
                 ev.preventDefault();
             }
 
-            var $e = this.$element;
+            var $e = this.$el;
             var db = $e.find("form [name=db]").val();
             if (!db) {
                 this.do_warn(_t("Login"), _t("No database selected !"));
diff --git a/addons/auth_signup/__openerp__.py b/addons/auth_signup/__openerp__.py
index 765a36ef252..9cfe89cdc1c 100644
--- a/addons/auth_signup/__openerp__.py
+++ b/addons/auth_signup/__openerp__.py
@@ -21,7 +21,10 @@
 
 {
     'name': 'Signup',
-    'description': 'Allow users to sign up',
+    'description': """
+Allow users to sign up.
+=======================
+    """,
     'author': 'OpenERP SA',
     'version': '1.0',
     'category': 'Authentication',
@@ -29,12 +32,9 @@
     'installable': True,
     'depends': ['base_setup'],
     'data': [
+        'auth_signup_data.xml',
         'res_config.xml',
     ],
-    'js': [
-        'static/src/js/auth_signup.js',
-    ],
-    'qweb': [
-        'static/src/xml/auth_signup.xml',
-    ],
+    'js': ['static/src/js/auth_signup.js'],
+    'qweb': ['static/src/xml/auth_signup.xml'],
 }
diff --git a/addons/auth_signup/auth_signup_data.xml b/addons/auth_signup/auth_signup_data.xml
new file mode 100644
index 00000000000..4a6bf9ae4b9
--- /dev/null
+++ b/addons/auth_signup/auth_signup_data.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<openerp>
+    <data noupdate="1">
+
+        <!-- Default template user for new users signing in -->
+        <record id="default_template_user" model="res.users">
+            <field name="name">Template User</field>
+            <field name="login">portaltemplate</field>
+            <!-- No password: this template user doesn't need to log in -->
+            <field name="password"></field>
+            <field name="active" eval="False"/>
+            <!-- Avoid auto-including this user in any default group, just like a typical portal member -->
+            <field name="groups_id" eval="[(5,)]"/>
+        </record>
+
+        <record id="default_template_user" model="ir.config_parameter">
+            <field name="key">auth_signup.template_user_id</field>
+            <field name="value" ref="default_template_user"/>
+        </record>
+
+    </data>
+</openerp>
diff --git a/addons/auth_signup/controllers/main.py b/addons/auth_signup/controllers/main.py
index 0ed2151d12b..821ef44f459 100644
--- a/addons/auth_signup/controllers/main.py
+++ b/addons/auth_signup/controllers/main.py
@@ -5,6 +5,7 @@ import werkzeug.urls
 from openerp.modules.registry import RegistryManager
 from openerp.addons.web.controllers.main import login_and_redirect
 import openerp.addons.web.common.http as openerpweb
+from openerp import SUPERUSER_ID
 
 _logger = logging.getLogger(__name__)
 
@@ -18,7 +19,7 @@ class OpenIDController(openerpweb.Controller):
         with registry.cursor() as cr:
             try:
                 Users = registry.get('res.users')
-                credentials = Users.auth_signup(cr, 1, name, login, password)
+                credentials = Users.auth_signup(cr, SUPERUSER_ID, name, login, password)
                 cr.commit()
                 return login_and_redirect(req, *credentials)
             except AttributeError:
diff --git a/addons/auth_signup/res_config.py b/addons/auth_signup/res_config.py
index a9a490de8c5..813a903870c 100644
--- a/addons/auth_signup/res_config.py
+++ b/addons/auth_signup/res_config.py
@@ -25,16 +25,17 @@ class base_config_settings(osv.TransientModel):
     _inherit = 'base.config.settings'
 
     _columns = {
-        'auth_signup_template_user_id': fields.many2one('res.users', 'Template user for new users created through signup')
+        'auth_signup_uninvited': fields.boolean('allow public users to sign up', help="If unchecked only invited users may sign up"),
+        'auth_signup_template_user_id': fields.many2one('res.users', 'Template user for new users created through signup'),
     }
 
-    def get_default_signup(self, cr, uid, fields, context=None):
+    def get_default_auth_signup_template_user_id(self, cr, uid, fields, context=None):
         icp = self.pool.get('ir.config_parameter')
         return {
-            'auth_signup_template_user_id': icp.get_param(cr, uid, 'auth.signup_template_user_id', 0) or False
+            'auth_signup_template_user_id': icp.get_param(cr, uid, 'auth_signup.template_user_id', 0) or False
         }
 
-    def set_signup(self, cr, uid, ids, context=None):
+    def set_auth_signup_template_user_id(self, cr, uid, ids, context=None):
         config = self.browse(cr, uid, ids[0], context=context)
         icp = self.pool.get('ir.config_parameter')
-        icp.set_param(cr, uid, 'auth.signup_template_user_id', config.auth_signup_template_user_id.id)
+        icp.set_param(cr, uid, 'auth_signup.template_user_id', config.auth_signup_template_user_id.id)
diff --git a/addons/auth_signup/res_config.xml b/addons/auth_signup/res_config.xml
index 3bea8dc2aed..c17634ececb 100644
--- a/addons/auth_signup/res_config.xml
+++ b/addons/auth_signup/res_config.xml
@@ -7,16 +7,15 @@
             <field name="model">base.config.settings</field>
             <field name="inherit_id" ref="base_setup.view_general_configuration"/>
             <field name="arch" type="xml">
-                <xpath expr="//group[last()]" position="after">
-                    <group>
-                        <label for="id" string="External Users"/>
-                        <div>
-                            <div>
-                                <label for="auth_signup_template_user_id"/>
-                                <field name="auth_signup_template_user_id" class="oe_inline"/>
-                            </div>
-                        </div>
-                    </group>
+                <xpath expr="//field[@name='module_auth_anonymous']/.." position="after">
+                    <div>
+                        <field name="auth_signup_uninvited" class="oe_inline"/>
+                        <label for="auth_signup_uninvited"/>
+                    </div>
+                    <div attrs="{'invisible':[('auth_signup_uninvited','=',False)]}">
+                        <label for="auth_signup_template_user_id"/>
+                        <field name="auth_signup_template_user_id" class="oe_inline" domain="['|',('active','=',0),('active','=',1)]"/>
+                    </div>
                 </xpath>
             </field>
         </record>
diff --git a/addons/auth_signup/res_users.py b/addons/auth_signup/res_users.py
index 1d77a3f9473..5f6463508b6 100644
--- a/addons/auth_signup/res_users.py
+++ b/addons/auth_signup/res_users.py
@@ -1,5 +1,6 @@
 import openerp
 from openerp.osv import osv
+from openerp import SUPERUSER_ID
 
 class res_users(osv.Model):
     _inherit = 'res.users'
@@ -15,9 +16,9 @@ class res_users(osv.Model):
         #
         user_template_id = self.pool.get('ir.config_parameter').get_param(cr, uid, 'auth.signup_template_user_id', 0)
         if user_template_id:
-            self.pool.get('res.users').copy(cr, 1, user_template_id, new_user, context=context)
+            self.pool.get('res.users').copy(cr, SUPERUSER_ID, user_template_id, new_user, context=context)
         else:
-            self.pool.get('res.users').create(cr, 1, new_user, context=context)
+            self.pool.get('res.users').create(cr, SUPERUSER_ID, new_user, context=context)
 
     def auth_signup(self, cr, uid, name, login, password, context=None):
         r = (cr.dbname, login, password)
diff --git a/addons/base_action_rule/__openerp__.py b/addons/base_action_rule/__openerp__.py
index eff92685313..c9483f00360 100644
--- a/addons/base_action_rule/__openerp__.py
+++ b/addons/base_action_rule/__openerp__.py
@@ -29,21 +29,19 @@ This module allows to implement action rules for any object.
 
 Use automated actions to automatically trigger actions for various screens.
 
-Example: A lead created by a specific user may be automatically set to a specific
+**Example:** A lead created by a specific user may be automatically set to a specific
 sales team, or an opportunity which still has status pending after 14 days might
 trigger an automatic reminder email.
     """,
     'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
     'depends': ['base', 'mail'],
-    'init_xml': [
-        'base_action_rule_data.xml'
-    ],
-    'update_xml': [
+    'data': [
         'base_action_rule_view.xml',
         'security/ir.model.access.csv',
+        'base_action_rule_data.xml'
     ],
-    'demo_xml': [],
+    'demo': [],
     'installable': True,
     'auto_install': False,
     'certificate' : '001017908446466333429',
diff --git a/addons/base_action_rule/base_action_rule.py b/addons/base_action_rule/base_action_rule.py
index b6eacda63c0..7e9bbacab13 100644
--- a/addons/base_action_rule/base_action_rule.py
+++ b/addons/base_action_rule/base_action_rule.py
@@ -302,33 +302,27 @@ the rule to mark CC(mail to any other person defined in actions)."),
         return self.format_body(body % data)
 
     def email_send(self, cr, uid, obj, emails, body, emailfrom=None, context=None):
-        """ send email
-            @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 email: pass the emails
-            @param emailfrom: Pass name the email From else False
-            @param context: A standard dictionary for contextual values """
-
         if not emailfrom:
-            emailfrom = tools.config.get('email_from', False)
-
-        if context is None:
-            context = {}
-
-        mail_message = self.pool.get('mail.message')
+            emailfrom = tools.config.get('email_from')
         body = self.format_mail(obj, body)
-        if not emailfrom:
-            if hasattr(obj, 'user_id') and obj.user_id and obj.user_id.email:
-                emailfrom = obj.user_id.email
-
-        name = '[%d] %s' % (obj.id, tools.ustr(obj.name))
+        if not emailfrom and hasattr(obj, 'user_id') and obj.user_id and obj.user_id.email:
+            emailfrom = obj.user_id.email
         emailfrom = tools.ustr(emailfrom)
         reply_to = emailfrom
         if not emailfrom:
             raise osv.except_osv(_('Error!'),
-                    _("No email ID found for your company address."))
-        return mail_message.schedule_with_attach(cr, uid, emailfrom, emails, name, body, model='base.action.rule', reply_to=reply_to, res_id=obj.id)
+                                 _("Missing default email address or missing email on responsible user"))
+        return self.pool.get('mail.mail').create(cr, uid,
+                {   'email_from': emailfrom,
+                    'email_to': emails.join(','),
+                    'reply_to': reply_to,
+                    'state': 'outgoing',
+                    'subject': '[%d] %s' % (obj.id, tools.ustr(obj.name)),
+                    'body_html': '<pre>%s</pre>' % body,
+                    'res_id': obj.id,
+                    'model': obj._table_name,
+                    'auto_delete': True
+                }, context=context)
 
 
     def do_check(self, cr, uid, action, obj, context=None):
@@ -438,11 +432,8 @@ the rule to mark CC(mail to any other person defined in actions)."),
         if len(emails) and action.act_mail_body:
             emails = list(set(emails))
             email_from = safe_eval(action.act_email_from, {}, locals_for_emails)
-
-            def to_email(text):
-                return re.findall(r'([^ ,<@]+@[^> ,]+)', text or '')
-            emails = to_email(','.join(filter(None, emails)))
-            email_froms = to_email(email_from)
+            emails = tools.email_split(','.join(filter(None, emails)))
+            email_froms = tools.email_split(email_from)
             if email_froms:
                 self.email_send(cr, uid, obj, emails, action.act_mail_body, emailfrom=email_froms[0])
         return True
diff --git a/addons/base_action_rule/i18n/ar.po b/addons/base_action_rule/i18n/ar.po
index dad10fc9d06..80229675200 100644
--- a/addons/base_action_rule/i18n/ar.po
+++ b/addons/base_action_rule/i18n/ar.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:58+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:38+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_action_rule
 #: help:base.action.rule,act_mail_to_user:0
diff --git a/addons/base_action_rule/i18n/bg.po b/addons/base_action_rule/i18n/bg.po
index 00ac1646476..2ad732d0f42 100644
--- a/addons/base_action_rule/i18n/bg.po
+++ b/addons/base_action_rule/i18n/bg.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:58+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_action_rule
 #: help:base.action.rule,act_mail_to_user:0
diff --git a/addons/base_action_rule/i18n/bs.po b/addons/base_action_rule/i18n/bs.po
index 1d0b81fc3ea..85412416373 100644
--- a/addons/base_action_rule/i18n/bs.po
+++ b/addons/base_action_rule/i18n/bs.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:58+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_action_rule
 #: help:base.action.rule,act_mail_to_user:0
diff --git a/addons/base_action_rule/i18n/ca.po b/addons/base_action_rule/i18n/ca.po
index f612d5a0a8f..49f4945bc13 100644
--- a/addons/base_action_rule/i18n/ca.po
+++ b/addons/base_action_rule/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:58+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_action_rule
 #: help:base.action.rule,act_mail_to_user:0
diff --git a/addons/base_action_rule/i18n/da.po b/addons/base_action_rule/i18n/da.po
index 938b822eab3..9bd53fc3d27 100644
--- a/addons/base_action_rule/i18n/da.po
+++ b/addons/base_action_rule/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:58+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_action_rule
 #: help:base.action.rule,act_mail_to_user:0
diff --git a/addons/base_action_rule/i18n/de.po b/addons/base_action_rule/i18n/de.po
index f24a0dee05e..352a211562b 100644
--- a/addons/base_action_rule/i18n/de.po
+++ b/addons/base_action_rule/i18n/de.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:58+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_action_rule
 #: help:base.action.rule,act_mail_to_user:0
diff --git a/addons/base_action_rule/i18n/el.po b/addons/base_action_rule/i18n/el.po
index 06491b0a9fd..87d4c4800d6 100644
--- a/addons/base_action_rule/i18n/el.po
+++ b/addons/base_action_rule/i18n/el.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:58+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_action_rule
 #: help:base.action.rule,act_mail_to_user:0
diff --git a/addons/base_action_rule/i18n/es.po b/addons/base_action_rule/i18n/es.po
index e4c51fa1199..d95b0f83988 100644
--- a/addons/base_action_rule/i18n/es.po
+++ b/addons/base_action_rule/i18n/es.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:58+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_action_rule
 #: help:base.action.rule,act_mail_to_user:0
diff --git a/addons/base_action_rule/i18n/es_CR.po b/addons/base_action_rule/i18n/es_CR.po
index 3e1c5732fd1..e8292d556f7 100644
--- a/addons/base_action_rule/i18n/es_CR.po
+++ b/addons/base_action_rule/i18n/es_CR.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:58+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 "Language: es\n"
 
 #. module: base_action_rule
diff --git a/addons/base_action_rule/i18n/es_EC.po b/addons/base_action_rule/i18n/es_EC.po
index b17bef384aa..5fcfd4d038b 100644
--- a/addons/base_action_rule/i18n/es_EC.po
+++ b/addons/base_action_rule/i18n/es_EC.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:58+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_action_rule
 #: help:base.action.rule,act_mail_to_user:0
diff --git a/addons/base_action_rule/i18n/es_PY.po b/addons/base_action_rule/i18n/es_PY.po
index 6380bc04f9e..2b33d74a16f 100644
--- a/addons/base_action_rule/i18n/es_PY.po
+++ b/addons/base_action_rule/i18n/es_PY.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:58+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_action_rule
 #: help:base.action.rule,act_mail_to_user:0
diff --git a/addons/base_action_rule/i18n/fa.po b/addons/base_action_rule/i18n/fa.po
index ef2a5f92039..cd8fe5cc3a2 100644
--- a/addons/base_action_rule/i18n/fa.po
+++ b/addons/base_action_rule/i18n/fa.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:58+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_action_rule
 #: help:base.action.rule,act_mail_to_user:0
diff --git a/addons/base_action_rule/i18n/fi.po b/addons/base_action_rule/i18n/fi.po
index 2ae3bd6bd94..8fdba7522ad 100644
--- a/addons/base_action_rule/i18n/fi.po
+++ b/addons/base_action_rule/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:58+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_action_rule
 #: help:base.action.rule,act_mail_to_user:0
diff --git a/addons/base_action_rule/i18n/fr.po b/addons/base_action_rule/i18n/fr.po
index 31715853a68..da9f3be54bf 100644
--- a/addons/base_action_rule/i18n/fr.po
+++ b/addons/base_action_rule/i18n/fr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:58+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_action_rule
 #: help:base.action.rule,act_mail_to_user:0
diff --git a/addons/base_action_rule/i18n/gl.po b/addons/base_action_rule/i18n/gl.po
index 5d794b1d41e..b2065d328df 100644
--- a/addons/base_action_rule/i18n/gl.po
+++ b/addons/base_action_rule/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:58+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_action_rule
 #: help:base.action.rule,act_mail_to_user:0
diff --git a/addons/base_action_rule/i18n/gu.po b/addons/base_action_rule/i18n/gu.po
index ca6059780bf..bf682eef29d 100644
--- a/addons/base_action_rule/i18n/gu.po
+++ b/addons/base_action_rule/i18n/gu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:58+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_action_rule
 #: help:base.action.rule,act_mail_to_user:0
diff --git a/addons/base_action_rule/i18n/hr.po b/addons/base_action_rule/i18n/hr.po
index cc40b2a8fe0..274ecf088f6 100644
--- a/addons/base_action_rule/i18n/hr.po
+++ b/addons/base_action_rule/i18n/hr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:58+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_action_rule
 #: help:base.action.rule,act_mail_to_user:0
diff --git a/addons/base_action_rule/i18n/hu.po b/addons/base_action_rule/i18n/hu.po
index c70333c8593..e03e28ef34e 100644
--- a/addons/base_action_rule/i18n/hu.po
+++ b/addons/base_action_rule/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:58+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_action_rule
 #: help:base.action.rule,act_mail_to_user:0
diff --git a/addons/base_action_rule/i18n/it.po b/addons/base_action_rule/i18n/it.po
index b951d476c6c..352f489772b 100644
--- a/addons/base_action_rule/i18n/it.po
+++ b/addons/base_action_rule/i18n/it.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:58+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_action_rule
 #: help:base.action.rule,act_mail_to_user:0
diff --git a/addons/base_action_rule/i18n/ja.po b/addons/base_action_rule/i18n/ja.po
index aa831b0a595..8ab189f3ad0 100644
--- a/addons/base_action_rule/i18n/ja.po
+++ b/addons/base_action_rule/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:58+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_action_rule
 #: help:base.action.rule,act_mail_to_user:0
diff --git a/addons/base_action_rule/i18n/lt.po b/addons/base_action_rule/i18n/lt.po
index a501963ea77..4a1edafb602 100644
--- a/addons/base_action_rule/i18n/lt.po
+++ b/addons/base_action_rule/i18n/lt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:58+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_action_rule
 #: help:base.action.rule,act_mail_to_user:0
diff --git a/addons/base_action_rule/i18n/lv.po b/addons/base_action_rule/i18n/lv.po
index 52940e160cf..4dc35787218 100644
--- a/addons/base_action_rule/i18n/lv.po
+++ b/addons/base_action_rule/i18n/lv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:58+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_action_rule
 #: help:base.action.rule,act_mail_to_user:0
diff --git a/addons/base_action_rule/i18n/mn.po b/addons/base_action_rule/i18n/mn.po
index 168725af3b9..672b3b688c6 100644
--- a/addons/base_action_rule/i18n/mn.po
+++ b/addons/base_action_rule/i18n/mn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:58+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_action_rule
 #: help:base.action.rule,act_mail_to_user:0
diff --git a/addons/base_action_rule/i18n/nb.po b/addons/base_action_rule/i18n/nb.po
new file mode 100644
index 00000000000..7aae94c417f
--- /dev/null
+++ b/addons/base_action_rule/i18n/nb.po
@@ -0,0 +1,536 @@
+# Norwegian Bokmal 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-02-08 00:36+0000\n"
+"PO-Revision-Date: 2012-09-03 16:43+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Norwegian Bokmal <nb@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-09-04 04:52+0000\n"
+"X-Generator: Launchpad (build 15890)\n"
+
+#. module: base_action_rule
+#: help:base.action.rule,act_mail_to_user:0
+msgid ""
+"Check this if you want the rule to send an email to the responsible person."
+msgstr ""
+"Sjekk dette hvis du vil at regelen skal sende en e-post til ansvarlig person."
+
+#. module: base_action_rule
+#: field:base.action.rule,act_remind_partner:0
+msgid "Remind Partner"
+msgstr "Påminn partner"
+
+#. module: base_action_rule
+#: field:base.action.rule,trg_partner_categ_id:0
+msgid "Partner Category"
+msgstr "Partner Kategori"
+
+#. module: base_action_rule
+#: field:base.action.rule,act_mail_to_watchers:0
+msgid "Mail to Watchers (CC)"
+msgstr "Post til overvåkere (CC)"
+
+#. module: base_action_rule
+#: field:base.action.rule,trg_state_to:0
+msgid "Button Pressed"
+msgstr "Knapp trykket"
+
+#. module: base_action_rule
+#: field:base.action.rule,model_id:0
+msgid "Object"
+msgstr "Objekt"
+
+#. module: base_action_rule
+#: field:base.action.rule,act_mail_to_email:0
+msgid "Mail to these Emails"
+msgstr "Send mail til disse e-postene"
+
+#. module: base_action_rule
+#: field:base.action.rule,act_state:0
+msgid "Set State to"
+msgstr "Still stat til"
+
+#. module: base_action_rule
+#: field:base.action.rule,act_email_from:0
+msgid "Email From"
+msgstr "E-post fra"
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Email Body"
+msgstr "E-post kropp"
+
+#. module: base_action_rule
+#: selection:base.action.rule,trg_date_range_type:0
+msgid "Days"
+msgstr "Dager"
+
+#. module: base_action_rule
+#: field:base.action.rule,last_run:0
+msgid "Last Run"
+msgstr "Siste kjøring"
+
+#. module: base_action_rule
+#: code:addons/base_action_rule/base_action_rule.py:328
+#, python-format
+msgid "Error!"
+msgstr "Feil!"
+
+#. module: base_action_rule
+#: field:base.action.rule,act_reply_to:0
+msgid "Reply-To"
+msgstr "Svar til"
+
+#. module: base_action_rule
+#: help:base.action.rule,act_email_cc:0
+msgid ""
+"These people will receive a copy of the future communication between partner "
+"and users by email"
+msgstr ""
+"Disse menneskene vil motta en kopi av den fremtidige kommunikasjon mellom "
+"partner og brukere av e-post"
+
+#. module: base_action_rule
+#: selection:base.action.rule,trg_date_range_type:0
+msgid "Minutes"
+msgstr "Minutter"
+
+#. module: base_action_rule
+#: field:base.action.rule,name:0
+msgid "Rule Name"
+msgstr "Regelnavn"
+
+#. module: base_action_rule
+#: help:base.action.rule,act_remind_partner:0
+msgid ""
+"Check this if you want the rule to send a reminder by email to the partner."
+msgstr ""
+"Sjekk dette hvis du vil at regelen skal sende en påminnelse via e-post til "
+"partneren."
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Conditions on Model Partner"
+msgstr "Forholdene på Modell Partner"
+
+#. module: base_action_rule
+#: selection:base.action.rule,trg_date_type:0
+msgid "Deadline"
+msgstr "Frist"
+
+#. module: base_action_rule
+#: field:base.action.rule,trg_partner_id:0
+msgid "Partner"
+msgstr "Partner"
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "%(object_subject)s = Object subject"
+msgstr "%(object_subject)s = Object subject"
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Email Reminders"
+msgstr "E-post påminnelser"
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Special Keywords to be Used in the Body"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,trg_state_from:0
+msgid "State"
+msgstr "Stat"
+
+#. module: base_action_rule
+#: model:ir.actions.act_window,help:base_action_rule.base_action_rule_act
+msgid ""
+"Use automated actions to automatically trigger actions for various screens. "
+"Example: a lead created by a specific user may be automatically set to a "
+"specific sales team, or an opportunity which still has status pending after "
+"14 days might trigger an automatic reminder email."
+msgstr ""
+"Bruke automatiserte tiltak for å automatisk utløse tiltak for ulike "
+"skjermer. Eksempel: en leder er opprettet av en bestemt bruker kan bli satt "
+"automatisk til en bestemt salgsteam, eller en mulighet som fortsatt har "
+"status påvente etter 14 dager kan utløse en automatisk påminnelse e-post."
+
+#. module: base_action_rule
+#: help:base.action.rule,act_mail_to_email:0
+msgid "Email-id of the persons whom mail is to be sent"
+msgstr "E-post ID av personer som post skal sendes"
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Action Rule"
+msgstr "Handling regel"
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Fields to Change"
+msgstr "Felter å endre"
+
+#. module: base_action_rule
+#: selection:base.action.rule,trg_date_type:0
+msgid "Creation Date"
+msgstr "Opprettelsesdato"
+
+#. module: base_action_rule
+#: selection:base.action.rule,trg_date_type:0
+msgid "Last Action Date"
+msgstr "Siste handlingsdato"
+
+#. module: base_action_rule
+#: selection:base.action.rule,trg_date_range_type:0
+msgid "Hours"
+msgstr "Timer"
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "%(object_id)s = Object ID"
+msgstr "%(object_ID)s = Object ID"
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Delay After Trigger Date"
+msgstr "Forsinkelse Etter utløser Dato"
+
+#. module: base_action_rule
+#: field:base.action.rule,act_remind_attach:0
+msgid "Remind with Attachment"
+msgstr "Minn med vedlegg"
+
+#. module: base_action_rule
+#: constraint:ir.cron:0
+msgid "Invalid arguments"
+msgstr "Ugyldige argumenter"
+
+#. module: base_action_rule
+#: field:base.action.rule,act_user_id:0
+msgid "Set Responsible to"
+msgstr "Satt Ansvarlig for å"
+
+#. module: base_action_rule
+#: selection:base.action.rule,trg_date_type:0
+msgid "None"
+msgstr "Ingen"
+
+#. module: base_action_rule
+#: help:base.action.rule,act_email_to:0
+msgid ""
+"Use a python expression to specify the right field on which one than we will "
+"use for the 'To' field of the header"
+msgstr ""
+"Bruk en python uttrykk for å angi høyre feltet på hvilken enn vi vil bruke "
+"for Til-feltet på header."
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "%(object_user_phone)s = Responsible phone"
+msgstr "% (object_bruker_telefonen) s = Ansvarlig telefon"
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid ""
+"The rule uses the AND operator. The model must match all non-empty fields so "
+"that the rule executes the action described in the 'Actions' tab."
+msgstr ""
+"Regelen bruker AND-operatoren. Modellen må matche alle-ikke tomme felt, slik "
+"at regelen utfører handlingen som er beskrevet i \"Handlinger\"-fanen."
+
+#. module: base_action_rule
+#: field:base.action.rule,trg_date_range_type:0
+msgid "Delay type"
+msgstr "forsinkelse typen"
+
+#. module: base_action_rule
+#: help:base.action.rule,regex_name:0
+msgid ""
+"Regular expression for matching name of the resource\n"
+"e.g.: 'urgent.*' will search for records having name starting with the "
+"string 'urgent'\n"
+"Note: This is case sensitive search."
+msgstr ""
+"Regulært uttrykk for matchende navnet på ressursen\n"
+"f.eks: \". haster * 'vil søke etter poster som har navn som starter med "
+"strengen\" haster \"\n"
+"Merk: Dette er små bokstaver søk."
+
+#. module: base_action_rule
+#: field:base.action.rule,act_method:0
+msgid "Call Object Method"
+msgstr "Kall objektmetode"
+
+#. module: base_action_rule
+#: field:base.action.rule,act_email_to:0
+msgid "Email To"
+msgstr "E-post til."
+
+#. module: base_action_rule
+#: help:base.action.rule,act_mail_to_watchers:0
+msgid ""
+"Check this if you want the rule to mark CC(mail to any other person defined "
+"in actions)."
+msgstr ""
+"Sjekk dette hvis du vil at regelen skal merkes CC (mail til en annen person "
+"som er definert i handlinger)."
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "%(partner)s = Partner name"
+msgstr "%(partner)s = Navn på partner"
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Note"
+msgstr "Notat"
+
+#. module: base_action_rule
+#: help:base.action.rule,act_email_from:0
+msgid ""
+"Use a python expression to specify the right field on which one than we will "
+"use for the 'From' field of the header"
+msgstr ""
+"Bruk en python uttrykk for å angi høyre feltet på hvilken enn vi vil bruke "
+"for Fra-feltet på overskriften"
+
+#. module: base_action_rule
+#: field:base.action.rule,trg_date_range:0
+msgid "Delay after trigger date"
+msgstr "Forsinkelse etter triggerdato"
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Conditions"
+msgstr "Betingelser"
+
+#. module: base_action_rule
+#: help:base.action.rule,trg_date_range:0
+msgid ""
+"Delay After Trigger Date,specifies you can put a negative number. If you "
+"need a delay before the trigger date, like sending a reminder 15 minutes "
+"before a meeting."
+msgstr ""
+"Forsinkelse Etter utløser Dato, spesifiserer du kan sette et negativt tall. "
+"Hvis du trenger en forsinkelse før avtrekkeren dato, som å sende en "
+"påminnelse 15 minutter før et møte."
+
+#. module: base_action_rule
+#: field:base.action.rule,active:0
+msgid "Active"
+msgstr "Aktiv"
+
+#. module: base_action_rule
+#: code:addons/base_action_rule/base_action_rule.py:329
+#, python-format
+msgid "No Email ID Found for your Company address!"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,act_remind_user:0
+msgid "Remind Responsible"
+msgstr "Minn Ansvarlig"
+
+#. module: base_action_rule
+#: help:base.action.rule,sequence:0
+msgid "Gives the sequence order when displaying a list of rules."
+msgstr "Gir sekvens ordre når du viser en liste over regler."
+
+#. module: base_action_rule
+#: selection:base.action.rule,trg_date_range_type:0
+msgid "Months"
+msgstr "Måneder"
+
+#. module: base_action_rule
+#: field:base.action.rule,filter_id:0
+msgid "Filter"
+msgstr "Filtrer"
+
+#. module: base_action_rule
+#: selection:base.action.rule,trg_date_type:0
+msgid "Date"
+msgstr "Dato"
+
+#. module: base_action_rule
+#: help:base.action.rule,server_action_id:0
+msgid ""
+"Describes the action name.\n"
+"eg:on which object which action to be taken on basis of which condition"
+msgstr ""
+"Beskriver handlingens navn.\n"
+"f.eks: på hvilket objekt som tiltak som skal iverksettes på grunnlag av "
+"hvilken tilstand"
+
+#. module: base_action_rule
+#: model:ir.model,name:base_action_rule.model_ir_cron
+msgid "ir.cron"
+msgstr "ir.actions.actions"
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "%(object_description)s = Object description"
+msgstr "% (object_beskrivelse) s = Object beskrivelse"
+
+#. module: base_action_rule
+#: constraint:base.action.rule:0
+msgid "Error: The mail is not well formated"
+msgstr "Feil: E-posten er ikke godt nok formatert"
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Email Actions"
+msgstr "E-post handlinger"
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Email Information"
+msgstr "E-post Informasjon"
+
+#. module: base_action_rule
+#: model:ir.model,name:base_action_rule.model_base_action_rule
+msgid "Action Rules"
+msgstr "Handlingsregler"
+
+#. module: base_action_rule
+#: help:base.action.rule,act_mail_body:0
+msgid "Content of mail"
+msgstr "Innholdet av post"
+
+#. module: base_action_rule
+#: field:base.action.rule,trg_user_id:0
+msgid "Responsible"
+msgstr "Ansvarlig"
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "%(partner_email)s = Partner Email"
+msgstr "% (partner_e-post) s = Partner E-post"
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "%(object_date)s = Creation date"
+msgstr "%(object_dato)s = opprettelsesdato"
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "%(object_user_email)s = Responsible Email"
+msgstr "% (object_brukerens_e-post) s = Ansvarlig e-post"
+
+#. module: base_action_rule
+#: field:base.action.rule,act_mail_body:0
+msgid "Mail body"
+msgstr "Mail kropp"
+
+#. module: base_action_rule
+#: help:base.action.rule,act_remind_user:0
+msgid ""
+"Check this if you want the rule to send a reminder by email to the user."
+msgstr ""
+"Kryss av her hvis du vil at regelen skal sende en påminnelse til brukeren "
+"via e-post."
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Server Action to be Triggered"
+msgstr "Server Tiltak som skal Utløses"
+
+#. module: base_action_rule
+#: field:base.action.rule,act_mail_to_user:0
+msgid "Mail to Responsible"
+msgstr "send mail til ansvarlig"
+
+#. module: base_action_rule
+#: field:base.action.rule,act_email_cc:0
+msgid "Add Watchers (Cc)"
+msgstr "Legg til overvåkere (Cc)"
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Conditions on Model Fields"
+msgstr "Forholdene på Modell Felter"
+
+#. module: base_action_rule
+#: model:ir.actions.act_window,name:base_action_rule.base_action_rule_act
+#: model:ir.ui.menu,name:base_action_rule.menu_base_action_rule_form
+msgid "Automated Actions"
+msgstr "Automatiserte handinger"
+
+#. module: base_action_rule
+#: field:base.action.rule,server_action_id:0
+msgid "Server Action"
+msgstr "Tjenerhandling"
+
+#. module: base_action_rule
+#: field:base.action.rule,regex_name:0
+msgid "Regex on Resource Name"
+msgstr "Regex på Ressursnavn"
+
+#. module: base_action_rule
+#: help:base.action.rule,act_remind_attach:0
+msgid ""
+"Check this if you want that all documents attached to the object be attached "
+"to the reminder email sent."
+msgstr ""
+"Kryss av her om du vil at alle dokumenter knyttet til objektet festes til "
+"påminnelse e-post sendt."
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Conditions on Timing"
+msgstr "Vilkår for timing"
+
+#. module: base_action_rule
+#: field:base.action.rule,sequence:0
+msgid "Sequence"
+msgstr "Sekvens"
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Actions"
+msgstr "Handlinger"
+
+#. module: base_action_rule
+#: help:base.action.rule,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the rule "
+"without removing it."
+msgstr ""
+"Hvis det aktive feltet er satt til False, vil det tillate deg å skjule "
+"regelen uten å fjerne den."
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "%(object_user)s = Responsible name"
+msgstr "% (object_bruker) s = Ansvarlig navn"
+
+#. module: base_action_rule
+#: field:base.action.rule,create_date:0
+msgid "Create Date"
+msgstr "Opprettet dato"
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Conditions on States"
+msgstr "Vilkår for tilstander"
+
+#. module: base_action_rule
+#: field:base.action.rule,trg_date_type:0
+msgid "Trigger Date"
+msgstr "Uttløser dato"
+
+#~ msgid "Special Keywords to Be Used in The Body"
+#~ msgstr "Spesielle nøkkelord for bruk i meldingsinnhold"
+
+#, python-format
+#~ msgid "No E-Mail ID Found for your Company address!"
+#~ msgstr "Ingen E-post ID funnet for din firmaadresse!"
diff --git a/addons/base_action_rule/i18n/nl.po b/addons/base_action_rule/i18n/nl.po
index b70d99d873f..d855d5a01f8 100644
--- a/addons/base_action_rule/i18n/nl.po
+++ b/addons/base_action_rule/i18n/nl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:58+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_action_rule
 #: help:base.action.rule,act_mail_to_user:0
diff --git a/addons/base_action_rule/i18n/pl.po b/addons/base_action_rule/i18n/pl.po
index da30bd781ef..14397d406c0 100644
--- a/addons/base_action_rule/i18n/pl.po
+++ b/addons/base_action_rule/i18n/pl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:58+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_action_rule
 #: help:base.action.rule,act_mail_to_user:0
diff --git a/addons/base_action_rule/i18n/pt.po b/addons/base_action_rule/i18n/pt.po
index fadf1cf4a3d..0e0e16faa27 100644
--- a/addons/base_action_rule/i18n/pt.po
+++ b/addons/base_action_rule/i18n/pt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:58+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_action_rule
 #: help:base.action.rule,act_mail_to_user:0
diff --git a/addons/base_action_rule/i18n/pt_BR.po b/addons/base_action_rule/i18n/pt_BR.po
index b50b6fe73e7..758e57a7a47 100644
--- a/addons/base_action_rule/i18n/pt_BR.po
+++ b/addons/base_action_rule/i18n/pt_BR.po
@@ -9,13 +9,14 @@ msgstr ""
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:36+0000\n"
 "PO-Revision-Date: 2012-07-28 14:59+0000\n"
-"Last-Translator: Fábio Martinelli <webmaster@guaru.net>\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: 2012-08-09 04:58+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_action_rule
 #: help:base.action.rule,act_mail_to_user:0
diff --git a/addons/base_action_rule/i18n/ro.po b/addons/base_action_rule/i18n/ro.po
index 77f7cbe419a..f436f6e9bdd 100644
--- a/addons/base_action_rule/i18n/ro.po
+++ b/addons/base_action_rule/i18n/ro.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:58+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_action_rule
 #: help:base.action.rule,act_mail_to_user:0
diff --git a/addons/base_action_rule/i18n/ru.po b/addons/base_action_rule/i18n/ru.po
index 85ec32c4367..59b10e6d3eb 100644
--- a/addons/base_action_rule/i18n/ru.po
+++ b/addons/base_action_rule/i18n/ru.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:58+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_action_rule
 #: help:base.action.rule,act_mail_to_user:0
diff --git a/addons/base_action_rule/i18n/sl.po b/addons/base_action_rule/i18n/sl.po
index 50e71449103..c1652e9fd59 100644
--- a/addons/base_action_rule/i18n/sl.po
+++ b/addons/base_action_rule/i18n/sl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:58+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_action_rule
 #: help:base.action.rule,act_mail_to_user:0
diff --git a/addons/base_action_rule/i18n/sq.po b/addons/base_action_rule/i18n/sq.po
index d92f72b679e..095d99142e3 100644
--- a/addons/base_action_rule/i18n/sq.po
+++ b/addons/base_action_rule/i18n/sq.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:58+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:38+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_action_rule
 #: help:base.action.rule,act_mail_to_user:0
diff --git a/addons/base_action_rule/i18n/sr.po b/addons/base_action_rule/i18n/sr.po
index d8a0102b30f..e2d16208e21 100644
--- a/addons/base_action_rule/i18n/sr.po
+++ b/addons/base_action_rule/i18n/sr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:58+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_action_rule
 #: help:base.action.rule,act_mail_to_user:0
diff --git a/addons/base_action_rule/i18n/sr@latin.po b/addons/base_action_rule/i18n/sr@latin.po
index 4d471d2c230..33ca418236f 100644
--- a/addons/base_action_rule/i18n/sr@latin.po
+++ b/addons/base_action_rule/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:58+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_action_rule
 #: help:base.action.rule,act_mail_to_user:0
diff --git a/addons/base_action_rule/i18n/sv.po b/addons/base_action_rule/i18n/sv.po
index bcc7ec3c4bf..3d7b1df0aee 100644
--- a/addons/base_action_rule/i18n/sv.po
+++ b/addons/base_action_rule/i18n/sv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:58+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_action_rule
 #: help:base.action.rule,act_mail_to_user:0
diff --git a/addons/base_action_rule/i18n/tr.po b/addons/base_action_rule/i18n/tr.po
index 75fa9df83b3..80a9b39df8a 100644
--- a/addons/base_action_rule/i18n/tr.po
+++ b/addons/base_action_rule/i18n/tr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:58+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_action_rule
 #: help:base.action.rule,act_mail_to_user:0
diff --git a/addons/base_action_rule/i18n/zh_CN.po b/addons/base_action_rule/i18n/zh_CN.po
index 1dc78ba4bad..62ef3aa4531 100644
--- a/addons/base_action_rule/i18n/zh_CN.po
+++ b/addons/base_action_rule/i18n/zh_CN.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:58+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_action_rule
 #: help:base.action.rule,act_mail_to_user:0
diff --git a/addons/base_action_rule/i18n/zh_TW.po b/addons/base_action_rule/i18n/zh_TW.po
index 803c62dd641..e1f5bf7dfd2 100644
--- a/addons/base_action_rule/i18n/zh_TW.po
+++ b/addons/base_action_rule/i18n/zh_TW.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:58+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_action_rule
 #: help:base.action.rule,act_mail_to_user:0
diff --git a/addons/base_calendar/__openerp__.py b/addons/base_calendar/__openerp__.py
index 58f666baa0d..48ec05e2e92 100644
--- a/addons/base_calendar/__openerp__.py
+++ b/addons/base_calendar/__openerp__.py
@@ -20,14 +20,15 @@
 ##############################################################################
 
 {
-    "name": "Calendar Layer",
-    "version": "1.0",
-    "depends": ["base", "base_status", "mail", "base_action_rule"],
+    'name': 'Calendar Layer',
+    'version': '1.0',
+    'depends': ['base', 'base_status', 'mail', 'base_action_rule'],
     'description': """
 This is a full-featured calendar system.
 ========================================
 
 It supports:
+------------
     - Calendar of events
     - Alerts (create requests)
     - Recurring events
@@ -35,25 +36,23 @@ It supports:
 
 If you need to manage your meetings, you should install the CRM module.
     """,
-    "author": "OpenERP SA",
+    'author': 'OpenERP SA',
     'category': 'Hidden/Dependency',
     'website': 'http://www.openerp.com',
-    "init_xml": [
-        'base_calendar_data.xml',
-        'crm_meeting_data.xml',
-    ],
-    "demo_xml": ['crm_meeting_demo.xml'],
-    "update_xml": [
+    'demo': ['crm_meeting_demo.xml'],
+    'data': [
         'security/calendar_security.xml',
         'security/ir.model.access.csv',
         'wizard/base_calendar_invite_attendee_view.xml',
         'base_calendar_view.xml',
         'crm_meeting_view.xml',
+        'base_calendar_data.xml',
+        'crm_meeting_data.xml',
     ],
-    "test" : ['test/base_calendar_test.yml'],
-    "installable": True,
-    "auto_install": False,
-    "certificate": "00694071962960352821",
+    'test' : ['test/base_calendar_test.yml'],
+    'installable': True,
+    'auto_install': False,
+    'certificate': '00694071962960352821',
     'images': ['images/base_calendar1.jpeg','images/base_calendar2.jpeg','images/base_calendar3.jpeg','images/base_calendar4.jpeg',],
 }
 
diff --git a/addons/base_calendar/base_calendar.py b/addons/base_calendar/base_calendar.py
index be3244f8a5b..a6d5f6859af 100644
--- a/addons/base_calendar/base_calendar.py
+++ b/addons/base_calendar/base_calendar.py
@@ -471,18 +471,10 @@ property or property parameter."),
     def _send_mail(self, cr, uid, ids, mail_to, email_from=tools.config.get('email_from', False), context=None):
         """
         Send mail for event invitation to event attendees.
-        @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks,
-        @param ids: List of attendee’s IDs.
         @param email_from: Email address for user sending the mail
-        @param context: A standard dictionary for contextual values
         @return: True
         """
-        if context is None:
-            context = {}
-
         company = self.pool.get('res.users').browse(cr, uid, uid, context=context).company_id.name
-        mail_message = self.pool.get('mail.message')
         for att in self.browse(cr, uid, ids, context=context):
             sign = att.sent_by_uid and att.sent_by_uid.signature or ''
             sign = '<br>'.join(sign and sign.split('\n') or [])
@@ -508,17 +500,18 @@ property or property parameter."),
                 }
                 body = html_invitation % body_vals
                 if mail_to and email_from:
-                    attach = self.get_ics_file(cr, uid, res_obj, context=context)
-                    mail_message.schedule_with_attach(cr, uid,
-                        email_from,
-                        mail_to,
-                        sub,
-                        body,
-                        attachments=attach and {'invitation.ics': attach} or None,
-                        content_subtype='html',
-                        reply_to=email_from,
-                        context=context
-                    )
+                    ics_file = self.get_ics_file(cr, uid, res_obj, context=context)
+                    vals = {'email_from': email_from,
+                            'email_to': mail_to,
+                            'state': 'outgoing',
+                            'subject': sub,
+                            'body_html': body,
+                            'auto_delete': True}
+                    if ics_file:
+                        vals['attachment_ids'] = [(0,0,{'name': 'invitation.ics',
+                                                        'datas_fname': 'invitation.ics',
+                                                        'datas': str(ics_file).encode('base64')})]
+                    self.pool.get('mail.mail').create(cr, uid, vals, context=context)
             return True
 
     def onchange_user_id(self, cr, uid, ids, user_id, *args, **argv):
@@ -812,7 +805,6 @@ class calendar_alarm(osv.osv):
         """
         if context is None:
             context = {}
-        mail_message = self.pool.get('mail.message')
         current_datetime = datetime.now()
         alarm_ids = self.search(cr, uid, [('state', '!=', 'done')], context=context)
 
@@ -849,36 +841,10 @@ class calendar_alarm(osv.osv):
             else:
                 re_dates = [alarm.trigger_date]
 
-            for r_date in re_dates:
-                ref = alarm.model_id.model + ',' + str(alarm.res_id)
-
-                # search for alreay sent requests
-                #if request_obj.search(cr, uid, [('trigger_date', '=', r_date), ('ref_doc1', '=', ref)], context=context):
-                    #continue
-
-                # Deactivated because of the removing of res.request
-                # TODO: when cleaning calendar module, re-add this in a new mechanism
-                #if alarm.action == 'display':
-                    #value = {
-                       #'name': alarm.name,
-                       #'act_from': alarm.user_id.id,
-                       #'act_to': alarm.user_id.id,
-                       #'body': alarm.description,
-                       #'trigger_date': r_date,
-                       #'ref_doc1': ref
-                    #}
-                    #request_id = request_obj.create(cr, uid, value)
-                    #request_ids = [request_id]
-                    #for attendee in res_obj.attendee_ids:
-                        #if attendee.user_id:
-                            #value['act_to'] = attendee.user_id.id
-                            #request_id = request_obj.create(cr, uid, value)
-                            #request_ids.append(request_id)
-                    #request_obj.request_send(cr, uid, request_ids)
-
+            if re_dates:
                 if alarm.action == 'email':
-                    sub = '[Openobject Reminder] %s' % (alarm.name)
-                    body = """
+                    sub = '[OpenERP Reminder] %s' % (alarm.name)
+                    body = """<pre>
 Event: %s
 Event Date: %s
 Description: %s
@@ -888,20 +854,21 @@ From:
 
 ----
 %s
-
+</pre>
 """  % (alarm.name, alarm.trigger_date, alarm.description, \
                         alarm.user_id.name, alarm.user_id.signature)
                     mail_to = [alarm.user_id.email]
                     for att in alarm.attendee_ids:
                         mail_to.append(att.user_id.email)
                     if mail_to:
-                        mail_message.schedule_with_attach(cr, uid,
-                            tools.config.get('email_from', False),
-                            mail_to,
-                            sub,
-                            body,
-                            context=context
-                        )
+                        vals = {
+                            'state': 'outgoing',
+                            'subject': sub,
+                            'body_html': body,
+                            'email_to': mail_to,
+                            'email_from': tools.config.get('email_from', mail_to),
+                        }
+                        self.pool.get('mail.mail').create(cr, uid, vals, context=context)
             if next_trigger_date:
                 update_vals.update({'trigger_date': next_trigger_date})
             else:
@@ -1616,36 +1583,6 @@ class calendar_todo(osv.osv):
 
 calendar_todo()
 
-class ir_attachment(osv.osv):
-    _name = 'ir.attachment'
-    _inherit = 'ir.attachment'
-
-    def search_count(self, cr, user, args, context=None):
-        new_args = []
-        for domain_item in args:
-            if isinstance(domain_item, (list, tuple)) and len(domain_item) == 3 and domain_item[0] == 'res_id':
-                new_args.append((domain_item[0], domain_item[1], base_calendar_id2real_id(domain_item[2])))
-            else:
-                new_args.append(domain_item)
-        return super(ir_attachment, self).search_count(cr, user, new_args, context)
-
-    def create(self, cr, uid, vals, context=None):
-        if context:
-            id = context.get('default_res_id', False)
-            context.update({'default_res_id' : base_calendar_id2real_id(id)})
-        return super(ir_attachment, self).create(cr, uid, vals, context=context)
-
-    def search(self, cr, uid, args, offset=0, limit=None, order=None,
-            context=None, count=False):
-        new_args = []
-        for domain_item in args:
-            if isinstance(domain_item, (list, tuple)) and len(domain_item) == 3 and domain_item[0] == 'res_id':
-                new_args.append((domain_item[0], domain_item[1], base_calendar_id2real_id(domain_item[2])))
-            else:
-                new_args.append(domain_item)
-        return super(ir_attachment, self).search(cr, uid, new_args, offset=offset,
-                            limit=limit, order=order, context=context, count=False)
-ir_attachment()
 
 class ir_values(osv.osv):
     _inherit = 'ir.values'
diff --git a/addons/base_calendar/crm_meeting.py b/addons/base_calendar/crm_meeting.py
index cb96ff2a4d0..e1c66148ae7 100644
--- a/addons/base_calendar/crm_meeting.py
+++ b/addons/base_calendar/crm_meeting.py
@@ -43,7 +43,7 @@ class crm_meeting(base_state, osv.Model):
     _name = 'crm.meeting'
     _description = "Meeting"
     _order = "id desc"
-    _inherit = ["calendar.event", 'ir.needaction_mixin', "mail.thread"]
+    _inherit = ["calendar.event", "mail.thread", 'ir.needaction_mixin']
     _columns = {
         # base_state required fields
         'create_date': fields.datetime('Creation Date', readonly=True),
@@ -70,13 +70,17 @@ class crm_meeting(base_state, osv.Model):
     # OpenChatter
     # ----------------------------------------
 
+    # shows events of the day for this user
+    def needaction_domain_get(self, cr, uid, domain=[], context={}):
+        return [('date','<=',time.strftime('%Y-%M-%D 23:59:59')), ('date_deadline','>=', time.strftime('%Y-%M-%D 00:00:00')), ('user_id','=',uid)]
+
     def case_get_note_msg_prefix(self, cr, uid, id, context=None):
         return 'Meeting'
 
     def case_open_send_note(self, cr, uid, ids, context=None):
-        return self.message_append_note(cr, uid, ids, body=_("Meeting has been <b>confirmed</b>."), context=context)
+        return self.message_post(cr, uid, ids, body=_("Meeting <b>confirmed</b>."), context=context)
 
     def case_close_send_note(self, cr, uid, ids, context=None):
-        return self.message_append_note(cr, uid, ids, body=_("Meeting has been <b>done</b>."), context=context)
+        return self.message_post(cr, uid, ids, body=_("Meeting <b>completed</b>."), context=context)
 
 
diff --git a/addons/base_calendar/crm_meeting_data.xml b/addons/base_calendar/crm_meeting_data.xml
index 44838514935..d1cffddc403 100644
--- a/addons/base_calendar/crm_meeting_data.xml
+++ b/addons/base_calendar/crm_meeting_data.xml
@@ -16,6 +16,14 @@
             <field name="name">Off-site Meeting</field>
         </record>
 
+        <record model="crm.meeting.type" id="categ_meet4">
+            <field name="name">Open Discussion</field>
+        </record>
+
+        <record model="crm.meeting.type" id="categ_meet5">
+            <field name="name">Feedback Meeting</field>
+        </record>
+
          <record model="res.request.link" id="request_link_meeting">
             <field name="name">Meeting</field>
             <field name="object">crm.meeting</field>
diff --git a/addons/base_calendar/crm_meeting_demo.xml b/addons/base_calendar/crm_meeting_demo.xml
index 221653e5fc3..6c098e2f949 100644
--- a/addons/base_calendar/crm_meeting_demo.xml
+++ b/addons/base_calendar/crm_meeting_demo.xml
@@ -27,7 +27,7 @@
             <field eval="time.strftime('%Y-%m-05 12:00:00')" name="date"/>
             <field eval="time.strftime('%Y-%m-05 19:00:00')" name="date_deadline"/>
             <field eval="7.0" name="duration"/>
-            <field name="state">draft</field>
+            <field name="state">open</field>
         </record>
 
         <record id="crm_meeting_3" model="crm.meeting">
@@ -39,7 +39,7 @@
             <field eval="time.strftime('%Y-%m-12 15:55:05')" name="date"/>
             <field eval="time.strftime('%Y-%m-12 18:55:05')" name="date_deadline"/>
             <field eval="3.0" name="duration"/>
-            <field name="state">done</field>
+            <field name="state">open</field>
         </record>
 
         <record id="crm_meeting_4" model="crm.meeting">
@@ -61,7 +61,7 @@
             <field eval="time.strftime('%Y-%m-22 11:05:00')" name="date"/>
             <field eval="time.strftime('%Y-%m-22 16:05:00')" name="date_deadline"/>
             <field eval="5" name="duration"/>
-            <field name="state">draft</field>
+            <field name="state">open</field>
         </record>
 
         <record id="crm_meeting_6" model="crm.meeting">
@@ -72,7 +72,7 @@
             <field eval="time.strftime('%Y-%m-18 2:00:00')" name="date"/>
             <field eval="time.strftime('%Y-%m-18 10:30:00')" name="date_deadline"/>
             <field eval="8.5" name="duration"/>
-            <field name="state">done</field>
+            <field name="state">open</field>
         </record>
     </data>
 </openerp>
diff --git a/addons/base_calendar/crm_meeting_view.xml b/addons/base_calendar/crm_meeting_view.xml
index 51d17ed43f8..928f8d94d5c 100644
--- a/addons/base_calendar/crm_meeting_view.xml
+++ b/addons/base_calendar/crm_meeting_view.xml
@@ -70,7 +70,7 @@
         <field name="arch" type="xml">
             <form string="Meetings" version="7.0">
                 <header>
-                    <field name="state"/>
+                    <field name="state" invisible="True"/>
                 </header>
                 <sheet>
                     <div class="oe_title">
@@ -115,7 +115,7 @@
                                     <label for="allday" string="All Day?"/>)
                                 </div>
                                     <field name="recurrency"
-                                        attrs="{'readonly': ['|', ('recurrent_uid','!=',False), ('state','=','done')]}"/>
+                                        attrs="{'readonly': [('recurrent_uid','!=',False)]}"/>
                             </group>
                             <group>
                                 <field name="alarm_id" widget="selection" />
@@ -170,7 +170,7 @@
                     <page string="Invitation Detail">
                         <button string="Invite People"
                             name="%(base_calendar.action_view_calendar_invite_attendee_wizard)d"
-                            icon="terp-partner" type="action"
+                            type="action"
                             attrs="{'readonly': [('state', '=', 'done')]}"
                             context="{'model' : 'crm.meeting', 'attendee_field':'attendee_ids'}" colspan="2"/>
                         <field name="attendee_ids" widget="one2many" mode="tree">
@@ -183,17 +183,16 @@
                                 <button name="do_tentative"
                                     states="needs-action,declined,accepted"
                                     string="Uncertain" type="object"
-                                    icon="terp-crm" />
+                                    />
                                 <button name="do_accept" string="Accept"
                                     states="needs-action,tentative,declined"
-                                    type="object" icon="gtk-apply" />
+                                    type="object" />
                                 <button name="do_decline" string="Decline"
                                     states="needs-action,tentative,accepted"
-                                    type="object" icon="gtk-cancel" />
+                                    type="object" />
                                 <button
                                     name="%(base_calendar.action_view_calendar_invite_attendee_wizard)d"
                                     string="Delegate" type="action"
-                                    icon="gtk-sort-descending"
                                     states="needs-action,tentative,declined,accepted"
                                     context="{'model' : 'calendar.attendee', 'attendee_field' : 'child_ids'}" />
                             </tree>
@@ -201,16 +200,16 @@
                                 <header>
                                     <button name="do_tentative" type="object"
                                         states="needs-action,declined,accepted"
-                                        string="Uncertain" icon="terp-crm" />
+                                        string="Uncertain" />
                                     <button name="do_accept" type="object"
                                         states="needs-action,tentative,declined"
-                                        string="Accept" icon="gtk-apply" />
+                                        string="Accept" />
                                     <button name="do_decline" type="object"
                                         states="needs-action,tentative,accepted"
-                                        string="Decline" icon="gtk-cancel" />
+                                        string="Decline" />
                                     <button name="%(base_calendar.action_view_calendar_invite_attendee_wizard)d" type="action"
                                         states="needs-action,tentative,declined,accepted"
-                                        string="Delegate" icon="gtk-sort-descending"
+                                        string="Delegate" 
                                         context="{'model' : 'calendar.attendee', 'attendee_field' : 'child_ids'}" />
                                     <field name="state" widget="statusbar" statusbar_visible="draft,open,done"/>
                                 </header>
@@ -245,14 +244,13 @@
         <field name="name">CRM - Meetings Tree</field>
         <field name="model">crm.meeting</field>
         <field name="arch" type="xml">
-            <tree string="Meetings" fonts="bold:needaction_pending==True"
-                colors="red:state=='open';black:state in ('draft', 'cancel','done','pending')">
+            <tree string="Meetings" fonts="bold:message_unread==True">
                 <field name="name" string="Subject" />
                 <field name="user_id"/>
                 <field name="date"/>
-                <field name="state"/>
+                <field name="state" invisible="True"/>
                 <field name="duration" />
-                <field name="needaction_pending" invisible="1"/>
+                <field name="message_unread" invisible="1"/>
             </tree>
         </field>
     </record>
@@ -289,9 +287,9 @@
         <field name="arch" type="xml">
             <search string="Search Meetings">
                 <field name="name" string="Meeting" filter_domain="[('name','ilike',self)]"/>
-                <filter string="Inbox" help="Unread messages" icon="terp-mail-message-new" name="needaction_pending" domain="[('needaction_pending','=',True)]"/>
+                <filter string="Inbox" help="Unread messages" name="message_unread" domain="[('message_unread','=',True)]"/>
                 <separator/>
-                <filter string="My Meetings" help="My Meetings" icon="terp-personal" domain="[('user_id','=',uid)]"/>
+                <filter string="My Meetings" help="My Meetings" domain="[('user_id','=',uid)]"/>
                 <field name="user_id"/>
                 <field name="partner_ids"/>
             </search>
diff --git a/addons/base_calendar/i18n/af.po b/addons/base_calendar/i18n/af.po
index 285a533dfd2..5f087bbc330 100644
--- a/addons/base_calendar/i18n/af.po
+++ b/addons/base_calendar/i18n/af.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:57+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:37+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
diff --git a/addons/base_calendar/i18n/ar.po b/addons/base_calendar/i18n/ar.po
index 39b0e504900..6e5d6c66cb4 100644
--- a/addons/base_calendar/i18n/ar.po
+++ b/addons/base_calendar/i18n/ar.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:57+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:37+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
diff --git a/addons/base_calendar/i18n/bg.po b/addons/base_calendar/i18n/bg.po
index 6e55cc526ff..84976ad7f1a 100644
--- a/addons/base_calendar/i18n/bg.po
+++ b/addons/base_calendar/i18n/bg.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:57+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:37+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
diff --git a/addons/base_calendar/i18n/bn.po b/addons/base_calendar/i18n/bn.po
index 73917a7b9f4..82a424bbc8a 100644
--- a/addons/base_calendar/i18n/bn.po
+++ b/addons/base_calendar/i18n/bn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:57+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:37+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
diff --git a/addons/base_calendar/i18n/bs.po b/addons/base_calendar/i18n/bs.po
index 5c984726f07..6ab89c498cc 100644
--- a/addons/base_calendar/i18n/bs.po
+++ b/addons/base_calendar/i18n/bs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:57+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:37+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 "X-Poedit-Country: BOSNIA AND HERZEGOVINA\n"
 "Language: hr\n"
 "X-Poedit-Language: Bosnian\n"
diff --git a/addons/base_calendar/i18n/ca.po b/addons/base_calendar/i18n/ca.po
index b170791e384..324f1ed9112 100644
--- a/addons/base_calendar/i18n/ca.po
+++ b/addons/base_calendar/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:57+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:37+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
diff --git a/addons/base_calendar/i18n/cs.po b/addons/base_calendar/i18n/cs.po
index 820202a9565..ad39f54ee52 100644
--- a/addons/base_calendar/i18n/cs.po
+++ b/addons/base_calendar/i18n/cs.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:57+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:37+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
diff --git a/addons/base_calendar/i18n/da.po b/addons/base_calendar/i18n/da.po
index 33bcd3f14a0..3ea85ae45bb 100644
--- a/addons/base_calendar/i18n/da.po
+++ b/addons/base_calendar/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:57+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:37+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
diff --git a/addons/base_calendar/i18n/de.po b/addons/base_calendar/i18n/de.po
index 05b6993948b..cdd295fc02f 100644
--- a/addons/base_calendar/i18n/de.po
+++ b/addons/base_calendar/i18n/de.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:58+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:37+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
diff --git a/addons/base_calendar/i18n/el.po b/addons/base_calendar/i18n/el.po
index 34276e2f0ca..49c8fc801b9 100644
--- a/addons/base_calendar/i18n/el.po
+++ b/addons/base_calendar/i18n/el.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:58+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:37+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
diff --git a/addons/base_calendar/i18n/es.po b/addons/base_calendar/i18n/es.po
index fcf9531a5e5..3ac43b0166c 100644
--- a/addons/base_calendar/i18n/es.po
+++ b/addons/base_calendar/i18n/es.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:58+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:38+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
diff --git a/addons/base_calendar/i18n/es_CR.po b/addons/base_calendar/i18n/es_CR.po
index da04bbc22c7..a6a77df941e 100644
--- a/addons/base_calendar/i18n/es_CR.po
+++ b/addons/base_calendar/i18n/es_CR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:58+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:38+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 "Language: es\n"
 
 #. module: base_calendar
diff --git a/addons/base_calendar/i18n/es_EC.po b/addons/base_calendar/i18n/es_EC.po
index 1eb9bb7ee48..5214b13734c 100644
--- a/addons/base_calendar/i18n/es_EC.po
+++ b/addons/base_calendar/i18n/es_EC.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:58+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:38+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
diff --git a/addons/base_calendar/i18n/es_PY.po b/addons/base_calendar/i18n/es_PY.po
index 5f322d703e9..2ae0f64a3e0 100644
--- a/addons/base_calendar/i18n/es_PY.po
+++ b/addons/base_calendar/i18n/es_PY.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:58+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:38+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
diff --git a/addons/base_calendar/i18n/et.po b/addons/base_calendar/i18n/et.po
index 02c33e5b1c7..de2ad342c2f 100644
--- a/addons/base_calendar/i18n/et.po
+++ b/addons/base_calendar/i18n/et.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:57+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:37+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
diff --git a/addons/base_calendar/i18n/fa.po b/addons/base_calendar/i18n/fa.po
index 75ec4eb2611..26b58644d4f 100644
--- a/addons/base_calendar/i18n/fa.po
+++ b/addons/base_calendar/i18n/fa.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:58+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:38+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
diff --git a/addons/base_calendar/i18n/fi.po b/addons/base_calendar/i18n/fi.po
index 3b3250e0842..382c38ebf82 100644
--- a/addons/base_calendar/i18n/fi.po
+++ b/addons/base_calendar/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:57+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:37+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
diff --git a/addons/base_calendar/i18n/fr.po b/addons/base_calendar/i18n/fr.po
index 78ceb1a8e56..814f3c73569 100644
--- a/addons/base_calendar/i18n/fr.po
+++ b/addons/base_calendar/i18n/fr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:58+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:37+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
diff --git a/addons/base_calendar/i18n/gl.po b/addons/base_calendar/i18n/gl.po
index b7b89f5e62e..0667d79fb14 100644
--- a/addons/base_calendar/i18n/gl.po
+++ b/addons/base_calendar/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:58+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:37+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
diff --git a/addons/base_calendar/i18n/hr.po b/addons/base_calendar/i18n/hr.po
index b22f984019a..66e0f5ab867 100644
--- a/addons/base_calendar/i18n/hr.po
+++ b/addons/base_calendar/i18n/hr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:58+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:38+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
diff --git a/addons/base_calendar/i18n/hu.po b/addons/base_calendar/i18n/hu.po
index 3e06b3511a9..cff2bf90bf9 100644
--- a/addons/base_calendar/i18n/hu.po
+++ b/addons/base_calendar/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:58+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:37+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
diff --git a/addons/base_calendar/i18n/id.po b/addons/base_calendar/i18n/id.po
new file mode 100644
index 00000000000..f80a0cf3a7f
--- /dev/null
+++ b/addons/base_calendar/i18n/id.po
@@ -0,0 +1,1526 @@
+# 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-02-08 00:36+0000\n"
+"PO-Revision-Date: 2012-08-27 02:14+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\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: 2012-08-28 06:37+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+msgid "Invitation Type"
+msgstr "Tipe Undangan"
+
+#. module: base_calendar
+#: selection:calendar.alarm,trigger_related:0
+#: selection:res.alarm,trigger_related:0
+msgid "The event starts"
+msgstr "Event  dimulai"
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+msgid "Declined Invitations"
+msgstr "Tolak Undangan"
+
+#. module: base_calendar
+#: help:calendar.event,exdate:0
+#: help:calendar.todo,exdate:0
+msgid ""
+"This property defines the list of date/time exceptions for a recurring "
+"calendar component."
+msgstr ""
+"Properti ini mendefinisikan daftar pengecualian tanggal / waktu untuk "
+"komponen kalender berulang."
+
+#. module: base_calendar
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr ""
+"Perusahaan yang dipilih tidak ada di dalam  perusahaan  diijinkan  untuk "
+"pengguna ini"
+
+#. module: base_calendar
+#: field:calendar.event,we:0
+#: field:calendar.todo,we:0
+msgid "Wed"
+msgstr "Rabu"
+
+#. module: base_calendar
+#: selection:calendar.event,rrule_type:0
+#: selection:calendar.todo,rrule_type:0
+msgid "Monthly"
+msgstr "Bulanan"
+
+#. module: base_calendar
+#: selection:calendar.attendee,cutype:0
+msgid "Unknown"
+msgstr "Tidak diketahui"
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+msgid "Invited User"
+msgstr "Pengguna yang diundang"
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+msgid "Invitation"
+msgstr "Undangan"
+
+#. module: base_calendar
+#: help:calendar.event,recurrency:0
+#: help:calendar.todo,recurrency:0
+msgid "Recurrent Meeting"
+msgstr "Pertemuan yang Berulang"
+
+#. module: base_calendar
+#: model:ir.actions.act_window,name:base_calendar.action_res_alarm_view
+#: model:ir.ui.menu,name:base_calendar.menu_crm_meeting_avail_alarm
+msgid "Alarms"
+msgstr "Alarm"
+
+#. module: base_calendar
+#: selection:calendar.event,week_list:0
+#: selection:calendar.todo,week_list:0
+msgid "Sunday"
+msgstr "Minggu"
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: field:calendar.attendee,role:0
+msgid "Role"
+msgstr "Peran"
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: view:calendar.event:0
+msgid "Invitation details"
+msgstr "Detail Undangan"
+
+#. module: base_calendar
+#: selection:calendar.event,byday:0
+#: selection:calendar.todo,byday:0
+msgid "Fourth"
+msgstr "Keempat"
+
+#. module: base_calendar
+#: code:addons/base_calendar/base_calendar.py:1006
+#, python-format
+msgid "Count cannot be negative"
+msgstr "Perhitungan tidak bisa negatif"
+
+#. module: base_calendar
+#: field:calendar.event,day:0
+#: selection:calendar.event,select1:0
+#: field:calendar.todo,day:0
+#: selection:calendar.todo,select1:0
+msgid "Date of month"
+msgstr "Tanggal Bulan"
+
+#. module: base_calendar
+#: selection:calendar.event,class:0
+#: selection:calendar.todo,class:0
+msgid "Public"
+msgstr "Umum"
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid " "
+msgstr ""
+"Merupakan suatu karakter spasi. Masukkan sebuah spasi ke dalam posisi yang "
+"ekuivalen di dalam translasi "
+
+#. module: base_calendar
+#: selection:calendar.event,month_list:0
+#: selection:calendar.todo,month_list:0
+msgid "March"
+msgstr ""
+
+#. module: base_calendar
+#: code:addons/base_calendar/base_calendar.py:418
+#: code:addons/base_calendar/base_calendar.py:1411
+#, python-format
+msgid "Warning !"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,rrule_type:0
+#: field:calendar.todo,rrule_type:0
+msgid "Recurrency"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.event,week_list:0
+#: selection:calendar.todo,week_list:0
+msgid "Friday"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,allday:0
+#: field:calendar.todo,allday:0
+msgid "All Day"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,select1:0
+#: field:calendar.todo,select1:0
+msgid "Option"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.attendee,availability:0
+#: selection:calendar.event,show_as:0
+#: selection:calendar.todo,show_as:0
+#: selection:res.users,availability:0
+msgid "Free"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.attendee,rsvp:0
+msgid "Indicats whether the favor of a reply is requested"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.alarm,alarm_id:0
+msgid "Basic Alarm"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.attendee,delegated_to:0
+msgid "The users that the original request was delegated to"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.attendee,ref:0
+msgid "Event Ref"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "Show Time as"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,tu:0
+#: field:calendar.todo,tu:0
+msgid "Tue"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.event,byday:0
+#: selection:calendar.todo,byday:0
+msgid "Third"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.event,rrule_type:0
+#: selection:calendar.todo,rrule_type:0
+msgid "Yearly"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.event,byday:0
+#: selection:calendar.todo,byday:0
+msgid "Last"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.attendee,cutype:0
+msgid "Room"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+msgid "Accepted Invitations"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.alarm,trigger_interval:0
+#: selection:res.alarm,trigger_interval:0
+msgid "Days"
+msgstr ""
+
+#. module: base_calendar
+#: code:addons/base_calendar/base_calendar.py:1194
+#: code:addons/base_calendar/wizard/base_calendar_invite_attendee.py:96
+#: code:addons/base_calendar/wizard/base_calendar_invite_attendee.py:143
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.attendee,role:0
+msgid "Chair Person"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.alarm,action:0
+msgid "Procedure"
+msgstr ""
+
+#. module: base_calendar
+#: code:addons/base_calendar/base_calendar.py:1004
+#, python-format
+msgid "Interval cannot be negative"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.event,state:0
+#: selection:calendar.todo,state:0
+msgid "Cancelled"
+msgstr ""
+
+#. module: base_calendar
+#: code:addons/base_calendar/wizard/base_calendar_invite_attendee.py:143
+#, python-format
+msgid "%s must have an email  address to send mail"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.alarm,trigger_interval:0
+#: selection:res.alarm,trigger_interval:0
+msgid "Minutes"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.alarm,action:0
+msgid "Display"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+msgid "Invitation type"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.attendee,state:0
+msgid "Status of the attendee's participation"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.alarm,trigger_related:0
+#: selection:res.alarm,trigger_related:0
+msgid "The event ends"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: view:calendar.event:0
+msgid "Group By..."
+msgstr ""
+
+#. module: base_calendar
+#: help:base_calendar.invite.attendee,email:0
+msgid "Provide external email address who will receive this invitation."
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.attendee,partner_id:0
+msgid "Partner related to contact"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.attendee,cutype:0
+msgid "Specify the type of Invitation"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.alarm,event_end_date:0
+#: field:calendar.attendee,event_end_date:0
+msgid "Event End Date"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.attendee,role:0
+msgid "Optional Participation"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,date_deadline:0
+#: field:calendar.todo,date_deadline:0
+msgid "Deadline"
+msgstr ""
+
+#. module: base_calendar
+#: code:addons/base_calendar/base_calendar.py:389
+#: code:addons/base_calendar/base_calendar.py:1004
+#: code:addons/base_calendar/base_calendar.py:1006
+#, python-format
+msgid "Warning!"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.event,active:0
+#: help:calendar.todo,active:0
+msgid ""
+"If the active field is set to          true, it will allow you to hide the "
+"event alarm information without removing it."
+msgstr ""
+
+#. module: base_calendar
+#: field:base_calendar.invite.attendee,partner_id:0
+#: view:calendar.attendee:0
+#: field:calendar.attendee,partner_id:0
+msgid "Partner"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,organizer:0
+#: field:calendar.event,organizer_id:0
+#: field:calendar.todo,organizer:0
+#: field:calendar.todo,organizer_id:0
+msgid "Organizer"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: view:calendar.event:0
+#: field:calendar.event,user_id:0
+#: field:calendar.todo,user_id:0
+msgid "Responsible"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+#: model:res.request.link,name:base_calendar.request_link_meeting
+msgid "Event"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.alarm,trigger_occurs:0
+#: selection:res.alarm,trigger_occurs:0
+msgid "Before"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+#: selection:calendar.event,state:0
+#: selection:calendar.todo,state:0
+msgid "Confirmed"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.alarm,attendee_ids:0
+#: field:calendar.event,attendee_ids:0
+#: field:calendar.todo,attendee_ids:0
+msgid "Attendees"
+msgstr ""
+
+#. module: base_calendar
+#: code:addons/base_calendar/base_calendar.py:1411
+#, python-format
+msgid "Group by date not supported, use the calendar view instead"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "Confirm"
+msgstr ""
+
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_calendar_todo
+msgid "Calendar Task"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,su:0
+#: field:calendar.todo,su:0
+msgid "Sun"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.attendee,cutype:0
+msgid "Invite Type"
+msgstr ""
+
+#. module: base_calendar
+#: view:res.alarm:0
+msgid "Reminder details"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.attendee,parent_ids:0
+msgid "Delegrated From"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.event,select1:0
+#: selection:calendar.todo,select1:0
+msgid "Day of month"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+#: field:calendar.event,location:0
+#: field:calendar.todo,location:0
+msgid "Location"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.event,class:0
+#: selection:calendar.todo,class:0
+msgid "Public for Employees"
+msgstr ""
+
+#. module: base_calendar
+#: field:base_calendar.invite.attendee,send_mail:0
+msgid "Send mail?"
+msgstr ""
+
+#. module: base_calendar
+#: field:base_calendar.invite.attendee,email:0
+#: selection:calendar.alarm,action:0
+#: field:calendar.attendee,email:0
+msgid "Email"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+msgid "Event Detail"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.alarm,state:0
+msgid "Run"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,exdate:0
+#: field:calendar.todo,exdate:0
+msgid "Exception Date/Times"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,end_date:0
+#: field:calendar.todo,end_date:0
+msgid "Repeat Until"
+msgstr ""
+
+#. module: base_calendar
+#: model:ir.actions.act_window,help:base_calendar.action_res_alarm_view
+msgid ""
+"Create specific calendar alarms that may be assigned to calendar events or "
+"meetings."
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,show_as:0
+#: field:calendar.todo,show_as:0
+msgid "Show as"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "Visibility"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.attendee,rsvp:0
+msgid "Required Reply?"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,base_calendar_url:0
+#: field:calendar.todo,base_calendar_url:0
+msgid "Caldav URL"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,recurrent_uid:0
+#: field:calendar.todo,recurrent_uid:0
+msgid "Recurrent ID"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.event,month_list:0
+#: selection:calendar.todo,month_list:0
+msgid "July"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: selection:calendar.attendee,state:0
+msgid "Accepted"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,th:0
+#: field:calendar.todo,th:0
+msgid "Thu"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.attendee,child_ids:0
+msgid "Delegrated To"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "To"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+msgid "Required Reply"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.attendee,role:0
+msgid "Participation required"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,create_date:0
+#: field:calendar.todo,create_date:0
+msgid "Created"
+msgstr ""
+
+#. module: base_calendar
+#: sql_constraint:ir.model:0
+msgid "Each model must be unique!"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.event,rrule_type:0
+#: selection:calendar.todo,rrule_type:0
+msgid "Daily"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,class:0
+#: field:calendar.todo,class:0
+msgid "Mark as"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: field:calendar.attendee,partner_address_id:0
+msgid "Contact"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.event,rrule_type:0
+#: help:calendar.todo,rrule_type:0
+msgid "Let the event automatically repeat at that interval"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: view:calendar.event:0
+msgid "Delegate"
+msgstr ""
+
+#. module: base_calendar
+#: view:base_calendar.invite.attendee:0
+#: selection:base_calendar.invite.attendee,type:0
+msgid "Partner Contacts"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.event,byday:0
+#: selection:calendar.todo,byday:0
+msgid "First"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "Privacy"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,vtimezone:0
+#: field:calendar.todo,vtimezone:0
+msgid "Timezone"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "Subject"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.attendee,state:0
+msgid "Needs Action"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.event,month_list:0
+#: selection:calendar.todo,month_list:0
+msgid "September"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.event,month_list:0
+#: selection:calendar.todo,month_list:0
+msgid "December"
+msgstr ""
+
+#. module: base_calendar
+#: help:base_calendar.invite.attendee,send_mail:0
+msgid "Check this if you want to send an Email to Invited Person"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "Availability"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.attendee,cutype:0
+msgid "Individual"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.event,count:0
+#: help:calendar.todo,count:0
+msgid "Repeat x times"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.alarm,user_id:0
+msgid "Owner"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+msgid "Delegation Info"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "Start Date"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.attendee,cn:0
+msgid "Common name"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: selection:calendar.attendee,state:0
+msgid "Declined"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+msgid "My Role"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "My Events"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: view:calendar.event:0
+msgid "Decline"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.attendee,cutype:0
+msgid "Group"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.event,class:0
+#: selection:calendar.todo,class:0
+msgid "Private"
+msgstr ""
+
+#. module: base_calendar
+#: field:base_calendar.invite.attendee,contact_ids:0
+msgid "Contacts"
+msgstr ""
+
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_res_alarm
+msgid "Basic Alarm Information"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,fr:0
+#: field:calendar.todo,fr:0
+msgid "Fri"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.alarm,trigger_interval:0
+#: selection:res.alarm,trigger_interval:0
+msgid "Hours"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: view:calendar.event:0
+msgid "Invitation Detail"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.attendee,member:0
+msgid "Member"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "From"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,rrule:0
+#: field:calendar.todo,rrule:0
+msgid "Recurrent Rule"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.alarm,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.alarm,attach:0
+msgid "Attachment"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+msgid "Invitation From"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "End of Recurrency"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "Reminder"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+#: model:ir.actions.act_window,name:base_calendar.action_view_event
+#: model:ir.ui.menu,name:base_calendar.menu_events
+msgid "Events"
+msgstr ""
+
+#. module: base_calendar
+#: model:ir.actions.act_window,name:base_calendar.action_view_calendar_invite_attendee_wizard
+#: model:ir.model,name:base_calendar.model_base_calendar_invite_attendee
+msgid "Invite Attendees"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.attendee,email:0
+msgid "Email of Invited Person"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.alarm,repeat:0
+#: field:calendar.event,count:0
+#: field:calendar.todo,count:0
+#: field:res.alarm,repeat:0
+msgid "Repeat"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.attendee,dir:0
+msgid ""
+"Reference to the URIthat points to the directory information corresponding "
+"to the attendee."
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.event,month_list:0
+#: selection:calendar.todo,month_list:0
+msgid "August"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.event,week_list:0
+#: selection:calendar.todo,week_list:0
+msgid "Monday"
+msgstr ""
+
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_ir_model
+msgid "Models"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.event,month_list:0
+#: selection:calendar.todo,month_list:0
+msgid "June"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.alarm,event_date:0
+#: field:calendar.attendee,event_date:0
+#: view:calendar.event:0
+msgid "Event Date"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.event,end_type:0
+#: selection:calendar.todo,end_type:0
+msgid "Number of repetitions"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "The"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: field:calendar.attendee,delegated_from:0
+msgid "Delegated From"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.attendee,user_id:0
+msgid "User"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+#: field:calendar.event,date:0
+msgid "Date"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.event,month_list:0
+#: selection:calendar.todo,month_list:0
+msgid "November"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.attendee,member:0
+msgid "Indicate the groups that the attendee belongs to"
+msgstr ""
+
+#. module: base_calendar
+#: view:base_calendar.invite.attendee:0
+msgid "Data"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,end_type:0
+#: field:calendar.todo,end_type:0
+msgid "Recurrence termination"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,mo:0
+#: field:calendar.todo,mo:0
+msgid "Mon"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+msgid "Invitations To Review"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.event,month_list:0
+#: selection:calendar.todo,month_list:0
+msgid "October"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: view:calendar.event:0
+msgid "Uncertain"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.attendee,language:0
+msgid "Language"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.alarm,trigger_occurs:0
+#: field:res.alarm,trigger_occurs:0
+msgid "Triggers"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.event,month_list:0
+#: selection:calendar.todo,month_list:0
+msgid "January"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+msgid "Delegated Invitations"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.alarm,trigger_interval:0
+#: field:res.alarm,trigger_interval:0
+msgid "Interval"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.event,week_list:0
+#: selection:calendar.todo,week_list:0
+msgid "Wednesday"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.alarm,name:0
+#: view:calendar.event:0
+msgid "Summary"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.alarm,active:0
+#: field:calendar.event,active:0
+#: field:calendar.todo,active:0
+#: field:res.alarm,active:0
+msgid "Active"
+msgstr ""
+
+#. module: base_calendar
+#: code:addons/base_calendar/base_calendar.py:389
+#, python-format
+msgid "You cannot duplicate a calendar attendee."
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "Choose day in the month where repeat the meeting"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.alarm,action:0
+msgid "Action"
+msgstr ""
+
+#. module: base_calendar
+#: help:base_calendar.invite.attendee,type:0
+msgid "Select whom you want to Invite"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.alarm,duration:0
+#: help:res.alarm,duration:0
+msgid ""
+"Duration' and 'Repeat' are both optional, but if one occurs, so MUST the "
+"other"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+msgid "Required to Join"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.attendee,role:0
+msgid "Participation role for the calendar user"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: field:calendar.attendee,delegated_to:0
+msgid "Delegated To"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.alarm,action:0
+msgid "Defines the action to be invoked when an alarm is triggered"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.event,end_type:0
+#: selection:calendar.todo,end_type:0
+msgid "End date"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "Search Events"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "Recurrency Option"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.event,rrule_type:0
+#: selection:calendar.todo,rrule_type:0
+msgid "Weekly"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.alarm,active:0
+#: help:res.alarm,active:0
+msgid ""
+"If the active field is set to true, it will allow you to hide the event "
+"alarm information without removing it."
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,recurrent_id:0
+#: field:calendar.todo,recurrent_id:0
+msgid "Recurrent ID date"
+msgstr ""
+
+#. module: base_calendar
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.alarm,state:0
+#: view:calendar.attendee:0
+#: field:calendar.attendee,state:0
+#: view:calendar.event:0
+#: field:calendar.event,state:0
+#: field:calendar.todo,state:0
+msgid "State"
+msgstr ""
+
+#. module: base_calendar
+#: view:res.alarm:0
+msgid "Reminder Details"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+msgid "To Review"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.alarm,state:0
+msgid "Done"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.event,interval:0
+#: help:calendar.todo,interval:0
+msgid "Repeat every (Days/Week/Month/Year)"
+msgstr ""
+
+#. module: base_calendar
+#: view:base_calendar.invite.attendee:0
+#: field:base_calendar.invite.attendee,user_ids:0
+msgid "Users"
+msgstr ""
+
+#. module: base_calendar
+#: view:base_calendar.invite.attendee:0
+#: view:calendar.event:0
+msgid "Cancel"
+msgstr ""
+
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_res_users
+msgid "res.users"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.event,week_list:0
+#: selection:calendar.todo,week_list:0
+msgid "Tuesday"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.alarm,description:0
+msgid ""
+"Provides a more complete                             description of the "
+"calendar component, than that                             provided by the "
+"\"SUMMARY\" property"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "Responsible User"
+msgstr ""
+
+#. module: base_calendar
+#: code:addons/base_calendar/base_calendar.py:1466
+#: selection:calendar.attendee,availability:0
+#: selection:calendar.event,show_as:0
+#: selection:calendar.todo,show_as:0
+#: selection:res.users,availability:0
+#, python-format
+msgid "Busy"
+msgstr ""
+
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_calendar_event
+msgid "Calendar Event"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.attendee,state:0
+#: selection:calendar.event,state:0
+#: selection:calendar.todo,state:0
+msgid "Tentative"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,interval:0
+#: field:calendar.todo,interval:0
+msgid "Repeat every"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,recurrency:0
+#: field:calendar.todo,recurrency:0
+msgid "Recurrent"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.event,location:0
+#: help:calendar.todo,location:0
+msgid "Location of Event"
+msgstr ""
+
+#. module: base_calendar
+#: model:ir.actions.act_window,name:base_calendar.action_view_attendee_form
+#: model:ir.ui.menu,name:base_calendar.menu_attendee_invitations
+msgid "Event Invitations"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.event,week_list:0
+#: selection:calendar.todo,week_list:0
+msgid "Thursday"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,exrule:0
+#: field:calendar.todo,exrule:0
+msgid "Exception Rule"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.attendee,language:0
+msgid ""
+"To specify the language for text values in aproperty or property parameter."
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "Details"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.event,exrule:0
+#: help:calendar.todo,exrule:0
+msgid ""
+"Defines a rule or repeating pattern of time to exclude from the recurring "
+"rule."
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,month_list:0
+#: field:calendar.todo,month_list:0
+msgid "Month"
+msgstr ""
+
+#. module: base_calendar
+#: view:base_calendar.invite.attendee:0
+#: view:calendar.event:0
+msgid "Invite People"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "Confirmed Events"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.attendee,dir:0
+msgid "URI Reference"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.alarm,description:0
+#: view:calendar.event:0
+#: field:calendar.event,description:0
+#: field:calendar.event,name:0
+#: field:calendar.todo,description:0
+#: field:calendar.todo,name:0
+msgid "Description"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.event,month_list:0
+#: selection:calendar.todo,month_list:0
+msgid "May"
+msgstr ""
+
+#. module: base_calendar
+#: field:base_calendar.invite.attendee,type:0
+#: view:calendar.attendee:0
+msgid "Type"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+msgid "Search Invitations"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.alarm,trigger_occurs:0
+#: selection:res.alarm,trigger_occurs:0
+msgid "After"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.alarm,state:0
+msgid "Stop"
+msgstr ""
+
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_ir_values
+msgid "ir.values"
+msgstr ""
+
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_ir_attachment
+msgid "ir.attachment"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: selection:calendar.attendee,state:0
+msgid "Delegated"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,sa:0
+#: field:calendar.todo,sa:0
+msgid "Sat"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "Choose day where repeat the meeting"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.alarm,trigger_related:0
+#: field:res.alarm,trigger_related:0
+msgid "Related to"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.attendee,sent_by:0
+msgid "Specify the user that is acting on behalf of the calendar user"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "End Date"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.event,month_list:0
+#: selection:calendar.todo,month_list:0
+msgid "February"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.attendee,cutype:0
+msgid "Resource"
+msgstr ""
+
+#. module: base_calendar
+#: field:res.alarm,name:0
+msgid "Name"
+msgstr ""
+
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_calendar_alarm
+msgid "Event alarm information"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.alarm,name:0
+msgid ""
+"Contains the text to be                      used as the message subject for "
+"email                      or contains the text to be used for display"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,alarm_id:0
+#: field:calendar.event,base_calendar_alarm_id:0
+#: field:calendar.todo,alarm_id:0
+#: field:calendar.todo,base_calendar_alarm_id:0
+msgid "Alarm"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.attendee,sent_by_uid:0
+msgid "Sent By User"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.event,month_list:0
+#: selection:calendar.todo,month_list:0
+msgid "April"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "Recurrency period"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,week_list:0
+#: field:calendar.todo,week_list:0
+msgid "Weekday"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,byday:0
+#: field:calendar.todo,byday:0
+msgid "By day"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.alarm,model_id:0
+msgid "Model"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.alarm,action:0
+msgid "Audio"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,id:0
+#: field:calendar.todo,id:0
+msgid "ID"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.attendee,role:0
+msgid "For information Purpose"
+msgstr ""
+
+#. module: base_calendar
+#: view:base_calendar.invite.attendee:0
+msgid "Invite"
+msgstr ""
+
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_calendar_attendee
+msgid "Attendee information"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.alarm,res_id:0
+msgid "Resource ID"
+msgstr ""
+
+#. module: base_calendar
+#: code:addons/base_calendar/base_calendar.py:418
+#, python-format
+msgid "Couldn't Invite because date is not specified!"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.attendee,sent_by:0
+msgid "Sent By"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,sequence:0
+#: field:calendar.todo,sequence:0
+msgid "Sequence"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.event,alarm_id:0
+#: help:calendar.todo,alarm_id:0
+msgid "Set an alarm at this time, before the event occurs"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base_calendar.invite.attendee,type:0
+msgid "Internal User"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: view:calendar.event:0
+msgid "Accept"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.event,week_list:0
+#: selection:calendar.todo,week_list:0
+msgid "Saturday"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+msgid "Invitation To"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.event,byday:0
+#: selection:calendar.todo,byday:0
+msgid "Second"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.attendee,availability:0
+#: field:res.users,availability:0
+msgid "Free/Busy"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.alarm,duration:0
+#: field:calendar.alarm,trigger_duration:0
+#: field:calendar.event,duration:0
+#: field:calendar.todo,date:0
+#: field:calendar.todo,duration:0
+#: field:res.alarm,duration:0
+#: field:res.alarm,trigger_duration:0
+msgid "Duration"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base_calendar.invite.attendee,type:0
+msgid "External Email"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.alarm,trigger_date:0
+msgid "Trigger Date"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.alarm,attach:0
+msgid ""
+"* Points to a sound resource,                     which is rendered when the "
+"alarm is triggered for audio,\n"
+"                    * File which is intended to be sent as message "
+"attachments for email,\n"
+"                    * Points to a procedure resource, which is invoked when  "
+"                    the alarm is triggered for procedure."
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.event,byday:0
+#: selection:calendar.todo,byday:0
+msgid "Fifth"
+msgstr ""
diff --git a/addons/base_calendar/i18n/it.po b/addons/base_calendar/i18n/it.po
index e2beb7c2adb..d955d2fe6f3 100644
--- a/addons/base_calendar/i18n/it.po
+++ b/addons/base_calendar/i18n/it.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:58+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:37+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
diff --git a/addons/base_calendar/i18n/ja.po b/addons/base_calendar/i18n/ja.po
index 9f1150e71c5..fe802f5feb0 100644
--- a/addons/base_calendar/i18n/ja.po
+++ b/addons/base_calendar/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:58+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:38+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
diff --git a/addons/base_calendar/i18n/ln.po b/addons/base_calendar/i18n/ln.po
index 2c0ec92552c..35dc041f901 100644
--- a/addons/base_calendar/i18n/ln.po
+++ b/addons/base_calendar/i18n/ln.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:58+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:38+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
diff --git a/addons/base_calendar/i18n/lt.po b/addons/base_calendar/i18n/lt.po
index a1966203e76..00236e04433 100644
--- a/addons/base_calendar/i18n/lt.po
+++ b/addons/base_calendar/i18n/lt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:58+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:38+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
diff --git a/addons/base_calendar/i18n/lv.po b/addons/base_calendar/i18n/lv.po
index c7c09ccb748..2f0e0550f2b 100644
--- a/addons/base_calendar/i18n/lv.po
+++ b/addons/base_calendar/i18n/lv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:58+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:38+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
diff --git a/addons/base_calendar/i18n/mn.po b/addons/base_calendar/i18n/mn.po
index b48b2d46188..b8e0d031f0a 100644
--- a/addons/base_calendar/i18n/mn.po
+++ b/addons/base_calendar/i18n/mn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:58+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:38+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
diff --git a/addons/base_calendar/i18n/nb.po b/addons/base_calendar/i18n/nb.po
index ca8c0757ec6..5b941937dd1 100644
--- a/addons/base_calendar/i18n/nb.po
+++ b/addons/base_calendar/i18n/nb.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:58+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:38+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
diff --git a/addons/base_calendar/i18n/nl.po b/addons/base_calendar/i18n/nl.po
index 18bd89bc6ec..265089765fc 100644
--- a/addons/base_calendar/i18n/nl.po
+++ b/addons/base_calendar/i18n/nl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:57+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:37+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
diff --git a/addons/base_calendar/i18n/pl.po b/addons/base_calendar/i18n/pl.po
index b2c16fa5ed1..2f38c74f295 100644
--- a/addons/base_calendar/i18n/pl.po
+++ b/addons/base_calendar/i18n/pl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:58+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:38+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
diff --git a/addons/base_calendar/i18n/pt.po b/addons/base_calendar/i18n/pt.po
index a2c2048256d..9b8c48413fa 100644
--- a/addons/base_calendar/i18n/pt.po
+++ b/addons/base_calendar/i18n/pt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:58+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:38+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
diff --git a/addons/base_calendar/i18n/pt_BR.po b/addons/base_calendar/i18n/pt_BR.po
index 384584903f0..31f16deeb40 100644
--- a/addons/base_calendar/i18n/pt_BR.po
+++ b/addons/base_calendar/i18n/pt_BR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:58+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:38+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
diff --git a/addons/base_calendar/i18n/ro.po b/addons/base_calendar/i18n/ro.po
index 102064db2fa..a8f389cf039 100644
--- a/addons/base_calendar/i18n/ro.po
+++ b/addons/base_calendar/i18n/ro.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:58+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:38+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
diff --git a/addons/base_calendar/i18n/ru.po b/addons/base_calendar/i18n/ru.po
index d4e3066c025..4a5684cca94 100644
--- a/addons/base_calendar/i18n/ru.po
+++ b/addons/base_calendar/i18n/ru.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:58+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:38+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
diff --git a/addons/base_calendar/i18n/sk.po b/addons/base_calendar/i18n/sk.po
index fcd714dd5d9..b96849a953d 100644
--- a/addons/base_calendar/i18n/sk.po
+++ b/addons/base_calendar/i18n/sk.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:58+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:38+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
diff --git a/addons/base_calendar/i18n/sl.po b/addons/base_calendar/i18n/sl.po
index 2e25cad65bf..25aa919e822 100644
--- a/addons/base_calendar/i18n/sl.po
+++ b/addons/base_calendar/i18n/sl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:58+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:38+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
diff --git a/addons/base_calendar/i18n/sq.po b/addons/base_calendar/i18n/sq.po
index e59203cccca..25f8be712e7 100644
--- a/addons/base_calendar/i18n/sq.po
+++ b/addons/base_calendar/i18n/sq.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:57+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:37+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
diff --git a/addons/base_calendar/i18n/sr.po b/addons/base_calendar/i18n/sr.po
index fedaef6cbe3..afb3f83ec2e 100644
--- a/addons/base_calendar/i18n/sr.po
+++ b/addons/base_calendar/i18n/sr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:58+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:38+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
diff --git a/addons/base_calendar/i18n/sr@latin.po b/addons/base_calendar/i18n/sr@latin.po
index 26f6f834b13..e3308bcea91 100644
--- a/addons/base_calendar/i18n/sr@latin.po
+++ b/addons/base_calendar/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:58+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:38+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
diff --git a/addons/base_calendar/i18n/sv.po b/addons/base_calendar/i18n/sv.po
index b7d9ed44e32..5f4c771ca7e 100644
--- a/addons/base_calendar/i18n/sv.po
+++ b/addons/base_calendar/i18n/sv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:58+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:38+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
diff --git a/addons/base_calendar/i18n/th.po b/addons/base_calendar/i18n/th.po
index 3fb9e9872ca..9c2061ed756 100644
--- a/addons/base_calendar/i18n/th.po
+++ b/addons/base_calendar/i18n/th.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:58+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:38+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
diff --git a/addons/base_calendar/i18n/tr.po b/addons/base_calendar/i18n/tr.po
index 506b9468085..8a6f08d0983 100644
--- a/addons/base_calendar/i18n/tr.po
+++ b/addons/base_calendar/i18n/tr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:58+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:38+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
diff --git a/addons/base_calendar/i18n/zh_CN.po b/addons/base_calendar/i18n/zh_CN.po
index 4c96289a2bb..44768f7dc75 100644
--- a/addons/base_calendar/i18n/zh_CN.po
+++ b/addons/base_calendar/i18n/zh_CN.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:58+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:38+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
diff --git a/addons/base_calendar/i18n/zh_TW.po b/addons/base_calendar/i18n/zh_TW.po
index ce65fe31cc0..a1b57bb46fd 100644
--- a/addons/base_calendar/i18n/zh_TW.po
+++ b/addons/base_calendar/i18n/zh_TW.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:58+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:38+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
diff --git a/addons/base_crypt/__openerp__.py b/addons/base_crypt/__openerp__.py
index 62edc76b277..d0252f6810c 100644
--- a/addons/base_crypt/__openerp__.py
+++ b/addons/base_crypt/__openerp__.py
@@ -19,18 +19,18 @@
 #
 ##############################################################################
 {
-    "name" : "DB Password Encryption",
-    "version" : "1.1",
-    "author" : ['OpenERP SA', "FS3"],
-    "maintainer" : "OpenERP SA",
-    "website" : "http://www.openerp.com",
-    "category" : "Tools",
-    "description": """
+    'name': 'DB Password Encryption',
+    'version': '1.1',
+    'author': ['OpenERP SA', 'FS3'],
+    'maintainer': 'OpenERP SA',
+    'website': 'http://www.openerp.com',
+    'category': 'Tools',
+    'description': """
 Replaces cleartext passwords in the database with a secure hash.
 ================================================================
 
 For your existing user base, the removal of the cleartext passwords occurs 
-immediately when you instal base_crypt.
+immediately when you install base_crypt.
 
 All passwords will be replaced by a secure, salted, cryptographic hash, 
 preventing anyone from reading the original password in the database.
@@ -49,16 +49,16 @@ contain critical data. Appropriate security measures need to be implemented
 by the system administrator in all areas, such as: protection of database
 backups, system files, remote shell access, physical server access.
 
-Interation with LDAP authentication:
-------------------------------------
+Interaction with LDAP authentication:
+-------------------------------------
 This module is currently not compatible with the ``user_ldap`` module and
 will disable LDAP authentication completely if installed at the same time.
 """,
-    "depends" : ["base"],
-    "data" : [],
-    "auto_install": False,
-    "installable": True,
-    "certificate" : "00721290471310299725",
+    'depends': ['base'],
+    'data': [],
+    'auto_install': False,
+    'installable': True,
+    'certificate': '00721290471310299725',
 }
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/base_crypt/i18n/ar.po b/addons/base_crypt/i18n/ar.po
index 80276623b9b..89278586c72 100644
--- a/addons/base_crypt/i18n/ar.po
+++ b/addons/base_crypt/i18n/ar.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_crypt
 #: model:ir.model,name:base_crypt.model_res_users
diff --git a/addons/base_crypt/i18n/bg.po b/addons/base_crypt/i18n/bg.po
index 2b865e1863b..f4f9135c8f9 100644
--- a/addons/base_crypt/i18n/bg.po
+++ b/addons/base_crypt/i18n/bg.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_crypt
 #: model:ir.model,name:base_crypt.model_res_users
diff --git a/addons/base_crypt/i18n/ca.po b/addons/base_crypt/i18n/ca.po
index 492b0b78418..de656070f52 100644
--- a/addons/base_crypt/i18n/ca.po
+++ b/addons/base_crypt/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_crypt
 #: model:ir.model,name:base_crypt.model_res_users
diff --git a/addons/base_crypt/i18n/cs.po b/addons/base_crypt/i18n/cs.po
index 3cbf6a15e93..3d8db634455 100644
--- a/addons/base_crypt/i18n/cs.po
+++ b/addons/base_crypt/i18n/cs.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_crypt
 #: model:ir.model,name:base_crypt.model_res_users
diff --git a/addons/base_crypt/i18n/da.po b/addons/base_crypt/i18n/da.po
index f9a3da26e92..bfe755e46cc 100644
--- a/addons/base_crypt/i18n/da.po
+++ b/addons/base_crypt/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_crypt
 #: model:ir.model,name:base_crypt.model_res_users
diff --git a/addons/base_crypt/i18n/de.po b/addons/base_crypt/i18n/de.po
index 4ff8deba24c..f946fe2ee28 100644
--- a/addons/base_crypt/i18n/de.po
+++ b/addons/base_crypt/i18n/de.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_crypt
 #: model:ir.model,name:base_crypt.model_res_users
diff --git a/addons/base_crypt/i18n/el.po b/addons/base_crypt/i18n/el.po
index af7531f7a21..3052f4c372f 100644
--- a/addons/base_crypt/i18n/el.po
+++ b/addons/base_crypt/i18n/el.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_crypt
 #: model:ir.model,name:base_crypt.model_res_users
diff --git a/addons/base_crypt/i18n/en_GB.po b/addons/base_crypt/i18n/en_GB.po
index fcc5f46ef0d..015c805263d 100644
--- a/addons/base_crypt/i18n/en_GB.po
+++ b/addons/base_crypt/i18n/en_GB.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_crypt
 #: model:ir.model,name:base_crypt.model_res_users
diff --git a/addons/base_crypt/i18n/es.po b/addons/base_crypt/i18n/es.po
index 788e31045fd..4d452b9bd9c 100644
--- a/addons/base_crypt/i18n/es.po
+++ b/addons/base_crypt/i18n/es.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_crypt
 #: model:ir.model,name:base_crypt.model_res_users
diff --git a/addons/base_crypt/i18n/es_CL.po b/addons/base_crypt/i18n/es_CL.po
index fc91293928f..9ea2d3caacd 100644
--- a/addons/base_crypt/i18n/es_CL.po
+++ b/addons/base_crypt/i18n/es_CL.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_crypt
 #: model:ir.model,name:base_crypt.model_res_users
diff --git a/addons/base_crypt/i18n/es_CR.po b/addons/base_crypt/i18n/es_CR.po
index 1827c9f4c45..566579feda0 100644
--- a/addons/base_crypt/i18n/es_CR.po
+++ b/addons/base_crypt/i18n/es_CR.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 "Language: es\n"
 
 #. module: base_crypt
diff --git a/addons/base_crypt/i18n/es_PY.po b/addons/base_crypt/i18n/es_PY.po
index d7d01b48249..822661d04e6 100644
--- a/addons/base_crypt/i18n/es_PY.po
+++ b/addons/base_crypt/i18n/es_PY.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_crypt
 #: model:ir.model,name:base_crypt.model_res_users
diff --git a/addons/base_crypt/i18n/et.po b/addons/base_crypt/i18n/et.po
index 038641e8c47..cc3caa20efd 100644
--- a/addons/base_crypt/i18n/et.po
+++ b/addons/base_crypt/i18n/et.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_crypt
 #: model:ir.model,name:base_crypt.model_res_users
diff --git a/addons/base_crypt/i18n/fa.po b/addons/base_crypt/i18n/fa.po
index 361d519e09c..a3c9367420b 100644
--- a/addons/base_crypt/i18n/fa.po
+++ b/addons/base_crypt/i18n/fa.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_crypt
 #: model:ir.model,name:base_crypt.model_res_users
diff --git a/addons/base_crypt/i18n/fi.po b/addons/base_crypt/i18n/fi.po
index d8a6867776e..3a3225d1c8e 100644
--- a/addons/base_crypt/i18n/fi.po
+++ b/addons/base_crypt/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_crypt
 #: model:ir.model,name:base_crypt.model_res_users
diff --git a/addons/base_crypt/i18n/fr.po b/addons/base_crypt/i18n/fr.po
index e468147fb92..290b6e2d58d 100644
--- a/addons/base_crypt/i18n/fr.po
+++ b/addons/base_crypt/i18n/fr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_crypt
 #: model:ir.model,name:base_crypt.model_res_users
diff --git a/addons/base_crypt/i18n/gl.po b/addons/base_crypt/i18n/gl.po
index 63fa384c172..658fe4fd31c 100644
--- a/addons/base_crypt/i18n/gl.po
+++ b/addons/base_crypt/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_crypt
 #: model:ir.model,name:base_crypt.model_res_users
diff --git a/addons/base_crypt/i18n/gu.po b/addons/base_crypt/i18n/gu.po
index 374555b520a..4fe2dec7554 100644
--- a/addons/base_crypt/i18n/gu.po
+++ b/addons/base_crypt/i18n/gu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_crypt
 #: model:ir.model,name:base_crypt.model_res_users
diff --git a/addons/base_crypt/i18n/hr.po b/addons/base_crypt/i18n/hr.po
index e2cc5ee9aeb..e7f169d5db5 100644
--- a/addons/base_crypt/i18n/hr.po
+++ b/addons/base_crypt/i18n/hr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_crypt
 #: model:ir.model,name:base_crypt.model_res_users
diff --git a/addons/base_crypt/i18n/it.po b/addons/base_crypt/i18n/it.po
index 7a6dfa553a5..d4a6023f870 100644
--- a/addons/base_crypt/i18n/it.po
+++ b/addons/base_crypt/i18n/it.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_crypt
 #: model:ir.model,name:base_crypt.model_res_users
diff --git a/addons/base_crypt/i18n/ja.po b/addons/base_crypt/i18n/ja.po
index 39e1cb6755b..3d583147704 100644
--- a/addons/base_crypt/i18n/ja.po
+++ b/addons/base_crypt/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_crypt
 #: model:ir.model,name:base_crypt.model_res_users
diff --git a/addons/base_crypt/i18n/mn.po b/addons/base_crypt/i18n/mn.po
index c8525c3c3a8..74b220f374f 100644
--- a/addons/base_crypt/i18n/mn.po
+++ b/addons/base_crypt/i18n/mn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_crypt
 #: model:ir.model,name:base_crypt.model_res_users
diff --git a/addons/base_crypt/i18n/nb.po b/addons/base_crypt/i18n/nb.po
index 3990ea16a2a..8104f6c0636 100644
--- a/addons/base_crypt/i18n/nb.po
+++ b/addons/base_crypt/i18n/nb.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_crypt
 #: model:ir.model,name:base_crypt.model_res_users
diff --git a/addons/base_crypt/i18n/nl.po b/addons/base_crypt/i18n/nl.po
index c01372f4949..8b2aa7e4e38 100644
--- a/addons/base_crypt/i18n/nl.po
+++ b/addons/base_crypt/i18n/nl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_crypt
 #: model:ir.model,name:base_crypt.model_res_users
diff --git a/addons/base_crypt/i18n/nl_BE.po b/addons/base_crypt/i18n/nl_BE.po
index 6413919958f..abc26657ee2 100644
--- a/addons/base_crypt/i18n/nl_BE.po
+++ b/addons/base_crypt/i18n/nl_BE.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_crypt
 #: model:ir.model,name:base_crypt.model_res_users
diff --git a/addons/base_crypt/i18n/oc.po b/addons/base_crypt/i18n/oc.po
index 2b705735177..a659599a051 100644
--- a/addons/base_crypt/i18n/oc.po
+++ b/addons/base_crypt/i18n/oc.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_crypt
 #: model:ir.model,name:base_crypt.model_res_users
diff --git a/addons/base_crypt/i18n/pl.po b/addons/base_crypt/i18n/pl.po
index 59f2e7bd789..1ca150cb22f 100644
--- a/addons/base_crypt/i18n/pl.po
+++ b/addons/base_crypt/i18n/pl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_crypt
 #: model:ir.model,name:base_crypt.model_res_users
diff --git a/addons/base_crypt/i18n/pt.po b/addons/base_crypt/i18n/pt.po
index 4cda167509c..46845693338 100644
--- a/addons/base_crypt/i18n/pt.po
+++ b/addons/base_crypt/i18n/pt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_crypt
 #: model:ir.model,name:base_crypt.model_res_users
diff --git a/addons/base_crypt/i18n/pt_BR.po b/addons/base_crypt/i18n/pt_BR.po
index 0417bb3155c..9516ca2ed4b 100644
--- a/addons/base_crypt/i18n/pt_BR.po
+++ b/addons/base_crypt/i18n/pt_BR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_crypt
 #: model:ir.model,name:base_crypt.model_res_users
diff --git a/addons/base_crypt/i18n/ro.po b/addons/base_crypt/i18n/ro.po
index 6e7ddc37116..652ac471e7b 100644
--- a/addons/base_crypt/i18n/ro.po
+++ b/addons/base_crypt/i18n/ro.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_crypt
 #: model:ir.model,name:base_crypt.model_res_users
diff --git a/addons/base_crypt/i18n/ru.po b/addons/base_crypt/i18n/ru.po
index cc4341d1166..0ec65d1726a 100644
--- a/addons/base_crypt/i18n/ru.po
+++ b/addons/base_crypt/i18n/ru.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_crypt
 #: model:ir.model,name:base_crypt.model_res_users
diff --git a/addons/base_crypt/i18n/sk.po b/addons/base_crypt/i18n/sk.po
index 20a9ff9eb4c..0d5c8897f07 100644
--- a/addons/base_crypt/i18n/sk.po
+++ b/addons/base_crypt/i18n/sk.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_crypt
 #: model:ir.model,name:base_crypt.model_res_users
diff --git a/addons/base_crypt/i18n/sl.po b/addons/base_crypt/i18n/sl.po
index 397ad807ead..3f51f38e572 100644
--- a/addons/base_crypt/i18n/sl.po
+++ b/addons/base_crypt/i18n/sl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_crypt
 #: model:ir.model,name:base_crypt.model_res_users
diff --git a/addons/base_crypt/i18n/sq.po b/addons/base_crypt/i18n/sq.po
index 75f445f53bb..4f8369d6686 100644
--- a/addons/base_crypt/i18n/sq.po
+++ b/addons/base_crypt/i18n/sq.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_crypt
 #: model:ir.model,name:base_crypt.model_res_users
diff --git a/addons/base_crypt/i18n/sr@latin.po b/addons/base_crypt/i18n/sr@latin.po
index 9468e1a6fa7..b8b7c6a7b4d 100644
--- a/addons/base_crypt/i18n/sr@latin.po
+++ b/addons/base_crypt/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_crypt
 #: model:ir.model,name:base_crypt.model_res_users
diff --git a/addons/base_crypt/i18n/sv.po b/addons/base_crypt/i18n/sv.po
index 3364a266694..9f3a3b65a21 100644
--- a/addons/base_crypt/i18n/sv.po
+++ b/addons/base_crypt/i18n/sv.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_crypt
 #: model:ir.model,name:base_crypt.model_res_users
diff --git a/addons/base_crypt/i18n/tr.po b/addons/base_crypt/i18n/tr.po
index 49f8f8d5c96..b7e79a69d57 100644
--- a/addons/base_crypt/i18n/tr.po
+++ b/addons/base_crypt/i18n/tr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_crypt
 #: model:ir.model,name:base_crypt.model_res_users
diff --git a/addons/base_crypt/i18n/vi.po b/addons/base_crypt/i18n/vi.po
index 8e0701467f6..058fc69ec08 100644
--- a/addons/base_crypt/i18n/vi.po
+++ b/addons/base_crypt/i18n/vi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_crypt
 #: model:ir.model,name:base_crypt.model_res_users
diff --git a/addons/base_crypt/i18n/zh_CN.po b/addons/base_crypt/i18n/zh_CN.po
index c3e2d3dfd27..3a4f57854dd 100644
--- a/addons/base_crypt/i18n/zh_CN.po
+++ b/addons/base_crypt/i18n/zh_CN.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_crypt
 #: model:ir.model,name:base_crypt.model_res_users
diff --git a/addons/base_crypt/i18n/zh_TW.po b/addons/base_crypt/i18n/zh_TW.po
index 291150b71f0..d4585374e6a 100644
--- a/addons/base_crypt/i18n/zh_TW.po
+++ b/addons/base_crypt/i18n/zh_TW.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-02-08 00:36+0000\n"
-"PO-Revision-Date: 2011-09-27 13:07+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2012-08-19 10:28+0000\n"
+"Last-Translator: Eric Huang <eh@cenoq.com>\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: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_crypt
 #: model:ir.model,name:base_crypt.model_res_users
 msgid "res.users"
-msgstr ""
+msgstr "res.users"
 
 #. module: base_crypt
 #: sql_constraint:res.users:0
 msgid "You can not have two users with the same login !"
-msgstr ""
+msgstr "您不能同時登入二個使用者!"
 
 #. module: base_crypt
 #: constraint:res.users:0
 msgid "The chosen company is not in the allowed companies for this user"
-msgstr ""
+msgstr "所選的公司不是使用者被允許的公司。"
 
 #. module: base_crypt
 #: code:addons/base_crypt/crypt.py:140
@@ -42,7 +42,7 @@ msgstr "請指定密碼 !"
 #: code:addons/base_crypt/crypt.py:140
 #, python-format
 msgid "Error"
-msgstr ""
+msgstr "錯誤"
 
 #~ msgid "Base - Password Encryption"
 #~ msgstr "基礎 - 密碼加密"
diff --git a/addons/base_gengo/__init__.py b/addons/base_gengo/__init__.py
new file mode 100644
index 00000000000..133fa90dc51
--- /dev/null
+++ b/addons/base_gengo/__init__.py
@@ -0,0 +1,26 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Openerp sa (<http://openerp.com>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+import res_company
+import ir_translation
+import wizard
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/analytic_contract_expense_project/__openerp__.py b/addons/base_gengo/__openerp__.py
similarity index 52%
rename from addons/analytic_contract_expense_project/__openerp__.py
rename to addons/base_gengo/__openerp__.py
index b569330d117..ae61ad8f13c 100644
--- a/addons/analytic_contract_expense_project/__openerp__.py
+++ b/addons/base_gengo/__openerp__.py
@@ -18,28 +18,33 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
-
-
 {
-    'name': 'Projects Management: hr_expense link',
-    'version': '1.1',
-    'category': 'Hidden',
+    'name': 'Automated Translations through Gengo API',
+    'version': '0.1',
+    'category': 'Tools',
     'description': """
-This module is for modifying project view to show some data related to the hr_expense module.
+Automated Translations through Gengo API
+----------------------------------------
+    This module will install passive scheduler job for automated translations 
+using the Gengo API. To activate it, you must
+1) Configure your Gengo authentication parameters under `Settings > Companies > Gengo Parameters`
+2) Launch the wizard under `Settings > Application Terms > Gengo: Manual Request of Translation` and follow the wizard.
 
-""",
-    "author": "OpenERP S.A.",
-    "website": "http://www.openerp.com/",
-    "depends": ["analytic_contract_hr_expense","project"],
-    "init_xml": [],
-    "update_xml": [
-                    "analytic_contract_expense_project_view.xml",
-                    ],
+This wizard will activate the CRON job and the Scheduler and will start the automatic translation via Gengo Services for all the terms where you requested it.
+    """,
+    'author': 'OpenERP SA',
+    'website': 'http://www.openerp.com',
+    'depends': ['base'],
+    'init_xml': ['gengo_sync_schedular_data.xml'],
+    'update_xml': [
+        'ir_translation.xml',
+        'res_company_view.xml',
+        'wizard/base_gengo_translations_view.xml',
+           ],
     'demo_xml': [],
-    "css" : [
-             ],
+    'test': [],
     'installable': True,
-    'auto_install': True,
+    'auto_install': False,
 }
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/base_gengo/gengo_sync_schedular_data.xml b/addons/base_gengo/gengo_sync_schedular_data.xml
new file mode 100644
index 00000000000..823ca8f14db
--- /dev/null
+++ b/addons/base_gengo/gengo_sync_schedular_data.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        <!--Scheduler sync Receive Request-->
+        <record id="gengo_sync_receive_request_scheduler" model="ir.cron">
+            <field name="name" >Gengo Sync Translation (Response)</field>
+            <field eval="False" name="active"/>
+            <field name="interval_number">20</field>
+            <field name="interval_type">minutes</field>
+            <field name="numbercall">-1</field>
+            <field eval="'base.gengo.translations'" name="model"></field>
+            <field eval="'_sync_response'" name="function"/>
+            <field eval="'(20,)'" name="args"/>
+        </record>
+
+        <!--Scheduler Sync Send Request-->
+        <record id="gengo_sync_send_request_scheduler" model="ir.cron">
+            <field name="name" >Gengo Sync Translation (Request)</field>
+            <field eval="False" name="active"/>
+            <field name="interval_number">20</field>
+            <field name="interval_type">minutes</field>
+            <field name="numbercall">-1</field>
+            <field eval="'base.gengo.translations'" name="model"></field>
+            <field eval="'_sync_request'" name="function"/>
+            <field eval="'(20,)'" name="args"/>
+        </record>
+    </data>
+</openerp>
diff --git a/addons/base_gengo/ir_translation.py b/addons/base_gengo/ir_translation.py
new file mode 100644
index 00000000000..7b864aba8ce
--- /dev/null
+++ b/addons/base_gengo/ir_translation.py
@@ -0,0 +1,88 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Business Applications
+#    Copyright (C) 2004-2012 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 osv import fields, osv
+from tools.translate import _
+
+LANG_CODE_MAPPING = {
+    'ar_SA': ('ar', 'Arabic'),
+    'id_ID': ('id', 'Indonesian'),
+    'nl_NL': ('nl', 'Dutch'),
+    'fr_CA': ('fr-ca', 'French (Canada)'),
+    'pl_PL': ('pl', 'Polish'),
+    'zh_TW': ('zh-tw', 'Chinese (Traditional)'),
+    'sv_SE': ('sv', 'Swedish'),
+    'ko_KR': ('ko', 'Korean'),
+    'pt_PT': ('pt', 'Portuguese (Europe)'),
+    'en_US': ('en', 'English'),
+    'ja_JP': ('ja', 'Japanese'),
+    'es_ES': ('es', 'Spanish (Spain)'),
+    'zh_CN': ('zh', 'Chinese (Simplified)'),
+    'de_DE': ('de', 'German'),
+    'fr_FR': ('fr', 'French'),
+    'fr_BE': ('fr', 'French'),
+    'ru_RU': ('ru', 'Russian'),
+    'it_IT': ('it', 'Italian'),
+    'pt_BR': ('pt-br', 'Portuguese (Brazil)')
+}
+
+class ir_translation(osv.Model):
+    _name = "ir.translation"
+    _inherit = "ir.translation"
+    _columns = {
+        'gengo_comment': fields.text("Comments & Activity Linked to Gengo"),
+        'job_id': fields.char('Gengo Job ID', size=32),
+        "gengo_translation": fields.selection([('machine', 'Translation By Machine'),
+                                            ('standard', 'Standard'),
+                                            ('pro', 'Pro'),
+                                            ('ultra', 'Ultra')], "Gengo Translation Service Level", help='You can select here the service level you want for an automatic translation using Gengo.'),
+    }
+
+    def _get_all_supported_languages(self, cr, uid, context=None):
+        flag, gengo = self.pool.get('base.gengo.translations').gengo_authentication(cr, uid, context=context)
+        if not flag:
+            raise osv.except_osv(_('Gengo Authentication Error'), gengo)
+        supported_langs = {}
+        lang_pair = gengo.getServiceLanguagePairs(lc_src='en')
+        if lang_pair['opstat'] == 'ok':
+            for g_lang in lang_pair['response']:
+                if g_lang['lc_tgt'] not in supported_langs:
+                    supported_langs[g_lang['lc_tgt']] = []
+                supported_langs[g_lang['lc_tgt']] += [g_lang['tier']]
+        return supported_langs
+
+    def _get_gengo_corresponding_language(cr, lang):
+        return lang in LANG_CODE_MAPPING and LANG_CODE_MAPPING[lang][0] or lang
+
+    def _check_lang_support(self, cr, uid, ids, context=None):
+        for term in self.browse(cr, uid, ids, context=context):
+            if term.gengo_translation:
+                supported_langs = self._get_all_supported_languages(cr, uid, context=context)
+                if supported_langs:
+                    tier = "nonprofit" if term.gengo_translation == 'machine' else term.gengo_translation
+                    language = self._get_gengo_corresponding_language(term.lang)
+                    if tier not in supported_langs.get(language,[]):
+                        return False
+        return True
+
+    _constraints = [
+        (_check_lang_support, 'The Gengo translation service selected is not supported for this language.', ['gengo_translation'])
+    ]
diff --git a/addons/base_gengo/ir_translation.xml b/addons/base_gengo/ir_translation.xml
new file mode 100644
index 00000000000..ba9667d979e
--- /dev/null
+++ b/addons/base_gengo/ir_translation.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        <record id="view_translation_search" model="ir.ui.view">
+            <field name="name">Translations</field>
+            <field name="model">ir.translation</field>
+            <field name="inherit_id" ref="base.view_translation_search"/>
+            <field name="arch" type="xml">
+                <search string="Translations">
+                     <filter string="To Approve In Gengo" domain="[('state','=','inprogress'),('gengo_translation','=',True)]"></filter>
+                </search>
+            </field>
+        </record>
+
+        <!-- ir.translation form view -->
+        <record model="ir.ui.view" id="view_ir_translation_inherit_base_gengo_form">
+            <field name="name">ir.translation.form.inherit</field>
+            <field name="inherit_id" ref="base.view_translation_form"/>
+            <field name="model">ir.translation</field>
+            <field name="arch" type="xml">
+                 <xpath expr="//form[@string='Translations']/sheet" position="inside">
+                    <group string="Gengo Translation Service" col="4" colspan="4">
+                        <field name="gengo_translation" />
+                        <label string="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"/>
+                        <field name="gengo_comment" nolabel="1" placeholder="Gengo Comments &amp; Activity..." colspan="4"/>
+                    </group>
+                </xpath>
+            </field>
+        </record>
+    </data>
+</openerp>
diff --git a/addons/analytic_contract_project/__openerp__.py b/addons/base_gengo/res_company.py
similarity index 54%
rename from addons/analytic_contract_project/__openerp__.py
rename to addons/base_gengo/res_company.py
index 4e4f621663c..22d7b343939 100644
--- a/addons/analytic_contract_project/__openerp__.py
+++ b/addons/base_gengo/res_company.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) 2004-2012 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,20 +19,19 @@
 #
 ##############################################################################
 
-{
-    "name" : "Contract on Project",
-    "version": "1.1",
-    "author" : "OpenERP SA",
-    'category': 'Hidden',
-    "website" : "http://www.openerp.com",
-    "depends" : ["project", "account_analytic_analysis"],
-    "description": """
-Add "Contract Data" in project view.
-    """,
-    "init_xml" : [],
-    "update_xml": ["analytic_contract_project_view.xml"],
-    'demo_xml': [],
-    'installable': True,
-    'auto_install': True,
-}
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+from osv import fields, osv
+
+
+class res_company(osv.Model):
+    _name = "res.company"
+    _inherit = "res.company"
+    _columns = {
+           "gengo_private_key": fields.text("Gengo Private Key"),
+           "gengo_public_key": fields.text("Gengo Public Key"),
+           "gengo_comment": fields.text("Comments", help="This comment will be automatically be enclosed in each an every request sent to Gengo"),
+           "gengo_auto_approve": fields.boolean("Auto Approve Translation ?", help="Jobs are Automatically Approved by Gengo."),
+    }
+
+    _defaults = {
+        "gengo_auto_approve": True,
+    }
diff --git a/addons/base_gengo/res_company_view.xml b/addons/base_gengo/res_company_view.xml
new file mode 100644
index 00000000000..0f99efc8ad0
--- /dev/null
+++ b/addons/base_gengo/res_company_view.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<openerp>
+    <data>
+        <!-- res.company form view -->
+        <record model="ir.ui.view" id="view_company_inherit_base_gengo_form">
+            <field name="name">res.company.form.inherit</field>
+            <field name="inherit_id" ref="base.view_company_form"/>
+            <field name="model">res.company</field>
+            <field name="arch" type="xml">
+                <xpath expr="//notebook[last()]" position="inside">
+                    <page string="Gengo Parameters">
+                        <group col="2">
+                            <group col="1" string="Public Key">
+                                <field name="gengo_public_key" nolabel="1" placeholder="Add Gengo login Public Key..."/>
+                            </group>
+                            <group col="1" string="Private Key">
+                                <field name="gengo_private_key" password="True" nolabel="1" placeholder="Add Gengo login Private Key..."/>
+                            </group>
+                        </group>
+                        <group col="4">
+                            <field name="gengo_auto_approve"/>
+                        </group>
+                        <group string="Comments for Translator" col="1">
+                            <field name="gengo_comment" nolabel="1" placeholder="Add your comments here for translator...."/>
+                        </group>
+                    </page>
+                </xpath>
+            </field>
+        </record>
+
+    </data>
+</openerp>
diff --git a/addons/project_mailgate/__init__.py b/addons/base_gengo/wizard/__init__.py
similarity index 97%
rename from addons/project_mailgate/__init__.py
rename to addons/base_gengo/wizard/__init__.py
index 0f82ebd1b41..f5dd71be01c 100644
--- a/addons/project_mailgate/__init__.py
+++ b/addons/base_gengo/wizard/__init__.py
@@ -19,6 +19,6 @@
 #
 ##############################################################################
 
-import project_mailgate
+import base_gengo_translations
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/base_gengo/wizard/base_gengo_translations.py b/addons/base_gengo/wizard/base_gengo_translations.py
new file mode 100644
index 00000000000..d8a96a2ced9
--- /dev/null
+++ b/addons/base_gengo/wizard/base_gengo_translations.py
@@ -0,0 +1,253 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Business Applications
+#    Copyright (C) 2004-2012 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 osv import osv, fields
+from tools.translate import _
+import re
+try:
+    from mygengo import MyGengo
+except ImportError:
+    raise osv.except_osv(_('Gengo ImportError'), _('Please install mygengo lib from http://pypi.python.org/pypi/mygengo'))
+
+import logging
+import tools
+import time
+
+_logger = logging.getLogger(__name__)
+
+GENGO_DEFAULT_LIMIT = 20
+
+DEFAULT_CRON_VALS = {
+    'active': True,
+    'interval_number': 20,
+    'interval_type': 'minutes',
+    'model': "'base.gengo.translations'",
+    'args': "'(%s,)'" % (str(GENGO_DEFAULT_LIMIT)),
+}
+
+class base_gengo_translations(osv.osv_memory):
+
+    _name = 'base.gengo.translations'
+    _columns = {
+        'restart_send_job': fields.boolean("Restart Sending Job"),
+        'lang_id': fields.many2one('res.lang', 'Language', help="Leave empty if you don't want to restrict the request to a single language"),
+    }
+
+    def gengo_authentication(self, cr, uid, context=None):
+        ''' 
+        This method tries to open a connection with Gengo. For that, it uses the Public and Private
+        keys that are linked to the company (given by Gengo on subscription). It returns a tuple with
+         * as first element: a boolean depicting if the authentication was a success or not
+         * as second element: the connection, if it was a success, or the error message returned by 
+            Gengo when the connection failed.
+            This error message can either be displayed in the server logs (if the authentication was called 
+            by the cron) or in a dialog box (if requested by the user), thus it's important to return it 
+            translated.
+        '''
+
+        user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
+        if not user.company_id.gengo_public_key or not user.company_id.gengo_private_key:
+            return (False, _("Invalid Gengo configuration. Gengo authentication `Public Key` or `Private Key` is missing. Complete Gengo authentication parameters under `Settings > Companies > Gengo Parameters`."))
+        try:
+            gengo = MyGengo(
+                public_key=user.company_id.gengo_public_key.encode('ascii'),
+                private_key=user.company_id.gengo_private_key.encode('ascii'),
+                sandbox=True,
+            )
+            gengo.getAccountStats()
+
+            return (True, gengo)
+        except Exception, e:
+            return (False, _("Gengo Connection Error\n%s") %e)
+
+    def do_check_schedular(self, cr, uid, xml_id, name, fn, context=None):
+        """
+        This function is used to reset a cron to its default values, or to recreate it if it was deleted.
+        """
+        cron_pool = self.pool.get('ir.cron')
+        cron_vals = DEFAULT_CRON_VALS.copy()
+        cron_vals.update({'name': name, "function": fn})
+        try:
+            res = []
+            model, res = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'base_gengo', xml_id)
+            cron_pool.write(cr, uid, [res], cron_vals, context=context)
+        except:
+            #the cron job was not found, probably deleted previously, so we create it again using default values
+            cron_vals.update({'numbercall': -1})
+            return cron_pool.create(cr, uid, cron_vals, context=context)
+
+    def act_update(self, cr, uid, ids, context=None):
+        '''
+        Function called by the wizard.
+        '''
+        if context == None:
+            context = {}
+
+        flag, gengo = self.gengo_authentication(cr, uid, context=context)
+        if not flag:
+            raise osv.except_osv(_('Gengo Authentication Error'), gengo)
+        for wizard in self.browse(cr, uid, ids, context=context):
+            supported_langs = self.pool.get('ir.translation')._get_all_supported_languages(cr, uid, context=context)
+            language = self.pool.get('ir.translation')._get_gengo_corresponding_language(wizard.lang_id.code)
+            if language not in supported_langs:
+                raise osv.except_osv(_("Warning"), _('This language is not supported by the  Gengo translation services.'))
+
+            #send immediately a new request for the selected language (if any)
+            ctx = context.copy()
+            ctx['gengo_language'] = wizard.lang_id.id
+            self._sync_request(cr, uid, limit=GENGO_DEFAULT_LIMIT, context=ctx)
+            self._sync_response( cr, uid, limit=GENGO_DEFAULT_LIMIT, context=ctx)
+            #check the cron jobs and eventually restart/recreate them
+            if wizard.restart_send_job:
+                self.do_check_schedular(cr, uid, 'gengo_sync_send_request_scheduler', _('Gengo Sync Translation (Request)'), '_sync_request', context=context)
+            self.do_check_schedular(cr, uid, 'gengo_sync_receive_request_scheduler', _('Gengo Sync Translation (Response)'), '_sync_response', context=context)
+        return {'type': 'ir.actions.act_window_close'}
+
+    def _sync_response(self, cr, uid, limit=GENGO_DEFAULT_LIMIT, context=None):
+        """
+        This method will be called by cron services to get translations from
+        Gengo. It will read translated terms and comments from Gengo and will 
+        update respective ir.translation in openerp.
+        """
+        translation_pool = self.pool.get('ir.translation')
+        flag, gengo = self.gengo_authentication(cr, uid, context=context)
+        if not flag:
+            _logger.warning("%s", gengo)
+        else:
+            translation_id = translation_pool.search(cr, uid, [('state', '=', 'inprogress'), ('gengo_translation', 'in', ('machine','standard','pro','ultra'))], limit=limit, context=context)
+            for term in translation_pool.browse(cr, uid, translation_id, context=context):
+                up_term = up_comment = 0
+                if term.job_id:
+                    vals={}
+                    job_response = gengo.getTranslationJob(id=term.job_id)
+                    if job_response['opstat'] != 'ok':
+                        _logger.warning("Invalid Response! Skipping translation Terms with `id` %s." % (term.job_id))
+                        continue
+                    if job_response['response']['job']['status'] == 'approved':
+                        vals.update({'state': 'translated',
+                            'value': job_response['response']['job']['body_tgt']})
+                        up_term += 1
+                    job_comment = gengo.getTranslationJobComments(id=term.job_id)
+                    if job_comment['opstat']=='ok':
+                        gengo_comments=""
+                        for comment in job_comment['response']['thread']:
+                            gengo_comments += _('%s\n\n--\n Commented on %s by %s.') % (comment['body'], time.ctime(comment['ctime']), comment['author'])
+                        vals.update({'gengo_comment': gengo_comments})
+                        up_comment += 1
+                    if vals:
+                        translation_pool.write(cr, uid, term.id, vals)
+                    _logger.info("Successfully Updated `%d` terms and %d Comments." % (up_term, up_comment ))
+                else:
+                    _logger.warning("%s", 'Cannot retrieve the Gengo job ID for translation %s: %s' % (term.id, term.src))
+        return True
+
+    def _update_terms(self, cr, uid, response, context=None):
+        """
+        Update the terms after their translation were requested to Gengo
+        """
+        translation_pool = self.pool.get('ir.translation')
+        for jobs in response['jobs']:
+            for t_id, res in jobs.items():
+                vals = {}
+                t_id = int(t_id)
+                tier = translation_pool.read(cr, uid, [t_id], ['gengo_translation'], context=context)[0]['gengo_translation']
+                if tier == "machine":
+                    vals.update({'value': res['body_tgt'], 'state': 'translated'})
+                else:
+                    vals.update({'job_id': res['job_id'], 'state': 'inprogress'})
+                translation_pool.write(cr, uid, [t_id], vals, context=context)
+        return
+
+    def pack_jobs_request(self, cr, uid, term_ids, context=None):
+        ''' prepare the terms that will be requested to gengo and returns them in a dictionary with following format
+            {'jobs': {
+                'term1.id': {...}
+                'term2.id': {...}
+                }
+            }'''
+
+        translation_pool = self.pool.get('ir.translation')
+        jobs = {}
+        user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
+        auto_approve = 1 if user.company_id.gengo_auto_approve else 0
+        for term in translation_pool.browse(cr, uid, term_ids, context=context):
+            if re.search(r"\w", term.src or ""):
+                jobs[term.id] = {'type': 'text',
+                        'slug': 'single::English to ' + term.lang,
+                        'tier': tools.ustr(term.gengo_translation),
+                        'body_src': term.src,
+                        'lc_src': 'en',
+                        'lc_tgt': translation_pool._get_gengo_corresponding_language(term.lang),
+                        'auto_approve': auto_approve,
+                        'comment': user.company_id.gengo_comment,
+                }
+        return {'jobs': jobs}
+
+
+    def _send_translation_terms(self, cr, uid,  term_ids, context=None):
+        """
+        Send a request to Gengo with all the term_ids in a different job, get the response and update the terms in
+        database accordingly.
+        """
+
+        user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
+        flag, gengo = self.gengo_authentication(cr, uid, context=context)
+        if flag:
+            request = self.pack_jobs_request(cr, uid, term_ids, context=context)
+            if request['jobs']:
+                result = gengo.postTranslationJobs(jobs=request)
+                if result['opstat'] == 'ok':
+                    self._update_terms(cr, uid, result['response'], context=context)
+        else:
+            _logger.error(gengo)
+        return True
+
+    def _sync_request(self, cr, uid, limit=GENGO_DEFAULT_LIMIT, context=None):
+        """
+        This scheduler will send a job request to the gengo , which terms are
+        waiing to be translated and for which gengo_translation is enabled. 
+
+        A special key 'gengo_language' can be passed in the context in order to 
+        request only translations of that language only. Its value is the language 
+        ID in openerp.
+        """
+        if context is None:
+            context = {}
+        language_pool = self.pool.get('res.lang')
+        translation_pool = self.pool.get('ir.translation')
+        try:
+            #by default, the request will be made for all terms that needs it, whatever the language
+            lang_ids = language_pool.search(cr, uid, [], context=context)
+            if context.get('gengo_language'):
+                #but if this specific key is given, then we restrict the request on terms of this language only
+                lang_ids = [context.get('gengo_language')]
+            langs = [lang.code for lang in language_pool.browse(cr, uid, lang_ids, context=context)]
+            #search for the n first terms to translate
+            term_ids = translation_pool.search(cr, uid, [('state', '=', 'to_translate'), ('gengo_translation', 'in', ('machine','standard','pro','ultra')), ('lang', 'in', langs)], limit=limit, context=context)
+            if term_ids:
+                self._send_translation_terms(cr, uid, term_ids, context=context)
+                _logger.info("%s Translation terms have been posted to Gengo successfully", len(term_ids))
+            else:
+                _logger.info('No Translation terms to process.')
+        except Exception, e:
+            _logger.error("%s", e)
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/base_gengo/wizard/base_gengo_translations_view.xml b/addons/base_gengo/wizard/base_gengo_translations_view.xml
new file mode 100644
index 00000000000..09c3a77b1d5
--- /dev/null
+++ b/addons/base_gengo/wizard/base_gengo_translations_view.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        <record model="ir.ui.view" id="base_gengo_translation_wizard_from">
+            <field name="name">base.gengo.translation.form</field>
+            <field name="model">base.gengo.translations</field>
+            <field name="arch" type="xml">
+                <form string="Gengo Request Form" version="7.0">
+                   <group col="4">
+                        <group>
+                            <field name="lang_id" required="1"/>
+                            <field name="restart_send_job"/>
+                        </group>
+                        <group>
+                            <label colspan="2" string="Leave empty for requesting all the terms to Gengo that needs it, regardless of their language"/>
+                        </group>
+                    </group>
+                    <footer>
+                        <button name="act_update" string="Send" type="object" class="oe_highlight"/> 
+                        or 
+                        <button name="act_cancel" special="cancel" string="Cancel" type="object" class="oe_link"/>
+                    </footer>
+                </form>
+            </field>
+        </record>
+
+        <record id="action_wizard_base_gengo_translations" model="ir.actions.act_window">
+            <field name="name">Gengo: Manual Request of Translation</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">base.gengo.translations</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+        </record>
+        <menuitem action="action_wizard_base_gengo_translations" id="menu_action_wizard_base_gengo_translations" parent="base.menu_translation_app"/>
+
+    </data>
+</openerp>
diff --git a/addons/base_iban/__openerp__.py b/addons/base_iban/__openerp__.py
index f7778c13f2b..76c397586c9 100644
--- a/addons/base_iban/__openerp__.py
+++ b/addons/base_iban/__openerp__.py
@@ -21,10 +21,10 @@
 {
     'name': 'IBAN Bank Accounts',
     'version': '1.0',
-    "category": 'Hidden/Dependency',
+    'category': 'Hidden/Dependency',
     'description': """
 This module installs the base for IBAN (International Bank Account Number) bank accounts and checks for it's validity.
-=====================================================================================================================
+======================================================================================================================
 
 The ability to extract the correctly represented local accounts from IBAN accounts 
 with a single statement.
@@ -32,8 +32,7 @@ with a single statement.
     'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
     'depends': ['base'],
-    'init_xml': ['base_iban_data.xml'],
-    'update_xml': ['base_iban_view.xml'],
+    'data': ['base_iban_data.xml' , 'base_iban_view.xml'],
     'installable': True,
     'auto_install': False,
     'certificate': '0050014379549',
diff --git a/addons/base_iban/base_iban_data.xml b/addons/base_iban/base_iban_data.xml
index ac481098254..eafc8dfcff8 100644
--- a/addons/base_iban/base_iban_data.xml
+++ b/addons/base_iban/base_iban_data.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-    <data>
+    <data noupdate="1">
 
         <!--
         Default bank account description
diff --git a/addons/base_iban/i18n/ar.po b/addons/base_iban/i18n/ar.po
index 20354e6e56a..52748e22022 100644
--- a/addons/base_iban/i18n/ar.po
+++ b/addons/base_iban/i18n/ar.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:51+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:58+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_iban
 #: constraint:res.partner.bank:0
diff --git a/addons/base_iban/i18n/bg.po b/addons/base_iban/i18n/bg.po
index 5d53434ac9b..b30014d7403 100644
--- a/addons/base_iban/i18n/bg.po
+++ b/addons/base_iban/i18n/bg.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:51+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:58+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_iban
 #: constraint:res.partner.bank:0
diff --git a/addons/base_iban/i18n/bs.po b/addons/base_iban/i18n/bs.po
index 8d2df7f4ff5..a5838218aab 100644
--- a/addons/base_iban/i18n/bs.po
+++ b/addons/base_iban/i18n/bs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:51+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:58+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_iban
 #: constraint:res.partner.bank:0
diff --git a/addons/base_iban/i18n/ca.po b/addons/base_iban/i18n/ca.po
index c4ef2614aaf..e16ddbd2b5f 100644
--- a/addons/base_iban/i18n/ca.po
+++ b/addons/base_iban/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:51+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:58+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_iban
 #: constraint:res.partner.bank:0
diff --git a/addons/base_iban/i18n/cs.po b/addons/base_iban/i18n/cs.po
index a013fb5efc6..efc84011bff 100644
--- a/addons/base_iban/i18n/cs.po
+++ b/addons/base_iban/i18n/cs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:51+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:58+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_iban
 #: constraint:res.partner.bank:0
diff --git a/addons/base_iban/i18n/da.po b/addons/base_iban/i18n/da.po
index 26106e32450..2267fa52953 100644
--- a/addons/base_iban/i18n/da.po
+++ b/addons/base_iban/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:51+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:58+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_iban
 #: constraint:res.partner.bank:0
diff --git a/addons/base_iban/i18n/de.po b/addons/base_iban/i18n/de.po
index 3e0cc4c6b0a..1d0acb8e1d1 100644
--- a/addons/base_iban/i18n/de.po
+++ b/addons/base_iban/i18n/de.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:51+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:58+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_iban
 #: constraint:res.partner.bank:0
diff --git a/addons/base_iban/i18n/el.po b/addons/base_iban/i18n/el.po
index c8c1b2efa7c..a90b58e9da3 100644
--- a/addons/base_iban/i18n/el.po
+++ b/addons/base_iban/i18n/el.po
@@ -9,8 +9,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:51+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:58+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
 "X-Poedit-SourceCharset: utf-8\n"
diff --git a/addons/base_iban/i18n/en_GB.po b/addons/base_iban/i18n/en_GB.po
index 493c44b01ab..baef371a836 100644
--- a/addons/base_iban/i18n/en_GB.po
+++ b/addons/base_iban/i18n/en_GB.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:51+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:58+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_iban
 #: constraint:res.partner.bank:0
diff --git a/addons/base_iban/i18n/es.po b/addons/base_iban/i18n/es.po
index 358590f6c4e..3d0779dbb5b 100644
--- a/addons/base_iban/i18n/es.po
+++ b/addons/base_iban/i18n/es.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:51+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:58+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_iban
 #: constraint:res.partner.bank:0
diff --git a/addons/base_iban/i18n/es_AR.po b/addons/base_iban/i18n/es_AR.po
index 56ffd7eb5fa..3dedef6957a 100644
--- a/addons/base_iban/i18n/es_AR.po
+++ b/addons/base_iban/i18n/es_AR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:51+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:58+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_iban
 #: constraint:res.partner.bank:0
diff --git a/addons/base_iban/i18n/es_CR.po b/addons/base_iban/i18n/es_CR.po
index 03453200453..eba66c6782f 100644
--- a/addons/base_iban/i18n/es_CR.po
+++ b/addons/base_iban/i18n/es_CR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:51+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:58+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 "Language: \n"
 
 #. module: base_iban
diff --git a/addons/base_iban/i18n/es_EC.po b/addons/base_iban/i18n/es_EC.po
index 08da041356f..80f60425277 100644
--- a/addons/base_iban/i18n/es_EC.po
+++ b/addons/base_iban/i18n/es_EC.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:51+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:58+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_iban
 #: constraint:res.partner.bank:0
diff --git a/addons/base_iban/i18n/es_PY.po b/addons/base_iban/i18n/es_PY.po
index 6e6e3c169a2..e0c7d1ef314 100644
--- a/addons/base_iban/i18n/es_PY.po
+++ b/addons/base_iban/i18n/es_PY.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:51+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:58+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_iban
 #: constraint:res.partner.bank:0
diff --git a/addons/base_iban/i18n/et.po b/addons/base_iban/i18n/et.po
index 42ee1cd1c32..d21f515f671 100644
--- a/addons/base_iban/i18n/et.po
+++ b/addons/base_iban/i18n/et.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:51+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:58+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_iban
 #: constraint:res.partner.bank:0
diff --git a/addons/base_iban/i18n/eu.po b/addons/base_iban/i18n/eu.po
index 6d578b62722..6ff1c0ea848 100644
--- a/addons/base_iban/i18n/eu.po
+++ b/addons/base_iban/i18n/eu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:51+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:58+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_iban
 #: constraint:res.partner.bank:0
diff --git a/addons/base_iban/i18n/fa.po b/addons/base_iban/i18n/fa.po
index 74eb31b3b7c..c0f69ea7e7b 100644
--- a/addons/base_iban/i18n/fa.po
+++ b/addons/base_iban/i18n/fa.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:51+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:58+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_iban
 #: constraint:res.partner.bank:0
diff --git a/addons/base_iban/i18n/fi.po b/addons/base_iban/i18n/fi.po
index 1865ff5edcd..61a9a574485 100644
--- a/addons/base_iban/i18n/fi.po
+++ b/addons/base_iban/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:51+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:58+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_iban
 #: constraint:res.partner.bank:0
diff --git a/addons/base_iban/i18n/fr.po b/addons/base_iban/i18n/fr.po
index 8218be30b82..1f2ac8fc3c7 100644
--- a/addons/base_iban/i18n/fr.po
+++ b/addons/base_iban/i18n/fr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:51+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:58+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_iban
 #: constraint:res.partner.bank:0
diff --git a/addons/base_iban/i18n/gl.po b/addons/base_iban/i18n/gl.po
index 5c07a34edc8..ba36d8941eb 100644
--- a/addons/base_iban/i18n/gl.po
+++ b/addons/base_iban/i18n/gl.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:51+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:58+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_iban
 #: constraint:res.partner.bank:0
diff --git a/addons/base_iban/i18n/gu.po b/addons/base_iban/i18n/gu.po
index 6ffd2adecdf..1e629ef235a 100644
--- a/addons/base_iban/i18n/gu.po
+++ b/addons/base_iban/i18n/gu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:51+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:58+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_iban
 #: constraint:res.partner.bank:0
diff --git a/addons/base_iban/i18n/hr.po b/addons/base_iban/i18n/hr.po
index fe48ec8a7c8..5ddfd5f5126 100644
--- a/addons/base_iban/i18n/hr.po
+++ b/addons/base_iban/i18n/hr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:51+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:58+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 "Language: hr\n"
 
 #. module: base_iban
diff --git a/addons/base_iban/i18n/hu.po b/addons/base_iban/i18n/hu.po
index 857c5a12a24..effd5ba2878 100644
--- a/addons/base_iban/i18n/hu.po
+++ b/addons/base_iban/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:51+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:58+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_iban
 #: constraint:res.partner.bank:0
diff --git a/addons/base_iban/i18n/id.po b/addons/base_iban/i18n/id.po
index f3714bacad1..5f3d17593db 100644
--- a/addons/base_iban/i18n/id.po
+++ b/addons/base_iban/i18n/id.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:51+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:58+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_iban
 #: constraint:res.partner.bank:0
diff --git a/addons/base_iban/i18n/it.po b/addons/base_iban/i18n/it.po
index 323690e7154..3017c31493f 100644
--- a/addons/base_iban/i18n/it.po
+++ b/addons/base_iban/i18n/it.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:51+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:58+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_iban
 #: constraint:res.partner.bank:0
diff --git a/addons/base_iban/i18n/ja.po b/addons/base_iban/i18n/ja.po
index aeeb792c4b3..ba62fce06ef 100644
--- a/addons/base_iban/i18n/ja.po
+++ b/addons/base_iban/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:51+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:58+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_iban
 #: constraint:res.partner.bank:0
diff --git a/addons/base_iban/i18n/ko.po b/addons/base_iban/i18n/ko.po
index 8a9bc31246c..3f32f2a9cb5 100644
--- a/addons/base_iban/i18n/ko.po
+++ b/addons/base_iban/i18n/ko.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:51+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:58+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_iban
 #: constraint:res.partner.bank:0
diff --git a/addons/base_iban/i18n/lt.po b/addons/base_iban/i18n/lt.po
index 664bfb9d8ba..01f5bbaeeae 100644
--- a/addons/base_iban/i18n/lt.po
+++ b/addons/base_iban/i18n/lt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:51+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:58+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_iban
 #: constraint:res.partner.bank:0
diff --git a/addons/base_iban/i18n/lv.po b/addons/base_iban/i18n/lv.po
index 08d4821df7a..b7ec6498af2 100644
--- a/addons/base_iban/i18n/lv.po
+++ b/addons/base_iban/i18n/lv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:51+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:58+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_iban
 #: constraint:res.partner.bank:0
diff --git a/addons/base_iban/i18n/mn.po b/addons/base_iban/i18n/mn.po
index d782ae1afd5..1f49c60d21c 100644
--- a/addons/base_iban/i18n/mn.po
+++ b/addons/base_iban/i18n/mn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:51+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:58+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_iban
 #: constraint:res.partner.bank:0
diff --git a/addons/base_iban/i18n/nb.po b/addons/base_iban/i18n/nb.po
new file mode 100644
index 00000000000..ee8d4d1cc38
--- /dev/null
+++ b/addons/base_iban/i18n/nb.po
@@ -0,0 +1,95 @@
+# Norwegian Bokmal 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-02-08 00:36+0000\n"
+"PO-Revision-Date: 2012-08-28 13:04+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Norwegian Bokmal <nb@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-08-29 05:05+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
+
+#. module: base_iban
+#: constraint:res.partner.bank:0
+msgid ""
+"\n"
+"Please define BIC/Swift code on bank for bank type IBAN Account to make "
+"valid payments"
+msgstr ""
+"\n"
+"Vennligst definere BIC / Swift-kode på bank for bank typen IBAN-konto for å "
+"fatte gyldige betalinger"
+
+#. module: base_iban
+#: code:addons/base_iban/base_iban.py:139
+#, python-format
+msgid "This IBAN does not pass the validation check, please verify it"
+msgstr "Dette IBAN passer ikke valideringskontrollen, du bekrefte den."
+
+#. module: base_iban
+#: model:res.partner.bank.type,format_layout:base_iban.bank_iban
+msgid "%(bank_name)s: IBAN %(acc_number)s - BIC %(bank_bic)s"
+msgstr "%(bank_navn)s: IBAN %(konto_nummer)s - BIC %(bank_bic)s"
+
+#. module: base_iban
+#: model:res.partner.bank.type.field,name:base_iban.bank_swift_field
+msgid "bank_bic"
+msgstr "bank_bic"
+
+#. module: base_iban
+#: model:res.partner.bank.type.field,name:base_iban.bank_zip_field
+msgid "zip"
+msgstr "Zip"
+
+#. module: base_iban
+#: help:res.partner.bank,iban:0
+msgid "International Bank Account Number"
+msgstr "Internasjonal bank kontonummer"
+
+#. module: base_iban
+#: model:ir.model,name:base_iban.model_res_partner_bank
+msgid "Bank Accounts"
+msgstr "Bankkontoer"
+
+#. module: base_iban
+#: model:res.partner.bank.type.field,name:base_iban.bank_country_field
+msgid "country_id"
+msgstr "country_id"
+
+#. module: base_iban
+#: code:addons/base_iban/base_iban.py:136
+#, python-format
+msgid ""
+"The IBAN does not seem to be correct. You should have entered something like "
+"this %s"
+msgstr ""
+"IBAN synes ikke å være korrekt. Du bør ha angitt noe sånt som dette% s"
+
+#. module: base_iban
+#: field:res.partner.bank,iban:0
+msgid "IBAN"
+msgstr "IBAN"
+
+#. module: base_iban
+#: code:addons/base_iban/base_iban.py:140
+#, python-format
+msgid "The IBAN is invalid, it should begin with the country code"
+msgstr "IBAN er ugyldig, Det burde begynne med landskode"
+
+#. module: base_iban
+#: model:res.partner.bank.type,name:base_iban.bank_iban
+msgid "IBAN Account"
+msgstr "IBAN Konto"
+
+#. module: base_iban
+#: constraint:res.partner.bank:0
+msgid "The RIB and/or IBAN is not valid"
+msgstr "RIB og / eller IBAN er ikke gyldig"
diff --git a/addons/base_iban/i18n/nl.po b/addons/base_iban/i18n/nl.po
index 05e4eee2ce1..8aa9d4a5e58 100644
--- a/addons/base_iban/i18n/nl.po
+++ b/addons/base_iban/i18n/nl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:51+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:58+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_iban
 #: constraint:res.partner.bank:0
diff --git a/addons/base_iban/i18n/nl_BE.po b/addons/base_iban/i18n/nl_BE.po
index e9844948f6e..51fb108b6b8 100644
--- a/addons/base_iban/i18n/nl_BE.po
+++ b/addons/base_iban/i18n/nl_BE.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:51+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:58+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_iban
 #: constraint:res.partner.bank:0
diff --git a/addons/base_iban/i18n/oc.po b/addons/base_iban/i18n/oc.po
index 15a862dd2d1..ce53ae9fdc8 100644
--- a/addons/base_iban/i18n/oc.po
+++ b/addons/base_iban/i18n/oc.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:51+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:58+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_iban
 #: constraint:res.partner.bank:0
diff --git a/addons/base_iban/i18n/pl.po b/addons/base_iban/i18n/pl.po
index 40dbd859e66..b663f35fffe 100644
--- a/addons/base_iban/i18n/pl.po
+++ b/addons/base_iban/i18n/pl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:51+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:58+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_iban
 #: constraint:res.partner.bank:0
diff --git a/addons/base_iban/i18n/pt.po b/addons/base_iban/i18n/pt.po
index e3d9480cfbf..05362f30600 100644
--- a/addons/base_iban/i18n/pt.po
+++ b/addons/base_iban/i18n/pt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:51+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:58+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_iban
 #: constraint:res.partner.bank:0
diff --git a/addons/base_iban/i18n/pt_BR.po b/addons/base_iban/i18n/pt_BR.po
index 0b108ea282b..a2b851b4f1b 100644
--- a/addons/base_iban/i18n/pt_BR.po
+++ b/addons/base_iban/i18n/pt_BR.po
@@ -8,13 +8,14 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 00:36+0000\n"
 "PO-Revision-Date: 2012-07-28 15:02+0000\n"
-"Last-Translator: Fábio Martinelli <webmaster@guaru.net>\n"
+"Last-Translator: Fábio Martinelli - http://zupy.com.br "
+"<webmaster@guaru.net>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:51+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:58+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_iban
 #: constraint:res.partner.bank:0
diff --git a/addons/base_iban/i18n/ro.po b/addons/base_iban/i18n/ro.po
index fab9e68acea..5128992709e 100644
--- a/addons/base_iban/i18n/ro.po
+++ b/addons/base_iban/i18n/ro.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:51+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:58+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_iban
 #: constraint:res.partner.bank:0
diff --git a/addons/base_iban/i18n/ru.po b/addons/base_iban/i18n/ru.po
index 867bcf68906..4bf84c55d53 100644
--- a/addons/base_iban/i18n/ru.po
+++ b/addons/base_iban/i18n/ru.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:51+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:58+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_iban
 #: constraint:res.partner.bank:0
diff --git a/addons/base_iban/i18n/sk.po b/addons/base_iban/i18n/sk.po
index c0b1fdb4fd9..8f93fe4c889 100644
--- a/addons/base_iban/i18n/sk.po
+++ b/addons/base_iban/i18n/sk.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:51+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:58+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_iban
 #: constraint:res.partner.bank:0
diff --git a/addons/base_iban/i18n/sl.po b/addons/base_iban/i18n/sl.po
index 27c223defc2..feb2e170a37 100644
--- a/addons/base_iban/i18n/sl.po
+++ b/addons/base_iban/i18n/sl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:51+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:58+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_iban
 #: constraint:res.partner.bank:0
diff --git a/addons/base_iban/i18n/sq.po b/addons/base_iban/i18n/sq.po
index 4090aa42cc2..839f4c11ba8 100644
--- a/addons/base_iban/i18n/sq.po
+++ b/addons/base_iban/i18n/sq.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:51+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:58+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_iban
 #: constraint:res.partner.bank:0
diff --git a/addons/base_iban/i18n/sr.po b/addons/base_iban/i18n/sr.po
index 4a40987c081..2eaa15890d0 100644
--- a/addons/base_iban/i18n/sr.po
+++ b/addons/base_iban/i18n/sr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:51+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:58+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_iban
 #: constraint:res.partner.bank:0
diff --git a/addons/base_iban/i18n/sr@latin.po b/addons/base_iban/i18n/sr@latin.po
index 11214cc6efa..5cc6af38d30 100644
--- a/addons/base_iban/i18n/sr@latin.po
+++ b/addons/base_iban/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:51+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:58+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_iban
 #: constraint:res.partner.bank:0
diff --git a/addons/base_iban/i18n/sv.po b/addons/base_iban/i18n/sv.po
index afe9cadd521..9a7d979f57a 100644
--- a/addons/base_iban/i18n/sv.po
+++ b/addons/base_iban/i18n/sv.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:51+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:58+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_iban
 #: constraint:res.partner.bank:0
diff --git a/addons/base_iban/i18n/ta.po b/addons/base_iban/i18n/ta.po
index 93cf0074ea2..637aaa69a8d 100644
--- a/addons/base_iban/i18n/ta.po
+++ b/addons/base_iban/i18n/ta.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:51+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:58+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_iban
 #: constraint:res.partner.bank:0
diff --git a/addons/base_iban/i18n/tlh.po b/addons/base_iban/i18n/tlh.po
index 2f80db9b7ba..c5a24356917 100644
--- a/addons/base_iban/i18n/tlh.po
+++ b/addons/base_iban/i18n/tlh.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:51+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:58+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_iban
 #: constraint:res.partner.bank:0
diff --git a/addons/base_iban/i18n/tr.po b/addons/base_iban/i18n/tr.po
index 05fec2f7a24..aa8e386f947 100644
--- a/addons/base_iban/i18n/tr.po
+++ b/addons/base_iban/i18n/tr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:51+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:58+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_iban
 #: constraint:res.partner.bank:0
diff --git a/addons/base_iban/i18n/uk.po b/addons/base_iban/i18n/uk.po
index 099fce5952c..3179a8d4363 100644
--- a/addons/base_iban/i18n/uk.po
+++ b/addons/base_iban/i18n/uk.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:51+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:58+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_iban
 #: constraint:res.partner.bank:0
diff --git a/addons/base_iban/i18n/vi.po b/addons/base_iban/i18n/vi.po
index a1975f5d742..8079a1eca6a 100644
--- a/addons/base_iban/i18n/vi.po
+++ b/addons/base_iban/i18n/vi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:51+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:58+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_iban
 #: constraint:res.partner.bank:0
diff --git a/addons/base_iban/i18n/zh_CN.po b/addons/base_iban/i18n/zh_CN.po
index d82648edc23..4e2f5196885 100644
--- a/addons/base_iban/i18n/zh_CN.po
+++ b/addons/base_iban/i18n/zh_CN.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:51+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:58+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_iban
 #: constraint:res.partner.bank:0
diff --git a/addons/base_iban/i18n/zh_TW.po b/addons/base_iban/i18n/zh_TW.po
index dbeacb6b2b4..92be73e8e78 100644
--- a/addons/base_iban/i18n/zh_TW.po
+++ b/addons/base_iban/i18n/zh_TW.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2009-01-30 12:44+0000\n"
-"Last-Translator: <>\n"
+"PO-Revision-Date: 2012-08-19 10:36+0000\n"
+"Last-Translator: Eric Huang <eh@cenoq.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:51+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:58+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_iban
 #: constraint:res.partner.bank:0
@@ -23,27 +23,29 @@ msgid ""
 "Please define BIC/Swift code on bank for bank type IBAN Account to make "
 "valid payments"
 msgstr ""
+"\n"
+"請為 IBAN類型的銀行指定 BIC/Swift代碼，以便自動付款。"
 
 #. module: base_iban
 #: code:addons/base_iban/base_iban.py:139
 #, python-format
 msgid "This IBAN does not pass the validation check, please verify it"
-msgstr ""
+msgstr "此IBAN沒有通過檢核，請查證"
 
 #. module: base_iban
 #: model:res.partner.bank.type,format_layout:base_iban.bank_iban
 msgid "%(bank_name)s: IBAN %(acc_number)s - BIC %(bank_bic)s"
-msgstr ""
+msgstr "%(bank_name)s: IBAN %(acc_number)s - BIC %(bank_bic)s"
 
 #. module: base_iban
 #: model:res.partner.bank.type.field,name:base_iban.bank_swift_field
 msgid "bank_bic"
-msgstr ""
+msgstr "bank_bic"
 
 #. module: base_iban
 #: model:res.partner.bank.type.field,name:base_iban.bank_zip_field
 msgid "zip"
-msgstr ""
+msgstr "zip"
 
 #. module: base_iban
 #: help:res.partner.bank,iban:0
@@ -53,12 +55,12 @@ msgstr "國際銀行帳號(IBAN)"
 #. module: base_iban
 #: model:ir.model,name:base_iban.model_res_partner_bank
 msgid "Bank Accounts"
-msgstr "銀行帳號"
+msgstr "銀行帳戶"
 
 #. module: base_iban
 #: model:res.partner.bank.type.field,name:base_iban.bank_country_field
 msgid "country_id"
-msgstr ""
+msgstr "country_id"
 
 #. module: base_iban
 #: code:addons/base_iban/base_iban.py:136
@@ -66,18 +68,18 @@ msgstr ""
 msgid ""
 "The IBAN does not seem to be correct. You should have entered something like "
 "this %s"
-msgstr ""
+msgstr "此IBAN似乎不正確。你應該輸入像 %s 的值。"
 
 #. module: base_iban
 #: field:res.partner.bank,iban:0
 msgid "IBAN"
-msgstr ""
+msgstr "IBAN"
 
 #. module: base_iban
 #: code:addons/base_iban/base_iban.py:140
 #, python-format
 msgid "The IBAN is invalid, it should begin with the country code"
-msgstr ""
+msgstr "此IBAN不正確，它開頭應該是國碼。"
 
 #. module: base_iban
 #: model:res.partner.bank.type,name:base_iban.bank_iban
@@ -87,7 +89,7 @@ msgstr "IBAN 帳號"
 #. module: base_iban
 #: constraint:res.partner.bank:0
 msgid "The RIB and/or IBAN is not valid"
-msgstr ""
+msgstr "RIB/IBAN 無效"
 
 #, python-format
 #~ msgid "The IBAN is invalid, It should begin with the country code"
diff --git a/addons/base_module_doc_rst/__openerp__.py b/addons/base_module_doc_rst/__openerp__.py
index 2f9aa2dac49..100a90dbd96 100644
--- a/addons/base_module_doc_rst/__openerp__.py
+++ b/addons/base_module_doc_rst/__openerp__.py
@@ -34,14 +34,13 @@ This module generates the Technical Guides of selected modules in Restructured T
     'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
     'depends': ['base'],
-    'init_xml': [],
-    'update_xml': [
+    'data': [
         'base_module_doc_rst_view.xml',
         'wizard/generate_relation_graph_view.xml',
         'wizard/tech_guide_rst_view.xml',
         'module_report.xml',
     ],
-    'demo_xml': [],
+    'demo': [],
     'installable': True,
     'certificate': '001288481437217734509',
     'images': ['images/base_module_doc_rst1.jpeg'],
diff --git a/addons/base_module_record/__openerp__.py b/addons/base_module_record/__openerp__.py
index 4cdc8116217..00af464b3ee 100644
--- a/addons/base_module_record/__openerp__.py
+++ b/addons/base_module_record/__openerp__.py
@@ -39,19 +39,19 @@ This should help you to easily create reusable and publishable modules for custo
 configurations and demo/testing data.
 
 How to use it?:
+---------------
 Run Settings/Technical/Module Creation/Export Customizations As a Module wizard. 
 Select datetime criteria of recording and objects to be recorded and Record module.
     """,
     'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
     'depends': ['base'],
-    'init_xml': [],
-    'update_xml': [
+    'data': [
         'security/ir.model.access.csv',
         'wizard/base_module_record_object_view.xml',
         'wizard/base_module_record_data_view.xml',
     ],
-    'demo_xml': [],
+    'demo': [],
     'installable': True,
     'certificate': '0083134865813',
     'images': ['images/base_module_record1.jpeg','images/base_module_record2.jpeg','images/base_module_record3.jpeg',]
diff --git a/addons/base_module_record/i18n/ar.po b/addons/base_module_record/i18n/ar.po
index 4ea3ae5eda5..ad4b05abd5c 100644
--- a/addons/base_module_record/i18n/ar.po
+++ b/addons/base_module_record/i18n/ar.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:00+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_module_record
 #: wizard_field:base_module_record.module_record_objects,info,category:0
diff --git a/addons/base_module_record/i18n/bg.po b/addons/base_module_record/i18n/bg.po
index a36ec5ef37c..1fbdf2b4ca2 100644
--- a/addons/base_module_record/i18n/bg.po
+++ b/addons/base_module_record/i18n/bg.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:00+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_module_record
 #: wizard_field:base_module_record.module_record_objects,info,category:0
diff --git a/addons/base_module_record/i18n/bs.po b/addons/base_module_record/i18n/bs.po
index d954f673099..fe933bba6fe 100644
--- a/addons/base_module_record/i18n/bs.po
+++ b/addons/base_module_record/i18n/bs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:00+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_module_record
 #: wizard_field:base_module_record.module_record_objects,info,category:0
diff --git a/addons/base_module_record/i18n/ca.po b/addons/base_module_record/i18n/ca.po
index 73954f1219b..e1a815734df 100644
--- a/addons/base_module_record/i18n/ca.po
+++ b/addons/base_module_record/i18n/ca.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:00+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_module_record
 #: wizard_field:base_module_record.module_record_objects,info,category:0
diff --git a/addons/base_module_record/i18n/cs.po b/addons/base_module_record/i18n/cs.po
index 434fe531e16..1a17901532c 100644
--- a/addons/base_module_record/i18n/cs.po
+++ b/addons/base_module_record/i18n/cs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:00+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 "X-Poedit-Language: Czech\n"
 
 #. module: base_module_record
diff --git a/addons/base_module_record/i18n/da.po b/addons/base_module_record/i18n/da.po
index f402492a4b7..4d2285398fc 100644
--- a/addons/base_module_record/i18n/da.po
+++ b/addons/base_module_record/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:00+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_module_record
 #: wizard_field:base_module_record.module_record_objects,info,category:0
diff --git a/addons/base_module_record/i18n/de.po b/addons/base_module_record/i18n/de.po
index d91741b3b2f..68267368d44 100644
--- a/addons/base_module_record/i18n/de.po
+++ b/addons/base_module_record/i18n/de.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:00+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_module_record
 #: wizard_field:base_module_record.module_record_objects,info,category:0
diff --git a/addons/base_module_record/i18n/el.po b/addons/base_module_record/i18n/el.po
index 23f8936236f..e47dcf0ee2e 100644
--- a/addons/base_module_record/i18n/el.po
+++ b/addons/base_module_record/i18n/el.po
@@ -12,8 +12,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:00+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
 "X-Poedit-SourceCharset: utf-8\n"
diff --git a/addons/base_module_record/i18n/es.po b/addons/base_module_record/i18n/es.po
index b323b231bbd..11c5edc2644 100644
--- a/addons/base_module_record/i18n/es.po
+++ b/addons/base_module_record/i18n/es.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:00+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_module_record
 #: wizard_field:base_module_record.module_record_objects,info,category:0
diff --git a/addons/base_module_record/i18n/es_AR.po b/addons/base_module_record/i18n/es_AR.po
index ac65f7c5211..7a63a11bb33 100644
--- a/addons/base_module_record/i18n/es_AR.po
+++ b/addons/base_module_record/i18n/es_AR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:00+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_module_record
 #: wizard_field:base_module_record.module_record_objects,info,category:0
diff --git a/addons/base_module_record/i18n/es_CR.po b/addons/base_module_record/i18n/es_CR.po
index a34582c4334..407f9a68b94 100644
--- a/addons/base_module_record/i18n/es_CR.po
+++ b/addons/base_module_record/i18n/es_CR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:00+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 "Language: es\n"
 
 #. module: base_module_record
diff --git a/addons/base_module_record/i18n/es_EC.po b/addons/base_module_record/i18n/es_EC.po
index 60b576c9e9f..6c2e2fcbe77 100644
--- a/addons/base_module_record/i18n/es_EC.po
+++ b/addons/base_module_record/i18n/es_EC.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:00+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_module_record
 #: wizard_field:base_module_record.module_record_objects,info,category:0
diff --git a/addons/base_module_record/i18n/es_PY.po b/addons/base_module_record/i18n/es_PY.po
index 7c1e527fede..4a637e8c72a 100644
--- a/addons/base_module_record/i18n/es_PY.po
+++ b/addons/base_module_record/i18n/es_PY.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_module_record
 #: wizard_field:base_module_record.module_record_objects,info,category:0
diff --git a/addons/base_module_record/i18n/et.po b/addons/base_module_record/i18n/et.po
index 30a6681ae0f..2d5fede4619 100644
--- a/addons/base_module_record/i18n/et.po
+++ b/addons/base_module_record/i18n/et.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:00+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_module_record
 #: wizard_field:base_module_record.module_record_objects,info,category:0
diff --git a/addons/base_module_record/i18n/fa.po b/addons/base_module_record/i18n/fa.po
index 9cdfee7cdba..e8754c4ed64 100644
--- a/addons/base_module_record/i18n/fa.po
+++ b/addons/base_module_record/i18n/fa.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:00+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_module_record
 #: wizard_field:base_module_record.module_record_objects,info,category:0
diff --git a/addons/base_module_record/i18n/fi.po b/addons/base_module_record/i18n/fi.po
index 166b6de7962..ea8ad4191aa 100644
--- a/addons/base_module_record/i18n/fi.po
+++ b/addons/base_module_record/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:00+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_module_record
 #: wizard_field:base_module_record.module_record_objects,info,category:0
diff --git a/addons/base_module_record/i18n/fr.po b/addons/base_module_record/i18n/fr.po
index c98469cca80..0c5111aa33b 100644
--- a/addons/base_module_record/i18n/fr.po
+++ b/addons/base_module_record/i18n/fr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:00+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_module_record
 #: wizard_field:base_module_record.module_record_objects,info,category:0
diff --git a/addons/base_module_record/i18n/gl.po b/addons/base_module_record/i18n/gl.po
index 2c787a5f6b5..a59e93262db 100644
--- a/addons/base_module_record/i18n/gl.po
+++ b/addons/base_module_record/i18n/gl.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:00+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_module_record
 #: wizard_field:base_module_record.module_record_objects,info,category:0
diff --git a/addons/base_module_record/i18n/hr.po b/addons/base_module_record/i18n/hr.po
index 72d66b88c7d..b7fd0869bec 100644
--- a/addons/base_module_record/i18n/hr.po
+++ b/addons/base_module_record/i18n/hr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:00+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 "Language: hr\n"
 
 #. module: base_module_record
diff --git a/addons/base_module_record/i18n/hu.po b/addons/base_module_record/i18n/hu.po
index 3b836c7993e..be29453fcc8 100644
--- a/addons/base_module_record/i18n/hu.po
+++ b/addons/base_module_record/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:00+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_module_record
 #: wizard_field:base_module_record.module_record_objects,info,category:0
diff --git a/addons/base_module_record/i18n/id.po b/addons/base_module_record/i18n/id.po
index 1c86e5a6d80..ee0e72e29c5 100644
--- a/addons/base_module_record/i18n/id.po
+++ b/addons/base_module_record/i18n/id.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:00+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_module_record
 #: wizard_field:base_module_record.module_record_objects,info,category:0
diff --git a/addons/base_module_record/i18n/it.po b/addons/base_module_record/i18n/it.po
index c63ab822e28..3d521f26752 100644
--- a/addons/base_module_record/i18n/it.po
+++ b/addons/base_module_record/i18n/it.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:00+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_module_record
 #: wizard_field:base_module_record.module_record_objects,info,category:0
diff --git a/addons/base_module_record/i18n/ja.po b/addons/base_module_record/i18n/ja.po
index 905c21fc6c0..96dc638d7a7 100644
--- a/addons/base_module_record/i18n/ja.po
+++ b/addons/base_module_record/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:00+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_module_record
 #: wizard_field:base_module_record.module_record_objects,info,category:0
diff --git a/addons/base_module_record/i18n/ko.po b/addons/base_module_record/i18n/ko.po
index 5d8e5c989bf..a91ce6bcded 100644
--- a/addons/base_module_record/i18n/ko.po
+++ b/addons/base_module_record/i18n/ko.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:00+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_module_record
 #: wizard_field:base_module_record.module_record_objects,info,category:0
diff --git a/addons/base_module_record/i18n/lt.po b/addons/base_module_record/i18n/lt.po
index e736257582d..622a059b931 100644
--- a/addons/base_module_record/i18n/lt.po
+++ b/addons/base_module_record/i18n/lt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:00+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_module_record
 #: wizard_field:base_module_record.module_record_objects,info,category:0
diff --git a/addons/base_module_record/i18n/nb.po b/addons/base_module_record/i18n/nb.po
new file mode 100644
index 00000000000..8465596f21b
--- /dev/null
+++ b/addons/base_module_record/i18n/nb.po
@@ -0,0 +1,271 @@
+# Norwegian Bokmal 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-02-08 00:36+0000\n"
+"PO-Revision-Date: 2012-09-04 13:40+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Norwegian Bokmal <nb@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:46+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
+
+#. module: base_module_record
+#: wizard_field:base_module_record.module_record_objects,info,category:0
+msgid "Category"
+msgstr "Kategori"
+
+#. module: base_module_record
+#: wizard_view:base_module_record.module_record_objects,save:0
+msgid "Information"
+msgstr "Informasjon"
+
+#. module: base_module_record
+#: model:ir.model,name:base_module_record.model_ir_module_record
+msgid "ir.module.record"
+msgstr "ir.modul.opptak"
+
+#. module: base_module_record
+#: wizard_button:base_module_record.module_record_data,info,end:0
+#: wizard_button:base_module_record.module_record_data,save_yaml,end:0
+msgid "End"
+msgstr "Slutt"
+
+#. module: base_module_record
+#: wizard_view:base_module_record.module_record_data,init:0
+#: wizard_view:base_module_record.module_record_objects,init:0
+msgid "Choose objects to record"
+msgstr "Velg objekter til opptak"
+
+#. module: base_module_record
+#: wizard_field:base_module_record.module_record_objects,info,author:0
+msgid "Author"
+msgstr "Forfatter"
+
+#. module: base_module_record
+#: wizard_field:base_module_record.module_record_objects,info,directory_name:0
+msgid "Directory Name"
+msgstr "Navn på katalog"
+
+#. module: base_module_record
+#: wizard_field:base_module_record.module_record_data,init,filter_cond:0
+#: wizard_field:base_module_record.module_record_objects,init,filter_cond:0
+msgid "Records only"
+msgstr "Bare opptak"
+
+#. module: base_module_record
+#: selection:base_module_record.module_record_objects,info,data_kind:0
+msgid "Demo Data"
+msgstr "Demo data"
+
+#. module: base_module_record
+#: wizard_field:base_module_record.module_record_objects,save,module_filename:0
+msgid "Filename"
+msgstr "Filnavn"
+
+#. module: base_module_record
+#: wizard_field:base_module_record.module_record_objects,info,version:0
+msgid "Version"
+msgstr "Versjon"
+
+#. module: base_module_record
+#: wizard_view:base_module_record.module_record_data,info:0
+#: wizard_view:base_module_record.module_record_data,init:0
+#: wizard_view:base_module_record.module_record_data,save_yaml:0
+#: wizard_view:base_module_record.module_record_objects,init:0
+msgid "Objects Recording"
+msgstr "objekter Innspilling"
+
+#. module: base_module_record
+#: wizard_view:base_module_record.module_record_objects,save:0
+msgid ""
+"If you think your module could interest other people, we'd like you to "
+"publish it on http://www.openerp.com, in the 'Modules' section. You can do "
+"it through the website or using features of the 'base_module_publish' module."
+msgstr ""
+"Hvis du tror din modul kan interessere andre mennesker, vil vi gjerne at du "
+"publisere den på http://www.openerp.com, i 'Moduler-delen. Du kan gjøre det "
+"gjennom nettstedet eller bruke funksjonene i «base_module_publish»-modulen."
+
+#. module: base_module_record
+#: wizard_field:base_module_record.module_record_data,init,check_date:0
+#: wizard_field:base_module_record.module_record_objects,init,check_date:0
+msgid "Record from Date"
+msgstr "Dato fra opptak"
+
+#. module: base_module_record
+#: wizard_view:base_module_record.module_record_data,end:0
+#: wizard_view:base_module_record.module_record_objects,end:0
+#: wizard_view:base_module_record.module_record_objects,info:0
+#: wizard_view:base_module_record.module_record_objects,save:0
+#: wizard_view:base_module_record.module_record_objects,save_yaml:0
+msgid "Module Recording"
+msgstr "Modul innspilling"
+
+#. module: base_module_record
+#: model:ir.actions.wizard,name:base_module_record.wizard_base_module_record_objects
+#: model:ir.ui.menu,name:base_module_record.menu_wizard_base_module_record_objects
+msgid "Export Customizations As a Module"
+msgstr "Eksporter Tilpasninger som en modul"
+
+#. module: base_module_record
+#: wizard_view:base_module_record.module_record_objects,save:0
+msgid "Thanks in advance for your contribution."
+msgstr "Takk på forhånd for ditt bidrag."
+
+#. module: base_module_record
+#: help:base_module_record.module_record_data,init,objects:0
+#: help:base_module_record.module_record_objects,init,objects:0
+msgid "List of objects to be recorded"
+msgstr "Liste over objekter som skal spilles inn"
+
+#. module: base_module_record
+#: wizard_field:base_module_record.module_record_objects,info,description:0
+msgid "Full Description"
+msgstr "Full beskrivelse"
+
+#. module: base_module_record
+#: wizard_field:base_module_record.module_record_objects,info,name:0
+msgid "Module Name"
+msgstr "Modulnavn"
+
+#. module: base_module_record
+#: wizard_field:base_module_record.module_record_data,init,objects:0
+#: wizard_field:base_module_record.module_record_objects,init,objects:0
+msgid "Objects"
+msgstr "Objekter"
+
+#. module: base_module_record
+#: wizard_field:base_module_record.module_record_objects,save,module_file:0
+#: wizard_field:base_module_record.module_record_objects,save_yaml,yaml_file:0
+msgid "Module .zip File"
+msgstr "Modul .zip fil"
+
+#. module: base_module_record
+#: wizard_view:base_module_record.module_record_objects,save:0
+msgid "Module successfully created!"
+msgstr ""
+
+#. module: base_module_record
+#: wizard_view:base_module_record.module_record_objects,save_yaml:0
+msgid "YAML file successfully created !"
+msgstr "YAML fil opprettet!"
+
+#. module: base_module_record
+#: wizard_view:base_module_record.module_record_data,info:0
+#: wizard_view:base_module_record.module_record_data,save_yaml:0
+msgid "Result, paste this to your module's xml"
+msgstr "Resultatet, lim denne til modulen xml"
+
+#. module: base_module_record
+#: selection:base_module_record.module_record_data,init,filter_cond:0
+#: selection:base_module_record.module_record_objects,init,filter_cond:0
+msgid "Created"
+msgstr "Opprettet"
+
+#. module: base_module_record
+#: wizard_view:base_module_record.module_record_data,end:0
+#: wizard_view:base_module_record.module_record_objects,end:0
+msgid "Thanks For using Module Recorder"
+msgstr "Takk for at du brukte Modul opptaker."
+
+#. module: base_module_record
+#: wizard_field:base_module_record.module_record_objects,info,website:0
+msgid "Documentation URL"
+msgstr "Dokumentasjon URL"
+
+#. module: base_module_record
+#: selection:base_module_record.module_record_data,init,filter_cond:0
+#: selection:base_module_record.module_record_objects,init,filter_cond:0
+msgid "Modified"
+msgstr "Modifisert"
+
+#. module: base_module_record
+#: wizard_button:base_module_record.module_record_data,init,record:0
+#: wizard_button:base_module_record.module_record_objects,init,record:0
+msgid "Record"
+msgstr "Opptak"
+
+#. module: base_module_record
+#: wizard_button:base_module_record.module_record_objects,info,save:0
+msgid "Continue"
+msgstr "Fortsett"
+
+#. module: base_module_record
+#: model:ir.actions.wizard,name:base_module_record.wizard_base_module_record_data
+#: model:ir.ui.menu,name:base_module_record.menu_wizard_base_module_record_data
+msgid "Export Customizations As Data File"
+msgstr "Eksport Tilpasninger Som datafil"
+
+#. module: base_module_record
+#: code:addons/base_module_record/wizard/base_module_save.py:129
+#, python-format
+msgid "Error"
+msgstr "Feil"
+
+#. module: base_module_record
+#: selection:base_module_record.module_record_objects,info,data_kind:0
+msgid "Normal Data"
+msgstr "Normal data"
+
+#. module: base_module_record
+#: wizard_button:base_module_record.module_record_data,end,end:0
+#: wizard_button:base_module_record.module_record_objects,end,end:0
+msgid "OK"
+msgstr "Ok"
+
+#. module: base_module_record
+#: model:ir.ui.menu,name:base_module_record.menu_wizard_base_mod_rec
+msgid "Module Creation"
+msgstr "modul Skapelsen"
+
+#. module: base_module_record
+#: wizard_field:base_module_record.module_record_objects,info,data_kind:0
+msgid "Type of Data"
+msgstr "Type data"
+
+#. module: base_module_record
+#: wizard_view:base_module_record.module_record_objects,info:0
+msgid "Module Information"
+msgstr "Modul informasjon"
+
+#. module: base_module_record
+#: wizard_field:base_module_record.module_record_data,init,info_yaml:0
+#: wizard_field:base_module_record.module_record_objects,init,info_yaml:0
+msgid "YAML"
+msgstr "YAML"
+
+#. module: base_module_record
+#: wizard_field:base_module_record.module_record_data,info,res_text:0
+#: wizard_field:base_module_record.module_record_data,save_yaml,res_text:0
+msgid "Result"
+msgstr "Resultat"
+
+#. module: base_module_record
+#: wizard_button:base_module_record.module_record_data,init,end:0
+#: wizard_button:base_module_record.module_record_objects,info,end:0
+#: wizard_button:base_module_record.module_record_objects,init,end:0
+msgid "Cancel"
+msgstr "Kanseller"
+
+#. module: base_module_record
+#: wizard_button:base_module_record.module_record_objects,save,end:0
+#: wizard_button:base_module_record.module_record_objects,save_yaml,end:0
+msgid "Close"
+msgstr "Lukke"
+
+#. module: base_module_record
+#: selection:base_module_record.module_record_data,init,filter_cond:0
+#: selection:base_module_record.module_record_objects,init,filter_cond:0
+msgid "Created & Modified"
+msgstr "Laget & Modifisert"
+
+#~ msgid "Module successfully created !"
+#~ msgstr "Modulen opprettet!"
diff --git a/addons/base_module_record/i18n/nl.po b/addons/base_module_record/i18n/nl.po
index 97a0622dad7..934a6c9e4a1 100644
--- a/addons/base_module_record/i18n/nl.po
+++ b/addons/base_module_record/i18n/nl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:00+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_module_record
 #: wizard_field:base_module_record.module_record_objects,info,category:0
diff --git a/addons/base_module_record/i18n/nl_BE.po b/addons/base_module_record/i18n/nl_BE.po
index e00633a8baf..19cb2a4995e 100644
--- a/addons/base_module_record/i18n/nl_BE.po
+++ b/addons/base_module_record/i18n/nl_BE.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:00+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_module_record
 #: wizard_field:base_module_record.module_record_objects,info,category:0
diff --git a/addons/base_module_record/i18n/pl.po b/addons/base_module_record/i18n/pl.po
index 8d6a98ee5aa..d5f9e8d9c56 100644
--- a/addons/base_module_record/i18n/pl.po
+++ b/addons/base_module_record/i18n/pl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:00+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_module_record
 #: wizard_field:base_module_record.module_record_objects,info,category:0
diff --git a/addons/base_module_record/i18n/pt.po b/addons/base_module_record/i18n/pt.po
index 931db709201..8a02a3f5559 100644
--- a/addons/base_module_record/i18n/pt.po
+++ b/addons/base_module_record/i18n/pt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:00+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_module_record
 #: wizard_field:base_module_record.module_record_objects,info,category:0
diff --git a/addons/base_module_record/i18n/pt_BR.po b/addons/base_module_record/i18n/pt_BR.po
index c813b7fc743..5f03bd02e73 100644
--- a/addons/base_module_record/i18n/pt_BR.po
+++ b/addons/base_module_record/i18n/pt_BR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:00+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_module_record
 #: wizard_field:base_module_record.module_record_objects,info,category:0
diff --git a/addons/base_module_record/i18n/ro.po b/addons/base_module_record/i18n/ro.po
index 99f5fc14a1f..fabb78dd2d4 100644
--- a/addons/base_module_record/i18n/ro.po
+++ b/addons/base_module_record/i18n/ro.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:00+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_module_record
 #: wizard_field:base_module_record.module_record_objects,info,category:0
diff --git a/addons/base_module_record/i18n/ru.po b/addons/base_module_record/i18n/ru.po
index 8f2fb3bc036..79c882c803b 100644
--- a/addons/base_module_record/i18n/ru.po
+++ b/addons/base_module_record/i18n/ru.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:00+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_module_record
 #: wizard_field:base_module_record.module_record_objects,info,category:0
diff --git a/addons/base_module_record/i18n/sk.po b/addons/base_module_record/i18n/sk.po
index 169939e0c0a..965128bb6da 100644
--- a/addons/base_module_record/i18n/sk.po
+++ b/addons/base_module_record/i18n/sk.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:00+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_module_record
 #: wizard_field:base_module_record.module_record_objects,info,category:0
diff --git a/addons/base_module_record/i18n/sl.po b/addons/base_module_record/i18n/sl.po
index 886570a4120..fdb618ddf0d 100644
--- a/addons/base_module_record/i18n/sl.po
+++ b/addons/base_module_record/i18n/sl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:00+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_module_record
 #: wizard_field:base_module_record.module_record_objects,info,category:0
diff --git a/addons/base_module_record/i18n/sq.po b/addons/base_module_record/i18n/sq.po
index 0d9c13145d8..1cade2e0e69 100644
--- a/addons/base_module_record/i18n/sq.po
+++ b/addons/base_module_record/i18n/sq.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:00+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_module_record
 #: wizard_field:base_module_record.module_record_objects,info,category:0
diff --git a/addons/base_module_record/i18n/sr.po b/addons/base_module_record/i18n/sr.po
index 7030822349b..b231c9ae425 100644
--- a/addons/base_module_record/i18n/sr.po
+++ b/addons/base_module_record/i18n/sr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:00+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_module_record
 #: wizard_field:base_module_record.module_record_objects,info,category:0
diff --git a/addons/base_module_record/i18n/sr@latin.po b/addons/base_module_record/i18n/sr@latin.po
index d1c6d3a41e9..56b4b6eee59 100644
--- a/addons/base_module_record/i18n/sr@latin.po
+++ b/addons/base_module_record/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_module_record
 #: wizard_field:base_module_record.module_record_objects,info,category:0
diff --git a/addons/base_module_record/i18n/sv.po b/addons/base_module_record/i18n/sv.po
index 4a34f859530..755853e16d5 100644
--- a/addons/base_module_record/i18n/sv.po
+++ b/addons/base_module_record/i18n/sv.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:00+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_module_record
 #: wizard_field:base_module_record.module_record_objects,info,category:0
diff --git a/addons/base_module_record/i18n/tlh.po b/addons/base_module_record/i18n/tlh.po
index 9f20eefb323..605abc55d24 100644
--- a/addons/base_module_record/i18n/tlh.po
+++ b/addons/base_module_record/i18n/tlh.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:00+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_module_record
 #: wizard_field:base_module_record.module_record_objects,info,category:0
diff --git a/addons/base_module_record/i18n/tr.po b/addons/base_module_record/i18n/tr.po
index c0cce843c25..7bf5aeb8636 100644
--- a/addons/base_module_record/i18n/tr.po
+++ b/addons/base_module_record/i18n/tr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:00+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_module_record
 #: wizard_field:base_module_record.module_record_objects,info,category:0
diff --git a/addons/base_module_record/i18n/uk.po b/addons/base_module_record/i18n/uk.po
index 3f8f001b113..56bd3d615ed 100644
--- a/addons/base_module_record/i18n/uk.po
+++ b/addons/base_module_record/i18n/uk.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:00+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_module_record
 #: wizard_field:base_module_record.module_record_objects,info,category:0
diff --git a/addons/base_module_record/i18n/vi.po b/addons/base_module_record/i18n/vi.po
index b98c991bc5f..b7431ffd149 100644
--- a/addons/base_module_record/i18n/vi.po
+++ b/addons/base_module_record/i18n/vi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:00+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_module_record
 #: wizard_field:base_module_record.module_record_objects,info,category:0
diff --git a/addons/base_module_record/i18n/zh_CN.po b/addons/base_module_record/i18n/zh_CN.po
index 5c9ee38cad7..ed9f605bd0f 100644
--- a/addons/base_module_record/i18n/zh_CN.po
+++ b/addons/base_module_record/i18n/zh_CN.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:00+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_module_record
 #: wizard_field:base_module_record.module_record_objects,info,category:0
diff --git a/addons/base_module_record/i18n/zh_TW.po b/addons/base_module_record/i18n/zh_TW.po
index c69621ac6f0..40932cc2169 100644
--- a/addons/base_module_record/i18n/zh_TW.po
+++ b/addons/base_module_record/i18n/zh_TW.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:00+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_module_record
 #: wizard_field:base_module_record.module_record_objects,info,category:0
diff --git a/addons/base_module_record/wizard/base_module_save.py b/addons/base_module_record/wizard/base_module_save.py
index 5e557472f7e..a63e7197654 100644
--- a/addons/base_module_record/wizard/base_module_save.py
+++ b/addons/base_module_record/wizard/base_module_save.py
@@ -60,9 +60,8 @@ def _create_module(self, cr, uid, ids, context=None):
         "category" : "%(category)s",
         "description": \"\"\"%(description)s\"\"\",
         "depends" : [%(depends)s],
-        "init_xml" : [ ],
-        "demo_xml" : [ %(demo_name)s],
-        "update_xml" : [%(update_name)s],
+        "demo" : [ %(demo_name)s],
+        "data" : [%(update_name)s],
         "installable": True
 } """ % data
     filewrite = {
@@ -167,4 +166,4 @@ class base_module_save(osv.osv_memory):
         
 base_module_save()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/base_report_designer/__openerp__.py b/addons/base_report_designer/__openerp__.py
index 078916b9439..3e0ca2152da 100644
--- a/addons/base_report_designer/__openerp__.py
+++ b/addons/base_report_designer/__openerp__.py
@@ -34,9 +34,8 @@ Once you have modified it you can upload the report using the same wizard.
     'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
     'depends': ['base'],
-    'init_xml': ['wizard/base_report_design_view.xml'],
-    'update_xml': ['base_report_designer_installer.xml'],
-    'demo_xml': [],
+    'data': ['wizard/base_report_design_view.xml' , 'base_report_designer_installer.xml'],
+    'demo': [],
     'installable': True,
     'auto_install': False,
     'certificate': '0056379010493',
diff --git a/addons/base_report_designer/i18n/ar.po b/addons/base_report_designer/i18n/ar.po
index 69e51ce65f4..333eb6fdec1 100644
--- a/addons/base_report_designer/i18n/ar.po
+++ b/addons/base_report_designer/i18n/ar.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:16+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:21+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_report_designer
 #: model:ir.model,name:base_report_designer.model_base_report_sxw
diff --git a/addons/base_report_designer/i18n/bg.po b/addons/base_report_designer/i18n/bg.po
index 74c7eeece18..919cd4b0f74 100644
--- a/addons/base_report_designer/i18n/bg.po
+++ b/addons/base_report_designer/i18n/bg.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:16+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:21+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_report_designer
 #: model:ir.model,name:base_report_designer.model_base_report_sxw
diff --git a/addons/base_report_designer/i18n/bs.po b/addons/base_report_designer/i18n/bs.po
index 64f110e9255..07a0a17d314 100644
--- a/addons/base_report_designer/i18n/bs.po
+++ b/addons/base_report_designer/i18n/bs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:16+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:21+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_report_designer
 #: model:ir.model,name:base_report_designer.model_base_report_sxw
diff --git a/addons/base_report_designer/i18n/ca.po b/addons/base_report_designer/i18n/ca.po
index 6c130ab034f..2ea5ac40d53 100644
--- a/addons/base_report_designer/i18n/ca.po
+++ b/addons/base_report_designer/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:16+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:21+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_report_designer
 #: model:ir.model,name:base_report_designer.model_base_report_sxw
diff --git a/addons/base_report_designer/i18n/cs.po b/addons/base_report_designer/i18n/cs.po
index 9ebbf4d7ba5..b460afbb23a 100644
--- a/addons/base_report_designer/i18n/cs.po
+++ b/addons/base_report_designer/i18n/cs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:16+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:21+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_report_designer
 #: model:ir.model,name:base_report_designer.model_base_report_sxw
diff --git a/addons/base_report_designer/i18n/da.po b/addons/base_report_designer/i18n/da.po
index 226867eaa4f..3a7d526abc5 100644
--- a/addons/base_report_designer/i18n/da.po
+++ b/addons/base_report_designer/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:16+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:21+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_report_designer
 #: model:ir.model,name:base_report_designer.model_base_report_sxw
diff --git a/addons/base_report_designer/i18n/de.po b/addons/base_report_designer/i18n/de.po
index d593bcad8a0..1f8e529fcf6 100644
--- a/addons/base_report_designer/i18n/de.po
+++ b/addons/base_report_designer/i18n/de.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:16+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:21+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_report_designer
 #: model:ir.model,name:base_report_designer.model_base_report_sxw
diff --git a/addons/base_report_designer/i18n/el.po b/addons/base_report_designer/i18n/el.po
index 47a03023b45..d952ff00768 100644
--- a/addons/base_report_designer/i18n/el.po
+++ b/addons/base_report_designer/i18n/el.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:16+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:21+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
 "X-Poedit-SourceCharset: utf-8\n"
diff --git a/addons/base_report_designer/i18n/es.po b/addons/base_report_designer/i18n/es.po
index f4dcd282393..bd2ca68992d 100644
--- a/addons/base_report_designer/i18n/es.po
+++ b/addons/base_report_designer/i18n/es.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:16+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:21+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_report_designer
 #: model:ir.model,name:base_report_designer.model_base_report_sxw
diff --git a/addons/base_report_designer/i18n/es_AR.po b/addons/base_report_designer/i18n/es_AR.po
index ee7edb3b96f..e23fde3667b 100644
--- a/addons/base_report_designer/i18n/es_AR.po
+++ b/addons/base_report_designer/i18n/es_AR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:16+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:21+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_report_designer
 #: model:ir.model,name:base_report_designer.model_base_report_sxw
diff --git a/addons/base_report_designer/i18n/es_CR.po b/addons/base_report_designer/i18n/es_CR.po
index a870f89bebd..adba4404e9f 100644
--- a/addons/base_report_designer/i18n/es_CR.po
+++ b/addons/base_report_designer/i18n/es_CR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:16+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:21+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 "Language: \n"
 
 #. module: base_report_designer
diff --git a/addons/base_report_designer/i18n/es_EC.po b/addons/base_report_designer/i18n/es_EC.po
index 6c23444b153..85ad84d63cc 100644
--- a/addons/base_report_designer/i18n/es_EC.po
+++ b/addons/base_report_designer/i18n/es_EC.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:16+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:21+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_report_designer
 #: model:ir.model,name:base_report_designer.model_base_report_sxw
diff --git a/addons/base_report_designer/i18n/es_PY.po b/addons/base_report_designer/i18n/es_PY.po
index a01899f734f..533c213fbc4 100644
--- a/addons/base_report_designer/i18n/es_PY.po
+++ b/addons/base_report_designer/i18n/es_PY.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:16+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:21+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_report_designer
 #: model:ir.model,name:base_report_designer.model_base_report_sxw
diff --git a/addons/base_report_designer/i18n/et.po b/addons/base_report_designer/i18n/et.po
index 5efc70656de..8f2fe9ec733 100644
--- a/addons/base_report_designer/i18n/et.po
+++ b/addons/base_report_designer/i18n/et.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:16+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:21+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_report_designer
 #: model:ir.model,name:base_report_designer.model_base_report_sxw
diff --git a/addons/base_report_designer/i18n/fa.po b/addons/base_report_designer/i18n/fa.po
index 9d5d33cfaf7..b588ab5b07f 100644
--- a/addons/base_report_designer/i18n/fa.po
+++ b/addons/base_report_designer/i18n/fa.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:16+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:21+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_report_designer
 #: model:ir.model,name:base_report_designer.model_base_report_sxw
diff --git a/addons/base_report_designer/i18n/fi.po b/addons/base_report_designer/i18n/fi.po
index d93802b7c39..6206576ce7a 100644
--- a/addons/base_report_designer/i18n/fi.po
+++ b/addons/base_report_designer/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:16+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:21+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_report_designer
 #: model:ir.model,name:base_report_designer.model_base_report_sxw
diff --git a/addons/base_report_designer/i18n/fr.po b/addons/base_report_designer/i18n/fr.po
index 7523898e211..b18422f74f1 100644
--- a/addons/base_report_designer/i18n/fr.po
+++ b/addons/base_report_designer/i18n/fr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:16+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:21+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_report_designer
 #: model:ir.model,name:base_report_designer.model_base_report_sxw
diff --git a/addons/base_report_designer/i18n/gl.po b/addons/base_report_designer/i18n/gl.po
index e6f396b1a14..b35ea5fd72e 100644
--- a/addons/base_report_designer/i18n/gl.po
+++ b/addons/base_report_designer/i18n/gl.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:16+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:21+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_report_designer
 #: model:ir.model,name:base_report_designer.model_base_report_sxw
diff --git a/addons/base_report_designer/i18n/hr.po b/addons/base_report_designer/i18n/hr.po
index a92c59e55e1..2430f002311 100644
--- a/addons/base_report_designer/i18n/hr.po
+++ b/addons/base_report_designer/i18n/hr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:16+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:21+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 "Language: hr\n"
 
 #. module: base_report_designer
diff --git a/addons/base_report_designer/i18n/hu.po b/addons/base_report_designer/i18n/hu.po
index da15613f185..c793d252d0a 100644
--- a/addons/base_report_designer/i18n/hu.po
+++ b/addons/base_report_designer/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:16+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:21+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_report_designer
 #: model:ir.model,name:base_report_designer.model_base_report_sxw
diff --git a/addons/base_report_designer/i18n/id.po b/addons/base_report_designer/i18n/id.po
index 58bab499879..07c78a05bf2 100644
--- a/addons/base_report_designer/i18n/id.po
+++ b/addons/base_report_designer/i18n/id.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:16+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:21+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_report_designer
 #: model:ir.model,name:base_report_designer.model_base_report_sxw
diff --git a/addons/base_report_designer/i18n/it.po b/addons/base_report_designer/i18n/it.po
index 2f9395d68fd..035e677de1d 100644
--- a/addons/base_report_designer/i18n/it.po
+++ b/addons/base_report_designer/i18n/it.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:16+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:21+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_report_designer
 #: model:ir.model,name:base_report_designer.model_base_report_sxw
diff --git a/addons/base_report_designer/i18n/ja.po b/addons/base_report_designer/i18n/ja.po
index 57183a1a570..c50e5d63243 100644
--- a/addons/base_report_designer/i18n/ja.po
+++ b/addons/base_report_designer/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:16+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:21+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_report_designer
 #: model:ir.model,name:base_report_designer.model_base_report_sxw
diff --git a/addons/base_report_designer/i18n/ko.po b/addons/base_report_designer/i18n/ko.po
index df6a850b0a8..da644acefd5 100644
--- a/addons/base_report_designer/i18n/ko.po
+++ b/addons/base_report_designer/i18n/ko.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:16+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:21+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_report_designer
 #: model:ir.model,name:base_report_designer.model_base_report_sxw
diff --git a/addons/base_report_designer/i18n/lt.po b/addons/base_report_designer/i18n/lt.po
index 64f110e9255..07a0a17d314 100644
--- a/addons/base_report_designer/i18n/lt.po
+++ b/addons/base_report_designer/i18n/lt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:16+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:21+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_report_designer
 #: model:ir.model,name:base_report_designer.model_base_report_sxw
diff --git a/addons/base_report_designer/i18n/mn.po b/addons/base_report_designer/i18n/mn.po
index 9f7a2d1b740..eac58d705d8 100644
--- a/addons/base_report_designer/i18n/mn.po
+++ b/addons/base_report_designer/i18n/mn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:16+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:21+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_report_designer
 #: model:ir.model,name:base_report_designer.model_base_report_sxw
diff --git a/addons/base_report_designer/i18n/nb.po b/addons/base_report_designer/i18n/nb.po
new file mode 100644
index 00000000000..9bf2b572a5f
--- /dev/null
+++ b/addons/base_report_designer/i18n/nb.po
@@ -0,0 +1,204 @@
+# Norwegian Bokmal 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-02-08 00:36+0000\n"
+"PO-Revision-Date: 2012-09-04 13:59+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Norwegian Bokmal <nb@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:46+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
+
+#. module: base_report_designer
+#: model:ir.model,name:base_report_designer.model_base_report_sxw
+msgid "base.report.sxw"
+msgstr "basen.rapport.sxw"
+
+#. module: base_report_designer
+#: view:base_report_designer.installer:0
+msgid "OpenERP Report Designer Configuration"
+msgstr "OpenERP Rapport Designer Konfigurasjon"
+
+#. module: base_report_designer
+#: view:base_report_designer.installer:0
+msgid ""
+"This plug-in allows you to create/modify OpenERP Reports into OpenOffice "
+"Writer."
+msgstr ""
+"Denne plug-in tillater deg å lage / endre OpenERP rapporter i OpenOffice "
+"Writer."
+
+#. module: base_report_designer
+#: view:base.report.file.sxw:0
+msgid "Upload the modified report"
+msgstr "Laste opp den endrede rapporten"
+
+#. module: base_report_designer
+#: view:base.report.file.sxw:0
+msgid "The .SXW report"
+msgstr ".SXW rapport"
+
+#. module: base_report_designer
+#: model:ir.model,name:base_report_designer.model_base_report_designer_installer
+msgid "base_report_designer.installer"
+msgstr "basen.rapport.designer.installatør"
+
+#. module: base_report_designer
+#: view:base_report_designer.installer:0
+msgid "_Close"
+msgstr "_Lukk"
+
+#. module: base_report_designer
+#: view:base.report.rml.save:0
+msgid "The RML Report"
+msgstr ""
+
+#. module: base_report_designer
+#: view:base_report_designer.installer:0
+msgid "Configure"
+msgstr "Konfigurer"
+
+#. module: base_report_designer
+#: view:base_report_designer.installer:0
+msgid "title"
+msgstr "tittel"
+
+#. module: base_report_designer
+#: field:base.report.file.sxw,report_id:0
+#: field:base.report.sxw,report_id:0
+msgid "Report"
+msgstr "Rapport"
+
+#. module: base_report_designer
+#: model:ir.model,name:base_report_designer.model_base_report_rml_save
+msgid "base.report.rml.save"
+msgstr "Basen.rapport.rml.lagre"
+
+#. module: base_report_designer
+#: model:ir.ui.menu,name:base_report_designer.menu_action_report_designer_wizard
+msgid "Report Designer"
+msgstr "Rapportdesigner"
+
+#. module: base_report_designer
+#: field:base_report_designer.installer,name:0
+msgid "File name"
+msgstr "Filnavn"
+
+#. module: base_report_designer
+#: view:base.report.file.sxw:0
+#: view:base.report.sxw:0
+msgid "Get a report"
+msgstr "Få en rapport"
+
+#. module: base_report_designer
+#: view:base_report_designer.installer:0
+#: model:ir.actions.act_window,name:base_report_designer.action_report_designer_wizard
+msgid "OpenERP Report Designer"
+msgstr "OpenERP Rapport designer"
+
+#. module: base_report_designer
+#: view:base.report.sxw:0
+msgid "Continue"
+msgstr "Fortsett"
+
+#. module: base_report_designer
+#: field:base.report.rml.save,file_rml:0
+msgid "Save As"
+msgstr "Lagre som"
+
+#. module: base_report_designer
+#: help:base_report_designer.installer,plugin_file:0
+msgid ""
+"OpenObject Report Designer plug-in file. Save as this file and install this "
+"plug-in in OpenOffice."
+msgstr ""
+"OpenObject Report Designer plug-in-filen. Lagre som denne filen og "
+"installere denne plugin-modulen i OpenOffice."
+
+#. module: base_report_designer
+#: view:base.report.rml.save:0
+msgid "Save RML FIle"
+msgstr "Lagre RML fil"
+
+#. module: base_report_designer
+#: field:base.report.file.sxw,file_sxw:0
+#: field:base.report.file.sxw,file_sxw_upload:0
+msgid "Your .SXW file"
+msgstr "Din .SXW fil"
+
+#. module: base_report_designer
+#: view:base_report_designer.installer:0
+msgid "Installation and Configuration Steps"
+msgstr "Installasjon og Konfigurasjon trinn"
+
+#. module: base_report_designer
+#: field:base_report_designer.installer,description:0
+msgid "Description"
+msgstr "Beskrivelse:"
+
+#. module: base_report_designer
+#: view:base.report.file.sxw:0
+msgid ""
+"This is the template of your requested report.\n"
+"Save it as a .SXW file and open it with OpenOffice.\n"
+"Don't forget to install the OpenERP SA OpenOffice package to modify it.\n"
+"Once it is modified, re-upload it in OpenERP using this wizard."
+msgstr ""
+"Dette er malen for den forespurte rapporten.\n"
+"Lagre det som en. Sxw fil og åpne den med OpenOffice.\n"
+"Ikke glem å installere OpenERP SA OpenOffice-pakken til å endre det.\n"
+"Når den er modifisert, laste opp det i OpenERP bruke denne veiviseren."
+
+#. module: base_report_designer
+#: field:base_report_designer.installer,config_logo:0
+msgid "Image"
+msgstr "Bilde"
+
+#. module: base_report_designer
+#: model:ir.actions.act_window,name:base_report_designer.action_view_base_report_sxw
+msgid "Base Report sxw"
+msgstr "Basen rapport sxw"
+
+#. module: base_report_designer
+#: model:ir.model,name:base_report_designer.model_base_report_file_sxw
+msgid "base.report.file.sxw"
+msgstr "basen.rapport.fil.sxw"
+
+#. module: base_report_designer
+#: field:base_report_designer.installer,plugin_file:0
+msgid "OpenObject Report Designer Plug-in"
+msgstr "OpenObject Rapport Designer Plug-in"
+
+#. module: base_report_designer
+#: model:ir.actions.act_window,name:base_report_designer.action_report_designer_installer
+msgid "OpenERP Report Designer Installation"
+msgstr "OpenERP Rapport Designer Installasjon"
+
+#. module: base_report_designer
+#: view:base.report.file.sxw:0
+#: view:base.report.rml.save:0
+#: view:base.report.sxw:0
+#: view:base_report_designer.installer:0
+msgid "Cancel"
+msgstr "Kanseller"
+
+#. module: base_report_designer
+#: model:ir.model,name:base_report_designer.model_ir_actions_report_xml
+msgid "ir.actions.report.xml"
+msgstr "ir.handlinger.rapport.xml"
+
+#. module: base_report_designer
+#: view:base.report.sxw:0
+msgid "Select your report"
+msgstr "Velg din rapport"
+
+#~ msgid "The RML report"
+#~ msgstr "RML rapport"
diff --git a/addons/base_report_designer/i18n/nl.po b/addons/base_report_designer/i18n/nl.po
index 6328e1f7176..16acc03803d 100644
--- a/addons/base_report_designer/i18n/nl.po
+++ b/addons/base_report_designer/i18n/nl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:16+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:21+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_report_designer
 #: model:ir.model,name:base_report_designer.model_base_report_sxw
diff --git a/addons/base_report_designer/i18n/nl_BE.po b/addons/base_report_designer/i18n/nl_BE.po
index 0eddaa594f7..504ecd8aa88 100644
--- a/addons/base_report_designer/i18n/nl_BE.po
+++ b/addons/base_report_designer/i18n/nl_BE.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:16+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:21+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_report_designer
 #: model:ir.model,name:base_report_designer.model_base_report_sxw
diff --git a/addons/base_report_designer/i18n/pl.po b/addons/base_report_designer/i18n/pl.po
index 974e7d9f7ce..687d14c7982 100644
--- a/addons/base_report_designer/i18n/pl.po
+++ b/addons/base_report_designer/i18n/pl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:16+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:21+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_report_designer
 #: model:ir.model,name:base_report_designer.model_base_report_sxw
diff --git a/addons/base_report_designer/i18n/pt.po b/addons/base_report_designer/i18n/pt.po
index 75ab3d7003a..4adbb9184e8 100644
--- a/addons/base_report_designer/i18n/pt.po
+++ b/addons/base_report_designer/i18n/pt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:16+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:21+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_report_designer
 #: model:ir.model,name:base_report_designer.model_base_report_sxw
diff --git a/addons/base_report_designer/i18n/pt_BR.po b/addons/base_report_designer/i18n/pt_BR.po
index 59cc278fc3d..867cbc18fd0 100644
--- a/addons/base_report_designer/i18n/pt_BR.po
+++ b/addons/base_report_designer/i18n/pt_BR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:16+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:21+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_report_designer
 #: model:ir.model,name:base_report_designer.model_base_report_sxw
diff --git a/addons/base_report_designer/i18n/ro.po b/addons/base_report_designer/i18n/ro.po
index 2d43a5a7260..f3a3c8b0c84 100644
--- a/addons/base_report_designer/i18n/ro.po
+++ b/addons/base_report_designer/i18n/ro.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:16+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:21+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_report_designer
 #: model:ir.model,name:base_report_designer.model_base_report_sxw
diff --git a/addons/base_report_designer/i18n/ru.po b/addons/base_report_designer/i18n/ru.po
index 43862ea8489..ab3a2a90cec 100644
--- a/addons/base_report_designer/i18n/ru.po
+++ b/addons/base_report_designer/i18n/ru.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:16+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:21+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_report_designer
 #: model:ir.model,name:base_report_designer.model_base_report_sxw
diff --git a/addons/base_report_designer/i18n/sk.po b/addons/base_report_designer/i18n/sk.po
index aa250b44620..25990ff84e9 100644
--- a/addons/base_report_designer/i18n/sk.po
+++ b/addons/base_report_designer/i18n/sk.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:16+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:21+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_report_designer
 #: model:ir.model,name:base_report_designer.model_base_report_sxw
diff --git a/addons/base_report_designer/i18n/sl.po b/addons/base_report_designer/i18n/sl.po
index 14e716a4e04..3b0a10184b7 100644
--- a/addons/base_report_designer/i18n/sl.po
+++ b/addons/base_report_designer/i18n/sl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:16+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:21+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_report_designer
 #: model:ir.model,name:base_report_designer.model_base_report_sxw
diff --git a/addons/base_report_designer/i18n/sq.po b/addons/base_report_designer/i18n/sq.po
index ce07a476e57..3efeb59dae9 100644
--- a/addons/base_report_designer/i18n/sq.po
+++ b/addons/base_report_designer/i18n/sq.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:16+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:21+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_report_designer
 #: model:ir.model,name:base_report_designer.model_base_report_sxw
diff --git a/addons/base_report_designer/i18n/sr.po b/addons/base_report_designer/i18n/sr.po
index e0b5be44bfe..53f844d72f5 100644
--- a/addons/base_report_designer/i18n/sr.po
+++ b/addons/base_report_designer/i18n/sr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:16+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:21+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_report_designer
 #: model:ir.model,name:base_report_designer.model_base_report_sxw
diff --git a/addons/base_report_designer/i18n/sr@latin.po b/addons/base_report_designer/i18n/sr@latin.po
index a70f5188de5..a74dc3c9f34 100644
--- a/addons/base_report_designer/i18n/sr@latin.po
+++ b/addons/base_report_designer/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:16+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:21+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_report_designer
 #: model:ir.model,name:base_report_designer.model_base_report_sxw
diff --git a/addons/base_report_designer/i18n/sv.po b/addons/base_report_designer/i18n/sv.po
index 9734f343caf..3686704cb05 100644
--- a/addons/base_report_designer/i18n/sv.po
+++ b/addons/base_report_designer/i18n/sv.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:16+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:21+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_report_designer
 #: model:ir.model,name:base_report_designer.model_base_report_sxw
diff --git a/addons/base_report_designer/i18n/tlh.po b/addons/base_report_designer/i18n/tlh.po
index e87980b0a93..a575ae9c4d7 100644
--- a/addons/base_report_designer/i18n/tlh.po
+++ b/addons/base_report_designer/i18n/tlh.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:16+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:21+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_report_designer
 #: model:ir.model,name:base_report_designer.model_base_report_sxw
diff --git a/addons/base_report_designer/i18n/tr.po b/addons/base_report_designer/i18n/tr.po
index ed538ee41a9..dfd5f103240 100644
--- a/addons/base_report_designer/i18n/tr.po
+++ b/addons/base_report_designer/i18n/tr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:16+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:21+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_report_designer
 #: model:ir.model,name:base_report_designer.model_base_report_sxw
diff --git a/addons/base_report_designer/i18n/uk.po b/addons/base_report_designer/i18n/uk.po
index be024249482..2b1bbf211a1 100644
--- a/addons/base_report_designer/i18n/uk.po
+++ b/addons/base_report_designer/i18n/uk.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:16+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:21+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_report_designer
 #: model:ir.model,name:base_report_designer.model_base_report_sxw
diff --git a/addons/base_report_designer/i18n/vi.po b/addons/base_report_designer/i18n/vi.po
index 63b34b1f3c7..b7c7cd661c0 100644
--- a/addons/base_report_designer/i18n/vi.po
+++ b/addons/base_report_designer/i18n/vi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:16+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:21+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_report_designer
 #: model:ir.model,name:base_report_designer.model_base_report_sxw
diff --git a/addons/base_report_designer/i18n/zh_CN.po b/addons/base_report_designer/i18n/zh_CN.po
index 45ff4e73170..108a23ba4a9 100644
--- a/addons/base_report_designer/i18n/zh_CN.po
+++ b/addons/base_report_designer/i18n/zh_CN.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:16+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:21+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_report_designer
 #: model:ir.model,name:base_report_designer.model_base_report_sxw
diff --git a/addons/base_report_designer/i18n/zh_TW.po b/addons/base_report_designer/i18n/zh_TW.po
index 730a04e2ef6..0eeb2dbec37 100644
--- a/addons/base_report_designer/i18n/zh_TW.po
+++ b/addons/base_report_designer/i18n/zh_TW.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:16+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:21+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_report_designer
 #: model:ir.model,name:base_report_designer.model_base_report_sxw
diff --git a/addons/base_report_designer/wizard/base_report_design_view.xml b/addons/base_report_designer/wizard/base_report_design_view.xml
index e0fbb248d84..d2ee1f70dc3 100644
--- a/addons/base_report_designer/wizard/base_report_design_view.xml
+++ b/addons/base_report_designer/wizard/base_report_design_view.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
+
         <record id="view_base_report_sxw" model="ir.ui.view">
             <field name="name">Base Report sxw</field>
             <field name="model">base.report.sxw</field>
@@ -17,7 +18,7 @@
                 </footer>
             </form>
             </field>
-       </record>
+        </record>
 
         <record id="action_view_base_report_sxw" model="ir.actions.act_window">
             <field name="name">Base Report sxw</field>
@@ -43,7 +44,8 @@
             <label colspan="4" string="This is the template of your requested report.&#10;Save it as a .SXW file and open it with OpenOffice.&#10;Don't forget to install the OpenERP SA OpenOffice package to modify it.&#10;Once it is modified, re-upload it in OpenERP using this wizard." align="0.0"/>
             </form>
             </field>
-       </record>
+        </record>
+
         <record id="view_base_report_file_rml" model="ir.ui.view">
             <field name="name">Base Report File sxw</field>
             <field name="model">base.report.rml.save</field>
@@ -55,6 +57,5 @@
             </field>
        </record>
 
-
     </data>
 </openerp>
diff --git a/addons/base_setup/i18n/ar.po b/addons/base_setup/i18n/ar.po
index ac0092f0c19..371009f820a 100644
--- a/addons/base_setup/i18n/ar.po
+++ b/addons/base_setup/i18n/ar.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:02+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:08+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_setup
 #: field:user.preferences.config,menu_tips:0
diff --git a/addons/base_setup/i18n/bg.po b/addons/base_setup/i18n/bg.po
index cafc439e064..1c1b8fa6653 100644
--- a/addons/base_setup/i18n/bg.po
+++ b/addons/base_setup/i18n/bg.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:02+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:08+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_setup
 #: field:user.preferences.config,menu_tips:0
diff --git a/addons/base_setup/i18n/bs.po b/addons/base_setup/i18n/bs.po
index ce15b961192..e50ae35432a 100644
--- a/addons/base_setup/i18n/bs.po
+++ b/addons/base_setup/i18n/bs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:02+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:08+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_setup
 #: field:user.preferences.config,menu_tips:0
diff --git a/addons/base_setup/i18n/ca.po b/addons/base_setup/i18n/ca.po
index 196bf12f7b8..80be7c242b7 100644
--- a/addons/base_setup/i18n/ca.po
+++ b/addons/base_setup/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:02+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:08+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_setup
 #: field:user.preferences.config,menu_tips:0
diff --git a/addons/base_setup/i18n/cs.po b/addons/base_setup/i18n/cs.po
index 267876129f3..217479feb44 100644
--- a/addons/base_setup/i18n/cs.po
+++ b/addons/base_setup/i18n/cs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:02+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:08+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 "X-Poedit-Language: Czech\n"
 
 #. module: base_setup
diff --git a/addons/base_setup/i18n/da.po b/addons/base_setup/i18n/da.po
index 75cd997cc55..ac7c3aaba7a 100644
--- a/addons/base_setup/i18n/da.po
+++ b/addons/base_setup/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:02+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:08+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_setup
 #: field:user.preferences.config,menu_tips:0
diff --git a/addons/base_setup/i18n/de.po b/addons/base_setup/i18n/de.po
index 6cc1605fdd6..0988a63903c 100644
--- a/addons/base_setup/i18n/de.po
+++ b/addons/base_setup/i18n/de.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:02+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:08+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_setup
 #: field:user.preferences.config,menu_tips:0
diff --git a/addons/base_setup/i18n/el.po b/addons/base_setup/i18n/el.po
index 8489b0ae0fc..72b81544f79 100644
--- a/addons/base_setup/i18n/el.po
+++ b/addons/base_setup/i18n/el.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:02+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:08+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_setup
 #: field:user.preferences.config,menu_tips:0
diff --git a/addons/base_setup/i18n/en_GB.po b/addons/base_setup/i18n/en_GB.po
index d528ed9cb39..59f48762514 100644
--- a/addons/base_setup/i18n/en_GB.po
+++ b/addons/base_setup/i18n/en_GB.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:02+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:08+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_setup
 #: field:user.preferences.config,menu_tips:0
diff --git a/addons/base_setup/i18n/es.po b/addons/base_setup/i18n/es.po
index e1ba63677a8..54e22709c3e 100644
--- a/addons/base_setup/i18n/es.po
+++ b/addons/base_setup/i18n/es.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:02+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:08+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_setup
 #: field:user.preferences.config,menu_tips:0
diff --git a/addons/base_setup/i18n/es_AR.po b/addons/base_setup/i18n/es_AR.po
index 0b2debd9438..b914748e679 100644
--- a/addons/base_setup/i18n/es_AR.po
+++ b/addons/base_setup/i18n/es_AR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:02+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:08+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_setup
 #: field:user.preferences.config,menu_tips:0
diff --git a/addons/base_setup/i18n/es_CL.po b/addons/base_setup/i18n/es_CL.po
index 231559c6416..5a8bd3e0c9a 100644
--- a/addons/base_setup/i18n/es_CL.po
+++ b/addons/base_setup/i18n/es_CL.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:02+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:08+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_setup
 #: field:user.preferences.config,menu_tips:0
diff --git a/addons/base_setup/i18n/es_CR.po b/addons/base_setup/i18n/es_CR.po
index 297a94dd176..cc3babbb539 100644
--- a/addons/base_setup/i18n/es_CR.po
+++ b/addons/base_setup/i18n/es_CR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:02+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:08+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 "Language: \n"
 
 #. module: base_setup
diff --git a/addons/base_setup/i18n/es_EC.po b/addons/base_setup/i18n/es_EC.po
index 793c92c640b..0b6d042f94b 100644
--- a/addons/base_setup/i18n/es_EC.po
+++ b/addons/base_setup/i18n/es_EC.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:02+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:08+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_setup
 #: field:user.preferences.config,menu_tips:0
diff --git a/addons/base_setup/i18n/es_PY.po b/addons/base_setup/i18n/es_PY.po
index e5a19bb8957..9a698d581f5 100644
--- a/addons/base_setup/i18n/es_PY.po
+++ b/addons/base_setup/i18n/es_PY.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:02+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:08+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_setup
 #: field:user.preferences.config,menu_tips:0
diff --git a/addons/base_setup/i18n/et.po b/addons/base_setup/i18n/et.po
index ad96c2fcb4d..4ff8cade6bb 100644
--- a/addons/base_setup/i18n/et.po
+++ b/addons/base_setup/i18n/et.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:02+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:08+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_setup
 #: field:user.preferences.config,menu_tips:0
diff --git a/addons/base_setup/i18n/fa.po b/addons/base_setup/i18n/fa.po
index 627b8440c4e..34717fa3683 100644
--- a/addons/base_setup/i18n/fa.po
+++ b/addons/base_setup/i18n/fa.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:02+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:08+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_setup
 #: field:user.preferences.config,menu_tips:0
diff --git a/addons/base_setup/i18n/fi.po b/addons/base_setup/i18n/fi.po
index f20b149b9fa..074c8324c7d 100644
--- a/addons/base_setup/i18n/fi.po
+++ b/addons/base_setup/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:02+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:08+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_setup
 #: field:user.preferences.config,menu_tips:0
diff --git a/addons/base_setup/i18n/fr.po b/addons/base_setup/i18n/fr.po
index 26bf9f8f08d..882d3b41e03 100644
--- a/addons/base_setup/i18n/fr.po
+++ b/addons/base_setup/i18n/fr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:02+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:08+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_setup
 #: field:user.preferences.config,menu_tips:0
diff --git a/addons/base_setup/i18n/gl.po b/addons/base_setup/i18n/gl.po
index 935cb8b98f8..624c2ef0079 100644
--- a/addons/base_setup/i18n/gl.po
+++ b/addons/base_setup/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:02+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:08+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_setup
 #: field:user.preferences.config,menu_tips:0
diff --git a/addons/base_setup/i18n/gu.po b/addons/base_setup/i18n/gu.po
index bb9030ae9b2..f7bdd286b6c 100644
--- a/addons/base_setup/i18n/gu.po
+++ b/addons/base_setup/i18n/gu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:02+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:08+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_setup
 #: field:user.preferences.config,menu_tips:0
diff --git a/addons/base_setup/i18n/hr.po b/addons/base_setup/i18n/hr.po
index c30a09dfcd1..b55493dc916 100644
--- a/addons/base_setup/i18n/hr.po
+++ b/addons/base_setup/i18n/hr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:02+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:08+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 "Language: hr\n"
 
 #. module: base_setup
diff --git a/addons/base_setup/i18n/hu.po b/addons/base_setup/i18n/hu.po
index bd6f54d7640..d356030cbf0 100644
--- a/addons/base_setup/i18n/hu.po
+++ b/addons/base_setup/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:02+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:08+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_setup
 #: field:user.preferences.config,menu_tips:0
diff --git a/addons/base_setup/i18n/id.po b/addons/base_setup/i18n/id.po
index 4fb5bbfdb93..8c72cf36321 100644
--- a/addons/base_setup/i18n/id.po
+++ b/addons/base_setup/i18n/id.po
@@ -13,38 +13,38 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:02+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:08+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_setup
 #: field:user.preferences.config,menu_tips:0
 msgid "Display Tips"
-msgstr ""
+msgstr "Tampilan Bantuan"
 
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
 msgid "Guest"
-msgstr ""
+msgstr "Tamu"
 
 #. module: base_setup
 #: model:ir.model,name:base_setup.model_product_installer
 msgid "product.installer"
-msgstr ""
+msgstr "Pemasangan Produk"
 
 #. module: base_setup
 #: selection:product.installer,customers:0
 msgid "Create"
-msgstr ""
+msgstr "Membuat"
 
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
 msgid "Member"
-msgstr ""
+msgstr "Anggota"
 
 #. module: base_setup
 #: field:migrade.application.installer.modules,sync_google_contact:0
 msgid "Sync Google Contact"
-msgstr ""
+msgstr "Sinkronisasikan Kontak Google"
 
 #. module: base_setup
 #: help:user.preferences.config,context_tz:0
@@ -52,21 +52,23 @@ msgid ""
 "Set default for new user's timezone, used to perform timezone conversions "
 "between the server and the client."
 msgstr ""
+"Set zona waktu standar bagi pengguna baru, digunakan untuk melakukan "
+"konversi zona waktu antara server dan klien."
 
 #. module: base_setup
 #: selection:product.installer,customers:0
 msgid "Import"
-msgstr ""
+msgstr "Impor"
 
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
 msgid "Donor"
-msgstr ""
+msgstr "Donor"
 
 #. module: base_setup
 #: model:ir.actions.act_window,name:base_setup.action_base_setup_company
 msgid "Set Company Header and Footer"
-msgstr ""
+msgstr "Buat Kop dan Kaki Surat Perusahaan"
 
 #. module: base_setup
 #: model:ir.actions.act_window,help:base_setup.action_base_setup_company
@@ -75,21 +77,24 @@ msgid ""
 "printed on your reports. You can click on the button 'Preview Header' in "
 "order to check the header/footer of PDF documents."
 msgstr ""
+"Isi data-data perusahaan Anda (alamat, logo, rekening bank) sehingga itu "
+"dicetak pada laporan Anda. Anda dapat klik pada 'header Preview' tombol "
+"untuk memeriksa header / footer dari dokumen PDF."
 
 #. module: base_setup
 #: field:product.installer,customers:0
 msgid "Customers"
-msgstr ""
+msgstr "Pelanggan"
 
 #. module: base_setup
 #: selection:user.preferences.config,view:0
 msgid "Extended"
-msgstr ""
+msgstr "Penambahan"
 
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
 msgid "Patient"
-msgstr ""
+msgstr "Telaten"
 
 #. module: base_setup
 #: model:ir.actions.act_window,help:base_setup.action_import_create_installer
@@ -98,26 +103,29 @@ msgid ""
 "you can import your existing partners by CSV spreadsheet from \"Import "
 "Data\" wizard"
 msgstr ""
+"Buat atau Impor Pelanggan dan kontak mereka secara manual dari form ini atau "
+"Anda dapat mengimpor mitra yang ada dengan spreadsheet CSV dari wizard "
+"\"Impor Data\""
 
 #. module: base_setup
 #: view:user.preferences.config:0
 msgid "Define Users's Preferences"
-msgstr ""
+msgstr "Tetapkan Pengaturan User"
 
 #. module: base_setup
 #: model:ir.actions.act_window,name:base_setup.action_user_preferences_config_form
 msgid "Define default users preferences"
-msgstr ""
+msgstr "Tetapkan Pengaturan User Standar"
 
 #. module: base_setup
 #: help:migrade.application.installer.modules,import_saleforce:0
 msgid "For Import Saleforce"
-msgstr ""
+msgstr "Untuk Import Salesforce"
 
 #. module: base_setup
 #: help:migrade.application.installer.modules,quickbooks_ippids:0
 msgid "For Quickbooks Ippids"
-msgstr ""
+msgstr "Untuk Quickbooks lppids"
 
 #. module: base_setup
 #: help:user.preferences.config,view:0
@@ -126,22 +134,26 @@ msgid ""
 "simplified interface, which has less features but is easier. You can always "
 "switch later from the user preferences."
 msgstr ""
+"Jika Anda menggunakan OpenERP untuk pertama kalinya kami sangat menyarankan "
+"Anda untuk memilih interface yang sederhana, yang memiliki fitur lebih "
+"sedikit tetapi lebih mudah. Anda selalu dapat beralih kemudian dari "
+"pengaturan pengguna."
 
 #. module: base_setup
 #: view:base.setup.terminology:0
 #: view:user.preferences.config:0
 msgid "res_config_contents"
-msgstr ""
+msgstr "res_config_contents"
 
 #. module: base_setup
 #: field:user.preferences.config,view:0
 msgid "Interface"
-msgstr ""
+msgstr "Antarmuka"
 
 #. module: base_setup
 #: model:ir.model,name:base_setup.model_migrade_application_installer_modules
 msgid "migrade.application.installer.modules"
-msgstr ""
+msgstr "migrade.pemasangan.modul.aplikasi"
 
 #. module: base_setup
 #: view:base.setup.terminology:0
@@ -149,21 +161,23 @@ msgid ""
 "You can use this wizard to change the terminologies for customers in the "
 "whole application."
 msgstr ""
+"Anda dapat menggunakan wizard ini untuk mengubah terminologi bagi pelanggan "
+"di seluruh aplikasi."
 
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
 msgid "Tenant"
-msgstr ""
+msgstr "Penyewa"
 
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
 msgid "Customer"
-msgstr ""
+msgstr "Pelanggan"
 
 #. module: base_setup
 #: field:user.preferences.config,context_lang:0
 msgid "Language"
-msgstr ""
+msgstr "Bahasa"
 
 #. module: base_setup
 #: help:user.preferences.config,context_lang:0
@@ -172,6 +186,10 @@ msgid ""
 "available. If you want to Add new Language, you can add it from 'Load an "
 "Official Translation' wizard  from 'Administration' menu."
 msgstr ""
+"Mengatur bahasa standar untuk semua antarmuka pengguna, ketika terjemahan UI "
+"yang tersedia. Jika Anda ingin Menambahkan Bahasa baru, Anda dapat "
+"menambahkannya dari 'Mengisikan Terjemahan Resmi' wizard dari menu "
+"'Administrasi'."
 
 #. module: base_setup
 #: view:user.preferences.config:0
@@ -180,47 +198,51 @@ msgid ""
 "ones. Afterwards, users are free to change those values on their own user "
 "preference form."
 msgstr ""
+"Ini akan mengatur pengaturan standar untuk pengguna baru dan memperbarui "
+"semua yang sudah ada. Setelah itu, pengguna bebas untuk mengubah nilai-nilai "
+"pada formulir pengaturan pengguna sendiri."
 
 #. module: base_setup
 #: field:base.setup.terminology,partner:0
 msgid "How do you call a Customer"
-msgstr ""
+msgstr "Bagaimana anda menghubungi Pelanggan"
 
 #. module: base_setup
 #: field:migrade.application.installer.modules,quickbooks_ippids:0
 msgid "Quickbooks Ippids"
-msgstr ""
+msgstr "Quickbooks lppids"
 
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
 msgid "Client"
-msgstr ""
+msgstr "Klien"
 
 #. module: base_setup
 #: field:migrade.application.installer.modules,import_saleforce:0
 msgid "Import Saleforce"
-msgstr ""
+msgstr "Impor Salesforce"
 
 #. module: base_setup
 #: field:user.preferences.config,context_tz:0
 msgid "Timezone"
-msgstr ""
+msgstr "Zona waktu"
 
 #. module: base_setup
 #: model:ir.actions.act_window,name:base_setup.action_partner_terminology_config_form
 msgid "Use another word to say \"Customer\""
-msgstr ""
+msgstr "Gunakan kata lain untuk \"Pelanggan\""
 
 #. module: base_setup
 #: model:ir.model,name:base_setup.model_base_setup_terminology
 msgid "base.setup.terminology"
-msgstr ""
+msgstr "pengaturan.terminologi.dasar"
 
 #. module: base_setup
 #: help:user.preferences.config,menu_tips:0
 msgid ""
 "Check out this box if you want to always display tips on each menu action"
 msgstr ""
+"Centang kotak ini jika anda selalu ingin menampilkan tips di setiap menu"
 
 #. module: base_setup
 #: field:base.setup.terminology,config_logo:0
@@ -228,57 +250,57 @@ msgstr ""
 #: field:product.installer,config_logo:0
 #: field:user.preferences.config,config_logo:0
 msgid "Image"
-msgstr ""
+msgstr "Gambar"
 
 #. module: base_setup
 #: model:ir.model,name:base_setup.model_user_preferences_config
 msgid "user.preferences.config"
-msgstr ""
+msgstr "konfig.pengaturan.user"
 
 #. module: base_setup
 #: model:ir.actions.act_window,name:base_setup.action_config_access_other_user
 msgid "Create Additional Users"
-msgstr ""
+msgstr "Membuat Pengguna Tambahan"
 
 #. module: base_setup
 #: model:ir.actions.act_window,name:base_setup.action_import_create_installer
 msgid "Create or Import Customers"
-msgstr ""
+msgstr "Buat atau Impor Data Pelanggan"
 
 #. module: base_setup
 #: field:migrade.application.installer.modules,import_sugarcrm:0
 msgid "Import Sugarcrm"
-msgstr ""
+msgstr "Impor Sugarcrm"
 
 #. module: base_setup
 #: help:product.installer,customers:0
 msgid "Import or create customers"
-msgstr ""
+msgstr "Impor atau buat data pelanggan"
 
 #. module: base_setup
 #: selection:user.preferences.config,view:0
 msgid "Simplified"
-msgstr ""
+msgstr "Sederhana"
 
 #. module: base_setup
 #: help:migrade.application.installer.modules,import_sugarcrm:0
 msgid "For Import Sugarcrm"
-msgstr ""
+msgstr "Untuk impor sugarcrm"
 
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
 msgid "Partner"
-msgstr ""
+msgstr "Rekanan"
 
 #. module: base_setup
 #: view:base.setup.terminology:0
 msgid "Specify Your Terminology"
-msgstr ""
+msgstr "Spesifikasikan Terminologi Anda"
 
 #. module: base_setup
 #: help:migrade.application.installer.modules,sync_google_contact:0
 msgid "For Sync Google Contact"
-msgstr ""
+msgstr "Untuk Sinkronisasi Kontak Google"
 
 #~ msgid "Next"
 #~ msgstr "Berikutnya"
diff --git a/addons/base_setup/i18n/it.po b/addons/base_setup/i18n/it.po
index 7cd8d1c9631..2e2bcfe06b4 100644
--- a/addons/base_setup/i18n/it.po
+++ b/addons/base_setup/i18n/it.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:02+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:08+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_setup
 #: field:user.preferences.config,menu_tips:0
diff --git a/addons/base_setup/i18n/ja.po b/addons/base_setup/i18n/ja.po
index 8d98742ac03..f3dfa8183e5 100644
--- a/addons/base_setup/i18n/ja.po
+++ b/addons/base_setup/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:02+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:08+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_setup
 #: field:user.preferences.config,menu_tips:0
diff --git a/addons/base_setup/i18n/ko.po b/addons/base_setup/i18n/ko.po
index 7b38058fb4c..155c2bed5bb 100644
--- a/addons/base_setup/i18n/ko.po
+++ b/addons/base_setup/i18n/ko.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:02+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:08+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_setup
 #: field:user.preferences.config,menu_tips:0
diff --git a/addons/base_setup/i18n/lt.po b/addons/base_setup/i18n/lt.po
index 88a52e2b856..b4da183191d 100644
--- a/addons/base_setup/i18n/lt.po
+++ b/addons/base_setup/i18n/lt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:02+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:08+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_setup
 #: field:user.preferences.config,menu_tips:0
diff --git a/addons/base_setup/i18n/lv.po b/addons/base_setup/i18n/lv.po
index 9b462559203..e482ac3aeab 100644
--- a/addons/base_setup/i18n/lv.po
+++ b/addons/base_setup/i18n/lv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:02+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:08+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_setup
 #: field:user.preferences.config,menu_tips:0
diff --git a/addons/base_setup/i18n/mn.po b/addons/base_setup/i18n/mn.po
index 322ca6fc021..fcac820102d 100644
--- a/addons/base_setup/i18n/mn.po
+++ b/addons/base_setup/i18n/mn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:02+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:08+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_setup
 #: field:user.preferences.config,menu_tips:0
diff --git a/addons/base_setup/i18n/nb.po b/addons/base_setup/i18n/nb.po
index f48f270313d..c450ed962c9 100644
--- a/addons/base_setup/i18n/nb.po
+++ b/addons/base_setup/i18n/nb.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:02+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:08+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_setup
 #: field:user.preferences.config,menu_tips:0
diff --git a/addons/base_setup/i18n/nl.po b/addons/base_setup/i18n/nl.po
index 24b5869c2c4..c38c5104eee 100644
--- a/addons/base_setup/i18n/nl.po
+++ b/addons/base_setup/i18n/nl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:02+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:08+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_setup
 #: field:user.preferences.config,menu_tips:0
diff --git a/addons/base_setup/i18n/nl_BE.po b/addons/base_setup/i18n/nl_BE.po
index d60b2de9dba..1662fc1a1dc 100644
--- a/addons/base_setup/i18n/nl_BE.po
+++ b/addons/base_setup/i18n/nl_BE.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:02+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:08+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_setup
 #: field:user.preferences.config,menu_tips:0
diff --git a/addons/base_setup/i18n/pl.po b/addons/base_setup/i18n/pl.po
index 289f3050e1b..c3d53a7f123 100644
--- a/addons/base_setup/i18n/pl.po
+++ b/addons/base_setup/i18n/pl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:02+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:08+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_setup
 #: field:user.preferences.config,menu_tips:0
diff --git a/addons/base_setup/i18n/pt.po b/addons/base_setup/i18n/pt.po
index d9207075140..97354b394f5 100644
--- a/addons/base_setup/i18n/pt.po
+++ b/addons/base_setup/i18n/pt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:02+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:08+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_setup
 #: field:user.preferences.config,menu_tips:0
diff --git a/addons/base_setup/i18n/pt_BR.po b/addons/base_setup/i18n/pt_BR.po
index 15e42257467..72f55da6eea 100644
--- a/addons/base_setup/i18n/pt_BR.po
+++ b/addons/base_setup/i18n/pt_BR.po
@@ -8,13 +8,14 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 00:36+0000\n"
 "PO-Revision-Date: 2012-07-28 19:07+0000\n"
-"Last-Translator: Fábio Martinelli <webmaster@guaru.net>\n"
+"Last-Translator: Fábio Martinelli - http://zupy.com.br "
+"<webmaster@guaru.net>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:02+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:08+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_setup
 #: field:user.preferences.config,menu_tips:0
diff --git a/addons/base_setup/i18n/ro.po b/addons/base_setup/i18n/ro.po
index e007344d486..b4e906ea354 100644
--- a/addons/base_setup/i18n/ro.po
+++ b/addons/base_setup/i18n/ro.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:02+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:08+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_setup
 #: field:user.preferences.config,menu_tips:0
diff --git a/addons/base_setup/i18n/ru.po b/addons/base_setup/i18n/ru.po
index 8c51fa9c32e..96bbd87b971 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-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-01-20 19:34+0000\n"
+"PO-Revision-Date: 2012-08-30 17:01+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: 2012-08-07 05:02+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-31 04:56+0000\n"
+"X-Generator: Launchpad (build 15887)\n"
 
 #. module: base_setup
 #: field:user.preferences.config,menu_tips:0
@@ -79,12 +79,12 @@ msgstr ""
 #. module: base_setup
 #: field:product.installer,customers:0
 msgid "Customers"
-msgstr ""
+msgstr "Заказчики"
 
 #. module: base_setup
 #: selection:user.preferences.config,view:0
 msgid "Extended"
-msgstr ""
+msgstr "Расширенный"
 
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
@@ -197,7 +197,7 @@ msgstr ""
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
 msgid "Client"
-msgstr ""
+msgstr "Клиент"
 
 #. module: base_setup
 #: field:migrade.application.installer.modules,import_saleforce:0
@@ -207,7 +207,7 @@ msgstr ""
 #. module: base_setup
 #: field:user.preferences.config,context_tz:0
 msgid "Timezone"
-msgstr ""
+msgstr "Часовой пояс"
 
 #. module: base_setup
 #: model:ir.actions.act_window,name:base_setup.action_partner_terminology_config_form
@@ -224,6 +224,8 @@ msgstr ""
 msgid ""
 "Check out this box if you want to always display tips on each menu action"
 msgstr ""
+"Отметьте этот квадратик, если вы хотите всегда выводить советы для каждого "
+"пункта меню"
 
 #. module: base_setup
 #: field:base.setup.terminology,config_logo:0
@@ -261,7 +263,7 @@ msgstr ""
 #. module: base_setup
 #: selection:user.preferences.config,view:0
 msgid "Simplified"
-msgstr ""
+msgstr "Упрощенный"
 
 #. module: base_setup
 #: help:migrade.application.installer.modules,import_sugarcrm:0
@@ -271,7 +273,7 @@ msgstr ""
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
 msgid "Partner"
-msgstr ""
+msgstr "Контрагент"
 
 #. module: base_setup
 #: view:base.setup.terminology:0
diff --git a/addons/base_setup/i18n/sk.po b/addons/base_setup/i18n/sk.po
index 9d07ac17669..14ad5d436b5 100644
--- a/addons/base_setup/i18n/sk.po
+++ b/addons/base_setup/i18n/sk.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:02+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:08+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_setup
 #: field:user.preferences.config,menu_tips:0
diff --git a/addons/base_setup/i18n/sl.po b/addons/base_setup/i18n/sl.po
index 3e3dc2bba5f..d26ee764454 100644
--- a/addons/base_setup/i18n/sl.po
+++ b/addons/base_setup/i18n/sl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:02+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:08+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_setup
 #: field:user.preferences.config,menu_tips:0
diff --git a/addons/base_setup/i18n/sq.po b/addons/base_setup/i18n/sq.po
index c9adc0439e5..e34ac6c82c2 100644
--- a/addons/base_setup/i18n/sq.po
+++ b/addons/base_setup/i18n/sq.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:02+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:08+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_setup
 #: field:user.preferences.config,menu_tips:0
diff --git a/addons/base_setup/i18n/sr.po b/addons/base_setup/i18n/sr.po
index af88f5399eb..3bb8ea6c3f5 100644
--- a/addons/base_setup/i18n/sr.po
+++ b/addons/base_setup/i18n/sr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:02+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:08+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_setup
 #: field:user.preferences.config,menu_tips:0
diff --git a/addons/base_setup/i18n/sr@latin.po b/addons/base_setup/i18n/sr@latin.po
index 4ee0f42ddef..b99df967416 100644
--- a/addons/base_setup/i18n/sr@latin.po
+++ b/addons/base_setup/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:02+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:08+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_setup
 #: field:user.preferences.config,menu_tips:0
diff --git a/addons/base_setup/i18n/sv.po b/addons/base_setup/i18n/sv.po
index 1afa9579801..8a5cbf32809 100644
--- a/addons/base_setup/i18n/sv.po
+++ b/addons/base_setup/i18n/sv.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:02+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:08+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_setup
 #: field:user.preferences.config,menu_tips:0
diff --git a/addons/base_setup/i18n/th.po b/addons/base_setup/i18n/th.po
index 87a223c5ef3..6100952a789 100644
--- a/addons/base_setup/i18n/th.po
+++ b/addons/base_setup/i18n/th.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:02+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:08+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_setup
 #: field:user.preferences.config,menu_tips:0
diff --git a/addons/base_setup/i18n/tlh.po b/addons/base_setup/i18n/tlh.po
index ebf0897b7d9..1b33829b1d0 100644
--- a/addons/base_setup/i18n/tlh.po
+++ b/addons/base_setup/i18n/tlh.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:02+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:08+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_setup
 #: field:user.preferences.config,menu_tips:0
diff --git a/addons/base_setup/i18n/tr.po b/addons/base_setup/i18n/tr.po
index 5a689c8ac10..de7b104c811 100644
--- a/addons/base_setup/i18n/tr.po
+++ b/addons/base_setup/i18n/tr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:02+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:08+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_setup
 #: field:user.preferences.config,menu_tips:0
diff --git a/addons/base_setup/i18n/uk.po b/addons/base_setup/i18n/uk.po
index 9dec941e294..f830280e4ce 100644
--- a/addons/base_setup/i18n/uk.po
+++ b/addons/base_setup/i18n/uk.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:02+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:08+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_setup
 #: field:user.preferences.config,menu_tips:0
diff --git a/addons/base_setup/i18n/vi.po b/addons/base_setup/i18n/vi.po
index 1834e2f8697..689dfea3a07 100644
--- a/addons/base_setup/i18n/vi.po
+++ b/addons/base_setup/i18n/vi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:02+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:08+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_setup
 #: field:user.preferences.config,menu_tips:0
diff --git a/addons/base_setup/i18n/zh_CN.po b/addons/base_setup/i18n/zh_CN.po
index 6f82e95cd6a..42dd40878c2 100644
--- a/addons/base_setup/i18n/zh_CN.po
+++ b/addons/base_setup/i18n/zh_CN.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:02+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:08+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_setup
 #: field:user.preferences.config,menu_tips:0
diff --git a/addons/base_setup/i18n/zh_TW.po b/addons/base_setup/i18n/zh_TW.po
index 44f5393a043..d453873b80d 100644
--- a/addons/base_setup/i18n/zh_TW.po
+++ b/addons/base_setup/i18n/zh_TW.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:02+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:08+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_setup
 #: field:user.preferences.config,menu_tips:0
diff --git a/addons/base_setup/res_config.py b/addons/base_setup/res_config.py
index 059a674e5f1..4826a50400d 100644
--- a/addons/base_setup/res_config.py
+++ b/addons/base_setup/res_config.py
@@ -28,10 +28,13 @@ class base_config_settings(osv.osv_memory):
         'module_multi_company': fields.boolean('manage multiple companies',
             help="""Work in multi-company environments, with appropriate security access between companies.
                 This installs the module multi_company."""),
-        'module_portal': fields.boolean('activate customer portal',
-            help="""The portal will give access to a series of documents for your  customers; his quotations, his invoices, his projects, etc."""),
         'module_share': fields.boolean('allow documents sharing',
-            help="""As an example, you will be able to share a project or some tasks to  your customers, or quotes/sales to several persons at your customer  company, or your agenda availabilities to your contacts."""),
+            help="""Share or embbed any screen of openerp."""),
+        'module_portal': fields.boolean('activate the customer/supplier portal',
+            help="""Give access your customers and suppliers to their documents."""),
+        'module_auth_anonymous': fields.boolean('activate the public portal',
+            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, ...'),
     }
 
     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 fe0fc7d1254..512c0a3f52e 100644
--- a/addons/base_setup/res_config_view.xml
+++ b/addons/base_setup/res_config_view.xml
@@ -28,20 +28,34 @@
                         </div>
                     </group>
                     <group>
-                        <label for="id" string="Share Data"/>
-                        <div>
+                        <label for="id" string="Email"/>
+                        <div name="email">
                             <div>
-                                <field name="module_share" class="oe_inline"/>
-                                <label for="module_share"/>
+                                <button type="action"
+                                    name="%(base.action_ir_mail_server_list)d"
+                                    string="Configure outgoing email servers" class="oe_link"/>
                             </div>
+                        </div>
+                    </group>
+                    <group>
+                        <label for="id" string="Portal access"/>
+                        <div>
                             <div>
                                 <field name="module_portal" class="oe_inline"/>
                                 <label for="module_portal"/>
                             </div>
                             <div>
-                                <button type="action"
-                                    name="%(base.action_ir_mail_server_list)d"
-                                    string="Configure outgoing email servers" class="oe_link"/>
+                                <field name="module_auth_anonymous" class="oe_inline"/>
+                                <label for="module_auth_anonymous"/>
+                            </div>
+                        </div>
+                    </group>
+                    <group>
+                        <label for="id" string="Authentication"/>
+                        <div>
+                            <div>
+                                <field name="module_auth_oauth" class="oe_inline"/>
+                                <label for="module_auth_oauth"/>
                             </div>
                         </div>
                     </group>
diff --git a/addons/base_setup/static/src/js/base_setup.js b/addons/base_setup/static/src/js/base_setup.js
index 4f900a3d69b..db217b71b38 100644
--- a/addons/base_setup/static/src/js/base_setup.js
+++ b/addons/base_setup/static/src/js/base_setup.js
@@ -7,13 +7,13 @@ openerp.base_setup = function(openerp) {
             if (this.dataset.model === 'res.partner') {
                 /* Set names for partner categories */
                 var category_ids = [];
-                this.$element.find('.oe_kanban_partner_categories span').each(function() {
+                this.$el.find('.oe_kanban_partner_categories span').each(function() {
                     category_ids.push($(this).data('category_id'));
                 });
                 var dataset = new openerp.web.DataSetSearch(this, 'res.partner.category', self.session.context);
                 dataset.name_get(_.uniq(category_ids)).then(function(result) {
                     _.each(result, function(value) {
-                        self.$element
+                        self.$el
                             .find('.oe_kanban_partner_categories span[data-category_id=' + value[0] + ']')
                             .html(value[1]);
                     });
diff --git a/addons/base_status/__openerp__.py b/addons/base_status/__openerp__.py
index bbd82b703ac..79b6dd2016c 100644
--- a/addons/base_status/__openerp__.py
+++ b/addons/base_status/__openerp__.py
@@ -24,19 +24,17 @@
     '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.
-========================================================================
+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
+    * ``base_state``: state management
+    * ``base_stage``: stage management
     """,
     'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
     'depends': ['base'],
-    'init_xml': [],
-    'update_xml': [],
-    'demo_xml': [],
+    'data': [],
+    'demo': [],
     'installable': True,
     'auto_install': False,
 }
diff --git a/addons/base_status/base_stage.py b/addons/base_status/base_stage.py
index 775de51394c..529e70fdb49 100644
--- a/addons/base_status/base_stage.py
+++ b/addons/base_status/base_stage.py
@@ -297,55 +297,31 @@ class base_stage(object):
                 destination=False)
 
     def remind_user(self, cr, uid, ids, context=None, attach=False, destination=True):
-        mail_message = self.pool.get('mail.message')
-        for case in self.browse(cr, uid, ids, context=context):
-            if not destination and not case.email_from:
-                return False
-            if not case.user_id.email:
-                return False
-            if destination and case.section_id.user_id:
-                case_email = case.section_id.user_id.email
-            else:
-                case_email = case.user_id.email
-
-            src = case_email
-            dest = case.user_id.email or ""
-            body = case.description or ""
-            for message in case.message_ids:
-                if message.email_from and message.body_text:
-                    body = message.body_text
-                    break
-
-            if not destination:
-                src, dest = dest, case.email_from
-                if body and case.user_id.signature:
-                    if body:
-                        body += '\n\n%s' % (case.user_id.signature)
-                    else:
-                        body = '\n\n%s' % (case.user_id.signature)
-
-            body = self.format_body(body)
-
-            attach_to_send = {}
-
-            if attach:
-                attach_ids = self.pool.get('ir.attachment').search(cr, uid, [('res_model', '=', self._name), ('res_id', '=', case.id)])
-                attach_to_send = self.pool.get('ir.attachment').read(cr, uid, attach_ids, ['datas_fname', 'datas'])
-                attach_to_send = dict(map(lambda x: (x['datas_fname'], base64.decodestring(x['datas'])), attach_to_send))
-
-            # Send an email
-            subject = "Reminder: [%s] %s" % (str(case.id), case.name, )
-            mail_message.schedule_with_attach(cr, uid,
-                src,
-                [dest],
-                subject,
-                body,
-                model=self._name,
-                reply_to=case.section_id.reply_to,
-                res_id=case.id,
-                attachments=attach_to_send,
-                context=context
-            )
+        if 'message_post' in self:
+            for case in self.browse(cr, uid, ids, context=context):
+                if destination:
+                    recipient_id = case.user_id.partner_id.id
+                else:
+                    if not case.email_from:
+                        return False
+                    recipient_id = self.pool.get('res.partner').find_or_create(cr, uid, case.email_from, context=context)
+                
+                body = case.description or ""
+                for message in case.message_ids:
+                    if message.type == 'email' and message.body:
+                        body = message.body
+                        break
+                body = self.format_body(body)
+                attach_to_send = {}
+                if attach:
+                    attach_ids = self.pool.get('ir.attachment').search(cr, uid, [('res_model', '=', self._name), ('res_id', '=', case.id)])
+                    attach_to_send = self.pool.get('ir.attachment').read(cr, uid, attach_ids, ['datas_fname', 'datas'])
+                    attach_to_send = dict(map(lambda x: (x['datas_fname'], x['datas'].decode('base64')), attach_to_send))
+ 
+                subject = "Reminder: [%s] %s" % (case.id, case.name)
+                self.message_post(cr, uid, case.id, body=body,
+                    subject=subject, attachments=attach_to_send, 
+                    partner_ids=[recipient_id], context=context)
         return True
 
     def _check(self, cr, uid, ids=False, context=None):
@@ -360,17 +336,6 @@ class base_stage(object):
     def format_mail(self, obj, body):
         return self.pool.get('base.action.rule').format_mail(obj, body)
 
-    def message_thread_followers(self, cr, uid, ids, context=None):
-        res = {}
-        for case in self.browse(cr, uid, ids, context=context):
-            l=[]
-            if case.email_cc:
-                l.append(case.email_cc)
-            if case.user_id and case.user_id.email:
-                l.append(case.user_id.email)
-            res[case.id] = l
-        return res
-
     # ******************************
     # Notifications
     # ******************************
@@ -395,31 +360,31 @@ class base_stage(object):
     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_append_note(cr, uid, [id], body=msg, 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_append_note(cr, uid, [id], body=msg, 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_append_note(cr, uid, [id], body=msg, 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_append_note(cr, uid, [id], body=msg, 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_append_note(cr, uid, [id], body=msg, 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):
@@ -428,5 +393,5 @@ class base_stage(object):
                 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_append_note(cr, uid, [id], 'System Notification', msg, context=context)
+            self.message_post(cr, uid, [id], body=msg, context=context)
         return True
diff --git a/addons/base_status/base_state.py b/addons/base_status/base_state.py
index 8fa2f92e22a..cebf5537485 100644
--- a/addons/base_status/base_state.py
+++ b/addons/base_status/base_state.py
@@ -179,13 +179,13 @@ class base_state(object):
     # Notifications
     # ******************************
     
-	def case_get_note_msg_prefix(self, cr, uid, id, context=None):
-		return ''
-	
+    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_append_note(cr, uid, [id], body=msg, 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):
@@ -194,29 +194,29 @@ class base_state(object):
                 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_append_note(cr, uid, [id], 'System Notification', msg, 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_append_note(cr, uid, [id], body=msg, 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_append_note(cr, uid, [id], body=msg, 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_append_note(cr, uid, [id], body=msg, 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_append_note(cr, uid, [id], body=msg, context=context)
+            self.message_post(cr, uid, [id], body=msg, context=context)
         return True
diff --git a/addons/base_tools/__openerp__.py b/addons/base_tools/__openerp__.py
index 8989c6d0a78..84f10e78959 100644
--- a/addons/base_tools/__openerp__.py
+++ b/addons/base_tools/__openerp__.py
@@ -1,22 +1,19 @@
 # -*- encoding: utf-8 -*-
 {
-    "name": "Base Tools",
-    "author": "OpenERP SA",
-    "version": "1.0",
-    "depends": ["base"],
-    "category" : "Hidden/Dependency",
+    'name': 'Base Tools',
+    'author': 'OpenERP SA',
+    'version': '1.0',
+    'depends': ['base'],
+    'category' : 'Hidden/Dependency',
     'description': """
 Common base for tools modules.
 ==============================
 
 Creates menu link for Tools from where tools like survey, lunch, idea are accessible if installed.
     """,
-    "init_xml": [],
-    "update_xml": [
-        'tools_view.xml'
-    ],
-    "installable": True,
-    "certificate" : "00571588675379342237"
+    'data': ['tools_view.xml'],
+    'installable': True,
+    'certificate' : '00571588675379342237'
 }
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/base_tools/i18n/ar.po b/addons/base_tools/i18n/ar.po
index ce6e36edfd3..389ac1af356 100644
--- a/addons/base_tools/i18n/ar.po
+++ b/addons/base_tools/i18n/ar.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_tools
 #: model:ir.module.module,shortdesc:base_tools.module_meta_information
diff --git a/addons/base_tools/i18n/bg.po b/addons/base_tools/i18n/bg.po
index 2210ac79cd8..9e1b0730048 100644
--- a/addons/base_tools/i18n/bg.po
+++ b/addons/base_tools/i18n/bg.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_tools
 #: model:ir.module.module,shortdesc:base_tools.module_meta_information
diff --git a/addons/base_tools/i18n/ca.po b/addons/base_tools/i18n/ca.po
index 29e9ffa53d8..c33a3b15baf 100644
--- a/addons/base_tools/i18n/ca.po
+++ b/addons/base_tools/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_tools
 #: model:ir.module.module,shortdesc:base_tools.module_meta_information
diff --git a/addons/base_tools/i18n/cs.po b/addons/base_tools/i18n/cs.po
index fce3e5173c9..6532862aa11 100644
--- a/addons/base_tools/i18n/cs.po
+++ b/addons/base_tools/i18n/cs.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_tools
 #: model:ir.module.module,shortdesc:base_tools.module_meta_information
diff --git a/addons/base_tools/i18n/da.po b/addons/base_tools/i18n/da.po
index 8e619ba3a85..4df777264fc 100644
--- a/addons/base_tools/i18n/da.po
+++ b/addons/base_tools/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_tools
 #: model:ir.module.module,shortdesc:base_tools.module_meta_information
diff --git a/addons/base_tools/i18n/de.po b/addons/base_tools/i18n/de.po
index 358b227a138..561df06caea 100644
--- a/addons/base_tools/i18n/de.po
+++ b/addons/base_tools/i18n/de.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_tools
 #: model:ir.module.module,shortdesc:base_tools.module_meta_information
diff --git a/addons/base_tools/i18n/en_GB.po b/addons/base_tools/i18n/en_GB.po
index 3c76a999aec..ca667bccf59 100644
--- a/addons/base_tools/i18n/en_GB.po
+++ b/addons/base_tools/i18n/en_GB.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_tools
 #: model:ir.module.module,shortdesc:base_tools.module_meta_information
diff --git a/addons/base_tools/i18n/es.po b/addons/base_tools/i18n/es.po
index 3592ff30f6d..7c471df9a20 100644
--- a/addons/base_tools/i18n/es.po
+++ b/addons/base_tools/i18n/es.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_tools
 #: model:ir.module.module,shortdesc:base_tools.module_meta_information
diff --git a/addons/base_tools/i18n/es_AR.po b/addons/base_tools/i18n/es_AR.po
index f20afe8f0fc..6faff2c306f 100644
--- a/addons/base_tools/i18n/es_AR.po
+++ b/addons/base_tools/i18n/es_AR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_tools
 #: model:ir.module.module,shortdesc:base_tools.module_meta_information
diff --git a/addons/base_tools/i18n/es_CL.po b/addons/base_tools/i18n/es_CL.po
index 13d24b56262..768d7cc1b4f 100644
--- a/addons/base_tools/i18n/es_CL.po
+++ b/addons/base_tools/i18n/es_CL.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_tools
 #: model:ir.module.module,shortdesc:base_tools.module_meta_information
diff --git a/addons/base_tools/i18n/es_CR.po b/addons/base_tools/i18n/es_CR.po
index 1be0f97dc63..b31b7457c7d 100644
--- a/addons/base_tools/i18n/es_CR.po
+++ b/addons/base_tools/i18n/es_CR.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 "Language: es\n"
 
 #. module: base_tools
diff --git a/addons/base_tools/i18n/es_EC.po b/addons/base_tools/i18n/es_EC.po
index 9e3a7fa5414..1950ab6fd43 100644
--- a/addons/base_tools/i18n/es_EC.po
+++ b/addons/base_tools/i18n/es_EC.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_tools
 #: model:ir.module.module,shortdesc:base_tools.module_meta_information
diff --git a/addons/base_tools/i18n/es_PY.po b/addons/base_tools/i18n/es_PY.po
index 836e2f18c6d..19ec2feae6d 100644
--- a/addons/base_tools/i18n/es_PY.po
+++ b/addons/base_tools/i18n/es_PY.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_tools
 #: model:ir.module.module,shortdesc:base_tools.module_meta_information
diff --git a/addons/base_tools/i18n/fa.po b/addons/base_tools/i18n/fa.po
index 513c9ad4763..bd4b2dbd4b4 100644
--- a/addons/base_tools/i18n/fa.po
+++ b/addons/base_tools/i18n/fa.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_tools
 #: model:ir.module.module,shortdesc:base_tools.module_meta_information
diff --git a/addons/base_tools/i18n/fi.po b/addons/base_tools/i18n/fi.po
index 26b13220bcc..5810f7ad137 100644
--- a/addons/base_tools/i18n/fi.po
+++ b/addons/base_tools/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_tools
 #: model:ir.module.module,shortdesc:base_tools.module_meta_information
diff --git a/addons/base_tools/i18n/fr.po b/addons/base_tools/i18n/fr.po
index 81f8bba5bd0..e3d4169def0 100644
--- a/addons/base_tools/i18n/fr.po
+++ b/addons/base_tools/i18n/fr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_tools
 #: model:ir.module.module,shortdesc:base_tools.module_meta_information
diff --git a/addons/base_tools/i18n/gl.po b/addons/base_tools/i18n/gl.po
index 73d28b7c52d..a2d1a0bb5cb 100644
--- a/addons/base_tools/i18n/gl.po
+++ b/addons/base_tools/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_tools
 #: model:ir.module.module,shortdesc:base_tools.module_meta_information
diff --git a/addons/base_tools/i18n/gu.po b/addons/base_tools/i18n/gu.po
index fb1f6a68b53..030e21f85c1 100644
--- a/addons/base_tools/i18n/gu.po
+++ b/addons/base_tools/i18n/gu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_tools
 #: model:ir.module.module,shortdesc:base_tools.module_meta_information
diff --git a/addons/base_tools/i18n/hi.po b/addons/base_tools/i18n/hi.po
index 28fec6d1e45..086dac411a7 100644
--- a/addons/base_tools/i18n/hi.po
+++ b/addons/base_tools/i18n/hi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_tools
 #: model:ir.module.module,shortdesc:base_tools.module_meta_information
diff --git a/addons/base_tools/i18n/hr.po b/addons/base_tools/i18n/hr.po
index b29152210fc..f71d831e5bf 100644
--- a/addons/base_tools/i18n/hr.po
+++ b/addons/base_tools/i18n/hr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_tools
 #: model:ir.module.module,shortdesc:base_tools.module_meta_information
diff --git a/addons/base_tools/i18n/id.po b/addons/base_tools/i18n/id.po
index 43cc9a8128c..eaf8e04fec6 100644
--- a/addons/base_tools/i18n/id.po
+++ b/addons/base_tools/i18n/id.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_tools
 #: model:ir.module.module,shortdesc:base_tools.module_meta_information
diff --git a/addons/base_tools/i18n/it.po b/addons/base_tools/i18n/it.po
index 45de44ab10c..43a848cf05e 100644
--- a/addons/base_tools/i18n/it.po
+++ b/addons/base_tools/i18n/it.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_tools
 #: model:ir.module.module,shortdesc:base_tools.module_meta_information
diff --git a/addons/base_tools/i18n/ja.po b/addons/base_tools/i18n/ja.po
index 0e0ba54d984..eb5c3ff6744 100644
--- a/addons/base_tools/i18n/ja.po
+++ b/addons/base_tools/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_tools
 #: model:ir.module.module,shortdesc:base_tools.module_meta_information
diff --git a/addons/base_tools/i18n/lt.po b/addons/base_tools/i18n/lt.po
new file mode 100644
index 00000000000..005bf36218f
--- /dev/null
+++ b/addons/base_tools/i18n/lt.po
@@ -0,0 +1,30 @@
+# Lithuanian 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: 2011-01-11 11:14+0000\n"
+"PO-Revision-Date: 2012-08-28 13:53+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: 2012-08-29 05:05+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
+
+#. module: base_tools
+#: model:ir.module.module,shortdesc:base_tools.module_meta_information
+msgid "Common base for tools modules"
+msgstr ""
+
+#. module: base_tools
+#: model:ir.module.module,description:base_tools.module_meta_information
+msgid ""
+"\n"
+"    "
+msgstr ""
diff --git a/addons/base_tools/i18n/mn.po b/addons/base_tools/i18n/mn.po
index c441b127833..424ac4fd9e0 100644
--- a/addons/base_tools/i18n/mn.po
+++ b/addons/base_tools/i18n/mn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_tools
 #: model:ir.module.module,shortdesc:base_tools.module_meta_information
diff --git a/addons/base_tools/i18n/nb.po b/addons/base_tools/i18n/nb.po
index 684b0106523..dcc674f3bdc 100644
--- a/addons/base_tools/i18n/nb.po
+++ b/addons/base_tools/i18n/nb.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_tools
 #: model:ir.module.module,shortdesc:base_tools.module_meta_information
diff --git a/addons/base_tools/i18n/nl.po b/addons/base_tools/i18n/nl.po
index 8053efdf90c..68ed91cdf4d 100644
--- a/addons/base_tools/i18n/nl.po
+++ b/addons/base_tools/i18n/nl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_tools
 #: model:ir.module.module,shortdesc:base_tools.module_meta_information
diff --git a/addons/base_tools/i18n/nl_BE.po b/addons/base_tools/i18n/nl_BE.po
index cc75d23f45d..2a3bc54a552 100644
--- a/addons/base_tools/i18n/nl_BE.po
+++ b/addons/base_tools/i18n/nl_BE.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_tools
 #: model:ir.module.module,shortdesc:base_tools.module_meta_information
diff --git a/addons/base_tools/i18n/oc.po b/addons/base_tools/i18n/oc.po
index c883afa9cf9..f0e14cd807a 100644
--- a/addons/base_tools/i18n/oc.po
+++ b/addons/base_tools/i18n/oc.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_tools
 #: model:ir.module.module,shortdesc:base_tools.module_meta_information
diff --git a/addons/base_tools/i18n/pt.po b/addons/base_tools/i18n/pt.po
index 7baf356a56d..586829bedbd 100644
--- a/addons/base_tools/i18n/pt.po
+++ b/addons/base_tools/i18n/pt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_tools
 #: model:ir.module.module,shortdesc:base_tools.module_meta_information
diff --git a/addons/base_tools/i18n/pt_BR.po b/addons/base_tools/i18n/pt_BR.po
index 30ded991240..10f8adab288 100644
--- a/addons/base_tools/i18n/pt_BR.po
+++ b/addons/base_tools/i18n/pt_BR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_tools
 #: model:ir.module.module,shortdesc:base_tools.module_meta_information
diff --git a/addons/base_tools/i18n/ro.po b/addons/base_tools/i18n/ro.po
index 3ff47676258..63550f7e0ba 100644
--- a/addons/base_tools/i18n/ro.po
+++ b/addons/base_tools/i18n/ro.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_tools
 #: model:ir.module.module,shortdesc:base_tools.module_meta_information
diff --git a/addons/base_tools/i18n/ru.po b/addons/base_tools/i18n/ru.po
index cd5fae5dfc5..d55368d88d3 100644
--- a/addons/base_tools/i18n/ru.po
+++ b/addons/base_tools/i18n/ru.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_tools
 #: model:ir.module.module,shortdesc:base_tools.module_meta_information
diff --git a/addons/base_tools/i18n/sk.po b/addons/base_tools/i18n/sk.po
index 27c3e423d67..a9c02244046 100644
--- a/addons/base_tools/i18n/sk.po
+++ b/addons/base_tools/i18n/sk.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_tools
 #: model:ir.module.module,shortdesc:base_tools.module_meta_information
diff --git a/addons/base_tools/i18n/sl.po b/addons/base_tools/i18n/sl.po
index 7353b2b7104..175c84db73c 100644
--- a/addons/base_tools/i18n/sl.po
+++ b/addons/base_tools/i18n/sl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_tools
 #: model:ir.module.module,shortdesc:base_tools.module_meta_information
diff --git a/addons/base_tools/i18n/sq.po b/addons/base_tools/i18n/sq.po
index 25249cd7dec..a488bda45f6 100644
--- a/addons/base_tools/i18n/sq.po
+++ b/addons/base_tools/i18n/sq.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_tools
 #: model:ir.module.module,shortdesc:base_tools.module_meta_information
diff --git a/addons/base_tools/i18n/sr@latin.po b/addons/base_tools/i18n/sr@latin.po
index 9373de229b2..883e6e01ab5 100644
--- a/addons/base_tools/i18n/sr@latin.po
+++ b/addons/base_tools/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_tools
 #: model:ir.module.module,shortdesc:base_tools.module_meta_information
diff --git a/addons/base_tools/i18n/sv.po b/addons/base_tools/i18n/sv.po
index 654947f3d2e..232a15703f3 100644
--- a/addons/base_tools/i18n/sv.po
+++ b/addons/base_tools/i18n/sv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_tools
 #: model:ir.module.module,shortdesc:base_tools.module_meta_information
diff --git a/addons/base_tools/i18n/tr.po b/addons/base_tools/i18n/tr.po
index b3b169dcd2f..5d961a40efd 100644
--- a/addons/base_tools/i18n/tr.po
+++ b/addons/base_tools/i18n/tr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_tools
 #: model:ir.module.module,shortdesc:base_tools.module_meta_information
diff --git a/addons/base_tools/i18n/vi.po b/addons/base_tools/i18n/vi.po
index 6c0269c1d4a..bf971d02d5a 100644
--- a/addons/base_tools/i18n/vi.po
+++ b/addons/base_tools/i18n/vi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_tools
 #: model:ir.module.module,shortdesc:base_tools.module_meta_information
diff --git a/addons/base_tools/i18n/zh_CN.po b/addons/base_tools/i18n/zh_CN.po
index f61cd1baf1e..b663347552d 100644
--- a/addons/base_tools/i18n/zh_CN.po
+++ b/addons/base_tools/i18n/zh_CN.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_tools
 #: model:ir.module.module,shortdesc:base_tools.module_meta_information
diff --git a/addons/base_tools/i18n/zh_TW.po b/addons/base_tools/i18n/zh_TW.po
index d864c96ee17..7fc27772692 100644
--- a/addons/base_tools/i18n/zh_TW.po
+++ b/addons/base_tools/i18n/zh_TW.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_tools
 #: model:ir.module.module,shortdesc:base_tools.module_meta_information
diff --git a/addons/base_vat/__openerp__.py b/addons/base_vat/__openerp__.py
index 7b09ee24a58..dfa23bb54fe 100644
--- a/addons/base_vat/__openerp__.py
+++ b/addons/base_vat/__openerp__.py
@@ -22,7 +22,7 @@
 {
     'name': 'VAT Number Validation',
     'version': '1.0',
-    "category": 'Hidden/Dependency',
+    'category': 'Hidden/Dependency',
     'description': """
 VAT validation for Partner's VAT numbers.
 =========================================
@@ -33,19 +33,20 @@ be validated for all supported countries. The country is inferred from the
 will be validated using the Belgian rules.
 
 There are two different levels of VAT number validation:
-
- * By default, a simple off-line check is performed using the known validation
-   rules for the country, usually a simple check digit. This is quick and 
-   always available, but allows numbers that are perhaps not truly allocated,
-   or not valid anymore.
- * When the "VAT VIES Check" option is enabled (in the configuration of the user's
-   Company), VAT numbers will be instead submitted to the online EU VIES
-   database, which will truly verify that the number is valid and currently
-   allocated to a EU company. This is a little bit slower than the simple
-   off-line check, requires an Internet connection, and may not be available
-   all the time. If the service is not available or does not support the
-   requested country (e.g. for non-EU countries), a simple check will be performed
-   instead.
+--------------------------------------------------------
+    * By default, a simple off-line check is performed using the known validation
+      rules for the country, usually a simple check digit. This is quick and 
+      always available, but allows numbers that are perhaps not truly allocated,
+      or not valid anymore.
+      
+    * When the "VAT VIES Check" option is enabled (in the configuration of the user's
+      Company), VAT numbers will be instead submitted to the online EU VIES
+      database, which will truly verify that the number is valid and currently
+      allocated to a EU company. This is a little bit slower than the simple
+      off-line check, requires an Internet connection, and may not be available
+      all the time. If the service is not available or does not support the
+      requested country (e.g. for non-EU countries), a simple check will be performed
+      instead.
 
 Supported countries currently include EU countries, and a few non-EU countries
 such as Chile, Colombia, Mexico, Norway or Russia. For unsupported countries,
diff --git a/addons/base_vat/i18n/ar.po b/addons/base_vat/i18n/ar.po
index 2106e763eb9..44305b9f1f5 100644
--- a/addons/base_vat/i18n/ar.po
+++ b/addons/base_vat/i18n/ar.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_vat
 #: code:addons/base_vat/base_vat.py:141
diff --git a/addons/base_vat/i18n/bg.po b/addons/base_vat/i18n/bg.po
index d0421385883..22eb4fe0bff 100644
--- a/addons/base_vat/i18n/bg.po
+++ b/addons/base_vat/i18n/bg.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_vat
 #: code:addons/base_vat/base_vat.py:141
diff --git a/addons/base_vat/i18n/bs.po b/addons/base_vat/i18n/bs.po
index 21ec64eba75..d506ce21e2d 100644
--- a/addons/base_vat/i18n/bs.po
+++ b/addons/base_vat/i18n/bs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_vat
 #: code:addons/base_vat/base_vat.py:141
diff --git a/addons/base_vat/i18n/ca.po b/addons/base_vat/i18n/ca.po
index efdafc716fd..73da8d8b0ff 100644
--- a/addons/base_vat/i18n/ca.po
+++ b/addons/base_vat/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_vat
 #: code:addons/base_vat/base_vat.py:141
diff --git a/addons/base_vat/i18n/cs.po b/addons/base_vat/i18n/cs.po
index 9b5cdb46166..7e79bbb00ff 100644
--- a/addons/base_vat/i18n/cs.po
+++ b/addons/base_vat/i18n/cs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_vat
 #: code:addons/base_vat/base_vat.py:141
diff --git a/addons/base_vat/i18n/da.po b/addons/base_vat/i18n/da.po
index 46a0d38bba8..c984eae461d 100644
--- a/addons/base_vat/i18n/da.po
+++ b/addons/base_vat/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_vat
 #: code:addons/base_vat/base_vat.py:141
diff --git a/addons/base_vat/i18n/de.po b/addons/base_vat/i18n/de.po
index 6f2e7f69bc2..2f8278b2852 100644
--- a/addons/base_vat/i18n/de.po
+++ b/addons/base_vat/i18n/de.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_vat
 #: code:addons/base_vat/base_vat.py:141
diff --git a/addons/base_vat/i18n/el.po b/addons/base_vat/i18n/el.po
index 50af067175f..7d7bb87ab79 100644
--- a/addons/base_vat/i18n/el.po
+++ b/addons/base_vat/i18n/el.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_vat
 #: code:addons/base_vat/base_vat.py:141
diff --git a/addons/base_vat/i18n/en_AU.po b/addons/base_vat/i18n/en_AU.po
index 08f9bfb1df9..b5dd221c9ce 100644
--- a/addons/base_vat/i18n/en_AU.po
+++ b/addons/base_vat/i18n/en_AU.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_vat
 #: code:addons/base_vat/base_vat.py:141
diff --git a/addons/base_vat/i18n/en_GB.po b/addons/base_vat/i18n/en_GB.po
index f9d81b8975b..e4b28cc7967 100644
--- a/addons/base_vat/i18n/en_GB.po
+++ b/addons/base_vat/i18n/en_GB.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_vat
 #: code:addons/base_vat/base_vat.py:141
diff --git a/addons/base_vat/i18n/es.po b/addons/base_vat/i18n/es.po
index 2ea9fab1348..edee97d0ee1 100644
--- a/addons/base_vat/i18n/es.po
+++ b/addons/base_vat/i18n/es.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_vat
 #: code:addons/base_vat/base_vat.py:141
diff --git a/addons/base_vat/i18n/es_AR.po b/addons/base_vat/i18n/es_AR.po
index 628d4a76bba..ea98c5e752c 100644
--- a/addons/base_vat/i18n/es_AR.po
+++ b/addons/base_vat/i18n/es_AR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_vat
 #: code:addons/base_vat/base_vat.py:141
diff --git a/addons/base_vat/i18n/es_CL.po b/addons/base_vat/i18n/es_CL.po
index 99c9f837b78..1c8c62306b2 100644
--- a/addons/base_vat/i18n/es_CL.po
+++ b/addons/base_vat/i18n/es_CL.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_vat
 #: code:addons/base_vat/base_vat.py:141
diff --git a/addons/base_vat/i18n/es_CR.po b/addons/base_vat/i18n/es_CR.po
index 06705e2cc69..6afa25ccd77 100644
--- a/addons/base_vat/i18n/es_CR.po
+++ b/addons/base_vat/i18n/es_CR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 "Language: \n"
 
 #. module: base_vat
diff --git a/addons/base_vat/i18n/es_EC.po b/addons/base_vat/i18n/es_EC.po
index a2d118bf826..3589f637dd7 100644
--- a/addons/base_vat/i18n/es_EC.po
+++ b/addons/base_vat/i18n/es_EC.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_vat
 #: code:addons/base_vat/base_vat.py:141
diff --git a/addons/base_vat/i18n/es_MX.po b/addons/base_vat/i18n/es_MX.po
index 57d269be72d..cd511c528b0 100644
--- a/addons/base_vat/i18n/es_MX.po
+++ b/addons/base_vat/i18n/es_MX.po
@@ -1,70 +1,54 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* base_vat
+# Spanish (Mexico) 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 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2010-12-25 18:58+0000\n"
-"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
-"<jesteve@zikzakmedia.com>\n"
-"Language-Team: \n"
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:36+0000\n"
+"PO-Revision-Date: 2012-09-07 00:31+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Spanish (Mexico) <es_MX@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-09-05 05:10+0000\n"
-"X-Generator: Launchpad (build 13830)\n"
+"X-Launchpad-Export-Date: 2012-09-08 04:54+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: base_vat
-#: code:addons/base_vat/base_vat.py:87
+#: code:addons/base_vat/base_vat.py:141
 #, python-format
 msgid ""
-"The Vat does not seems to be correct. You should have entered something like "
-"this %s"
-msgstr ""
-"El CIF/NIF parece que no sea correcto. Debería haber introducido algo como "
-"esto %s"
+"This VAT number does not seem to be valid.\n"
+"Note: the expected format is %s"
+msgstr "El RFC no es válido. El formato esperado es %s"
 
 #. module: base_vat
-#: model:ir.module.module,description:base_vat.module_meta_information
-msgid ""
-"\n"
-"    Enable the VAT Number for the partner. Check the validity of that VAT "
-"Number.\n"
-"\n"
-"    This module follows the methods stated at http://sima-pc.com/nif.php "
-"for\n"
-"    checking the validity of VAT Number assigned to partners in European "
-"countries.\n"
-"    "
+#: sql_constraint:res.company:0
+msgid "The company name must be unique !"
 msgstr ""
-"\n"
-"    Permite la validación del CIF/NIF de las empresas. Comprueba si el "
-"CIF/NIF es un número válido.\n"
-"\n"
-"    Este módulo usa los métodos especificados en http://sima-pc.com/nif.php "
-"para\n"
-"    la validación del CIF/NIF asignado a las empresas de los países "
-"europeos.\n"
-"    "
-
-#. module: base_vat
-#: model:ir.module.module,shortdesc:base_vat.module_meta_information
-msgid "Base VAT - To check VAT number validity"
-msgstr "Base CIF/NIF - Para comprobar la validez de los CIF/NIF"
 
 #. module: base_vat
 #: constraint:res.partner:0
-msgid "Error ! You can not create recursive associated members."
-msgstr "¡Error! No puede crear miembros asociados recursivos."
+msgid "Error ! You cannot create recursive associated members."
+msgstr ""
 
 #. module: base_vat
-#: code:addons/base_vat/base_vat.py:88
-#, python-format
-msgid "The VAT is invalid, It should begin with the country code"
-msgstr "El CIF/NIF no es válido, debería empezar con el código del país"
+#: field:res.company,vat_check_vies:0
+msgid "VIES VAT Check"
+msgstr ""
+
+#. module: base_vat
+#: model:ir.model,name:base_vat.model_res_company
+msgid "Companies"
+msgstr ""
+
+#. module: base_vat
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr ""
 
 #. module: base_vat
 #: help:res.partner,vat_subjected:0
@@ -72,27 +56,20 @@ msgid ""
 "Check this box if the partner is subjected to the VAT. It will be used for "
 "the VAT legal statement."
 msgstr ""
-"Marque esta opción si la empresa está sujeta al IVA. Será utilizado para la "
-"declaración legal del IVA."
 
 #. module: base_vat
 #: model:ir.model,name:base_vat.model_res_partner
 msgid "Partner"
-msgstr "Empresa"
+msgstr ""
+
+#. module: base_vat
+#: help:res.company,vat_check_vies:0
+msgid ""
+"If checked, Partners VAT numbers will be fully validated against EU's VIES "
+"service rather than via a simple format validation (checksum)."
+msgstr ""
 
 #. module: base_vat
 #: field:res.partner,vat_subjected:0
 msgid "VAT Legal Statement"
-msgstr "Sujeto a IVA"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "¡XML inválido para la definición de la vista!"
-
-#~ msgid ""
-#~ "Enable the VAT Number for the partner. Check the validity of that VAT Number."
-#~ msgstr ""
-#~ "Activa el IVA (Impuesto Valor Añadido) para la empresa. Comprueba la validez "
-#~ "del CIF/NIF."
-
-#~ msgid "VAT"
-#~ msgstr "IVA"
+msgstr ""
diff --git a/addons/base_vat/i18n/es_PY.po b/addons/base_vat/i18n/es_PY.po
index 411d37719d0..528ec84005e 100644
--- a/addons/base_vat/i18n/es_PY.po
+++ b/addons/base_vat/i18n/es_PY.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_vat
 #: code:addons/base_vat/base_vat.py:141
diff --git a/addons/base_vat/i18n/et.po b/addons/base_vat/i18n/et.po
index c891a06f444..018f0c5b7f1 100644
--- a/addons/base_vat/i18n/et.po
+++ b/addons/base_vat/i18n/et.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_vat
 #: code:addons/base_vat/base_vat.py:141
diff --git a/addons/base_vat/i18n/eu.po b/addons/base_vat/i18n/eu.po
index 684fa52a906..aa59b82e79e 100644
--- a/addons/base_vat/i18n/eu.po
+++ b/addons/base_vat/i18n/eu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_vat
 #: code:addons/base_vat/base_vat.py:141
diff --git a/addons/base_vat/i18n/fa.po b/addons/base_vat/i18n/fa.po
index db7a5bd78f3..0a0089a4fe7 100644
--- a/addons/base_vat/i18n/fa.po
+++ b/addons/base_vat/i18n/fa.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_vat
 #: code:addons/base_vat/base_vat.py:141
diff --git a/addons/base_vat/i18n/fi.po b/addons/base_vat/i18n/fi.po
index cf78bb2d396..5f848589c52 100644
--- a/addons/base_vat/i18n/fi.po
+++ b/addons/base_vat/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_vat
 #: code:addons/base_vat/base_vat.py:141
diff --git a/addons/base_vat/i18n/fr.po b/addons/base_vat/i18n/fr.po
index 60f1aafb281..bf8d6129c81 100644
--- a/addons/base_vat/i18n/fr.po
+++ b/addons/base_vat/i18n/fr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_vat
 #: code:addons/base_vat/base_vat.py:141
diff --git a/addons/base_vat/i18n/gl.po b/addons/base_vat/i18n/gl.po
index 7d8b3deec90..4add37e0fcd 100644
--- a/addons/base_vat/i18n/gl.po
+++ b/addons/base_vat/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_vat
 #: code:addons/base_vat/base_vat.py:141
diff --git a/addons/base_vat/i18n/gu.po b/addons/base_vat/i18n/gu.po
index 152d33fb712..501c554969e 100644
--- a/addons/base_vat/i18n/gu.po
+++ b/addons/base_vat/i18n/gu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_vat
 #: code:addons/base_vat/base_vat.py:141
diff --git a/addons/base_vat/i18n/hr.po b/addons/base_vat/i18n/hr.po
index a3d87478cfb..eff97d7720d 100644
--- a/addons/base_vat/i18n/hr.po
+++ b/addons/base_vat/i18n/hr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_vat
 #: code:addons/base_vat/base_vat.py:141
diff --git a/addons/base_vat/i18n/hu.po b/addons/base_vat/i18n/hu.po
index 414b4ad1a40..2562ba0995c 100644
--- a/addons/base_vat/i18n/hu.po
+++ b/addons/base_vat/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_vat
 #: code:addons/base_vat/base_vat.py:141
diff --git a/addons/base_vat/i18n/id.po b/addons/base_vat/i18n/id.po
index 9530d931747..673c0edbd0a 100644
--- a/addons/base_vat/i18n/id.po
+++ b/addons/base_vat/i18n/id.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_vat
 #: code:addons/base_vat/base_vat.py:141
@@ -23,31 +23,33 @@ msgid ""
 "This VAT number does not seem to be valid.\n"
 "Note: the expected format is %s"
 msgstr ""
+"Nomor PPN ini tidak valid.\n"
+"Catatang: format yang diharapkan adalah %s"
 
 #. module: base_vat
 #: sql_constraint:res.company:0
 msgid "The company name must be unique !"
-msgstr ""
+msgstr "Nama Perusahaan harus unik!"
 
 #. module: base_vat
 #: constraint:res.partner:0
 msgid "Error ! You cannot create recursive associated members."
-msgstr ""
+msgstr "Kesalahan! Anda tidak bisa membuat anggota berulang-ulang"
 
 #. module: base_vat
 #: field:res.company,vat_check_vies:0
 msgid "VIES VAT Check"
-msgstr ""
+msgstr "Cek VIES PPN"
 
 #. module: base_vat
 #: model:ir.model,name:base_vat.model_res_company
 msgid "Companies"
-msgstr ""
+msgstr "Perusahaan"
 
 #. module: base_vat
 #: constraint:res.company:0
 msgid "Error! You can not create recursive companies."
-msgstr ""
+msgstr "Gagal! Anda tidak dapat membuat perulangan nama perusahaan"
 
 #. module: base_vat
 #: help:res.partner,vat_subjected:0
@@ -55,11 +57,13 @@ msgid ""
 "Check this box if the partner is subjected to the VAT. It will be used for "
 "the VAT legal statement."
 msgstr ""
+"Centang kotak ini jika pasangan yang dikontrol terkena PPN. Ini akan "
+"digunakan untuk laporan PPN."
 
 #. module: base_vat
 #: model:ir.model,name:base_vat.model_res_partner
 msgid "Partner"
-msgstr ""
+msgstr "Rekanan"
 
 #. module: base_vat
 #: help:res.company,vat_check_vies:0
@@ -67,11 +71,13 @@ msgid ""
 "If checked, Partners VAT numbers will be fully validated against EU's VIES "
 "service rather than via a simple format validation (checksum)."
 msgstr ""
+"Jika dicentang, Nomor Mitra PPN akan sepenuhnya divalidasi terhadap layanan "
+"Vies Uni Eropa, bukan melalui validasi format sederhana (checksum)."
 
 #. module: base_vat
 #: field:res.partner,vat_subjected:0
 msgid "VAT Legal Statement"
-msgstr ""
+msgstr "Hukum PPN"
 
 #~ msgid "VAT"
 #~ msgstr "VAT"
diff --git a/addons/base_vat/i18n/it.po b/addons/base_vat/i18n/it.po
index c3080611eb3..d53223c2571 100644
--- a/addons/base_vat/i18n/it.po
+++ b/addons/base_vat/i18n/it.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_vat
 #: code:addons/base_vat/base_vat.py:141
diff --git a/addons/base_vat/i18n/ja.po b/addons/base_vat/i18n/ja.po
index 0f0e03be0d5..6039777080a 100644
--- a/addons/base_vat/i18n/ja.po
+++ b/addons/base_vat/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_vat
 #: code:addons/base_vat/base_vat.py:141
diff --git a/addons/base_vat/i18n/ko.po b/addons/base_vat/i18n/ko.po
index 60db4986659..f4ac9d084f2 100644
--- a/addons/base_vat/i18n/ko.po
+++ b/addons/base_vat/i18n/ko.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_vat
 #: code:addons/base_vat/base_vat.py:141
diff --git a/addons/base_vat/i18n/lt.po b/addons/base_vat/i18n/lt.po
index 885f93714c7..1b80a23e279 100644
--- a/addons/base_vat/i18n/lt.po
+++ b/addons/base_vat/i18n/lt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_vat
 #: code:addons/base_vat/base_vat.py:141
diff --git a/addons/base_vat/i18n/lv.po b/addons/base_vat/i18n/lv.po
index 964b20d156d..b192ae1255a 100644
--- a/addons/base_vat/i18n/lv.po
+++ b/addons/base_vat/i18n/lv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_vat
 #: code:addons/base_vat/base_vat.py:141
diff --git a/addons/base_vat/i18n/mn.po b/addons/base_vat/i18n/mn.po
index 1b88c695f7d..55f72f80bee 100644
--- a/addons/base_vat/i18n/mn.po
+++ b/addons/base_vat/i18n/mn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_vat
 #: code:addons/base_vat/base_vat.py:141
diff --git a/addons/base_vat/i18n/nb.po b/addons/base_vat/i18n/nb.po
index c1ecc88c1ec..931f0ea105f 100644
--- a/addons/base_vat/i18n/nb.po
+++ b/addons/base_vat/i18n/nb.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_vat
 #: code:addons/base_vat/base_vat.py:141
@@ -35,7 +35,7 @@ msgstr "Firmanavn må være unikt !"
 #. module: base_vat
 #: constraint:res.partner:0
 msgid "Error ! You cannot create recursive associated members."
-msgstr ""
+msgstr "Feil! Du kan ikke opprette rekursive tilknyttede medlemmer."
 
 #. module: base_vat
 #: field:res.company,vat_check_vies:0
diff --git a/addons/base_vat/i18n/nl.po b/addons/base_vat/i18n/nl.po
index bf40526b59c..7db3e9323ba 100644
--- a/addons/base_vat/i18n/nl.po
+++ b/addons/base_vat/i18n/nl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_vat
 #: code:addons/base_vat/base_vat.py:141
diff --git a/addons/base_vat/i18n/nl_BE.po b/addons/base_vat/i18n/nl_BE.po
index 04735b811f0..f468f96cd38 100644
--- a/addons/base_vat/i18n/nl_BE.po
+++ b/addons/base_vat/i18n/nl_BE.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_vat
 #: code:addons/base_vat/base_vat.py:141
diff --git a/addons/base_vat/i18n/oc.po b/addons/base_vat/i18n/oc.po
index 4ce418e8e49..e9c8018f142 100644
--- a/addons/base_vat/i18n/oc.po
+++ b/addons/base_vat/i18n/oc.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_vat
 #: code:addons/base_vat/base_vat.py:141
diff --git a/addons/base_vat/i18n/pl.po b/addons/base_vat/i18n/pl.po
index 96b0becfbac..711c7862226 100644
--- a/addons/base_vat/i18n/pl.po
+++ b/addons/base_vat/i18n/pl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_vat
 #: code:addons/base_vat/base_vat.py:141
diff --git a/addons/base_vat/i18n/pt.po b/addons/base_vat/i18n/pt.po
index c0ee7c047fb..985fc0d0e43 100644
--- a/addons/base_vat/i18n/pt.po
+++ b/addons/base_vat/i18n/pt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_vat
 #: code:addons/base_vat/base_vat.py:141
diff --git a/addons/base_vat/i18n/pt_BR.po b/addons/base_vat/i18n/pt_BR.po
index 509fd93f422..ea131d832a1 100644
--- a/addons/base_vat/i18n/pt_BR.po
+++ b/addons/base_vat/i18n/pt_BR.po
@@ -8,13 +8,14 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 00:36+0000\n"
 "PO-Revision-Date: 2012-07-28 18:37+0000\n"
-"Last-Translator: Fábio Martinelli <webmaster@guaru.net>\n"
+"Last-Translator: Fábio Martinelli - http://zupy.com.br "
+"<webmaster@guaru.net>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_vat
 #: code:addons/base_vat/base_vat.py:141
diff --git a/addons/base_vat/i18n/ro.po b/addons/base_vat/i18n/ro.po
index 279b786ff60..794abdb8512 100644
--- a/addons/base_vat/i18n/ro.po
+++ b/addons/base_vat/i18n/ro.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_vat
 #: code:addons/base_vat/base_vat.py:141
diff --git a/addons/base_vat/i18n/ru.po b/addons/base_vat/i18n/ru.po
index 979cd275dab..6fe9c4e2312 100644
--- a/addons/base_vat/i18n/ru.po
+++ b/addons/base_vat/i18n/ru.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_vat
 #: code:addons/base_vat/base_vat.py:141
diff --git a/addons/base_vat/i18n/sk.po b/addons/base_vat/i18n/sk.po
index 5c867bd436b..42086788e0a 100644
--- a/addons/base_vat/i18n/sk.po
+++ b/addons/base_vat/i18n/sk.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_vat
 #: code:addons/base_vat/base_vat.py:141
diff --git a/addons/base_vat/i18n/sl.po b/addons/base_vat/i18n/sl.po
index 8d03fc45a91..9c4e5be915d 100644
--- a/addons/base_vat/i18n/sl.po
+++ b/addons/base_vat/i18n/sl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_vat
 #: code:addons/base_vat/base_vat.py:141
diff --git a/addons/base_vat/i18n/sq.po b/addons/base_vat/i18n/sq.po
index e652f404824..df1f8c1f543 100644
--- a/addons/base_vat/i18n/sq.po
+++ b/addons/base_vat/i18n/sq.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_vat
 #: code:addons/base_vat/base_vat.py:141
diff --git a/addons/base_vat/i18n/sr.po b/addons/base_vat/i18n/sr.po
index f356491013b..f64ffd00273 100644
--- a/addons/base_vat/i18n/sr.po
+++ b/addons/base_vat/i18n/sr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_vat
 #: code:addons/base_vat/base_vat.py:141
diff --git a/addons/base_vat/i18n/sr@latin.po b/addons/base_vat/i18n/sr@latin.po
index 8c29e6bbdd4..db63924e230 100644
--- a/addons/base_vat/i18n/sr@latin.po
+++ b/addons/base_vat/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_vat
 #: code:addons/base_vat/base_vat.py:141
diff --git a/addons/base_vat/i18n/sv.po b/addons/base_vat/i18n/sv.po
index 708745b60e1..e8ca1f52080 100644
--- a/addons/base_vat/i18n/sv.po
+++ b/addons/base_vat/i18n/sv.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_vat
 #: code:addons/base_vat/base_vat.py:141
diff --git a/addons/base_vat/i18n/th.po b/addons/base_vat/i18n/th.po
index 349d729bf81..ecc96643f52 100644
--- a/addons/base_vat/i18n/th.po
+++ b/addons/base_vat/i18n/th.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_vat
 #: code:addons/base_vat/base_vat.py:141
diff --git a/addons/base_vat/i18n/tlh.po b/addons/base_vat/i18n/tlh.po
index b54f468be6a..717f49abe4c 100644
--- a/addons/base_vat/i18n/tlh.po
+++ b/addons/base_vat/i18n/tlh.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_vat
 #: code:addons/base_vat/base_vat.py:141
diff --git a/addons/base_vat/i18n/tr.po b/addons/base_vat/i18n/tr.po
index 5d4a6e8ff30..77745310ace 100644
--- a/addons/base_vat/i18n/tr.po
+++ b/addons/base_vat/i18n/tr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_vat
 #: code:addons/base_vat/base_vat.py:141
diff --git a/addons/base_vat/i18n/uk.po b/addons/base_vat/i18n/uk.po
index 52c7b0f5157..7388be2695c 100644
--- a/addons/base_vat/i18n/uk.po
+++ b/addons/base_vat/i18n/uk.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_vat
 #: code:addons/base_vat/base_vat.py:141
diff --git a/addons/base_vat/i18n/vi.po b/addons/base_vat/i18n/vi.po
index 322e5cba3b2..190041cee9f 100644
--- a/addons/base_vat/i18n/vi.po
+++ b/addons/base_vat/i18n/vi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_vat
 #: code:addons/base_vat/base_vat.py:141
diff --git a/addons/base_vat/i18n/zh_CN.po b/addons/base_vat/i18n/zh_CN.po
index d193213fc00..25ed18f1ee5 100644
--- a/addons/base_vat/i18n/zh_CN.po
+++ b/addons/base_vat/i18n/zh_CN.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_vat
 #: code:addons/base_vat/base_vat.py:141
diff --git a/addons/base_vat/i18n/zh_TW.po b/addons/base_vat/i18n/zh_TW.po
index 32fee420d42..2457557304f 100644
--- a/addons/base_vat/i18n/zh_TW.po
+++ b/addons/base_vat/i18n/zh_TW.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: base_vat
 #: code:addons/base_vat/base_vat.py:141
diff --git a/addons/board/__openerp__.py b/addons/board/__openerp__.py
index 62986c452be..2690012f3b4 100644
--- a/addons/board/__openerp__.py
+++ b/addons/board/__openerp__.py
@@ -28,27 +28,18 @@
 Lets the user create a custom dashboard.
 ========================================
 
-This module also creates the Administration Dashboard.
-
-The user can also publish notes.
+Allows users to create custom dashboard.
     """,
     'author': 'OpenERP SA',
     'depends': ['base'],
-    'update_xml': [
+    'data': [
         'security/ir.model.access.csv',
         'board_view.xml',
         'board_mydashboard_view.xml'
     ],
-    "js": [
-        'static/src/js/dashboard.js',
-    ],
-    "css": [
-        'static/src/css/dashboard.css',
-    ],
-    'qweb': [
-        "static/src/xml/*.xml",
-    ],
-
+    'js': ['static/src/js/dashboard.js'],
+    'css': ['static/src/css/dashboard.css'],
+    'qweb': ['static/src/xml/*.xml'],
     'installable': True,
     'auto_install': False,
     'certificate': '0076912305725',
diff --git a/addons/board/i18n/ar.po b/addons/board/i18n/ar.po
index b48c5d79065..4a910e3b367 100644
--- a/addons/board/i18n/ar.po
+++ b/addons/board/i18n/ar.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:18+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:23+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: board
 #: view:res.log.report:0
diff --git a/addons/board/i18n/bg.po b/addons/board/i18n/bg.po
index 9d37ca8154c..7457de5a7ac 100644
--- a/addons/board/i18n/bg.po
+++ b/addons/board/i18n/bg.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:18+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:23+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: board
 #: view:res.log.report:0
diff --git a/addons/board/i18n/br.po b/addons/board/i18n/br.po
index be86a2782f0..c75ee19f2f6 100644
--- a/addons/board/i18n/br.po
+++ b/addons/board/i18n/br.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:18+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:23+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: board
 #: view:res.log.report:0
diff --git a/addons/board/i18n/bs.po b/addons/board/i18n/bs.po
index ba84711e94f..c1ed0c999b3 100644
--- a/addons/board/i18n/bs.po
+++ b/addons/board/i18n/bs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:18+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:23+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: board
 #: view:res.log.report:0
diff --git a/addons/board/i18n/ca.po b/addons/board/i18n/ca.po
index d6c3690dcb8..787f695db1a 100644
--- a/addons/board/i18n/ca.po
+++ b/addons/board/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:18+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:23+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: board
 #: view:res.log.report:0
diff --git a/addons/board/i18n/cs.po b/addons/board/i18n/cs.po
index 0c101046f1d..6220e158afe 100644
--- a/addons/board/i18n/cs.po
+++ b/addons/board/i18n/cs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:18+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:23+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 "X-Poedit-Language: Czech\n"
 
 #. module: board
diff --git a/addons/board/i18n/da.po b/addons/board/i18n/da.po
index 3d12df74deb..4cee1c88ef0 100644
--- a/addons/board/i18n/da.po
+++ b/addons/board/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:18+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:23+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: board
 #: view:res.log.report:0
diff --git a/addons/board/i18n/de.po b/addons/board/i18n/de.po
index 0176d1174ac..f5027927c28 100644
--- a/addons/board/i18n/de.po
+++ b/addons/board/i18n/de.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:18+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:23+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: board
 #: view:res.log.report:0
diff --git a/addons/board/i18n/el.po b/addons/board/i18n/el.po
index d057596de15..b0399cb7a82 100644
--- a/addons/board/i18n/el.po
+++ b/addons/board/i18n/el.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:18+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:23+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
 "X-Poedit-SourceCharset: utf-8\n"
diff --git a/addons/board/i18n/es.po b/addons/board/i18n/es.po
index 6c2982e5796..70f627976de 100644
--- a/addons/board/i18n/es.po
+++ b/addons/board/i18n/es.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:18+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:24+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: board
 #: view:res.log.report:0
diff --git a/addons/board/i18n/es_AR.po b/addons/board/i18n/es_AR.po
index 1e49515318e..f853014307f 100644
--- a/addons/board/i18n/es_AR.po
+++ b/addons/board/i18n/es_AR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:18+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:24+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: board
 #: view:res.log.report:0
diff --git a/addons/board/i18n/es_CL.po b/addons/board/i18n/es_CL.po
index 5292e08e6f5..332cc4af05f 100644
--- a/addons/board/i18n/es_CL.po
+++ b/addons/board/i18n/es_CL.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:18+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:24+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: board
 #: view:res.log.report:0
diff --git a/addons/board/i18n/es_CR.po b/addons/board/i18n/es_CR.po
index 8a3b9e2e068..c4322db21b1 100644
--- a/addons/board/i18n/es_CR.po
+++ b/addons/board/i18n/es_CR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:18+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:24+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 "Language: \n"
 
 #. module: board
diff --git a/addons/board/i18n/es_EC.po b/addons/board/i18n/es_EC.po
index 2726e695083..8b590757577 100644
--- a/addons/board/i18n/es_EC.po
+++ b/addons/board/i18n/es_EC.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:18+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:24+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: board
 #: view:res.log.report:0
diff --git a/addons/board/i18n/es_PY.po b/addons/board/i18n/es_PY.po
index 075333f5499..25e2b9024c9 100644
--- a/addons/board/i18n/es_PY.po
+++ b/addons/board/i18n/es_PY.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:18+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:24+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: board
 #: view:res.log.report:0
diff --git a/addons/board/i18n/et.po b/addons/board/i18n/et.po
index d9d89dd1f92..7c91d49fecc 100644
--- a/addons/board/i18n/et.po
+++ b/addons/board/i18n/et.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:18+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:23+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: board
 #: view:res.log.report:0
diff --git a/addons/board/i18n/fa.po b/addons/board/i18n/fa.po
index 332aea8a6da..7c1c6c1c046 100644
--- a/addons/board/i18n/fa.po
+++ b/addons/board/i18n/fa.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:18+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:23+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: board
 #: view:res.log.report:0
diff --git a/addons/board/i18n/fi.po b/addons/board/i18n/fi.po
index 7ea86e913be..b0e42d4f6de 100644
--- a/addons/board/i18n/fi.po
+++ b/addons/board/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:18+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:23+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: board
 #: view:res.log.report:0
diff --git a/addons/board/i18n/fr.po b/addons/board/i18n/fr.po
index 81508a101e9..51f47e542d7 100644
--- a/addons/board/i18n/fr.po
+++ b/addons/board/i18n/fr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:18+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:23+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: board
 #: view:res.log.report:0
diff --git a/addons/board/i18n/gl.po b/addons/board/i18n/gl.po
index c32027813fe..289f08c1586 100644
--- a/addons/board/i18n/gl.po
+++ b/addons/board/i18n/gl.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:18+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:23+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: board
 #: view:res.log.report:0
diff --git a/addons/board/i18n/gu.po b/addons/board/i18n/gu.po
index 95568ba71ac..099f2cd783e 100644
--- a/addons/board/i18n/gu.po
+++ b/addons/board/i18n/gu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:18+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:23+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: board
 #: view:res.log.report:0
diff --git a/addons/board/i18n/hr.po b/addons/board/i18n/hr.po
index 4bd11d70c59..031af8f3639 100644
--- a/addons/board/i18n/hr.po
+++ b/addons/board/i18n/hr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:18+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:24+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: board
 #: view:res.log.report:0
diff --git a/addons/board/i18n/hu.po b/addons/board/i18n/hu.po
index acdb3f8266c..53cb38345ab 100644
--- a/addons/board/i18n/hu.po
+++ b/addons/board/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:18+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:23+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: board
 #: view:res.log.report:0
diff --git a/addons/board/i18n/id.po b/addons/board/i18n/id.po
index d89c45aef3b..1e83fc1de69 100644
--- a/addons/board/i18n/id.po
+++ b/addons/board/i18n/id.po
@@ -13,18 +13,18 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:18+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:23+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: board
 #: view:res.log.report:0
 msgid "  Year  "
-msgstr ""
+msgstr "  Tahun  "
 
 #. module: board
 #: model:ir.model,name:board.model_board_menu_create
 msgid "Menu Create"
-msgstr ""
+msgstr "Pembuatan Menu"
 
 #. module: board
 #: view:board.menu.create:0
@@ -34,33 +34,33 @@ msgstr "Informasi Menu"
 #. module: board
 #: view:res.users:0
 msgid "Latest Connections"
-msgstr ""
+msgstr "Koneksi Terbaru"
 
 #. module: board
 #: view:res.log.report:0
 msgid "Log created in last month"
-msgstr ""
+msgstr "Log telah dibuat pada bulan yang lalu"
 
 #. module: board
 #: view:board.board:0
 #: model:ir.actions.act_window,name:board.open_board_administration_form
 msgid "Administration Dashboard"
-msgstr ""
+msgstr "Papan Instrumen Administrasi"
 
 #. module: board
 #: view:res.log.report:0
 msgid "Group By..."
-msgstr ""
+msgstr "Dikelompokan berdasarkan ..."
 
 #. module: board
 #: view:res.log.report:0
 msgid "Log created in current year"
-msgstr ""
+msgstr "Log telah dibuat pada tahun yang sedang berjalan"
 
 #. module: board
 #: model:ir.model,name:board.model_board_board
 msgid "Board"
-msgstr ""
+msgstr "Papan"
 
 #. module: board
 #: field:board.menu.create,menu_name:0
@@ -71,7 +71,7 @@ msgstr "Nama Menu"
 #: model:ir.actions.act_window,name:board.board_weekly_res_log_report_action
 #: view:res.log.report:0
 msgid "Weekly Global Activity"
-msgstr ""
+msgstr "Aktivitas Global Mingguan"
 
 #. module: board
 #: field:board.board.line,name:0
@@ -81,154 +81,154 @@ msgstr "Judul"
 #. module: board
 #: field:res.log.report,nbr:0
 msgid "# of Entries"
-msgstr ""
+msgstr "# dari data tersedia"
 
 #. module: board
 #: view:res.log.report:0
 #: field:res.log.report,month:0
 msgid "Month"
-msgstr ""
+msgstr "Bulan"
 
 #. module: board
 #: view:res.log.report:0
 msgid "Log created in current month"
-msgstr ""
+msgstr "Log telah dibuat pada bulan yang sedang berjalan"
 
 #. module: board
 #: model:ir.actions.act_window,name:board.board_monthly_res_log_report_action
 #: view:res.log.report:0
 msgid "Monthly Activity per Document"
-msgstr ""
+msgstr "Aktivitas Bulanan per Dokumen"
 
 #. module: board
 #: view:board.board:0
 msgid "Configuration Overview"
-msgstr ""
+msgstr "Gambaran Umum Konfigurasi"
 
 #. module: board
 #: model:ir.actions.act_window,name:board.action_view_board_list_form
 #: model:ir.ui.menu,name:board.menu_view_board_form
 msgid "Dashboard Definition"
-msgstr ""
+msgstr "Definisi Dasbor"
 
 #. module: board
 #: selection:res.log.report,month:0
 msgid "March"
-msgstr ""
+msgstr "Maret"
 
 #. module: board
 #: selection:res.log.report,month:0
 msgid "August"
-msgstr ""
+msgstr "Agustus"
 
 #. module: board
 #: model:ir.actions.act_window,name:board.action_user_connection_tree
 msgid "User Connections"
-msgstr ""
+msgstr "Koneksi User"
 
 #. module: board
 #: field:res.log.report,creation_date:0
 msgid "Creation Date"
-msgstr ""
+msgstr "Tanggal Pembuatan"
 
 #. module: board
 #: view:res.log.report:0
 msgid "Log Analysis"
-msgstr ""
+msgstr "Analisis Log"
 
 #. module: board
 #: field:res.log.report,res_model:0
 msgid "Object"
-msgstr ""
+msgstr "Obyek"
 
 #. module: board
 #: selection:res.log.report,month:0
 msgid "June"
-msgstr ""
+msgstr "Juni"
 
 #. module: board
 #: field:board.board,line_ids:0
 msgid "Action Views"
-msgstr ""
+msgstr "Tampilan tindakan"
 
 #. module: board
 #: model:ir.model,name:board.model_res_log_report
 msgid "Log Report"
-msgstr ""
+msgstr "Laporan Log"
 
 #. module: board
 #: code:addons/board/wizard/board_menu_create.py:46
 #, python-format
 msgid "Please Insert Dashboard View(s) !"
-msgstr ""
+msgstr "Mohon masukkan tampilan dasbor!"
 
 #. module: board
 #: selection:res.log.report,month:0
 msgid "July"
-msgstr ""
+msgstr "Juli"
 
 #. module: board
 #: view:res.log.report:0
 #: field:res.log.report,day:0
 msgid "Day"
-msgstr ""
+msgstr "Hari"
 
 #. module: board
 #: view:board.menu.create:0
 msgid "Create Menu For Dashboard"
-msgstr ""
+msgstr "Buat Menu pada Dasbor/papan instrumen"
 
 #. module: board
 #: selection:res.log.report,month:0
 msgid "February"
-msgstr ""
+msgstr "Februari"
 
 #. module: board
 #: selection:res.log.report,month:0
 msgid "October"
-msgstr ""
+msgstr "Oktober"
 
 #. module: board
 #: model:ir.model,name:board.model_board_board_line
 msgid "Board Line"
-msgstr ""
+msgstr "Garis Badan"
 
 #. module: board
 #: field:board.menu.create,menu_parent_id:0
 msgid "Parent Menu"
-msgstr ""
+msgstr "Menu Induk"
 
 #. module: board
 #: view:res.log.report:0
 msgid "    Month-1    "
-msgstr ""
+msgstr "    Bulan - 1    "
 
 #. module: board
 #: selection:res.log.report,month:0
 msgid "January"
-msgstr ""
+msgstr "Januari"
 
 #. module: board
 #: view:board.board:0
 msgid "Users"
-msgstr ""
+msgstr "Pengguna"
 
 #. module: board
 #: selection:res.log.report,month:0
 msgid "November"
-msgstr ""
+msgstr "November"
 
 #. module: board
 #: help:board.board.line,sequence:0
 msgid ""
 "Gives the sequence order                         when displaying a list of "
 "board lines."
-msgstr ""
+msgstr "Tentukan runtutan pesanan saat menampilkan daftar garis badan."
 
 #. module: board
 #: selection:res.log.report,month:0
 msgid "April"
-msgstr ""
+msgstr "April"
 
 #. module: board
 #: view:board.board:0
@@ -236,18 +236,18 @@ msgstr ""
 #: field:board.board.line,board_id:0
 #: model:ir.ui.menu,name:board.menu_dasboard
 msgid "Dashboard"
-msgstr ""
+msgstr "Dasbor"
 
 #. module: board
 #: code:addons/board/wizard/board_menu_create.py:45
 #, python-format
 msgid "User Error!"
-msgstr ""
+msgstr "Kesalahan Pengguna!"
 
 #. module: board
 #: field:board.board.line,action_id:0
 msgid "Action"
-msgstr ""
+msgstr "Tindakan"
 
 #. module: board
 #: field:board.board.line,position:0
@@ -257,17 +257,17 @@ msgstr "Posisi"
 #. module: board
 #: view:res.log.report:0
 msgid "Model"
-msgstr ""
+msgstr "Contoh"
 
 #. module: board
 #: model:ir.actions.act_window,name:board.board_homepage_action
 msgid "Home Page"
-msgstr ""
+msgstr "Halaman Utama"
 
 #. module: board
 #: model:ir.actions.act_window,name:board.action_latest_activities_tree
 msgid "Latest Activities"
-msgstr ""
+msgstr "Aktivitas Terbaru"
 
 #. module: board
 #: selection:board.board.line,position:0
@@ -277,7 +277,7 @@ msgstr "Kiri"
 #. module: board
 #: field:board.board,view_id:0
 msgid "Board View"
-msgstr ""
+msgstr "Tampilan Umum"
 
 #. module: board
 #: selection:board.board.line,position:0
@@ -292,22 +292,22 @@ msgstr "Lebar"
 #. module: board
 #: view:res.log.report:0
 msgid "   Month   "
-msgstr ""
+msgstr "   Bulan   "
 
 #. module: board
 #: field:board.board.line,sequence:0
 msgid "Sequence"
-msgstr ""
+msgstr "Urutan"
 
 #. module: board
 #: selection:res.log.report,month:0
 msgid "September"
-msgstr ""
+msgstr "September"
 
 #. module: board
 #: selection:res.log.report,month:0
 msgid "December"
-msgstr ""
+msgstr "Desember"
 
 #. module: board
 #: view:board.board:0
@@ -323,18 +323,18 @@ msgstr "Tinggi"
 #. module: board
 #: model:ir.actions.act_window,name:board.action_board_menu_create
 msgid "Create Board Menu"
-msgstr ""
+msgstr "Buat Menu Utama"
 
 #. module: board
 #: selection:res.log.report,month:0
 msgid "May"
-msgstr ""
+msgstr "Mei"
 
 #. module: board
 #: view:res.log.report:0
 #: field:res.log.report,name:0
 msgid "Year"
-msgstr ""
+msgstr "Tahun"
 
 #. module: board
 #: view:board.menu.create:0
@@ -344,7 +344,7 @@ msgstr "Batal"
 #. module: board
 #: view:board.board:0
 msgid "Dashboard View"
-msgstr ""
+msgstr "Tampilan Dasbor"
 
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Nama model tidak sah di definsi aksi"
diff --git a/addons/board/i18n/it.po b/addons/board/i18n/it.po
index e1dd6a0fe50..b4d4bad7761 100644
--- a/addons/board/i18n/it.po
+++ b/addons/board/i18n/it.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:18+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:23+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: board
 #: view:res.log.report:0
diff --git a/addons/board/i18n/ja.po b/addons/board/i18n/ja.po
index 28d18240cfb..1e9d47198e7 100644
--- a/addons/board/i18n/ja.po
+++ b/addons/board/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:18+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:23+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: board
 #: view:res.log.report:0
diff --git a/addons/board/i18n/ko.po b/addons/board/i18n/ko.po
index fac5acb9ca6..307427c709f 100644
--- a/addons/board/i18n/ko.po
+++ b/addons/board/i18n/ko.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:18+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:23+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: board
 #: view:res.log.report:0
diff --git a/addons/board/i18n/ln.po b/addons/board/i18n/ln.po
index c38e5e26a64..f655875a807 100644
--- a/addons/board/i18n/ln.po
+++ b/addons/board/i18n/ln.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:18+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:23+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: board
 #: view:res.log.report:0
diff --git a/addons/board/i18n/lt.po b/addons/board/i18n/lt.po
index 7337810cd6b..e5103a76284 100644
--- a/addons/board/i18n/lt.po
+++ b/addons/board/i18n/lt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:18+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:23+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: board
 #: view:res.log.report:0
diff --git a/addons/board/i18n/lv.po b/addons/board/i18n/lv.po
index ade1590ae11..5db385a947a 100644
--- a/addons/board/i18n/lv.po
+++ b/addons/board/i18n/lv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:18+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:23+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: board
 #: view:res.log.report:0
diff --git a/addons/board/i18n/mn.po b/addons/board/i18n/mn.po
index 35641c11d18..1bf3f710e30 100644
--- a/addons/board/i18n/mn.po
+++ b/addons/board/i18n/mn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:18+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:23+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: board
 #: view:res.log.report:0
diff --git a/addons/board/i18n/nb.po b/addons/board/i18n/nb.po
new file mode 100644
index 00000000000..2d759af27d1
--- /dev/null
+++ b/addons/board/i18n/nb.po
@@ -0,0 +1,348 @@
+# Norwegian Bokmal 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-02-08 00:36+0000\n"
+"PO-Revision-Date: 2012-09-06 14:01+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Norwegian Bokmal <nb@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:58+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
+
+#. module: board
+#: view:res.log.report:0
+msgid "  Year  "
+msgstr "  År  "
+
+#. module: board
+#: model:ir.model,name:board.model_board_menu_create
+msgid "Menu Create"
+msgstr "Meny laget"
+
+#. module: board
+#: view:board.menu.create:0
+msgid "Menu Information"
+msgstr "Meny informasjon"
+
+#. module: board
+#: view:res.users:0
+msgid "Latest Connections"
+msgstr "Siste Tilkoblinger"
+
+#. module: board
+#: view:res.log.report:0
+msgid "Log created in last month"
+msgstr "Logg opprettet i forrige måned"
+
+#. module: board
+#: view:board.board:0
+#: model:ir.actions.act_window,name:board.open_board_administration_form
+msgid "Administration Dashboard"
+msgstr "Administrasjon kontrollpanel"
+
+#. module: board
+#: view:res.log.report:0
+msgid "Group By..."
+msgstr "Grupper etter ..."
+
+#. module: board
+#: view:res.log.report:0
+msgid "Log created in current year"
+msgstr "Logg opprettet i gjeldende år."
+
+#. module: board
+#: model:ir.model,name:board.model_board_board
+msgid "Board"
+msgstr "Brett"
+
+#. module: board
+#: field:board.menu.create,menu_name:0
+msgid "Menu Name"
+msgstr "Menynavn"
+
+#. module: board
+#: model:ir.actions.act_window,name:board.board_weekly_res_log_report_action
+#: view:res.log.report:0
+msgid "Weekly Global Activity"
+msgstr "Ukentlig global aktivitet"
+
+#. module: board
+#: field:board.board.line,name:0
+msgid "Title"
+msgstr "Tittel"
+
+#. module: board
+#: field:res.log.report,nbr:0
+msgid "# of Entries"
+msgstr "# av oppføringer"
+
+#. module: board
+#: view:res.log.report:0
+#: field:res.log.report,month:0
+msgid "Month"
+msgstr "Måned"
+
+#. module: board
+#: view:res.log.report:0
+msgid "Log created in current month"
+msgstr "Logg opprettet i gjeldende måned."
+
+#. module: board
+#: model:ir.actions.act_window,name:board.board_monthly_res_log_report_action
+#: view:res.log.report:0
+msgid "Monthly Activity per Document"
+msgstr "Månedlig aktivitet per dokument"
+
+#. module: board
+#: view:board.board:0
+msgid "Configuration Overview"
+msgstr "Konfigurasjonsoversikt"
+
+#. module: board
+#: model:ir.actions.act_window,name:board.action_view_board_list_form
+#: model:ir.ui.menu,name:board.menu_view_board_form
+msgid "Dashboard Definition"
+msgstr "Kontrollpanel Definisjon"
+
+#. module: board
+#: selection:res.log.report,month:0
+msgid "March"
+msgstr "Mars"
+
+#. module: board
+#: selection:res.log.report,month:0
+msgid "August"
+msgstr "August"
+
+#. module: board
+#: model:ir.actions.act_window,name:board.action_user_connection_tree
+msgid "User Connections"
+msgstr "Brukertilkoblinger"
+
+#. module: board
+#: field:res.log.report,creation_date:0
+msgid "Creation Date"
+msgstr "Opprettelsesdato"
+
+#. module: board
+#: view:res.log.report:0
+msgid "Log Analysis"
+msgstr "Logg analyse"
+
+#. module: board
+#: field:res.log.report,res_model:0
+msgid "Object"
+msgstr "Objekt"
+
+#. module: board
+#: selection:res.log.report,month:0
+msgid "June"
+msgstr "Juni"
+
+#. module: board
+#: field:board.board,line_ids:0
+msgid "Action Views"
+msgstr "Handling Visninger"
+
+#. module: board
+#: model:ir.model,name:board.model_res_log_report
+msgid "Log Report"
+msgstr "Logg rapport"
+
+#. module: board
+#: code:addons/board/wizard/board_menu_create.py:46
+#, python-format
+msgid "Please Insert Dashboard View(s) !"
+msgstr "Vennligst Sett Kontrollpanel Vinsning (er)!"
+
+#. module: board
+#: selection:res.log.report,month:0
+msgid "July"
+msgstr "juli"
+
+#. module: board
+#: view:res.log.report:0
+#: field:res.log.report,day:0
+msgid "Day"
+msgstr "Dag"
+
+#. module: board
+#: view:board.menu.create:0
+msgid "Create Menu For Dashboard"
+msgstr "Opprett meny for Kontrollpanel."
+
+#. module: board
+#: selection:res.log.report,month:0
+msgid "February"
+msgstr "Februar"
+
+#. module: board
+#: selection:res.log.report,month:0
+msgid "October"
+msgstr "Oktober"
+
+#. module: board
+#: model:ir.model,name:board.model_board_board_line
+msgid "Board Line"
+msgstr "bord Linje"
+
+#. module: board
+#: field:board.menu.create,menu_parent_id:0
+msgid "Parent Menu"
+msgstr "Overordnet meny"
+
+#. module: board
+#: view:res.log.report:0
+msgid "    Month-1    "
+msgstr "    Måned-1    "
+
+#. module: board
+#: selection:res.log.report,month:0
+msgid "January"
+msgstr "Januar"
+
+#. module: board
+#: view:board.board:0
+msgid "Users"
+msgstr "Brukere"
+
+#. module: board
+#: selection:res.log.report,month:0
+msgid "November"
+msgstr "November"
+
+#. module: board
+#: help:board.board.line,sequence:0
+msgid ""
+"Gives the sequence order                         when displaying a list of "
+"board lines."
+msgstr "Gir rekkefølgen av når du viser en liste over bord linjer."
+
+#. module: board
+#: selection:res.log.report,month:0
+msgid "April"
+msgstr "April"
+
+#. module: board
+#: view:board.board:0
+#: field:board.board,name:0
+#: field:board.board.line,board_id:0
+#: model:ir.ui.menu,name:board.menu_dasboard
+msgid "Dashboard"
+msgstr "Kontrollpanel"
+
+#. module: board
+#: code:addons/board/wizard/board_menu_create.py:45
+#, python-format
+msgid "User Error!"
+msgstr "Bruker feil!"
+
+#. module: board
+#: field:board.board.line,action_id:0
+msgid "Action"
+msgstr "Handling"
+
+#. module: board
+#: field:board.board.line,position:0
+msgid "Position"
+msgstr "Posisjon"
+
+#. module: board
+#: view:res.log.report:0
+msgid "Model"
+msgstr "Modell"
+
+#. module: board
+#: model:ir.actions.act_window,name:board.board_homepage_action
+msgid "Home Page"
+msgstr "Hjemmeside"
+
+#. module: board
+#: model:ir.actions.act_window,name:board.action_latest_activities_tree
+msgid "Latest Activities"
+msgstr "Senest aktiveter"
+
+#. module: board
+#: selection:board.board.line,position:0
+msgid "Left"
+msgstr "Venstre"
+
+#. module: board
+#: field:board.board,view_id:0
+msgid "Board View"
+msgstr "Bord visning"
+
+#. module: board
+#: selection:board.board.line,position:0
+msgid "Right"
+msgstr "Høyre"
+
+#. module: board
+#: field:board.board.line,width:0
+msgid "Width"
+msgstr "Bredde"
+
+#. module: board
+#: view:res.log.report:0
+msgid "   Month   "
+msgstr "   Måned   "
+
+#. module: board
+#: field:board.board.line,sequence:0
+msgid "Sequence"
+msgstr "Sekvens"
+
+#. module: board
+#: selection:res.log.report,month:0
+msgid "September"
+msgstr "September"
+
+#. module: board
+#: selection:res.log.report,month:0
+msgid "December"
+msgstr "Desember"
+
+#. module: board
+#: view:board.board:0
+#: view:board.menu.create:0
+msgid "Create Menu"
+msgstr "Opprett meny"
+
+#. module: board
+#: field:board.board.line,height:0
+msgid "Height"
+msgstr "Høyde"
+
+#. module: board
+#: model:ir.actions.act_window,name:board.action_board_menu_create
+msgid "Create Board Menu"
+msgstr "Opprett bord meny"
+
+#. module: board
+#: selection:res.log.report,month:0
+msgid "May"
+msgstr "Mai"
+
+#. module: board
+#: view:res.log.report:0
+#: field:res.log.report,name:0
+msgid "Year"
+msgstr "År"
+
+#. module: board
+#: view:board.menu.create:0
+msgid "Cancel"
+msgstr "Kanseller"
+
+#. module: board
+#: view:board.board:0
+msgid "Dashboard View"
+msgstr "Kontrollpanel visning"
diff --git a/addons/board/i18n/nl.po b/addons/board/i18n/nl.po
index 6334d6e996c..7f7a5679340 100644
--- a/addons/board/i18n/nl.po
+++ b/addons/board/i18n/nl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:18+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:23+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: board
 #: view:res.log.report:0
diff --git a/addons/board/i18n/nl_BE.po b/addons/board/i18n/nl_BE.po
index ff0566f48a3..45eb8d92ec7 100644
--- a/addons/board/i18n/nl_BE.po
+++ b/addons/board/i18n/nl_BE.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:18+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:24+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: board
 #: view:res.log.report:0
diff --git a/addons/board/i18n/pl.po b/addons/board/i18n/pl.po
index 2edb6c6409e..ef05325abef 100644
--- a/addons/board/i18n/pl.po
+++ b/addons/board/i18n/pl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:18+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:23+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: board
 #: view:res.log.report:0
diff --git a/addons/board/i18n/pt.po b/addons/board/i18n/pt.po
index 42be479b795..0b0c5392d55 100644
--- a/addons/board/i18n/pt.po
+++ b/addons/board/i18n/pt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:18+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:23+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: board
 #: view:res.log.report:0
diff --git a/addons/board/i18n/pt_BR.po b/addons/board/i18n/pt_BR.po
index aaa87347bf6..bd8f4a9cff3 100644
--- a/addons/board/i18n/pt_BR.po
+++ b/addons/board/i18n/pt_BR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:18+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:24+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: board
 #: view:res.log.report:0
diff --git a/addons/board/i18n/ro.po b/addons/board/i18n/ro.po
index 0f2879f030d..f048c3dc8e1 100644
--- a/addons/board/i18n/ro.po
+++ b/addons/board/i18n/ro.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:18+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:23+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: board
 #: view:res.log.report:0
diff --git a/addons/board/i18n/ru.po b/addons/board/i18n/ru.po
index 7d80b775753..1fce621b87c 100644
--- a/addons/board/i18n/ru.po
+++ b/addons/board/i18n/ru.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:18+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:24+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: board
 #: view:res.log.report:0
diff --git a/addons/board/i18n/sk.po b/addons/board/i18n/sk.po
index 8a7d736eb3f..f5d6ad6dab2 100644
--- a/addons/board/i18n/sk.po
+++ b/addons/board/i18n/sk.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:18+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:24+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: board
 #: view:res.log.report:0
diff --git a/addons/board/i18n/sl.po b/addons/board/i18n/sl.po
index ddda1699442..a6e1caf15ea 100644
--- a/addons/board/i18n/sl.po
+++ b/addons/board/i18n/sl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:18+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:24+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: board
 #: view:res.log.report:0
diff --git a/addons/board/i18n/sq.po b/addons/board/i18n/sq.po
index fa7c0dc76a4..3aec96a68f8 100644
--- a/addons/board/i18n/sq.po
+++ b/addons/board/i18n/sq.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:18+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:23+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: board
 #: view:res.log.report:0
diff --git a/addons/board/i18n/sr.po b/addons/board/i18n/sr.po
index a8d449ac502..5e9e7d84c59 100644
--- a/addons/board/i18n/sr.po
+++ b/addons/board/i18n/sr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:18+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:24+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: board
 #: view:res.log.report:0
diff --git a/addons/board/i18n/sr@latin.po b/addons/board/i18n/sr@latin.po
index 610bd69dc45..8557e0125fe 100644
--- a/addons/board/i18n/sr@latin.po
+++ b/addons/board/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:18+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:24+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: board
 #: view:res.log.report:0
diff --git a/addons/board/i18n/sv.po b/addons/board/i18n/sv.po
index c352cde3648..36869817d1d 100644
--- a/addons/board/i18n/sv.po
+++ b/addons/board/i18n/sv.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:18+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:24+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: board
 #: view:res.log.report:0
diff --git a/addons/board/i18n/th.po b/addons/board/i18n/th.po
index cdcc4e6174b..7f637d023c6 100644
--- a/addons/board/i18n/th.po
+++ b/addons/board/i18n/th.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:18+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:24+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: board
 #: view:res.log.report:0
diff --git a/addons/board/i18n/tlh.po b/addons/board/i18n/tlh.po
index 7bf84fbf9ef..1a378b20050 100644
--- a/addons/board/i18n/tlh.po
+++ b/addons/board/i18n/tlh.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:18+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:24+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: board
 #: view:res.log.report:0
diff --git a/addons/board/i18n/tr.po b/addons/board/i18n/tr.po
index 7a59e38e742..835951d7cc5 100644
--- a/addons/board/i18n/tr.po
+++ b/addons/board/i18n/tr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:18+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:24+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: board
 #: view:res.log.report:0
diff --git a/addons/board/i18n/uk.po b/addons/board/i18n/uk.po
index 68940919d20..5abc2f2da3a 100644
--- a/addons/board/i18n/uk.po
+++ b/addons/board/i18n/uk.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:18+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:24+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: board
 #: view:res.log.report:0
diff --git a/addons/board/i18n/vi.po b/addons/board/i18n/vi.po
index dc9cd71303f..299a4804e01 100644
--- a/addons/board/i18n/vi.po
+++ b/addons/board/i18n/vi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:18+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:24+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: board
 #: view:res.log.report:0
diff --git a/addons/board/i18n/zh_CN.po b/addons/board/i18n/zh_CN.po
index ab29a7bac9a..992902d07ab 100644
--- a/addons/board/i18n/zh_CN.po
+++ b/addons/board/i18n/zh_CN.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:18+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:24+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: board
 #: view:res.log.report:0
diff --git a/addons/board/i18n/zh_TW.po b/addons/board/i18n/zh_TW.po
index 9d2080c3759..b19cbf7c9fa 100644
--- a/addons/board/i18n/zh_TW.po
+++ b/addons/board/i18n/zh_TW.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:18+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:24+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: board
 #: view:res.log.report:0
diff --git a/addons/board/static/src/css/Makefile b/addons/board/static/src/css/Makefile
new file mode 100644
index 00000000000..0cb5ae70f4a
--- /dev/null
+++ b/addons/board/static/src/css/Makefile
@@ -0,0 +1,3 @@
+dashboard.css: dashboard.sass
+	sass --trace -t expanded dashboard.sass dashboard.css
+
diff --git a/addons/board/static/src/css/dashboard.css b/addons/board/static/src/css/dashboard.css
index f3d300add2e..38e224daf42 100644
--- a/addons/board/static/src/css/dashboard.css
+++ b/addons/board/static/src/css/dashboard.css
@@ -5,6 +5,11 @@
 .openerp .oe_dashboard {
   width: 100%;
 }
+.openerp .oe_dashboard .oe_dashboard_layout_selector ul, .openerp .oe_dashboard .oe_dashboard_layout_selector li {
+  margin: 0;
+  padding: 0;
+  list-style-type: none;
+}
 .openerp .oe_dashboard .oe_action {
   margin: 0 8px 8px 0;
   background-color: white;
@@ -50,6 +55,13 @@
   content: "+";
   margin-left: 4px;
 }
+.openerp .oe_dashboard .oe_action .oe_header .oe_header_text {
+  visibility: hidden;
+  cursor: text;
+}
+.openerp .oe_dashboard .oe_action .oe_header span {
+  cursor: pointer;
+}
 .openerp .oe_dashboard .oe_action .oe_header_empty {
   padding-top: 0;
   padding-bottom: 2px;
diff --git a/addons/board/static/src/css/dashboard.sass b/addons/board/static/src/css/dashboard.sass
index dd4d144e918..1bfc01a3809 100644
--- a/addons/board/static/src/css/dashboard.sass
+++ b/addons/board/static/src/css/dashboard.sass
@@ -14,6 +14,11 @@
     margin: 0 4px 6px 0
   .oe_dashboard
     width: 100%
+    .oe_dashboard_layout_selector
+      ul, li
+        margin: 0
+        padding: 0
+        list-style-type: none
     .oe_action
       margin: 0 8px 8px 0
       background-color: white
@@ -49,6 +54,11 @@
         .oe_maximize:after
           content: "+"
           margin-left: 4px
+        .oe_header_text
+          visibility: hidden
+          cursor: text
+        span
+          cursor: pointer
       .oe_header_empty
         padding-top: 0
         padding-bottom: 2px
diff --git a/addons/board/static/src/js/dashboard.js b/addons/board/static/src/js/dashboard.js
index b9df81bf868..0333690aa57 100644
--- a/addons/board/static/src/js/dashboard.js
+++ b/addons/board/static/src/js/dashboard.js
@@ -18,18 +18,21 @@ instance.web.form.DashBoard = instance.web.form.FormWidget.extend({
         var self = this;
         this._super.apply(this, arguments);
 
-        this.$element.find('.oe_dashboard_column').sortable({
+        this.$el.find('.oe_dashboard_column').sortable({
             connectWith: '.oe_dashboard_column',
             handle: '.oe_header',
             scroll: false
-        }).disableSelection().bind('sortstop', self.do_save_dashboard);
+        }).bind('sortstop', self.do_save_dashboard);
 
         // Events
-        this.$element.find('.oe_dashboard_link_reset').click(this.on_reset);
-        this.$element.find('.oe_dashboard_link_change_layout').click(this.on_change_layout);
-
-        this.$element.delegate('.oe_dashboard_column .oe_fold', 'click', this.on_fold_action);
-        this.$element.delegate('.oe_dashboard_column .oe_close', 'click', this.on_close_action);
+        this.$el.find('.oe_dashboard_link_reset').click(this.on_reset);
+        this.$el.find('.oe_dashboard_link_change_layout').click(this.on_change_layout);
+        this.$el.find('h2.oe_header span.oe_header_txt').click(function(ev){
+            if(ev.target === ev.currentTarget)
+                self.on_header_string($(ev.target).parent());
+        });
+        this.$el.delegate('.oe_dashboard_column .oe_fold', 'click', this.on_fold_action);
+        this.$el.delegate('.oe_dashboard_column .oe_close', 'click', this.on_close_action);
 
         // Init actions
         _.each(this.node.children, function(column, column_index) {
@@ -46,6 +49,30 @@ instance.web.form.DashBoard = instance.web.form.FormWidget.extend({
             });
         });
     },
+    on_header_string:function(h2){
+        var self = this;
+        var span = h2.find('span:first').hide();
+        var input = h2.find('.oe_header_text').css('visibility','visible');
+        var attr = h2.closest(".oe_action").data('action_attrs');
+        var change_string = function(new_name){
+                attr['string'] = new_name;
+                span.text(new_name).show();
+                input.css('visibility','hidden');
+                self.do_save_dashboard();
+        }
+        input.unbind()
+        .val(span.text())
+        .change(function(event){
+            change_string($(this).val());
+        })
+        .keyup(function(event){
+            if(event.keyCode == 27){
+                //esc key to cancel changes
+                input.css('visibility','hidden');
+                span.show();
+            }
+        });
+    },
     on_reset: function() {
         this.rpc('/web/view/undo_custom', {
             view_id: this.view.fields_view.view_id,
@@ -55,7 +82,7 @@ instance.web.form.DashBoard = instance.web.form.FormWidget.extend({
     on_change_layout: function() {
         var self = this;
         var qdict = {
-            current_layout : this.$element.find('.oe_dashboard').attr('data-layout')
+            current_layout : this.$el.find('.oe_dashboard').attr('data-layout')
         };
         var $dialog = instance.web.dialog($('<div>'), {
                             modal: true,
@@ -70,7 +97,7 @@ instance.web.form.DashBoard = instance.web.form.FormWidget.extend({
         });
     },
     do_change_layout: function(new_layout) {
-        var $dashboard = this.$element.find('.oe_dashboard');
+        var $dashboard = this.$el.find('.oe_dashboard');
         var current_layout = $dashboard.attr('data-layout');
         if (current_layout != new_layout) {
             var clayout = current_layout.split('-').length,
@@ -114,10 +141,10 @@ instance.web.form.DashBoard = instance.web.form.FormWidget.extend({
         var self = this;
         var board = {
                 form_title : this.view.fields_view.arch.attrs.string,
-                style : this.$element.find('.oe_dashboard').attr('data-layout'),
+                style : this.$el.find('.oe_dashboard').attr('data-layout'),
                 columns : []
             };
-        this.$element.find('.oe_dashboard_column').each(function() {
+        this.$el.find('.oe_dashboard_column').each(function() {
             var actions = [];
             $(this).find('.oe_action').each(function() {
                 var action_id = $(this).attr('data-id'),
@@ -139,7 +166,7 @@ instance.web.form.DashBoard = instance.web.form.FormWidget.extend({
             view_id: this.view.fields_view.view_id,
             arch: arch
         }, function() {
-            self.$element.find('.oe_dashboard_link_reset').show();
+            self.$el.find('.oe_dashboard_link_reset').show();
         });
     },
     on_load_action: function(result, index, action_attrs) {
@@ -245,11 +272,11 @@ instance.web.form.DashBoard = instance.web.form.FormWidget.extend({
             });
         }
         var rendered = QWeb.render(this.form_template, this);
-        this.$element.html(rendered);
+        this.$el.html(rendered);
     },
     no_result: function() {
         if (this.view.options.action.help) {
-            this.$element.append(
+            this.$el.append(
                 $('<div class="oe_view_nocontent">')
                     .append($('<div>').html(this.view.options.action.help || " "))
             );
@@ -296,7 +323,7 @@ instance.board.AddToDashboard = instance.web.search.Input.extend({
     _in_drawer: true,
     start: function () {
         var self = this;
-        this.$element
+        this.$el
             .on('click', 'h4', this.proxy('show_option'))
             .on('submit', 'form', function (e) {
                 e.preventDefault();
@@ -333,7 +360,7 @@ instance.board.AddToDashboard = instance.web.search.Input.extend({
         var self = this;
         var getParent = this.getParent();
         var view_parent = this.getParent().getParent();
-        if (! view_parent.action || ! this.$element.find("select").val()) {
+        if (! view_parent.action || ! this.$el.find("select").val()) {
             this.do_warn("Can't find dashboard action");
             return;
         }
@@ -343,24 +370,24 @@ instance.board.AddToDashboard = instance.web.search.Input.extend({
         _.each(data.contexts, context.add, context);
         _.each(data.domains, domain.add, domain);
         this.rpc('/board/add_to_dashboard', {
-            menu_id: this.$element.find("select").val(),
+            menu_id: this.$el.find("select").val(),
             action_id: view_parent.action.id,
             context_to_save: context,
             domain: domain,
             view_mode: view_parent.active_view,
-            name: this.$element.find("input").val()
+            name: this.$el.find("input").val()
         }, function(r) {
             if (r === false) {
                 self.do_warn("Could not add filter to dashboard");
             } else {
-                self.$element.toggleClass('oe_opened');
+                self.$el.toggleClass('oe_opened');
                 self.do_notify("Filter added to dashboard", '');
             }
         });
     },
     show_option:function(){
-        this.$element.toggleClass('oe_opened');
-        if (! this.$element.hasClass('oe_opened'))
+        this.$el.toggleClass('oe_opened');
+        if (! this.$el.hasClass('oe_opened'))
             return;
         this.$("input").val(this.getParent().fields_view.name || "" );
     }
diff --git a/addons/board/static/src/xml/board.xml b/addons/board/static/src/xml/board.xml
index 13d81d11f8d..b2363cafd53 100644
--- a/addons/board/static/src/xml/board.xml
+++ b/addons/board/static/src/xml/board.xml
@@ -23,13 +23,15 @@
 <t t-name="DashBoard.action">
     <div t-att-data-id="action.attrs.name" class="oe_action">
         <h2 t-attf-class="oe_header #{action.attrs.string ? '' : 'oe_header_empty'}">
-            <t t-esc="action.attrs.string"/>
+            <span class="oe_header_txt"> <t t-esc="action.attrs.string"/> </span>
+            <input class = "oe_header_text" type="text"/>
             <t t-if="!action.attrs.string">&amp;nbsp;</t>
             <button t-if="action.attrs.creatable and action.attrs.creatable !== 'false'" class="oe_button oe_button_create">Create</button>
             <span class='oe_icon oe_close'></span>
             <span class='oe_icon oe_minimize oe_fold' t-if="!action.attrs.fold"></span>
             <span class='oe_icon oe_maximize oe_fold' t-if="action.attrs.fold"></span>
         </h2>
+        
         <div t-attf-id="#{view.element_id}_action_#{column_index}_#{action_index}" class="oe_content" t-att-style="action.attrs.fold ? 'display: none' : null"></div>
     </div>
 </t>
diff --git a/addons/caldav/__openerp__.py b/addons/caldav/__openerp__.py
index 2946fe77b1f..4d35b00bdb4 100644
--- a/addons/caldav/__openerp__.py
+++ b/addons/caldav/__openerp__.py
@@ -21,13 +21,13 @@
 
 
 {
-    "name": "Share Calendar Using CalDAV",
-    "version": "1.1",
-    "depends": [
-                    "base",
-                    "document_webdav",
-                ],
-     'description': """
+    'name': 'Share Calendar Using CalDAV',
+    'version': '1.1',
+    'depends': [
+        'base',
+        'document_webdav',
+    ],
+    'description': """
 This module contains basic functionality for Caldav system.
 ===========================================================
 
@@ -37,34 +37,39 @@ This module contains basic functionality for Caldav system.
   - Provides iCal Import/Export functionality
 
 To access Calendars using CalDAV clients, point them to:
+--------------------------------------------------------
     http://HOSTNAME:PORT/webdav/DATABASE_NAME/calendars/users/USERNAME/c
 
 To access OpenERP Calendar using WebCal to remote site use the URL like:
+------------------------------------------------------------------------
     http://HOSTNAME:PORT/webdav/DATABASE_NAME/Calendars/CALENDAR_NAME.ics
 
     Where,
-        HOSTNAME: Host on which OpenERP server(With webdav) is running
-        PORT : Port on which OpenERP server is running (By Default : 8069)
-        DATABASE_NAME: Name of database on which OpenERP Calendar is created
-        CALENDAR_NAME: Name of calendar to access
+        **HOSTNAME:** Host on which OpenERP server(With webdav) is running
+        
+        **PORT :** Port on which OpenERP server is running (By Default : 8069)
+        
+        **DATABASE_NAME:** Name of database on which OpenERP Calendar is created
+        
+        **CALENDAR_NAME:** Name of calendar to access
 """, 
     'category': 'Hidden/Dependency', 
-    "author": "OpenERP SA",
+    'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
-    "init_xml": ["caldav_data.xml"],
-    "demo_xml": [],
-    "update_xml": [
-                    'security/ir.model.access.csv',
-                    'wizard/calendar_event_export_view.xml',
-                    'wizard/calendar_event_import_view.xml',
-                    'wizard/calendar_event_subscribe_view.xml',
-                    'wizard/caldav_browse_view.xml',
-                    'caldav_view.xml',
-                    'caldav_setup.xml'
-                    ],
-    "installable": True,
-    "auto_install": False,
-    "certificate": "00924841426645403741",
+    'demo': [],
+    'data': [
+        'security/ir.model.access.csv',
+        'wizard/calendar_event_export_view.xml',
+        'wizard/calendar_event_import_view.xml',
+        'wizard/calendar_event_subscribe_view.xml',
+        'wizard/caldav_browse_view.xml',
+        'caldav_view.xml',
+        'caldav_setup.xml',
+        'caldav_data.xml'
+    ],
+    'installable': True,
+    'auto_install': False,
+    'certificate': '00924841426645403741',
     'images': ['images/calendar_collections.jpeg','images/calendars.jpeg','images/export_ics_file.jpeg'],
 }
 
diff --git a/addons/caldav/i18n/ar.po b/addons/caldav/i18n/ar.po
index 12629b55991..02209b36efd 100644
--- a/addons/caldav/i18n/ar.po
+++ b/addons/caldav/i18n/ar.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:58+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: caldav
 #: view:basic.calendar:0
diff --git a/addons/caldav/i18n/bg.po b/addons/caldav/i18n/bg.po
index 1832b538424..f943269fa7d 100644
--- a/addons/caldav/i18n/bg.po
+++ b/addons/caldav/i18n/bg.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:58+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: caldav
 #: view:basic.calendar:0
diff --git a/addons/caldav/i18n/ca.po b/addons/caldav/i18n/ca.po
index a808e55a7ae..537ec8cb89a 100644
--- a/addons/caldav/i18n/ca.po
+++ b/addons/caldav/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:58+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: caldav
 #: view:basic.calendar:0
diff --git a/addons/caldav/i18n/da.po b/addons/caldav/i18n/da.po
index aa94070caf1..219b5bf0bf0 100644
--- a/addons/caldav/i18n/da.po
+++ b/addons/caldav/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:58+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: caldav
 #: view:basic.calendar:0
diff --git a/addons/caldav/i18n/de.po b/addons/caldav/i18n/de.po
index 11197e6096c..beb1d9c4ff2 100644
--- a/addons/caldav/i18n/de.po
+++ b/addons/caldav/i18n/de.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:58+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: caldav
 #: view:basic.calendar:0
diff --git a/addons/caldav/i18n/el.po b/addons/caldav/i18n/el.po
index 002114c9c04..e7f838af479 100644
--- a/addons/caldav/i18n/el.po
+++ b/addons/caldav/i18n/el.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: caldav
 #: view:basic.calendar:0
diff --git a/addons/caldav/i18n/es.po b/addons/caldav/i18n/es.po
index d5c1a72818d..55eaa1269c9 100644
--- a/addons/caldav/i18n/es.po
+++ b/addons/caldav/i18n/es.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: caldav
 #: view:basic.calendar:0
diff --git a/addons/caldav/i18n/es_CR.po b/addons/caldav/i18n/es_CR.po
index 0d4b50add6b..2dc081d85e5 100644
--- a/addons/caldav/i18n/es_CR.po
+++ b/addons/caldav/i18n/es_CR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 "Language: es\n"
 
 #. module: caldav
diff --git a/addons/caldav/i18n/es_EC.po b/addons/caldav/i18n/es_EC.po
index 6d5c18f2350..0a7666a7a80 100644
--- a/addons/caldav/i18n/es_EC.po
+++ b/addons/caldav/i18n/es_EC.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: caldav
 #: view:basic.calendar:0
diff --git a/addons/caldav/i18n/es_PY.po b/addons/caldav/i18n/es_PY.po
index 4ebae00d20f..428cc07754d 100644
--- a/addons/caldav/i18n/es_PY.po
+++ b/addons/caldav/i18n/es_PY.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: caldav
 #: view:basic.calendar:0
diff --git a/addons/caldav/i18n/fa.po b/addons/caldav/i18n/fa.po
index d124a9a1402..6e46cd83e46 100644
--- a/addons/caldav/i18n/fa.po
+++ b/addons/caldav/i18n/fa.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: caldav
 #: view:basic.calendar:0
diff --git a/addons/caldav/i18n/fi.po b/addons/caldav/i18n/fi.po
index 90bfc5e60ee..9102ddb5024 100644
--- a/addons/caldav/i18n/fi.po
+++ b/addons/caldav/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:58+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: caldav
 #: view:basic.calendar:0
diff --git a/addons/caldav/i18n/fr.po b/addons/caldav/i18n/fr.po
index 17d54e2679d..6fea1b94023 100644
--- a/addons/caldav/i18n/fr.po
+++ b/addons/caldav/i18n/fr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:58+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: caldav
 #: view:basic.calendar:0
diff --git a/addons/caldav/i18n/gl.po b/addons/caldav/i18n/gl.po
index 352d8d55a97..a074c9a6b01 100644
--- a/addons/caldav/i18n/gl.po
+++ b/addons/caldav/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: caldav
 #: view:basic.calendar:0
diff --git a/addons/caldav/i18n/hr.po b/addons/caldav/i18n/hr.po
index 08a30c94ccf..5859cf537f4 100644
--- a/addons/caldav/i18n/hr.po
+++ b/addons/caldav/i18n/hr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: caldav
 #: view:basic.calendar:0
diff --git a/addons/caldav/i18n/hu.po b/addons/caldav/i18n/hu.po
index 0904c951922..b5abebc768a 100644
--- a/addons/caldav/i18n/hu.po
+++ b/addons/caldav/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: caldav
 #: view:basic.calendar:0
diff --git a/addons/caldav/i18n/it.po b/addons/caldav/i18n/it.po
index d1a4e5d9c16..41e555069f4 100644
--- a/addons/caldav/i18n/it.po
+++ b/addons/caldav/i18n/it.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: caldav
 #: view:basic.calendar:0
diff --git a/addons/caldav/i18n/ja.po b/addons/caldav/i18n/ja.po
index e2282c72122..7145dc7cc74 100644
--- a/addons/caldav/i18n/ja.po
+++ b/addons/caldav/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: caldav
 #: view:basic.calendar:0
diff --git a/addons/caldav/i18n/lv.po b/addons/caldav/i18n/lv.po
index 968ddefdbd8..ca3d67af134 100644
--- a/addons/caldav/i18n/lv.po
+++ b/addons/caldav/i18n/lv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: caldav
 #: view:basic.calendar:0
diff --git a/addons/caldav/i18n/mn.po b/addons/caldav/i18n/mn.po
index c54fff471b3..7c40d7904c2 100644
--- a/addons/caldav/i18n/mn.po
+++ b/addons/caldav/i18n/mn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-11 05:46+0000\n"
-"X-Generator: Launchpad (build 15780)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: caldav
 #: view:basic.calendar:0
diff --git a/addons/caldav/i18n/nl.po b/addons/caldav/i18n/nl.po
index a0bc6b68738..c1bb22c9dbb 100644
--- a/addons/caldav/i18n/nl.po
+++ b/addons/caldav/i18n/nl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:58+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: caldav
 #: view:basic.calendar:0
diff --git a/addons/caldav/i18n/pl.po b/addons/caldav/i18n/pl.po
index 6c44c905de3..184ba47a5bc 100644
--- a/addons/caldav/i18n/pl.po
+++ b/addons/caldav/i18n/pl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: caldav
 #: view:basic.calendar:0
diff --git a/addons/caldav/i18n/pt.po b/addons/caldav/i18n/pt.po
index b9d8dd58005..42608b71b09 100644
--- a/addons/caldav/i18n/pt.po
+++ b/addons/caldav/i18n/pt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: caldav
 #: view:basic.calendar:0
diff --git a/addons/caldav/i18n/pt_BR.po b/addons/caldav/i18n/pt_BR.po
index bdecb867de0..6ae8e074b3a 100644
--- a/addons/caldav/i18n/pt_BR.po
+++ b/addons/caldav/i18n/pt_BR.po
@@ -9,13 +9,14 @@ msgstr ""
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:36+0000\n"
 "PO-Revision-Date: 2012-07-28 18:39+0000\n"
-"Last-Translator: Fábio Martinelli <webmaster@guaru.net>\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: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: caldav
 #: view:basic.calendar:0
diff --git a/addons/caldav/i18n/ro.po b/addons/caldav/i18n/ro.po
index 4d23eb013cb..76e061e9247 100644
--- a/addons/caldav/i18n/ro.po
+++ b/addons/caldav/i18n/ro.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: caldav
 #: view:basic.calendar:0
diff --git a/addons/caldav/i18n/ru.po b/addons/caldav/i18n/ru.po
index 41a0abf7166..46fdbbd3f9e 100644
--- a/addons/caldav/i18n/ru.po
+++ b/addons/caldav/i18n/ru.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: caldav
 #: view:basic.calendar:0
diff --git a/addons/caldav/i18n/sq.po b/addons/caldav/i18n/sq.po
index c21a765abbb..470c2d5ed4d 100644
--- a/addons/caldav/i18n/sq.po
+++ b/addons/caldav/i18n/sq.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:58+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: caldav
 #: view:basic.calendar:0
diff --git a/addons/caldav/i18n/sr.po b/addons/caldav/i18n/sr.po
index a509c9bc3ee..26a3d7a0ede 100644
--- a/addons/caldav/i18n/sr.po
+++ b/addons/caldav/i18n/sr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: caldav
 #: view:basic.calendar:0
diff --git a/addons/caldav/i18n/sr@latin.po b/addons/caldav/i18n/sr@latin.po
index 0f94225fc16..5d10741b562 100644
--- a/addons/caldav/i18n/sr@latin.po
+++ b/addons/caldav/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: caldav
 #: view:basic.calendar:0
diff --git a/addons/caldav/i18n/sv.po b/addons/caldav/i18n/sv.po
index 48327be8519..a95aa027f54 100644
--- a/addons/caldav/i18n/sv.po
+++ b/addons/caldav/i18n/sv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: caldav
 #: view:basic.calendar:0
diff --git a/addons/caldav/i18n/tr.po b/addons/caldav/i18n/tr.po
index 3d1e8ec948b..105ee44deec 100644
--- a/addons/caldav/i18n/tr.po
+++ b/addons/caldav/i18n/tr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: caldav
 #: view:basic.calendar:0
diff --git a/addons/caldav/i18n/zh_CN.po b/addons/caldav/i18n/zh_CN.po
index e0f06bc0d64..feda4e8e52f 100644
--- a/addons/caldav/i18n/zh_CN.po
+++ b/addons/caldav/i18n/zh_CN.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: caldav
 #: view:basic.calendar:0
diff --git a/addons/caldav/i18n/zh_TW.po b/addons/caldav/i18n/zh_TW.po
new file mode 100644
index 00000000000..85e3b6b1468
--- /dev/null
+++ b/addons/caldav/i18n/zh_TW.po
@@ -0,0 +1,942 @@
+# Chinese (Traditional) 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-02-08 00:36+0000\n"
+"PO-Revision-Date: 2012-08-28 02:54+0000\n"
+"Last-Translator: Eric Huang <eh@cenoq.com>\n"
+"Language-Team: Cenoq Corp.MIME-Version: 1.0\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-08-29 05:05+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
+
+#. module: caldav
+#: view:basic.calendar:0
+msgid "Value Mapping"
+msgstr "值對應"
+
+#. module: caldav
+#: help:caldav.browse,url:0
+msgid "Url of the caldav server, use for synchronization"
+msgstr "caldav伺服器網址，用於同步"
+
+#. module: caldav
+#: code:addons/caldav/wizard/caldav_browse.py:99
+#, python-format
+msgid ""
+"\n"
+"Prerequire\n"
+"----------\n"
+"There is no buit-in way to synchronize calendar with caldav.\n"
+"So you need to install a third part software : Calendar (CalDav)\n"
+"for now it's the only one\n"
+"\n"
+"configuration\n"
+"-------------\n"
+"\n"
+"1. Open Calendar Sync\n"
+"   I'll get an interface with 2 tabs\n"
+"   Stay on the first one\n"
+"\n"
+"2. CaDAV Calendar URL : put the URL given above (ie : "
+"http://host.com:8069/webdav/db/calendars/users/demo/c/Meetings)\n"
+"\n"
+"3. Put your openerp username and password\n"
+"\n"
+"4. If your server don't use SSL, you'll get a warnign, say \"Yes\"\n"
+"\n"
+"5. Then you can synchronize manually or custom the settings to synchronize "
+"every x minutes.\n"
+"\n"
+"    "
+msgstr ""
+"\n"
+"前提\n"
+"--------------\n"
+"沒有內建的用caldav支持同步行事曆的方式。\n"
+"你需要安裝第三方軟體 CalDav。\n"
+"\n"
+"設定步驟\n"
+"--------------\n"
+"1. 打開行事曆同步\n"
+"    有兩個標籤頁\n"
+"    保持在第一個\n"
+"2. "
+"CalDav行事曆鏈接：輸入上面給出的地址（例如：http://host.com:8069/webdav/db/calendars/users/demo/"
+"c/Meetings）\n"
+"\n"
+"3.輸入你的openerp使用者名稱和密碼\n"
+"\n"
+"4.如果你的伺服器沒有使用安全連接，會看到一個警告，單擊「是 」\n"
+"\n"
+"5. 你可以自動同步也可以自訂為每隔幾分鐘同步\n"
+"\n"
+"    "
+
+#. module: caldav
+#: field:basic.calendar.alias,name:0
+msgid "Filename"
+msgstr "檔名"
+
+#. module: caldav
+#: model:ir.model,name:caldav.model_calendar_event_export
+msgid "Event Export"
+msgstr "事件匯出"
+
+#. module: caldav
+#: view:calendar.event.subscribe:0
+msgid "Provide Path for Remote Calendar"
+msgstr "提供路徑給遠端行事曆"
+
+#. module: caldav
+#: model:ir.actions.act_window,name:caldav.action_calendar_event_import_values
+msgid "Import .ics File"
+msgstr "匯入 .ics 檔案"
+
+#. module: caldav
+#: view:caldav.browse:0
+#: view:calendar.event.export:0
+msgid "_Close"
+msgstr "關閉(_C)："
+
+#. module: caldav
+#: selection:basic.calendar.attributes,type:0
+#: selection:basic.calendar.lines,name:0
+msgid "Attendee"
+msgstr "參與者"
+
+#. module: caldav
+#: sql_constraint:basic.calendar.fields:0
+msgid "Can not map a field more than once"
+msgstr "不能對應相關欄位多於一個"
+
+#. module: caldav
+#: model:ir.actions.act_window,help:caldav.action_caldav_form
+msgid ""
+"\"Calendars\" allow you to Customize calendar event and todo attribute with "
+"any of OpenERP model.Caledars provide iCal Import/Export "
+"functionality.Webdav server that provides remote access to calendar.Help You "
+"to synchronize Meeting with Calendars client.You can access Calendars using "
+"CalDAV clients, like sunbird, Calendar Evaluation, Mobile."
+msgstr ""
+"「行事曆」允許你在系統的任何模型裡自訂行事曆事件和代辦事項屬性。行事曆提供ical的匯入/匯出功能。\r\n"
+"WebDay伺服器提供遠端訪問行事曆。幫助你同步行事曆客戶端的會議。你能用 CalDAV客戶端sunbird，Calendar "
+"Evaluation，手機訪問行事曆。"
+
+#. module: caldav
+#: code:addons/caldav/calendar.py:789
+#: code:addons/caldav/calendar.py:879
+#: code:addons/caldav/wizard/calendar_event_import.py:63
+#, python-format
+msgid "Warning !"
+msgstr "警告！"
+
+#. module: caldav
+#: field:basic.calendar.lines,object_id:0
+msgid "Object"
+msgstr "對象"
+
+#. module: caldav
+#: view:basic.calendar:0
+msgid "Todo"
+msgstr "待辦事項"
+
+#. module: caldav
+#: model:ir.model,name:caldav.model_user_preference
+msgid "User preference Form"
+msgstr "使用者偏好"
+
+#. module: caldav
+#: field:user.preference,service:0
+msgid "Services"
+msgstr "服務"
+
+#. module: caldav
+#: selection:basic.calendar.fields,fn:0
+msgid "Expression as constant"
+msgstr "表示式常數"
+
+#. module: caldav
+#: selection:user.preference,device:0
+msgid "Evolution"
+msgstr "演變"
+
+#. module: caldav
+#: view:calendar.event.import:0
+#: view:calendar.event.subscribe:0
+msgid "Ok"
+msgstr "確定"
+
+#. module: caldav
+#: code:addons/caldav/wizard/caldav_browse.py:123
+#, python-format
+msgid ""
+"\n"
+"    1. Go to Calendar View\n"
+"\n"
+"    2. File -> New -> Calendar\n"
+"\n"
+"    3. Fill the form\n"
+"        - type : CalDav\n"
+"        - name : Whaterver you want (ie : Meeting)\n"
+"        - url : "
+"http://HOST:PORT/webdav/DB_NAME/calendars/users/USER/c/Meetings (ie : "
+"http://localhost:8069/webdav/db_1/calendars/users/demo/c/Meetings) the one "
+"given on the top of this window\n"
+"        - uncheck \"User SSL\"\n"
+"        - Username : Your username (ie : Demo)\n"
+"        - Refresh : everytime you want that evolution synchronize the data "
+"with the server\n"
+"\n"
+"    4. Click ok and give your openerp password\n"
+"\n"
+"    5. A new calendar named with the name you gave should appear on the left "
+"side.\n"
+"     "
+msgstr ""
+"\n"
+"    1. 進入行事曆視圖\n"
+"\n"
+"2. 檔案 - 新建 - 行事曆\n"
+"\n"
+"3. 填寫表單：\n"
+"- 類型：CalDav\n"
+"- 名稱：簡單描述\n"
+"- 地址：url : http://HOST:PORT/webdav/DB_NAME/calendars/users/USER/c/Meetings "
+"(如 : http://localhost:8069/webdav/db_1/calendars/users/demo/c/Meetings) "
+"http://host.com:8069/webdav/db/calendars/users/demo/c/Meetings)，請參考此視窗上方給出的地址"
+"\n"
+"- 不要勾選 \"使用SSL\"\n"
+"- 使用者名稱：您的使用者名稱\n"
+"- 重新整理：每次你需要與伺服器數據同步\n"
+"\n"
+"4.單擊OK並輸入openerp密碼\n"
+"\n"
+"5. 新的行事曆會出現在介面的左側。\n"
+"     "
+
+#. module: caldav
+#: code:addons/caldav/calendar.py:879
+#, python-format
+msgid "Please provide proper configuration of \"%s\" in Calendar Lines"
+msgstr "在行事曆明細中請為 \"%s\" 進行合適的設置"
+
+#. module: caldav
+#: view:user.preference:0
+msgid "Caldav's host name configuration"
+msgstr "CalDav主機名稱設置"
+
+#. module: caldav
+#: field:caldav.browse,url:0
+msgid "Caldav Server"
+msgstr "Caldav 伺服器"
+
+#. module: caldav
+#: selection:basic.calendar.fields,fn:0
+msgid "Datetime In UTC"
+msgstr "標準時間"
+
+#. module: caldav
+#: selection:user.preference,device:0
+msgid "iPhone"
+msgstr "iPhone"
+
+#. module: caldav
+#: selection:basic.calendar,type:0
+#: selection:basic.calendar.attributes,type:0
+#: selection:basic.calendar.lines,name:0
+msgid "TODO"
+msgstr "待辦"
+
+#. module: caldav
+#: view:calendar.event.export:0
+msgid "Export ICS"
+msgstr "匯出ics格式行事曆"
+
+#. module: caldav
+#: selection:basic.calendar.fields,fn:0
+msgid "Use the field"
+msgstr "用這個欄位"
+
+#. module: caldav
+#: code:addons/caldav/calendar.py:789
+#, python-format
+msgid "Can not create line \"%s\" more than once"
+msgstr "不能重複建立細項 \"%s\""
+
+#. module: caldav
+#: view:basic.calendar:0
+msgid "Webcal Calendar"
+msgstr "Webcal Calendar"
+
+#. module: caldav
+#: view:basic.calendar:0
+#: field:basic.calendar,line_ids:0
+#: model:ir.model,name:caldav.model_basic_calendar_lines
+msgid "Calendar Lines"
+msgstr "行事曆記錄"
+
+#. module: caldav
+#: model:ir.model,name:caldav.model_calendar_event_subscribe
+msgid "Event subscribe"
+msgstr "訂閱事件"
+
+#. module: caldav
+#: view:calendar.event.import:0
+msgid "Import ICS"
+msgstr "匯入ics行事曆檔案"
+
+#. module: caldav
+#: view:calendar.event.import:0
+#: view:calendar.event.subscribe:0
+#: view:user.preference:0
+msgid "_Cancel"
+msgstr "取消(_C)"
+
+#. module: caldav
+#: model:ir.model,name:caldav.model_basic_calendar_event
+msgid "basic.calendar.event"
+msgstr "basic.calendar.event"
+
+#. module: caldav
+#: view:basic.calendar:0
+#: selection:basic.calendar,type:0
+#: selection:basic.calendar.attributes,type:0
+#: selection:basic.calendar.lines,name:0
+msgid "Event"
+msgstr "事件"
+
+#. module: caldav
+#: field:document.directory,calendar_collection:0
+#: field:user.preference,collection:0
+msgid "Calendar Collection"
+msgstr "行事曆集"
+
+#. module: caldav
+#: constraint:document.directory:0
+msgid "Error! You can not create recursive Directories."
+msgstr "錯誤:你無法建立循環引用的目錄"
+
+#. module: caldav
+#: view:user.preference:0
+msgid "_Open"
+msgstr "打開(_O)"
+
+#. module: caldav
+#: view:user.preference:0
+msgid "Next"
+msgstr "下一個"
+
+#. module: caldav
+#: field:basic.calendar,type:0
+#: field:basic.calendar.attributes,type:0
+#: field:basic.calendar.fields,type_id:0
+#: field:basic.calendar.lines,name:0
+msgid "Type"
+msgstr "類型"
+
+#. module: caldav
+#: help:calendar.event.export,name:0
+msgid "Save in .ics format"
+msgstr "儲存為ics格式"
+
+#. module: caldav
+#: code:addons/caldav/calendar.py:1293
+#, python-format
+msgid "Error !"
+msgstr "錯誤！"
+
+#. module: caldav
+#: model:ir.model,name:caldav.model_basic_calendar_attributes
+msgid "Calendar attributes"
+msgstr "行事曆屬性"
+
+#. module: caldav
+#: model:ir.model,name:caldav.model_caldav_browse
+msgid "Caldav Browse"
+msgstr "Caldav 瀏覽"
+
+#. module: caldav
+#: selection:user.preference,device:0
+msgid "Android based device"
+msgstr "基於Android的設備"
+
+#. module: caldav
+#: view:user.preference:0
+msgid "Configure your openerp hostname. For example : "
+msgstr "配置你的openerp主機。例如： "
+
+#. module: caldav
+#: field:basic.calendar,create_date:0
+msgid "Created Date"
+msgstr "建立日期"
+
+#. module: caldav
+#: view:basic.calendar:0
+msgid "Attributes Mapping"
+msgstr "屬性對照"
+
+#. module: caldav
+#: model:ir.model,name:caldav.model_document_directory
+msgid "Directory"
+msgstr "目錄"
+
+#. module: caldav
+#: field:calendar.event.subscribe,url_path:0
+msgid "Provide path for remote calendar"
+msgstr "輸入遠端行事曆的路徑"
+
+#. module: caldav
+#: field:basic.calendar.lines,domain:0
+msgid "Domain"
+msgstr "網域"
+
+#. module: caldav
+#: view:calendar.event.subscribe:0
+msgid "_Subscribe"
+msgstr "訂閱(_S)"
+
+#. module: caldav
+#: field:basic.calendar,user_id:0
+msgid "Owner"
+msgstr "所有者"
+
+#. module: caldav
+#: view:basic.calendar:0
+#: field:basic.calendar.alias,cal_line_id:0
+#: field:basic.calendar.lines,calendar_id:0
+#: model:ir.ui.menu,name:caldav.menu_calendar
+#: field:user.preference,calendar:0
+msgid "Calendar"
+msgstr "行事曆"
+
+#. module: caldav
+#: code:addons/caldav/calendar.py:41
+#, python-format
+msgid ""
+"Please install python-vobject from http://vobject.skyhouseconsulting.com/"
+msgstr ""
+"請安裝 python-vobject\r\n"
+"http://vobject.skyhouseconsulting.com/"
+
+#. module: caldav
+#: code:addons/caldav/wizard/calendar_event_import.py:63
+#, python-format
+msgid "Invalid format of the ics, file can not be imported"
+msgstr "ics檔案格式錯誤，無法匯入"
+
+#. module: caldav
+#: selection:user.preference,service:0
+msgid "CalDAV"
+msgstr "CalDAV"
+
+#. module: caldav
+#: field:basic.calendar.fields,field_id:0
+msgid "OpenObject Field"
+msgstr "對象欄位"
+
+#. module: caldav
+#: field:basic.calendar.alias,res_id:0
+msgid "Res. ID"
+msgstr "資源ID"
+
+#. module: caldav
+#: view:calendar.event.subscribe:0
+msgid "Message..."
+msgstr "訊息"
+
+#. module: caldav
+#: view:basic.calendar:0
+#: field:basic.calendar,has_webcal:0
+msgid "WebCal"
+msgstr "WebCal"
+
+#. module: caldav
+#: view:document.directory:0
+#: model:ir.actions.act_window,name:caldav.action_calendar_collection_form
+#: model:ir.ui.menu,name:caldav.menu_calendar_collection
+msgid "Calendar Collections"
+msgstr "行事曆集"
+
+#. module: caldav
+#: code:addons/caldav/calendar.py:815
+#: sql_constraint:basic.calendar.alias:0
+#, python-format
+msgid "The same filename cannot apply to two records!"
+msgstr "兩筆記錄不能用同一個檔名"
+
+#. module: caldav
+#: sql_constraint:document.directory:0
+msgid "Directory cannot be parent of itself!"
+msgstr "目錄不能設自己為上級目錄。"
+
+#. module: caldav
+#: view:basic.calendar:0
+#: field:document.directory,calendar_ids:0
+#: model:ir.actions.act_window,name:caldav.action_caldav_form
+#: model:ir.ui.menu,name:caldav.menu_caldav_directories
+msgid "Calendars"
+msgstr "行事曆"
+
+#. module: caldav
+#: field:basic.calendar,collection_id:0
+msgid "Collection"
+msgstr "集合"
+
+#. module: caldav
+#: field:basic.calendar,write_date:0
+msgid "Write Date"
+msgstr "修改日期"
+
+#. module: caldav
+#: code:addons/caldav/wizard/caldav_browse.py:32
+#, python-format
+msgid ""
+"\n"
+"  * Webdav server that provides remote access to calendar\n"
+"  * Synchronisation of calendar using WebDAV\n"
+"  * Customize calendar event and todo attribute with any of OpenERP model\n"
+"  * Provides iCal Import/Export functionality\n"
+"\n"
+"    To access Calendars using CalDAV clients, point them to:\n"
+"        "
+"http://HOSTNAME:PORT/webdav/DATABASE_NAME/calendars/users/USERNAME/c\n"
+"\n"
+"    To access OpenERP Calendar using WebCal to remote site use the URL "
+"like:\n"
+"        "
+"http://HOSTNAME:PORT/webdav/DATABASE_NAME/Calendars/CALENDAR_NAME.ics\n"
+"\n"
+"      Where,\n"
+"        HOSTNAME: Host on which OpenERP server(With webdav) is running\n"
+"        PORT : Port on which OpenERP server is running (By Default : 8069)\n"
+"        DATABASE_NAME: Name of database on which OpenERP Calendar is "
+"created\n"
+"     "
+msgstr ""
+"\n"
+"  提供遠端訪問行事曆的Webdav伺服器\n"
+"用WebDAV同步行事曆\n"
+"設置行事曆事件和任意OpenERP模型的待辦屬性\n"
+"支持iCal的匯入匯出功能\n"
+"\n"
+"要用CalDAV客戶端訪問行事曆，指向：\n"
+"http://HOSTNAME:PORT/webdav/DATABASE_NAME/calendars/users/USERNAME/c\n"
+"\n"
+"用WebCal訪問遠端OpenERP行事曆，使用以下地址：\n"
+"http://HOSTNAME:PORT/webdav/DATABASE_NAME/Calendars/CALENDAR_NAME.ics\n"
+"\n"
+"其中：\n"
+"HOSTNAME：正在運行的OpenERP伺服器\n"
+"PORT：OpenERP伺服器的埠號\n"
+"DATABASE_NAME:OpenERP行事曆所在的資料庫\n"
+"     "
+
+#. module: caldav
+#: sql_constraint:document.directory:0
+msgid "The directory name must be unique !"
+msgstr "目錄名必須唯一！"
+
+#. module: caldav
+#: view:user.preference:0
+msgid "User Preference"
+msgstr "使用者偏好設定"
+
+#. module: caldav
+#: code:addons/caldav/wizard/calendar_event_subscribe.py:59
+#, python-format
+msgid "Please provide Proper URL !"
+msgstr "請輸入正確的地址"
+
+#. module: caldav
+#: model:ir.model,name:caldav.model_basic_calendar_timezone
+msgid "basic.calendar.timezone"
+msgstr "basic.calendar.timezone"
+
+#. module: caldav
+#: field:basic.calendar.fields,expr:0
+msgid "Expression"
+msgstr "表示式"
+
+#. module: caldav
+#: model:ir.model,name:caldav.model_basic_calendar_attendee
+msgid "basic.calendar.attendee"
+msgstr "basic.calendar.attendee"
+
+#. module: caldav
+#: model:ir.model,name:caldav.model_basic_calendar_alias
+msgid "basic.calendar.alias"
+msgstr "basic.calendar.alias"
+
+#. module: caldav
+#: view:calendar.event.import:0
+#: field:calendar.event.import,file_path:0
+msgid "Select ICS File"
+msgstr "選擇 ICS 檔案"
+
+#. module: caldav
+#: field:user.preference,device:0
+msgid "Software/Devices"
+msgstr "軟體 / 裝置"
+
+#. module: caldav
+#: field:basic.calendar.lines,mapping_ids:0
+msgid "Fields Mapping"
+msgstr "欄位對照"
+
+#. module: caldav
+#: code:addons/caldav/wizard/caldav_browse.py:141
+#, python-format
+msgid ""
+"\n"
+"Prerequire\n"
+"----------\n"
+"If you are using thunderbird, first you need to install the lightning "
+"module\n"
+"http://www.mozilla.org/projects/calendar/lightning/\n"
+"\n"
+"configuration\n"
+"-------------\n"
+"\n"
+"1. Go to Calendar View\n"
+"\n"
+"2. File -> New Calendar\n"
+"\n"
+"3. Chosse \"On the Network\"\n"
+"\n"
+"4. for format choose CalDav\n"
+"   and as location the url given above (ie : "
+"http://host.com:8069/webdav/db/calendars/users/demo/c/Meetings)\n"
+"\n"
+"5. Choose a name and a color for the Calendar, and we advice you to uncheck "
+"\"alarm\"\n"
+"\n"
+"6. Then put your openerp login and password (to give the password only check "
+"the box \"Use password Manager to remember this password\"\n"
+"\n"
+"7. Then Finish, your meetings should appear now in your calendar view\n"
+msgstr ""
+"\n"
+"前提\n"
+"--------\n"
+"如果你正在用thunderbird，你要首先安裝 lightning 模組\n"
+"http://www.mozilla.org/projects/calendar/lightning/\n"
+"\n"
+"配置\n"
+"--------\n"
+"\n"
+"1.進入行事曆視圖\n"
+"\n"
+"2. 檔案 - 新行事曆\n"
+"\n"
+"3. 選擇「在網絡上 」\n"
+"\n"
+"4. 格式選擇 CalDav\n"
+"    "
+"地址輸入以上給出的地址，例如：http://host.com:8069/webdav/db/calendars/users/demo/c/Meetings"
+"\n"
+"\n"
+"5. 輸入行事曆的名稱和顏色，我們建議您不要勾選「 提醒」\n"
+"\n"
+"6. 然後輸入您的openerp使用者名稱和密碼（勾選」用密碼管理器來記住這個密碼「以免重複輸入）\n"
+"\n"
+"7. 然後完成。你的邀約會在行事曆上顯示出來。\n"
+
+#. module: caldav
+#: view:caldav.browse:0
+msgid "Browse Caldav"
+msgstr "瀏覽 Caldav"
+
+#. module: caldav
+#: field:user.preference,host_name:0
+msgid "Host Name"
+msgstr "主機名"
+
+#. module: caldav
+#: model:ir.model,name:caldav.model_basic_calendar
+msgid "basic.calendar"
+msgstr "basic.calendar"
+
+#. module: caldav
+#: view:basic.calendar:0
+msgid "Other Info"
+msgstr "其它資訊"
+
+#. module: caldav
+#: selection:user.preference,device:0
+msgid "Other"
+msgstr "其它"
+
+#. module: caldav
+#: view:basic.calendar:0
+msgid "My Calendar(s)"
+msgstr "我的行事曆"
+
+#. module: caldav
+#: help:basic.calendar,has_webcal:0
+msgid ""
+"Also export a <name>.ics entry next to the calendar folder, with WebCal "
+"content."
+msgstr "並且在行事曆目錄後生成一個 行事曆名稱.ics檔案"
+
+#. module: caldav
+#: field:basic.calendar.fields,fn:0
+msgid "Function"
+msgstr "功能"
+
+#. module: caldav
+#: view:user.preference:0
+msgid "database.my.openerp.com  or companyserver.com"
+msgstr "database.my.openerp.com 或者 companyserver.com"
+
+#. module: caldav
+#: view:basic.calendar:0
+#: field:basic.calendar,description:0
+#: view:caldav.browse:0
+#: field:caldav.browse,description:0
+msgid "Description"
+msgstr "描述"
+
+#. module: caldav
+#: help:basic.calendar.alias,cal_line_id:0
+msgid "The calendar/line this mapping applies to"
+msgstr "行事曆套用於"
+
+#. module: caldav
+#: field:basic.calendar.fields,mapping:0
+msgid "Mapping"
+msgstr "對照"
+
+#. module: caldav
+#: code:addons/caldav/wizard/calendar_event_import.py:86
+#, python-format
+msgid "Import Sucessful"
+msgstr "匯入成功"
+
+#. module: caldav
+#: view:calendar.event.import:0
+msgid "_Import"
+msgstr "匯入(_I)"
+
+#. module: caldav
+#: model:ir.model,name:caldav.model_calendar_event_import
+msgid "Event Import"
+msgstr "匯入事件"
+
+#. module: caldav
+#: selection:basic.calendar.fields,fn:0
+msgid "Interval in hours"
+msgstr "間隔時數"
+
+#. module: caldav
+#: field:calendar.event.export,name:0
+msgid "File name"
+msgstr "檔名"
+
+#. module: caldav
+#: view:calendar.event.subscribe:0
+msgid "Subscribe to Remote Calendar"
+msgstr "訂閱遠端行事曆"
+
+#. module: caldav
+#: help:basic.calendar,calendar_color:0
+msgid "For supporting clients, the color of the calendar entries"
+msgstr "為支持彩色的客戶端指定此行事曆顏色"
+
+#. module: caldav
+#: field:basic.calendar,name:0
+#: field:basic.calendar.attributes,name:0
+#: field:basic.calendar.fields,name:0
+msgid "Name"
+msgstr "名稱"
+
+#. module: caldav
+#: selection:basic.calendar.attributes,type:0
+#: selection:basic.calendar.lines,name:0
+msgid "Alarm"
+msgstr "提醒"
+
+#. module: caldav
+#: model:ir.model,name:caldav.model_basic_calendar_alarm
+msgid "basic.calendar.alarm"
+msgstr "basic.calendar.alarm"
+
+#. module: caldav
+#: code:addons/caldav/calendar.py:1293
+#, python-format
+msgid "Attendee must have an Email Id"
+msgstr "參與者必須有郵件地址"
+
+#. module: caldav
+#: model:ir.actions.act_window,name:caldav.action_calendar_event_export_values
+msgid "Export .ics File"
+msgstr "匯出 .ics 檔案"
+
+#. module: caldav
+#: code:addons/caldav/calendar.py:41
+#, python-format
+msgid "vobject Import Error!"
+msgstr "vobject匯入錯誤"
+
+#. module: caldav
+#: field:calendar.event.export,file_path:0
+msgid "Save ICS file"
+msgstr "儲存ics檔案"
+
+#. module: caldav
+#: code:addons/caldav/wizard/caldav_browse.py:50
+#, python-format
+msgid ""
+"\n"
+"    For SSL specific configuration see the documentation below\n"
+"\n"
+"Now, to setup the calendars, you need to:\n"
+"\n"
+"1. Click on the \"Settings\" and go to the \"Mail, Contacts, Calendars\" "
+"page.\n"
+"2. Go to \"Add account...\"\n"
+"3. Click on \"Other\"\n"
+"4. From the \"Calendars\" group, select \"Add CalDAV Account\"\n"
+"\n"
+"5. Enter the host's name\n"
+"   (ie : if the url is http://openerp.com:8069/webdav/db_1/calendars/ , "
+"openerp.com is the host)\n"
+"\n"
+"6. Fill Username and password with your openerp login and password\n"
+"\n"
+"7. As a description, you can either leave the server's name or\n"
+"   something like \"OpenERP calendars\".\n"
+"\n"
+"9. If you are not using a SSL server, you'll get an error, do not worry and "
+"push \"Continue\"\n"
+"\n"
+"10. Then click to \"Advanced Settings\" to specify the right\n"
+"    ports and paths.\n"
+"\n"
+"11. Specify the port for the OpenERP server: 8071 for SSL, 8069 without.\n"
+"\n"
+"12. Set the \"Account URL\" to the right path of the OpenERP webdav:\n"
+"    the url given by the wizard (ie : "
+"http://my.server.ip:8069/webdav/dbname/calendars/ )\n"
+"\n"
+"11. Click on Done. The phone will hopefully connect to the OpenERP server\n"
+"    and verify it can use the account.\n"
+"\n"
+"12. Go to the main menu of the iPhone and enter the Calendar application.\n"
+"    Your OpenERP calendars will be visible inside the selection of the\n"
+"    \"Calendars\" button.\n"
+"    Note that when creating a new calendar entry, you will have to specify\n"
+"    which calendar it should be saved at.\n"
+"\n"
+"IF you need SSL (and your certificate is not a verified one, as usual),\n"
+"then you first will need to let the iPhone trust that. Follow these\n"
+"steps:\n"
+"\n"
+"    s1. Open Safari and enter the https location of the OpenERP server:\n"
+"      https://my.server.ip:8071/\n"
+"      (assuming you have the server at \"my.server.ip\" and the HTTPS port\n"
+"      is the default 8071)\n"
+"    s2. Safari will try to connect and issue a warning about the "
+"certificate\n"
+"      used. Inspect the certificate and click \"Accept\" so that iPhone\n"
+"      now trusts it.\n"
+"    "
+msgstr ""
+"\n"
+"    1.單擊設置並進入「郵件、聯絡人、行事曆」頁面\n"
+"2.進入 「添加帳號」\n"
+"3.單擊 「其他」\n"
+"4.在「行事曆」組，選擇「添加CalDAV帳號」\n"
+"5.輸入主機名（例如，地址是http://openerp.com:8069/webdav/db_1/calendars/ , "
+"主機名就是openerp.com ）\n"
+"6.在使用者名稱和密碼欄位輸入你的openerp使用者名稱和密碼\n"
+"7.輸入描述。可以是伺服器名字也可以是其他文字\n"
+"8.如果你沒有用SSL伺服器，會看到一個錯誤訊息，別擔心，單擊「繼續」\n"
+"9.單擊「進階設置」輸入埠號和地址\n"
+"10.輸入openerp伺服器埠號號：8071用於SSL，8069用於非SSL\n"
+"11.設置「帳號地址」到正確的openerp webdav地址：\n"
+"地址已由精靈給出：（例如：http://my.server.ip:8069/webdav/dbname/calendars/）\n"
+"12.單擊完成。手機會嘗試連接openerp伺服器並驗證帳號。\n"
+"13.進入iPhone的主菜單，並進入行事曆應用。你的openerp行事曆會在行事曆按鈕上可見。\n"
+"注意，你要新建行事曆記錄的時候，你要指定你要儲存在哪個行事曆裡。\n"
+"\n"
+"如果你需要SSL（一般來說你的伺服器無法提供認證），你需要先讓你的iPhone信任這個伺服器。\n"
+"按以下步驟操作：\n"
+"\n"
+"1.打開Safari瀏覽器並輸入https開頭的OpenERP伺服器地址：如https://my.server.ip:8071/\n"
+"\n"
+"2.Safari會試圖連接並給出一個關於認證的警告。忽略警告並單擊「接受」以便iPhone信任這個地址。\n"
+"    "
+
+#. module: caldav
+#: selection:user.preference,device:0
+msgid "Sunbird/Thunderbird"
+msgstr "Sunbird/Thunderbird"
+
+#. module: caldav
+#: field:basic.calendar,calendar_order:0
+msgid "Order"
+msgstr "順序"
+
+#. module: caldav
+#: code:addons/caldav/wizard/calendar_event_subscribe.py:59
+#, python-format
+msgid "Error!"
+msgstr "錯誤！"
+
+#. module: caldav
+#: field:basic.calendar,calendar_color:0
+msgid "Color"
+msgstr "顏色"
+
+#. module: caldav
+#: view:basic.calendar:0
+msgid "MY"
+msgstr "我的"
+
+#. module: caldav
+#: model:ir.model,name:caldav.model_basic_calendar_fields
+msgid "Calendar fields"
+msgstr "行事曆欄位"
+
+#. module: caldav
+#: view:calendar.event.import:0
+msgid "Import Message"
+msgstr "匯入訊息"
+
+#. module: caldav
+#: model:ir.actions.act_window,name:caldav.action_calendar_event_subscribe
+#: model:ir.actions.act_window,name:caldav.action_calendar_event_subscribe_values
+msgid "Subscribe"
+msgstr "訂閱"
+
+#. module: caldav
+#: sql_constraint:document.directory:0
+msgid "Directory must have a parent or a storage"
+msgstr "目錄必須具有上級目錄或一個存儲區"
+
+#. module: caldav
+#: model:ir.model,name:caldav.model_basic_calendar_todo
+msgid "basic.calendar.todo"
+msgstr "basic.calendar.todo"
+
+#. module: caldav
+#: help:basic.calendar,calendar_order:0
+msgid "For supporting clients, the order of this folder among the calendars"
+msgstr "針對支持排序的客戶端，此行事曆所在的位置"
+
+#~ msgid "Provide path for Remote Calendar"
+#~ msgstr "提供遠端行事曆路徑"
+
+#~ msgid "Select ICS file"
+#~ msgstr "選擇ics檔案"
+
+#~ msgid "Browse caldav"
+#~ msgstr "瀏覽caldav"
diff --git a/addons/claim_from_delivery/__openerp__.py b/addons/claim_from_delivery/__openerp__.py
index 3ce79a382ca..9c4395927af 100644
--- a/addons/claim_from_delivery/__openerp__.py
+++ b/addons/claim_from_delivery/__openerp__.py
@@ -18,23 +18,22 @@
 #
 ##############################################################################
 {
-    "name" : "Claim on Deliveries",
-    "version" : "1.0",
-    "author" : "OpenERP SA",
-    "category" : "Warehouse Management",
-    "depends" : ["base", "crm_claim", "stock"],
-    "init_xml" : [],
-    "demo_xml" : [],
-    "description": '''
+    'name' : 'Claim on Deliveries',
+    'version' : '1.0',
+    'author' : 'OpenERP SA',
+    'category' : 'Warehouse Management',
+    'depends' : ['base', 'crm_claim', 'stock'],
+    'demo' : [],
+    'description': """
 Create a claim from a delivery order.
 =====================================
 
 Adds a Claim link to the delivery order.
-''',
-    "update_xml" : ["claim_delivery_view.xml"],
-    "auto_install": False,
-    "installable": True,
-    "certificate" : "001101649349223746957",
+""",
+    'data' : ['claim_delivery_view.xml'],
+    'auto_install': False,
+    'installable': True,
+    'certificate' : '001101649349223746957',
     'images': ['images/1_claim_link_delivery_order.jpeg'],
 }
 
diff --git a/addons/claim_from_delivery/i18n/ar.po b/addons/claim_from_delivery/i18n/ar.po
index aa43e8979ed..b9cb822929a 100644
--- a/addons/claim_from_delivery/i18n/ar.po
+++ b/addons/claim_from_delivery/i18n/ar.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: claim_from_delivery
 #: model:ir.actions.act_window,name:claim_from_delivery.action_claim_from_delivery
diff --git a/addons/claim_from_delivery/i18n/bg.po b/addons/claim_from_delivery/i18n/bg.po
index 8f3edd63cf6..02074cc7753 100644
--- a/addons/claim_from_delivery/i18n/bg.po
+++ b/addons/claim_from_delivery/i18n/bg.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: claim_from_delivery
 #: model:ir.actions.act_window,name:claim_from_delivery.action_claim_from_delivery
diff --git a/addons/claim_from_delivery/i18n/ca.po b/addons/claim_from_delivery/i18n/ca.po
index 89524a879d2..0d227045347 100644
--- a/addons/claim_from_delivery/i18n/ca.po
+++ b/addons/claim_from_delivery/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: claim_from_delivery
 #: model:ir.actions.act_window,name:claim_from_delivery.action_claim_from_delivery
diff --git a/addons/claim_from_delivery/i18n/cs.po b/addons/claim_from_delivery/i18n/cs.po
index 1626b76f63a..9e5eadfcd51 100644
--- a/addons/claim_from_delivery/i18n/cs.po
+++ b/addons/claim_from_delivery/i18n/cs.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: claim_from_delivery
 #: model:ir.actions.act_window,name:claim_from_delivery.action_claim_from_delivery
diff --git a/addons/claim_from_delivery/i18n/da.po b/addons/claim_from_delivery/i18n/da.po
index 07e48b83e7a..1fd8dbda909 100644
--- a/addons/claim_from_delivery/i18n/da.po
+++ b/addons/claim_from_delivery/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: claim_from_delivery
 #: model:ir.actions.act_window,name:claim_from_delivery.action_claim_from_delivery
diff --git a/addons/claim_from_delivery/i18n/de.po b/addons/claim_from_delivery/i18n/de.po
index 75d1e08d1d5..36ad2b68ef7 100644
--- a/addons/claim_from_delivery/i18n/de.po
+++ b/addons/claim_from_delivery/i18n/de.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: claim_from_delivery
 #: model:ir.actions.act_window,name:claim_from_delivery.action_claim_from_delivery
diff --git a/addons/claim_from_delivery/i18n/en_GB.po b/addons/claim_from_delivery/i18n/en_GB.po
index 22e5a013c29..42ac7ae1ce5 100644
--- a/addons/claim_from_delivery/i18n/en_GB.po
+++ b/addons/claim_from_delivery/i18n/en_GB.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: claim_from_delivery
 #: model:ir.actions.act_window,name:claim_from_delivery.action_claim_from_delivery
diff --git a/addons/claim_from_delivery/i18n/es.po b/addons/claim_from_delivery/i18n/es.po
index 8cb0530bd0a..0f19f6990ed 100644
--- a/addons/claim_from_delivery/i18n/es.po
+++ b/addons/claim_from_delivery/i18n/es.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: claim_from_delivery
 #: model:ir.actions.act_window,name:claim_from_delivery.action_claim_from_delivery
diff --git a/addons/claim_from_delivery/i18n/es_AR.po b/addons/claim_from_delivery/i18n/es_AR.po
index 776a02a7a1e..86a845d932c 100644
--- a/addons/claim_from_delivery/i18n/es_AR.po
+++ b/addons/claim_from_delivery/i18n/es_AR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: claim_from_delivery
 #: model:ir.actions.act_window,name:claim_from_delivery.action_claim_from_delivery
diff --git a/addons/claim_from_delivery/i18n/es_CL.po b/addons/claim_from_delivery/i18n/es_CL.po
index feafbf2cb2d..4622cf82115 100644
--- a/addons/claim_from_delivery/i18n/es_CL.po
+++ b/addons/claim_from_delivery/i18n/es_CL.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: claim_from_delivery
 #: model:ir.actions.act_window,name:claim_from_delivery.action_claim_from_delivery
diff --git a/addons/claim_from_delivery/i18n/es_CR.po b/addons/claim_from_delivery/i18n/es_CR.po
index d13a6842622..6ebd7794414 100644
--- a/addons/claim_from_delivery/i18n/es_CR.po
+++ b/addons/claim_from_delivery/i18n/es_CR.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 "Language: es\n"
 
 #. module: claim_from_delivery
diff --git a/addons/claim_from_delivery/i18n/es_EC.po b/addons/claim_from_delivery/i18n/es_EC.po
index d62844470d5..b4171a3ec6c 100644
--- a/addons/claim_from_delivery/i18n/es_EC.po
+++ b/addons/claim_from_delivery/i18n/es_EC.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: claim_from_delivery
 #: model:ir.actions.act_window,name:claim_from_delivery.action_claim_from_delivery
diff --git a/addons/claim_from_delivery/i18n/es_PY.po b/addons/claim_from_delivery/i18n/es_PY.po
index 3c5f79daba4..15b7b1961b4 100644
--- a/addons/claim_from_delivery/i18n/es_PY.po
+++ b/addons/claim_from_delivery/i18n/es_PY.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: claim_from_delivery
 #: model:ir.actions.act_window,name:claim_from_delivery.action_claim_from_delivery
diff --git a/addons/claim_from_delivery/i18n/fa.po b/addons/claim_from_delivery/i18n/fa.po
index 9508fc50c6d..d7168b10510 100644
--- a/addons/claim_from_delivery/i18n/fa.po
+++ b/addons/claim_from_delivery/i18n/fa.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: claim_from_delivery
 #: model:ir.actions.act_window,name:claim_from_delivery.action_claim_from_delivery
diff --git a/addons/claim_from_delivery/i18n/fi.po b/addons/claim_from_delivery/i18n/fi.po
index 18a9ea34990..9a6c0fa81b2 100644
--- a/addons/claim_from_delivery/i18n/fi.po
+++ b/addons/claim_from_delivery/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: claim_from_delivery
 #: model:ir.actions.act_window,name:claim_from_delivery.action_claim_from_delivery
diff --git a/addons/claim_from_delivery/i18n/fr.po b/addons/claim_from_delivery/i18n/fr.po
index db0094d32e3..b3b153885b7 100644
--- a/addons/claim_from_delivery/i18n/fr.po
+++ b/addons/claim_from_delivery/i18n/fr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: claim_from_delivery
 #: model:ir.actions.act_window,name:claim_from_delivery.action_claim_from_delivery
diff --git a/addons/claim_from_delivery/i18n/gl.po b/addons/claim_from_delivery/i18n/gl.po
index 709d62b5c33..7785eff534a 100644
--- a/addons/claim_from_delivery/i18n/gl.po
+++ b/addons/claim_from_delivery/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: claim_from_delivery
 #: model:ir.actions.act_window,name:claim_from_delivery.action_claim_from_delivery
diff --git a/addons/claim_from_delivery/i18n/gu.po b/addons/claim_from_delivery/i18n/gu.po
index 76fdd111015..5414cb8da2a 100644
--- a/addons/claim_from_delivery/i18n/gu.po
+++ b/addons/claim_from_delivery/i18n/gu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: claim_from_delivery
 #: model:ir.actions.act_window,name:claim_from_delivery.action_claim_from_delivery
diff --git a/addons/claim_from_delivery/i18n/hr.po b/addons/claim_from_delivery/i18n/hr.po
index 145a68b44ef..0cf703bc02d 100644
--- a/addons/claim_from_delivery/i18n/hr.po
+++ b/addons/claim_from_delivery/i18n/hr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: claim_from_delivery
 #: model:ir.actions.act_window,name:claim_from_delivery.action_claim_from_delivery
diff --git a/addons/claim_from_delivery/i18n/hu.po b/addons/claim_from_delivery/i18n/hu.po
index 97d5c4d3370..2d0fa2dcc23 100644
--- a/addons/claim_from_delivery/i18n/hu.po
+++ b/addons/claim_from_delivery/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: claim_from_delivery
 #: model:ir.actions.act_window,name:claim_from_delivery.action_claim_from_delivery
diff --git a/addons/claim_from_delivery/i18n/id.po b/addons/claim_from_delivery/i18n/id.po
index 9cce9e49aa8..09b8f404c9b 100644
--- a/addons/claim_from_delivery/i18n/id.po
+++ b/addons/claim_from_delivery/i18n/id.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: claim_from_delivery
 #: model:ir.actions.act_window,name:claim_from_delivery.action_claim_from_delivery
diff --git a/addons/claim_from_delivery/i18n/it.po b/addons/claim_from_delivery/i18n/it.po
index 19ce39fd161..d0d7e74a514 100644
--- a/addons/claim_from_delivery/i18n/it.po
+++ b/addons/claim_from_delivery/i18n/it.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: claim_from_delivery
 #: model:ir.actions.act_window,name:claim_from_delivery.action_claim_from_delivery
diff --git a/addons/claim_from_delivery/i18n/ja.po b/addons/claim_from_delivery/i18n/ja.po
index 9fb966e961c..1c043308f31 100644
--- a/addons/claim_from_delivery/i18n/ja.po
+++ b/addons/claim_from_delivery/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: claim_from_delivery
 #: model:ir.actions.act_window,name:claim_from_delivery.action_claim_from_delivery
diff --git a/addons/claim_from_delivery/i18n/lo.po b/addons/claim_from_delivery/i18n/lo.po
new file mode 100644
index 00000000000..fb52982c3a2
--- /dev/null
+++ b/addons/claim_from_delivery/i18n/lo.po
@@ -0,0 +1,23 @@
+# Lao 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-02-08 00:36+0000\n"
+"PO-Revision-Date: 2012-08-20 18:44+0000\n"
+"Last-Translator: Brice Muangkhot ສຸພາ ເມືອງໂຄຕ <bmuangkhot@gmail.com>\n"
+"Language-Team: Lao <lo@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
+
+#. module: claim_from_delivery
+#: model:ir.actions.act_window,name:claim_from_delivery.action_claim_from_delivery
+msgid "Claim"
+msgstr "ຕໍ່ຮ້ອງ"
diff --git a/addons/claim_from_delivery/i18n/mn.po b/addons/claim_from_delivery/i18n/mn.po
index ff61eea02ca..f5748ec8e1e 100644
--- a/addons/claim_from_delivery/i18n/mn.po
+++ b/addons/claim_from_delivery/i18n/mn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: claim_from_delivery
 #: model:ir.actions.act_window,name:claim_from_delivery.action_claim_from_delivery
diff --git a/addons/claim_from_delivery/i18n/nb.po b/addons/claim_from_delivery/i18n/nb.po
index 0d9bf875e6e..b4e77027635 100644
--- a/addons/claim_from_delivery/i18n/nb.po
+++ b/addons/claim_from_delivery/i18n/nb.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: claim_from_delivery
 #: model:ir.actions.act_window,name:claim_from_delivery.action_claim_from_delivery
diff --git a/addons/claim_from_delivery/i18n/nl.po b/addons/claim_from_delivery/i18n/nl.po
index 1ccf984e01d..be181ea1a64 100644
--- a/addons/claim_from_delivery/i18n/nl.po
+++ b/addons/claim_from_delivery/i18n/nl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: claim_from_delivery
 #: model:ir.actions.act_window,name:claim_from_delivery.action_claim_from_delivery
diff --git a/addons/claim_from_delivery/i18n/oc.po b/addons/claim_from_delivery/i18n/oc.po
index 4fcc3cc1c72..16d9e4937a2 100644
--- a/addons/claim_from_delivery/i18n/oc.po
+++ b/addons/claim_from_delivery/i18n/oc.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: claim_from_delivery
 #: model:ir.actions.act_window,name:claim_from_delivery.action_claim_from_delivery
diff --git a/addons/claim_from_delivery/i18n/pt.po b/addons/claim_from_delivery/i18n/pt.po
index b8105bf16d0..9ff6b3825dc 100644
--- a/addons/claim_from_delivery/i18n/pt.po
+++ b/addons/claim_from_delivery/i18n/pt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: claim_from_delivery
 #: model:ir.actions.act_window,name:claim_from_delivery.action_claim_from_delivery
diff --git a/addons/claim_from_delivery/i18n/pt_BR.po b/addons/claim_from_delivery/i18n/pt_BR.po
index 74042c2d572..13c593c79bd 100644
--- a/addons/claim_from_delivery/i18n/pt_BR.po
+++ b/addons/claim_from_delivery/i18n/pt_BR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: claim_from_delivery
 #: model:ir.actions.act_window,name:claim_from_delivery.action_claim_from_delivery
diff --git a/addons/claim_from_delivery/i18n/ro.po b/addons/claim_from_delivery/i18n/ro.po
index 28055a7dc9f..44b19869eab 100644
--- a/addons/claim_from_delivery/i18n/ro.po
+++ b/addons/claim_from_delivery/i18n/ro.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: claim_from_delivery
 #: model:ir.actions.act_window,name:claim_from_delivery.action_claim_from_delivery
diff --git a/addons/claim_from_delivery/i18n/ru.po b/addons/claim_from_delivery/i18n/ru.po
index 5ca1012b26a..c1312a57dec 100644
--- a/addons/claim_from_delivery/i18n/ru.po
+++ b/addons/claim_from_delivery/i18n/ru.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: claim_from_delivery
 #: model:ir.actions.act_window,name:claim_from_delivery.action_claim_from_delivery
diff --git a/addons/claim_from_delivery/i18n/sl.po b/addons/claim_from_delivery/i18n/sl.po
index 713d13c4d84..a63ea4a5a55 100644
--- a/addons/claim_from_delivery/i18n/sl.po
+++ b/addons/claim_from_delivery/i18n/sl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: claim_from_delivery
 #: model:ir.actions.act_window,name:claim_from_delivery.action_claim_from_delivery
diff --git a/addons/claim_from_delivery/i18n/sq.po b/addons/claim_from_delivery/i18n/sq.po
index b8d0c7ce7f5..7190f88c25b 100644
--- a/addons/claim_from_delivery/i18n/sq.po
+++ b/addons/claim_from_delivery/i18n/sq.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: claim_from_delivery
 #: model:ir.actions.act_window,name:claim_from_delivery.action_claim_from_delivery
diff --git a/addons/claim_from_delivery/i18n/sr.po b/addons/claim_from_delivery/i18n/sr.po
index aa2e3e864dc..e16e6517b9a 100644
--- a/addons/claim_from_delivery/i18n/sr.po
+++ b/addons/claim_from_delivery/i18n/sr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: claim_from_delivery
 #: model:ir.actions.act_window,name:claim_from_delivery.action_claim_from_delivery
diff --git a/addons/claim_from_delivery/i18n/sr@latin.po b/addons/claim_from_delivery/i18n/sr@latin.po
index 0eae21cbd15..8e510e243f1 100644
--- a/addons/claim_from_delivery/i18n/sr@latin.po
+++ b/addons/claim_from_delivery/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: claim_from_delivery
 #: model:ir.actions.act_window,name:claim_from_delivery.action_claim_from_delivery
diff --git a/addons/claim_from_delivery/i18n/sv.po b/addons/claim_from_delivery/i18n/sv.po
index 6f68be6c37d..c029a098131 100644
--- a/addons/claim_from_delivery/i18n/sv.po
+++ b/addons/claim_from_delivery/i18n/sv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: claim_from_delivery
 #: model:ir.actions.act_window,name:claim_from_delivery.action_claim_from_delivery
diff --git a/addons/claim_from_delivery/i18n/ta.po b/addons/claim_from_delivery/i18n/ta.po
index 022574dc4b9..ededbcdf9cb 100644
--- a/addons/claim_from_delivery/i18n/ta.po
+++ b/addons/claim_from_delivery/i18n/ta.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: claim_from_delivery
 #: model:ir.actions.act_window,name:claim_from_delivery.action_claim_from_delivery
diff --git a/addons/claim_from_delivery/i18n/tr.po b/addons/claim_from_delivery/i18n/tr.po
index 7eba8080701..6450653d486 100644
--- a/addons/claim_from_delivery/i18n/tr.po
+++ b/addons/claim_from_delivery/i18n/tr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: claim_from_delivery
 #: model:ir.actions.act_window,name:claim_from_delivery.action_claim_from_delivery
diff --git a/addons/claim_from_delivery/i18n/zh_CN.po b/addons/claim_from_delivery/i18n/zh_CN.po
index f3a9d38234d..a6e3d2aa9ec 100644
--- a/addons/claim_from_delivery/i18n/zh_CN.po
+++ b/addons/claim_from_delivery/i18n/zh_CN.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: claim_from_delivery
 #: model:ir.actions.act_window,name:claim_from_delivery.action_claim_from_delivery
diff --git a/addons/claim_from_delivery/i18n/zh_TW.po b/addons/claim_from_delivery/i18n/zh_TW.po
new file mode 100644
index 00000000000..644122f6e5f
--- /dev/null
+++ b/addons/claim_from_delivery/i18n/zh_TW.po
@@ -0,0 +1,23 @@
+# Chinese (Traditional) 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-02-08 00:36+0000\n"
+"PO-Revision-Date: 2012-08-19 10:24+0000\n"
+"Last-Translator: Eric Huang <eh@cenoq.com>\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: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
+
+#. module: claim_from_delivery
+#: model:ir.actions.act_window,name:claim_from_delivery.action_claim_from_delivery
+msgid "Claim"
+msgstr "索賠"
diff --git a/addons/crm/__openerp__.py b/addons/crm/__openerp__.py
index 643908c1098..415431bf531 100644
--- a/addons/crm/__openerp__.py
+++ b/addons/crm/__openerp__.py
@@ -24,8 +24,8 @@
     'name': 'CRM',
     'version': '1.0',
     'category': 'Customer Relationship Management',
-    "sequence": 2,
-    "summary": "Leads, Opportunities, Agenda",
+    'sequence': 2,
+    'summary': 'Leads, Opportunities, Agenda',
     'description': """
 The generic OpenERP Customer Relationship Management.
 =====================================================
@@ -70,12 +70,11 @@ Creates a dashboard for CRM that includes:
         'board',
         'fetchmail'
     ],
-    'init_xml': [
+    'data': [
         'crm_data.xml',
         'crm_lead_data.xml',
         'crm_phonecall_data.xml',
-    ],
-    'update_xml': [
+
         'security/crm_security.xml',
         'security/ir.model.access.csv',
 
@@ -115,22 +114,22 @@ Creates a dashboard for CRM that includes:
         'res_config_view.xml',
 
     ],
-    'demo_xml': [
+    'demo': [
         'crm_demo.xml',
         'crm_lead_demo.xml',
         'crm_phonecall_demo.xml',
     ],
     'test': [
-            'test/process/communication_with_customer.yml',
-            'test/process/lead2opportunity2win.yml',
-            'test/process/merge_opportunity.yml',
-            'test/process/cancel_lead.yml',
-            'test/process/action_rule.yml',
-            'test/process/segmentation.yml',
-            'test/ui/crm_demo.yml',
-            'test/ui/duplicate_lead.yml',
-            'test/ui/delete_lead.yml'
-             ],
+        'test/process/communication_with_customer.yml',
+        'test/process/lead2opportunity2win.yml',
+        'test/process/merge_opportunity.yml',
+        'test/process/cancel_lead.yml',
+        'test/process/action_rule.yml',
+        'test/process/segmentation.yml',
+        'test/ui/crm_demo.yml',
+        'test/ui/duplicate_lead.yml',
+        'test/ui/delete_lead.yml'
+    ],
     'installable': True,
     'application': True,
     'auto_install': False,
diff --git a/addons/crm/board_crm_view.xml b/addons/crm/board_crm_view.xml
index 16ed1e4c5ad..d80183b80c9 100644
--- a/addons/crm/board_crm_view.xml
+++ b/addons/crm/board_crm_view.xml
@@ -2,22 +2,6 @@
 <openerp>
      <data>
         <!-- CRM dashboard -->
-        <record model="ir.actions.act_window" id="act_my_oppor">
-            <field name="name">My Opportunities</field>
-            <field name="res_model">crm.lead</field>
-            <field name="view_mode">tree</field>
-            <field name="domain">[('user_id','=',uid),('type', '=', 'opportunity'),('state','not in',('cancel','done'))]</field>
-            <field name="view_id" ref="crm.crm_case_tree_view_oppor"/>
-        </record>
-
-        <record model="ir.actions.act_window" id="act_crm_tag_tree_view_leads_all">
-            <field name="name">New Leads</field>
-            <field name="res_model">crm.lead</field>
-            <field name="view_mode">tree</field>
-            <field name="domain">[('user_id','=',uid),('state','=','draft'),('type','=','lead')]</field>
-            <field name="view_id" ref="crm.crm_case_tree_view_leads"/>
-        </record>
-
         <record model="ir.ui.view" id="view_crm_opportunity_stage_graph">
             <field name="name">Opportunities By Stage - Graph</field>
             <field name="model">crm.lead.report</field>
@@ -70,11 +54,9 @@
                 <form string="Statistics Dashboard" version="7.0">
                     <board style="1-1">
                         <column>
-                            <action string="New Leads" name="%(act_crm_tag_tree_view_leads_all)d"/>
-                            <action string="My Opportunities" name="%(act_my_oppor)d"/>
+                            <action string="Planned Revenue by Stage and User" name="%(act_oppor_stage_user)d"/>
                         </column>
                         <column>
-                            <action string="Planned Revenue by Stage and User" name="%(act_oppor_stage_user)d"/>
                             <action string="Opportunities by Stage" name="%(act_opportunity_stage)d"/>
                         </column>
                     </board>
diff --git a/addons/crm/crm_action_rule.py b/addons/crm/crm_action_rule.py
index 3e3bdc90d08..8b1ba655afc 100644
--- a/addons/crm/crm_action_rule.py
+++ b/addons/crm/crm_action_rule.py
@@ -46,21 +46,11 @@ class base_action_rule(osv.osv):
     }
 
     def email_send(self, cr, uid, obj, emails, body, emailfrom=tools.config.get('email_from', False), context=None):
-        mail_message = self.pool.get('mail.message')
-        body = self.format_mail(obj, body)
-        if not emailfrom:
-            if hasattr(obj, 'user_id') and obj.user_id and obj.user_id.email:
-                emailfrom = obj.user_id.email
-
-        name = '[%d] %s' % (obj.id, tools.ustr(obj.name))
-        emailfrom = tools.ustr(emailfrom)
-        if hasattr(obj, 'section_id') and obj.section_id and obj.section_id.alias_id:
+        mail_id = super(base_action_rule, self).email_send(cr, uid, obj, emails, body, emailfrom=emailfrom, context=context)
+        if mail_id and hasattr(obj, 'section_id') and obj.section_id and obj.section_id.alias_id:
             reply_to = obj.section_id.alias_id.name_get()[0][1]
-        else:
-            reply_to = emailfrom
-        if not emailfrom:
-            raise osv.except_osv(_('Error!'), _("There is no email for your company address."))
-        return mail_message.schedule_with_attach(cr, uid, emailfrom, emails, name, body, model=obj._name, reply_to=reply_to, res_id=obj.id)
+            self.pool.get('mail.mail').write(cr, uid, [mail_id], {'reply_to': reply_to}, context=context)
+        return mail_id
 
     def do_check(self, cr, uid, action, obj, context=None):
         ok = super(base_action_rule, self).do_check(cr, uid, action, obj, context=context)
@@ -105,8 +95,8 @@ class base_action_rule(osv.osv):
                 write['email_cc'] = obj.act_email_cc
 
         # Put state change by rule in communication history
-        if hasattr(obj, 'state') and hasattr(obj, 'message_append') and action.act_state:
-            model_obj.message_append(cr, uid, [obj], _(action.act_state))
+        if hasattr(obj, 'state') and hasattr(obj, 'message_post') and action.act_state:
+            model_obj.message_post(cr, uid, [obj], _(action.act_state), context=context)
 
         model_obj.write(cr, uid, [obj.id], write, context)
         super(base_action_rule, self).do_action(cr, uid, action, model_obj, obj, context=context)
diff --git a/addons/crm/crm_data.xml b/addons/crm/crm_data.xml
index c5671385e56..5bf4b5ffbf9 100644
--- a/addons/crm/crm_data.xml
+++ b/addons/crm/crm_data.xml
@@ -55,21 +55,20 @@
         </record>
 
         <!-- notify all employees of module installation -->
-        <function model="mail.group" name="message_append_note">
-            <!-- ids, subject, body, parent_id=False, type='notification', content_subtype='html' -->
-            <value eval="[ref('mail.group_all_employees')]"/>
-            <value>Module CRM has been installed</value>
-            <value>From the top menu Sales, you can: trace leads and opportunities, get accurate forecast on your sales pipeline, plan meetings and phonecalls, get realtime statistics and efficiently organize the communication with your prospects.
+        <record model="mail.message" id="module_install_notification">
+            <field name="model">mail.group</field>
+            <field name="res_id" ref="mail.group_all_employees"/>
+            <field name="type">notification</field>
+            <field name="subject">CRM application installed!</field>
+            <field name="body">From the top Sales menu you can track leads and opportunities, get accurate forecast on your sales pipeline, plan meetings and phonecalls, get realtime statistics and efficiently organize the communication with your prospects.
+To manage quotations and sale orders, install the "Sales Management" application.</field>
+        </record>
 
-To manage quotations and sale orders, install the module "Sales Management".</value>
-        </function>
-        
         <record model="mail.alias" id="default_sales_alias">
             <field name="alias_name">sales</field>
             <field name="alias_model_id" ref="model_crm_lead"/>
             <field name="alias_user_id" ref="base.user_root"/>
             <field name="alias_defaults">{'type':'lead'}</field>
         </record>
-
     </data>
 </openerp>
diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index 146417a7abb..ddfdb05ca66 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -19,11 +19,9 @@
 #
 ##############################################################################
 
-import binascii
 from base_status.base_stage import base_stage
 import crm
 from datetime import datetime
-from mail.mail_message import to_email
 from osv import fields, osv
 import time
 import tools
@@ -40,8 +38,7 @@ class crm_lead(base_stage, osv.osv):
     _name = "crm.lead"
     _description = "Lead/Opportunity"
     _order = "priority,date_action,id desc"
-    _inherit = ['ir.needaction_mixin', 'mail.thread']
-    _mail_compose_message = True
+    _inherit = ['mail.thread','ir.needaction_mixin']
 
     def _get_default_section_id(self, cr, uid, context=None):
         """ Gives default section by checking if present in the context """
@@ -90,8 +87,8 @@ class crm_lead(base_stage, osv.osv):
         search_domain = []
         section_id = self._resolve_section_id_from_context(cr, uid, context=context)
         if section_id:
-            search_domain += ['|', '&', ('section_ids', '=', section_id), ('fold', '=', False)]
-        search_domain += ['|', ('id', 'in', ids), '&', ('case_default', '=', True), ('fold', '=', False)]
+            search_domain += ['|', ('section_ids', '=', section_id)]
+        search_domain += ['|', ('id', 'in', ids), ('case_default', '=', True)]
         # retrieve type from the context (if set: choose 'type' or 'both')
         type = self._resolve_type_from_context(cr, uid, context=context)
         if type:
@@ -101,7 +98,12 @@ class crm_lead(base_stage, osv.osv):
         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])))
-        return result
+
+        fold = {}
+        for stage in stage_obj.browse(cr, access_rights_uid, stage_ids, context=context):
+            fold[stage.id] = stage.fold or False
+
+        return result, fold
 
     _group_by_full = {
         'stage_id': _read_group_stage_ids
@@ -175,16 +177,6 @@ class crm_lead(base_stage, osv.osv):
         else:
             return [('id', '=', '0')]
 
-    def _get_email_subject(self, cr, uid, ids, fields, args, context=None):
-        res = {}
-        for obj in self.browse(cr, uid, ids, context=context):
-            res[obj.id] = ''
-            for msg in obj.message_ids:
-                if msg.email_from:
-                    res[obj.id] = msg.subject
-                    break
-        return res
-
     _columns = {
         'partner_id': fields.many2one('res.partner', 'Partner', ondelete='set null',
             select=True, help="Optional linked partner, usually after conversion of the lead"),
@@ -213,7 +205,7 @@ class crm_lead(base_stage, osv.osv):
         'priority': fields.selection(crm.AVAILABLE_PRIORITIES, 'Priority', select=True),
         'date_closed': fields.datetime('Closed', readonly=True),
         'stage_id': fields.many2one('crm.case.stage', 'Stage',
-                        domain="['&', '|', ('section_ids', '=', section_id), ('case_default', '=', True), '|', ('type', '=', type), ('type', '=', 'both')]"),
+                        domain="['&', ('fold', '=', False), '&', '|', ('section_ids', '=', section_id), ('case_default', '=', True), '|', ('type', '=', type), ('type', '=', 'both')]"),
         'user_id': fields.many2one('res.users', 'Salesperson'),
         'referred': fields.char('Referred By', size=64),
         'date_open': fields.datetime('Opened', readonly=True),
@@ -228,7 +220,6 @@ class crm_lead(base_stage, osv.osv):
                       When the case is over, the state is set to \'Done\'.\
                       If the case needs to be reviewed then the state is \
                       set to \'Pending\'.'),
-        'subjects': fields.function(_get_email_subject, fnct_search=_history_search, string='Subject of Email', type='char', size=64),
 
         # Only used for type opportunity
         'probability': fields.float('Success Rate (%)',group_operator="avg"),
@@ -291,6 +282,7 @@ class crm_lead(base_stage, osv.osv):
 
     def on_change_partner(self, cr, uid, ids, partner_id, context=None):
         result = {}
+        values = {}
         if partner_id:
             partner = self.pool.get('res.partner').browse(cr, uid, partner_id, context=context)
             values = {
@@ -448,7 +440,7 @@ class crm_lead(base_stage, osv.osv):
         oldest_id = opportunity_ids[0]
         return self.browse(cr, uid, oldest_id, context=context)
 
-    def _mail_body_text(self, cr, uid, lead, fields, title=False, context=None):
+    def _mail_body(self, cr, uid, lead, fields, title=False, context=None):
         body = []
         if title:
             body.append("%s\n" % (title))
@@ -485,11 +477,11 @@ class crm_lead(base_stage, osv.osv):
         for opportunity in opportunities:
             subject.append(opportunity.name)
             title = "%s : %s" % (merge_message, opportunity.name)
-            details.append(self._mail_body_text(cr, uid, opportunity, fields, title=title, context=context))
+            details.append(self._mail_body(cr, uid, opportunity, fields, title=title, context=context))
 
         subject = subject[0] + ", ".join(subject[1:])
         details = "\n\n".join(details)
-        return self.message_append_note(cr, uid, [opportunity_id], subject=subject, body=details)
+        return self.message_post(cr, uid, [opportunity_id], body=details, subject=subject, context=context)
 
     def _merge_opportunity_history(self, cr, uid, opportunity_id, opportunities, context=None):
         message = self.pool.get('mail.message')
@@ -545,7 +537,7 @@ class crm_lead(base_stage, osv.osv):
         oldest = self._merge_find_oldest(cr, uid, ids, context=context)
         if ctx_opportunities :
             first_opportunity = ctx_opportunities[0]
-            tail_opportunities = opportunities_list
+            tail_opportunities = opportunities_list + ctx_opportunities[1:]
         else:
             first_opportunity = opportunities_list[0]
             tail_opportunities = opportunities_list[1:]
@@ -605,19 +597,13 @@ class crm_lead(base_stage, osv.osv):
         for lead in self.browse(cr, uid, ids, context=context):
             if lead.state in ('done', 'cancel'):
                 continue
-            if user_ids or section_id:
-                self.allocate_salesman(cr, uid, [lead.id], user_ids, section_id, context=context)
-
             vals = self._convert_opportunity_data(cr, uid, lead, customer, section_id, context=context)
             self.write(cr, uid, [lead.id], vals, context=context)
-
             self.convert_opportunity_send_note(cr, uid, lead, context=context)
-            #TOCHECK: why need to change partner details in all messages of lead ?
-            if lead.partner_id:
-                msg_ids = [ x.id for x in lead.message_ids]
-                mail_message.write(cr, uid, msg_ids, {
-                        'partner_id': lead.partner_id.id
-                    }, context=context)
+
+        if user_ids or section_id:
+            self.allocate_salesman(cr, uid, ids, user_ids, section_id, context=context)
+
         return True
 
     def _lead_create_contact(self, cr, uid, lead, name, is_company, parent_id=False, context=None):
@@ -629,7 +615,7 @@ class crm_lead(base_stage, osv.osv):
             'parent_id': parent_id,
             'phone': lead.phone,
             'mobile': lead.mobile,
-            'email': lead.email_from and to_email(lead.email_from)[0],
+            'email': lead.email_from and tools.email_split(lead.email_from)[0],
             'fax': lead.fax,
             'title': lead.title and lead.title.id or False,
             'function': lead.function,
@@ -649,7 +635,7 @@ class crm_lead(base_stage, osv.osv):
         partner_id =  False
         if lead.partner_name and lead.contact_name:
             partner_id = self._lead_create_contact(cr, uid, lead, lead.partner_name, True, context=context)
-            self._lead_create_contact(cr, uid, lead, lead.contact_name, False, partner_id, context=context)
+            partner_id = self._lead_create_contact(cr, uid, lead, lead.contact_name, False, partner_id, context=context)
         elif lead.partner_name and not lead.contact_name:
             partner_id = self._lead_create_contact(cr, uid, lead, lead.partner_name, True, context=context)
         elif not lead.partner_name and lead.contact_name:
@@ -677,32 +663,16 @@ class crm_lead(base_stage, osv.osv):
         if context is None:
             context = {}
         partner_ids = {}
+        force_partner_id = partner_id
         for lead in self.browse(cr, uid, ids, context=context):
             if action == 'create':
                 if not partner_id:
                     partner_id = self._create_lead_partner(cr, uid, lead, context)
+                partner_id = force_partner_id or self._create_lead_partner(cr, uid, lead, context=context)
             self._lead_set_partner(cr, uid, lead, partner_id, context=context)
             partner_ids[lead.id] = partner_id
         return partner_ids
 
-    def _send_mail_to_salesman(self, cr, uid, lead, context=None):
-        """
-        Send mail to salesman with updated Lead details.
-        @ lead: browse record of 'crm.lead' object.
-        """
-        #TOFIX: mail template should be used here instead of fix subject, body text.
-        message = self.pool.get('mail.message')
-        email_to = lead.user_id and lead.user_id.email
-        if not email_to:
-            return False
-
-        email_from = lead.section_id and lead.section_id.user_id and lead.section_id.user_id.email or email_to
-        partner = lead.partner_id and lead.partner_id.name or lead.partner_name
-        subject = "lead %s converted into opportunity" % lead.name
-        body = "Info \n Id : %s \n Subject: %s \n Partner: %s \n Description : %s " % (lead.id, lead.name, lead.partner_id.name, lead.description)
-        return message.schedule_with_attach(cr, uid, email_from, [email_to], subject, body)
-
-
     def allocate_salesman(self, cr, uid, ids, user_ids, team_id=False, context=None):
         index = 0
         for lead_id in ids:
@@ -820,14 +790,13 @@ class crm_lead(base_stage, osv.osv):
         if custom_values is None: custom_values = {}
         custom_values.update({
             'name':  msg.get('subject') or _("No Subject"),
-            'description': msg.get('body_text'),
+            'description': msg.get('body'),
             'email_from': msg.get('from'),
             'email_cc': msg.get('cc'),
             'user_id': False,
         })
         if msg.get('priority') in dict(crm.AVAILABLE_PRIORITIES):
             custom_values['priority'] = msg.get('priority')
-        custom_values.update(self.message_partner_by_email(cr, uid, msg.get('from', False), context=context))
         return super(crm_lead, self).message_new(cr, uid, msg, custom_values=custom_values, context=context)
 
     def message_update(self, cr, uid, ids, msg, update_vals=None, context=None):
@@ -840,18 +809,18 @@ class crm_lead(base_stage, osv.osv):
         if update_vals is None: update_vals = {}
 
         if msg.get('priority') in dict(crm.AVAILABLE_PRIORITIES):
-            vals['priority'] = msg.get('priority')
+            update_vals['priority'] = msg.get('priority')
         maps = {
             'cost':'planned_cost',
             'revenue': 'planned_revenue',
             'probability':'probability',
         }
-        for line in msg.get('body_text', '').split('\n'):
+        for line in msg.get('body', '').split('\n'):
             line = line.strip()
             res = tools.misc.command_re.match(line)
             if res and maps.get(res.group(1).lower()):
                 key = maps.get(res.group(1).lower())
-                vals[key] = res.group(2).lower()
+                update_vals[key] = res.group(2).lower()
 
         return super(crm_lead, self).message_update(cr, uid, ids, msg, update_vals=update_vals, context=context)
 
@@ -859,15 +828,10 @@ class crm_lead(base_stage, osv.osv):
     # OpenChatter methods and notifications
     # ----------------------------------------
 
-    def message_get_monitored_follower_fields(self, cr, uid, ids, context=None):
-        """ Add 'user_id' to the monitored fields """
-        res = super(crm_lead, self).message_get_monitored_follower_fields(cr, uid, ids, context=context)
-        return res + ['user_id']
-
     def stage_set_send_note(self, cr, uid, ids, stage_id, context=None):
         """ Override of the (void) default notification method. """
         stage_name = self.pool.get('crm.case.stage').name_get(cr, uid, [stage_id], context=context)[0][1]
-        return self.message_append_note(cr, uid, ids, body= _("Stage changed to <b>%s</b>.") % (stage_name), context=context)
+        return self.message_post(cr, uid, ids, body= _("Stage changed to <b>%s</b>.") % (stage_name), context=context)
 
     def case_get_note_msg_prefix(self, cr, uid, lead, context=None):
         if isinstance(lead, (int, long)):
@@ -877,33 +841,33 @@ class crm_lead(base_stage, osv.osv):
     def create_send_note(self, cr, uid, ids, context=None):
         for id in ids:
             message = _("%s has been <b>created</b>.")% (self.case_get_note_msg_prefix(cr, uid, id, context=context))
-            self.message_append_note(cr, uid, [id], body=message, context=context)
+            self.message_post(cr, uid, [id], body=message, context=context)
         return True
 
     def case_mark_lost_send_note(self, cr, uid, ids, context=None):
         message = _("Opportunity has been <b>lost</b>.")
-        return self.message_append_note(cr, uid, ids, body=message, context=context)
+        return self.message_post(cr, uid, ids, body=message, context=context)
 
     def case_mark_won_send_note(self, cr, uid, ids, context=None):
         message = _("Opportunity has been <b>won</b>.")
-        return self.message_append_note(cr, uid, ids, body=message, context=context)
+        return self.message_post(cr, uid, ids, body=message, context=context)
 
     def schedule_phonecall_send_note(self, cr, uid, ids, phonecall_id, action, context=None):
         phonecall = self.pool.get('crm.phonecall').browse(cr, uid, [phonecall_id], context=context)[0]
         if action == 'log': prefix = 'Logged'
         else: prefix = 'Scheduled'
         message = _("<b>%s a call</b> for the <em>%s</em>.") % (prefix, phonecall.date)
-        return self.message_append_note(cr, uid, ids, body=message, context=context)
+        return self.message_post(cr, uid, ids, body=message, context=context)
 
     def _lead_set_partner_send_note(self, cr, uid, ids, context=None):
         for lead in self.browse(cr, uid, ids, context=context):
             message = _("%s <b>partner</b> is now set to <em>%s</em>." % (self.case_get_note_msg_prefix(cr, uid, lead, context=context), lead.partner_id.name))
-            lead.message_append_note(body=message)
+            lead.message_post(body=message)
         return True
 
     def convert_opportunity_send_note(self, cr, uid, lead, context=None):
         message = _("Lead has been <b>converted to an opportunity</b>.")
-        lead.message_append_note(body=message)
+        lead.message_post(body=message)
         return True
 
 crm_lead()
diff --git a/addons/crm/crm_lead_data.xml b/addons/crm/crm_lead_data.xml
index 04f91933f66..f734a839ff4 100644
--- a/addons/crm/crm_lead_data.xml
+++ b/addons/crm/crm_lead_data.xml
@@ -55,7 +55,7 @@
         <record model="crm.case.stage" id="stage_lead7">
             <field name="name">Dead</field>
             <field eval="1" name="case_default"/>
-            <field eval="True" name="fold"/>
+            <field eval="False" name="fold"/>
             <field name="state">cancel</field>
             <field eval="'0'" name="probability"/>
             <field eval="'16'" name="sequence"/>
diff --git a/addons/crm/crm_lead_demo.xml b/addons/crm/crm_lead_demo.xml
index ed51c525335..b3c00256b06 100644
--- a/addons/crm/crm_lead_demo.xml
+++ b/addons/crm/crm_lead_demo.xml
@@ -23,7 +23,7 @@
             <field name="channel_id" ref="crm_case_channel_email"/>
             <field name="priority">1</field>
             <field name="section_id" ref="crm_case_section_4"/>
-            <field name="user_id" ref="base.user_admin"/>
+            <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,
@@ -47,9 +47,8 @@ Can you send details,</field>
             <field name="channel_id" ref="crm_case_channel_website"/>
             <field name="priority">4</field>
             <field name="section_id" ref="crm_case_section_3"/>
-            <field name="user_id" ref="base.user_admin"/>
+            <field name="user_id" ref="base.user_root"/>
             <field name="stage_id" ref="stage_lead1"/>
-            <field name="description">Want to know features and benifits to use the new software.</field>
             <field eval="1" name="active"/>
         </record>
 
@@ -109,7 +108,7 @@ Can you send details,</field>
             <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_admin"/>
+            <field name="user_id" ref="base.user_root"/>
             <field name="stage_id" ref="stage_lead1"/>
             <field name="description">Hi, Can you send a quotation for 20 Computers with speakers? 
 Regards,
@@ -136,7 +135,7 @@ Contact: +1 813 494 5005</field>
             <field name="channel_id" ref=""/>
             <field name="priority">3</field>
             <field name="section_id" ref="crm_case_section_4"/>
-            <field name="user_id" ref="base.user_admin"/>
+            <field name="user_id" ref="base.user_root"/>
             <field name="stage_id" ref="stage_lead1"/>
             <field eval="1" name="active"/>
         </record>
@@ -195,7 +194,7 @@ 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_admin"/>
+            <field name="user_id" ref="base.user_root"/>
             <field name="stage_id" ref="stage_lead1"/>
             <field eval="1" name="active"/>
         </record>
@@ -298,7 +297,7 @@ Andrew</field>
             <field eval="time.strftime('%Y-%m-12')" name="date_action"/>
             <field name="title_action">Meeting for pricing information.</field>
             <field name="section_id" ref="crm_case_section_3"/>
-            <field name="user_id" ref="base.user_admin"/>
+            <field name="user_id" ref="base.user_root"/>
             <field name="stage_id" ref="crm.stage_lead3"/>
             <field eval="1" name="active"/>
         </record>
@@ -343,7 +342,7 @@ Andrew</field>
             <field eval="time.strftime('%Y-%m-10')" name="date_action"/>
             <field name="title_action">Call to ask system requirement</field>
             <field name="section_id" ref="crm_case_section_3"/>
-            <field name="user_id" ref="base.user_admin"/>
+            <field name="user_id" ref="base.user_root"/>
             <field name="stage_id" ref="crm.stage_lead4"/>
             <field eval="1" name="active"/>
         </record>
@@ -412,7 +411,7 @@ Andrew</field>
             <field eval="time.strftime('%Y-%m-4')" name="date_action"/>
             <field name="title_action">Call to define real needs about training</field>
             <field name="section_id" ref="crm_case_section_2"/>
-            <field name="user_id" ref="base.user_admin"/>
+            <field name="user_id" ref="base.user_root"/>
             <field name="stage_id" ref="crm.stage_lead3"/>
             <field eval="1" name="active"/>
         </record>
@@ -435,7 +434,7 @@ Andrew</field>
             <field eval="time.strftime('%Y-%m-5')" name="date_action"/>
             <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_admin"/>
+            <field name="user_id" ref="base.user_root"/>
             <field name="stage_id" ref="crm.stage_lead4"/>
             <field eval="1" name="active"/>
         </record>
@@ -467,7 +466,7 @@ Andrew</field>
             <field name="channel_id" ref="crm_case_channel_phone"/>
             <field name="priority">3</field>
             <field name="section_id" ref="crm_case_section_4"/>
-            <field name="user_id" ref="base.user_admin"/>
+            <field name="user_id" ref="base.user_root"/>
             <field name="stage_id" ref="crm.stage_lead8"/>
             <field eval="1" name="active"/>
         </record>
@@ -485,7 +484,7 @@ Andrew</field>
             <field name="channel_id" ref="crm_case_channel_email"/>
             <field name="priority">3</field>
             <field name="section_id" ref="crm_case_section_4"/>
-            <field name="user_id" ref="base.user_admin"/>
+            <field name="user_id" ref="base.user_root"/>
             <field name="stage_id" ref="crm.stage_lead8"/>
             <field eval="1" name="active"/>
         </record>
@@ -520,7 +519,7 @@ Andrew</field>
             <field name="priority">5</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_admin"/>
+            <field name="user_id" ref="base.user_root"/>
             <field name="stage_id" ref="crm.stage_lead6"/>
             <field eval="1" name="active"/>
         </record>
@@ -543,62 +542,76 @@ Andrew</field>
             <field name="priority">2</field>
             <field name="title_action">Conf call with technical service</field>
             <field name="section_id" ref="crm_case_section_2"/>
-            <field name="user_id" ref="base.user_admin"/>
+            <field name="user_id" ref="base.user_root"/>
             <field name="stage_id" ref="crm.stage_lead4"/>
             <field eval="1" name="active"/>
         </record>
 
         <!-- Some messages linked to the previous opportunity -->
         <record id="message_email0" model="mail.message">
-            <field name="subject">Kitchen design</field>
+            <field name="subject">Plan to buy a Laptop</field>
             <field name="model">crm.lead</field>
             <field name="res_id" ref="crm_case_15"/>
-            <field name="content_subtype">html</field>
-            <field name="body_html"><![CDATA[Email0 inquiry]]></field>
+            <field name="body">&lt;![CDATA[Email0 inquiry]]&gt;&lt;div&gt;&lt;font size="2"&gt;Hello,&lt;/font&gt;&lt;/div&gt;&lt;div&gt;&lt;font size="2"&gt;&lt;br&gt;&lt;/font&gt;&lt;/div&gt;&lt;div&gt;&lt;font size="2"&gt;I am interested in your company's product and I plan to buy a new laptop having latest technologies and affordable price.&lt;/font&gt;&lt;/div&gt;&lt;div&gt;&lt;font size="2"&gt;Can you please send me product catalogue?&lt;/font&gt;&lt;/div&gt;</field>
             <field name="type">email</field>
-            <field name="state">sent</field>
-            <field name="user_id" ref="base.user_root"></field>
         </record>
         <record id="message_note0" model="mail.message">
-            <field name="subject">Reply</field>
+            <field name="subject">Re: Plan to buy a Laptop</field>
             <field name="model">crm.lead</field>
             <field name="res_id" ref="crm_case_15"/>
-            <field name="content_subtype">html</field>
-            <field name="body_html"><![CDATA[Internal note0]]></field>
             <field name="type">comment</field>
-            <field name="user_id" ref="base.user_root"></field>
+            <field name="body">Dear Customer,
+Thanks for showing interest in our products.
+We have attached the catalogue,
+We would like to know your interests, Let us know if we can call you for more details.
+
+Thanks</field>
+            <field name="parent_id" ref="message_email0"/>
+            <field name="author_id" ref="base.partner_root"/>
         </record>
         <record id="message_note0_comment0" model="mail.message">
-            <field name="subject">Reply</field>
+            <field name="subject">Re: Plan to buy a Laptop</field>
             <field name="model">crm.lead</field>
             <field name="res_id" ref="crm_case_15"/>
-            <field name="content_subtype">html</field>
-            <field name="body_html"><![CDATA[comment on note0]]></field>
-            <field name="parent_id" ref="message_note0"/>
             <field name="type">comment</field>
-            <field name="user_id" ref="base.user_root"></field>
+            <field name="body">&lt;div&gt;Thanks for the information,&lt;/div&gt;&lt;div&gt;I will visit the store soon.&lt;/div&gt;</field>
+            <field name="parent_id" ref="message_note0"/>
+            <field name="author_id" ref="base.partner_demo"/>
         </record>
         <record id="message_note0_comment1" model="mail.message">
-            <field name="subject">Reply</field>
+            <field name="subject">Re: Plan to buy a Laptop</field>
             <field name="model">crm.lead</field>
             <field name="res_id" ref="crm_case_15"/>
-            <field name="content_subtype">html</field>
-            <field name="body_html"><![CDATA[comment1 on note0]]></field>
-            <field name="parent_id" ref="message_note0"/>
             <field name="type">comment</field>
-            <field name="user_id" ref="base.user_root"></field>
+            <field name="body">&lt;font color="#1f1f1f"&gt;Can you tell me if the store is open at 9:00 PM?&lt;/b&gt;&lt;/font&gt;</field>
+            <field name="parent_id" ref="message_note0"/>
+            <field name="author_id" ref="base.partner_demo"/>
         </record>
         <record id="message_email1" model="mail.message">
-            <field name="subject">Your inquiry</field>
+            <field name="subject">Re: Plan to buy a Laptop</field>
             <field name="model">crm.lead</field>
             <field name="res_id" ref="crm_case_15"/>
-            <field name="content_subtype">html</field>
-            <field name="body_html"><![CDATA[hello, outgoing email]]></field>
+            <field name="body">Yes, its open till 10:00 PM, you are welcome!</field>
             <field name="type">email</field>
-            <field name="state">received</field>
-            <field name="user_id" ref="base.user_root"></field>
+            <field name="author_id" ref="base.partner_root"/>
+        </record>
+        <record id="message_email_12" 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">Hello,
+I am Jason from Le Club SARL,
+I am intertested to attend Training organized in your company,
+Can you send details,</field>
+            <field name="type">email</field>
+        </record>
+        <record id="message_email_13" 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 benifits to use the new software.</field>
+            <field name="type">comment</field>
         </record>
-
 
         <!--        Call Function to set the opportunities as Unread -->
         <function model="crm.lead" name="message_mark_as_unread"
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index e56215f3332..29299373d91 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -155,7 +155,7 @@
                         <group>
                             <field name="partner_name" string="Company Name"/>
                             <field name="partner_id" string="Customer"
-                                on_change="on_change_partner(partner_id)" />
+                                on_change="on_change_partner(partner_id)" options='{"create_name_field": "name"}'/>
                             <label for="street" string="Address"/>
                             <div>
                                 <field name="street" placeholder="Street..."/>
@@ -246,7 +246,7 @@
             <field name="name">Leads</field>
             <field name="model">crm.lead</field>
             <field name="arch" type="xml">
-                <tree string="Leads" fonts="bold:needaction_pending==True" colors="grey:state in ('cancel', 'done')">
+                <tree string="Leads" fonts="bold:message_unread==True" colors="grey:state in ('cancel', 'done')">
                     <field name="date_deadline" invisible="1"/>
                     <field name="create_date" groups="base.group_no_one"/>
                     <field name="name"/>
@@ -257,12 +257,11 @@
                     <field name="stage_id"/>
                     <field name="user_id" invisible="1"/>
                     <field name="section_id" invisible="context.get('invisible_section', True)" />
-                    <field name="state" groups="base.group_no_one"/>
+                    <field name="state" invisible="1"/>
                     <field name="type_id" invisible="1"/>
                     <field name="referred" invisible="1"/>
                     <field name="channel_id" invisible="1"/>
-                    <field name="subjects" invisible="1"/>
-                    <field name="needaction_pending" invisible="1"/>
+                    <field name="message_unread" invisible="1"/>
                 </tree>
             </field>
         </record>
@@ -288,6 +287,7 @@
             <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"/>
                     <field name="planned_revenue" sum="Expected Revenues"/>
@@ -295,23 +295,16 @@
                     <field name="user_id"/>
                     <field name="partner_address_email"/>
                     <field name="message_summary"/>
-                    <field name="needaction_pending"/>
+                    <field name="message_unread"/>
                     <templates>
-                        <t t-name="lead_details">
-                            <ul class="oe_kanban_tooltip">
-                                <li t-if="record.phone.raw_value"><b>Phone:</b> <field name="phone"/></li>
-                                <li><b>Probability:</b> <field name="probability"/>%%</li>
-                                <li><b>Creation date:</b> <field name="create_date"/></li>
-                                <li t-if="record.date_deadline.raw_value"><b>Date Deadline:</b> <field name="date_deadline"/></li>
-                            </ul>
-                        </t>
+                        <field name="date_deadline"/>
                         <t t-name="kanban-box">
                             <div t-attf-class="oe_kanban_color_#{kanban_getcolor(record.color.raw_value)} oe_kanban_card oe_kanban_global_click">
                                 <div class="oe_dropdown_toggle oe_dropdown_kanban">
                                     <span class="oe_e">í</span>
                                     <ul class="oe_dropdown_menu">
-                                        <li><a type="edit" >Edit...</a></li>
-                                        <li><a type="delete">Delete</a></li>
+                                        <t t-if="widget.view.is_action_enabled('edit')"><li><a type="edit">Edit...</a></li></t>
+                                        <t t-if="widget.view.is_action_enabled('delete')"><li><a type="delete">Delete</a></li></t>
                                         <li><a name="%(mail.action_email_compose_message_wizard)d" type="action">Send Email</a></li>
                                         <li><a name="%(opportunity2phonecall_act)d" type="action">Log Call</a></li>
                                         <li><a name="action_makeMeeting" type="object">Schedule Meeting</a></li>
@@ -341,7 +334,6 @@
                                         <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"/>
                                     </div>
                                     <div class="oe_kanban_footer_left">
-                                        <t t-if="record.needaction_pending.raw_value"><span class="oe_kanban_mail_new">New</span></t>
                                         <t t-raw="record.message_summary.raw_value"/>
                                     </div>
                                 </div>
@@ -361,10 +353,8 @@
                 <search string="Search Leads">
                     <field name="name" string="Lead / Customer" filter_domain="['|','|',('partner_name','ilike',self),('email_from','ilike',self),('name','ilike',self)]"/>
                     <field name="categ_ids" string="Category" filter_domain="[('categ_ids','ilike',self)]" />
-                    <!-- subjects is not set as store=True so, it is placed outside filter_domain-->
-                    <field name="subjects"/>
                     <field name="create_date"/>
-                    <filter icon="terp-mail-message-new" string="Inbox" help="Unread messages" name="needaction_pending" domain="[('needaction_pending','=',True)]"/>
+                    <filter icon="terp-mail-message-new" string="Inbox" help="Unread messages" name="message_unread" domain="[('message_unread','=',True)]"/>
                     <separator/>
                     <filter icon="terp-check" string="New" name="new" help="New Leads" domain="[('state','=','draft')]"/>
                     <filter icon="terp-camera_test" string="Open" name="open" domain="[('state','=','open')]"/>
@@ -385,7 +375,6 @@
                         <filter string="Channel" icon="terp-call-start" domain="[]" context="{'group_by':'channel_id'}" />
                         <separator orientation="vertical"/>
                         <filter string="Stage" icon="terp-stage" domain="[]" context="{'group_by':'stage_id'}"/>
-                        <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
                         <filter string="Creation" help="Create date" icon="terp-go-month" domain="[]" context="{'group_by':'create_date'}" groups="base.group_no_one"/>
                     </group>
                     <group string="Display">
@@ -514,7 +503,7 @@
                                     <field name="day_open" groups="base.group_no_one"/>
                                     <field name="day_close" groups="base.group_no_one"/>
                                     <field name="referred"/>
-                                    <field name="state" groups="base.group_no_one"/>
+                                    <field name="state" invisible="1"/>
                                     <field name="type" invisible="1"/>
                                 </group>
                                 <group string="References">
@@ -544,7 +533,7 @@
             <field name="name">Opportunities Tree</field>
             <field name="model">crm.lead</field>
             <field name="arch" type="xml">
-                <tree string="Opportunities" fonts="bold:needaction_pending==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:state in ('cancel', 'done');red:date_deadline and (date_deadline &lt; current_date)">
                     <field name="date_deadline" invisible="1"/>
                     <field name="create_date" groups="base.group_no_one"/>
                     <field name="name" string="Opportunity"/>
@@ -554,7 +543,6 @@
                     <field name="title_action" />
                     <field name="channel_id" invisible="1"/>
                     <field name="type_id" invisible="1"/>
-                    <field name="subjects" invisible="1"/>
                     <field name="stage_id"/>
                     <field name="planned_revenue" sum="Expected Revenues"/>
                     <field name="probability" widget="progressbar" avg="Avg. of Probability"/>
@@ -562,7 +550,7 @@
                     <field name="user_id"/>
                     <field name="priority" invisible="1"/>
                     <field name="state" groups="base.group_no_one"/>
-                    <field name="needaction_pending" invisible="1"/>
+                    <field name="message_unread" invisible="1"/>
                 </tree>
             </field>
         </record>
@@ -577,7 +565,7 @@
                     <field name="name" string="Opportunity / Customer"
                         filter_domain="['|','|','|',('partner_id','ilike',self),('partner_name','ilike',self),('email_from','ilike',self),('name', 'ilike', self)]"/>
                     <field name="categ_ids" string="Category" filter_domain="[('categ_ids','ilike', self)]" />
-                    <filter icon="terp-mail-message-new" string="Inbox" help="Unread messages" name="needaction_pending" domain="[('needaction_pending','=',True)]"/>
+                    <filter icon="terp-mail-message-new" string="Inbox" help="Unread messages" name="message_unread" domain="[('message_unread','=',True)]"/>
                     <separator/>
                     <filter icon="terp-check" string="New" help="New Opportunities" name="new" domain="[('state','=','draft')]"/>
                     <filter icon="terp-camera_test" string="Open" help="Open Opportunities" name="open" domain="[('state','=','open')]"/>
@@ -599,7 +587,6 @@
                         <filter string="Priority" icon="terp-rating-rated" domain="[]" context="{'group_by':'priority'}" />
                         <filter string="Campaign" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'type_id'}"/>
                         <filter string="Channel" icon="terp-call-start" domain="[]" context="{'group_by':'channel_id'}" />
-                        <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
                         <filter string="Creation" icon="terp-go-month" domain="[]" context="{'group_by':'create_date'}" groups="base.group_no_one"/>
                         <filter string="Exp.Closing" icon="terp-go-month" help="Expected Closing" domain="[]" context="{'group_by':'date_deadline'}" />
                     </group>
diff --git a/addons/crm/crm_meeting.py b/addons/crm/crm_meeting.py
index 13171d95b9b..62fc53364ee 100644
--- a/addons/crm/crm_meeting.py
+++ b/addons/crm/crm_meeting.py
@@ -44,7 +44,7 @@ class crm_meeting(osv.Model):
     def create_send_note(self, cr, uid, ids, context=None):
         if context is None:
             context = {}
-        # update context: if come from phonecall, default state values can make the message_append_note crash
+        # update context: if come from phonecall, default state values can make the message_post crash
         context.pop('default_state', False)
         for meeting in self.browse(cr, uid, ids, context=context):
             # in the message, transpose meeting.date to the timezone of the current user
@@ -53,14 +53,14 @@ class crm_meeting(osv.Model):
             if meeting.opportunity_id: # meeting can be create from phonecalls or opportunities, therefore checking for the parent
                 lead = meeting.opportunity_id
                 message = _("Meeting linked to the opportunity <em>%s</em> has been <b>created</b> and <b>scheduled</b> on <em>%s</em>.") % (lead.name, meeting_date_tz)
-                lead.message_append_note(_('System Notification'), message)
+                lead.message_post(body=message)
             elif meeting.phonecall_id:
                 phonecall = meeting.phonecall_id
                 message = _("Meeting linked to the phonecall <em>%s</em> has been <b>created</b> and <b>scheduled</b> on <em>%s</em>.") % (phonecall.name, meeting_date_tz)
-                phonecall.message_append_note(body=message)
+                phonecall.message_post(body=message)
             else:
                 message = _("A meeting has been <b>scheduled</b> on <em>%s</em>.") % (meeting_date_tz)
-            meeting.message_append_note(body=message)
+            meeting.message_post(body=message)
         return True
 
 class calendar_attendee(osv.osv):
diff --git a/addons/crm/crm_meeting_view.xml b/addons/crm/crm_meeting_view.xml
index d7f59267a30..068f7cfbf64 100644
--- a/addons/crm/crm_meeting_view.xml
+++ b/addons/crm/crm_meeting_view.xml
@@ -2,9 +2,8 @@
 <openerp>
     <data>
 
-    <!-- Calendar Attendee Form View -->
-
-    <record id="attendee_form_view_inherit" model="ir.ui.view">
+        <!-- Calendar Attendee Form View -->
+        <record id="attendee_form_view_inherit" model="ir.ui.view">
             <field name="name">calendar.attendee.form.inherit</field>
             <field name="model">calendar.attendee</field>
             <field name="inherit_id" ref="base_calendar.base_calendar_attendee_form_view"/>
@@ -13,7 +12,7 @@
                     <field name="categ_id" string="Event Type"/>
                 </field>
             </field>
-    </record>
+        </record>
 
     </data>
 </openerp>
diff --git a/addons/crm/crm_phonecall.py b/addons/crm/crm_phonecall.py
index da08f97250a..44894fc881d 100644
--- a/addons/crm/crm_phonecall.py
+++ b/addons/crm/crm_phonecall.py
@@ -32,7 +32,7 @@ class crm_phonecall(base_state, osv.osv):
     _name = "crm.phonecall"
     _description = "Phonecall"
     _order = "id desc"
-    _inherit = ['ir.needaction_mixin', 'mail.thread']
+    _inherit = ['mail.thread']
     _columns = {
         # base_state required fields
         'date_action_last': fields.datetime('Last Action', readonly=1),
@@ -177,11 +177,11 @@ class crm_phonecall(base_state, osv.osv):
         if context is None:
             context = {}
         partner_ids = {}
+        force_partner_id = partner_id
         for call in self.browse(cr, uid, ids, context=context):
             if action == 'create':
-               if not partner_id:
-                   partner_id = self._call_create_partner(cr, uid, call, context=context)
-               self._call_create_partner_address(cr, uid, call, partner_id, context=context)
+                partner_id = force_partner_id or self._call_create_partner(cr, uid, call, context=context)
+                self._call_create_partner_address(cr, uid, call, partner_id, context=context)
             self._call_set_partner(cr, uid, [call.id], partner_id, context=context)
             partner_ids[call.id] = partner_id
         return partner_ids
@@ -266,7 +266,7 @@ class crm_phonecall(base_state, osv.osv):
     
     def case_reset_send_note(self, cr, uid, ids, context=None):
         message = _('Phonecall has been <b>reset and set as open</b>.')
-        return self.message_append_note(cr, uid, ids, body=message, context=context)
+        return self.message_post(cr, uid, ids, body=message, context=context)
 
     def case_open_send_note(self, cr, uid, ids, context=None):
         lead_obj = self.pool.get('crm.lead')
@@ -280,11 +280,11 @@ class crm_phonecall(base_state, osv.osv):
                 message = _("Phonecall linked to the opportunity <em>%s</em> has been <b>created</b> and <b>scheduled</b> on <em>%s</em>.") % (lead.name, phonecall_date_str)
             else:
                 message = _("Phonecall has been <b>created and opened</b>.")
-            phonecall.message_append_note(body=message)
+            phonecall.message_post(body=message)
         return True
 
     def _call_set_partner_send_note(self, cr, uid, ids, context=None):
-        return self.message_append_note(cr, uid, ids, body=_("Partner has been <b>created</b>."), context=context)
+        return self.message_post(cr, uid, ids, body=_("Partner has been <b>created</b>."), context=context)
 
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/crm/crm_phonecall_view.xml b/addons/crm/crm_phonecall_view.xml
index 3b5162288a4..2f885e09b61 100644
--- a/addons/crm/crm_phonecall_view.xml
+++ b/addons/crm/crm_phonecall_view.xml
@@ -66,8 +66,7 @@
         <field name="name">CRM - Phone Calls Tree</field>
         <field name="model">crm.phonecall</field>
         <field name="arch" type="xml">
-            <tree fonts="bold:needaction_pending==True" colors="gray:state in ('cancel','done');blue:state in ('pending',)" string="Phone Calls">
-                <field name="needaction_pending" invisible="1"/>
+            <tree colors="gray:state in ('cancel','done');blue:state in ('pending',)" string="Phone Calls">
                 <field name="date"/>
                 <field name="name"/>
                 <field name="partner_id"/>
@@ -76,7 +75,6 @@
                 <field name="categ_id" invisible="1"/>
                 <field name="create_date" invisible="1"/>
                 <field name="opportunity_id" invisible="1"/>
-                <field name="needaction_pending" invisible="1"/>
                 <button string="Convert to Opportunity"
                     name="%(phonecall2opportunity_act)d"
                     states="open,pending"
@@ -166,7 +164,7 @@
         <field name="name">CRM - Logged Phone Calls Tree</field>
         <field name="model">crm.phonecall</field>
         <field name="arch" type="xml">
-            <tree string="Phone Calls" fonts="bold:needaction_pending==True" editable="top">
+            <tree string="Phone Calls" editable="top">
                 <field name="date"/>
                 <field name="name"/>
                 <field name="partner_id"
@@ -180,7 +178,6 @@
                 <field name="state" invisible="1"/>
                 <field name="create_date" invisible="1"/>
                 <field name="opportunity_id" invisible="1"/>
-                <field name="needaction_pending" invisible="1"/>
                 <button string="Schedule Other Call"
                     icon="terp-call-start"
                     name="%(phonecall_to_phonecall_act)d"
@@ -219,7 +216,6 @@
             <search string="Search Phonecalls">
                <field name="name" string="Phonecalls"/>
                <field name="date"/>
-               <filter icon="terp-mail-message-new" string="Inbox" help="Unread messages" name="needaction_pending" domain="[('needaction_pending','=',True)]"/>
                <separator/>
                <filter icon="terp-gtk-go-back-rtl" string="To Do" name="current" domain="[('state','=','open')]"/>
                <separator/>
diff --git a/addons/crm/i18n/ar.po b/addons/crm/i18n/ar.po
index 6f47d36d620..918b4d85d9c 100644
--- a/addons/crm/i18n/ar.po
+++ b/addons/crm/i18n/ar.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:58+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:04+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -1127,7 +1127,7 @@ msgstr "تاريخ الإنشاء"
 #. module: crm
 #: view:board.board:0
 msgid "My Opportunities"
-msgstr ""
+msgstr "الفرص الخاصة بي"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor5
@@ -1173,7 +1173,7 @@ msgstr "رسال للشريك"
 #. module: crm
 #: view:crm.opportunity2phonecall:0 view:crm.phonecall2phonecall:0
 msgid "Call Details"
-msgstr ""
+msgstr "تفاصيل المكالمة"
 
 #. module: crm
 #: field:crm.meeting,class:0
@@ -1183,7 +1183,7 @@ msgstr "تعليم كـ"
 #. module: crm
 #: view:crm.opportunity2phonecall:0 view:crm.phonecall2phonecall:0
 msgid "Log call"
-msgstr ""
+msgstr "سجل المكالمة"
 
 #. module: crm
 #: help:crm.meeting,rrule_type:0
@@ -1426,7 +1426,7 @@ msgstr ""
 #. module: crm
 #: view:crm.phonecall.report:0
 msgid "Date of call"
-msgstr ""
+msgstr "تاريخ المكالمة"
 
 #. module: crm
 #: help:crm.lead,section_id:0
@@ -1819,7 +1819,7 @@ msgstr "أعلى"
 #. module: crm
 #: help:crm.lead.report,creation_year:0
 msgid "Creation year"
-msgstr ""
+msgstr "سنة الإنشاء"
 
 #. module: crm
 #: view:crm.case.section:0 view:crm.lead:0 field:crm.lead,description:0
@@ -2108,7 +2108,7 @@ msgstr "الإحتمال"
 #. module: crm
 #: view:crm.lead:0
 msgid "Pending Opportunities"
-msgstr ""
+msgstr "فرص معلقة"
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:491
@@ -2276,7 +2276,7 @@ msgstr "عدد الإيام لفتح الحالة"
 #. module: crm
 #: selection:crm.meeting,end_type:0
 msgid "Number of repetitions"
-msgstr ""
+msgstr "عدد التكرر"
 
 #. module: crm
 #: field:crm.lead,phone:0 field:crm.opportunity2phonecall,phone:0
@@ -2426,7 +2426,7 @@ msgstr "مشغول"
 #. module: crm
 #: field:crm.lead.report,creation_day:0
 msgid "Creation Day"
-msgstr ""
+msgstr "تاريخ الإنشاء"
 
 #. module: crm
 #: field:crm.meeting,interval:0
@@ -2802,7 +2802,7 @@ msgstr ""
 #. module: crm
 #: field:crm.lead,color:0
 msgid "Color Index"
-msgstr ""
+msgstr "لون الفهرس"
 
 #. module: crm
 #: view:crm.lead:0
@@ -2945,7 +2945,7 @@ msgstr "قناة"
 #: view:crm.lead:0 view:crm.lead.report:0 view:crm.meeting:0
 #: view:crm.phonecall:0 view:crm.phonecall.report:0
 msgid "My Sales Team(s)"
-msgstr ""
+msgstr "فريقي للمبيعات"
 
 #. module: crm
 #: help:crm.segmentation,exclusif:0
@@ -3422,7 +3422,7 @@ msgstr "خاص"
 #. module: crm
 #: selection:crm.meeting,class:0
 msgid "Public for Employees"
-msgstr ""
+msgstr "عام لكل الموظفيين"
 
 #. module: crm
 #: field:crm.lead,function:0
@@ -3461,7 +3461,7 @@ msgstr "الاهتمام بالاجزاء"
 #. module: crm
 #: view:crm.lead:0
 msgid "New Opportunities"
-msgstr ""
+msgstr "فرص جديدة"
 
 #. module: crm
 #: code:addons/crm/crm_action_rule.py:61
@@ -3629,7 +3629,7 @@ msgstr "مسلسل"
 #. module: crm
 #: model:ir.model,name:crm.model_mail_compose_message
 msgid "E-mail composition wizard"
-msgstr ""
+msgstr "مرشد تركيب البريد الإلكتروني"
 
 #. module: crm
 #: view:crm.meeting:0
@@ -3666,7 +3666,7 @@ msgstr "سنة"
 #. module: crm
 #: constraint:res.partner:0
 msgid "Error ! You cannot create recursive associated members."
-msgstr ""
+msgstr "خطأ ! لا يمكنك إنشاء أعضاء مرتبطين و متداخلين."
 
 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_lead8
diff --git a/addons/crm/i18n/bg.po b/addons/crm/i18n/bg.po
index 80da84dc659..18bc020a68e 100644
--- a/addons/crm/i18n/bg.po
+++ b/addons/crm/i18n/bg.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:58+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:05+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: crm
 #: view:crm.lead.report:0
diff --git a/addons/crm/i18n/bs.po b/addons/crm/i18n/bs.po
index 8c1c7147d63..e4e04af4646 100644
--- a/addons/crm/i18n/bs.po
+++ b/addons/crm/i18n/bs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:58+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:04+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: crm
 #: view:crm.lead.report:0
diff --git a/addons/crm/i18n/ca.po b/addons/crm/i18n/ca.po
index 0b2865fd8eb..1afc890b875 100644
--- a/addons/crm/i18n/ca.po
+++ b/addons/crm/i18n/ca.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:58+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:05+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: crm
 #: view:crm.lead.report:0
diff --git a/addons/crm/i18n/cs.po b/addons/crm/i18n/cs.po
index 1fcad11184a..b53109fd664 100644
--- a/addons/crm/i18n/cs.po
+++ b/addons/crm/i18n/cs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:58+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:05+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 "X-Poedit-Language: Czech\n"
 
 #. module: crm
diff --git a/addons/crm/i18n/da.po b/addons/crm/i18n/da.po
index c7245d4ea56..4a2569c74c8 100644
--- a/addons/crm/i18n/da.po
+++ b/addons/crm/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:58+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:05+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: crm
 #: view:crm.lead.report:0
diff --git a/addons/crm/i18n/de.po b/addons/crm/i18n/de.po
index 1feb0d2dca0..ab1c85f22bf 100644
--- a/addons/crm/i18n/de.po
+++ b/addons/crm/i18n/de.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:58+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:05+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: crm
 #: view:crm.lead.report:0
diff --git a/addons/crm/i18n/el.po b/addons/crm/i18n/el.po
index 3a6a7810706..c8a2ddf90f3 100644
--- a/addons/crm/i18n/el.po
+++ b/addons/crm/i18n/el.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:58+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:05+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
 "X-Poedit-SourceCharset: utf-8\n"
diff --git a/addons/crm/i18n/es.po b/addons/crm/i18n/es.po
index e907f9a594f..2c7c7989759 100644
--- a/addons/crm/i18n/es.po
+++ b/addons/crm/i18n/es.po
@@ -8,13 +8,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 01:37+0100\n"
 "PO-Revision-Date: 2012-02-10 17:48+0000\n"
-"Last-Translator: Carlos @ smile-iberia <Unknown>\n"
+"Last-Translator: Carlos Ch. <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: 2012-08-07 04:59+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:06+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: crm
 #: view:crm.lead.report:0
diff --git a/addons/crm/i18n/es_AR.po b/addons/crm/i18n/es_AR.po
index 5cfa38acddd..f5d6ea8a329 100644
--- a/addons/crm/i18n/es_AR.po
+++ b/addons/crm/i18n/es_AR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:00+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:06+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: crm
 #: view:crm.lead.report:0
diff --git a/addons/crm/i18n/es_CR.po b/addons/crm/i18n/es_CR.po
index d4a599a743f..ea48c945009 100644
--- a/addons/crm/i18n/es_CR.po
+++ b/addons/crm/i18n/es_CR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:00+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:06+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 "Language: \n"
 
 #. module: crm
diff --git a/addons/crm/i18n/es_EC.po b/addons/crm/i18n/es_EC.po
index a05a3e29d81..ac7abe7f6de 100644
--- a/addons/crm/i18n/es_EC.po
+++ b/addons/crm/i18n/es_EC.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:00+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:06+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: crm
 #: view:crm.lead.report:0
diff --git a/addons/crm/i18n/es_MX.po.moved b/addons/crm/i18n/es_MX.po.moved
deleted file mode 100644
index bba19b80731..00000000000
--- a/addons/crm/i18n/es_MX.po.moved
+++ /dev/null
@@ -1,3672 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* crm
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.2\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2011-07-06 16:24+0000\n"
-"PO-Revision-Date: 2011-07-06 16:24+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: crm
-#: view:crm.lead.report:0
-msgid "# Leads"
-msgstr "# Iniciativas"
-
-#. module: crm
-#: view:crm.lead:0
-#: selection:crm.lead,type:0
-#: selection:crm.lead.report,type:0
-msgid "Lead"
-msgstr "Iniciativa"
-
-#. module: crm
-#: model:crm.case.categ,name:crm.categ_oppor3
-msgid "Need Services"
-msgstr "Necesita servicios"
-
-#. module: crm
-#: selection:crm.meeting,rrule_type:0
-msgid "Monthly"
-msgstr "Mensual"
-
-#. module: crm
-#: view:crm.opportunity2phonecall:0
-msgid "Schedule a PhoneCall"
-msgstr "Planificar llamada telefónica"
-
-#. module: crm
-#: model:ir.model,name:crm.model_crm_case_stage
-msgid "Stage of case"
-msgstr "Etapa del caso"
-
-#. module: crm
-#: view:crm.meeting:0
-msgid "Visibility"
-msgstr "Visibilidad"
-
-#. module: crm
-#: field:crm.lead,title:0
-msgid "Title"
-msgstr "Título"
-
-#. module: crm
-#: field:crm.meeting,show_as:0
-msgid "Show as"
-msgstr "Mostrar como"
-
-#. module: crm
-#: field:crm.meeting,day:0
-#: selection:crm.meeting,select1:0
-msgid "Date of month"
-msgstr "Día del mes"
-
-#. module: crm
-#: view:crm.lead:0
-#: view:crm.phonecall:0
-msgid "Today"
-msgstr "Hoy"
-
-#. module: crm
-#: view:crm.merge.opportunity:0
-msgid "Select Opportunities"
-msgstr "Seleccionar oportunidades"
-
-#. module: crm
-#: view:crm.meeting:0
-#: view:crm.phonecall2opportunity:0
-#: view:crm.phonecall2phonecall:0
-#: view:crm.send.mail:0
-msgid " "
-msgstr " "
-
-#. module: crm
-#: view:crm.lead.report:0
-#: field:crm.phonecall.report,delay_close:0
-msgid "Delay to close"
-msgstr "Demora cierre"
-
-#. module: crm
-#: view:crm.lead:0
-msgid "Previous Stage"
-msgstr "Etapa anterior"
-
-#. module: crm
-#: code:addons/crm/wizard/crm_add_note.py:26
-#, python-format
-msgid "Can not add note!"
-msgstr "¡No se puede añadir una nota!"
-
-#. module: crm
-#: field:crm.case.stage,name:0
-msgid "Stage Name"
-msgstr "Nombre de etapa"
-
-#. module: crm
-#: view:crm.lead.report:0
-#: field:crm.lead.report,day:0
-#: view:crm.phonecall.report:0
-#: field:crm.phonecall.report,day:0
-msgid "Day"
-msgstr "Día"
-
-#. module: crm
-#: sql_constraint:crm.case.section:0
-msgid "The code of the sales team must be unique !"
-msgstr "¡El código del equipo de ventas debe ser único!"
-
-#. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:95
-#, python-format
-msgid "Lead '%s' has been converted to an opportunity."
-msgstr "La inicaitiva '%s' ha sido convertida en oportunidad"
-
-#. module: crm
-#: code:addons/crm/crm_lead.py:228
-#, python-format
-msgid "The lead '%s' has been closed."
-msgstr "La iniciativa '%s' ha sido cerrada"
-
-#. module: crm
-#: selection:crm.meeting,freq:0
-msgid "No Repeat"
-msgstr "No repetir"
-
-#. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:135
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:260
-#: code:addons/crm/wizard/crm_lead_to_partner.py:55
-#: code:addons/crm/wizard/crm_phonecall_to_partner.py:52
-#, python-format
-msgid "Warning !"
-msgstr "Advertencia !"
-
-#. module: crm
-#: selection:crm.meeting,rrule_type:0
-msgid "Yearly"
-msgstr "Anual"
-
-#. module: crm
-#: field:crm.segmentation.line,name:0
-msgid "Rule Name"
-msgstr "Nombre de regla"
-
-#. module: crm
-#: view:crm.case.resource.type:0
-#: view:crm.lead:0
-#: field:crm.lead,type_id:0
-#: view:crm.lead.report:0
-#: field:crm.lead.report,type_id:0
-#: model:ir.model,name:crm.model_crm_case_resource_type
-msgid "Campaign"
-msgstr "Campaña"
-
-#. module: crm
-#: selection:crm.lead2opportunity.partner,action:0
-msgid "Do not create a partner"
-msgstr "No crear una empresa"
-
-#. module: crm
-#: view:crm.lead:0
-msgid "Search Opportunities"
-msgstr "Busqueda de oportunidades"
-
-#. module: crm
-#: code:addons/crm/wizard/crm_merge_opportunities.py:46
-#, python-format
-msgid "Opportunity must have Partner assigned before merging with other Opportunity."
-msgstr "La oportunidad debe de tener una empresa asignada antes de fusionarla con otra oportunidad."
-
-#. module: crm
-#: code:addons/crm/wizard/crm_merge_opportunities.py:46
-#: code:addons/crm/wizard/crm_merge_opportunities.py:53
-#, python-format
-msgid "Warning!"
-msgstr "¡Aviso!"
-
-#. module: crm
-#: code:addons/crm/wizard/crm_send_email.py:72
-#: code:addons/crm/wizard/crm_send_email.py:169
-#: code:addons/crm/wizard/crm_send_email.py:270
-#, python-format
-msgid "Can not send mail!"
-msgstr "¡No se pudo enviar el correo!"
-
-#. module: crm
-#: field:crm.lead,partner_id:0
-#: view:crm.lead.report:0
-#: field:crm.lead.report,partner_id:0
-#: field:crm.lead2opportunity,partner_id:0
-#: field:crm.lead2opportunity.partner,partner_id:0
-#: field:crm.lead2partner,partner_id:0
-#: view:crm.meeting:0
-#: field:crm.meeting,partner_id:0
-#: field:crm.partner2opportunity,partner_id:0
-#: view:crm.phonecall:0
-#: field:crm.phonecall,partner_id:0
-#: view:crm.phonecall.report:0
-#: field:crm.phonecall.report,partner_id:0
-#: field:crm.phonecall2opportunity,partner_id:0
-#: field:crm.phonecall2partner,partner_id:0
-#: model:ir.model,name:crm.model_res_partner
-#: model:process.node,name:crm.process_node_partner0
-msgid "Partner"
-msgstr "Empresa"
-
-#. module: crm
-#: field:crm.meeting,organizer:0
-#: field:crm.meeting,organizer_id:0
-msgid "Organizer"
-msgstr "Organizador"
-
-#. module: crm
-#: view:crm.phonecall:0
-#: view:crm.phonecall2phonecall:0
-#: model:ir.actions.act_window,name:crm.phonecall_to_phonecall_act
-#: view:res.partner:0
-msgid "Schedule Other Call"
-msgstr "Planificar otra llamada"
-
-#. module: crm
-#: help:crm.meeting,edit_all:0
-msgid "Edit all Occurrences  of recurrent Meeting."
-msgstr "Editar todas las ocurrencias de la reunión recurrente."
-
-#. module: crm
-#: code:addons/crm/wizard/crm_opportunity_to_phonecall.py:134
-#: code:addons/crm/wizard/crm_phonecall_to_phonecall.py:89
-#: model:crm.case.categ,name:crm.categ_meet3
-#: view:crm.phonecall:0
-#: model:ir.ui.menu,name:crm.menu_crm_config_phonecall
-#: view:res.partner:0
-#, python-format
-msgid "Phone Call"
-msgstr "Llamada de telefono"
-
-#. module: crm
-#: field:crm.lead,optout:0
-msgid "Opt-Out"
-msgstr "No acepta recibir emails"
-
-#. module: crm
-#: code:addons/crm/crm_opportunity.py:108
-#, python-format
-msgid "The opportunity '%s' has been marked as lost."
-msgstr "La oportunidad '%s' ha sido marcada como perdida."
-
-#. module: crm
-#: model:ir.actions.act_window,help:crm.action_report_crm_lead
-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 "El análisis de iniciativas le permite verificar información relacionada con el CRM. Puede verificar los retrasos, el número de respuestas realizadas y el número de emails enviados. Puede ordenar el análisis de sus iniciativas según diferentes grupos para obtener un análisis reagrupado preciso."
-
-#. module: crm
-#: view:crm.lead:0
-msgid "Send New Email"
-msgstr "Enviar nuevo email"
-
-#. module: crm
-#: field:crm.segmentation,segmentation_line:0
-msgid "Criteria"
-msgstr "Criterios"
-
-#. module: crm
-#: field:crm.case.stage,section_ids:0
-msgid "Sections"
-msgstr "Secciones"
-
-#. module: crm
-#: view:crm.merge.opportunity:0
-msgid "_Merge"
-msgstr "_Fusionar"
-
-#. 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 "Análisis de iniciativas"
-
-#. module: crm
-#: view:crm.lead2opportunity.action:0
-msgid "If you select Merge with existing Opportunity, the lead details(with the communication history) will be merged with existing Opportunity of Selected partner."
-msgstr "Si selecciona fusionar con oportunidad existente, los detalles de la iniciativa (con el histórico de la comunicación) serán fusionados con la oportunidad existente de la empresa seleccionada"
-
-#. module: crm
-#: selection:crm.meeting,class:0
-msgid "Public"
-msgstr "Público"
-
-#. 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 "Campañas"
-
-#. module: crm
-#: model:ir.actions.act_window,name:crm.crm_lead_categ_action
-#: model:ir.ui.menu,name:crm.menu_crm_case_phonecall-act
-#: model:ir.ui.menu,name:crm.menu_crm_lead_categ
-msgid "Categories"
-msgstr "Categorías"
-
-#. module: crm
-#: selection:crm.meeting,end_type:0
-msgid "Forever"
-msgstr "Siempre"
-
-#. module: crm
-#: help:crm.lead,optout:0
-msgid "If opt-out is checked, this contact has refused to receive emails or unsubscribed to a campaign."
-msgstr "Si opt-out está marcado, 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
-msgid "Prospect Partner"
-msgstr "Socio prospecto"
-
-#. module: crm
-#: field:crm.lead,contact_name:0
-msgid "Contact Name"
-msgstr "Nombre de contacto"
-
-#. module: crm
-#: selection:crm.lead2opportunity.partner,action:0
-#: selection:crm.lead2partner,action:0
-#: selection:crm.phonecall2partner,action:0
-msgid "Link to an existing partner"
-msgstr "Enlace al socio existente"
-
-#. module: crm
-#: view:crm.lead:0
-#: view:crm.meeting:0
-#: field:crm.phonecall,partner_contact:0
-msgid "Contact"
-msgstr "Contacto"
-
-#. module: crm
-#: view:crm.installer:0
-msgid "Enhance your core CRM Application with additional functionalities."
-msgstr "Mejore su aplicación CRM básica con funcionalidades adicionales."
-
-#. module: crm
-#: field:crm.case.stage,on_change:0
-msgid "Change Probability Automatically"
-msgstr "Cambiar la probabilidad automáticamente"
-
-#. module: crm
-#: field:base.action.rule,regex_history:0
-msgid "Regular Expression on Case History"
-msgstr "Expresiones Regulares en el Historial del Caso"
-
-#. module: crm
-#: code:addons/crm/crm_lead.py:209
-#, python-format
-msgid "The lead '%s' has been opened."
-msgstr "La iniciativa '%s' ha sido abierta."
-
-#. module: crm
-#: model:process.transition,name:crm.process_transition_opportunitymeeting0
-msgid "Opportunity Meeting"
-msgstr "Oportunidad de Reunión"
-
-#. 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 "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 "Cuando un proyecto/oportunidad real es detectado"
-
-#. module: crm
-#: field:crm.installer,crm_fundraising:0
-msgid "Fundraising"
-msgstr "Recaudación de fondos"
-
-#. module: crm
-#: view:res.partner:0
-#: field:res.partner,opportunity_ids:0
-msgid "Leads and Opportunities"
-msgstr "Iniciativas y oportunidades"
-
-#. module: crm
-#: view:crm.send.mail:0
-msgid "_Send"
-msgstr "_Enviar"
-
-#. module: crm
-#: view:crm.lead:0
-msgid "Communication"
-msgstr "Comunicación"
-
-#. module: crm
-#: field:crm.case.section,change_responsible:0
-msgid "Change Responsible"
-msgstr "Cambiar responsable"
-
-#. module: crm
-#: field:crm.merge.opportunity,state:0
-msgid "Set State To"
-msgstr "Cambiar estado a"
-
-#. module: crm
-#: model:ir.actions.act_window,help:crm.crm_case_categ_phone_outgoing0
-msgid "Outbound Calls list all the calls to be done by your sales team. A salesman can record the information about the call in the form view. This information will be stored in the partner form to trace every contact you have with a customer. You can also import a .CSV file with a list of calls to be done by your sales team."
-msgstr "Llamadas salientes muestra todas las llamadas realizadas por su equipo de ventas. Un vendedor puede grabar la información sobre la llamada en la vista de formulario. Esta información se almacenará en el formulario de empresa para rastrear cada contacto que tenga con un cliente. También puede importar un archivo .CSV con una lista de llamadas a realizar por su equipo de ventas."
-
-#. module: crm
-#: model:ir.model,name:crm.model_crm_lead2opportunity_action
-msgid "Convert/Merge Opportunity"
-msgstr "Convertir/Fusionar oportunidad"
-
-#. module: crm
-#: field:crm.lead,write_date:0
-msgid "Update Date"
-msgstr "Actualizar fecha"
-
-#. module: crm
-#: view:crm.lead2opportunity.action:0
-#: field:crm.lead2opportunity.action,name:0
-msgid "Select Action"
-msgstr "Seleccionar acción"
-
-#. module: crm
-#: field:base.action.rule,trg_categ_id:0
-#: view:crm.lead:0
-#: field:crm.lead,categ_id:0
-#: view:crm.lead.report:0
-#: field:crm.lead.report,categ_id:0
-#: field:crm.opportunity2phonecall,categ_id:0
-#: field:crm.phonecall,categ_id:0
-#: field:crm.phonecall.report,categ_id:0
-#: field:crm.phonecall2phonecall,categ_id:0
-msgid "Category"
-msgstr "Categoría"
-
-#. module: crm
-#: view:crm.lead.report:0
-msgid "#Opportunities"
-msgstr "# Oportunidades"
-
-#. module: crm
-#: model:crm.case.resource.type,name:crm.type_oppor2
-msgid "Campaign 1"
-msgstr "Campaña 1"
-
-#. module: crm
-#: model:crm.case.resource.type,name:crm.type_oppor1
-msgid "Campaign 2"
-msgstr "Campaña 2"
-
-#. module: crm
-#: view:crm.meeting:0
-msgid "Privacy"
-msgstr "Privada"
-
-#. module: crm
-#: view:crm.lead.report:0
-msgid "Opportunity Analysis"
-msgstr "Análisis de oportunidades"
-
-#. module: crm
-#: help:crm.meeting,location:0
-msgid "Location of Event"
-msgstr "Lacalización del evento"
-
-#. module: crm
-#: field:crm.meeting,rrule:0
-msgid "Recurrent Rule"
-msgstr "Regla recurrente"
-
-#. module: crm
-#: help:crm.installer,fetchmail:0
-msgid "Allows you to receive E-Mails from POP/IMAP server."
-msgstr "Le permite recibir e-mails desde un servidor POP/IMAP"
-
-#. module: crm
-#: model:process.transition,note:crm.process_transition_opportunitymeeting0
-msgid "Normal or phone meeting for opportunity"
-msgstr "Oportunidad de reunion normal ó telefonico."
-
-#. module: crm
-#: model:process.node,note:crm.process_node_leads0
-msgid "Very first contact with new prospect"
-msgstr "Primer contacto con nueva prospección"
-
-#. module: crm
-#: code:addons/crm/crm_lead.py:278
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:197
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:231
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:299
-#: view:crm.lead2opportunity:0
-#: view:crm.partner2opportunity:0
-#: model:ir.actions.act_window,name:crm.action_crm_lead2opportunity
-#: model:ir.actions.act_window,name:crm.action_view_crm_partner2opportunity
-#: model:ir.actions.act_window,name:crm.crm_partner2opportunity
-#, python-format
-msgid "Create Opportunity"
-msgstr "Crear oportunidad"
-
-#. module: crm
-#: view:crm.installer:0
-msgid "Configure"
-msgstr "Configurar"
-
-#. module: crm
-#: code:addons/crm/crm.py:378
-#: view:crm.lead:0
-#: view:res.partner:0
-#, python-format
-msgid "Escalate"
-msgstr "Escalado"
-
-#. module: crm
-#: model:ir.module.module,shortdesc:crm.module_meta_information
-msgid "Customer & Supplier Relationship Management"
-msgstr "Gestión de las relaciones con los clientes y proveedores"
-
-#. module: crm
-#: selection:crm.lead.report,month:0
-#: selection:crm.meeting,month_list:0
-#: selection:crm.phonecall.report,month:0
-msgid "June"
-msgstr "Junio"
-
-#. module: crm
-#: selection:crm.segmentation,state:0
-msgid "Not Running"
-msgstr "No ejecutado"
-
-#. module: crm
-#: view:crm.send.mail:0
-#: model:ir.actions.act_window,name:crm.action_crm_reply_mail
-msgid "Reply to last Mail"
-msgstr "Responder al último e-mail"
-
-#. module: crm
-#: field:crm.lead,email:0
-msgid "E-Mail"
-msgstr "E-mail"
-
-#. module: crm
-#: field:crm.installer,wiki_sale_faq:0
-msgid "Sale FAQ"
-msgstr "FAQ de ventas"
-
-#. module: crm
-#: model:ir.model,name:crm.model_crm_send_mail_attachment
-msgid "crm.send.mail.attachment"
-msgstr "crm.enviar.mail.adjunto"
-
-#. module: crm
-#: selection:crm.lead.report,month:0
-#: selection:crm.meeting,month_list:0
-#: selection:crm.phonecall.report,month:0
-msgid "October"
-msgstr "Octubre"
-
-#. module: crm
-#: help:crm.meeting,email_from:0
-#: help:crm.phonecall,email_from:0
-msgid "These people will receive email."
-msgstr "Estas personas recibirán un email."
-
-#. module: crm
-#: view:crm.meeting:0
-#: field:crm.meeting,name:0
-msgid "Summary"
-msgstr "Resumen"
-
-#. module: crm
-#: view:crm.segmentation:0
-msgid "State of Mind Computation"
-msgstr "Cálculo grado de satisfacción"
-
-#. module: crm
-#: help:crm.case.section,change_responsible:0
-msgid "Thick this box if you want that on escalation, the responsible of this sale team automatically becomes responsible of the lead/opportunity escaladed"
-msgstr "Marque esta opción si quiere que el responsable del equipo de ventas sea automáticamente responsable de la iniciativa/oportunidad, en caso de ser escalada."
-
-#. module: crm
-#: help:crm.installer,outlook:0
-#: help:crm.installer,thunderbird:0
-msgid "Allows you to link your e-mail to OpenERP's documents. You can attach it to any existing one in OpenERP or create a new one."
-msgstr "Permite enlazar su e-mail a la gestión documental de OpenERP. Puede adjuntarlo a cualquier documento ya existente en OpenERP o crear uno de nuevo."
-
-#. module: crm
-#: view:crm.case.categ:0
-msgid "Case Category"
-msgstr "Categoría del caso"
-
-#. module: crm
-#: help:crm.segmentation,som_interval_default:0
-msgid "Default state of mind for period preceeding the 'Max Interval' computation. This is the starting state of mind by default if the partner has no event."
-msgstr "Grado de satisfacción por defecto para el período que precede el cálculo de 'Intervalo máx.'. Este es el grado de satisfacción inicial por defecto si la empresa no tiene ningún evento."
-
-#. module: crm
-#: selection:crm.meeting,end_type:0
-msgid "End date"
-msgstr "Fecha de fin"
-
-#. module: crm
-#: constraint:base.action.rule:0
-msgid "Error: The mail is not well formated"
-msgstr "Error: El email no está bien formateado"
-
-#. module: crm
-#: view:crm.phonecall.report:0
-msgid "#Phone calls"
-msgstr "#Llamadas telefónicas"
-
-#. module: crm
-#: help:crm.segmentation,categ_id:0
-msgid "The partner category that will be added to partners that match the segmentation criterions after computation."
-msgstr "La categoría de empresas que será añadida a las empresas que cumplan los criterios de segmentación después del cálculo."
-
-#. module: crm
-#: view:crm.lead:0
-msgid "Communication history"
-msgstr "Historial de comunicación"
-
-#. module: crm
-#: help:crm.phonecall,canal_id:0
-msgid "The channels represent the different communication                         modes available with the customer. With each commercial opportunity, you can indicate                         the canall which is this opportunity source."
-msgstr "Los canales representan los diferentes modos de comunicación posibles con el cliente. En cada oportunidad comercial, puede indicar el canal que ha sido el origen de esta oportunidad."
-
-#. module: crm
-#: code:addons/crm/crm_meeting.py:93
-#, python-format
-msgid "The meeting '%s' has been confirmed."
-msgstr "La reunión '%s' ha sido confirmada"
-
-#. module: crm
-#: field:crm.case.section,user_id:0
-msgid "Responsible User"
-msgstr "Usuario responsable"
-
-#. module: crm
-#: code:addons/crm/wizard/crm_phonecall_to_partner.py:53
-#, python-format
-msgid "A partner is already defined on this phonecall."
-msgstr "Una empresa ya esta definida para esta llamada."
-
-#. module: crm
-#: help:crm.case.section,reply_to:0
-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
-#: view:res.users:0
-msgid "Current Activity"
-msgstr "Actividad actual"
-
-#. module: crm
-#: help:crm.meeting,exrule:0
-msgid "Defines a rule or repeating pattern of time to exclude from the recurring rule."
-msgstr "Define una regla o patrón de repetición de tiempo a excluir de la regla recurrente."
-
-#. module: crm
-#: field:crm.case.section,resource_calendar_id:0
-msgid "Working Time"
-msgstr "Horario de trabajo"
-
-#. module: crm
-#: view:crm.segmentation.line:0
-msgid "Partner Segmentation Lines"
-msgstr "Líneas de segmentación de empresa"
-
-#. module: crm
-#: view:crm.lead:0
-#: view:crm.meeting:0
-msgid "Details"
-msgstr "Detalles"
-
-#. module: crm
-#: help:crm.installer,crm_caldav:0
-msgid "Helps you to synchronize the meetings with other calendar clients and mobiles."
-msgstr "Le permite sincronizar las reuniones con otros clientes de calendario y móviles."
-
-#. module: crm
-#: selection:crm.meeting,freq:0
-msgid "Years"
-msgstr "Años"
-
-#. module: crm
-#: help:crm.installer,crm_claim:0
-msgid "Manages the suppliers and customers claims, including your corrective or preventive actions."
-msgstr "Gestiona las reclamaciones de clientes y proveedores, incluyendo acciones correctivas o preventivas"
-
-#. module: crm
-#: view:crm.lead:0
-msgid "Leads Form"
-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"
-
-#. module: crm
-#: model:ir.actions.act_window,help:crm.crm_case_categ_meet
-msgid "The meeting calendar is shared between the sales teams and fully integrated with other applications such as the employee holidays or the business opportunities. You can also synchronize meetings with your mobile phone using the caldav interface.\n"
-"        "
-msgstr "Las citas del calendario estan compartidas entre el equipo de ventas e integradas con otras aplicaciones como los dias festivos de los empleados o las oportunidades de negocio. Usted puede tambien sincronizar citas con su telefono movil usando la interfaz caldav.\n"
-"        "
-
-#. module: crm
-#: field:crm.lead.report,probable_revenue:0
-msgid "Probable Revenue"
-msgstr "Ingreso estimado"
-
-#. module: crm
-#: help:crm.segmentation,name:0
-msgid "The name of the segmentation."
-msgstr "El nombre de la segmentación."
-
-#. module: crm
-#: field:crm.case.stage,probability:0
-#: field:crm.lead,probability:0
-msgid "Probability (%)"
-msgstr "Probabilidad (%)"
-
-#. module: crm
-#: view:crm.lead:0
-msgid "Leads Generation"
-msgstr "Generación de iniciativas"
-
-#. module: crm
-#: view:board.board:0
-#: model:ir.ui.menu,name:crm.menu_board_statistics_dash
-msgid "Statistics Dashboard"
-msgstr "Tablero de estadísticas"
-
-#. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:88
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:98
-#: code:addons/crm/wizard/crm_partner_to_opportunity.py:101
-#: code:addons/crm/wizard/crm_phonecall_to_opportunity.py:117
-#: view:crm.lead:0
-#: selection:crm.lead,type:0
-#: selection:crm.lead.report,type:0
-#: field:crm.lead2opportunity,name:0
-#: field:crm.meeting,opportunity_id:0
-#: field:crm.phonecall,opportunity_id:0
-#, python-format
-msgid "Opportunity"
-msgstr "Oportunidad"
-
-#. module: crm
-#: model:crm.case.resource.type,name:crm.type_lead7
-msgid "Television"
-msgstr "Televisión"
-
-#. module: crm
-#: field:crm.installer,crm_caldav:0
-msgid "Calendar Synchronizing"
-msgstr "Sincronización del calendario"
-
-#. module: crm
-#: view:crm.segmentation:0
-msgid "Stop Process"
-msgstr "Parar el proceso"
-
-#. module: crm
-#: view:crm.phonecall:0
-msgid "Search Phonecalls"
-msgstr "Buscar llamadas"
-
-#. module: crm
-#: view:crm.lead2opportunity.partner:0
-#: view:crm.lead2partner:0
-#: view:crm.phonecall2partner:0
-msgid "Continue"
-msgstr "Siguiente"
-
-#. module: crm
-#: field:crm.segmentation,som_interval:0
-msgid "Days per Period"
-msgstr "Días por período"
-
-#. module: crm
-#: field:crm.meeting,byday:0
-msgid "By day"
-msgstr "Por día"
-
-#. module: crm
-#: field:base.action.rule,act_section_id:0
-msgid "Set Team to"
-msgstr "Establecer equipo a"
-
-#. module: crm
-#: view:calendar.attendee:0
-#: field:calendar.attendee,categ_id:0
-msgid "Event Type"
-msgstr "Tipo de evento"
-
-#. module: crm
-#: model:ir.model,name:crm.model_crm_installer
-msgid "crm.installer"
-msgstr "crm.instalador"
-
-#. module: crm
-#: field:crm.segmentation,exclusif:0
-msgid "Exclusive"
-msgstr "Exclusivo"
-
-#. module: crm
-#: code:addons/crm/crm_opportunity.py:91
-#, python-format
-msgid "The opportunity '%s' has been won."
-msgstr "La oportunidad '%s' ha sido ganada"
-
-#. module: crm
-#: help:crm.meeting,alarm_id:0
-msgid "Set an alarm at this time, before the event occurs"
-msgstr "Configure una alarma en este momento, antes de que ocurra el evento"
-
-#. module: crm
-#: field:crm.lead.report,create_date:0
-#: field:crm.phonecall.report,create_date:0
-msgid "Create Date"
-msgstr "Fecha creación"
-
-#. module: crm
-#: field:crm.lead,ref2:0
-msgid "Reference 2"
-msgstr "Referencia 2"
-
-#. module: crm
-#: view:crm.segmentation:0
-msgid "Sales Purchase"
-msgstr "Compra Ventas"
-
-#. module: crm
-#: view:crm.case.stage:0
-#: field:crm.case.stage,requirements:0
-msgid "Requirements"
-msgstr "Requerimientos"
-
-#. module: crm
-#: help:crm.meeting,exdate:0
-msgid "This property defines the list of date/time exceptions for a recurring calendar component."
-msgstr "Esta propiedad define la lista de excepciones de fecha/hora para un evento de calendario recurrente."
-
-#. module: crm
-#: view:crm.phonecall2opportunity:0
-msgid "Convert To Opportunity "
-msgstr "Convertir a oportunidad "
-
-#. module: crm
-#: help:crm.case.stage,sequence:0
-msgid "Gives the sequence order when displaying a list of case stages."
-msgstr "Indica el orden de secuencia cuando se muestra un lista de etapas de casos."
-
-#. module: crm
-#: view:crm.lead:0
-#: field:crm.merge.opportunity,opportunity_ids:0
-#: model:ir.actions.act_window,name:crm.crm_case_category_act_oppor11
-#: model:ir.ui.menu,name:crm.menu_crm_case_opp
-#: model:process.node,name:crm.process_node_opportunities0
-msgid "Opportunities"
-msgstr "Oportunidades"
-
-#. module: crm
-#: field:crm.segmentation,categ_id:0
-msgid "Partner Category"
-msgstr "Categoría de empresa"
-
-#. module: crm
-#: view:crm.add.note:0
-#: model:ir.actions.act_window,name:crm.action_crm_add_note
-msgid "Add Note"
-msgstr "Añadir nota"
-
-#. module: crm
-#: field:crm.lead,is_supplier_add:0
-msgid "Supplier"
-msgstr "Proveedor"
-
-#. module: crm
-#: help:crm.send.mail,reply_to:0
-msgid "Reply-to of the Sales team defined on this case"
-msgstr "\"Responder a\" del equipo de ventas definido en este caso"
-
-#. module: crm
-#: view:crm.lead:0
-msgid "Mark Won"
-msgstr "Marcar ganado"
-
-#. module: crm
-#: selection:crm.segmentation.line,expr_name:0
-msgid "Purchase Amount"
-msgstr "Importe de compra"
-
-#. module: crm
-#: view:crm.lead:0
-msgid "Mark Lost"
-msgstr "Marcar perdido"
-
-#. module: crm
-#: selection:crm.lead.report,month:0
-#: selection:crm.meeting,month_list:0
-#: selection:crm.phonecall.report,month:0
-msgid "March"
-msgstr "Marzo"
-
-#. module: crm
-#: code:addons/crm/crm_lead.py:230
-#, python-format
-msgid "The opportunity '%s' has been closed."
-msgstr "La oportunidad '%s' ha sido cerrada"
-
-#. module: crm
-#: field:crm.lead,day_open:0
-msgid "Days to Open"
-msgstr "Días para abrir"
-
-#. module: crm
-#: view:crm.meeting:0
-msgid "Show Time as"
-msgstr "Mostrar hora como"
-
-#. module: crm
-#: code:addons/crm/crm_lead.py:264
-#: view:crm.phonecall2partner:0
-#, python-format
-msgid "Create Partner"
-msgstr "Crear empresa"
-
-#. module: crm
-#: selection:crm.segmentation.line,expr_operator:0
-msgid "<"
-msgstr "<"
-
-#. module: crm
-#: field:crm.lead,mobile:0
-#: field:crm.phonecall,partner_mobile:0
-msgid "Mobile"
-msgstr "Móvil"
-
-#. module: crm
-#: field:crm.meeting,end_type:0
-msgid "Way to end reccurency"
-msgstr "Forma de terminar recurrencia"
-
-#. module: crm
-#: code:addons/crm/wizard/crm_merge_opportunities.py:53
-#, python-format
-msgid "There are no other 'Open' or 'Pending' Opportunities for the partner '%s'."
-msgstr "No existen más oportunidades 'Abiertas' o 'Pendientes' para la empresa '%s'."
-
-#. module: crm
-#: view:crm.lead:0
-msgid "Next Stage"
-msgstr "Siguiente etapa"
-
-#. module: crm
-#: view:board.board:0
-msgid "My Meetings"
-msgstr "Mis reuniones"
-
-#. module: crm
-#: field:crm.lead,ref:0
-msgid "Reference"
-msgstr "Referencia"
-
-#. module: crm
-#: field:crm.lead,optin:0
-msgid "Opt-In"
-msgstr "Acepta recibir emails"
-
-#. module: crm
-#: code:addons/crm/crm_opportunity.py:208
-#: code:addons/crm/crm_phonecall.py:185
-#: code:addons/crm/wizard/crm_phonecall_to_meeting.py:55
-#: code:addons/crm/wizard/crm_phonecall_to_meeting.py:137
-#: view:crm.meeting:0
-#: model:ir.actions.act_window,name:crm.act_crm_opportunity_crm_meeting_new
-#: model:ir.actions.act_window,name:crm.crm_case_categ_meet
-#: model:ir.ui.menu,name:crm.menu_crm_case_categ_meet
-#: model:ir.ui.menu,name:crm.menu_meeting_sale
-#: view:res.partner:0
-#: field:res.partner,meeting_ids:0
-#, python-format
-msgid "Meetings"
-msgstr "Reuniones"
-
-#. module: crm
-#: view:crm.meeting:0
-msgid "Choose day where repeat the meeting"
-msgstr "Eligir día en el que repetir la cita"
-
-#. module: crm
-#: field:crm.lead,date_action_next:0
-#: field:crm.lead,title_action:0
-#: field:crm.meeting,date_action_next:0
-#: field:crm.phonecall,date_action_next:0
-msgid "Next Action"
-msgstr "Acción siguiente"
-
-#. module: crm
-#: field:crm.meeting,end_date:0
-msgid "Repeat Until"
-msgstr "Repetir hasta"
-
-#. module: crm
-#: field:crm.meeting,date_deadline:0
-msgid "Deadline"
-msgstr "Fecha límite"
-
-#. module: crm
-#: help:crm.meeting,active:0
-msgid "If the active field is set to          true, it will allow you to hide the event alarm information without removing it."
-msgstr "Si el campo activo se establece en verdadero, se omitirá la alarma del evento, sin embargo no se eliminará."
-
-#. module: crm
-#: code:addons/crm/wizard/crm_phonecall_to_opportunity.py:57
-#, python-format
-msgid "Closed/Cancelled Phone Call Could not convert into Opportunity"
-msgstr "Las llamadas telefónicas cerradas/canceladas no podrían ser convertidas en oportunidades"
-
-#. module: crm
-#: view:crm.segmentation:0
-msgid "Partner Segmentations"
-msgstr "Segmentaciones de empresa"
-
-#. module: crm
-#: view:crm.meeting:0
-#: field:crm.meeting,user_id:0
-#: view:crm.phonecall:0
-#: field:crm.phonecall,user_id:0
-#: view:res.partner:0
-msgid "Responsible"
-msgstr "Responsable"
-
-#. module: crm
-#: view:res.partner:0
-msgid "Previous"
-msgstr "Anterior"
-
-#. module: crm
-#: view:crm.lead:0
-msgid "Statistics"
-msgstr "Estadísticas"
-
-#. module: crm
-#: view:crm.meeting:0
-#: field:crm.send.mail,email_from:0
-msgid "From"
-msgstr "De"
-
-#. module: crm
-#: view:crm.lead2opportunity.action:0
-#: view:res.partner:0
-msgid "Next"
-msgstr "Siguiente"
-
-#. module: crm
-#: view:crm.lead:0
-msgid "Stage:"
-msgstr "Etapa:"
-
-#. module: crm
-#: model:crm.case.stage,name:crm.stage_lead5
-#: model:crm.case.stage,name:crm.stage_opportunity5
-#: view:crm.lead:0
-msgid "Won"
-msgstr "Ganado"
-
-#. module: crm
-#: field:crm.lead.report,delay_expected:0
-msgid "Overpassed Deadline"
-msgstr "Fecha límite sobrepasada"
-
-#. module: crm
-#: model:crm.case.section,name:crm.section_sales_department
-msgid "Sales Department"
-msgstr "Departamento de ventas"
-
-#. module: crm
-#: field:crm.send.mail,html:0
-msgid "HTML formatting?"
-msgstr "Formato HTML?"
-
-#. module: crm
-#: field:crm.case.stage,type:0
-#: field:crm.lead,type:0
-#: field:crm.lead.report,type:0
-#: view:crm.meeting:0
-#: view:crm.phonecall:0
-#: view:crm.phonecall.report:0
-#: view:res.partner:0
-msgid "Type"
-msgstr "Tipo"
-
-#. module: crm
-#: view:crm.segmentation:0
-msgid "Compute Segmentation"
-msgstr "Calcular la segmentación"
-
-#. module: crm
-#: selection:crm.lead,priority:0
-#: selection:crm.lead.report,priority:0
-#: selection:crm.phonecall,priority:0
-#: selection:crm.phonecall.report,priority:0
-msgid "Lowest"
-msgstr "Muy bajo"
-
-#. module: crm
-#: view:crm.add.note:0
-#: view:crm.send.mail:0
-#: field:crm.send.mail.attachment,binary:0
-msgid "Attachment"
-msgstr "Adjunto"
-
-#. module: crm
-#: selection:crm.lead.report,month:0
-#: selection:crm.meeting,month_list:0
-#: selection:crm.phonecall.report,month:0
-msgid "August"
-msgstr "Agosto"
-
-#. module: crm
-#: view:crm.lead:0
-#: field:crm.lead,create_date:0
-#: field:crm.lead.report,creation_date:0
-#: field:crm.meeting,create_date:0
-#: field:crm.phonecall,create_date:0
-#: field:crm.phonecall.report,creation_date:0
-msgid "Creation Date"
-msgstr "Fecha creación"
-
-#. module: crm
-#: model:crm.case.categ,name:crm.categ_oppor5
-msgid "Need a Website Design"
-msgstr "Necesita un diseño de sitio web"
-
-#. module: crm
-#: field:crm.meeting,recurrent_uid:0
-msgid "Recurrent ID"
-msgstr "ID recurrente"
-
-#. module: crm
-#: view:crm.lead:0
-#: view:crm.meeting:0
-#: field:crm.send.mail,subject:0
-#: view:res.partner:0
-msgid "Subject"
-msgstr "Asunto"
-
-#. module: crm
-#: field:crm.meeting,tu:0
-msgid "Tue"
-msgstr "Mar"
-
-#. module: crm
-#: code:addons/crm/crm_lead.py:300
-#: view:crm.case.stage:0
-#: view:crm.lead:0
-#: field:crm.lead,stage_id:0
-#: view:crm.lead.report:0
-#: field:crm.lead.report,stage_id:0
-#, python-format
-msgid "Stage"
-msgstr "Etapa"
-
-#. module: crm
-#: view:crm.lead:0
-msgid "History Information"
-msgstr "Histórico información"
-
-#. module: crm
-#: field:base.action.rule,act_mail_to_partner:0
-msgid "Mail to Partner"
-msgstr "Correo a la empresa"
-
-#. module: crm
-#: view:crm.lead:0
-msgid "Mailings"
-msgstr "Correos"
-
-#. module: crm
-#: field:crm.meeting,class:0
-msgid "Mark as"
-msgstr "Marcar como"
-
-#. module: crm
-#: field:crm.meeting,count:0
-msgid "Repeat"
-msgstr "Repetir"
-
-#. module: crm
-#: help:crm.meeting,rrule_type:0
-msgid "Let the event automatically repeat at that interval"
-msgstr "Permite que el evento se repita en ese intervalo"
-
-#. module: crm
-#: view:base.action.rule:0
-msgid "Condition Case Fields"
-msgstr "Campos de condiciones de casos"
-
-#. module: crm
-#: model:ir.module.module,description:crm.module_meta_information
-msgid "The generic OpenERP Customer Relationship Management\n"
-"system enables a group of people to intelligently and efficiently manage\n"
-"leads, opportunities, meeting, phonecall etc.\n"
-"It manages key tasks such as communication, identification, prioritization,\n"
-"assignment, resolution and notification.\n"
-"\n"
-"OpenERP ensures that all cases are successfully tracked by users, customers and\n"
-"suppliers. It can automatically send reminders, escalate the request, trigger\n"
-"specific methods and lots of other actions based on your own enterprise rules.\n"
-"\n"
-"The greatest thing about this system is that users don't need to do anything\n"
-"special. They can just send email to the request tracker. OpenERP will take\n"
-"care of thanking them for their message, automatically routing it to the\n"
-"appropriate staff, and make sure all future correspondence gets to the right\n"
-"place.\n"
-"\n"
-"The CRM module has a email gateway for the synchronisation interface\n"
-"between mails and OpenERP.\n"
-"Create dashboard for CRM that includes:\n"
-"    * My Leads (list)\n"
-"    * Leads by Stage (graph)\n"
-"    * My Meetings (list)\n"
-"    * Sales Pipeline by Stage (graph)\n"
-"    * My Cases (list)\n"
-"    * Jobs Tracking (graph)\n"
-""
-msgstr "El sistema de Gestion de Relaciones con Cliente en OpenERP \n"
-"le permite a un grupo de personas \n"
-"leads, opportunities, meeting, phonecall etc.\n"
-"It manages key tasks such as communication, identification, prioritization,\n"
-"assignment, resolution and notification.\n"
-"\n"
-"OpenERP ensures that all cases are successfully tracked by users, customers and\n"
-"suppliers. It can automatically send reminders, escalate the request, trigger\n"
-"specific methods and lots of other actions based on your own enterprise rules.\n"
-"\n"
-"The greatest thing about this system is that users don't need to do anything\n"
-"special. They can just send email to the request tracker. OpenERP will take\n"
-"care of thanking them for their message, automatically routing it to the\n"
-"appropriate staff, and make sure all future correspondence gets to the right\n"
-"place.\n"
-"\n"
-"The CRM module has a email gateway for the synchronisation interface\n"
-"between mails and OpenERP.\n"
-"Create dashboard for CRM that includes:\n"
-"    * My Leads (list)\n"
-"    * Leads by Stage (graph)\n"
-"    * My Meetings (list)\n"
-"    * Sales Pipeline by Stage (graph)\n"
-"    * My Cases (list)\n"
-"    * Jobs Tracking (graph)\n"
-""
-
-#. module: crm
-#: view:crm.case.section:0
-#: field:crm.case.section,stage_ids:0
-#: view:crm.case.stage:0
-#: model:ir.actions.act_window,name:crm.crm_case_stage_act
-#: model:ir.actions.act_window,name:crm.crm_lead_stage_act
-#: model:ir.actions.act_window,name:crm.crm_opportunity_stage_act
-#: model:ir.ui.menu,name:crm.menu_crm_lead_stage_act
-#: model:ir.ui.menu,name:crm.menu_crm_opportunity_stage_act
-msgid "Stages"
-msgstr "Etapas"
-
-#. module: crm
-#: field:crm.lead,planned_revenue:0
-#: field:crm.lead2opportunity,planned_revenue:0
-#: field:crm.partner2opportunity,planned_revenue:0
-#: field:crm.phonecall2opportunity,planned_revenue:0
-msgid "Expected Revenue"
-msgstr "Ingreso estimado"
-
-#. module: crm
-#: model:ir.actions.act_window,help:crm.crm_phonecall_categ_action
-msgid "Create specific phone call categories to better define the type of calls tracked in the system."
-msgstr "Crear categorías específicas de llamada telefónica para definir mejor el tipo de llamadas en el sistema de seguimiento."
-
-#. module: crm
-#: selection:crm.lead.report,month:0
-#: selection:crm.meeting,month_list:0
-#: selection:crm.phonecall.report,month:0
-msgid "September"
-msgstr "Setiembre"
-
-#. module: crm
-#: field:crm.segmentation,partner_id:0
-msgid "Max Partner ID processed"
-msgstr "Máx ID de empresa procesado"
-
-#. 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 "Análisis de llamadas"
-
-#. module: crm
-#: field:crm.lead.report,opening_date:0
-#: field:crm.phonecall.report,opening_date:0
-msgid "Opening Date"
-msgstr "Fecha de apertura"
-
-#. module: crm
-#: help:crm.phonecall,duration:0
-msgid "Duration in Minutes"
-msgstr "Duración en minutos"
-
-#. module: crm
-#: help:crm.installer,crm_helpdesk:0
-msgid "Manages a Helpdesk service."
-msgstr "Gestiona un servicio de soporte."
-
-#. module: crm
-#: field:crm.partner2opportunity,name:0
-msgid "Opportunity Name"
-msgstr "Nombre oportunidad"
-
-#. module: crm
-#: help:crm.case.section,active:0
-msgid "If the active field is set to true, it will allow you to hide the sales team without removing it."
-msgstr "Si el campo activo se marca, permite ocultar el equipo de ventas sin eliminarlo."
-
-#. module: crm
-#: view:crm.lead.report:0
-#: view:crm.phonecall.report:0
-msgid "  Year  "
-msgstr "  Año  "
-
-#. module: crm
-#: field:crm.meeting,edit_all:0
-msgid "Edit All"
-msgstr "Editar todo"
-
-#. module: crm
-#: field:crm.meeting,fr:0
-msgid "Fri"
-msgstr "Vie"
-
-#. module: crm
-#: model:ir.model,name:crm.model_crm_lead
-msgid "crm.lead"
-msgstr "crm.iniciativa"
-
-#. module: crm
-#: field:crm.meeting,write_date:0
-msgid "Write Date"
-msgstr "Fecha escritura"
-
-#. module: crm
-#: view:crm.meeting:0
-msgid "End of Recurrency"
-msgstr "Fin de recurrencia"
-
-#. module: crm
-#: view:crm.meeting:0
-msgid "Reminder"
-msgstr "Recordatorio"
-
-#. module: crm
-#: help:crm.segmentation,sales_purchase_active:0
-msgid "Check if you want to use this tab as part of the segmentation rule. If not checked, the criteria beneath will be ignored"
-msgstr "Márquela si quiere utilizar esta pestaña como parte de la regla de segmentación. Si no se marca, los criterios que contenga serán ignorados"
-
-#. module: crm
-#: view:crm.lead2opportunity.partner:0
-#: view:crm.lead2partner:0
-#: view:crm.phonecall:0
-#: view:crm.phonecall2partner:0
-#: model:ir.actions.act_window,name:crm.action_crm_lead2partner
-#: model:ir.actions.act_window,name:crm.action_crm_phonecall2partner
-#: view:res.partner:0
-msgid "Create a Partner"
-msgstr "Crear una empresa"
-
-#. module: crm
-#: field:crm.segmentation,state:0
-msgid "Execution Status"
-msgstr "Estado ejecución"
-
-#. module: crm
-#: selection:crm.meeting,week_list:0
-msgid "Monday"
-msgstr "Lunes"
-
-#. module: crm
-#: field:crm.lead,day_close:0
-msgid "Days to Close"
-msgstr "Días para el cierre"
-
-#. module: crm
-#: field:crm.add.note,attachment_ids:0
-#: field:crm.case.section,complete_name:0
-#: field:crm.send.mail,attachment_ids:0
-msgid "unknown"
-msgstr "desconocido"
-
-#. module: crm
-#: field:crm.lead,id:0
-#: field:crm.meeting,id:0
-#: field:crm.phonecall,id:0
-msgid "ID"
-msgstr "ID"
-
-#. module: crm
-#: model:ir.model,name:crm.model_crm_partner2opportunity
-msgid "Partner To Opportunity"
-msgstr "Empresa a oportunidad"
-
-#. module: crm
-#: view:crm.meeting:0
-#: field:crm.meeting,date:0
-#: field:crm.opportunity2phonecall,date:0
-#: view:crm.phonecall:0
-#: field:crm.phonecall,date:0
-#: field:crm.phonecall2phonecall,date:0
-#: view:res.partner:0
-msgid "Date"
-msgstr "Fecha"
-
-#. module: crm
-#: view:crm.lead:0
-#: view:crm.lead.report:0
-#: view:crm.meeting:0
-#: view:crm.phonecall.report:0
-msgid "Extended Filters..."
-msgstr "Filtros extendidos..."
-
-#. module: crm
-#: field:crm.phonecall2opportunity,name:0
-msgid "Opportunity Summary"
-msgstr "Resumen oportunidad"
-
-#. module: crm
-#: view:crm.phonecall.report:0
-msgid "Search"
-msgstr "Buscar"
-
-#. module: crm
-#: view:board.board:0
-msgid "Opportunities by Categories"
-msgstr "Oportunidades por categorías"
-
-#. module: crm
-#: view:crm.meeting:0
-msgid "Choose day in the month where repeat the meeting"
-msgstr "Elija el día del mes en que se repetirá la cita."
-
-#. module: crm
-#: view:crm.lead:0
-#: view:res.partner:0
-msgid "History"
-msgstr "Historial"
-
-#. module: crm
-#: model:ir.actions.act_window,help:crm.crm_segmentation_tree-act
-msgid "Create specific partner categories which you can assign to your partners to better manage your interactions with them. The segmentation tool is able to assign categories to partners according to criteria you set."
-msgstr "Cree categorías de empresa específicas para gestionar mejor sus interacciones con ellas. La herramienta de segmentación es capaz de asignar categorías a empresas de acuerdo a los criterios que establezca."
-
-#. module: crm
-#: field:crm.case.section,code:0
-msgid "Code"
-msgstr "Código"
-
-#. module: crm
-#: field:crm.case.section,child_ids:0
-msgid "Child Teams"
-msgstr "Equipos hijos"
-
-#. module: crm
-#: view:crm.lead:0
-#: field:crm.lead,state:0
-#: view:crm.lead.report:0
-#: field:crm.lead.report,state:0
-#: view:crm.meeting:0
-#: field:crm.meeting,state:0
-#: field:crm.phonecall,state:0
-#: view:crm.phonecall.report:0
-#: field:crm.phonecall.report,state:0
-msgid "State"
-msgstr "Estado"
-
-#. module: crm
-#: model:crm.case.resource.type,name:crm.type_lead1
-msgid "Telesales"
-msgstr "Telesales"
-
-#. module: crm
-#: field:crm.meeting,freq:0
-msgid "Frequency"
-msgstr "Frecuencia"
-
-#. module: crm
-#: view:crm.lead:0
-msgid "References"
-msgstr "Referencias"
-
-#. module: crm
-#: code:addons/crm/crm.py:392
-#: view:crm.lead:0
-#: view:crm.lead2opportunity:0
-#: view:crm.lead2opportunity.action:0
-#: view:crm.lead2opportunity.partner:0
-#: view:crm.lead2partner:0
-#: view:crm.phonecall:0
-#: view:crm.phonecall2partner:0
-#: view:res.partner:0
-#, python-format
-msgid "Cancel"
-msgstr "Cancelar"
-
-#. module: crm
-#: model:ir.model,name:crm.model_res_users
-msgid "res.users"
-msgstr "res.usuarios"
-
-#. module: crm
-#: model:ir.model,name:crm.model_crm_merge_opportunity
-msgid "Merge two Opportunities"
-msgstr "Fusionar dos oportunidades"
-
-#. module: crm
-#: selection:crm.meeting,end_type:0
-msgid "Fix amout of times"
-msgstr "Cantidad fija de veces"
-
-#. module: crm
-#: view:crm.lead:0
-#: view:crm.meeting:0
-#: view:crm.phonecall:0
-msgid "Current"
-msgstr "Actual"
-
-#. module: crm
-#: field:crm.meeting,exrule:0
-msgid "Exception Rule"
-msgstr "Exception de regla"
-
-#. module: crm
-#: help:base.action.rule,act_mail_to_partner:0
-msgid "Check this if you want the rule to send an email to the partner."
-msgstr "Verifica esto si tu quieres enviar la norma en un correo electronico a el socio"
-
-#. module: crm
-#: model:ir.actions.act_window,name:crm.crm_phonecall_categ_action
-msgid "Phonecall Categories"
-msgstr "Categorías de llamadas"
-
-#. module: crm
-#: view:crm.meeting:0
-msgid "Invite People"
-msgstr "Invitar personas"
-
-#. module: crm
-#: constraint:crm.case.section:0
-msgid "Error ! You cannot create recursive Sales team."
-msgstr "¡Error! No puede crear equipos de ventas recursivos."
-
-#. module: crm
-#: view:crm.meeting:0
-msgid "Search Meetings"
-msgstr "Buscar reuniones"
-
-#. module: crm
-#: selection:crm.segmentation.line,expr_name:0
-msgid "Sale Amount"
-msgstr "Importe de venta"
-
-#. module: crm
-#: code:addons/crm/wizard/crm_send_email.py:141
-#, python-format
-msgid "Unable to send mail. Please check SMTP is configured properly."
-msgstr "Imposible enviar el correo electrónico. Verifique que la configuración SMTP sea correcta."
-
-#. module: crm
-#: selection:crm.segmentation.line,expr_operator:0
-msgid "="
-msgstr "="
-
-#. module: crm
-#: selection:crm.meeting,state:0
-msgid "Unconfirmed"
-msgstr "No confirmado"
-
-#. module: crm
-#: model:ir.actions.act_window,help:crm.action_report_crm_opportunity
-msgid "Opportunities Analysis gives you an instant access to your opportunities with information such as the expected revenue, planned cost, missed deadlines or the number of interactions per opportunity. This report is mainly used by the sales manager in order to do the periodic review with the teams of the sales pipeline."
-msgstr "El análisis de oportunidades le da acceso instantáneo a sus oportunidades con información como el ingreso previsto, coste planeado, fechas límite incumplidas o el número de interacciones por oportunidad. Este informe lo utiliza principalmente el responsable de ventas para hacer una revisión periódica del proceso de ventas con los equipos."
-
-#. module: crm
-#: field:crm.case.categ,name:0
-#: field:crm.installer,name:0
-#: field:crm.lead,name:0
-#: field:crm.segmentation,name:0
-#: field:crm.send.mail.attachment,name:0
-msgid "Name"
-msgstr "Nombre"
-
-#. module: crm
-#: field:crm.meeting,alarm_id:0
-#: field:crm.meeting,base_calendar_alarm_id:0
-msgid "Alarm"
-msgstr "Alarma"
-
-#. module: crm
-#: model:ir.actions.act_window,help:crm.crm_lead_stage_act
-msgid "Add specific stages to leads and opportunities allowing your sales to better organise their sales pipeline. Stages will allow them to easily track how a specific lead or opportunity is positioned in the sales cycle."
-msgstr "Agregar etapas específicas de iniciativas y oportunidades para organizar mejor su flujo de ventas. Estas etapas permitirán un fácil seguimiento de iniciativas u oportunidades en relación al ciclo de ventas."
-
-#. module: crm
-#: view:crm.lead.report:0
-#: view:crm.phonecall.report:0
-msgid "My Case(s)"
-msgstr "Mi(s) caso(s)"
-
-#. module: crm
-#: field:crm.lead,birthdate:0
-msgid "Birthdate"
-msgstr "Fecha de nacimiento"
-
-#. module: crm
-#: view:crm.meeting:0
-msgid "The"
-msgstr "El"
-
-#. module: crm
-#: field:crm.send.mail.attachment,wizard_id:0
-msgid "Wizard"
-msgstr "Asistente"
-
-#. module: crm
-#: help:crm.lead,section_id:0
-msgid "Sales team to which this case belongs to. Defines responsible user and e-mail address for the mail gateway."
-msgstr "El equipo de ventas al que pertenece este caso. Define el usuario responsable y la dirección de correo electrónico para la pasarela de correo."
-
-#. module: crm
-#: view:crm.lead:0
-#: view:crm.phonecall:0
-msgid "Creation"
-msgstr "Creación"
-
-#. module: crm
-#: selection:crm.lead,priority:0
-#: selection:crm.lead.report,priority:0
-#: selection:crm.phonecall,priority:0
-#: selection:crm.phonecall.report,priority:0
-msgid "High"
-msgstr "Alto"
-
-#. module: crm
-#: model:process.node,note:crm.process_node_partner0
-msgid "Convert to prospect to business partner"
-msgstr "Convertir prospección a empresa"
-
-#. module: crm
-#: view:crm.phonecall2opportunity:0
-msgid "_Convert"
-msgstr "_Convertir"
-
-#. module: crm
-#: model:ir.actions.act_window,help:crm.action_view_attendee_form
-msgid "With Meeting Invitations you can create and manage the meeting invitations sent/to be sent to your colleagues/partners. You can not only invite OpenERP users, but also external parties, such as a customer."
-msgstr "Con invitaciones a reuniones puede crear y gesionar las invitaciones  de reuniones enviadas / por enviar a sus compañeros de trabajo / empresas. La invitación no debe ser únicamente para usuarios de OpenERP, puede ser igualmente para terceros externos, como un cliente."
-
-#. module: crm
-#: selection:crm.meeting,week_list:0
-msgid "Saturday"
-msgstr "Sábado"
-
-#. module: crm
-#: selection:crm.meeting,byday:0
-msgid "Fifth"
-msgstr "Quinto"
-
-#. module: crm
-#: view:crm.phonecall2phonecall:0
-msgid "_Schedule"
-msgstr "_Calendario"
-
-#. module: crm
-#: field:crm.lead.report,delay_close:0
-msgid "Delay to Close"
-msgstr "Tiempo restante para el cierre"
-
-#. module: crm
-#: field:crm.meeting,we:0
-msgid "Wed"
-msgstr "Mier"
-
-#. module: crm
-#: model:crm.case.categ,name:crm.categ_oppor6
-msgid "Potential Reseller"
-msgstr "Distribuidor potencial"
-
-#. module: crm
-#: field:crm.lead.report,planned_revenue:0
-msgid "Planned Revenue"
-msgstr "Ingresos previstos"
-
-#. module: crm
-#: view:crm.lead:0
-#: view:crm.lead.report:0
-#: view:crm.meeting:0
-#: view:crm.phonecall:0
-#: view:crm.phonecall.report:0
-msgid "Group By..."
-msgstr "Agrupar por..."
-
-#. module: crm
-#: help:crm.lead,partner_id:0
-msgid "Optional linked partner, usually after conversion of the lead"
-msgstr "Empresa relacionada opcional, normalmente después de la conversión de la iniciativa"
-
-#. module: crm
-#: view:crm.meeting:0
-msgid "Invitation details"
-msgstr "Detalles de la invitación"
-
-#. module: crm
-#: field:crm.case.section,parent_id:0
-msgid "Parent Team"
-msgstr "Equipo padre"
-
-#. module: crm
-#: field:crm.lead,date_action:0
-msgid "Next Action Date"
-msgstr "Fecha  de la próxima acción"
-
-#. module: crm
-#: selection:crm.segmentation,state:0
-msgid "Running"
-msgstr "En proceso"
-
-#. module: crm
-#: selection:crm.meeting,freq:0
-msgid "Hours"
-msgstr "Horas"
-
-#. module: crm
-#: field:crm.lead,zip:0
-msgid "Zip"
-msgstr "Código postal"
-
-#. module: crm
-#: code:addons/crm/crm_lead.py:213
-#, python-format
-msgid "The case '%s' has been opened."
-msgstr "El caso '%s' ha sido abierto"
-
-#. module: crm
-#: view:crm.installer:0
-msgid "title"
-msgstr "título"
-
-#. module: crm
-#: model:crm.case.categ,name:crm.categ_phone1
-#: model:ir.actions.act_window,name:crm.crm_case_categ_phone_incoming0
-#: model:ir.ui.menu,name:crm.menu_crm_case_phone_inbound
-msgid "Inbound"
-msgstr "Entrante"
-
-#. module: crm
-#: help:crm.case.stage,probability:0
-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 sean un éxito."
-
-#. module: crm
-#: view:crm.phonecall.report:0
-#: model:ir.actions.act_window,name:crm.act_crm_opportunity_crm_phonecall_new
-msgid "Phone calls"
-msgstr "Llamadas telefónicas"
-
-#. module: crm
-#: view:crm.lead:0
-msgid "Communication  History"
-msgstr "Historial de comunicaciones"
-
-#. module: crm
-#: selection:crm.meeting,show_as:0
-msgid "Free"
-msgstr "Libre"
-
-#. module: crm
-#: view:crm.installer:0
-msgid "Synchronization"
-msgstr "Sincronización"
-
-#. module: crm
-#: field:crm.case.section,allow_unlink:0
-msgid "Allow Delete"
-msgstr "Permitir eliminar"
-
-#. module: crm
-#: field:crm.meeting,mo:0
-msgid "Mon"
-msgstr "Lun"
-
-#. module: crm
-#: selection:crm.lead,priority:0
-#: selection:crm.lead.report,priority:0
-#: selection:crm.phonecall,priority:0
-#: selection:crm.phonecall.report,priority:0
-msgid "Highest"
-msgstr "Muy alto"
-
-#. module: crm
-#: model:ir.actions.act_window,help:crm.crm_case_categ_phone_incoming0
-msgid "The Inbound Calls tool allows you to log your inbound calls on the fly. Each call you get will appear on the partner form to trace every contact you have with a partner. From the phone call form, you can trigger a request for another call, a meeting or an opportunity."
-msgstr "La herramienta de llamadas entrantes le permite seguir el rastro de sus llamadas entrantes en tiempo real. Cada llamada que reciba, aparecerá en el formulario de la empresa para dejar el rastro de cada contacto que tiene en una empresa. Desde el formulario de llamada telefónica, puede lanzar una solicitud para otra llamada, una reunión o una oportunidad"
-
-#. module: crm
-#: help:crm.meeting,recurrency:0
-msgid "Recurrent Meeting"
-msgstr "Reunión periódica"
-
-#. module: crm
-#: view:crm.case.section:0
-#: view:crm.lead:0
-#: field:crm.lead,description:0
-msgid "Notes"
-msgstr "Notas"
-
-#. module: crm
-#: selection:crm.meeting,freq:0
-msgid "Days"
-msgstr "Días"
-
-#. module: crm
-#: field:crm.segmentation.line,expr_value:0
-msgid "Value"
-msgstr "Valor"
-
-#. module: crm
-#: view:crm.lead:0
-#: view:crm.lead.report:0
-msgid "Opportunity by Categories"
-msgstr "Oportunidades por categorías"
-
-#. module: crm
-#: view:crm.lead:0
-#: field:crm.lead,partner_name:0
-msgid "Customer Name"
-msgstr "Nombre del cliente"
-
-#. module: crm
-#: model:ir.model,name:crm.model_crm_phonecall2opportunity
-msgid "Phonecall To Opportunity"
-msgstr "Llamada telefónica a oportunidad"
-
-#. module: crm
-#: field:crm.case.section,reply_to:0
-msgid "Reply-To"
-msgstr "Responder a"
-
-#. module: crm
-#: view:crm.case.section:0
-msgid "Select Stages for this Sales Team"
-msgstr "Seleccionar etapas para este equipo de ventas"
-
-#. module: crm
-#: view:board.board:0
-msgid "Opportunities by Stage"
-msgstr "Oportunidades por etapa"
-
-#. module: crm
-#: view:crm.meeting:0
-msgid "Recurrency Option"
-msgstr "Opción de recurrencia"
-
-#. module: crm
-#: model:process.transition,note:crm.process_transition_leadpartner0
-msgid "Prospect is converting to business partner"
-msgstr "El prospecto se convierte a partner"
-
-#. module: crm
-#: view:crm.lead2opportunity:0
-#: view:crm.partner2opportunity:0
-#: model:ir.actions.act_window,name:crm.phonecall2opportunity_act
-msgid "Convert To Opportunity"
-msgstr "Convertir en oportunidad"
-
-#. module: crm
-#: view:crm.phonecall:0
-#: view:crm.phonecall.report:0
-#: view:res.partner:0
-msgid "Held"
-msgstr "Ocupado"
-
-#. module: crm
-#: view:crm.lead:0
-#: view:crm.phonecall:0
-#: view:res.partner:0
-msgid "Reset to Draft"
-msgstr "Cambiar a borrador"
-
-#. module: crm
-#: view:crm.lead:0
-msgid "Extra Info"
-msgstr "Información extra"
-
-#. module: crm
-#: view:crm.merge.opportunity:0
-#: model:ir.actions.act_window,name:crm.action_merge_opportunities
-#: model:ir.actions.act_window,name:crm.merge_opportunity_act
-msgid "Merge Opportunities"
-msgstr "Fusionar oportunidades"
-
-#. module: crm
-#: model:crm.case.resource.type,name:crm.type_lead5
-msgid "Google Adwords"
-msgstr "Google Adwords"
-
-#. module: crm
-#: model:ir.model,name:crm.model_crm_phonecall
-msgid "crm.phonecall"
-msgstr "crm.llamadateléfono"
-
-#. module: crm
-#: model:crm.case.resource.type,name:crm.type_lead3
-msgid "Mail Campaign 2"
-msgstr "Campaña mail 2"
-
-#. module: crm
-#: model:crm.case.resource.type,name:crm.type_lead2
-msgid "Mail Campaign 1"
-msgstr "Mail Campaign 1"
-
-#. module: crm
-#: view:crm.lead:0
-msgid "Create"
-msgstr "Crear"
-
-#. module: crm
-#: view:crm.lead:0
-msgid "Dates"
-msgstr "Fechas"
-
-#. module: crm
-#: code:addons/crm/crm.py:492
-#, python-format
-msgid "Send"
-msgstr "Enviar"
-
-#. module: crm
-#: view:crm.lead:0
-#: field:crm.lead,priority:0
-#: view:crm.lead.report:0
-#: field:crm.lead.report,priority:0
-#: field:crm.phonecall,priority:0
-#: view:crm.phonecall.report:0
-#: field:crm.phonecall.report,priority:0
-msgid "Priority"
-msgstr "Prioridad"
-
-#. module: crm
-#: field:crm.segmentation,sales_purchase_active:0
-msgid "Use The Sales Purchase Rules"
-msgstr "Utiliza las reglas de compra ventas"
-
-#. module: crm
-#: model:ir.model,name:crm.model_crm_lead2opportunity_partner
-msgid "Lead To Opportunity Partner"
-msgstr "Iniciativa a Oportunidad"
-
-#. module: crm
-#: field:crm.meeting,location:0
-msgid "Location"
-msgstr "Ubicación"
-
-#. module: crm
-#: view:crm.lead:0
-msgid "Reply"
-msgstr "Responder"
-
-#. module: crm
-#: selection:crm.meeting,freq:0
-msgid "Weeks"
-msgstr "Semanas"
-
-#. module: crm
-#: model:process.node,note:crm.process_node_meeting0
-msgid "Schedule a normal or phone meeting"
-msgstr "Programar una reunión normal o telefónica"
-
-#. module: crm
-#: code:addons/crm/crm.py:375
-#, python-format
-msgid "Error !"
-msgstr "¡Error!"
-
-#. module: crm
-#: model:ir.actions.act_window,help:crm.crm_meeting_categ_action
-msgid "Create different meeting categories to better organize and classify your meetings."
-msgstr "Cree diferentes categorías de reuniones para organizarlas y clasificarlas mejor."
-
-#. module: crm
-#: model:ir.model,name:crm.model_crm_segmentation_line
-msgid "Segmentation line"
-msgstr "Línea de segmentación"
-
-#. module: crm
-#: view:crm.opportunity2phonecall:0
-#: view:crm.phonecall2phonecall:0
-msgid "Planned Date"
-msgstr "Fecha prevista"
-
-#. module: crm
-#: field:crm.meeting,base_calendar_url:0
-msgid "Caldav URL"
-msgstr "URL de caldav"
-
-#. module: crm
-#: view:crm.lead:0
-msgid "Expected Revenues"
-msgstr "Ingresos esperados"
-
-#. module: crm
-#: model:crm.case.resource.type,name:crm.type_lead6
-msgid "Google Adwords 2"
-msgstr "Google Adwords 2"
-
-#. module: crm
-#: help:crm.lead,type:0
-#: help:crm.lead.report,type:0
-msgid "Type is used to separate Leads and Opportunities"
-msgstr "El tipo es utilizado para separar iniciativas y oportunidades"
-
-#. module: crm
-#: view:crm.phonecall2partner:0
-msgid "Are you sure you want to create a partner based on this Phonecall ?"
-msgstr "¿Está seguro que quiere crear una empresa basada en esta llamada telefónica?"
-
-#. module: crm
-#: selection:crm.lead.report,month:0
-#: selection:crm.meeting,month_list:0
-#: selection:crm.phonecall.report,month:0
-msgid "July"
-msgstr "Julio"
-
-#. module: crm
-#: model:ir.actions.act_window,help:crm.crm_case_section_act
-msgid "Define a Sales Team to organize your different salesmen or sales departments into separate teams. Each team will work in its own list of opportunities, sales orders, etc. Each user can set a default team in his user preferences. The opportunities and sales order displayed, will automatically be filtered according to his team."
-msgstr "Defina un equipo de ventas para organizar a sus diferentes vendedores o departamentos de ventas en equipos separados. Cada equipo trabajará en su propia lista de oportunidades, pedidos de venta, etc. Cada usuario puede configurar un equipo predeterminado en sus preferencias de usuario. Las oportunidades y pedidos de venta mostrados se filtrarán automáticamente de acuerdo a su equipo."
-
-#. module: crm
-#: help:crm.meeting,count:0
-msgid "Repeat x times"
-msgstr "Repetir x veces"
-
-#. 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 "Equipos de ventas"
-
-#. module: crm
-#: model:ir.model,name:crm.model_crm_lead2partner
-msgid "Lead to Partner"
-msgstr "Inicaitiva a cliente"
-
-#. module: crm
-#: field:crm.segmentation.line,segmentation_id:0
-#: model:ir.actions.act_window,name:crm.crm_segmentation-act
-msgid "Segmentation"
-msgstr "Segmentación"
-
-#. module: crm
-#: view:crm.lead:0
-msgid "Team"
-msgstr "Equipo"
-
-#. module: crm
-#: field:crm.installer,outlook:0
-msgid "MS-Outlook"
-msgstr "MS-Outlook"
-
-#. module: crm
-#: view:crm.phonecall:0
-#: view:crm.phonecall.report:0
-#: view:res.partner:0
-msgid "Not Held"
-msgstr "No ocupado"
-
-#. module: crm
-#: field:crm.lead.report,probability:0
-msgid "Probability"
-msgstr "Probabilidad"
-
-#. module: crm
-#: view:crm.lead.report:0
-#: field:crm.lead.report,month:0
-#: field:crm.meeting,month_list:0
-#: view:crm.phonecall.report:0
-#: field:crm.phonecall.report,month:0
-msgid "Month"
-msgstr "Mes"
-
-#. module: crm
-#: view:crm.lead:0
-#: model:ir.actions.act_window,name:crm.crm_case_category_act_leads_all
-#: model:ir.ui.menu,name:crm.menu_crm_case_categ0_act_leads
-#: model:process.node,name:crm.process_node_leads0
-msgid "Leads"
-msgstr "Iniciativas"
-
-#. module: crm
-#: model:ir.actions.act_window,help:crm.crm_case_category_act_leads_all
-msgid "Leads allow you to manage and keep track of all initial contacts with a prospect or partner showing interest in your products or services. A lead is usually the first step in your sales cycle. Once qualified, a lead may be converted into a business opportunity, while creating the related partner for further detailed tracking of any linked activities. You can import a database of prospects, keep track of your business cards or integrate your website's contact form with the OpenERP Leads. Leads can be connected to the email gateway: new emails may create leads, each of them automatically gets the history of the conversation with the prospect."
-msgstr "Las iniciativas le permiten gestionar y realizar un seguimiento de todos los contactos iniciales con un cliente potencial o socio que muestre interés en sus productos o servicios. Una iniciativa es generalmente el primer paso en su ciclo de ventas. Una vez identificada, una iniciativa se puede convertir en una oportunidad de negocio, creándose el socio correspondiente para el seguimiento detallado de cualquier actividad relacionada. Usted puede importar una base de datos de posibles clientes, realizar el seguimiento de sus tarjetas de visita o integrar el formulario de contacto de su sitio web con las iniciativas de OpenERP. Las iniciativas pueden ser conectadas a una pasarela de correo electrónico: los nuevos correos crearán nuevas iniciativas y cada una de ellas obtendrá automáticamente el historial de la conversación con el cliente potencial."
-
-#. module: crm
-#: selection:crm.lead2opportunity.partner,action:0
-#: selection:crm.lead2partner,action:0
-#: selection:crm.phonecall2partner,action:0
-msgid "Create a new partner"
-msgstr "Crear una nueva empresa"
-
-#. module: crm
-#: view:crm.meeting:0
-#: view:res.partner:0
-msgid "Start Date"
-msgstr "Fecha inicio"
-
-#. module: crm
-#: selection:crm.phonecall,state:0
-#: view:crm.phonecall.report:0
-msgid "Todo"
-msgstr "Por hacer"
-
-#. module: crm
-#: view:crm.meeting:0
-msgid "Delegate"
-msgstr "Delegar"
-
-#. module: crm
-#: view:crm.meeting:0
-msgid "Decline"
-msgstr "Rechazar"
-
-#. module: crm
-#: help:crm.lead,optin:0
-msgid "If opt-in is checked, this contact has accepted to receive emails."
-msgstr "Si opt-in está marcado, este contacto ha aceptado recibir correos electrónicos."
-
-#. module: crm
-#: view:crm.meeting:0
-msgid "Reset to Unconfirmed"
-msgstr "Restablecer a no confirmado"
-
-#. module: crm
-#: code:addons/crm/wizard/crm_add_note.py:40
-#: view:crm.add.note:0
-#, python-format
-msgid "Note"
-msgstr "Nota"
-
-#. module: crm
-#: constraint:res.users:0
-msgid "The chosen company is not in the allowed companies for this user"
-msgstr "La compañía seleccionada no está en las compañías permitidas para este usuario"
-
-#. module: crm
-#: selection:crm.lead,priority:0
-#: selection:crm.lead.report,priority:0
-#: selection:crm.phonecall,priority:0
-#: selection:crm.phonecall.report,priority:0
-msgid "Low"
-msgstr "Bajo"
-
-#. module: crm
-#: selection:crm.add.note,state:0
-#: field:crm.lead,date_closed:0
-#: selection:crm.lead,state:0
-#: view:crm.lead.report:0
-#: selection:crm.lead.report,state:0
-#: field:crm.meeting,date_closed:0
-#: selection:crm.merge.opportunity,state:0
-#: field:crm.phonecall,date_closed:0
-#: selection:crm.phonecall.report,state:0
-#: selection:crm.send.mail,state:0
-msgid "Closed"
-msgstr "Cerrado"
-
-#. module: crm
-#: view:crm.installer:0
-msgid "Plug-In"
-msgstr "Conector"
-
-#. module: crm
-#: model:crm.case.categ,name:crm.categ_meet2
-msgid "Internal Meeting"
-msgstr "Reunión interna"
-
-#. module: crm
-#: code:addons/crm/crm.py:411
-#: selection:crm.add.note,state:0
-#: view:crm.lead:0
-#: selection:crm.lead,state:0
-#: view:crm.lead.report:0
-#: selection:crm.lead.report,state:0
-#: selection:crm.merge.opportunity,state:0
-#: selection:crm.phonecall,state:0
-#: selection:crm.phonecall.report,state:0
-#: selection:crm.send.mail,state:0
-#, python-format
-msgid "Pending"
-msgstr "Pendiente"
-
-#. module: crm
-#: model:crm.case.categ,name:crm.categ_meet1
-msgid "Customer Meeting"
-msgstr "Reunión de cliente"
-
-#. module: crm
-#: view:crm.lead:0
-#: field:crm.lead,email_cc:0
-msgid "Global CC"
-msgstr "CC Global"
-
-#. module: crm
-#: 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
-#: view:res.partner:0
-msgid "Phone Calls"
-msgstr "Llamadas telefónicas"
-
-#. module: crm
-#: help:crm.lead.report,delay_open:0
-#: help:crm.phonecall.report,delay_open:0
-msgid "Number of Days to open the case"
-msgstr "Número de días para abrir el caso"
-
-#. module: crm
-#: field:crm.lead,phone:0
-#: field:crm.phonecall,partner_phone:0
-msgid "Phone"
-msgstr "Teléfono"
-
-#. module: crm
-#: field:crm.case.section,active:0
-#: field:crm.lead,active:0
-#: view:crm.lead.report:0
-#: field:crm.meeting,active:0
-#: field:crm.phonecall,active:0
-msgid "Active"
-msgstr "Activo"
-
-#. module: crm
-#: code:addons/crm/crm_lead.py:306
-#, python-format
-msgid "The stage of opportunity '%s' has been changed to '%s'."
-msgstr "La fase de la oportunidad '%s' ha cambiado a '%s'."
-
-#. module: crm
-#: selection:crm.segmentation.line,operator:0
-msgid "Mandatory Expression"
-msgstr "Expresión obligatoria"
-
-#. module: crm
-#: selection:crm.segmentation.line,expr_operator:0
-msgid ">"
-msgstr ">"
-
-#. module: crm
-#: view:crm.meeting:0
-msgid "Uncertain"
-msgstr "Incierto"
-
-#. module: crm
-#: field:crm.send.mail,email_cc:0
-msgid "CC"
-msgstr "CC"
-
-#. module: crm
-#: view:crm.send.mail:0
-#: model:ir.actions.act_window,name:crm.action_crm_send_mail
-msgid "Send Mail"
-msgstr "Enviar correo"
-
-#. module: crm
-#: selection:crm.meeting,freq:0
-msgid "Months"
-msgstr "Meses"
-
-#. module: crm
-#: help:crm.installer,wiki_sale_faq:0
-msgid "Helps you manage wiki pages for Frequently Asked Questions on Sales Application."
-msgstr "Le ayuda a organizar páginas wiki para preguntas frecuentes sobre la aplicación de ventas"
-
-#. module: crm
-#: help:crm.installer,crm_fundraising:0
-msgid "This may help associations in their fundraising process and tracking."
-msgstr "Puede ayudar a las asociaciones en su proceso de obtención de fondos y seguimiento."
-
-#. module: crm
-#: field:crm.lead2opportunity.partner,action:0
-#: field:crm.lead2partner,action:0
-#: field:crm.phonecall2partner,action:0
-msgid "Action"
-msgstr "Acción"
-
-#. module: crm
-#: field:crm.installer,crm_claim:0
-msgid "Claims"
-msgstr "Reclamaciones"
-
-#. module: crm
-#: field:crm.segmentation,som_interval_decrease:0
-msgid "Decrease (0>1)"
-msgstr "Disminuir (0>1)"
-
-#. module: crm
-#: view:crm.add.note:0
-#: view:crm.lead:0
-#: view:crm.send.mail:0
-msgid "Attachments"
-msgstr "Datos adjuntos"
-
-#. module: crm
-#: selection:crm.meeting,rrule_type:0
-msgid "Weekly"
-msgstr "Semanal"
-
-#. module: crm
-#: view:crm.lead.report:0
-#: model:ir.actions.act_window,name:crm.action_report_crm_opportunity
-#: model:ir.ui.menu,name:crm.menu_report_crm_opportunities_tree
-msgid "Opportunities Analysis"
-msgstr "Análisis de oportunidades"
-
-#. module: crm
-#: view:crm.lead:0
-msgid "Misc"
-msgstr "Varios"
-
-#. module: crm
-#: model:crm.case.categ,name:crm.categ_oppor8
-#: view:crm.meeting:0
-msgid "Other"
-msgstr "Otro"
-
-#. module: crm
-#: view:crm.meeting:0
-#: selection:crm.meeting,state:0
-#: selection:crm.phonecall,state:0
-msgid "Done"
-msgstr "Hecho"
-
-#. module: crm
-#: help:crm.meeting,interval:0
-msgid "Repeat every (Days/Week/Month/Year)"
-msgstr "Repetir cada (días/semana/mes/año)"
-
-#. module: crm
-#: field:crm.segmentation,som_interval_max:0
-msgid "Max Interval"
-msgstr "Intervalo máx"
-
-#. module: crm
-#: view:crm.opportunity2phonecall:0
-msgid "_Schedule Call"
-msgstr "_Programar llamada"
-
-#. module: crm
-#: code:addons/crm/crm.py:326
-#: selection:crm.add.note,state:0
-#: view:crm.lead:0
-#: selection:crm.lead,state:0
-#: selection:crm.lead.report,state:0
-#: selection:crm.merge.opportunity,state:0
-#: view:crm.phonecall:0
-#: selection:crm.phonecall.report,state:0
-#: selection:crm.send.mail,state:0
-#: view:res.partner:0
-#, python-format
-msgid "Open"
-msgstr "Abierto"
-
-#. module: crm
-#: selection:crm.meeting,week_list:0
-msgid "Tuesday"
-msgstr "Martes"
-
-#. module: crm
-#: field:crm.lead,city:0
-msgid "City"
-msgstr "Ciudad"
-
-#. module: crm
-#: selection:crm.meeting,show_as:0
-msgid "Busy"
-msgstr "Ocupado"
-
-#. module: crm
-#: field:crm.meeting,interval:0
-msgid "Repeat every"
-msgstr "Repetir cada"
-
-#. module: crm
-#: field:crm.installer,crm_helpdesk:0
-msgid "Helpdesk"
-msgstr "Asistencia/Ayuda"
-
-#. module: crm
-#: field:crm.meeting,recurrency:0
-msgid "Recurrent"
-msgstr "Recurrente"
-
-#. module: crm
-#: code:addons/crm/crm.py:397
-#, python-format
-msgid "The case '%s' has been cancelled."
-msgstr "El caso '%s' ha sido cancelado"
-
-#. module: crm
-#: field:crm.installer,sale_crm:0
-msgid "Opportunity to Quotation"
-msgstr "Oportunidad a presupuesto"
-
-#. module: crm
-#: model:ir.model,name:crm.model_crm_send_mail
-msgid "Send new email"
-msgstr "Enviar nuevo email"
-
-#. module: crm
-#: view:board.board:0
-#: model:ir.actions.act_window,name:crm.act_my_oppor
-msgid "My Open Opportunities"
-msgstr "Mis oportunidades abiertas"
-
-#. module: crm
-#: model:ir.actions.act_window,name:crm.open_board_statistical_dash
-msgid "CRM - Statistics Dashboard"
-msgstr "CRM - Tablero de estadísticas"
-
-#. module: crm
-#: help:crm.meeting,rrule:0
-msgid "Defines a rule or repeating pattern for recurring events\n"
-"e.g.: Every other month on the last Sunday of the month for 10 occurrences:        FREQ=MONTHLY;INTERVAL=2;COUNT=10;BYDAY=-1SU"
-msgstr "Define una regla o patrón repetitivo para eventos recurrentes.\n"
-"Por ejemplo: Para 10 ocurrencias cada último domingo de cada dos meses : FREQ=MONTHLY;INTERVAL=2;COUNT=10;BYDAY=-1SU"
-
-#. module: crm
-#: field:base.action.rule,trg_max_history:0
-msgid "Maximum Communication History"
-msgstr "Máximo historial de comunicaciones"
-
-#. module: crm
-#: view:crm.lead2opportunity.partner:0
-#: view:crm.lead2partner:0
-msgid "Are you sure you want to create a partner based on this lead ?"
-msgstr "¿Está seguro que quiere crear una empresa basada en esta iniciativa?"
-
-#. module: crm
-#: view:crm.meeting:0
-#: field:crm.meeting,categ_id:0
-msgid "Meeting Type"
-msgstr "Tipo de reunión"
-
-#. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:314
-#, python-format
-msgid "Merge with Existing Opportunity"
-msgstr "Fusinar con oportunidad existente"
-
-#. module: crm
-#: help:crm.lead,state:0
-#: help:crm.phonecall,state:0
-msgid "The state is set to 'Draft', when a case is created.                                  \n"
-"If the case is in progress the state is set to 'Open'.                                  \n"
-"When the case is over, the state is set to 'Done'.                                  \n"
-"If the case needs to be reviewed then the state is set to 'Pending'."
-msgstr "El estado se establece a 'Borrador', cuando se crea un caso.                                  \n"
-"Si el caso está en progreso el estado se establece a 'Abierto'.                                  \n"
-"Cuando el caso se cierra, el estado se establece a 'Realizado'.                                  \n"
-"Si el caso necesita ser revisado entonces en estado se establece a 'Pendiente'."
-
-#. module: crm
-#: view:crm.meeting:0
-#: view:res.partner:0
-msgid "End Date"
-msgstr "Fecha final"
-
-#. module: crm
-#: selection:crm.meeting,byday:0
-msgid "Third"
-msgstr "Tercero"
-
-#. module: crm
-#: help:crm.segmentation,som_interval_max:0
-msgid "The computation is made on all events that occured during this interval, the past X periods."
-msgstr "El cálculo se realiza en todos los eventos que ocurran durante este intervalo, los X períodos anteriores."
-
-#. module: crm
-#: view:board.board:0
-msgid "My Win/Lost Ratio for the Last Year"
-msgstr "Mi coeficiente ganado/perdido del año anterior"
-
-#. module: crm
-#: field:crm.installer,thunderbird:0
-msgid "Thunderbird"
-msgstr "Thunderbird"
-
-#. module: crm
-#: view:crm.lead.report:0
-msgid "# of Emails"
-msgstr "Nº de e-mails"
-
-#. module: crm
-#: view:crm.lead:0
-msgid "Search Leads"
-msgstr "Buscar iniciativas"
-
-#. module: crm
-#: view:crm.lead.report:0
-#: view:crm.phonecall.report:0
-#: field:crm.phonecall.report,delay_open:0
-msgid "Delay to open"
-msgstr "Retraso de apertura"
-
-#. module: crm
-#: view:crm.meeting:0
-msgid "Recurrency period"
-msgstr "Periodo de recurrencia"
-
-#. module: crm
-#: field:crm.meeting,week_list:0
-msgid "Weekday"
-msgstr "Día de la semana"
-
-#. module: crm
-#: view:crm.lead:0
-msgid "Referrer"
-msgstr "Referenciado por"
-
-#. module: crm
-#: model:ir.model,name:crm.model_crm_lead2opportunity
-msgid "Lead To Opportunity"
-msgstr "Iniciativa a opportunidad"
-
-#. module: crm
-#: model:ir.model,name:crm.model_calendar_attendee
-msgid "Attendee information"
-msgstr "Información asistentes"
-
-#. module: crm
-#: view:crm.segmentation:0
-msgid "Segmentation Test"
-msgstr "Prueba de segmentación"
-
-#. module: crm
-#: view:crm.segmentation:0
-msgid "Continue Process"
-msgstr "Continuar el proceso"
-
-#. module: crm
-#: view:crm.installer:0
-msgid "Configure Your CRM Application"
-msgstr "Configure su aplicación CRM"
-
-#. module: crm
-#: model:ir.model,name:crm.model_crm_phonecall2partner
-msgid "Phonecall to Partner"
-msgstr "Llamada telefónica a empresa"
-
-#. module: crm
-#: help:crm.lead,partner_name:0
-msgid "The name of the future partner that will be created while converting the into opportunity"
-msgstr "El nombre del futuro cliente que se creará cuando se convierta en oportunidad."
-
-#. module: crm
-#: field:crm.opportunity2phonecall,user_id:0
-#: field:crm.phonecall2phonecall,user_id:0
-msgid "Assign To"
-msgstr "Asignar a"
-
-#. module: crm
-#: field:crm.add.note,state:0
-#: field:crm.send.mail,state:0
-msgid "Set New State To"
-msgstr "Establecer nuevo estado a"
-
-#. module: crm
-#: field:crm.lead,date_action_last:0
-#: field:crm.meeting,date_action_last:0
-#: field:crm.phonecall,date_action_last:0
-msgid "Last Action"
-msgstr "Última acción"
-
-#. module: crm
-#: field:crm.meeting,duration:0
-#: field:crm.phonecall,duration:0
-#: field:crm.phonecall.report,duration:0
-msgid "Duration"
-msgstr "Duración"
-
-#. module: crm
-#: field:crm.send.mail,reply_to:0
-msgid "Reply To"
-msgstr "Responder a"
-
-#. module: crm
-#: view:board.board:0
-#: model:ir.actions.act_window,name:crm.open_board_crm
-#: model:ir.ui.menu,name:crm.menu_board_crm
-msgid "Sales Dashboard"
-msgstr "Tablero de ventas"
-
-#. module: crm
-#: code:addons/crm/wizard/crm_lead_to_partner.py:56
-#, python-format
-msgid "A partner is already defined on this lead."
-msgstr "Una empresa ya ha sido definida en esta iniciativa."
-
-#. module: crm
-#: field:crm.lead.report,nbr:0
-#: field:crm.phonecall.report,nbr:0
-msgid "# of Cases"
-msgstr "# de casos"
-
-#. module: crm
-#: help:crm.meeting,section_id:0
-#: help:crm.phonecall,section_id:0
-msgid "Sales team to which Case belongs to."
-msgstr "Equipo de ventas al cual pertence el caso"
-
-#. module: crm
-#: selection:crm.meeting,week_list:0
-msgid "Sunday"
-msgstr "Domingo"
-
-#. module: crm
-#: selection:crm.meeting,byday:0
-msgid "Fourth"
-msgstr "Cuarto"
-
-#. module: crm
-#: selection:crm.add.note,state:0
-#: selection:crm.merge.opportunity,state:0
-#: selection:crm.send.mail,state:0
-msgid "Unchanged"
-msgstr "Sin cambios"
-
-#. module: crm
-#: model:ir.actions.act_window,name:crm.crm_segmentation_tree-act
-#: model:ir.ui.menu,name:crm.menu_crm_segmentation-act
-msgid "Partners Segmentation"
-msgstr "Segmentación de empresas"
-
-#. module: crm
-#: field:crm.lead,fax:0
-msgid "Fax"
-msgstr "Fax"
-
-#. module: crm
-#: model:ir.actions.act_window,help:crm.crm_case_category_act_oppor11
-msgid "With opportunities you can manage and keep track of your sales pipeline by creating specific customer- or prospect-related sales documents to follow up potential sales. Information such as expected revenue, opportunity stage, expected closing date, communication history and much more can be stored. Opportunities can be connected to the email gateway: new emails may create opportunities, each of them automatically gets the history of the conversation with the customer.\n"
-"\n"
-"You and your team(s) will be able to plan meetings and phone calls from opportunities, convert them into quotations, manage related documents, track all customer related activities, and much more."
-msgstr "Con las oportunidades puede gestionar y guardar el registro de su canal de ventas creando documentos específicos de venta por cliente - o potencial cliente - para el seguimiento de sus ventas potenciales. La información sobre ingresos esperados, etapa de la oportunidad, fecha estimada de cierre, histórico de las comunicaciones y muchos otros datos puede ser registrada. Las oportunidades pueden ser conectadas a la pasarela de correo electrónico: nuevos emails pueden crear oportunidades, y cada uno de ellos obtiene automáticamente el historial de la conversación con el cliente."
-
-#. module: crm
-#: view:crm.meeting:0
-msgid "Assignment"
-msgstr "Asignación"
-
-#. module: crm
-#: field:crm.lead,company_id:0
-#: view:crm.lead.report:0
-#: field:crm.lead.report,company_id:0
-#: field:crm.phonecall,company_id:0
-#: view:crm.phonecall.report:0
-#: field:crm.phonecall.report,company_id:0
-msgid "Company"
-msgstr "Compañía"
-
-#. module: crm
-#: selection:crm.meeting,week_list:0
-msgid "Friday"
-msgstr "Viernes"
-
-#. module: crm
-#: field:crm.meeting,allday:0
-msgid "All Day"
-msgstr "Todo el día"
-
-#. module: crm
-#: field:crm.segmentation.line,operator:0
-msgid "Mandatory / Optional"
-msgstr "Obligatorio / Opcional"
-
-#. module: crm
-#: model:ir.actions.act_window,name:crm.action_view_attendee_form
-#: model:ir.ui.menu,name:crm.menu_attendee_invitations
-msgid "Meeting Invitations"
-msgstr "Invitaciones a reunión"
-
-#. module: crm
-#: field:crm.case.categ,object_id:0
-msgid "Object Name"
-msgstr "Nombre del objeto"
-
-#. module: crm
-#: help:crm.lead,email_from:0
-msgid "E-mail address of the contact"
-msgstr "e-mail del contacto"
-
-#. module: crm
-#: field:crm.lead,referred:0
-msgid "Referred by"
-msgstr "Referenciado por"
-
-#. module: crm
-#: view:crm.lead:0
-#: model:ir.model,name:crm.model_crm_add_note
-msgid "Add Internal Note"
-msgstr "Añadir nota interna"
-
-#. module: crm
-#: code:addons/crm/crm_lead.py:304
-#, python-format
-msgid "The stage of lead '%s' has been changed to '%s'."
-msgstr "La etapa de la iniciativa '%s' ha sido cambiada por '%s'"
-
-#. module: crm
-#: selection:crm.meeting,byday:0
-msgid "Last"
-msgstr "Último"
-
-#. module: crm
-#: field:crm.lead,message_ids:0
-#: field:crm.meeting,message_ids:0
-#: field:crm.phonecall,message_ids:0
-msgid "Messages"
-msgstr "Mensajes"
-
-#. module: crm
-#: help:crm.case.stage,on_change:0
-msgid "Change Probability on next and previous stages."
-msgstr "Cambiar probabilidad para las etapas siguientes y anteriores."
-
-#. module: crm
-#: code:addons/crm/crm.py:455
-#: code:addons/crm/crm.py:457
-#: code:addons/crm/crm_action_rule.py:66
-#: code:addons/crm/wizard/crm_send_email.py:141
-#, python-format
-msgid "Error!"
-msgstr "¡Error!"
-
-#. module: crm
-#: field:crm.opportunity2phonecall,name:0
-#: field:crm.phonecall2phonecall,name:0
-msgid "Call summary"
-msgstr "Resumen de la llamada"
-
-#. module: crm
-#: selection:crm.add.note,state:0
-#: selection:crm.lead,state:0
-#: selection:crm.lead.report,state:0
-#: selection:crm.meeting,state:0
-#: selection:crm.merge.opportunity,state:0
-#: selection:crm.phonecall,state:0
-#: selection:crm.phonecall.report,state:0
-#: selection:crm.send.mail,state:0
-msgid "Cancelled"
-msgstr "Cancelado"
-
-#. module: crm
-#: field:crm.add.note,body:0
-msgid "Note Body"
-msgstr "Contenido de la nota"
-
-#. module: crm
-#: view:board.board:0
-msgid "My Planned Revenues by Stage"
-msgstr "Mis ingresos previstos por etapa"
-
-#. module: crm
-#: field:crm.lead.report,date_closed:0
-#: field:crm.phonecall.report,date_closed:0
-msgid "Close Date"
-msgstr "Fecha cierre"
-
-#. module: crm
-#: view:crm.lead.report:0
-#: view:crm.phonecall.report:0
-msgid "   Month   "
-msgstr "   Mes   "
-
-#. module: crm
-#: view:crm.lead:0
-msgid "Links"
-msgstr "Enlaces"
-
-#. module: crm
-#: model:ir.actions.act_window,help:crm.crm_lead_categ_action
-msgid "Create specific categories that fit your company's activities to better classify and analyse your leads and opportunities. Such categories could for instance reflect your product structure or the different types of sales you do."
-msgstr "Crear categorías específicas que se adapten a las actividades de su compañía para clasificar y analizar mejor sus iniciativas y oportunidades. Estas categorías podrían, por ejemplo, reflejar la estructura de sus productos o de los distintos tipos de ventas que realice."
-
-#. module: crm
-#: help:crm.segmentation,som_interval_decrease:0
-msgid "If the partner has not purchased (or bought) during a period, decrease the state of mind by this factor. It's a multiplication"
-msgstr "Si la empresa no ha comprado durante un período, disminuir el grado de satisfacción por este factor. Es una multiplicación."
-
-#. module: crm
-#: model:ir.actions.act_window,help:crm.action_report_crm_phonecall
-msgid "From this report, you can analyse the performance of your sales team, based on their phone calls. You can group or filter the information according to several criteria and drill down the information, by adding more groups in the report."
-msgstr "Desde este informe, puede analizar el rendimiento de su equipo de ventas basándose en sus llamadas telefónicas. Puede agrupar o filtrar la información de acuerdo a varios criterios y profundizar en la información añadiendo más grupos al informe."
-
-#. module: crm
-#: view:crm.case.section:0
-msgid "Mailgateway"
-msgstr "Pasarela de correo"
-
-#. module: crm
-#: help:crm.lead,user_id:0
-msgid "By Default Salesman is Administrator when create New User"
-msgstr "Por defecto el vendedor es administrador cuando se crea un nuevo usuario"
-
-#. module: crm
-#: view:crm.lead.report:0
-msgid "# Mails"
-msgstr "Nº de correos"
-
-#. module: crm
-#: code:addons/crm/wizard/crm_phonecall_to_opportunity.py:57
-#, python-format
-msgid "Warning"
-msgstr "Aviso"
-
-#. module: crm
-#: field:crm.phonecall,name:0
-#: view:res.partner:0
-msgid "Call Summary"
-msgstr "Resumen de llamadas"
-
-#. module: crm
-#: field:crm.segmentation.line,expr_operator:0
-msgid "Operator"
-msgstr "Operador"
-
-#. module: crm
-#: view:crm.lead:0
-msgid "Schedule/Log Call"
-msgstr "Planificar/Registrar llamada"
-
-#. module: crm
-#: field:crm.installer,fetchmail:0
-msgid "Fetch Emails"
-msgstr "Buscar emails"
-
-#. module: crm
-#: selection:crm.meeting,state:0
-msgid "Confirmed"
-msgstr "Confirmado"
-
-#. module: crm
-#: help:crm.send.mail,email_cc:0
-msgid "These addresses will receive a copy of this email. To modify the permanent CC list, edit the global CC field of this case"
-msgstr "Estas direcciones recibirán una copia de este correo electrónico. Para modificar la lista CC permanente, edite el campo CC global de este caso."
-
-#. module: crm
-#: view:crm.meeting:0
-msgid "Confirm"
-msgstr "Confirmar"
-
-#. module: crm
-#: field:crm.meeting,su:0
-msgid "Sun"
-msgstr "Dom"
-
-#. module: crm
-#: field:crm.phonecall.report,section_id:0
-msgid "Section"
-msgstr "Sección"
-
-#. module: crm
-#: view:crm.lead:0
-msgid "Total of Planned Revenue"
-msgstr "Total ingresos previstos"
-
-#. module: crm
-#: code:addons/crm/crm.py:375
-#, python-format
-msgid "You can not escalate, You are already at the top level regarding your sales-team category."
-msgstr "No puede escalar, ya está en el nivel más alto en su categoría de equipo de ventas."
-
-#. module: crm
-#: selection:crm.segmentation.line,operator:0
-msgid "Optional Expression"
-msgstr "Expresión opcional"
-
-#. module: crm
-#: selection:crm.meeting,select1:0
-msgid "Day of month"
-msgstr "Día del mes"
-
-#. module: crm
-#: field:crm.lead2opportunity,probability:0
-msgid "Success Rate (%)"
-msgstr "Tasa de éxito (%)"
-
-#. module: crm
-#: model:crm.case.stage,name:crm.stage_lead1
-#: model:crm.case.stage,name:crm.stage_opportunity1
-msgid "New"
-msgstr "Nuevo"
-
-#. module: crm
-#: view:crm.meeting:0
-msgid "Mail TO"
-msgstr "Enviar correo a"
-
-#. module: crm
-#: view:crm.lead:0
-#: field:crm.lead,email_from:0
-#: field:crm.meeting,email_from:0
-#: field:crm.phonecall,email_from:0
-msgid "Email"
-msgstr "Email"
-
-#. module: crm
-#: view:crm.lead:0
-#: field:crm.lead,channel_id:0
-#: view:crm.lead.report:0
-#: field:crm.lead.report,channel_id:0
-#: field:crm.phonecall,canal_id:0
-msgid "Channel"
-msgstr "Canal"
-
-#. module: crm
-#: model:ir.actions.act_window,name:crm.opportunity2phonecall_act
-msgid "Schedule Call"
-msgstr "Planificar llamada"
-
-#. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:135
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:260
-#, python-format
-msgid "Closed/Cancelled Leads Could not convert into Opportunity"
-msgstr "Las iniciativas cerradas/canceladas no podrían ser convertidas en oportunidades"
-
-#. module: crm
-#: help:crm.segmentation,exclusif:0
-msgid "Check if the category is limited to partners that match the segmentation criterions.                        \n"
-"If checked, remove the category from partners that doesn't match segmentation criterions"
-msgstr "Marque esta opción si la categoría está limitada a empresas que coincidan con los criterios de segmentación.                        \n"
-"Si está marcada, elimina la categoría de aquellas empresas que no coincidan con los criterios de segmentación."
-
-#. module: crm
-#: field:crm.meeting,exdate:0
-msgid "Exception Date/Times"
-msgstr "Fecha/horas excepción"
-
-#. module: crm
-#: selection:crm.meeting,class:0
-msgid "Confidential"
-msgstr "Confidencial"
-
-#. module: crm
-#: field:crm.lead,state_id:0
-msgid "Fed. State"
-msgstr "Provincia"
-
-#. module: crm
-#: model:process.transition,note:crm.process_transition_leadopportunity0
-msgid "Creating business opportunities from Leads"
-msgstr "Creando oportunidades de negocio desde iniciativas"
-
-#. module: crm
-#: help:crm.send.mail,html:0
-msgid "Select this if you want to send email with HTML formatting."
-msgstr "Seleccione esta opción si desea enviar emails con formato HTML"
-
-#. module: crm
-#: model:crm.case.categ,name:crm.categ_oppor4
-msgid "Need Information"
-msgstr "Necesita información"
-
-#. module: crm
-#: model:process.transition,name:crm.process_transition_leadopportunity0
-msgid "Prospect Opportunity"
-msgstr "Oportunidad de prospección"
-
-#. module: crm
-#: view:crm.installer:0
-#: model:ir.actions.act_window,name:crm.action_crm_installer
-msgid "CRM Application Configuration"
-msgstr "Configuración de la aplicación CRM"
-
-#. module: crm
-#: field:base.action.rule,act_categ_id:0
-msgid "Set Category to"
-msgstr "Establecer categoría"
-
-#. module: crm
-#: view:crm.case.section:0
-msgid "Configuration"
-msgstr "Configuración"
-
-#. module: crm
-#: field:crm.meeting,th:0
-msgid "Thu"
-msgstr "Jue"
-
-#. module: crm
-#: view:crm.add.note:0
-#: view:crm.merge.opportunity:0
-#: view:crm.opportunity2phonecall:0
-#: view:crm.partner2opportunity:0
-#: view:crm.phonecall2opportunity:0
-#: view:crm.phonecall2phonecall:0
-#: view:crm.send.mail:0
-msgid "_Cancel"
-msgstr "_Cancelar"
-
-#. module: crm
-#: view:crm.lead.report:0
-#: view:crm.phonecall.report:0
-msgid "    Month-1    "
-msgstr "    Mes-1    "
-
-#. module: crm
-#: help:crm.installer,sale_crm:0
-msgid "This module relates sale from opportunity cases in the CRM."
-msgstr "Este módulo relaciona ventas con oportunidades en el CRM."
-
-#. module: crm
-#: selection:crm.meeting,rrule_type:0
-msgid "Daily"
-msgstr "Diario"
-
-#. module: crm
-#: model:crm.case.stage,name:crm.stage_lead2
-#: model:crm.case.stage,name:crm.stage_opportunity2
-msgid "Qualification"
-msgstr "Calificación"
-
-#. module: crm
-#: view:crm.case.stage:0
-msgid "Stage Definition"
-msgstr "Definición de etapa"
-
-#. module: crm
-#: selection:crm.meeting,byday:0
-msgid "First"
-msgstr "Primero"
-
-#. module: crm
-#: selection:crm.lead.report,month:0
-#: selection:crm.meeting,month_list:0
-#: selection:crm.phonecall.report,month:0
-msgid "December"
-msgstr "Diciembre"
-
-#. module: crm
-#: field:crm.installer,config_logo:0
-msgid "Image"
-msgstr "Imagen"
-
-#. module: crm
-#: view:base.action.rule:0
-msgid "Condition on Communication History"
-msgstr "Condición en el historial de comunicaciones"
-
-#. module: crm
-#: help:crm.segmentation,som_interval:0
-msgid "A period is the average number of days between two cycle of sale or purchase for this segmentation.                 \n"
-"It's mainly used to detect if a partner has not purchased or buy for a too long time,                  \n"
-"so we suppose that his state of mind has decreased because he probably bought goods to another supplier.                  \n"
-"Use this functionality for recurring businesses."
-msgstr "Un periodo es el número medio de días entre dos ciclos de ventas o compras para esta segmentación.                 \n"
-"Se utiliza principalmente para detectar si una empresa no ha comprado por un largo periodo de tiempo,                  \n"
-"por lo que suponemos que su grado de satisfacción ha disminuido porqué seguramente compró bienes a otro proveedor.                  \n"
-"Utilice esta funcionalidad para negocios recurrentes."
-
-#. module: crm
-#: view:crm.send.mail:0
-msgid "_Send Reply"
-msgstr "_Enviar respuesta"
-
-#. module: crm
-#: field:crm.meeting,vtimezone:0
-msgid "Timezone"
-msgstr "Zona horaria"
-
-#. module: crm
-#: field:crm.lead2opportunity.partner,msg:0
-#: field:crm.lead2partner,msg:0
-#: view:crm.send.mail:0
-msgid "Message"
-msgstr "Mensaje"
-
-#. module: crm
-#: field:crm.meeting,sa:0
-msgid "Sat"
-msgstr "Sáb"
-
-#. module: crm
-#: view:crm.lead:0
-#: field:crm.lead,user_id:0
-#: view:crm.lead.report:0
-#: view:crm.phonecall.report:0
-msgid "Salesman"
-msgstr "Comercial"
-
-#. module: crm
-#: field:crm.lead,date_deadline:0
-msgid "Expected Closing"
-msgstr "Cierre previsto"
-
-#. module: crm
-#: model:ir.model,name:crm.model_crm_opportunity2phonecall
-msgid "Opportunity to Phonecall"
-msgstr "Oportunidad a llamada telefónica"
-
-#. module: crm
-#: help:crm.case.section,allow_unlink:0
-msgid "Allows to delete non draft cases"
-msgstr "Permite eliminar los casos en estado no borrador."
-
-#. module: crm
-#: view:crm.lead:0
-msgid "Schedule Meeting"
-msgstr "Programar reunión"
-
-#. module: crm
-#: view:crm.lead:0
-msgid "Partner Name"
-msgstr "Nombre empresa"
-
-#. module: crm
-#: model:crm.case.categ,name:crm.categ_phone2
-#: model:ir.actions.act_window,name:crm.crm_case_categ_phone_outgoing0
-#: model:ir.ui.menu,name:crm.menu_crm_case_phone_outbound
-msgid "Outbound"
-msgstr "Saliente"
-
-#. module: crm
-#: field:crm.lead,date_open:0
-#: field:crm.phonecall,date_open:0
-msgid "Opened"
-msgstr "Abierto"
-
-#. module: crm
-#: view:crm.case.section:0
-#: field:crm.case.section,member_ids:0
-msgid "Team Members"
-msgstr "Miembros del equipo"
-
-#. module: crm
-#: view:crm.lead:0
-#: view:crm.meeting:0
-#: view:crm.phonecall:0
-#: view:res.partner:0
-msgid "Contacts"
-msgstr "Contactos"
-
-#. module: crm
-#: model:crm.case.categ,name:crm.categ_oppor1
-msgid "Interest in Computer"
-msgstr "Interesado en ordenadores"
-
-#. module: crm
-#: view:crm.meeting:0
-msgid "Invitation Detail"
-msgstr "Detalle de la invitación"
-
-#. module: crm
-#: field:crm.segmentation,som_interval_default:0
-msgid "Default (0=None)"
-msgstr "Por defecto (0=Ninguno)"
-
-#. module: crm
-#: help:crm.lead,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 "Estas direcciones de correo serán añadidas al campo CC para todos los correos entrantes y salientes de este registro antes de ser enviados. Separe las diferentes direcciones de correo con una coma."
-
-#. module: crm
-#: field:crm.partner2opportunity,probability:0
-#: field:crm.phonecall2opportunity,probability:0
-msgid "Success Probability"
-msgstr "Probabilidad de éxito"
-
-#. module: crm
-#: code:addons/crm/crm.py:426
-#: selection:crm.add.note,state:0
-#: selection:crm.lead,state:0
-#: selection:crm.lead.report,state:0
-#: selection:crm.merge.opportunity,state:0
-#: selection:crm.phonecall,state:0
-#: selection:crm.phonecall.report,state:0
-#: selection:crm.send.mail,state:0
-#, python-format
-msgid "Draft"
-msgstr "Borrador"
-
-#. module: crm
-#: model:ir.actions.act_window,name:crm.crm_case_section_act_tree
-msgid "Cases by Sales Team"
-msgstr "Casos por equipo de ventas"
-
-#. module: crm
-#: field:crm.meeting,attendee_ids:0
-msgid "Attendees"
-msgstr "Asistentes"
-
-#. module: crm
-#: view:crm.meeting:0
-#: view:crm.phonecall:0
-#: model:ir.model,name:crm.model_crm_meeting
-#: model:process.node,name:crm.process_node_meeting0
-#: model:res.request.link,name:crm.request_link_meeting
-msgid "Meeting"
-msgstr "Reunión"
-
-#. module: crm
-#: model:ir.model,name:crm.model_crm_case_categ
-msgid "Category of Case"
-msgstr "Categoría de caso"
-
-#. module: crm
-#: view:crm.lead:0
-#: view:crm.phonecall:0
-msgid "7 Days"
-msgstr "7 días"
-
-#. module: crm
-#: view:board.board:0
-msgid "Planned Revenue by Stage and User"
-msgstr "Ingresos previsto por etapa y usuario"
-
-#. module: crm
-#: view:crm.lead:0
-msgid "Communication & History"
-msgstr "Comunicación e Historial"
-
-#. module: crm
-#: model:ir.model,name:crm.model_crm_lead_report
-msgid "CRM Lead Report"
-msgstr "Informe de iniciativas CRM"
-
-#. module: crm
-#: field:crm.installer,progress:0
-msgid "Configuration Progress"
-msgstr "Progreso de la configuración"
-
-#. module: crm
-#: selection:crm.lead,priority:0
-#: selection:crm.lead.report,priority:0
-#: selection:crm.phonecall,priority:0
-#: selection:crm.phonecall.report,priority:0
-msgid "Normal"
-msgstr "Normal"
-
-#. module: crm
-#: field:crm.lead,street2:0
-msgid "Street2"
-msgstr "Calle2"
-
-#. module: crm
-#: model:ir.actions.act_window,name:crm.crm_meeting_categ_action
-#: model:ir.ui.menu,name:crm.menu_crm_case_meeting-act
-msgid "Meeting Categories"
-msgstr "Categorías de reuniones"
-
-#. module: crm
-#: view:crm.lead2opportunity.partner:0
-#: view:crm.lead2partner:0
-#: view:crm.phonecall2partner:0
-msgid "You may have to verify that this partner does not exist already."
-msgstr "Debería verificar que esta empresa no exista ya."
-
-#. module: crm
-#: field:crm.lead.report,delay_open:0
-msgid "Delay to Open"
-msgstr "Retraso de apertura"
-
-#. module: crm
-#: field:crm.lead.report,user_id:0
-#: field:crm.phonecall.report,user_id:0
-msgid "User"
-msgstr "Usuario"
-
-#. module: crm
-#: selection:crm.lead.report,month:0
-#: selection:crm.meeting,month_list:0
-#: selection:crm.phonecall.report,month:0
-msgid "November"
-msgstr "Noviembre"
-
-#. module: crm
-#: code:addons/crm/crm_action_rule.py:67
-#, python-format
-msgid "No E-Mail ID Found for your Company address!"
-msgstr "¡No se ha encontrado Email en la dirección de su compañía!"
-
-#. module: crm
-#: view:crm.lead.report:0
-msgid "Opportunities By Stage"
-msgstr "Oportunidades por etapa"
-
-#. module: crm
-#: model:ir.actions.act_window,name:crm.crm_case_categ_phone_create_partner
-msgid "Schedule Phone Call"
-msgstr "Planificar llamada telefónica"
-
-#. module: crm
-#: selection:crm.lead.report,month:0
-#: selection:crm.meeting,month_list:0
-#: selection:crm.phonecall.report,month:0
-msgid "January"
-msgstr "Enero"
-
-#. module: crm
-#: model:ir.actions.act_window,help:crm.crm_opportunity_stage_act
-msgid "Create specific stages that will help your sales better organise their sales pipeline by maintaining them to their sales opportunities. It will allow them to easily track how is positioned a specific opportunity in the sales cycle."
-msgstr "Crear pasos específicos que ayudarán a su departamento de ventas a organizar mejor el flujo de venta gestionando sus oportunidades de venta. Esto les permitirá seguir fácilmente como está posicionada una oportunidad en el ciclo de ventas."
-
-#. module: crm
-#: model:process.process,name:crm.process_process_contractprocess0
-msgid "Contract"
-msgstr "Contrato"
-
-#. module: crm
-#: model:crm.case.resource.type,name:crm.type_lead4
-msgid "Twitter Ads"
-msgstr "Anuncios Twiter"
-
-#. module: crm
-#: code:addons/crm/wizard/crm_add_note.py:26
-#: code:addons/crm/wizard/crm_send_email.py:72
-#: code:addons/crm/wizard/crm_send_email.py:169
-#: code:addons/crm/wizard/crm_send_email.py:270
-#, python-format
-msgid "Error"
-msgstr "Error"
-
-#. module: crm
-#: view:crm.lead.report:0
-msgid "Planned Revenues"
-msgstr "Ingresos esperados"
-
-#. module: crm
-#: model:crm.case.categ,name:crm.categ_oppor7
-msgid "Need Consulting"
-msgstr "Necesita consultoría"
-
-#. module: crm
-#: model:ir.model,name:crm.model_crm_phonecall2phonecall
-msgid "Phonecall To Phonecall"
-msgstr "Llamada telefónica a llamada telefónica"
-
-#. module: crm
-#: code:addons/crm/crm_lead.py:232
-#, python-format
-msgid "The case '%s' has been closed."
-msgstr "El caso '%s' ha sido cerrado"
-
-#. module: crm
-#: field:crm.lead,partner_address_id:0
-#: field:crm.meeting,partner_address_id:0
-#: field:crm.phonecall,partner_address_id:0
-msgid "Partner Contact"
-msgstr "Contacto empresa"
-
-#. module: crm
-#: field:crm.meeting,recurrent_id:0
-msgid "Recurrent ID date"
-msgstr "ID fecha recurrente"
-
-#. module: crm
-#: sql_constraint:res.users:0
-msgid "You can not have two users with the same login !"
-msgstr "¡No puede tener dos usuarios con el mismo identificador de usuario!"
-
-#. module: crm
-#: code:addons/crm/wizard/crm_merge_opportunities.py:100
-#, python-format
-msgid "Merged into Opportunity: %s"
-msgstr "Fusionado con la oportunidad '%s'"
-
-#. module: crm
-#: code:addons/crm/crm.py:347
-#: view:crm.lead:0
-#: view:res.partner:0
-#, python-format
-msgid "Close"
-msgstr "Cerrado"
-
-#. module: crm
-#: view:crm.lead:0
-#: view:crm.phonecall:0
-#: view:res.partner:0
-msgid "Categorization"
-msgstr "Categorización"
-
-#. module: crm
-#: model:ir.model,name:crm.model_base_action_rule
-msgid "Action Rules"
-msgstr "Reglas acción"
-
-#. module: crm
-#: field:crm.meeting,rrule_type:0
-msgid "Recurrency"
-msgstr "Recurrencia"
-
-#. module: crm
-#: field:crm.meeting,phonecall_id:0
-msgid "Phonecall"
-msgstr "Llamada telefónica"
-
-#. module: crm
-#: selection:crm.meeting,week_list:0
-msgid "Thursday"
-msgstr "Jueves"
-
-#. module: crm
-#: view:crm.meeting:0
-#: field:crm.send.mail,email_to:0
-msgid "To"
-msgstr "Para"
-
-#. module: crm
-#: selection:crm.meeting,class:0
-msgid "Private"
-msgstr "Privado"
-
-#. module: crm
-#: field:crm.lead,function:0
-msgid "Function"
-msgstr "Función"
-
-#. module: crm
-#: view:crm.add.note:0
-msgid "_Add"
-msgstr "_Añadir"
-
-#. module: crm
-#: selection:crm.segmentation.line,expr_name:0
-msgid "State of Mind"
-msgstr "Grado de satisfacción"
-
-#. module: crm
-#: field:crm.case.section,note:0
-#: view:crm.meeting:0
-#: field:crm.meeting,description:0
-#: view:crm.phonecall:0
-#: field:crm.phonecall,description:0
-#: view:crm.segmentation:0
-#: field:crm.segmentation,description:0
-#: view:res.partner:0
-msgid "Description"
-msgstr "Descripción"
-
-#. module: crm
-#: field:base.action.rule,trg_section_id:0
-#: field:crm.case.categ,section_id:0
-#: field:crm.case.resource.type,section_id:0
-#: view:crm.case.section:0
-#: field:crm.case.section,name:0
-#: field:crm.lead,section_id:0
-#: view:crm.lead.report:0
-#: field:crm.lead.report,section_id:0
-#: field:crm.meeting,section_id:0
-#: field:crm.opportunity2phonecall,section_id:0
-#: view:crm.phonecall:0
-#: field:crm.phonecall,section_id:0
-#: view:crm.phonecall.report:0
-#: field:crm.phonecall2phonecall,section_id:0
-#: field:res.partner,section_id:0
-#: field:res.users,context_section_id:0
-msgid "Sales Team"
-msgstr "Equipo de ventas"
-
-#. module: crm
-#: selection:crm.lead.report,month:0
-#: selection:crm.meeting,month_list:0
-#: selection:crm.phonecall.report,month:0
-msgid "May"
-msgstr "Mayo"
-
-#. module: crm
-#: model:crm.case.categ,name:crm.categ_oppor2
-msgid "Interest in Accessories"
-msgstr "Interesado en accesorios"
-
-#. module: crm
-#: code:addons/crm/crm_lead.py:211
-#, python-format
-msgid "The opportunity '%s' has been opened."
-msgstr "La oportunidad '%s' ha sido abierta"
-
-#. module: crm
-#: field:crm.lead.report,email:0
-msgid "# Emails"
-msgstr "Nº de emails"
-
-#. module: crm
-#: field:crm.lead,street:0
-msgid "Street"
-msgstr "Calle"
-
-#. module: crm
-#: view:crm.lead.report:0
-msgid "Opportunities by User and Team"
-msgstr "Oportunidades por usuario y equipo"
-
-#. module: crm
-#: field:crm.case.section,working_hours:0
-msgid "Working Hours"
-msgstr "Horario de trabajo"
-
-#. module: crm
-#: view:crm.lead:0
-#: field:crm.lead,is_customer_add:0
-msgid "Customer"
-msgstr "Cliente"
-
-#. module: crm
-#: selection:crm.lead.report,month:0
-#: selection:crm.meeting,month_list:0
-#: selection:crm.phonecall.report,month:0
-msgid "February"
-msgstr "Febrero"
-
-#. module: crm
-#: view:crm.phonecall:0
-#: model:ir.actions.act_window,name:crm.crm_case_categ_meet_create_partner
-#: view:res.partner:0
-msgid "Schedule a Meeting"
-msgstr "Planificar una reunión"
-
-#. module: crm
-#: model:crm.case.stage,name:crm.stage_lead6
-#: model:crm.case.stage,name:crm.stage_opportunity6
-#: view:crm.lead:0
-msgid "Lost"
-msgstr "Perdido"
-
-#. module: crm
-#: field:crm.lead,country_id:0
-#: view:crm.lead.report:0
-#: field:crm.lead.report,country_id:0
-msgid "Country"
-msgstr "País"
-
-#. module: crm
-#: view:crm.lead:0
-#: selection:crm.lead2opportunity.action,name:0
-#: view:crm.phonecall:0
-#: view:res.partner:0
-msgid "Convert to Opportunity"
-msgstr "Convertir a oportunidad"
-
-#. module: crm
-#: selection:crm.meeting,week_list:0
-msgid "Wednesday"
-msgstr "Miércoles"
-
-#. module: crm
-#: selection:crm.lead.report,month:0
-#: selection:crm.meeting,month_list:0
-#: selection:crm.phonecall.report,month:0
-msgid "April"
-msgstr "Abril"
-
-#. module: crm
-#: field:crm.case.resource.type,name:0
-msgid "Campaign Name"
-msgstr "Nombre de la campaña"
-
-#. module: crm
-#: model:ir.model,name:crm.model_crm_phonecall_report
-msgid "Phone calls by user and section"
-msgstr "Llamadas telefónicas por usuario y sección"
-
-#. module: crm
-#: selection:crm.lead2opportunity.action,name:0
-msgid "Merge with existing Opportunity"
-msgstr "Fusionado con oportunidad existente"
-
-#. module: crm
-#: field:crm.meeting,select1:0
-msgid "Option"
-msgstr "Opción"
-
-#. module: crm
-#: model:crm.case.stage,name:crm.stage_lead4
-#: model:crm.case.stage,name:crm.stage_opportunity4
-msgid "Negotiation"
-msgstr "Negociación"
-
-#. module: crm
-#: view:crm.lead:0
-msgid "Exp.Closing"
-msgstr "Cierre previsto"
-
-#. module: crm
-#: field:crm.case.stage,sequence:0
-#: field:crm.meeting,sequence:0
-msgid "Sequence"
-msgstr "Secuencia"
-
-#. module: crm
-#: field:crm.send.mail,body:0
-msgid "Message Body"
-msgstr "Cuerpo del mensaje"
-
-#. module: crm
-#: view:crm.meeting:0
-msgid "Accept"
-msgstr "Aceptar"
-
-#. module: crm
-#: field:crm.segmentation.line,expr_name:0
-msgid "Control Variable"
-msgstr "Variable de control"
-
-#. module: crm
-#: selection:crm.meeting,byday:0
-msgid "Second"
-msgstr "Segundo"
-
-#. module: crm
-#: model:crm.case.stage,name:crm.stage_lead3
-#: model:crm.case.stage,name:crm.stage_opportunity3
-msgid "Proposition"
-msgstr "Propuesta"
-
-#. module: crm
-#: field:res.partner,phonecall_ids:0
-msgid "Phonecalls"
-msgstr "Llamadas telefónicas"
-
-#. module: crm
-#: view:crm.lead.report:0
-#: field:crm.lead.report,name:0
-#: view:crm.phonecall.report:0
-#: field:crm.phonecall.report,name:0
-msgid "Year"
-msgstr "Año"
-
-#. module: crm
-#: model:crm.case.resource.type,name:crm.type_lead8
-msgid "Newsletter"
-msgstr "Boletín de noticias"
-
diff --git a/addons/crm/i18n/es_PY.po b/addons/crm/i18n/es_PY.po
index 416d532cc04..9ebf3fb8753 100644
--- a/addons/crm/i18n/es_PY.po
+++ b/addons/crm/i18n/es_PY.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:00+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:06+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: crm
 #: view:crm.lead.report:0
diff --git a/addons/crm/i18n/et.po b/addons/crm/i18n/et.po
index 25802b9a2a9..47db5a356df 100644
--- a/addons/crm/i18n/et.po
+++ b/addons/crm/i18n/et.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:58+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:05+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: crm
 #: view:crm.lead.report:0
diff --git a/addons/crm/i18n/fi.po b/addons/crm/i18n/fi.po
index 3ae63371b03..84ab50b2d27 100644
--- a/addons/crm/i18n/fi.po
+++ b/addons/crm/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:58+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:05+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: crm
 #: view:crm.lead.report:0
diff --git a/addons/crm/i18n/fr.po b/addons/crm/i18n/fr.po
index b74c8c53f39..9180b691cd5 100644
--- a/addons/crm/i18n/fr.po
+++ b/addons/crm/i18n/fr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:58+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:05+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: crm
 #: view:crm.lead.report:0
diff --git a/addons/crm/i18n/gl.po b/addons/crm/i18n/gl.po
index 7e3d5d226d4..e91d2ec2c03 100644
--- a/addons/crm/i18n/gl.po
+++ b/addons/crm/i18n/gl.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:58+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:05+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: crm
 #: view:crm.lead.report:0
diff --git a/addons/crm/i18n/gu.po b/addons/crm/i18n/gu.po
index 4c2f4784b89..b3aa2ffbb69 100644
--- a/addons/crm/i18n/gu.po
+++ b/addons/crm/i18n/gu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:58+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:05+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: crm
 #: view:crm.lead.report:0
diff --git a/addons/crm/i18n/hr.po b/addons/crm/i18n/hr.po
index 2340d287655..9f8a6d8a286 100644
--- a/addons/crm/i18n/hr.po
+++ b/addons/crm/i18n/hr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:59+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:06+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 "Language: hr\n"
 
 #. module: crm
diff --git a/addons/crm/i18n/hu.po b/addons/crm/i18n/hu.po
index bd06c62b8bf..882a3f4c402 100644
--- a/addons/crm/i18n/hu.po
+++ b/addons/crm/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:58+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:05+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: crm
 #: view:crm.lead.report:0
diff --git a/addons/crm/i18n/id.po b/addons/crm/i18n/id.po
index f20c865c3ae..abc7795fbd9 100644
--- a/addons/crm/i18n/id.po
+++ b/addons/crm/i18n/id.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:58+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:05+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: crm
 #: view:crm.lead.report:0
diff --git a/addons/crm/i18n/it.po b/addons/crm/i18n/it.po
index bc7892e81e4..4b0b7d3c787 100644
--- a/addons/crm/i18n/it.po
+++ b/addons/crm/i18n/it.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-11 05:45+0000\n"
-"X-Generator: Launchpad (build 15780)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:05+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: crm
 #: view:crm.lead.report:0
diff --git a/addons/crm/i18n/ja.po b/addons/crm/i18n/ja.po
index da328c74334..af5ab85b750 100644
--- a/addons/crm/i18n/ja.po
+++ b/addons/crm/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:58+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:05+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: crm
 #: view:crm.lead.report:0
diff --git a/addons/crm/i18n/ko.po b/addons/crm/i18n/ko.po
index b860d5723c3..01fcba3148b 100644
--- a/addons/crm/i18n/ko.po
+++ b/addons/crm/i18n/ko.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:58+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:05+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: crm
 #: view:crm.lead.report:0
diff --git a/addons/crm/i18n/lo.po b/addons/crm/i18n/lo.po
index 8b2166bf3c7..ce7381daaa8 100644
--- a/addons/crm/i18n/lo.po
+++ b/addons/crm/i18n/lo.po
@@ -8,25 +8,25 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 01:37+0100\n"
-"PO-Revision-Date: 2011-01-17 11:18+0000\n"
+"PO-Revision-Date: 2012-08-20 19:07+0000\n"
 "Last-Translator: Brice Muangkhot ສຸພາ ເມືອງໂຄຕ <bmuangkhot@gmail.com>\n"
 "Language-Team: Lao <lo@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:58+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:05+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: crm
 #: view:crm.lead.report:0
 msgid "# Leads"
-msgstr ""
+msgstr "ຮ່ອມຮອຍ"
 
 #. module: crm
 #: view:crm.lead:0 selection:crm.lead,type:0 view:crm.lead.report:0
 #: selection:crm.lead.report,type:0
 msgid "Lead"
-msgstr ""
+msgstr "ຮ່ອມຮອຍ"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor3
@@ -36,7 +36,7 @@ msgstr "ຕ້ອງການບໍລິການ"
 #. module: crm
 #: selection:crm.meeting,rrule_type:0
 msgid "Monthly"
-msgstr "ປາຈໍາເດືອນ"
+msgstr "ປາຈຳເດືອນ"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_case_stage
@@ -61,7 +61,7 @@ msgstr "ໃຫ້ເຫັນເເບບນີ້້"
 #. module: crm
 #: field:crm.meeting,day:0 selection:crm.meeting,select1:0
 msgid "Date of month"
-msgstr "ວັນທີປະຈໍາເດືອນ"
+msgstr "ວັນທີປະຈຳເດືອນ"
 
 #. module: crm
 #: view:crm.lead:0 view:crm.phonecall:0
@@ -71,7 +71,7 @@ msgstr "ມື້ນີ້"
 #. module: crm
 #: view:crm.lead2opportunity.partner:0 view:crm.merge.opportunity:0
 msgid "Select Opportunities"
-msgstr ""
+msgstr "ເລືອກໂອກາດ"
 
 #. module: crm
 #: view:crm.meeting:0 view:crm.phonecall2opportunity:0
@@ -87,7 +87,7 @@ msgstr "ເຍື້ອນໄປເພື່ອປິດ"
 #. module: crm
 #: view:crm.lead:0
 msgid "Previous Stage"
-msgstr "ຂັ້້ນກ່ອນ"
+msgstr "ຂັ້ນກ່ອນ"
 
 #. module: crm
 #: code:addons/crm/wizard/crm_add_note.py:28
@@ -136,12 +136,12 @@ msgstr ""
 #. module: crm
 #: selection:crm.meeting,rrule_type:0
 msgid "Yearly"
-msgstr "ປະຈໍາປີ"
+msgstr "ປະຈຳປີ"
 
 #. module: crm
 #: help:crm.lead.report,creation_day:0
 msgid "Creation day"
-msgstr ""
+msgstr "ມື້ສ້າງ"
 
 #. module: crm
 #: field:crm.segmentation.line,name:0
@@ -151,7 +151,7 @@ msgstr "ຊື່ກົດການ"
 #. module: crm
 #: view:crm.case.section:0
 msgid "Configuration"
-msgstr ""
+msgstr "ສ້ອມຕັ້ງ"
 
 #. module: crm
 #: view:crm.case.resource.type:0 view:crm.lead:0 field:crm.lead,type_id:0
@@ -163,12 +163,12 @@ msgstr ""
 #. module: crm
 #: view:crm.lead:0
 msgid "Search Opportunities"
-msgstr ""
+msgstr "ຊອກຫາໂອກາດ"
 
 #. module: crm
 #: help:crm.lead.report,deadline_month:0
 msgid "Expected closing month"
-msgstr ""
+msgstr "ເດອືນຖ້າຈະປິດ"
 
 #. module: crm
 #: view:crm.lead2opportunity.partner.mass:0
@@ -244,7 +244,7 @@ msgstr "ສົ່ງອີເມລໃໝ່"
 #. module: crm
 #: field:crm.segmentation,segmentation_line:0
 msgid "Criteria"
-msgstr ""
+msgstr "ແນວເລືອກ"
 
 #. module: crm
 #: view:crm.segmentation:0
diff --git a/addons/crm/i18n/lt.po b/addons/crm/i18n/lt.po
index d227f7fc04f..eb3ed0de579 100644
--- a/addons/crm/i18n/lt.po
+++ b/addons/crm/i18n/lt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:59+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:05+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 "Language: lt\n"
 
 #. module: crm
diff --git a/addons/crm/i18n/lv.po b/addons/crm/i18n/lv.po
index 1a443c3c9f3..9337404ce69 100644
--- a/addons/crm/i18n/lv.po
+++ b/addons/crm/i18n/lv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:59+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:05+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: crm
 #: view:crm.lead.report:0
diff --git a/addons/crm/i18n/mn.po b/addons/crm/i18n/mn.po
index 2bdbd4087af..b44af26eb4b 100644
--- a/addons/crm/i18n/mn.po
+++ b/addons/crm/i18n/mn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:59+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:05+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: crm
 #: view:crm.lead.report:0
diff --git a/addons/crm/i18n/nb.po b/addons/crm/i18n/nb.po
index 8fd92e37c2a..2aaa10a4b0e 100644
--- a/addons/crm/i18n/nb.po
+++ b/addons/crm/i18n/nb.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:59+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:05+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -219,7 +219,7 @@ msgstr "Mul-ut"
 #. module: crm
 #: field:crm.meeting,end_type:0
 msgid "Recurrence termination"
-msgstr ""
+msgstr "Avslutning av gjentagelse"
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:323
@@ -235,6 +235,9 @@ msgid ""
 "sort out your leads analysis by different groups to get accurate grained "
 "analysis."
 msgstr ""
+"Leads Analysis tillater deg å sjekke ulik CRM relatert informasjon. Sjekk "
+"for behandlingsforsinkelser, antall svar gitt og e-poster sendt. Du kan "
+"sortere analysen på forskjellige måterer for å få detaljert analyse."
 
 #. module: crm
 #: view:crm.lead:0
@@ -305,6 +308,8 @@ msgid ""
 "If opt-out is checked, this contact has refused to receive emails or "
 "unsubscribed to a campaign."
 msgstr ""
+"Hvis opt-out er sjekket, har denne kontakten nektet å motta e-post eller "
+"avsluttet abonnementet på en kampanje."
 
 #. module: crm
 #: model:process.transition,name:crm.process_transition_leadpartner0
@@ -351,7 +356,7 @@ msgstr "="
 #. module: crm
 #: field:base.action.rule,regex_history:0
 msgid "Regular Expression on Case History"
-msgstr ""
+msgstr "Vanlig uttrykk på sakshistorikken"
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:274
@@ -411,6 +416,8 @@ msgid ""
 "This percentage depicts the default/average probability of the Case for this "
 "stage to be a success"
 msgstr ""
+"Denne skildrer normal/gjennomsnittlig sannsynlighet for at saken på dette "
+"stadiet kan bli en suksess"
 
 #. module: crm
 #: field:base.action.rule,trg_categ_id:0 view:crm.lead:0
@@ -447,6 +454,12 @@ msgid ""
 "Revenue\" and the \"Expected Closing Date.\" You should also have a look at "
 "the tooltip of the field \"Change Probability Automatically\"."
 msgstr ""
+"Stadier vil tillate selgere til enkelt å spore hvordan en bestemt anledning "
+"er plassert i salgssyklusen. For å effektivt håndtere salgskanalen, er det "
+"viktig å definere vilkår for å gå til neste trinn. Eksempel: for å sette en "
+"mulighet som \"kvalifisert\", må du angi \"forventet inntekt\" og "
+"\"forventet sluttdato.\" Du bør også ta en titt på verktøytipset på feltet "
+"\"Endre Sannsynlighetsregning automatisk\"."
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -461,12 +474,12 @@ msgstr "Sted for arrangement"
 #. module: crm
 #: field:crm.meeting,rrule:0
 msgid "Recurrent Rule"
-msgstr ""
+msgstr "Gjentagelsesregel"
 
 #. module: crm
 #: model:process.transition,note:crm.process_transition_opportunitymeeting0
 msgid "Normal or phone meeting for opportunity"
-msgstr ""
+msgstr "Normalt møte eller telefonmøte for anledningen"
 
 #. module: crm
 #: view:crm.case.section:0
@@ -587,12 +600,12 @@ msgstr ""
 #. module: crm
 #: constraint:base.action.rule:0
 msgid "Error: The mail is not well formated"
-msgstr ""
+msgstr "Feil: E-posten er ikke godt nok formatert"
 
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Profiling Options"
-msgstr ""
+msgstr "Profilerende alternativer"
 
 #. module: crm
 #: view:crm.phonecall.report:0
@@ -655,11 +668,13 @@ msgid ""
 "Defines a rule or repeating pattern of time to exclude from the recurring "
 "rule."
 msgstr ""
+"Definerer en regel eller et repeterende mønster av tid til å utelukke "
+"gjentagelsesregelen."
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Leads Form"
-msgstr ""
+msgstr "Leads skjema"
 
 #. module: crm
 #: view:crm.segmentation:0 model:ir.model,name:crm.model_crm_segmentation
@@ -675,6 +690,11 @@ msgid ""
 "using the caldav interface.\n"
 "        "
 msgstr ""
+"Møtekalenderen deles mellom salgsteam og er fullt integrert med andre "
+"programmer for eksempel for de ansattes ferie eller forretningsavtaler. Du "
+"kan også synkronisere møter med mobiltelefonen ved hjelp av CalDAV-"
+"grensesnittet.\n"
+"        "
 
 #. module: crm
 #: field:crm.lead2opportunity.partner.mass,user_ids:0
@@ -720,6 +740,11 @@ msgid ""
 "opportunities, you can assign the following stage to the team: Territory, "
 "Qualified, Qualified Sponsors, Proposition, Negociaton, Won/Lost."
 msgstr ""
+"Definer salgsteam til å strukturere din salgsorganisasjon og tilordne "
+"brukere til hver gruppe. Du bør også definere salgsstadium til hver gruppe. "
+"Som et eksempel, hvis du bruker Solutions Salgsteknikker for å spore dine "
+"muligheter, kan du tilordne følgende stadium til teamet: territoriet, "
+"Kvalifiserte, kvalifiserte sponsorer, Forslag, Forhandlinger, Vunnet/Tapt."
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:718 view:crm.lead:0 selection:crm.lead,type:0
@@ -772,7 +797,7 @@ msgstr "Pr. dag"
 #. module: crm
 #: field:base.action.rule,act_section_id:0
 msgid "Set Team to"
-msgstr ""
+msgstr "Sett team til"
 
 #. module: crm
 #: view:calendar.attendee:0 field:calendar.attendee,categ_id:0
@@ -791,6 +816,8 @@ msgid ""
 "You cannot delete lead '%s'; it must be in state 'Draft' to be deleted. You "
 "should better cancel it, instead of deleting it."
 msgstr ""
+"Du kan ikke slette lead '% s'; det må være i status 'Utkast' for å bli "
+"slettet. Du bør avbryte det i stedet for å slette det."
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:451
@@ -840,6 +867,8 @@ msgid ""
 "This property defines the list of date/time exceptions for a recurring "
 "calendar component."
 msgstr ""
+"Denne egenskapen definerer listen over dato-/klokkeslettunntakene for en "
+"gjentagende kalenderkomponent."
 
 #. module: crm
 #: view:crm.phonecall2opportunity:0
@@ -849,12 +878,12 @@ msgstr "Konvertert til salgsmulighet "
 #. module: crm
 #: help:crm.meeting,recurrency:0
 msgid "Recurrent Meeting"
-msgstr ""
+msgstr "Gjentagende møte"
 
 #. module: crm
 #: view:crm.phonecall:0
 msgid "Unassigned Phonecalls"
-msgstr ""
+msgstr "Ikke fordelte telefonsamtaler"
 
 #. module: crm
 #: view:crm.lead:0 field:crm.lead2opportunity.partner,opportunity_ids:0
@@ -920,7 +949,7 @@ msgstr "Telefonsamtaler utført i år"
 #. module: crm
 #: field:crm.lead,day_open:0
 msgid "Days to Open"
-msgstr ""
+msgstr "Dager til åpning"
 
 #. module: crm
 #: view:crm.meeting:0
@@ -1006,6 +1035,8 @@ msgid ""
 "If the active field is set to          true, it will allow you to hide the "
 "event alarm information without removing it."
 msgstr ""
+"Hvis det aktive feltet er satt til sant, vil det tillate deg å skjule "
+"hendelsesalarm informasjon uten å fjerne den."
 
 #. module: crm
 #: view:crm.lead:0
@@ -1076,7 +1107,7 @@ msgstr "Vunnet"
 #. module: crm
 #: field:crm.lead.report,delay_expected:0
 msgid "Overpassed Deadline"
-msgstr ""
+msgstr "Passert frist"
 
 #. module: crm
 #: model:crm.case.section,name:crm.section_sales_department
@@ -1175,7 +1206,7 @@ msgstr "Logg samtalen"
 #. module: crm
 #: help:crm.meeting,rrule_type:0
 msgid "Let the event automatically repeat at that interval"
-msgstr ""
+msgstr "La arrangementet automatisk gjenta ved det intervallet"
 
 #. module: crm
 #: view:base.action.rule:0
@@ -1209,6 +1240,8 @@ msgid ""
 "Create specific phone call categories to better define the type of calls "
 "tracked in the system."
 msgstr ""
+"Lag spesifikke telefonsamtalekategorier for å definere typen samtaler som "
+"spores i systemet."
 
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
@@ -1228,6 +1261,7 @@ msgid ""
 "Setting this stage will change the probability automatically on the "
 "opportunity."
 msgstr ""
+"Å sette dette stadiet vil endre sannsynligheten automatiskt på muligheten."
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.action_report_crm_phonecall
@@ -1267,6 +1301,8 @@ msgid ""
 "If the active field is set to true, it will allow you to hide the sales team "
 "without removing it."
 msgstr ""
+"Dersom det aktive feltet er satt til sant, vil det tillate deg å skjule "
+"salgsteamet uten å fjerne det."
 
 #. module: crm
 #: field:crm.lead,street2:0
@@ -1279,6 +1315,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 ""
+"Hvis du krysser av dette feltet, vil stadiet bli foreslått som standard på "
+"hvert salgsteam. Det vil ikke tildele dette stadiet til eksisterende team."
 
 #. module: crm
 #: field:crm.meeting,fr:0
@@ -1348,6 +1386,10 @@ msgid ""
 "       \n"
 "If the call needs to be done then the state is set to 'Not Held'."
 msgstr ""
+"Statusen blir satt til 'Å gjøre' når en sak er opprettet.\n"
+"Hvis saken er i progresjon er statusen satt til 'Åpen'.\n"
+"Når samtalen er over settes statusen til 'Hold'.\n"
+"Hvis samtalen er nødt til å bli ferdig er statusen satt til 'Ikke Hold'."
 
 #. module: crm
 #: selection:crm.meeting,week_list:0
@@ -1439,7 +1481,7 @@ msgstr "Planlegg et møte"
 #: code:addons/crm/crm_lead.py:431
 #, python-format
 msgid "Merged opportunities"
-msgstr ""
+msgstr "Sammenslåtte muligheter"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_section_view_form_installer
@@ -1453,6 +1495,9 @@ msgid ""
 "better manage your interactions with them. The segmentation tool is able to "
 "assign categories to partners according to criteria you set."
 msgstr ""
+"Lag konkrete samarbeidskategorier som du kan tilordne til dine partnere for "
+"å bedre administrere ditt samspill med dem. Segmenteringsverktøyet er i "
+"stand til å tildele kategorier til partnere i henhold til kriterier du angir."
 
 #. module: crm
 #: field:crm.case.section,code:0
@@ -1462,7 +1507,7 @@ msgstr "Kode"
 #. module: crm
 #: field:crm.case.section,child_ids:0
 msgid "Child Teams"
-msgstr ""
+msgstr "Underordnet team"
 
 #. module: crm
 #: view:crm.phonecall.report:0
@@ -1529,7 +1574,7 @@ msgstr "E-post"
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_phonecall_categ_action
 msgid "Phonecall Categories"
-msgstr ""
+msgstr "Telefonsamtalekategorier"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -1547,11 +1592,13 @@ msgid ""
 "The name of the future partner that will be created while converting the "
 "lead into opportunity"
 msgstr ""
+"Navnet på fremtidig partner som vil bli dannet ved konvertering av lead til "
+"mulighet"
 
 #. module: crm
 #: constraint:crm.case.section:0
 msgid "Error ! You cannot create recursive Sales team."
-msgstr ""
+msgstr "Feil! Du kan ikke knytte salgsteam i uendelig struktur."
 
 #. module: crm
 #: selection:crm.opportunity2phonecall,action:0
@@ -1578,7 +1625,7 @@ msgstr "Salgssum"
 #. module: crm
 #: view:crm.meeting:0
 msgid "Choose day where repeat the meeting"
-msgstr ""
+msgstr "Velg dag for å repetere møtet"
 
 #. module: crm
 #: selection:crm.meeting,state:0
@@ -1632,7 +1679,7 @@ msgstr "Fødselsdato"
 #. module: crm
 #: view:crm.meeting:0
 msgid "The"
-msgstr ""
+msgstr "Den"
 
 #. module: crm
 #: view:crm.lead:0 view:crm.phonecall:0
@@ -1668,6 +1715,9 @@ msgid ""
 "sent/to be sent to your colleagues/partners. You can not only invite OpenERP "
 "users, but also external parties, such as a customer."
 msgstr ""
+"Med møteinvitasjoner kan du opprette og administrere møteinvitasjoner "
+"sendt/sendes til dine kolleger/samarbeidspartnere. Du kan ikke bare invitere "
+"OpenERP brukere, men også eksterne parter, for eksempel en kunde."
 
 #. module: crm
 #: selection:crm.meeting,week_list:0
@@ -1687,7 +1737,7 @@ msgstr "Leads/muligheter som er i utført status"
 #. module: crm
 #: field:crm.lead.report,delay_close:0
 msgid "Delay to Close"
-msgstr ""
+msgstr "Forsinkelse til lukking"
 
 #. module: crm
 #: field:crm.meeting,we:0
@@ -1719,7 +1769,7 @@ msgstr "Grupper etter..."
 #. module: crm
 #: help:crm.lead,partner_id:0
 msgid "Optional linked partner, usually after conversion of the lead"
-msgstr ""
+msgstr "Valgfritt knyttet partner, vanligvis etter konvertering fra lead"
 
 #. module: crm
 #: view:crm.meeting:0
@@ -1809,7 +1859,7 @@ msgstr "Verdi"
 #. module: crm
 #: help:crm.lead,type:0 help:crm.lead.report,type:0
 msgid "Type is used to separate Leads and Opportunities"
-msgstr ""
+msgstr "Type brukes for å skille leads og muligheter"
 
 #. module: crm
 #: view:crm.lead:0 view:crm.lead.report:0
@@ -1854,7 +1904,7 @@ msgstr "Lead / kunde"
 #. module: crm
 #: model:process.transition,note:crm.process_transition_leadpartner0
 msgid "Prospect is converting to business partner"
-msgstr ""
+msgstr "Prospektet konverterer til forretningspartner"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.phonecall2opportunity_act
@@ -1959,7 +2009,7 @@ msgstr "Svar"
 #. module: crm
 #: model:process.node,note:crm.process_node_meeting0
 msgid "Schedule a normal or phone meeting"
-msgstr ""
+msgstr "Planlegg et normalt møte eller et telefonmøte"
 
 #. module: crm
 #: code:addons/crm/crm.py:430
@@ -1973,6 +2023,7 @@ msgid ""
 "Create different meeting categories to better organize and classify your "
 "meetings."
 msgstr ""
+"Lag ulike møtekategorier for å bedre organisere og klassifisere dine møter."
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_segmentation_line
@@ -1992,7 +2043,7 @@ msgstr ""
 #. module: crm
 #: view:crm.lead:0
 msgid "Expected Revenues"
-msgstr ""
+msgstr "Forventede inntekter"
 
 #. module: crm
 #: field:crm.lead,contact_name:0
@@ -2002,19 +2053,21 @@ msgstr "Kontaktnavn"
 #. module: crm
 #: view:crm.lead:0
 msgid "Leads creating during last 7 days"
-msgstr ""
+msgstr "Leads skapt i løpet av de siste 7 dagene"
 
 #. module: crm
 #: view:crm.phonecall2partner:0
 msgid "Are you sure you want to create a partner based on this Phonecall ?"
 msgstr ""
+"Er du sikker på at du vil lage en samarbeidspartner basert på denne "
+"telefonsamtalen?"
 
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
 #: selection:crm.lead.report,deadline_month:0
 #: selection:crm.meeting,month_list:0 selection:crm.phonecall.report,month:0
 msgid "July"
-msgstr ""
+msgstr "juli"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_case_section_act
@@ -2025,28 +2078,33 @@ msgid ""
 "The opportunities and sales order displayed, will automatically be filtered "
 "according to his team."
 msgstr ""
+"Definer et salgsteam til å organisere dine forskjellige selgere eller "
+"salgsavdelinger i separate lag. Hvert lag skal jobbe i sin egen liste over "
+"muligheter, salgsordrer, osv. Hver bruker kan angi et standardteam i sine "
+"brukerinnstillinger. De mulighetene og salgsordrene som vises, vil "
+"automatisk bli filtrert i henhold til sitt team."
 
 #. module: crm
 #: view:crm.lead.report:0
 msgid "Show only lead"
-msgstr ""
+msgstr "Vis bare lead"
 
 #. module: crm
 #: help:crm.meeting,count:0
 msgid "Repeat x times"
-msgstr ""
+msgstr "Gjenta x ganger"
 
 #. 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 "Salgsteam"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_lead2partner
 msgid "Lead to Partner"
-msgstr ""
+msgstr "Lead til partner"
 
 #. module: crm
 #: view:crm.segmentation:0 field:crm.segmentation.line,segmentation_id:0
@@ -2057,12 +2115,12 @@ msgstr "Segmentering"
 #. module: crm
 #: view:crm.lead:0
 msgid "Team"
-msgstr ""
+msgstr "Team"
 
 #. module: crm
 #: view:crm.lead.report:0
 msgid "Leads/Opportunities which are in New state"
-msgstr ""
+msgstr "Leads/muligheter som er i stadium Ny"
 
 #. module: crm
 #: view:crm.phonecall:0 selection:crm.phonecall,state:0
@@ -2078,13 +2136,13 @@ msgstr "Sannsynlighet"
 #. module: crm
 #: view:crm.lead:0
 msgid "Pending Opportunities"
-msgstr ""
+msgstr "Ventende Muligheter"
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:491
 #, python-format
 msgid "Please select more than one opportunity from the list view."
-msgstr ""
+msgstr "Vær vennlig å velg mer enn en mulighet fra listen"
 
 #. module: crm
 #: view:crm.lead.report:0 field:crm.meeting,month_list:0
@@ -2098,7 +2156,7 @@ msgstr "Måned"
 #: model:ir.ui.menu,name:crm.menu_crm_case_categ0_act_leads
 #: model:process.node,name:crm.process_node_leads0
 msgid "Leads"
-msgstr ""
+msgstr "Leads"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_case_category_act_leads_all
@@ -2126,17 +2184,17 @@ msgstr "Opprett en ny partner"
 #: 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 "Planlagte samtaler"
 
 #. module: crm
 #: view:crm.meeting:0 view:res.partner:0
 msgid "Start Date"
-msgstr ""
+msgstr "Startdato"
 
 #. module: crm
 #: view:crm.phonecall:0
 msgid "Scheduled Phonecalls"
-msgstr ""
+msgstr "Planlagte telefonsamtaler"
 
 #. module: crm
 #: view:crm.meeting:0
@@ -2146,12 +2204,13 @@ msgstr "Avslå"
 #. module: crm
 #: field:crm.lead,user_email:0
 msgid "User Email"
-msgstr ""
+msgstr "E-post for bruker"
 
 #. module: crm
 #: help:crm.lead,optin:0
 msgid "If opt-in is checked, this contact has accepted to receive emails."
 msgstr ""
+"Hvis opt-in er krysset av, har denne kontakten akseptert å motta e-poster."
 
 #. module: crm
 #: view:crm.meeting:0
@@ -2187,7 +2246,7 @@ msgstr "Lukket"
 #. module: crm
 #: view:crm.lead:0
 msgid "Total of Planned Revenue"
-msgstr ""
+msgstr "Total av planlagt inntekt"
 
 #. module: crm
 #: view:crm.lead:0
@@ -2197,7 +2256,7 @@ msgstr "Åpne muligheter"
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_meet2
 msgid "Internal Meeting"
-msgstr ""
+msgstr "Internt møte"
 
 #. module: crm
 #: code:addons/crm/crm.py:454 selection:crm.add.note,state:0 view:crm.lead:0
@@ -2215,7 +2274,7 @@ msgstr "Kundemøte"
 #. module: crm
 #: field:crm.lead,email_cc:0
 msgid "Global CC"
-msgstr ""
+msgstr "Global CC"
 
 #. module: crm
 #: view:crm.phonecall:0
@@ -2282,7 +2341,7 @@ msgstr "Usikker"
 #. module: crm
 #: help:crm.case.stage,sequence:0
 msgid "Used to order stages."
-msgstr ""
+msgstr "Brukt til å ordne nivåer"
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:276
@@ -2306,7 +2365,7 @@ msgstr "Minske (0>1)"
 #. module: crm
 #: field:crm.lead.report,deadline_day:0
 msgid "Exp. Closing Day"
-msgstr ""
+msgstr "Forvenet sluttdag"
 
 #. module: crm
 #: field:crm.case.section,change_responsible:0
@@ -2333,7 +2392,7 @@ msgstr "Div."
 #. module: crm
 #: model:ir.actions.act_window,name:crm.open_board_crm
 msgid "Sales"
-msgstr ""
+msgstr "Salg"
 
 #. module: crm
 #: code:addons/crm/crm.py:430
@@ -2342,11 +2401,13 @@ msgid ""
 "You can not escalate, you are already at the top level regarding your sales-"
 "team category."
 msgstr ""
+"Du kan ikke eskalere, du er allerede på øverste nivå når det gjelder din "
+"salgs-team kategori."
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor8 view:crm.meeting:0
 msgid "Other"
-msgstr ""
+msgstr "Andre"
 
 #. module: crm
 #: view:crm.meeting:0 selection:crm.meeting,state:0
@@ -2356,7 +2417,7 @@ msgstr "Ferdig"
 #. module: crm
 #: help:crm.meeting,interval:0
 msgid "Repeat every (Days/Week/Month/Year)"
-msgstr ""
+msgstr "Gjenta hver (Dag/Uke/Måned/År)"
 
 #. module: crm
 #: field:crm.segmentation,som_interval_max:0
@@ -2373,7 +2434,7 @@ msgstr "Åpne"
 #. module: crm
 #: field:crm.lead,city:0
 msgid "City"
-msgstr ""
+msgstr "By"
 
 #. module: crm
 #: view:crm.lead:0 view:res.partner:0
@@ -2383,7 +2444,7 @@ msgstr "historikk"
 #. module: crm
 #: selection:crm.meeting,show_as:0
 msgid "Busy"
-msgstr ""
+msgstr "Opptatt"
 
 #. module: crm
 #: field:crm.lead.report,creation_day:0
@@ -2393,7 +2454,7 @@ msgstr ""
 #. module: crm
 #: field:crm.meeting,interval:0
 msgid "Repeat every"
-msgstr ""
+msgstr "Gjenta hvert"
 
 #. module: crm
 #: field:crm.meeting,recurrency:0
@@ -2403,12 +2464,12 @@ msgstr ""
 #. module: crm
 #: view:crm.phonecall.report:0
 msgid "Phone calls made in last month"
-msgstr ""
+msgstr "Telefonsamtaler utført forrige måned"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.act_my_oppor
 msgid "My Open Opportunities"
-msgstr ""
+msgstr "Mine åpne muligheter"
 
 #. module: crm
 #: field:base.action.rule,trg_max_history:0
@@ -2418,12 +2479,12 @@ msgstr "Maksimal kommunikasjonshistorikk"
 #. module: crm
 #: view:crm.meeting:0
 msgid "Invite People"
-msgstr ""
+msgstr "Inviter folk"
 
 #. module: crm
 #: view:crm.meeting:0 field:crm.meeting,categ_id:0
 msgid "Meeting Type"
-msgstr ""
+msgstr "Møtetype"
 
 #. module: crm
 #: help:crm.lead,state:0
@@ -2436,6 +2497,10 @@ msgid ""
 "       \n"
 "If the case needs to be reviewed then the state is set to 'Pending'."
 msgstr ""
+"Statusen er satt til 'Utkast', når en sak er opprettet.\n"
+"Hvis saken er under progresjon er statusen satt til 'Åpen'.\n"
+"Når saken er over, er statusen satt til 'Ferdig'.\n"
+"Hvis saken må bli sett igjennom er statusen satt til 'Avventer'."
 
 #. module: crm
 #: view:crm.meeting:0 view:res.partner:0
@@ -2445,7 +2510,7 @@ msgstr "Sluttdato"
 #. module: crm
 #: selection:crm.meeting,byday:0
 msgid "Third"
-msgstr ""
+msgstr "Tredje"
 
 #. module: crm
 #: help:crm.segmentation,som_interval_max:0
@@ -2459,7 +2524,7 @@ msgstr ""
 #. module: crm
 #: view:crm.lead:0
 msgid "Unassigned Opportunities"
-msgstr ""
+msgstr "Ikke fordelte muligheter"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -2475,7 +2540,7 @@ msgstr ""
 #: view:crm.lead.report:0 view:crm.phonecall.report:0
 #: field:crm.phonecall.report,delay_open:0
 msgid "Delay to open"
-msgstr ""
+msgstr "Forsinkelse før åpning"
 
 #. module: crm
 #: view:crm.meeting:0
@@ -2503,11 +2568,13 @@ msgid ""
 "From which campaign (seminar, marketing campaign, mass mailing, ...) did "
 "this contact come from?"
 msgstr ""
+"Fra hvilken kampanje (seminar, markedsføringskampanje, masseutsendelse, ...) "
+"kom denne kontakten kommer fra?"
 
 #. module: crm
 #: model:ir.model,name:crm.model_calendar_attendee
 msgid "Attendee information"
-msgstr ""
+msgstr "Deltagerinformasjon"
 
 #. module: crm
 #: view:crm.segmentation:0
@@ -2517,7 +2584,7 @@ msgstr "Segmenteringstest"
 #. module: crm
 #: field:crm.lead,user_login:0
 msgid "User Login"
-msgstr ""
+msgstr "Brukernavn"
 
 #. module: crm
 #: view:crm.segmentation:0
@@ -2527,18 +2594,18 @@ msgstr "Fortsett prosess"
 #. module: crm
 #: view:crm.lead.report:0
 msgid "Leads/Opportunities created in current year"
-msgstr ""
+msgstr "Leads/muligheter laget i inneværende år"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_phonecall2partner
 msgid "Phonecall to Partner"
-msgstr ""
+msgstr "Telefonsamtale til partner"
 
 #. module: crm
 #: field:crm.opportunity2phonecall,user_id:0
 #: field:crm.phonecall2phonecall,user_id:0
 msgid "Assign To"
-msgstr ""
+msgstr "Tildel til"
 
 #. module: crm
 #: field:crm.add.note,state:0
@@ -2560,17 +2627,17 @@ msgstr "Varighet"
 #. module: crm
 #: view:crm.lead:0
 msgid "Show countries"
-msgstr ""
+msgstr "Vis land"
 
 #. module: crm
 #: view:crm.lead2opportunity.partner.mass:0
 msgid "Select Salesman"
-msgstr ""
+msgstr "Velg selger"
 
 #. module: crm
 #: view:board.board:0
 msgid "Sales Dashboard"
-msgstr ""
+msgstr "Salgskonsoll"
 
 #. module: crm
 #: field:crm.lead.report,nbr:0 field:crm.phonecall.report,nbr:0
@@ -2590,12 +2657,12 @@ msgstr "Søndag"
 #. module: crm
 #: selection:crm.meeting,byday:0
 msgid "Fourth"
-msgstr ""
+msgstr "Fjerde"
 
 #. module: crm
 #: selection:crm.add.note,state:0
 msgid "Unchanged"
-msgstr ""
+msgstr "Uforandret"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_segmentation_tree-act
@@ -2611,12 +2678,12 @@ msgstr "Fax"
 #. module: crm
 #: view:crm.lead.report:0
 msgid "Leads/Opportunities created in current month"
-msgstr ""
+msgstr "Leads/muligheter laget i inneværende måned"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Assignment"
-msgstr ""
+msgstr "Tildelt"
 
 #. module: crm
 #: field:crm.lead,company_id:0 view:crm.lead.report:0
@@ -2628,7 +2695,7 @@ msgstr "Firma"
 #. module: crm
 #: selection:crm.meeting,week_list:0
 msgid "Friday"
-msgstr ""
+msgstr "Fredag"
 
 #. module: crm
 #: field:crm.meeting,allday:0
@@ -2643,12 +2710,12 @@ msgstr "Obligatorisk / valgfri"
 #. module: crm
 #: view:crm.lead:0
 msgid "Unassigned Leads"
-msgstr ""
+msgstr "Ikke fordelte leads"
 
 #. module: crm
 #: field:crm.lead,subjects:0
 msgid "Subject of Email"
-msgstr ""
+msgstr "Emne på e-post"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.action_view_attendee_form
@@ -2661,7 +2728,7 @@ msgstr "Møteinvitasjoner"
 #: view:crm.phonecall.report:0 selection:crm.phonecall.report,state:0
 #: view:res.partner:0
 msgid "Todo"
-msgstr ""
+msgstr "Å gjøre"
 
 #. module: crm
 #: field:crm.case.categ,object_id:0
@@ -2671,7 +2738,7 @@ msgstr "Objektnavn"
 #. module: crm
 #: help:crm.lead,email_from:0
 msgid "E-mail address of the contact"
-msgstr ""
+msgstr "E-postadresse til kontakt"
 
 #. module: crm
 #: field:crm.lead,referred:0
@@ -2681,7 +2748,7 @@ msgstr ""
 #. module: crm
 #: view:crm.lead:0 model:ir.model,name:crm.model_crm_add_note
 msgid "Add Internal Note"
-msgstr ""
+msgstr "Legg til internt notat"
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:853
@@ -2703,7 +2770,7 @@ msgstr "Meldinger"
 #. module: crm
 #: help:crm.lead,channel_id:0
 msgid "Communication channel (mail, direct, phone, ...)"
-msgstr ""
+msgstr "Kommunikasjonskanal (e-post, direkte, telefon, ...)"
 
 #. module: crm
 #: code:addons/crm/crm_action_rule.py:61
@@ -2752,12 +2819,12 @@ msgstr ""
 #. module: crm
 #: field:crm.lead,color:0
 msgid "Color Index"
-msgstr ""
+msgstr "Fargeindeks"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Links"
-msgstr ""
+msgstr "Lenker"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_lead_categ_action
@@ -2767,6 +2834,10 @@ msgid ""
 "instance reflect your product structure or the different types of sales you "
 "do."
 msgstr ""
+"Lag spesifikke kategorier som passer bedriftens aktiviteter for å bedre "
+"klassifisere og analysere dine potensielle kunder og muligheter. Slike "
+"kategorier kan for eksempel reflektere produktets struktur eller ulike typer "
+"salg du gjør."
 
 #. module: crm
 #: help:crm.segmentation,som_interval_decrease:0
@@ -2774,6 +2845,8 @@ msgid ""
 "If the partner has not purchased (or bought) during a period, decrease the "
 "state of mind by this factor. It's a multiplication"
 msgstr ""
+"Hvis samarbeidspartneren ikke har kjøpt i en periode, reduseres "
+"sinnstilstand med denne faktoren. Det er multiplikasjon"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.action_report_crm_phonecall
@@ -2783,11 +2856,15 @@ msgid ""
 "several criteria and drill down the information, by adding more groups in "
 "the report."
 msgstr ""
+"Ut fra denne rapporten kan du analysere resultatene av salgsteamet, basert "
+"på deres telefonsamtaler. Du kan gruppere eller filtrere informasjon i "
+"henhold til flere kriterier og bore ned informasjon, ved å legge flere "
+"grupper i rapporten."
 
 #. module: crm
 #: view:crm.lead.report:0
 msgid "# Mails"
-msgstr ""
+msgstr "Antall e-poster"
 
 #. module: crm
 #: field:crm.phonecall,name:0 view:res.partner:0
@@ -2797,7 +2874,7 @@ msgstr "Samtalesammendrag"
 #. module: crm
 #: view:crm.lead:0
 msgid "Todays' Leads"
-msgstr ""
+msgstr "Dagens leads"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_case_categ_phone_outgoing0
@@ -2817,13 +2894,13 @@ msgstr "Operatør"
 #. module: crm
 #: model:ir.model,name:crm.model_crm_phonecall2phonecall
 msgid "Phonecall To Phonecall"
-msgstr ""
+msgstr "Telefonsamtale til telefonsamtale"
 
 #. module: crm
 #: view:crm.lead:0
 #: model:ir.actions.act_window,name:crm.opportunity2phonecall_act
 msgid "Schedule/Log Call"
-msgstr ""
+msgstr "Planlegg/logg samtale"
 
 #. module: crm
 #: selection:crm.meeting,state:0
@@ -2833,7 +2910,7 @@ msgstr "Bekreftet"
 #. module: crm
 #: model:ir.actions.act_window,name:crm.act_oppor_stage_user
 msgid "Planned Revenue By User and Stage"
-msgstr ""
+msgstr "Planlagt inntekt pr. bruker og stadium"
 
 #. module: crm
 #: view:crm.meeting:0
@@ -2858,12 +2935,12 @@ msgstr "Valgfritt uttrykk"
 #. module: crm
 #: selection:crm.meeting,select1:0
 msgid "Day of month"
-msgstr ""
+msgstr "Dag i måneden"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.act_my_oppor_stage
 msgid "Planned Revenue By Stage"
-msgstr ""
+msgstr "Planlagt inntekt pr. stadium"
 
 #. module: crm
 #: selection:crm.add.note,state:0 model:crm.case.stage,name:crm.stage_lead1
@@ -2887,7 +2964,7 @@ msgstr "Kanal"
 #: view:crm.lead:0 view:crm.lead.report:0 view:crm.meeting:0
 #: view:crm.phonecall:0 view:crm.phonecall.report:0
 msgid "My Sales Team(s)"
-msgstr ""
+msgstr "Mine salgsteam"
 
 #. module: crm
 #: help:crm.segmentation,exclusif:0
@@ -2897,18 +2974,22 @@ msgid ""
 "If checked, remove the category from partners that doesn't match "
 "segmentation criterions"
 msgstr ""
+"Sjekk om kategorien er begrenset til partnere som svarer til grupperingens "
+"kriterier.\n"
+"Hvis sjekket, fjern kategorien fra partnere som ikke svarer til "
+"grupperingens kriterier"
 
 #. module: crm
 #: field:crm.meeting,exdate:0
 msgid "Exception Date/Times"
-msgstr ""
+msgstr "Unntak dato/tider"
 
 #. module: crm
 #: help:crm.meeting,date_deadline:0
 msgid ""
 "Deadline Date is automatically                         computed from Start "
 "Date + Duration"
-msgstr ""
+msgstr "Tidsfrist er automatisk beregnet fra Startdato + Varighet"
 
 #. module: crm
 #: field:crm.lead,state_id:0
@@ -2918,13 +2999,13 @@ msgstr ""
 #. module: crm
 #: model:process.transition,note:crm.process_transition_leadopportunity0
 msgid "Creating business opportunities from Leads"
-msgstr ""
+msgstr "Opprette forretningsmuligheter fra Leads"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.open_board_statistical_dash
 #: model:ir.ui.menu,name:crm.menu_board_statistics_dash
 msgid "CRM Dashboard"
-msgstr ""
+msgstr "CRM Dashboard"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor4
@@ -2934,17 +3015,17 @@ msgstr "Trenger informasjon"
 #. module: crm
 #: model:process.transition,name:crm.process_transition_leadopportunity0
 msgid "Prospect Opportunity"
-msgstr ""
+msgstr "Prospekt salgsmulighet"
 
 #. module: crm
 #: field:base.action.rule,act_categ_id:0
 msgid "Set Category to"
-msgstr ""
+msgstr "Sett kategori til"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Mail To"
-msgstr ""
+msgstr "E-post til"
 
 #. module: crm
 #: field:crm.meeting,th:0
@@ -2966,7 +3047,7 @@ msgstr "Daglig"
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_stage_form_installer
 msgid "Review Sales Stages"
-msgstr ""
+msgstr "Gjennomgå salgstadier"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_lead2
@@ -2976,13 +3057,13 @@ msgstr "Kvalifikasjon"
 #. module: crm
 #: field:crm.lead,partner_address_email:0
 msgid "Partner Contact Email"
-msgstr ""
+msgstr "Partners kontakt e-post"
 
 #. module: crm
 #: code:addons/crm/wizard/crm_lead_to_partner.py:48
 #, python-format
 msgid "A partner is already defined."
-msgstr ""
+msgstr "En samarbeidspartner er allerede definert"
 
 #. module: crm
 #: selection:crm.meeting,byday:0
@@ -3009,7 +3090,7 @@ msgstr "Vilkår for kommunikasjonslogg"
 #. module: crm
 #: view:crm.phonecall:0
 msgid "Date of Call"
-msgstr ""
+msgstr "Dato for samtale"
 
 #. module: crm
 #: help:crm.segmentation,som_interval:0
@@ -3026,7 +3107,7 @@ msgstr ""
 #. module: crm
 #: field:crm.meeting,vtimezone:0
 msgid "Timezone"
-msgstr ""
+msgstr "Tidssone"
 
 #. module: crm
 #: field:crm.meeting,sa:0
@@ -3042,12 +3123,12 @@ msgstr "Selger"
 #. module: crm
 #: view:crm.lead:0 field:crm.lead,date_deadline:0
 msgid "Expected Closing"
-msgstr ""
+msgstr "Forventet lukking"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_opportunity2phonecall
 msgid "Opportunity to Phonecall"
-msgstr ""
+msgstr "Mulighet for telefonsamtale"
 
 #. module: crm
 #: help:crm.case.section,allow_unlink:0
@@ -3057,7 +3138,7 @@ msgstr "Tillater å slette saker som ikke er utkast"
 #. module: crm
 #: field:crm.meeting,count:0
 msgid "Repeat"
-msgstr ""
+msgstr "Gjenta"
 
 #. module: crm
 #: field:crm.lead.report,deadline_year:0
@@ -3072,7 +3153,7 @@ msgstr "Partnernavn"
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_phone2
 msgid "Outbound"
-msgstr ""
+msgstr "Utgående"
 
 #. module: crm
 #: field:crm.lead,date_open:0 field:crm.phonecall,date_open:0
@@ -3082,7 +3163,7 @@ msgstr "Åpnet"
 #. module: crm
 #: view:crm.case.section:0 field:crm.case.section,member_ids:0
 msgid "Team Members"
-msgstr ""
+msgstr "Gruppemedlemmer"
 
 #. module: crm
 #: view:crm.lead:0 view:crm.meeting:0 view:crm.phonecall:0
@@ -3092,12 +3173,12 @@ msgstr "Kontakter"
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor1
 msgid "Interest in Computer"
-msgstr ""
+msgstr "Interesse i data"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Invitation Detail"
-msgstr ""
+msgstr "Invitasjonsdetaljer"
 
 #. module: crm
 #: field:crm.segmentation,som_interval_default:0
@@ -3111,18 +3192,20 @@ msgid ""
 "outbound emails for this record before being sent. Separate multiple email "
 "addresses with a comma"
 msgstr ""
+"Disse e-postadressene vil bli lagt til kopi-feltet for alle inngående og "
+"utgående e-poster før de sendes. Skill flere e-postadresser med komma."
 
 #. module: crm
 #: 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 "Loggede samtaler"
 
 #. module: crm
 #: field:crm.partner2opportunity,probability:0
 #: field:crm.phonecall2opportunity,probability:0
 msgid "Success Probability"
-msgstr ""
+msgstr "Sannsynlighet for suksess"
 
 #. module: crm
 #: code:addons/crm/crm.py:466 selection:crm.lead.report,state:0
@@ -3134,12 +3217,12 @@ msgstr "Utkast"
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_section_act_tree
 msgid "Cases by Sales Team"
-msgstr ""
+msgstr "Hendelser pr. salgsteam"
 
 #. module: crm
 #: field:crm.meeting,attendee_ids:0
 msgid "Attendees"
-msgstr ""
+msgstr "Deltakere"
 
 #. module: crm
 #: view:crm.meeting:0 view:crm.phonecall:0
@@ -3152,7 +3235,7 @@ msgstr "Møte"
 #. module: crm
 #: model:ir.model,name:crm.model_crm_case_categ
 msgid "Category of Case"
-msgstr ""
+msgstr "Kategori for hendelse"
 
 #. module: crm
 #: view:crm.lead:0 view:crm.phonecall:0
@@ -3162,7 +3245,7 @@ msgstr "7 dager"
 #. module: crm
 #: view:board.board:0
 msgid "Planned Revenue by Stage and User"
-msgstr ""
+msgstr "Planlagte inntekter pr. stadium og bruker"
 
 #. module: crm
 #: view:crm.lead:0
@@ -3180,7 +3263,7 @@ msgstr "Normal"
 #: code:addons/crm/wizard/crm_lead_to_opportunity.py:104
 #, python-format
 msgid "Closed/Cancelled Leads can not be converted into Opportunity"
-msgstr ""
+msgstr "Lukkede/annullerte Leads kan ikke bli konvertert til en mulighet"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_meeting_categ_action
@@ -3191,12 +3274,12 @@ msgstr "Møtekategorier"
 #. module: crm
 #: view:crm.phonecall2partner:0
 msgid "You may have to verify that this partner does not exist already."
-msgstr ""
+msgstr "Du må kanskje bekrefte at denne partneren ikke allerede finnes."
 
 #. module: crm
 #: field:crm.lead.report,delay_open:0
 msgid "Delay to Open"
-msgstr ""
+msgstr "Forsinkelse før åpning"
 
 #. module: crm
 #: field:crm.lead.report,user_id:0 field:crm.phonecall.report,user_id:0
@@ -3207,20 +3290,20 @@ msgstr "Bruker"
 #: code:addons/crm/crm.py:446
 #, python-format
 msgid "The case '%s' has been cancelled."
-msgstr ""
+msgstr "Saken '%s' har blitt annullert."
 
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
 #: selection:crm.lead.report,deadline_month:0
 #: selection:crm.meeting,month_list:0 selection:crm.phonecall.report,month:0
 msgid "November"
-msgstr ""
+msgstr "November"
 
 #. module: crm
 #: view:crm.lead.report:0
 #: model:ir.actions.act_window,name:crm.act_opportunity_stage
 msgid "Opportunities By Stage"
-msgstr ""
+msgstr "Muligheter pr. stadium"
 
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
@@ -3237,18 +3320,18 @@ msgstr "Kontrakt"
 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_lead4
 msgid "Twitter Ads"
-msgstr ""
+msgstr "Twitter-annonser"
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:336
 #, python-format
 msgid "The opportunity '%s' has been been won."
-msgstr ""
+msgstr "Anledningen '%s' er vunnet"
 
 #. module: crm
 #: field:crm.case.stage,case_default:0
 msgid "Common to All Teams"
-msgstr ""
+msgstr "Felles for alle team"
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:831 code:addons/crm/wizard/crm_add_note.py:28
@@ -3264,17 +3347,17 @@ msgstr "Planlagt omsetning"
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor7
 msgid "Need Consulting"
-msgstr ""
+msgstr "Trenger rådgivning"
 
 #. module: crm
 #: constraint:crm.segmentation:0
 msgid "Error ! You can not create recursive profiles."
-msgstr ""
+msgstr "Feil! Du kan ikke lage profiler i uendelig struktur."
 
 #. module: crm
 #: help:crm.lead.report,deadline_year:0
 msgid "Expected closing year"
-msgstr ""
+msgstr "Forventet sluttår"
 
 #. module: crm
 #: field:crm.lead,partner_address_id:0 field:crm.meeting,partner_address_id:0
@@ -3285,7 +3368,7 @@ msgstr "Partnerkontakt"
 #. module: crm
 #: field:crm.meeting,recurrent_id:0
 msgid "Recurrent ID date"
-msgstr ""
+msgstr "Gjentagende ID dato"
 
 #. module: crm
 #: sql_constraint:res.users:0
@@ -3302,7 +3385,7 @@ msgstr "Lukk"
 #: selection:crm.opportunity2phonecall,action:0
 #: selection:crm.phonecall2phonecall,action:0
 msgid "Schedule a call"
-msgstr ""
+msgstr "Planlegg en samtale"
 
 #. module: crm
 #: view:crm.lead:0 view:crm.phonecall:0
@@ -3312,17 +3395,17 @@ msgstr "Kategorisering"
 #. module: crm
 #: view:crm.lead:0
 msgid "Log Call"
-msgstr ""
+msgstr "Logg samtale"
 
 #. module: crm
 #: model:ir.model,name:crm.model_base_action_rule
 msgid "Action Rules"
-msgstr ""
+msgstr "Handlingsregler"
 
 #. module: crm
 #: field:crm.meeting,rrule_type:0
 msgid "Recurrency"
-msgstr ""
+msgstr "Gjentagende"
 
 #. module: crm
 #: field:crm.meeting,phonecall_id:0
@@ -3342,17 +3425,17 @@ msgstr "Til"
 #. module: crm
 #: view:crm.lead:0
 msgid "Create date"
-msgstr ""
+msgstr "Opprettet dato"
 
 #. module: crm
 #: selection:crm.meeting,class:0
 msgid "Private"
-msgstr ""
+msgstr "Privat"
 
 #. module: crm
 #: selection:crm.meeting,class:0
 msgid "Public for Employees"
-msgstr ""
+msgstr "Offentlig for ansatte"
 
 #. module: crm
 #: field:crm.lead,function:0
@@ -3362,7 +3445,7 @@ msgstr "Funksjon"
 #. module: crm
 #: view:crm.add.note:0
 msgid "_Add"
-msgstr ""
+msgstr "_Legg til"
 
 #. module: crm
 #: field:crm.case.section,note:0 view:crm.meeting:0
@@ -3374,7 +3457,7 @@ msgstr "Beskrivelse"
 #. module: crm
 #: view:crm.phonecall.report:0
 msgid "Phone calls made in current month"
-msgstr ""
+msgstr "Telefonsamtaler gjort i inneværende måned"
 
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
@@ -3386,18 +3469,18 @@ msgstr "Mai"
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor2
 msgid "Interest in Accessories"
-msgstr ""
+msgstr "Interesse i tilbehør"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "New Opportunities"
-msgstr ""
+msgstr "Nye muligheter"
 
 #. module: crm
 #: code:addons/crm/crm_action_rule.py:61
 #, python-format
 msgid "No E-Mail Found for your Company address!"
-msgstr ""
+msgstr "Ingen e-post funnet for adressen til selskapet ditt!"
 
 #. module: crm
 #: field:crm.lead.report,email:0
@@ -3412,22 +3495,22 @@ msgstr "Gate"
 #. module: crm
 #: view:crm.lead.report:0
 msgid "Opportunities by User and Team"
-msgstr ""
+msgstr "Muligheter pr.  bruker og team"
 
 #. module: crm
 #: view:crm.phonecall:0
 msgid "Reset to Todo"
-msgstr ""
+msgstr "Tilbakestill til Å gjøre"
 
 #. module: crm
 #: field:crm.case.section,working_hours:0
 msgid "Working Hours"
-msgstr ""
+msgstr "Arbeidstid"
 
 #. module: crm
 #: field:res.partner,phonecall_ids:0
 msgid "Phonecalls"
-msgstr ""
+msgstr "Telefonsamtaler"
 
 #. module: crm
 #: view:crm.lead:0 field:crm.lead,is_customer_add:0
@@ -3469,7 +3552,7 @@ msgstr "Tapt"
 #. module: crm
 #: view:crm.lead:0
 msgid "Edit"
-msgstr ""
+msgstr "Endre"
 
 #. module: crm
 #: field:crm.lead,country_id:0 view:crm.lead.report:0
@@ -3484,7 +3567,7 @@ msgstr "Land"
 #: selection:crm.lead2opportunity.partner.mass,name:0 view:crm.phonecall:0
 #: view:res.partner:0
 msgid "Convert to Opportunity"
-msgstr ""
+msgstr "Konverter til salgsmulighet"
 
 #. module: crm
 #: selection:crm.meeting,week_list:0
@@ -3499,6 +3582,10 @@ msgid ""
 "partner. From the phone call form, you can trigger a request for another "
 "call, a meeting or an opportunity."
 msgstr ""
+"Dette verktøyet lar deg logge av alle innkommende samtaler på sparket. Hver "
+"samtale du får vises på samarbeidspartnerskjemaet for å spore hver kontakt "
+"du har med en partner. Fra telefonsamtale skjemaet, kan du utløse en "
+"anmodning om en annen samtale, et møte eller en mulighet."
 
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
@@ -3510,17 +3597,17 @@ msgstr "April"
 #. module: crm
 #: field:crm.case.resource.type,name:0
 msgid "Campaign Name"
-msgstr ""
+msgstr "Kampanjenavn"
 
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Profiling"
-msgstr ""
+msgstr "Profilering"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_phonecall_report
 msgid "Phone calls by user and section"
-msgstr ""
+msgstr "Telefonsamtaler pr. bruker og seksjon"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_case_channel_action
@@ -3529,6 +3616,9 @@ msgid ""
 "channels that will be maintained at the creation of a document in the "
 "system. Some examples of channels can be: Website, Phone Call, Reseller, etc."
 msgstr ""
+"Spor fra hvor dine potensielle kunder kommer ved å opprette spesielle "
+"kanaler som vil bli oppdatert ved opprettelse av dokumenter i systemet. Noen "
+"eksempler på kanaler kan være: nettside, telefonsamtale, forhandler, etc."
 
 #. module: crm
 #: selection:crm.lead2opportunity.partner,name:0
@@ -3539,7 +3629,7 @@ msgstr "Slå sammen med eksisterende salgsmulighet"
 #. module: crm
 #: field:crm.meeting,select1:0
 msgid "Option"
-msgstr ""
+msgstr "Valg"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_lead4
@@ -3549,7 +3639,7 @@ msgstr "Forhandling"
 #. module: crm
 #: view:crm.lead:0
 msgid "Exp.Closing"
-msgstr ""
+msgstr "Forventet lukking"
 
 #. module: crm
 #: field:crm.case.stage,sequence:0 field:crm.meeting,sequence:0
@@ -3564,7 +3654,7 @@ msgstr ""
 #. module: crm
 #: view:crm.meeting:0
 msgid "Accept"
-msgstr ""
+msgstr "Godta"
 
 #. module: crm
 #: field:crm.segmentation.line,expr_name:0
@@ -3579,29 +3669,29 @@ msgstr "Sekund"
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_lead3
 msgid "Proposition"
-msgstr ""
+msgstr "Preposisjon"
 
 #. module: crm
 #: field:crm.lead.report,date_closed:0
 #: field:crm.phonecall.report,date_closed:0
 msgid "Close Date"
-msgstr ""
+msgstr "Lukkingsdato"
 
 #. module: crm
 #: view:crm.lead.report:0 view:crm.phonecall.report:0
 #: field:crm.phonecall.report,name:0
 msgid "Year"
-msgstr ""
+msgstr "År"
 
 #. module: crm
 #: constraint:res.partner:0
 msgid "Error ! You cannot create recursive associated members."
-msgstr ""
+msgstr "Feil! Du kan ikke lage uendelig struktur av assosierte medlemmer."
 
 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_lead8
 msgid "Newsletter"
-msgstr ""
+msgstr "Nyhetsbrev"
 
 #, python-format
 #~ msgid "Warning!"
@@ -4067,3 +4157,15 @@ msgstr ""
 
 #~ msgid "Schedule/Log a call"
 #~ msgstr "Planlegg/logg en samtale"
+
+#~ msgid "Select stages for this Sales Team"
+#~ msgstr "Velg nivå for dette salgsteamet"
+
+#~ msgid "Referred By"
+#~ msgstr "Henvist av"
+
+#~ msgid "Assigned opportunities to"
+#~ msgstr "Tildelte muligheter til"
+
+#~ msgid "End of recurrency"
+#~ msgstr "Slutt på gjentagelse"
diff --git a/addons/crm/i18n/nl.po b/addons/crm/i18n/nl.po
index b89ce3c905f..85e8e51dd7c 100644
--- a/addons/crm/i18n/nl.po
+++ b/addons/crm/i18n/nl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:58+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:05+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: crm
 #: view:crm.lead.report:0
diff --git a/addons/crm/i18n/nl_BE.po b/addons/crm/i18n/nl_BE.po
index 3380a752fa6..1c2847856a0 100644
--- a/addons/crm/i18n/nl_BE.po
+++ b/addons/crm/i18n/nl_BE.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:00+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:06+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: crm
 #: view:crm.lead.report:0
diff --git a/addons/crm/i18n/pl.po b/addons/crm/i18n/pl.po
index 1d08a5c208c..c5fd59533b5 100644
--- a/addons/crm/i18n/pl.po
+++ b/addons/crm/i18n/pl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:59+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:06+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: crm
 #: view:crm.lead.report:0
diff --git a/addons/crm/i18n/pt.po b/addons/crm/i18n/pt.po
index 5979958cf34..d9c78b6fa42 100644
--- a/addons/crm/i18n/pt.po
+++ b/addons/crm/i18n/pt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:59+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:06+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: crm
 #: view:crm.lead.report:0
diff --git a/addons/crm/i18n/pt_BR.po b/addons/crm/i18n/pt_BR.po
index 331e63e9ce6..79a8ff73a87 100644
--- a/addons/crm/i18n/pt_BR.po
+++ b/addons/crm/i18n/pt_BR.po
@@ -8,13 +8,14 @@ msgstr ""
 "Report-Msgid-Bugs-To: renato.lima@akretion.com\n"
 "POT-Creation-Date: 2012-02-08 01:37+0100\n"
 "PO-Revision-Date: 2012-07-28 18:57+0000\n"
-"Last-Translator: Fábio Martinelli <webmaster@guaru.net>\n"
+"Last-Translator: Fábio Martinelli - http://zupy.com.br "
+"<webmaster@guaru.net>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:00+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:06+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: crm
 #: view:crm.lead.report:0
diff --git a/addons/crm/i18n/ro.po b/addons/crm/i18n/ro.po
index eb95346c59e..9e3fec7c13c 100644
--- a/addons/crm/i18n/ro.po
+++ b/addons/crm/i18n/ro.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:59+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:06+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: crm
 #: view:crm.lead.report:0
diff --git a/addons/crm/i18n/ru.po b/addons/crm/i18n/ru.po
index 64a895fdd06..fab81c37340 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-02-08 01:37+0100\n"
-"PO-Revision-Date: 2012-08-06 11:58+0000\n"
+"PO-Revision-Date: 2012-08-30 17:52+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-08 04:36+0000\n"
-"X-Generator: Launchpad (build 15757)\n"
+"X-Launchpad-Export-Date: 2012-08-31 04:56+0000\n"
+"X-Generator: Launchpad (build 15887)\n"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -320,7 +320,7 @@ msgstr "Перспективный партнер"
 #: code:addons/crm/crm_lead.py:735
 #, python-format
 msgid "No Subject"
-msgstr ""
+msgstr "Без темы"
 
 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_lead6
@@ -535,7 +535,7 @@ msgstr "Эл. письмо"
 #. module: crm
 #: view:crm.phonecall:0
 msgid "Phonecalls during last 7 days"
-msgstr ""
+msgstr "Звонки за последние 7 дней"
 
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
@@ -626,7 +626,7 @@ msgstr "Встреча '%s' была подтверждена."
 #. module: crm
 #: selection:crm.add.note,state:0 selection:crm.lead,state:0
 msgid "In Progress"
-msgstr ""
+msgstr "В процессе"
 
 #. module: crm
 #: help:crm.case.section,reply_to:0
@@ -720,7 +720,7 @@ msgstr "Вероятность (%)"
 #. module: crm
 #: field:crm.lead,company_currency:0
 msgid "Company Currency"
-msgstr ""
+msgstr "Валюта организации"
 
 #. module: crm
 #: view:crm.lead:0
@@ -763,7 +763,7 @@ msgstr "Остановить процесс"
 #. module: crm
 #: view:crm.lead.report:0 view:crm.phonecall.report:0
 msgid "Month-1"
-msgstr ""
+msgstr "Месяц-1"
 
 #. module: crm
 #: view:crm.phonecall:0
@@ -778,7 +778,7 @@ msgstr "Продолжить"
 #. module: crm
 #: field:crm.segmentation,som_interval:0
 msgid "Days per Period"
-msgstr ""
+msgstr "Дней в периоде"
 
 #. module: crm
 #: field:crm.meeting,byday:0
@@ -933,7 +933,7 @@ msgstr "Внимание!"
 #. module: crm
 #: view:crm.phonecall.report:0
 msgid "Phone calls made in current year"
-msgstr ""
+msgstr "Звонки за текущий год"
 
 #. module: crm
 #: field:crm.lead,day_open:0
@@ -943,7 +943,7 @@ msgstr "Дней до открытия"
 #. module: crm
 #: view:crm.meeting:0
 msgid "Show Time as"
-msgstr ""
+msgstr "Показать время как"
 
 #. module: crm
 #: view:crm.phonecall2partner:0
@@ -973,7 +973,7 @@ msgstr "Мои встречи"
 #. module: crm
 #: view:crm.phonecall:0
 msgid "Todays's Phonecalls"
-msgstr ""
+msgstr "Звонки за сегодня"
 
 #. module: crm
 #: view:board.board:0
@@ -1030,7 +1030,7 @@ msgstr ""
 #. module: crm
 #: view:crm.lead:0
 msgid "Change Color"
-msgstr ""
+msgstr "Изменить цвет"
 
 #. module: crm
 #: view:crm.segmentation:0
@@ -1180,7 +1180,7 @@ msgstr "Письмо партнеру"
 #. module: crm
 #: view:crm.opportunity2phonecall:0 view:crm.phonecall2phonecall:0
 msgid "Call Details"
-msgstr ""
+msgstr "Детали звонка"
 
 #. module: crm
 #: field:crm.meeting,class:0
@@ -1270,7 +1270,7 @@ msgstr "Продолжительность в минутах"
 #. module: crm
 #: field:crm.case.channel,name:0
 msgid "Channel Name"
-msgstr ""
+msgstr "Название канала"
 
 #. module: crm
 #: field:crm.partner2opportunity,name:0 field:crm.phonecall2opportunity,name:0
@@ -1321,7 +1321,7 @@ msgstr "Дата записи"
 #. module: crm
 #: view:crm.meeting:0
 msgid "End of Recurrency"
-msgstr ""
+msgstr "Конец повторения"
 
 #. module: crm
 #: view:crm.meeting:0
@@ -1345,7 +1345,7 @@ msgstr "Установить сигнал на это время, перед с
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_categ_phone_create_partner
 msgid "Schedule a Call"
-msgstr ""
+msgstr "Назначить звонок"
 
 #. module: crm
 #: view:crm.lead2partner:0 view:crm.phonecall:0 view:crm.phonecall2partner:0
@@ -1433,7 +1433,7 @@ msgstr ""
 #. module: crm
 #: view:crm.phonecall.report:0
 msgid "Date of call"
-msgstr ""
+msgstr "Дата звонка"
 
 #. module: crm
 #: help:crm.lead,section_id:0
@@ -1549,7 +1549,7 @@ msgstr ""
 #. module: crm
 #: view:crm.lead:0
 msgid "Mail"
-msgstr ""
+msgstr "Почта"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_phonecall_categ_action
@@ -1905,7 +1905,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 selection:crm.phonecall,state:0
@@ -2181,7 +2181,7 @@ 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
 #: view:crm.meeting:0 view:res.partner:0
@@ -2191,7 +2191,7 @@ msgstr "Дата начала"
 #. module: crm
 #: view:crm.phonecall:0
 msgid "Scheduled Phonecalls"
-msgstr ""
+msgstr "Запланированные звонки"
 
 #. module: crm
 #: view:crm.meeting:0
@@ -2201,7 +2201,7 @@ msgstr "Отклонить"
 #. module: crm
 #: field:crm.lead,user_email:0
 msgid "User Email"
-msgstr ""
+msgstr "Email пользователя"
 
 #. module: crm
 #: help:crm.lead,optin:0
@@ -2387,7 +2387,7 @@ msgstr "Прочее"
 #. module: crm
 #: model:ir.actions.act_window,name:crm.open_board_crm
 msgid "Sales"
-msgstr ""
+msgstr "Продажи"
 
 #. module: crm
 #: code:addons/crm/crm.py:430
@@ -2575,7 +2575,7 @@ msgstr "Проверка классификации"
 #. module: crm
 #: field:crm.lead,user_login:0
 msgid "User Login"
-msgstr ""
+msgstr "Логин пользователя"
 
 #. module: crm
 #: view:crm.segmentation:0
@@ -2706,7 +2706,7 @@ msgstr ""
 #. module: crm
 #: field:crm.lead,subjects:0
 msgid "Subject of Email"
-msgstr ""
+msgstr "Тема письма"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.action_view_attendee_form
@@ -2822,7 +2822,7 @@ msgstr ""
 #. module: crm
 #: field:crm.lead,color:0
 msgid "Color Index"
-msgstr ""
+msgstr "Цветовая палитра"
 
 #. module: crm
 #: view:crm.lead:0
@@ -3010,7 +3010,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 Dashboard"
-msgstr ""
+msgstr "Панель аналитики CRM"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor4
@@ -3095,7 +3095,7 @@ msgstr "Условие на историю общения"
 #. module: crm
 #: view:crm.phonecall:0
 msgid "Date of Call"
-msgstr ""
+msgstr "Дата звонка"
 
 #. module: crm
 #: help:crm.segmentation,som_interval:0
@@ -3398,7 +3398,7 @@ msgstr "Закрыть"
 #: selection:crm.opportunity2phonecall,action:0
 #: selection:crm.phonecall2phonecall,action:0
 msgid "Schedule a call"
-msgstr ""
+msgstr "Запланировать звонок"
 
 #. module: crm
 #: view:crm.lead:0 view:crm.phonecall:0
@@ -3408,7 +3408,7 @@ msgstr "Категоризация"
 #. module: crm
 #: view:crm.lead:0
 msgid "Log Call"
-msgstr ""
+msgstr "Описать звонок"
 
 #. module: crm
 #: model:ir.model,name:crm.model_base_action_rule
@@ -3438,7 +3438,7 @@ msgstr "Кому"
 #. module: crm
 #: view:crm.lead:0
 msgid "Create date"
-msgstr ""
+msgstr "Дата создания"
 
 #. module: crm
 #: selection:crm.meeting,class:0
@@ -3470,7 +3470,7 @@ msgstr "Описание"
 #. module: crm
 #: view:crm.phonecall.report:0
 msgid "Phone calls made in current month"
-msgstr ""
+msgstr "Звонки, сделанные в текущем месяце"
 
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
@@ -3565,7 +3565,7 @@ msgstr "Проиграно"
 #. module: crm
 #: view:crm.lead:0
 msgid "Edit"
-msgstr ""
+msgstr "Изменить"
 
 #. module: crm
 #: field:crm.lead,country_id:0 view:crm.lead.report:0
@@ -3625,6 +3625,9 @@ msgid ""
 "channels that will be maintained at the creation of a document in the "
 "system. Some examples of channels can be: Website, Phone Call, Reseller, etc."
 msgstr ""
+"Отлеживание источников появления кандидатов и предложений путём создания "
+"специализированных каналов, обслуживаемых при создании докумета в системе. "
+"Например, каналы могут быть такими: сайт, телефонный звонок, реселлер и т.д."
 
 #. module: crm
 #: selection:crm.lead2opportunity.partner,name:0
@@ -3655,7 +3658,7 @@ msgstr "Последовательность"
 #. module: crm
 #: model:ir.model,name:crm.model_mail_compose_message
 msgid "E-mail composition wizard"
-msgstr ""
+msgstr "Мастер создания электронной почты"
 
 #. module: crm
 #: view:crm.meeting:0
@@ -3692,7 +3695,7 @@ msgstr "Год"
 #. module: crm
 #: constraint:res.partner:0
 msgid "Error ! You cannot create recursive associated members."
-msgstr ""
+msgstr "Ошибка! Вы не можете создавать рекурсивные ссылки на участников."
 
 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_lead8
diff --git a/addons/crm/i18n/sk.po b/addons/crm/i18n/sk.po
index 268d6e4e876..de9224b038a 100644
--- a/addons/crm/i18n/sk.po
+++ b/addons/crm/i18n/sk.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:59+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:06+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: crm
 #: view:crm.lead.report:0
diff --git a/addons/crm/i18n/sl.po b/addons/crm/i18n/sl.po
index 9cc8450091f..37b350090f3 100644
--- a/addons/crm/i18n/sl.po
+++ b/addons/crm/i18n/sl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:59+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:06+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: crm
 #: view:crm.lead.report:0
diff --git a/addons/crm/i18n/sq.po b/addons/crm/i18n/sq.po
index 2c69dabb2b0..f325e016e8f 100644
--- a/addons/crm/i18n/sq.po
+++ b/addons/crm/i18n/sq.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:57+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:04+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: crm
 #: view:crm.lead.report:0
diff --git a/addons/crm/i18n/sr.po b/addons/crm/i18n/sr.po
index 95c6f4087d4..94c9570a605 100644
--- a/addons/crm/i18n/sr.po
+++ b/addons/crm/i18n/sr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:59+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:06+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: crm
 #: view:crm.lead.report:0
diff --git a/addons/crm/i18n/sr@latin.po b/addons/crm/i18n/sr@latin.po
index e88876edbee..1dd1e9fd52d 100644
--- a/addons/crm/i18n/sr@latin.po
+++ b/addons/crm/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:00+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: crm
 #: view:crm.lead.report:0
diff --git a/addons/crm/i18n/sv.po b/addons/crm/i18n/sv.po
index ccc512d93fa..a438fa262eb 100644
--- a/addons/crm/i18n/sv.po
+++ b/addons/crm/i18n/sv.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:59+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:06+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: crm
 #: view:crm.lead.report:0
diff --git a/addons/crm/i18n/th.po b/addons/crm/i18n/th.po
index af880fcbc57..81c3006d6f6 100644
--- a/addons/crm/i18n/th.po
+++ b/addons/crm/i18n/th.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:59+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:06+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: crm
 #: view:crm.lead.report:0
diff --git a/addons/crm/i18n/tlh.po b/addons/crm/i18n/tlh.po
index 2653ea054cf..0b8f7390225 100644
--- a/addons/crm/i18n/tlh.po
+++ b/addons/crm/i18n/tlh.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:59+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:06+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: crm
 #: view:crm.lead.report:0
diff --git a/addons/crm/i18n/tr.po b/addons/crm/i18n/tr.po
index 188eb205e02..8a21a027fcb 100644
--- a/addons/crm/i18n/tr.po
+++ b/addons/crm/i18n/tr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:59+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:06+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -455,6 +455,13 @@ msgid ""
 "Revenue\" and the \"Expected Closing Date.\" You should also have a look at "
 "the tooltip of the field \"Change Probability Automatically\"."
 msgstr ""
+"Aşamalar, satış elemanının belirli bir fırsatın nasıl satış döngüsüne "
+"yerleştirildiğini izlemesini sağlar. Satış kanalınızı daha verimli bir "
+"şekilde yönetmek için, sonraki adıma geçilebilmesi için gerekli koşulları "
+"tanımlamanız önemlidir. Örneğin: bir fırsatı 'Uygun' olarak ayarlamak için "
+"\"Umulan Gelir\" ve \"Umulan Kapanış Tarihi\" ni ayarlamanız gerekir. "
+"Ayrıca; \"Olasılığı Otomatikman Değiştir\" alanının araç ipucuna da "
+"gözatmalısınız."
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -736,6 +743,11 @@ msgid ""
 "opportunities, you can assign the following stage to the team: Territory, "
 "Qualified, Qualified Sponsors, Proposition, Negociaton, Won/Lost."
 msgstr ""
+"Satış organizasyonlarınızı yapılandırmak için satış takımını tanımlayın ve "
+"her takıma kullanıcı atayın. Ayrıca; her takıma satış aşamaları da "
+"tanımlamalısınız. Örnek olarak, fırsatlarınızı izlemek için Satış Çözümleri "
+"tekniğini kullanırsanız, takıma aşağıdaki aşamayı atayabilirsiniz: Bölge, "
+"Uygun, Uygun Sponsorlar, Öneri, Görüşme, Kazanç/Kayıp"
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:718 view:crm.lead:0 selection:crm.lead,type:0
@@ -748,7 +760,7 @@ msgstr "Fırsat"
 #. module: crm
 #: view:crm.lead.report:0
 msgid "Leads/Opportunities created in last month"
-msgstr ""
+msgstr "Geçen ayda oluşturulan Adaylar/Fırsatlar"
 
 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_lead7
@@ -807,6 +819,8 @@ msgid ""
 "You cannot delete lead '%s'; it must be in state 'Draft' to be deleted. You "
 "should better cancel it, instead of deleting it."
 msgstr ""
+"'%s' Adayını silemezsiniz; silinebilmesi için 'Taslak' durumunda olmalıdır. "
+"Onu silmek yerine iptal etmeniz daha iyi olur."
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:451
@@ -1056,7 +1070,7 @@ msgstr "Önceki"
 #. module: crm
 #: view:crm.lead:0
 msgid "New Leads"
-msgstr ""
+msgstr "Yeni Adaylar"
 
 #. module: crm
 #: view:crm.lead:0
@@ -1250,6 +1264,7 @@ msgid ""
 "Setting this stage will change the probability automatically on the "
 "opportunity."
 msgstr ""
+"Bu aşamayı ayarlamak fırsattaki olasılığı otomatikman değiştirecektir."
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.action_report_crm_phonecall
@@ -1303,6 +1318,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 ""
+"Bu alanı işaretlerseniz, bu aşama her satış takımına varsayılan olarak "
+"önerilecektir. Varolan takımlara bu aşama atanmayacaktır."
 
 #. module: crm
 #: field:crm.meeting,fr:0
@@ -1372,6 +1389,13 @@ msgid ""
 "       \n"
 "If the call needs to be done then the state is set to 'Not Held'."
 msgstr ""
+"Bir durum oluşturulduğunda durum 'Yapılacak'olarak ayarlanır.                "
+"                  \n"
+"Eğer durum yürütülmekteyse durum 'Açık' olarak ayarlanır.                    "
+"              \n"
+"Çağrı bittiğinde durum 'Beklemede' olarak ayarlanır.                         "
+"         \n"
+"Çağrıyı bitirmek gerektiğinde durum 'Bekelemede değil' olarak ayarlanır."
 
 #. module: crm
 #: selection:crm.meeting,week_list:0
@@ -1429,7 +1453,7 @@ msgstr "Kategorilere göre fırsatlar"
 #. module: crm
 #: model:crm.case.section,name:crm.section_sales_marketing_department
 msgid "Sales Marketing Department"
-msgstr ""
+msgstr "Satış Pazarlama Bölümü"
 
 #. module: crm
 #: view:crm.phonecall.report:0
@@ -1524,7 +1548,7 @@ msgstr "res.users"
 #. module: crm
 #: view:crm.lead.report:0
 msgid "Leads/Opportunities which are in pending state"
-msgstr ""
+msgstr "Bekleyen durumundaki Adaylar/Fırsatlar"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_merge_opportunity
@@ -1544,7 +1568,7 @@ msgstr "Eğer paydaşa bir eposta göndermek isterseniz bunu işaretleyin."
 #. module: crm
 #: field:crm.phonecall,opportunity_id:0
 msgid "Lead/Opportunity"
-msgstr ""
+msgstr "Aday/Fırsat"
 
 #. module: crm
 #: view:crm.lead:0
@@ -1559,7 +1583,7 @@ msgstr "Telefon Görüşmesi Kategorileri"
 #. module: crm
 #: view:crm.lead.report:0
 msgid "Leads/Opportunities which are in open state"
-msgstr ""
+msgstr "Açık durumundaki Adaylar/Fırsatlar"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.act_oppor_categ
@@ -1572,6 +1596,7 @@ msgid ""
 "The name of the future partner that will be created while converting the "
 "lead into opportunity"
 msgstr ""
+"Adayın fırsata dönüştürülmesi sırasında oluşturulacak gelecek paydaşın adı"
 
 #. module: crm
 #: constraint:crm.case.section:0
@@ -1719,7 +1744,7 @@ msgstr "Beşinci"
 #. module: crm
 #: view:crm.lead.report:0
 msgid "Leads/Opportunities which are in done state"
-msgstr ""
+msgstr "Tamamlandı durumundaki Adaylar/Fırsatlar"
 
 #. module: crm
 #: field:crm.lead.report,delay_close:0
@@ -1740,7 +1765,7 @@ msgstr "Potansiyel Satıcı"
 #: help:crm.case.section,change_responsible:0
 msgid ""
 "When escalating to this team override the saleman with the team leader."
-msgstr ""
+msgstr "Bu takıma yükselirken satıcı ile takım lideri geçersiz kılınır"
 
 #. module: crm
 #: field:crm.lead.report,planned_revenue:0
@@ -1886,7 +1911,7 @@ msgstr "Yineleme Seçeneği"
 #. module: crm
 #: view:crm.lead:0
 msgid "Lead / Customer"
-msgstr ""
+msgstr "Aday/ Mğşteri"
 
 #. module: crm
 #: model:process.transition,note:crm.process_transition_leadpartner0
@@ -1986,7 +2011,7 @@ msgstr "Konum"
 #. module: crm
 #: model:ir.model,name:crm.model_crm_lead2opportunity_partner_mass
 msgid "Mass Lead To Opportunity Partner"
-msgstr ""
+msgstr "Adaydan Fırsat Paydaşına toplu dönüştür"
 
 #. module: crm
 #: view:crm.lead:0
@@ -2041,7 +2066,7 @@ msgstr "İlgili Adı"
 #. module: crm
 #: view:crm.lead:0
 msgid "Leads creating during last 7 days"
-msgstr ""
+msgstr "Son 7 günde oluşturulan Adaylar"
 
 #. module: crm
 #: view:crm.phonecall2partner:0
@@ -2075,7 +2100,7 @@ msgstr ""
 #. module: crm
 #: view:crm.lead.report:0
 msgid "Show only lead"
-msgstr ""
+msgstr "Yalnızca adayları göster"
 
 #. module: crm
 #: help:crm.meeting,count:0
@@ -2108,7 +2133,7 @@ msgstr "Takım"
 #. module: crm
 #: view:crm.lead.report:0
 msgid "Leads/Opportunities which are in New state"
-msgstr ""
+msgstr "Yeni durumundaki Adayla/Fırsatlar"
 
 #. module: crm
 #: view:crm.phonecall:0 selection:crm.phonecall,state:0
@@ -2130,7 +2155,7 @@ msgstr "Bekleyen Fırsatlar"
 #: code:addons/crm/crm_lead.py:491
 #, python-format
 msgid "Please select more than one opportunity from the list view."
-msgstr ""
+msgstr "Liste görünümünden lütfen birden çok fırsat seçin."
 
 #. module: crm
 #: view:crm.lead.report:0 field:crm.meeting,month_list:0
@@ -2337,7 +2362,7 @@ msgstr "Belirsiz"
 #. module: crm
 #: help:crm.case.stage,sequence:0
 msgid "Used to order stages."
-msgstr ""
+msgstr "Aşamalrı sıralamak için kullanılır."
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:276
@@ -2366,7 +2391,7 @@ msgstr "Bekl. Kapanış Günü"
 #. module: crm
 #: field:crm.case.section,change_responsible:0
 msgid "Reassign Escalated"
-msgstr ""
+msgstr "Yükseltileni yeniden ata"
 
 #. module: crm
 #: selection:crm.meeting,rrule_type:0
@@ -2397,6 +2422,7 @@ 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: crm
 #: model:crm.case.categ,name:crm.categ_oppor8 view:crm.meeting:0
@@ -2521,7 +2547,7 @@ msgstr ""
 #. module: crm
 #: view:crm.lead:0
 msgid "Unassigned Opportunities"
-msgstr ""
+msgstr "Atanmamış Fırsatlar"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -2565,6 +2591,8 @@ msgid ""
 "From which campaign (seminar, marketing campaign, mass mailing, ...) did "
 "this contact come from?"
 msgstr ""
+"Bu kişi hangi kampanyadan (seminer, pazarlama kampanyası, toplu postalama, "
+"...) geldi?"
 
 #. module: crm
 #: model:ir.model,name:crm.model_calendar_attendee
@@ -2589,7 +2617,7 @@ msgstr "Devam Prosesi"
 #. module: crm
 #: view:crm.lead.report:0
 msgid "Leads/Opportunities created in current year"
-msgstr ""
+msgstr "Geçerli yılda oluşturulan Adaylar/Fırsatlar"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_phonecall2partner
@@ -2673,7 +2701,7 @@ msgstr "Faks"
 #. module: crm
 #: view:crm.lead.report:0
 msgid "Leads/Opportunities created in current month"
-msgstr ""
+msgstr "Geçerli ayda oluşturulan Adaylar/Fırsatlar"
 
 #. module: crm
 #: view:crm.meeting:0
@@ -2705,7 +2733,7 @@ msgstr "Zorunlu / Seçmeli"
 #. module: crm
 #: view:crm.lead:0
 msgid "Unassigned Leads"
-msgstr ""
+msgstr "Atanmamış Adaylar"
 
 #. module: crm
 #: field:crm.lead,subjects:0
@@ -2881,7 +2909,7 @@ msgstr "Çağrı Özeti"
 #. module: crm
 #: view:crm.lead:0
 msgid "Todays' Leads"
-msgstr ""
+msgstr "Bugünün Adayları"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_case_categ_phone_outgoing0
@@ -2892,6 +2920,11 @@ msgid ""
 "customer. You can also import a .CSV file with a list of calls to be done by "
 "your sales team."
 msgstr ""
+"Planlanmış çağrılar, satış takımınızca yapılması gereken bütün çağrıları "
+"listeler. Bir satıcı, çağrı ile ilgili bilgiyi form görünümünde "
+"kaydedebilir. Bu bilgi, bir müşteriye ait her kişiyi izlemek için paydaş "
+"formuna kaydedilecektir. Ayrıca; satış takımınızca yapılması gereken "
+"çağrıların listesini bir .CSV dosyası olarak içeaktarabilirsiniz."
 
 #. module: crm
 #: field:crm.segmentation.line,expr_operator:0
@@ -2917,7 +2950,7 @@ msgstr "Onaylandı"
 #. module: crm
 #: model:ir.actions.act_window,name:crm.act_oppor_stage_user
 msgid "Planned Revenue By User and Stage"
-msgstr ""
+msgstr "Kullanıcı ve Aşamaya göre Planlanan Gelir"
 
 #. module: crm
 #: view:crm.meeting:0
@@ -2947,7 +2980,7 @@ msgstr "Ayın günü"
 #. module: crm
 #: model:ir.actions.act_window,name:crm.act_my_oppor_stage
 msgid "Planned Revenue By Stage"
-msgstr ""
+msgstr "Aşamaya göre Planlanan Gelir."
 
 #. module: crm
 #: selection:crm.add.note,state:0 model:crm.case.stage,name:crm.stage_lead1
@@ -3054,7 +3087,7 @@ msgstr "Günlük"
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_stage_form_installer
 msgid "Review Sales Stages"
-msgstr ""
+msgstr "Satış Aşamalarını İncele"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_lead2
@@ -3277,7 +3310,7 @@ msgstr "Normal"
 #: code:addons/crm/wizard/crm_lead_to_opportunity.py:104
 #, python-format
 msgid "Closed/Cancelled Leads can not be converted into Opportunity"
-msgstr ""
+msgstr "Fırsata dönüştürülemeyen Kapalı/İptal edilmiş Adaylar"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_meeting_categ_action
@@ -3409,7 +3442,7 @@ msgstr "Sınıflandırma"
 #. module: crm
 #: view:crm.lead:0
 msgid "Log Call"
-msgstr ""
+msgstr "Çağrı Günlüğü"
 
 #. module: crm
 #: model:ir.model,name:crm.model_base_action_rule
@@ -3514,7 +3547,7 @@ msgstr "Kullanıcıya ve Takıma göre Fırsatlar"
 #. module: crm
 #: view:crm.phonecall:0
 msgid "Reset to Todo"
-msgstr ""
+msgstr "Yapılacaklara Sıfırla"
 
 #. module: crm
 #: field:crm.case.section,working_hours:0
@@ -3596,6 +3629,10 @@ msgid ""
 "partner. From the phone call form, you can trigger a request for another "
 "call, a meeting or an opportunity."
 msgstr ""
+"Bu araç, gelen çağrılara anında bağlanmanızı sağlar. Aldığınız her çağrı, "
+"bir paydaşa ait her kişiyi izlemek için paydaş formunda belirecektir. Çağrı "
+"formundan, diğer bir çağrıyı, bir toplantıyı ya da bir fırsatı "
+"başlatabilirsiniz."
 
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
@@ -3626,6 +3663,8 @@ msgid ""
 "channels that will be maintained at the creation of a document in the "
 "system. Some examples of channels can be: Website, Phone Call, Reseller, etc."
 msgstr ""
+"Adaylarınızın ve fırsatlarınızın nereden geldiğini, sistem içinde bir belge "
+"oluştururken sağlanacak özel kanallar oluşturarak izleyin."
 
 #. module: crm
 #: selection:crm.lead2opportunity.partner,name:0
@@ -4497,3 +4536,6 @@ msgstr "Habermektubu"
 
 #~ msgid "Schedule call"
 #~ msgstr "Görüşme Programla"
+
+#~ msgid "Assigned opportunities to"
+#~ msgstr "Fırsatların buna ata"
diff --git a/addons/crm/i18n/uk.po b/addons/crm/i18n/uk.po
index a9743b624e7..366cab96a76 100644
--- a/addons/crm/i18n/uk.po
+++ b/addons/crm/i18n/uk.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:59+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:06+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: crm
 #: view:crm.lead.report:0
diff --git a/addons/crm/i18n/vi.po b/addons/crm/i18n/vi.po
index 18002726457..eb7755483a5 100644
--- a/addons/crm/i18n/vi.po
+++ b/addons/crm/i18n/vi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:59+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:06+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: crm
 #: view:crm.lead.report:0
diff --git a/addons/crm/i18n/zh_CN.po b/addons/crm/i18n/zh_CN.po
index efa67733a64..94c5df29046 100644
--- a/addons/crm/i18n/zh_CN.po
+++ b/addons/crm/i18n/zh_CN.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:00+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:06+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: crm
 #: view:crm.lead.report:0
diff --git a/addons/crm/i18n/zh_TW.po b/addons/crm/i18n/zh_TW.po
index ad6407b4b9e..a56875dfe82 100644
--- a/addons/crm/i18n/zh_TW.po
+++ b/addons/crm/i18n/zh_TW.po
@@ -7,19 +7,19 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 01:37+0100\n"
-"PO-Revision-Date: 2011-09-27 07:26+0000\n"
+"PO-Revision-Date: 2012-08-30 10:41+0000\n"
 "Last-Translator: Walter Cheuk <wwycheuk@gmail.com>\n"
-"Language-Team: \n"
+"Language-Team: Cenoq Corp.\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:00+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-31 04:56+0000\n"
+"X-Generator: Launchpad (build 15887)\n"
 
 #. module: crm
 #: view:crm.lead.report:0
 msgid "# Leads"
-msgstr "潛在客戶數"
+msgstr "潛在客戶"
 
 #. module: crm
 #: view:crm.lead:0 selection:crm.lead,type:0 view:crm.lead.report:0
@@ -35,22 +35,22 @@ msgstr "需要服務"
 #. module: crm
 #: selection:crm.meeting,rrule_type:0
 msgid "Monthly"
-msgstr "每月"
+msgstr "月度"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_case_stage
 msgid "Stage of case"
-msgstr "個案階段"
+msgstr "業務階段"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Visibility"
-msgstr "可見性"
+msgstr "可視等級"
 
 #. module: crm
 #: field:crm.lead,title:0
 msgid "Title"
-msgstr "稱謂"
+msgstr "標題"
 
 #. module: crm
 #: field:crm.meeting,show_as:0
@@ -60,17 +60,17 @@ msgstr "顯示為"
 #. module: crm
 #: field:crm.meeting,day:0 selection:crm.meeting,select1:0
 msgid "Date of month"
-msgstr "月份日期"
+msgstr "每月的指定日期"
 
 #. module: crm
 #: view:crm.lead:0 view:crm.phonecall:0
 msgid "Today"
-msgstr "今日"
+msgstr "今天"
 
 #. module: crm
 #: view:crm.lead2opportunity.partner:0 view:crm.merge.opportunity:0
 msgid "Select Opportunities"
-msgstr "選擇機會"
+msgstr "選擇商機"
 
 #. module: crm
 #: view:crm.meeting:0 view:crm.phonecall2opportunity:0
@@ -81,18 +81,18 @@ msgstr " "
 #. module: crm
 #: view:crm.lead.report:0 field:crm.phonecall.report,delay_close:0
 msgid "Delay to close"
-msgstr "關閉延遲時間"
+msgstr "延遲關閉"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Previous Stage"
-msgstr "上階段"
+msgstr "前一階段"
 
 #. module: crm
 #: code:addons/crm/wizard/crm_add_note.py:28
 #, python-format
 msgid "Can not add note!"
-msgstr "無法添加記事！"
+msgstr "無法添加備註!"
 
 #. module: crm
 #: field:crm.case.stage,name:0
@@ -102,7 +102,7 @@ msgstr "階段名稱"
 #. module: crm
 #: model:ir.model,name:crm.model_crm_lead_report
 msgid "CRM Lead Analysis"
-msgstr ""
+msgstr "CRM 潛在客戶分析"
 
 #. module: crm
 #: view:crm.lead.report:0 view:crm.phonecall.report:0
@@ -113,34 +113,34 @@ msgstr "日"
 #. module: crm
 #: sql_constraint:crm.case.section:0
 msgid "The code of the sales team must be unique !"
-msgstr "業務團隊代號不能重覆！"
+msgstr "銷售團隊編碼必須唯一！"
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:553
 #, python-format
 msgid "Lead '%s' has been converted to an opportunity."
-msgstr "潛在客戶「%s」已轉為機會。"
+msgstr "潛在客戶'%s'已轉化為商機"
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:294
 #, python-format
 msgid "The lead '%s' has been closed."
-msgstr "業務機會「%s」已關閉。"
+msgstr "潛在客戶 '%s' 已關閉."
 
 #. module: crm
 #: view:crm.lead.report:0
 msgid "Exp. Closing"
-msgstr ""
+msgstr "預計成交日期"
 
 #. module: crm
 #: selection:crm.meeting,rrule_type:0
 msgid "Yearly"
-msgstr "每年"
+msgstr "年度"
 
 #. module: crm
 #: help:crm.lead.report,creation_day:0
 msgid "Creation day"
-msgstr ""
+msgstr "報告日期"
 
 #. module: crm
 #: field:crm.segmentation.line,name:0
@@ -150,29 +150,29 @@ msgstr "規則名稱"
 #. module: crm
 #: view:crm.case.section:0
 msgid "Configuration"
-msgstr ""
+msgstr "設置"
 
 #. module: crm
 #: view:crm.case.resource.type:0 view:crm.lead:0 field:crm.lead,type_id:0
 #: view:crm.lead.report:0 field:crm.lead.report,type_id:0
 #: model:ir.model,name:crm.model_crm_case_resource_type
 msgid "Campaign"
-msgstr "推廣"
+msgstr "行銷活動"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Search Opportunities"
-msgstr "搜尋機會"
+msgstr "搜尋商機"
 
 #. module: crm
 #: help:crm.lead.report,deadline_month:0
 msgid "Expected closing month"
-msgstr ""
+msgstr "預計成交月份"
 
 #. module: crm
 #: view:crm.lead2opportunity.partner.mass:0
 msgid "Assigned Opportunities to"
-msgstr ""
+msgstr "分配的機會"
 
 #. module: crm
 #: view:crm.lead:0 field:crm.lead,partner_id:0 view:crm.lead.report:0
@@ -190,41 +190,41 @@ msgstr ""
 #: model:ir.model,name:crm.model_res_partner
 #: model:process.node,name:crm.process_node_partner0
 msgid "Partner"
-msgstr "伙伴"
+msgstr "業務夥伴"
 
 #. module: crm
 #: field:crm.meeting,organizer:0 field:crm.meeting,organizer_id:0
 msgid "Organizer"
-msgstr "組織者"
+msgstr "召集人"
 
 #. module: crm
 #: view:crm.phonecall:0
 #: model:ir.actions.act_window,name:crm.phonecall_to_phonecall_act
 msgid "Schedule Other Call"
-msgstr "安排其他致電"
+msgstr "安排其它電訪"
 
 #. module: crm
 #: code:addons/crm/crm_phonecall.py:216
 #: model:crm.case.categ,name:crm.categ_meet3 view:crm.phonecall:0
 #, python-format
 msgid "Phone Call"
-msgstr "致電"
+msgstr "電訪"
 
 #. module: crm
 #: field:crm.lead,optout:0
 msgid "Opt-Out"
-msgstr ""
+msgstr "不參加"
 
 #. module: crm
 #: field:crm.meeting,end_type:0
 msgid "Recurrence termination"
-msgstr ""
+msgstr "反覆終止"
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:323
 #, python-format
 msgid "The opportunity '%s' has been marked as lost."
-msgstr "「%s」機會已標為丟失。"
+msgstr "商機 '%s' 已失."
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.action_report_crm_lead
@@ -234,26 +234,27 @@ msgid ""
 "sort out your leads analysis by different groups to get accurate grained "
 "analysis."
 msgstr ""
+"潛在客戶分析允許你檢查CRM的相關訊息，檢查耽擱的處理，送出及回覆的郵件數量。你能整理出對不同群體的潛在客戶分析去獲得更準確的細粒度分析。"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Send New Email"
-msgstr "發送新電郵"
+msgstr "發送新的電子郵件"
 
 #. module: crm
 #: field:crm.segmentation,segmentation_line:0
 msgid "Criteria"
-msgstr "準則"
+msgstr "條件"
 
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Excluded Answers :"
-msgstr ""
+msgstr "已排除的答案 :"
 
 #. module: crm
 #: field:crm.case.stage,section_ids:0
 msgid "Sections"
-msgstr ""
+msgstr "分類"
 
 #. module: crm
 #: view:crm.merge.opportunity:0
@@ -270,13 +271,13 @@ msgstr "潛在客戶分析"
 #. module: crm
 #: selection:crm.meeting,class:0
 msgid "Public"
-msgstr ""
+msgstr "公開"
 
 #. 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 "行銷活動"
 
 #. module: crm
 #: view:crm.lead:0 field:crm.lead,state:0 view:crm.lead.report:0
@@ -284,7 +285,7 @@ msgstr "推廣活動"
 #: field:crm.phonecall,state:0 view:crm.phonecall.report:0
 #: field:crm.phonecall.report,state:0
 msgid "State"
-msgstr ""
+msgstr "狀態"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_lead_categ_action
@@ -296,30 +297,30 @@ msgstr "分類"
 #. module: crm
 #: view:crm.lead:0
 msgid "Dates"
-msgstr ""
+msgstr "日期"
 
 #. module: crm
 #: help:crm.lead,optout:0
 msgid ""
 "If opt-out is checked, this contact has refused to receive emails or "
 "unsubscribed to a campaign."
-msgstr ""
+msgstr "如果勾選不參加，代表此聯絡人拒絕收到郵件或不參加行銷活動。"
 
 #. module: crm
 #: model:process.transition,name:crm.process_transition_leadpartner0
 msgid "Prospect Partner"
-msgstr "展望伙伴"
+msgstr "潛在業務夥伴"
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:735
 #, python-format
 msgid "No Subject"
-msgstr ""
+msgstr "無主題"
 
 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_lead6
 msgid "Google Adwords 2"
-msgstr ""
+msgstr "Google Adwords 2"
 
 #. module: crm
 #: selection:crm.lead2opportunity.partner,action:0
@@ -327,7 +328,7 @@ msgstr ""
 #: selection:crm.lead2partner,action:0
 #: selection:crm.phonecall2partner,action:0
 msgid "Link to an existing partner"
-msgstr "連結至既有伙伴"
+msgstr "連結到現有的業務夥伴"
 
 #. module: crm
 #: view:crm.lead:0 field:crm.lead,contact_id:0 view:crm.meeting:0
@@ -335,58 +336,58 @@ msgstr "連結至既有伙伴"
 #: field:crm.phonecall,partner_contact:0
 #: field:crm.phonecall2phonecall,contact_name:0
 msgid "Contact"
-msgstr "聯絡人"
+msgstr "聯絡方式"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Delegate"
-msgstr "委託"
+msgstr "委派"
 
 #. module: crm
 #: selection:crm.segmentation.line,expr_operator:0
 msgid "="
-msgstr ""
+msgstr "="
 
 #. module: crm
 #: field:base.action.rule,regex_history:0
 msgid "Regular Expression on Case History"
-msgstr ""
+msgstr "案子歷史紀錄的正規表示式"
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:274
 #, python-format
 msgid "The lead '%s' has been opened."
-msgstr ""
+msgstr "這潛在客戶'%s'已經開啟"
 
 #. module: crm
 #: model:process.transition,name:crm.process_transition_opportunitymeeting0
 msgid "Opportunity Meeting"
-msgstr "商機會談"
+msgstr "商機會議"
 
 #. 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 "到期天數"
 
 #. module: crm
 #: model:process.node,note:crm.process_node_opportunities0
 msgid "When a real project/opportunity is detected"
-msgstr "當偵測到真正專案/機會"
+msgstr "當發現一個明確的專案/商機"
 
 #. module: crm
 #: view:res.partner:0 field:res.partner,opportunity_ids:0
 msgid "Leads and Opportunities"
-msgstr "潛在客戶及機會"
+msgstr "潛在客戶與商機"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Communication"
-msgstr "通訊"
+msgstr "溝通"
 
 #. module: crm
 #: selection:crm.meeting,week_list:0
 msgid "Tuesday"
-msgstr "星期二"
+msgstr "週二"
 
 #. module: crm
 #: field:crm.lead,write_date:0
@@ -396,7 +397,7 @@ msgstr "更新日期"
 #. module: crm
 #: field:crm.case.section,user_id:0
 msgid "Team Leader"
-msgstr ""
+msgstr "團隊主管"
 
 #. module: crm
 #: field:crm.lead2opportunity.partner,name:0
@@ -409,7 +410,7 @@ msgstr "選擇動作"
 msgid ""
 "This percentage depicts the default/average probability of the Case for this "
 "stage to be a success"
-msgstr ""
+msgstr "此預設百分比描述業務在此階段的平均成功概率"
 
 #. module: crm
 #: field:base.action.rule,trg_categ_id:0 view:crm.lead:0
@@ -424,17 +425,17 @@ msgstr "分類"
 #. module: crm
 #: view:crm.lead:0
 msgid "Opportunity / Customer"
-msgstr ""
+msgstr "商機/客戶"
 
 #. module: crm
 #: view:crm.lead.report:0
 msgid "#Opportunities"
-msgstr "#機會"
+msgstr "商機數"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Privacy"
-msgstr ""
+msgstr "隱私"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_case_stage_form_installer
@@ -446,50 +447,52 @@ msgid ""
 "Revenue\" and the \"Expected Closing Date.\" You should also have a look at "
 "the tooltip of the field \"Change Probability Automatically\"."
 msgstr ""
+"階段能讓業務人員簡單地追蹤某個商機在銷售循環中的位置。要高效管理您的銷售管道，定義下一步跳轉的條件很重要。例如：要設置商機為「已驗證」，需先輸入「預期收入"
+"」和「預計結束日期」。你可以看一下「自動修改成功率」欄位的幫助。"
 
 #. module: crm
 #: view:crm.lead.report:0
 msgid "Opportunity Analysis"
-msgstr "機會分析"
+msgstr "商機分析"
 
 #. module: crm
 #: help:crm.meeting,location:0
 msgid "Location of Event"
-msgstr "事件地點"
+msgstr "地點"
 
 #. module: crm
 #: field:crm.meeting,rrule:0
 msgid "Recurrent Rule"
-msgstr ""
+msgstr "循環性規則"
 
 #. module: crm
 #: model:process.transition,note:crm.process_transition_opportunitymeeting0
 msgid "Normal or phone meeting for opportunity"
-msgstr "與機會的正常或電話會談"
+msgstr "商機的正常會議或電話會議"
 
 #. module: crm
 #: view:crm.case.section:0
 msgid "Mail Gateway"
-msgstr ""
+msgstr "郵件閘道"
 
 #. module: crm
 #: model:process.node,note:crm.process_node_leads0
 msgid "Very first contact with new prospect"
-msgstr ""
+msgstr "第一次與新的潛在客戶接觸"
 
 #. module: crm
 #: view:crm.lead2opportunity.partner:0 view:crm.partner2opportunity:0
 #: model:ir.actions.act_window,name:crm.action_view_crm_partner2opportunity
 #: model:ir.actions.act_window,name:crm.crm_partner2opportunity
 msgid "Create Opportunity"
-msgstr "建立機會"
+msgstr "建立商機"
 
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
 #: selection:crm.lead.report,deadline_month:0
 #: selection:crm.meeting,month_list:0 selection:crm.phonecall.report,month:0
 msgid "August"
-msgstr "八月"
+msgstr "8月"
 
 #. module: crm
 #: code:addons/crm/crm.py:433 view:crm.lead:0 view:res.partner:0
@@ -500,24 +503,24 @@ msgstr "提升"
 #. module: crm
 #: view:crm.lead:0
 msgid "Mailings"
-msgstr ""
+msgstr "郵件"
 
 #. module: crm
 #: view:crm.phonecall:0
 msgid "To Do"
-msgstr ""
+msgstr "待辦事項"
 
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
 #: selection:crm.lead.report,deadline_month:0
 #: selection:crm.meeting,month_list:0 selection:crm.phonecall.report,month:0
 msgid "June"
-msgstr "六月"
+msgstr "6月"
 
 #. module: crm
 #: selection:crm.segmentation,state:0
 msgid "Not Running"
-msgstr "未運作"
+msgstr "未執行"
 
 #. module: crm
 #: field:crm.lead,email:0
@@ -527,51 +530,51 @@ msgstr "電子郵件"
 #. module: crm
 #: view:crm.phonecall:0
 msgid "Phonecalls during last 7 days"
-msgstr ""
+msgstr "過去7天的通話記錄"
 
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
 #: selection:crm.lead.report,deadline_month:0
 #: selection:crm.meeting,month_list:0 selection:crm.phonecall.report,month:0
 msgid "October"
-msgstr "十月"
+msgstr "10月"
 
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Included Answers :"
-msgstr ""
+msgstr "包括的答案 :"
 
 #. module: crm
 #: help:crm.meeting,email_from:0 help:crm.phonecall,email_from:0
 msgid "These people will receive email."
-msgstr ""
+msgstr "這些人將收到電子郵件。"
 
 #. module: crm
 #: view:crm.meeting:0 field:crm.meeting,name:0
 msgid "Summary"
-msgstr ""
+msgstr "摘要"
 
 #. module: crm
 #: view:crm.segmentation:0
 msgid "State of Mind Computation"
-msgstr "滿意度調查"
+msgstr "滿意度計算"
 
 #. module: crm
 #: view:crm.case.categ:0
 msgid "Case Category"
-msgstr "案例分類"
+msgstr "業務分類"
 
 #. module: crm
 #: help:crm.segmentation,som_interval_default:0
 msgid ""
 "Default state of mind for period preceeding the 'Max Interval' computation. "
 "This is the starting state of mind by default if the partner has no event."
-msgstr ""
+msgstr "預設的開始滿意度以'最大間隔'計算. 如果業務夥伴沒有事件這是預設的開始滿意度"
 
 #. module: crm
 #: field:crm.lead,partner_address_name:0
 msgid "Partner Contact Name"
-msgstr ""
+msgstr "聯絡人姓名"
 
 #. module: crm
 #: selection:crm.meeting,end_type:0
@@ -581,52 +584,52 @@ msgstr "結束日期"
 #. module: crm
 #: view:crm.opportunity2phonecall:0 view:crm.phonecall2phonecall:0
 msgid "Schedule/Log a Call"
-msgstr ""
+msgstr "附表/撥打電話"
 
 #. module: crm
 #: constraint:base.action.rule:0
 msgid "Error: The mail is not well formated"
-msgstr ""
+msgstr "錯誤:郵件沒有正確的格式"
 
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Profiling Options"
-msgstr ""
+msgstr "剖面選項"
 
 #. module: crm
 #: view:crm.phonecall.report:0
 msgid "#Phone calls"
-msgstr "致電數"
+msgstr "電訪數"
 
 #. module: crm
 #: help:crm.segmentation,categ_id:0
 msgid ""
 "The partner category that will be added to partners that match the "
 "segmentation criterions after computation."
-msgstr ""
+msgstr "該業務夥伴分類將加到計算符合業務夥伴的業務夥伴細分規則中"
 
 #. module: crm
 #: code:addons/crm/crm_meeting.py:93
 #, python-format
 msgid "The meeting '%s' has been confirmed."
-msgstr ""
+msgstr "此會議'%s'已確認"
 
 #. module: crm
 #: selection:crm.add.note,state:0 selection:crm.lead,state:0
 msgid "In Progress"
-msgstr ""
+msgstr "進行中"
 
 #. module: crm
 #: help:crm.case.section,reply_to:0
 msgid ""
 "The email address put in the 'Reply-To' of all emails sent by OpenERP about "
 "cases in this sales team"
-msgstr ""
+msgstr "'回覆到'電子郵件地址填入該業務的團隊在系統裡設定的發送所有郵件的地址"
 
 #. module: crm
 #: field:crm.lead.report,creation_month:0
 msgid "Creation Month"
-msgstr ""
+msgstr "建立月份"
 
 #. module: crm
 #: field:crm.case.section,resource_calendar_id:0
@@ -637,29 +640,29 @@ msgstr "工作時間"
 #. module: crm
 #: view:crm.segmentation.line:0
 msgid "Partner Segmentation Lines"
-msgstr "伙伴區間行"
+msgstr "業務夥伴細分明細"
 
 #. module: crm
 #: view:crm.lead:0 view:crm.meeting:0
 msgid "Details"
-msgstr "詳情"
+msgstr "詳細資訊"
 
 #. module: crm
 #: help:crm.meeting,exrule:0
 msgid ""
 "Defines a rule or repeating pattern of time to exclude from the recurring "
 "rule."
-msgstr ""
+msgstr "定義一個規則或時間重複模式以排除循環性規則"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Leads Form"
-msgstr ""
+msgstr "潛在客戶表單"
 
 #. module: crm
 #: view:crm.segmentation:0 model:ir.model,name:crm.model_crm_segmentation
 msgid "Partner Segmentation"
-msgstr "伙伴區間"
+msgstr "業務夥伴細分"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_case_categ_meet
@@ -670,41 +673,43 @@ msgid ""
 "using the caldav interface.\n"
 "        "
 msgstr ""
+"銷售團隊共享會議日程表，並且和其它應用程序完整整合，比如員工的節假日、商機。你也可以通過caldav介面把會議日程與你的行動裝置進行同步。\n"
+"        "
 
 #. module: crm
 #: field:crm.lead2opportunity.partner.mass,user_ids:0
 msgid "Salesmans"
-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
 msgid "The name of the segmentation."
-msgstr "區間名稱"
+msgstr "細分的名稱"
 
 #. module: crm
 #: field:crm.case.stage,probability:0 field:crm.lead,probability:0
 msgid "Probability (%)"
-msgstr "概率 (%)"
+msgstr "概率(%)"
 
 #. module: crm
 #: field:crm.lead,company_currency:0
 msgid "Company Currency"
-msgstr ""
+msgstr "公司貨幣"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Leads Generation"
-msgstr ""
+msgstr "產生潛在客戶"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_case_section_view_form_installer
@@ -715,6 +720,8 @@ msgid ""
 "opportunities, you can assign the following stage to the team: Territory, "
 "Qualified, Qualified Sponsors, Proposition, Negociaton, Won/Lost."
 msgstr ""
+"用銷售團隊來劃分你的銷售部門，並把使用者分配到銷售團隊。你也可以給每個團隊定義銷售階段。例如，你用顧問式銷售技巧追蹤你的商機，你可以給銷售團隊分配這樣幾個"
+"階段：切入、已驗證、確定決策人、提案、談判、成交/丟單。"
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:718 view:crm.lead:0 selection:crm.lead,type:0
@@ -722,12 +729,12 @@ msgstr ""
 #: field:crm.meeting,opportunity_id:0
 #, python-format
 msgid "Opportunity"
-msgstr "機會"
+msgstr "商機"
 
 #. module: crm
 #: view:crm.lead.report:0
 msgid "Leads/Opportunities created in last month"
-msgstr ""
+msgstr "潛在客戶/上月商機"
 
 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_lead7
@@ -742,12 +749,12 @@ msgstr "停止處理"
 #. module: crm
 #: view:crm.lead.report:0 view:crm.phonecall.report:0
 msgid "Month-1"
-msgstr ""
+msgstr "上月"
 
 #. module: crm
 #: view:crm.phonecall:0
 msgid "Search Phonecalls"
-msgstr "搜尋致電"
+msgstr "搜尋電訪"
 
 #. module: crm
 #: view:crm.lead2partner:0 view:crm.phonecall2partner:0
@@ -757,17 +764,17 @@ msgstr "繼續"
 #. module: crm
 #: field:crm.segmentation,som_interval:0
 msgid "Days per Period"
-msgstr ""
+msgstr "每個週期的天數"
 
 #. module: crm
 #: field:crm.meeting,byday:0
 msgid "By day"
-msgstr "每日"
+msgstr "按天"
 
 #. module: crm
 #: field:base.action.rule,act_section_id:0
 msgid "Set Team to"
-msgstr "將團隊設為"
+msgstr "設定團隊"
 
 #. module: crm
 #: view:calendar.attendee:0 field:calendar.attendee,categ_id:0
@@ -777,7 +784,7 @@ msgstr "事件類型"
 #. module: crm
 #: field:crm.segmentation,exclusif:0
 msgid "Exclusive"
-msgstr "选择性排除"
+msgstr "唯一的"
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:832
@@ -785,18 +792,18 @@ msgstr "选择性排除"
 msgid ""
 "You cannot delete lead '%s'; it must be in state 'Draft' to be deleted. You "
 "should better cancel it, instead of deleting it."
-msgstr ""
+msgstr "你不能刪除潛在客戶 '%s'；只有草稿狀態的潛在客戶才能刪除。你最好不要刪除，而是取消它。"
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:451
 #, python-format
 msgid "From %s : %s"
-msgstr ""
+msgstr "發自: %s:%s"
 
 #. module: crm
 #: field:crm.lead.report,creation_year:0
 msgid "Creation Year"
-msgstr ""
+msgstr "報告年份"
 
 #. module: crm
 #: field:crm.lead.report,create_date:0
@@ -807,49 +814,49 @@ msgstr "建立日期"
 #. module: crm
 #: field:crm.lead,ref2:0
 msgid "Reference 2"
-msgstr "參照 2"
+msgstr "參考2"
 
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Sales Purchase"
-msgstr "業務採購"
+msgstr "銷售採購"
 
 #. module: crm
 #: help:crm.case.section,resource_calendar_id:0
 msgid "Used to compute open days"
-msgstr ""
+msgstr "用於計算開放天數"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Schedule Meeting"
-msgstr "安排會議"
+msgstr "會議計劃"
 
 #. module: crm
 #: view:crm.case.stage:0 field:crm.case.stage,requirements:0
 msgid "Requirements"
-msgstr ""
+msgstr "必備條件"
 
 #. module: crm
 #: help:crm.meeting,exdate:0
 msgid ""
 "This property defines the list of date/time exceptions for a recurring "
 "calendar component."
-msgstr ""
+msgstr "這屬性定義循環日程的日期/時間異常列表。"
 
 #. module: crm
 #: view:crm.phonecall2opportunity:0
 msgid "Convert To Opportunity "
-msgstr "轉變為機會 "
+msgstr "轉換為商機 "
 
 #. module: crm
 #: help:crm.meeting,recurrency:0
 msgid "Recurrent Meeting"
-msgstr ""
+msgstr "循環性會議"
 
 #. module: crm
 #: view:crm.phonecall:0
 msgid "Unassigned Phonecalls"
-msgstr ""
+msgstr "未分配的電訪"
 
 #. module: crm
 #: view:crm.lead:0 field:crm.lead2opportunity.partner,opportunity_ids:0
@@ -859,18 +866,18 @@ msgstr ""
 #: model:ir.ui.menu,name:crm.menu_crm_case_opp
 #: model:process.node,name:crm.process_node_opportunities0
 msgid "Opportunities"
-msgstr "機會"
+msgstr "商機列表"
 
 #. module: crm
 #: field:crm.segmentation,categ_id:0
 msgid "Partner Category"
-msgstr "伙伴分類"
+msgstr "業務夥伴分類"
 
 #. module: crm
 #: view:crm.add.note:0
 #: model:ir.actions.act_window,name:crm.action_crm_add_note
 msgid "Add Note"
-msgstr "添加記事"
+msgstr "添加備註"
 
 #. module: crm
 #: field:crm.lead,is_supplier_add:0
@@ -880,24 +887,24 @@ msgstr "供應商"
 #. module: crm
 #: view:crm.lead:0
 msgid "Mark Won"
-msgstr "標為勝出"
+msgstr "標記為成交"
 
 #. module: crm
 #: selection:crm.segmentation.line,expr_name:0
 msgid "Purchase Amount"
-msgstr "採購總額"
+msgstr "採購金額"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Mark Lost"
-msgstr "標為失敗"
+msgstr "標記為已丟單"
 
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
 #: selection:crm.lead.report,deadline_month:0
 #: selection:crm.meeting,month_list:0 selection:crm.phonecall.report,month:0
 msgid "March"
-msgstr "三月"
+msgstr "3月"
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:491
@@ -910,62 +917,62 @@ msgstr "警告！"
 #. module: crm
 #: view:crm.phonecall.report:0
 msgid "Phone calls made in current year"
-msgstr ""
+msgstr "本年的電訪"
 
 #. module: crm
 #: field:crm.lead,day_open:0
 msgid "Days to Open"
-msgstr ""
+msgstr "開啟天數"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Show Time as"
-msgstr ""
+msgstr "將時間顯示為"
 
 #. module: crm
 #: view:crm.phonecall2partner:0
 msgid "Create Partner"
-msgstr "建立伙伴"
+msgstr "建立業務夥伴"
 
 #. module: crm
 #: selection:crm.segmentation.line,expr_operator:0
 msgid "<"
-msgstr ""
+msgstr "<"
 
 #. module: crm
 #: field:crm.lead,mobile:0 field:crm.phonecall,partner_mobile:0
 msgid "Mobile"
-msgstr "手機"
+msgstr "行動裝置"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Next Stage"
-msgstr "下階段"
+msgstr "下一階段"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "My Meetings"
-msgstr ""
+msgstr "我的會議"
 
 #. module: crm
 #: view:crm.phonecall:0
 msgid "Todays's Phonecalls"
-msgstr ""
+msgstr "今日電訪記錄"
 
 #. module: crm
 #: view:board.board:0
 msgid "Statistics Dashboard"
-msgstr ""
+msgstr "統計控制台"
 
 #. module: crm
 #: field:crm.lead,ref:0
 msgid "Reference"
-msgstr "參照"
+msgstr "參考"
 
 #. module: crm
 #: field:crm.lead,optin:0
 msgid "Opt-In"
-msgstr ""
+msgstr "參加"
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:814 code:addons/crm/crm_phonecall.py:296
@@ -977,61 +984,61 @@ msgstr ""
 #: field:res.partner,meeting_ids:0
 #, python-format
 msgid "Meetings"
-msgstr ""
+msgstr "會議"
 
 #. module: crm
 #: field:crm.lead,date_action_next:0 field:crm.lead,title_action:0
 #: field:crm.meeting,date_action_next:0 field:crm.phonecall,date_action_next:0
 msgid "Next Action"
-msgstr "下個動作"
+msgstr "下一動作"
 
 #. module: crm
 #: field:crm.meeting,end_date:0
 msgid "Repeat Until"
-msgstr "重覆直至"
+msgstr "重複直到"
 
 #. module: crm
 #: field:crm.meeting,date_deadline:0
 msgid "Deadline"
-msgstr "截止日期"
+msgstr "最後期限"
 
 #. module: crm
 #: help:crm.meeting,active:0
 msgid ""
 "If the active field is set to          true, it will allow you to hide the "
 "event alarm information without removing it."
-msgstr ""
+msgstr "如果啟用欄位設為真，他將允許你隱藏事件的警告訊息而不需將其刪除。"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Change Color"
-msgstr ""
+msgstr "改變顏色"
 
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Partner Segmentations"
-msgstr "伙伴區間"
+msgstr "業務夥伴細分"
 
 #. module: crm
 #: field:crm.meeting,user_id:0 view:crm.phonecall:0
 #: field:crm.phonecall,user_id:0 view:res.partner:0
 msgid "Responsible"
-msgstr ""
+msgstr "負責人"
 
 #. module: crm
 #: view:crm.lead.report:0
 msgid "Show only opportunity"
-msgstr ""
+msgstr "僅顯示商機"
 
 #. module: crm
 #: view:res.partner:0
 msgid "Previous"
-msgstr ""
+msgstr "上一個"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "New Leads"
-msgstr ""
+msgstr "建立潛在客戶"
 
 #. module: crm
 #: view:crm.lead:0
@@ -1041,22 +1048,22 @@ msgstr "統計"
 #. module: crm
 #: view:crm.meeting:0
 msgid "From"
-msgstr "自"
+msgstr "來自"
 
 #. module: crm
 #: view:crm.lead2opportunity.partner.mass:0
 msgid "Convert into Opportunities"
-msgstr ""
+msgstr "轉成商機"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Show Sales Team"
-msgstr ""
+msgstr "顯示銷售團隊"
 
 #. module: crm
 #: view:res.partner:0
 msgid "Next"
-msgstr ""
+msgstr "下一個"
 
 #. module: crm
 #: view:crm.lead:0
@@ -1066,17 +1073,17 @@ msgstr "階段："
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_lead5 view:crm.lead:0
 msgid "Won"
-msgstr "勝出"
+msgstr "成交"
 
 #. module: crm
 #: field:crm.lead.report,delay_expected:0
 msgid "Overpassed Deadline"
-msgstr ""
+msgstr "超過截止日期"
 
 #. module: crm
 #: model:crm.case.section,name:crm.section_sales_department
 msgid "Sales Department"
-msgstr "業務部"
+msgstr "銷售部"
 
 #. module: crm
 #: selection:crm.segmentation.line,expr_name:0
@@ -1092,12 +1099,12 @@ msgstr "類型"
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Compute Segmentation"
-msgstr "計算區間"
+msgstr "計算細分"
 
 #. module: crm
 #: field:crm.case.stage,on_change:0
 msgid "Change Probability Automatically"
-msgstr "自動變更概率"
+msgstr "自動修改概率"
 
 #. module: crm
 #: field:crm.lead,create_date:0 field:crm.meeting,create_date:0
@@ -1109,32 +1116,32 @@ msgstr "建立日期"
 #. module: crm
 #: view:board.board:0
 msgid "My Opportunities"
-msgstr ""
+msgstr "我的商機"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor5
 msgid "Need a Website Design"
-msgstr ""
+msgstr "需要網站設計"
 
 #. module: crm
 #: view:crm.phonecall.report:0
 msgid "Year of call"
-msgstr ""
+msgstr "電訪年份"
 
 #. module: crm
 #: field:crm.meeting,recurrent_uid:0
 msgid "Recurrent ID"
-msgstr ""
+msgstr "循環ID"
 
 #. module: crm
 #: view:crm.lead:0 view:crm.meeting:0 view:res.partner:0
 msgid "Subject"
-msgstr ""
+msgstr "主題"
 
 #. module: crm
 #: field:crm.meeting,tu:0
 msgid "Tue"
-msgstr "二"
+msgstr "週二"
 
 #. module: crm
 #: view:crm.case.stage:0 view:crm.lead:0 field:crm.lead,stage_id:0
@@ -1145,42 +1152,42 @@ msgstr "階段"
 #. module: crm
 #: view:crm.lead:0
 msgid "History Information"
-msgstr ""
+msgstr "歷史資訊"
 
 #. module: crm
 #: field:base.action.rule,act_mail_to_partner:0
 msgid "Mail to Partner"
-msgstr ""
+msgstr "向業務夥伴發送郵件"
 
 #. module: crm
 #: view:crm.opportunity2phonecall:0 view:crm.phonecall2phonecall:0
 msgid "Call Details"
-msgstr ""
+msgstr "通話詳情"
 
 #. module: crm
 #: field:crm.meeting,class:0
 msgid "Mark as"
-msgstr "標為"
+msgstr "標記為"
 
 #. module: crm
 #: view:crm.opportunity2phonecall:0 view:crm.phonecall2phonecall:0
 msgid "Log call"
-msgstr ""
+msgstr "記錄通話"
 
 #. module: crm
 #: help:crm.meeting,rrule_type:0
 msgid "Let the event automatically repeat at that interval"
-msgstr ""
+msgstr "讓事件在該時間間隔自動重複"
 
 #. module: crm
 #: view:base.action.rule:0
 msgid "Condition Case Fields"
-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 field:crm.case.section,stage_ids:0
@@ -1203,119 +1210,119 @@ msgstr "預期收益"
 msgid ""
 "Create specific phone call categories to better define the type of calls "
 "tracked in the system."
-msgstr ""
+msgstr "在系統中建立指定的電訪分類以方便定義電訪追蹤類型"
 
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
 #: selection:crm.lead.report,deadline_month:0
 #: selection:crm.meeting,month_list:0 selection:crm.phonecall.report,month:0
 msgid "September"
-msgstr "九月"
+msgstr "9月"
 
 #. module: crm
 #: field:crm.segmentation,partner_id:0
 msgid "Max Partner ID processed"
-msgstr "已處理最大伙伴ID"
+msgstr "處理的最大業務夥伴ID"
 
 #. module: crm
 #: help:crm.case.stage,on_change:0
 msgid ""
 "Setting this stage will change the probability automatically on the "
 "opportunity."
-msgstr ""
+msgstr "設定為這個階段，會自動改變商機的成功概率"
 
 #. 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 "電訪分析"
 
 #. 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
 #: field:crm.partner2opportunity,name:0 field:crm.phonecall2opportunity,name:0
 msgid "Opportunity 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
 msgid ""
 "If the active field is set to true, it will allow you to hide the sales team "
 "without removing it."
-msgstr ""
+msgstr "如果啟用欄位設為真，它將允許你隱藏銷售團隊而不需要刪除它。"
 
 #. module: crm
 #: field:crm.lead,street2:0
 msgid "Street2"
-msgstr "街道2"
+msgstr "街道 2"
 
 #. module: crm
 #: help:crm.case.stage,case_default:0
 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 ""
+msgstr "如果你勾選了這裡，這個階段會作為每個銷售團隊的預設階段。對已有的銷售團隊無效。"
 
 #. module: crm
 #: field:crm.meeting,fr:0
 msgid "Fri"
-msgstr "五"
+msgstr "週五"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_lead
 msgid "crm.lead"
-msgstr ""
+msgstr "crm.lead"
 
 #. module: crm
 #: field:crm.meeting,write_date:0
 msgid "Write Date"
-msgstr ""
+msgstr "寫入日期"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "End of Recurrency"
-msgstr ""
+msgstr "停止重覆"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Reminder"
-msgstr "提示"
+msgstr "提醒"
 
 #. module: crm
 #: help:crm.segmentation,sales_purchase_active:0
 msgid ""
 "Check if you want to use this tab as part of the segmentation rule. If not "
 "checked, the criteria beneath will be ignored"
-msgstr ""
+msgstr "勾選此項, 如果你要使用此標籤上的細分規則. 如果不選下面的條件將被忽略"
 
 #. module: crm
 #: help:crm.meeting,alarm_id:0
 msgid "Set an alarm at this time, before the event occurs"
-msgstr ""
+msgstr "設置此時為事件發生前的提醒時間"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_categ_phone_create_partner
 msgid "Schedule a Call"
-msgstr ""
+msgstr "安排電訪"
 
 #. module: crm
 #: view:crm.lead2partner:0 view:crm.phonecall:0 view:crm.phonecall2partner:0
@@ -1323,7 +1330,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:crm.action_crm_lead2partner
 #: model:ir.actions.act_window,name:crm.action_crm_phonecall2partner
 msgid "Create a Partner"
-msgstr ""
+msgstr "建立業務夥伴"
 
 #. module: crm
 #: field:crm.segmentation,state:0
@@ -1341,32 +1348,36 @@ msgid ""
 "       \n"
 "If the call needs to be done then the state is set to 'Not Held'."
 msgstr ""
+"新建的電訪是「待辦」狀態。\n"
+"正在撥打的電訪是「開啟」狀態。\n"
+"打完了的電話是「已撥」狀態。\n"
+"還沒打的電話是「未撥」狀態。"
 
 #. module: crm
 #: selection:crm.meeting,week_list:0
 msgid "Monday"
-msgstr ""
+msgstr "週一"
 
 #. module: crm
 #: field:crm.lead,day_close:0
 msgid "Days to Close"
-msgstr ""
+msgstr "結束日期"
 
 #. module: crm
 #: field:crm.case.section,complete_name:0
 msgid "unknown"
-msgstr ""
+msgstr "未知"
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:296
 #, python-format
 msgid "The case '%s' has been closed."
-msgstr ""
+msgstr "這業務'%s'已結束"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_partner2opportunity
 msgid "Partner To Opportunity"
-msgstr ""
+msgstr "業務夥伴的商機"
 
 #. module: crm
 #: field:crm.meeting,date:0 field:crm.opportunity2phonecall,date:0
@@ -1378,65 +1389,65 @@ 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
 #: view:board.board:0
 msgid "Opportunities by Categories"
-msgstr "各分類機會"
+msgstr "商機分類"
 
 #. module: crm
 #: model:crm.case.section,name:crm.section_sales_marketing_department
 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
 msgid ""
 "When sending mails, the default email address is taken from the sales team."
-msgstr ""
+msgstr "發送郵件的時候，預設的郵件地址來自銷售團隊。"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Choose day in the month where repeat the meeting"
-msgstr ""
+msgstr "在本月為循環的會議選擇日期"
 
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Segmentation Description"
-msgstr "區間說明"
+msgstr "細分說明"
 
 #. module: crm
 #: view:crm.phonecall:0
 #: model:ir.actions.act_window,name:crm.crm_case_categ_meet_create_partner
 msgid "Schedule a Meeting"
-msgstr "安排會議"
+msgstr "安排一個會議"
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:431
 #, python-format
 msgid "Merged opportunities"
-msgstr ""
+msgstr "合併商機"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_section_view_form_installer
 msgid "Define Sales Team"
-msgstr ""
+msgstr "定義銷售團隊"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_segmentation_tree-act
@@ -1444,32 +1455,32 @@ msgid ""
 "Create specific partner categories which you can assign to your partners to "
 "better manage your interactions with them. The segmentation tool is able to "
 "assign categories to partners according to criteria you set."
-msgstr ""
+msgstr "建立指定的業務夥伴類型，細分規則可以根據你設定的規則去指定業務夥伴的分類，以便你可以更好管理和他們的互動。"
 
 #. module: crm
 #: field:crm.case.section,code:0
 msgid "Code"
-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
 #: model:crm.case.resource.type,name:crm.type_lead1
 msgid "Telesales"
-msgstr ""
+msgstr "電話銷售"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "References"
-msgstr "參照"
+msgstr "參考"
 
 #. module: crm
 #: code:addons/crm/crm.py:441 view:crm.lead:0
@@ -1484,91 +1495,91 @@ msgstr "取消"
 #. module: crm
 #: model:ir.model,name:crm.model_res_users
 msgid "res.users"
-msgstr ""
+msgstr "res.users"
 
 #. module: crm
 #: view:crm.lead.report:0
 msgid "Leads/Opportunities which are in pending state"
-msgstr ""
+msgstr "待處理狀態的潛在客戶/商機"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_merge_opportunity
 msgid "Merge two Opportunities"
-msgstr "合併兩個機會"
+msgstr "合併兩個商機"
 
 #. module: crm
 #: field:crm.meeting,exrule:0
 msgid "Exception Rule"
-msgstr ""
+msgstr "例外規則"
 
 #. module: crm
 #: help:base.action.rule,act_mail_to_partner:0
 msgid "Check this if you want the rule to send an email to the partner."
-msgstr ""
+msgstr "勾選此項, 如果你想要此規則發送郵件給業務夥伴"
 
 #. module: crm
 #: field:crm.phonecall,opportunity_id:0
 msgid "Lead/Opportunity"
-msgstr ""
+msgstr "潛在客戶/商機"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Mail"
-msgstr ""
+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
 msgid "Leads/Opportunities which are in open state"
-msgstr ""
+msgstr "開啟的潛在客戶/商機"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.act_oppor_categ
 msgid "Opportunities By Categories"
-msgstr ""
+msgstr "商機分類"
 
 #. module: crm
 #: help:crm.lead,partner_name:0
 msgid ""
 "The name of the future partner that will be created while converting the "
 "lead into opportunity"
-msgstr ""
+msgstr "當由潛在客戶轉成商機時，要建立的未來業務夥伴名稱。"
 
 #. module: crm
 #: constraint:crm.case.section:0
 msgid "Error ! You cannot create recursive Sales team."
-msgstr ""
+msgstr "錯誤！你不能建立循環引用的的銷售團隊"
 
 #. module: crm
 #: selection:crm.opportunity2phonecall,action:0
 #: selection:crm.phonecall2phonecall,action:0
 msgid "Log a call"
-msgstr ""
+msgstr "記錄電訪"
 
 #. module: crm
 #: selection:crm.lead2opportunity.partner,action:0
 #: selection:crm.lead2opportunity.partner.mass,action:0
 msgid "Do not link to a partner"
-msgstr ""
+msgstr "不能連結到商業夥伴"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Search Meetings"
-msgstr ""
+msgstr "搜尋會議"
 
 #. module: crm
 #: selection:crm.segmentation.line,expr_name:0
 msgid "Sale Amount"
-msgstr "業務總額"
+msgstr "銷售金額"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Choose day where repeat the meeting"
-msgstr ""
+msgstr "為重複的會議選擇日期"
 
 #. module: crm
 #: selection:crm.meeting,state:0
@@ -1584,6 +1595,7 @@ msgid ""
 "mainly used by the sales manager in order to do the periodic review with the "
 "teams of the sales pipeline."
 msgstr ""
+"商機分析給你隨時訪問商機的資訊如：預期收入、計劃成本、錯過的最後時限或者每個商機的互動次數。這個報表主要給銷售經理定期審查這團隊裡的業務人員。"
 
 #. module: crm
 #: field:crm.case.categ,name:0 field:crm.lead,name:0
@@ -1594,7 +1606,7 @@ msgstr "名稱"
 #. module: crm
 #: field:crm.meeting,alarm_id:0 field:crm.meeting,base_calendar_alarm_id:0
 msgid "Alarm"
-msgstr ""
+msgstr "警告"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_lead_stage_act
@@ -1602,17 +1614,17 @@ msgid ""
 "Add specific stages to leads and opportunities allowing your sales to better "
 "organise their sales pipeline. Stages will allow them to easily track how a "
 "specific lead or opportunity is positioned in the sales cycle."
-msgstr ""
+msgstr "為你的銷售的潛在客戶和商機增加特定的階段以便更好組織你的銷售管道。階段使你更輕鬆追蹤指定的潛在客戶或在銷售週期中的商機。"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.action_crm_send_mass_convert
 msgid "Convert opportunities"
-msgstr ""
+msgstr "商機轉換"
 
 #. module: crm
 #: view:crm.lead.report:0 view:crm.phonecall.report:0
 msgid "My Case(s)"
-msgstr ""
+msgstr "我的業務"
 
 #. module: crm
 #: field:crm.lead,birthdate:0
@@ -1622,12 +1634,12 @@ msgstr "生日"
 #. module: crm
 #: view:crm.meeting:0
 msgid "The"
-msgstr ""
+msgstr "這"
 
 #. module: crm
 #: view:crm.lead:0 view:crm.phonecall:0
 msgid "Creation"
-msgstr ""
+msgstr "建立時間"
 
 #. module: crm
 #: selection:crm.lead,priority:0 selection:crm.lead.report,priority:0
@@ -1639,12 +1651,12 @@ msgstr "高"
 #. module: crm
 #: model:process.node,note:crm.process_node_partner0
 msgid "Convert to prospect to business partner"
-msgstr ""
+msgstr "把潛在客戶轉成商業夥伴"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Meeting / Partner"
-msgstr ""
+msgstr "會議/業務夥伴"
 
 #. module: crm
 #: view:crm.phonecall2opportunity:0
@@ -1657,12 +1669,12 @@ msgid ""
 "With Meeting Invitations you can create and manage the meeting invitations "
 "sent/to be sent to your colleagues/partners. You can not only invite OpenERP "
 "users, but also external parties, such as a customer."
-msgstr "您可在此建立或管理發送至同事或伙伴之會議邀約。您不單可邀請 OpenERP 用戶，還可邀請客戶等外人。"
+msgstr "與會邀請你可以建立和管理會議邀請發送給你的同事、業務夥伴。你不僅能邀請系統的使用者還可以邀請外部人士如客戶。"
 
 #. module: crm
 #: selection:crm.meeting,week_list:0
 msgid "Saturday"
-msgstr "星期六"
+msgstr "週六"
 
 #. module: crm
 #: selection:crm.meeting,byday:0
@@ -1672,96 +1684,96 @@ msgstr "第五"
 #. module: crm
 #: view:crm.lead.report:0
 msgid "Leads/Opportunities which are in done state"
-msgstr ""
+msgstr "已完成的潛在客戶/商機"
 
 #. module: crm
 #: field:crm.lead.report,delay_close:0
 msgid "Delay to Close"
-msgstr ""
+msgstr "延遲關閉"
 
 #. module: crm
 #: field:crm.meeting,we:0
 msgid "Wed"
-msgstr "三"
+msgstr "週三"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor6
 msgid "Potential Reseller"
-msgstr ""
+msgstr "潛在經銷商"
 
 #. module: crm
 #: help:crm.case.section,change_responsible:0
 msgid ""
 "When escalating to this team override the saleman with the team leader."
-msgstr ""
+msgstr "當在團隊內上報的時候，業務人員的名字會被替換為團隊主管"
 
 #. module: crm
 #: field:crm.lead.report,planned_revenue:0
 msgid "Planned Revenue"
-msgstr "計劃收益"
+msgstr "計劃收入"
 
 #. module: crm
 #: view:crm.lead:0 view:crm.lead.report:0 view:crm.phonecall:0
 #: view:crm.phonecall.report:0
 msgid "Group By..."
-msgstr "分組根據..."
+msgstr "分類方式..."
 
 #. module: crm
 #: help:crm.lead,partner_id:0
 msgid "Optional linked partner, usually after conversion of the lead"
-msgstr ""
+msgstr "可選聯絡業務夥伴，通常在潛在客戶轉換後"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Invitation details"
-msgstr "邀約詳情"
+msgstr "邀請詳情"
 
 #. module: crm
 #: field:crm.case.section,parent_id:0
 msgid "Parent Team"
-msgstr "上級團隊"
+msgstr "母團隊"
 
 #. module: crm
 #: field:crm.lead,date_action:0
 msgid "Next Action Date"
-msgstr "下個動作日期"
+msgstr "下一動作日期"
 
 #. module: crm
 #: selection:crm.segmentation,state:0
 msgid "Running"
-msgstr "正運作"
+msgstr "運行中"
 
 #. module: crm
 #: field:crm.lead,zip:0
 msgid "Zip"
-msgstr "郵政編碼"
+msgstr "郵遞區號"
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:278
 #, python-format
 msgid "The case '%s' has been opened."
-msgstr ""
+msgstr "這業務'%s'已開啟"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_phone1
 msgid "Inbound"
-msgstr ""
+msgstr "來電"
 
 #. module: crm
 #: view:crm.phonecall.report:0
 msgid "Month of call"
-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
 #: selection:crm.meeting,show_as:0
 msgid "Free"
-msgstr ""
+msgstr "自由"
 
 #. module: crm
 #: field:crm.case.section,allow_unlink:0
@@ -1771,7 +1783,7 @@ msgstr "允許刪除"
 #. module: crm
 #: field:crm.meeting,mo:0
 msgid "Mon"
-msgstr "一"
+msgstr "週一"
 
 #. module: crm
 #: selection:crm.lead,priority:0 selection:crm.lead.report,priority:0
@@ -1783,13 +1795,13 @@ msgstr "最高"
 #. module: crm
 #: help:crm.lead.report,creation_year:0
 msgid "Creation year"
-msgstr ""
+msgstr "建立年份"
 
 #. module: crm
 #: view:crm.case.section:0 view:crm.lead:0 field:crm.lead,description:0
 #: view:crm.opportunity2phonecall:0
 msgid "Notes"
-msgstr ""
+msgstr "備註"
 
 #. module: crm
 #: field:crm.segmentation.line,expr_value:0
@@ -1799,57 +1811,57 @@ msgstr "值"
 #. module: crm
 #: help:crm.lead,type:0 help:crm.lead.report,type:0
 msgid "Type is used to separate Leads and Opportunities"
-msgstr ""
+msgstr "類型用於區分潛在客戶和商機"
 
 #. module: crm
 #: view:crm.lead:0 view:crm.lead.report:0
 msgid "Opportunity by Categories"
-msgstr "各分類機會"
+msgstr "商機按分類分組"
 
 #. module: crm
 #: view:crm.lead:0 field:crm.lead,partner_name:0
 msgid "Customer Name"
-msgstr "客戶名"
+msgstr "客戶名稱"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_phonecall2opportunity
 msgid "Phonecall To Opportunity"
-msgstr ""
+msgstr "電訪轉成商機"
 
 #. module: crm
 #: field:crm.case.section,reply_to:0
 msgid "Reply-To"
-msgstr "回覆至"
+msgstr "回覆到"
 
 #. module: crm
 #: view:crm.case.section:0
 msgid "Select Stages for this Sales Team"
-msgstr ""
+msgstr "這個銷售團隊的選擇階段"
 
 #. module: crm
 #: view:board.board:0
 msgid "Opportunities by Stage"
-msgstr "各階段機會"
+msgstr "商機的階段"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Recurrency Option"
-msgstr ""
+msgstr "循環選擇"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Lead / Customer"
-msgstr ""
+msgstr "潛在客戶/客戶"
 
 #. module: crm
 #: model:process.transition,note:crm.process_transition_leadpartner0
 msgid "Prospect is converting to business partner"
-msgstr ""
+msgstr "潛在客戶正轉成商業夥伴"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.phonecall2opportunity_act
 msgid "Convert To Opportunity"
-msgstr ""
+msgstr "轉換為商機"
 
 #. module: crm
 #: view:crm.case.channel:0
@@ -1857,19 +1869,19 @@ 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 selection:crm.phonecall,state:0
 #: view:crm.phonecall.report:0 selection:crm.phonecall.report,state:0
 #: view:res.partner:0
 msgid "Held"
-msgstr ""
+msgstr "已撥"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Reset to Draft"
-msgstr "退回至草案"
+msgstr "重置為草稿"
 
 #. module: crm
 #: view:crm.lead:0
@@ -1881,65 +1893,65 @@ msgstr "額外資訊"
 #: model:ir.actions.act_window,name:crm.action_merge_opportunities
 #: model:ir.actions.act_window,name:crm.merge_opportunity_act
 msgid "Merge Opportunities"
-msgstr "合併機會"
+msgstr "合併商機"
 
 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_lead5
 msgid "Google Adwords"
-msgstr ""
+msgstr "Google Adwords"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_phonecall
 msgid "crm.phonecall"
-msgstr ""
+msgstr "crm.phonecall"
 
 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_lead3
 msgid "Mail Campaign 2"
-msgstr "郵件推廣 2"
+msgstr "郵件行銷 2"
 
 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_lead2
 msgid "Mail Campaign 1"
-msgstr ""
+msgstr "郵件行銷 1"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Create"
-msgstr ""
+msgstr "建立"
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:849
 #, python-format
 msgid "Changed Stage to: %s"
-msgstr ""
+msgstr "修改階段為'%s'"
 
 #. module: crm
 #: view:crm.lead:0 field:crm.lead,priority:0 view:crm.lead.report:0
 #: field:crm.lead.report,priority:0 field:crm.phonecall,priority:0
 #: view:crm.phonecall.report:0 field:crm.phonecall.report,priority:0
 msgid "Priority"
-msgstr "優先次序"
+msgstr "優先級(0=緊急)"
 
 #. module: crm
 #: field:crm.segmentation,sales_purchase_active:0
 msgid "Use The Sales Purchase Rules"
-msgstr ""
+msgstr "使用這銷售採購規則"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_lead2opportunity_partner
 msgid "Lead To Opportunity Partner"
-msgstr ""
+msgstr "潛在客戶轉換為業務夥伴或商機"
 
 #. module: crm
 #: field:crm.lead,location_id:0 field:crm.meeting,location:0
 msgid "Location"
-msgstr ""
+msgstr "地點"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_lead2opportunity_partner_mass
 msgid "Mass Lead To Opportunity Partner"
-msgstr ""
+msgstr "批量轉換潛在客戶為商機業務夥伴"
 
 #. module: crm
 #: view:crm.lead:0
@@ -1949,25 +1961,25 @@ msgstr "回覆"
 #. module: crm
 #: model:process.node,note:crm.process_node_meeting0
 msgid "Schedule a normal or phone meeting"
-msgstr "安排正常或電話會談"
+msgstr "安排正常會議或電話會議"
 
 #. module: crm
 #: code:addons/crm/crm.py:430
 #, python-format
 msgid "Error !"
-msgstr ""
+msgstr "錯誤！"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_meeting_categ_action
 msgid ""
 "Create different meeting categories to better organize and classify your "
 "meetings."
-msgstr ""
+msgstr "建立不同的會議分類以便更好組織和把會議分類"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_segmentation_line
 msgid "Segmentation line"
-msgstr "區間行"
+msgstr "細分明細"
 
 #. module: crm
 #: view:crm.opportunity2phonecall:0 view:crm.phonecall2phonecall:0
@@ -1977,34 +1989,34 @@ msgstr "計劃日期"
 #. module: crm
 #: field:crm.meeting,base_calendar_url:0
 msgid "Caldav URL"
-msgstr ""
+msgstr "Caldav 服務的URL"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Expected Revenues"
-msgstr "預期收益"
+msgstr "預期收入"
 
 #. module: crm
 #: field:crm.lead,contact_name:0
 msgid "Contact Name"
-msgstr "聯絡人名稱"
+msgstr "聯絡人姓名"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Leads creating during last 7 days"
-msgstr ""
+msgstr "前7天發現的潛在客戶"
 
 #. module: crm
 #: view:crm.phonecall2partner:0
 msgid "Are you sure you want to create a partner based on this Phonecall ?"
-msgstr ""
+msgstr "你確定你基於這電訪建立的業務夥伴？"
 
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
 #: selection:crm.lead.report,deadline_month:0
 #: selection:crm.meeting,month_list:0 selection:crm.phonecall.report,month:0
 msgid "July"
-msgstr "七月"
+msgstr "7月"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_case_section_act
@@ -2015,34 +2027,36 @@ msgid ""
 "The opportunities and sales order displayed, will automatically be filtered "
 "according to his team."
 msgstr ""
+"定義銷售團隊組織你不同的業務人員或者銷售部門成立一個獨立的團隊。每個團隊工作在自己的商機『銷售單，如每個使用者能設置預設的團隊的客戶偏好。商機和銷售訂單將"
+"根據他的團隊自動篩選。"
 
 #. module: crm
 #: view:crm.lead.report:0
 msgid "Show only lead"
-msgstr ""
+msgstr "僅顯示潛在客戶"
 
 #. module: crm
 #: help:crm.meeting,count:0
 msgid "Repeat x times"
-msgstr "重覆x次"
+msgstr "重複 x 次"
 
 #. 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
 #: model:ir.model,name:crm.model_crm_lead2partner
 msgid "Lead to Partner"
-msgstr ""
+msgstr "潛在客戶轉成業務夥伴"
 
 #. module: crm
 #: view:crm.segmentation:0 field:crm.segmentation.line,segmentation_id:0
 #: model:ir.actions.act_window,name:crm.crm_segmentation-act
 msgid "Segmentation"
-msgstr "區間"
+msgstr "Segmentation"
 
 #. module: crm
 #: view:crm.lead:0
@@ -2052,13 +2066,13 @@ msgstr "團隊"
 #. module: crm
 #: view:crm.lead.report:0
 msgid "Leads/Opportunities which are in New state"
-msgstr ""
+msgstr "潛在客戶/新建的商機"
 
 #. module: crm
 #: view:crm.phonecall:0 selection:crm.phonecall,state:0
 #: view:crm.phonecall.report:0 view:res.partner:0
 msgid "Not Held"
-msgstr ""
+msgstr "未撥"
 
 #. module: crm
 #: field:crm.lead.report,probability:0
@@ -2068,19 +2082,19 @@ msgstr "概率"
 #. module: crm
 #: view:crm.lead:0
 msgid "Pending Opportunities"
-msgstr ""
+msgstr "待處理商機"
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:491
 #, python-format
 msgid "Please select more than one opportunity from the list view."
-msgstr ""
+msgstr "請在列表中選擇多個商機"
 
 #. module: crm
 #: view:crm.lead.report:0 field:crm.meeting,month_list:0
 #: view:crm.phonecall.report:0 field:crm.phonecall.report,month:0
 msgid "Month"
-msgstr "月"
+msgstr "月份"
 
 #. module: crm
 #: view:crm.lead:0
@@ -2088,7 +2102,7 @@ msgstr "月"
 #: model:ir.ui.menu,name:crm.menu_crm_case_categ0_act_leads
 #: model:process.node,name:crm.process_node_leads0
 msgid "Leads"
-msgstr ""
+msgstr "潛在客戶"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_case_category_act_leads_all
@@ -2103,6 +2117,9 @@ msgid ""
 "email gateway: new emails may create leads, each of them automatically gets "
 "the history of the conversation with the prospect."
 msgstr ""
+"潛在客戶用來追蹤你和對您產品或服務感興趣的潛在客戶或現有業務夥伴的最初接觸。潛在客戶一般來說是銷售循環的第一步。當確認了以後，潛在客戶需要轉化為商機，此時"
+"應建立業務伙伴以便進一步追蹤相關的活動。你可以匯入一個潛在客戶的資料庫，追蹤一下你的名片或把你的網站留言板與OpenERP的潛在客戶集成起來。潛在客戶可以"
+"與郵件閘道連接起來：新的郵件可以建立潛在客戶，後續郵件可以成為與潛在客戶溝通的歷史記錄。"
 
 #. module: crm
 #: selection:crm.lead2opportunity.partner,action:0
@@ -2110,53 +2127,53 @@ msgstr ""
 #: selection:crm.lead2partner,action:0
 #: selection:crm.phonecall2partner,action:0
 msgid "Create a new partner"
-msgstr ""
+msgstr "建立新的業務夥伴"
 
 #. module: crm
 #: 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
 #: view:crm.meeting:0 view:res.partner:0
 msgid "Start Date"
-msgstr ""
+msgstr "開啟日期"
 
 #. module: crm
 #: view:crm.phonecall:0
 msgid "Scheduled Phonecalls"
-msgstr ""
+msgstr "排定的電訪"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Decline"
-msgstr ""
+msgstr "拒絕"
 
 #. module: crm
 #: field:crm.lead,user_email:0
 msgid "User Email"
-msgstr ""
+msgstr "使用者電子郵件"
 
 #. module: crm
 #: help:crm.lead,optin:0
 msgid "If opt-in is checked, this contact has accepted to receive emails."
-msgstr ""
+msgstr "如果訂閱已選擇，此聯絡人已同意接收郵件。"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Reset to Unconfirmed"
-msgstr ""
+msgstr "重置為未確認"
 
 #. module: crm
 #: field:crm.opportunity2phonecall,note:0 field:crm.phonecall2phonecall,note:0
 msgid "Note"
-msgstr ""
+msgstr "備註"
 
 #. module: crm
 #: constraint:res.users:0
 msgid "The chosen company is not in the allowed companies for this user"
-msgstr ""
+msgstr "選擇的公司不屬於此使用者允許訪問的公司。"
 
 #. module: crm
 #: selection:crm.lead,priority:0 selection:crm.lead.report,priority:0
@@ -2171,17 +2188,17 @@ msgstr "低"
 #: selection:crm.lead.report,state:0 field:crm.meeting,date_closed:0
 #: field:crm.phonecall,date_closed:0
 msgid "Closed"
-msgstr "關閉"
+msgstr "已關閉"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Total of Planned Revenue"
-msgstr "計劃收益總計"
+msgstr "計劃收入合計"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Open Opportunities"
-msgstr ""
+msgstr "開啟商機"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_meet2
@@ -2204,7 +2221,7 @@ msgstr "客戶會議"
 #. module: crm
 #: field:crm.lead,email_cc:0
 msgid "Global CC"
-msgstr ""
+msgstr "完整副本"
 
 #. module: crm
 #: view:crm.phonecall:0
@@ -2212,22 +2229,22 @@ msgstr ""
 #: model:ir.ui.menu,name:crm.menu_crm_case_phone
 #: model:ir.ui.menu,name:crm.menu_crm_config_phonecall view:res.partner:0
 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 help:crm.phonecall.report,delay_open:0
 msgid "Number of Days to open the case"
-msgstr ""
+msgstr "起案的天數"
 
 #. module: crm
 #: selection:crm.meeting,end_type:0
 msgid "Number of repetitions"
-msgstr ""
+msgstr "副本數量"
 
 #. module: crm
 #: field:crm.lead,phone:0 field:crm.opportunity2phonecall,phone:0
@@ -2240,23 +2257,23 @@ msgstr "電話"
 #: field:crm.lead,active:0 field:crm.meeting,active:0
 #: field:crm.phonecall,active:0
 msgid "Active"
-msgstr "活躍"
+msgstr "啟用"
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:856
 #, python-format
 msgid "The stage of opportunity '%s' has been changed to '%s'."
-msgstr "機會階段已由「%s」變為「%s」。"
+msgstr "這商機的階段』%s'已改為'%s'。"
 
 #. module: crm
 #: selection:crm.segmentation.line,operator:0
 msgid "Mandatory Expression"
-msgstr ""
+msgstr "強制的表示式"
 
 #. module: crm
 #: selection:crm.segmentation.line,expr_operator:0
 msgid ">"
-msgstr ""
+msgstr ">"
 
 #. module: crm
 #: view:crm.opportunity2phonecall:0 view:crm.phonecall2phonecall:0
@@ -2271,13 +2288,13 @@ msgstr "不確定"
 #. module: crm
 #: help:crm.case.stage,sequence:0
 msgid "Used to order stages."
-msgstr ""
+msgstr "用於對階段排序"
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:276
 #, python-format
 msgid "The opportunity '%s' has been opened."
-msgstr ""
+msgstr "這商機 \"%s\" 已開啟"
 
 #. module: crm
 #: field:crm.lead2opportunity.partner,action:0
@@ -2295,34 +2312,34 @@ msgstr "減少 (0>1)"
 #. module: crm
 #: field:crm.lead.report,deadline_day:0
 msgid "Exp. Closing Day"
-msgstr ""
+msgstr "預期結束日期"
 
 #. module: crm
 #: field:crm.case.section,change_responsible:0
 msgid "Reassign Escalated"
-msgstr ""
+msgstr "提交給上級"
 
 #. module: crm
 #: selection:crm.meeting,rrule_type:0
 msgid "Weekly"
-msgstr "每週"
+msgstr "按周"
 
 #. module: crm
 #: view:crm.lead.report:0
 #: model:ir.actions.act_window,name:crm.action_report_crm_opportunity
 #: model:ir.ui.menu,name:crm.menu_report_crm_opportunities_tree
 msgid "Opportunities Analysis"
-msgstr "機會分析"
+msgstr "商機分析"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Misc"
-msgstr ""
+msgstr "雜項"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.open_board_crm
 msgid "Sales"
-msgstr ""
+msgstr "銷售"
 
 #. module: crm
 #: code:addons/crm/crm.py:430
@@ -2330,12 +2347,12 @@ msgstr ""
 msgid ""
 "You can not escalate, you are already at the top level regarding your sales-"
 "team category."
-msgstr ""
+msgstr "不能上報，你已經在您銷售團隊類別中的最高級了。"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor8 view:crm.meeting:0
 msgid "Other"
-msgstr ""
+msgstr "其它"
 
 #. module: crm
 #: view:crm.meeting:0 selection:crm.meeting,state:0
@@ -2345,7 +2362,7 @@ msgstr "完成"
 #. module: crm
 #: help:crm.meeting,interval:0
 msgid "Repeat every (Days/Week/Month/Year)"
-msgstr ""
+msgstr "重複間隔（日/周/年）"
 
 #. module: crm
 #: field:crm.segmentation,som_interval_max:0
@@ -2357,7 +2374,7 @@ msgstr "最大間隔"
 #: selection:crm.lead.report,state:0 view:res.partner:0
 #, python-format
 msgid "Open"
-msgstr ""
+msgstr "開啟"
 
 #. module: crm
 #: field:crm.lead,city:0
@@ -2367,47 +2384,47 @@ msgstr "城市"
 #. module: crm
 #: view:crm.lead:0 view:res.partner:0
 msgid "History"
-msgstr ""
+msgstr "歷史記錄"
 
 #. module: crm
 #: selection:crm.meeting,show_as:0
 msgid "Busy"
-msgstr "忙線"
+msgstr "忙碌"
 
 #. module: crm
 #: field:crm.lead.report,creation_day:0
 msgid "Creation Day"
-msgstr ""
+msgstr "建立日期"
 
 #. module: crm
 #: field:crm.meeting,interval:0
 msgid "Repeat every"
-msgstr "重覆間隔："
+msgstr "重複間隔"
 
 #. module: crm
 #: field:crm.meeting,recurrency:0
 msgid "Recurrent"
-msgstr ""
+msgstr "循環"
 
 #. module: crm
 #: view:crm.phonecall.report:0
 msgid "Phone calls made in last month"
-msgstr ""
+msgstr "上個月的通話"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.act_my_oppor
 msgid "My Open Opportunities"
-msgstr "我的開放機會"
+msgstr "我開啟的商機"
 
 #. module: crm
 #: field:base.action.rule,trg_max_history:0
 msgid "Maximum Communication History"
-msgstr ""
+msgstr "最大的溝通日誌"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Invite People"
-msgstr "邀請"
+msgstr "邀請他人"
 
 #. module: crm
 #: view:crm.meeting:0 field:crm.meeting,categ_id:0
@@ -2425,6 +2442,10 @@ msgid ""
 "       \n"
 "If the case needs to be reviewed then the state is set to 'Pending'."
 msgstr ""
+"當一個業務建立時狀態設為'草稿'\n"
+"如果業務正在處理狀態設為'開啟'\n"
+"當業務結束狀態設為'完成'\n"
+"如果業務需要審查狀態設為'待處理'"
 
 #. module: crm
 #: view:crm.meeting:0 view:res.partner:0
@@ -2441,70 +2462,70 @@ msgstr "第三"
 msgid ""
 "The computation is made on all events that occured during this interval, the "
 "past X periods."
-msgstr ""
+msgstr "這計算是基於在過去 X 期間發生的所有事件。"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Unassigned Opportunities"
-msgstr ""
+msgstr "未分配的商機"
 
 #. module: crm
 #: view:crm.lead.report:0
 msgid "# of Emails"
-msgstr ""
+msgstr "郵件"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Search Leads"
-msgstr ""
+msgstr "搜尋潛在客戶"
 
 #. module: crm
 #: view:crm.lead.report:0 view:crm.phonecall.report:0
 #: field:crm.phonecall.report,delay_open:0
 msgid "Delay to open"
-msgstr ""
+msgstr "延遲開啟"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Recurrency period"
-msgstr ""
+msgstr "循環週期"
 
 #. module: crm
 #: field:crm.meeting,week_list:0
 msgid "Weekday"
-msgstr "週日"
+msgstr "工作日"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Referrer"
-msgstr ""
+msgstr "參考"
 
 #. module: crm
 #: field:crm.lead,id:0 field:crm.meeting,id:0 field:crm.phonecall,id:0
 msgid "ID"
-msgstr ""
+msgstr "ID"
 
 #. module: crm
 #: help:crm.lead,type_id:0
 msgid ""
 "From which campaign (seminar, marketing campaign, mass mailing, ...) did "
 "this contact come from?"
-msgstr ""
+msgstr "這個聯絡人從哪個活動中來（研討會、行銷活動還是群發郵件）。"
 
 #. module: crm
 #: model:ir.model,name:crm.model_calendar_attendee
 msgid "Attendee information"
-msgstr "出席者資訊"
+msgstr "參與者資訊"
 
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Segmentation Test"
-msgstr "區間測試"
+msgstr "細分測試"
 
 #. module: crm
 #: field:crm.lead,user_login:0
 msgid "User Login"
-msgstr ""
+msgstr "使用者賬戶"
 
 #. module: crm
 #: view:crm.segmentation:0
@@ -2514,29 +2535,29 @@ msgstr "繼續處理"
 #. module: crm
 #: view:crm.lead.report:0
 msgid "Leads/Opportunities created in current year"
-msgstr ""
+msgstr "今年建立的潛在客戶/商機"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_phonecall2partner
 msgid "Phonecall to Partner"
-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.add.note,state:0
 msgid "Set New State To"
-msgstr ""
+msgstr "設定新狀態為"
 
 #. module: crm
 #: field:crm.lead,date_action_last:0 field:crm.meeting,date_action_last:0
 #: field:crm.phonecall,date_action_last:0
 msgid "Last Action"
-msgstr "最後動作"
+msgstr "最近動作"
 
 #. module: crm
 #: field:crm.meeting,duration:0 field:crm.phonecall,duration:0
@@ -2547,32 +2568,32 @@ msgstr "持續時間"
 #. module: crm
 #: view:crm.lead:0
 msgid "Show countries"
-msgstr ""
+msgstr "顯示國家"
 
 #. module: crm
 #: view:crm.lead2opportunity.partner.mass:0
 msgid "Select Salesman"
-msgstr ""
+msgstr "選擇業務人員"
 
 #. module: crm
 #: view:board.board:0
 msgid "Sales Dashboard"
-msgstr "業務儀錶版"
+msgstr "銷售控制台"
 
 #. module: crm
 #: field:crm.lead.report,nbr:0 field:crm.phonecall.report,nbr:0
 msgid "# of Cases"
-msgstr ""
+msgstr "業務量"
 
 #. module: crm
 #: help:crm.meeting,section_id:0 help:crm.phonecall,section_id:0
 msgid "Sales team to which Case belongs to."
-msgstr ""
+msgstr "業務所屬銷售團隊"
 
 #. module: crm
 #: selection:crm.meeting,week_list:0
 msgid "Sunday"
-msgstr "星期日"
+msgstr "週日"
 
 #. module: crm
 #: selection:crm.meeting,byday:0
@@ -2582,13 +2603,13 @@ msgstr "第四"
 #. module: crm
 #: selection:crm.add.note,state:0
 msgid "Unchanged"
-msgstr "不變"
+msgstr "未更改"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_segmentation_tree-act
 #: model:ir.ui.menu,name:crm.menu_crm_segmentation-act
 msgid "Partners Segmentation"
-msgstr "伙伴區間"
+msgstr "業務夥伴細分"
 
 #. module: crm
 #: field:crm.lead,fax:0
@@ -2598,12 +2619,12 @@ msgstr "傳真"
 #. module: crm
 #: view:crm.lead.report:0
 msgid "Leads/Opportunities created in current month"
-msgstr ""
+msgstr "本月新建的潛在客戶/商機"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Assignment"
-msgstr ""
+msgstr "指派"
 
 #. module: crm
 #: field:crm.lead,company_id:0 view:crm.lead.report:0
@@ -2615,7 +2636,7 @@ msgstr "公司"
 #. module: crm
 #: selection:crm.meeting,week_list:0
 msgid "Friday"
-msgstr "星期五"
+msgstr "週五"
 
 #. module: crm
 #: field:crm.meeting,allday:0
@@ -2625,23 +2646,23 @@ msgstr "整天"
 #. module: crm
 #: field:crm.segmentation.line,operator:0
 msgid "Mandatory / Optional"
-msgstr ""
+msgstr "強制的/ 可選的"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Unassigned Leads"
-msgstr ""
+msgstr "未分配的潛在客戶"
 
 #. module: crm
 #: field:crm.lead,subjects:0
 msgid "Subject of Email"
-msgstr ""
+msgstr "郵件主題"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.action_view_attendee_form
 #: model:ir.ui.menu,name:crm.menu_attendee_invitations
 msgid "Meeting Invitations"
-msgstr "會議邀約"
+msgstr "會議邀請"
 
 #. module: crm
 #: view:crm.phonecall:0 selection:crm.phonecall,state:0
@@ -2653,72 +2674,72 @@ msgstr "待辦"
 #. module: crm
 #: field:crm.case.categ,object_id:0
 msgid "Object Name"
-msgstr "物件名稱"
+msgstr "對象名"
 
 #. module: crm
 #: help:crm.lead,email_from:0
 msgid "E-mail address of the contact"
-msgstr "聯絡人電郵地址"
+msgstr "這聯絡人的郵件地址"
 
 #. module: crm
 #: field:crm.lead,referred:0
 msgid "Referred by"
-msgstr ""
+msgstr "推薦人"
 
 #. module: crm
 #: view:crm.lead:0 model:ir.model,name:crm.model_crm_add_note
 msgid "Add Internal Note"
-msgstr "添加內部記事"
+msgstr "添加內部備註"
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:853
 #, python-format
 msgid "The stage of lead '%s' has been changed to '%s'."
-msgstr ""
+msgstr "這潛在客戶的階段從 '%s' 改為 '%s'"
 
 #. module: crm
 #: selection:crm.meeting,byday:0
 msgid "Last"
-msgstr ""
+msgstr "最後"
 
 #. module: crm
 #: field:crm.lead,message_ids:0 field:crm.meeting,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
 #: code:addons/crm/crm_action_rule.py:61
 #, python-format
 msgid "Error!"
-msgstr "錯誤！"
+msgstr "錯誤!"
 
 #. module: crm
 #: field:crm.opportunity2phonecall,name:0 field:crm.phonecall2phonecall,name:0
 msgid "Call summary"
-msgstr ""
+msgstr "電訪摘要"
 
 #. module: crm
 #: selection:crm.add.note,state:0 selection:crm.lead,state:0
 #: selection:crm.lead.report,state:0 selection:crm.meeting,state:0
 #: selection:crm.phonecall,state:0 selection:crm.phonecall.report,state:0
 msgid "Cancelled"
-msgstr "取消"
+msgstr "已取消"
 
 #. module: crm
 #: field:crm.add.note,body:0
 msgid "Note Body"
-msgstr "記事內容"
+msgstr "備註內容"
 
 #. module: crm
 #: view:board.board:0
 msgid "My Planned Revenues by Stage"
-msgstr "各階段我的計劃收益"
+msgstr "我的階段計劃營收"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_case_category_act_oppor11
@@ -2735,11 +2756,15 @@ msgid ""
 "opportunities, convert them into quotations, manage related documents, track "
 "all customer related activities, and much more."
 msgstr ""
+"對於商機你可以管理和與你的銷售管道建立的特定客戶或者跟進潛在銷售相關的銷售單保持聯絡，資訊如：預期收入，商機的階段，預計結束日期，大量的溝通日誌，通過郵件"
+"閘道商機能和郵件相連：新的郵件可能能建立新的商機，他們能自動獲得和客戶交流的日誌。\n"
+"\n"
+"你和你的團隊可以為會議和從電訪來的商機做計劃，把它們轉換成報價，管理相關文檔，追蹤所有相關客戶的活動等。。"
 
 #. module: crm
 #: field:crm.lead,color:0
 msgid "Color Index"
-msgstr ""
+msgstr "顏色索引"
 
 #. module: crm
 #: view:crm.lead:0
@@ -2753,14 +2778,14 @@ msgid ""
 "classify and analyse your leads and opportunities. Such categories could for "
 "instance reflect your product structure or the different types of sales you "
 "do."
-msgstr ""
+msgstr "建立具體合適你公司行銷活動的類型以便更好地分類和分析潛在客戶和商機。例如這類型能反映你的產品結構或對不同類型的銷售該怎麼做。"
 
 #. module: crm
 #: help:crm.segmentation,som_interval_decrease:0
 msgid ""
 "If the partner has not purchased (or bought) during a period, decrease the "
 "state of mind by this factor. It's a multiplication"
-msgstr ""
+msgstr "如果業務夥伴在一段時間都沒有買賣，使用此因子來減少滿意度。這是一個乘法。"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.action_report_crm_phonecall
@@ -2769,22 +2794,22 @@ msgid ""
 "on their phone calls. You can group or filter the information according to "
 "several criteria and drill down the information, by adding more groups in "
 "the report."
-msgstr ""
+msgstr "在這報表中，你能分析你的銷售團隊在電訪上的業績。你能在報表新增更多的群組以根據數個條件來分類或篩選資訊並深入分析資訊。"
 
 #. module: crm
 #: view:crm.lead.report:0
 msgid "# Mails"
-msgstr ""
+msgstr "郵件"
 
 #. module: crm
 #: field:crm.phonecall,name:0 view:res.partner:0
 msgid "Call Summary"
-msgstr ""
+msgstr "電訪摘要"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Todays' Leads"
-msgstr ""
+msgstr "今天的潛在客戶"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_case_categ_phone_outgoing0
@@ -2795,86 +2820,88 @@ msgid ""
 "customer. You can also import a .CSV file with a list of calls to be done by "
 "your sales team."
 msgstr ""
+"排定的電訪列出所有你的團隊需要打的電話。業務人員可以在表單中記錄電訪的資訊。這些資訊會保存在業務夥伴表單用於追蹤你和客戶的聯絡過程。你可以用CSV文件匯入"
+"一個需要團隊打電話的列表。"
 
 #. module: crm
 #: field:crm.segmentation.line,expr_operator:0
 msgid "Operator"
-msgstr "操作員"
+msgstr "運算符"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_phonecall2phonecall
 msgid "Phonecall To Phonecall"
-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
 #: selection:crm.meeting,state:0
 msgid "Confirmed"
-msgstr "確認"
+msgstr "已確認"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.act_oppor_stage_user
 msgid "Planned Revenue By User and Stage"
-msgstr ""
+msgstr "按使用者和階段查看預期收入"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Confirm"
-msgstr "確認"
+msgstr "確定"
 
 #. module: crm
 #: field:crm.meeting,su:0
 msgid "Sun"
-msgstr "日"
+msgstr "週日"
 
 #. module: crm
 #: field:crm.phonecall.report,section_id:0
 msgid "Section"
-msgstr ""
+msgstr "分類"
 
 #. module: crm
 #: selection:crm.segmentation.line,operator:0
 msgid "Optional Expression"
-msgstr ""
+msgstr "選擇性的表示式"
 
 #. module: crm
 #: selection:crm.meeting,select1:0
 msgid "Day of month"
-msgstr ""
+msgstr "日"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.act_my_oppor_stage
 msgid "Planned Revenue By Stage"
-msgstr ""
+msgstr "按階段分組的預期收入"
 
 #. module: crm
 #: selection:crm.add.note,state:0 model:crm.case.stage,name:crm.stage_lead1
 #: view:crm.lead:0 selection:crm.lead,state:0 view:crm.lead.report:0
 msgid "New"
-msgstr ""
+msgstr "建立"
 
 #. module: crm
 #: view:crm.lead:0 field:crm.lead,email_from:0 field:crm.meeting,email_from:0
 #: field:crm.phonecall,email_from:0
 msgid "Email"
-msgstr "電郵"
+msgstr "電子郵件"
 
 #. module: crm
 #: view:crm.case.channel:0 view:crm.lead:0 field:crm.lead,channel_id:0
 #: view:crm.lead.report:0 field:crm.lead.report,channel_id:0
 msgid "Channel"
-msgstr "通路"
+msgstr "管道"
 
 #. module: crm
 #: view:crm.lead:0 view:crm.lead.report:0 view:crm.meeting:0
 #: view:crm.phonecall:0 view:crm.phonecall.report:0
 msgid "My Sales Team(s)"
-msgstr ""
+msgstr "我的銷售團隊"
 
 #. module: crm
 #: help:crm.segmentation,exclusif:0
@@ -2884,34 +2911,36 @@ msgid ""
 "If checked, remove the category from partners that doesn't match "
 "segmentation criterions"
 msgstr ""
+"檢查是否限制此分類的業務夥伴符合細分規則。\n"
+"如勾選此項，將從業務夥伴移除不符合細分規則的分類。"
 
 #. module: crm
 #: field:crm.meeting,exdate:0
 msgid "Exception Date/Times"
-msgstr ""
+msgstr "例外的日期/ 時間"
 
 #. module: crm
 #: help:crm.meeting,date_deadline:0
 msgid ""
 "Deadline Date is automatically                         computed from Start "
 "Date + Duration"
-msgstr ""
+msgstr "從“開始”日期+時間自動計算截止日期"
 
 #. module: crm
 #: field:crm.lead,state_id:0
 msgid "Fed. State"
-msgstr ""
+msgstr "省/州"
 
 #. module: crm
 #: model:process.transition,note:crm.process_transition_leadopportunity0
 msgid "Creating business opportunities from Leads"
-msgstr ""
+msgstr "從潛在客戶建立商機"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.open_board_statistical_dash
 #: model:ir.ui.menu,name:crm.menu_board_statistics_dash
 msgid "CRM Dashboard"
-msgstr ""
+msgstr "客戶關係管理控制台"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor4
@@ -2921,22 +2950,22 @@ msgstr "需要資訊"
 #. module: crm
 #: model:process.transition,name:crm.process_transition_leadopportunity0
 msgid "Prospect Opportunity"
-msgstr "展望機會"
+msgstr "探查商機"
 
 #. module: crm
 #: field:base.action.rule,act_categ_id:0
 msgid "Set Category to"
-msgstr "將分類設為"
+msgstr "設置分類為"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Mail To"
-msgstr ""
+msgstr "收信人"
 
 #. module: crm
 #: field:crm.meeting,th:0
 msgid "Thu"
-msgstr "四"
+msgstr "週四"
 
 #. module: crm
 #: view:crm.add.note:0 view:crm.merge.opportunity:0
@@ -2953,23 +2982,23 @@ msgstr "每天"
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_stage_form_installer
 msgid "Review Sales Stages"
-msgstr ""
+msgstr "檢查銷售階段"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_lead2
 msgid "Qualification"
-msgstr ""
+msgstr "資格"
 
 #. module: crm
 #: field:crm.lead,partner_address_email:0
 msgid "Partner Contact Email"
-msgstr ""
+msgstr "業務夥伴郵箱"
 
 #. module: crm
 #: code:addons/crm/wizard/crm_lead_to_partner.py:48
 #, python-format
 msgid "A partner is already defined."
-msgstr ""
+msgstr "商業夥伴已建立."
 
 #. module: crm
 #: selection:crm.meeting,byday:0
@@ -2979,24 +3008,24 @@ msgstr "第一"
 #. module: crm
 #: field:crm.lead.report,deadline_month:0
 msgid "Exp. Closing Month"
-msgstr ""
+msgstr "預期結束月數"
 
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
 #: selection:crm.lead.report,deadline_month:0
 #: selection:crm.meeting,month_list:0 selection:crm.phonecall.report,month:0
 msgid "December"
-msgstr "十二月"
+msgstr "12月"
 
 #. module: crm
 #: view:base.action.rule:0
 msgid "Condition on Communication History"
-msgstr ""
+msgstr "溝通日誌的條件"
 
 #. module: crm
 #: view:crm.phonecall:0
 msgid "Date of Call"
-msgstr ""
+msgstr "呼叫日期"
 
 #. module: crm
 #: help:crm.segmentation,som_interval:0
@@ -3009,6 +3038,10 @@ msgid ""
 "bought goods to another supplier.                  \n"
 "Use this functionality for recurring businesses."
 msgstr ""
+"在一個期間兩個週期間這細分的業務夥伴銷售或採購的平均天數。\n"
+"它主要用來檢查業務夥伴有沒有業務或者多長時間有。\n"
+"所以因此我們假定他的滿意度下降因此向其它供應商採購。\n"
+"對經常的業務使用這功能。"
 
 #. module: crm
 #: field:crm.meeting,vtimezone:0
@@ -3018,53 +3051,53 @@ msgstr "時區"
 #. module: crm
 #: field:crm.meeting,sa:0
 msgid "Sat"
-msgstr "六"
+msgstr "週六"
 
 #. module: crm
 #: view:crm.lead:0 field:crm.lead,user_id:0 view:crm.lead.report:0
 #: view:crm.phonecall.report:0
 msgid "Salesman"
-msgstr "業務員"
+msgstr "業務人員"
 
 #. module: crm
 #: view:crm.lead:0 field:crm.lead,date_deadline:0
 msgid "Expected Closing"
-msgstr ""
+msgstr "預期結束"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_opportunity2phonecall
 msgid "Opportunity to Phonecall"
-msgstr ""
+msgstr "商機轉成電訪"
 
 #. module: crm
 #: help:crm.case.section,allow_unlink:0
 msgid "Allows to delete non draft cases"
-msgstr ""
+msgstr "允許刪除不是草稿的業務"
 
 #. module: crm
 #: field:crm.meeting,count:0
 msgid "Repeat"
-msgstr "重覆"
+msgstr "重複"
 
 #. module: crm
 #: field:crm.lead.report,deadline_year:0
 msgid "Ex. Closing Year"
-msgstr ""
+msgstr "預期結束年數"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Partner Name"
-msgstr "伙伴名稱"
+msgstr "業務夥伴名稱"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_phone2
 msgid "Outbound"
-msgstr ""
+msgstr "致電"
 
 #. module: crm
 #: 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
@@ -3074,22 +3107,22 @@ msgstr "團隊成員"
 #. module: crm
 #: view:crm.lead:0 view:crm.meeting:0 view:crm.phonecall:0
 msgid "Contacts"
-msgstr "聯絡人"
+msgstr "聯絡人列表"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor1
 msgid "Interest in Computer"
-msgstr ""
+msgstr "對電腦有興趣"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Invitation Detail"
-msgstr "邀約詳情"
+msgstr "邀請內容"
 
 #. module: crm
 #: field:crm.segmentation,som_interval_default:0
 msgid "Default (0=None)"
-msgstr "預設 (0=無)"
+msgstr "預設(0=無)"
 
 #. module: crm
 #: help:crm.lead,email_cc:0
@@ -3097,13 +3130,13 @@ 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 ""
+msgstr "這些郵件地址將添加到之前發送記錄的發送和接收郵件的副本欄位，以逗點分隔多個郵件地址。"
 
 #. module: crm
 #: 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
 #: field:crm.partner2opportunity,probability:0
@@ -3116,17 +3149,17 @@ msgstr "成功概率"
 #: selection:crm.phonecall,state:0 selection:crm.phonecall.report,state:0
 #, python-format
 msgid "Draft"
-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
 #: field:crm.meeting,attendee_ids:0
 msgid "Attendees"
-msgstr "出席者"
+msgstr "與會者"
 
 #. module: crm
 #: view:crm.meeting:0 view:crm.phonecall:0
@@ -3139,35 +3172,35 @@ msgstr "會議"
 #. module: crm
 #: model:ir.model,name:crm.model_crm_case_categ
 msgid "Category of Case"
-msgstr "案例分類"
+msgstr "業務分類"
 
 #. module: crm
 #: view:crm.lead:0 view:crm.phonecall:0
 msgid "7 Days"
-msgstr "七日"
+msgstr "7天"
 
 #. module: crm
 #: view:board.board:0
 msgid "Planned Revenue by Stage and User"
-msgstr "各階段及用戶計劃收益"
+msgstr "按銷售階段及使用者的計劃營收"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Communication & History"
-msgstr ""
+msgstr "溝通&日誌"
 
 #. module: crm
 #: selection:crm.lead,priority:0 selection:crm.lead.report,priority:0
 #: selection:crm.phonecall,priority:0
 #: selection:crm.phonecall.report,priority:0
 msgid "Normal"
-msgstr ""
+msgstr "一般"
 
 #. module: crm
 #: code:addons/crm/wizard/crm_lead_to_opportunity.py:104
 #, python-format
 msgid "Closed/Cancelled Leads can not be converted into Opportunity"
-msgstr ""
+msgstr "關閉或取消狀態的潛在客戶不能轉為商機"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_meeting_categ_action
@@ -3178,64 +3211,64 @@ msgstr "會議分類"
 #. module: crm
 #: view:crm.phonecall2partner:0
 msgid "You may have to verify that this partner does not exist already."
-msgstr ""
+msgstr "你可能要確認這個業務夥伴是否已不存在"
 
 #. module: crm
 #: field:crm.lead.report,delay_open:0
 msgid "Delay to Open"
-msgstr ""
+msgstr "延遲開啟"
 
 #. module: crm
 #: field:crm.lead.report,user_id:0 field:crm.phonecall.report,user_id:0
 msgid "User"
-msgstr "用戶"
+msgstr "使用者"
 
 #. module: crm
 #: code:addons/crm/crm.py:446
 #, python-format
 msgid "The case '%s' has been cancelled."
-msgstr ""
+msgstr "這業務'%s'已取消"
 
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
 #: selection:crm.lead.report,deadline_month:0
 #: selection:crm.meeting,month_list:0 selection:crm.phonecall.report,month:0
 msgid "November"
-msgstr "十一月"
+msgstr "11月"
 
 #. 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.meeting,month_list:0 selection:crm.phonecall.report,month:0
 msgid "January"
-msgstr "一月"
+msgstr "1月"
 
 #. 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 "Twitter 廣告"
+msgstr "Twitter地址"
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:336
 #, python-format
 msgid "The opportunity '%s' has been been won."
-msgstr ""
+msgstr "商機 '%s'  成交"
 
 #. module: crm
 #: field:crm.case.stage,case_default:0
 msgid "Common to All Teams"
-msgstr ""
+msgstr "適用於所有團隊"
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:831 code:addons/crm/wizard/crm_add_note.py:28
@@ -3246,60 +3279,60 @@ msgstr "錯誤"
 #. module: crm
 #: view:crm.lead.report:0
 msgid "Planned Revenues"
-msgstr "計劃收益"
+msgstr "計劃收入"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor7
 msgid "Need Consulting"
-msgstr ""
+msgstr "需要諮詢"
 
 #. module: crm
 #: constraint:crm.segmentation:0
 msgid "Error ! You can not create recursive profiles."
-msgstr ""
+msgstr "錯誤! 你不能建立循環引用的剖面。"
 
 #. module: crm
 #: help:crm.lead.report,deadline_year:0
 msgid "Expected closing year"
-msgstr ""
+msgstr "預期結束年數"
 
 #. module: crm
 #: field:crm.lead,partner_address_id:0 field:crm.meeting,partner_address_id:0
 #: field:crm.phonecall,partner_address_id:0
 msgid "Partner Contact"
-msgstr "伙伴聯絡人"
+msgstr "業務夥伴聯絡方式"
 
 #. module: crm
 #: field:crm.meeting,recurrent_id:0
 msgid "Recurrent ID date"
-msgstr ""
+msgstr "循環日期"
 
 #. module: crm
 #: sql_constraint:res.users:0
 msgid "You can not have two users with the same login !"
-msgstr ""
+msgstr "兩個使用者不能使用相同的登入名稱！"
 
 #. module: crm
 #: code:addons/crm/crm.py:409 view:crm.lead:0 view:res.partner:0
 #, python-format
 msgid "Close"
-msgstr "關閉"
+msgstr "結束"
 
 #. module: crm
 #: selection:crm.opportunity2phonecall,action:0
 #: selection:crm.phonecall2phonecall,action:0
 msgid "Schedule a call"
-msgstr ""
+msgstr "安排通話"
 
 #. module: crm
 #: view:crm.lead:0 view:crm.phonecall:0
 msgid "Categorization"
-msgstr "分類化"
+msgstr "歸類"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Log Call"
-msgstr ""
+msgstr "記錄通話日誌"
 
 #. module: crm
 #: model:ir.model,name:crm.model_base_action_rule
@@ -3309,47 +3342,47 @@ msgstr "動作規則"
 #. module: crm
 #: field:crm.meeting,rrule_type:0
 msgid "Recurrency"
-msgstr ""
+msgstr "循環"
 
 #. module: crm
 #: field:crm.meeting,phonecall_id:0
 msgid "Phonecall"
-msgstr "致電"
+msgstr "電訪"
 
 #. module: crm
 #: selection:crm.meeting,week_list:0
 msgid "Thursday"
-msgstr "星期四"
+msgstr "週四"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "To"
-msgstr ""
+msgstr "到"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Create date"
-msgstr ""
+msgstr "發現日期"
 
 #. module: crm
 #: selection:crm.meeting,class:0
 msgid "Private"
-msgstr ""
+msgstr "私有的"
 
 #. module: crm
 #: selection:crm.meeting,class:0
 msgid "Public for Employees"
-msgstr ""
+msgstr "全體員工可見"
 
 #. module: crm
 #: field:crm.lead,function:0
 msgid "Function"
-msgstr ""
+msgstr "職務"
 
 #. module: crm
 #: view:crm.add.note:0
 msgid "_Add"
-msgstr ""
+msgstr "添加"
 
 #. module: crm
 #: field:crm.case.section,note:0 view:crm.meeting:0
@@ -3361,60 +3394,60 @@ msgstr "說明"
 #. module: crm
 #: view:crm.phonecall.report:0
 msgid "Phone calls made in current month"
-msgstr ""
+msgstr "本月通話記錄"
 
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
 #: selection:crm.lead.report,deadline_month:0
 #: selection:crm.meeting,month_list:0 selection:crm.phonecall.report,month:0
 msgid "May"
-msgstr "五月"
+msgstr "5月"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor2
 msgid "Interest in Accessories"
-msgstr ""
+msgstr "對週邊商品感興趣"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "New Opportunities"
-msgstr ""
+msgstr "新建商機"
 
 #. module: crm
 #: code:addons/crm/crm_action_rule.py:61
 #, python-format
 msgid "No E-Mail Found for your Company address!"
-msgstr ""
+msgstr "公司未配置郵箱"
 
 #. module: crm
 #: field:crm.lead.report,email:0
 msgid "# Emails"
-msgstr ""
+msgstr "電子郵件"
 
 #. module: crm
 #: field:crm.lead,street:0
 msgid "Street"
-msgstr ""
+msgstr "街道"
 
 #. module: crm
 #: view:crm.lead.report:0
 msgid "Opportunities by User and Team"
-msgstr "各用戶及團隊機會"
+msgstr "使用者和團隊的商機"
 
 #. module: crm
 #: view:crm.phonecall:0
 msgid "Reset to Todo"
-msgstr ""
+msgstr "重設為待辦"
 
 #. module: crm
 #: field:crm.case.section,working_hours:0
 msgid "Working Hours"
-msgstr ""
+msgstr "工時"
 
 #. module: crm
 #: field:res.partner,phonecall_ids:0
 msgid "Phonecalls"
-msgstr "致電"
+msgstr "電訪列表"
 
 #. module: crm
 #: view:crm.lead:0 field:crm.lead,is_customer_add:0
@@ -3433,7 +3466,7 @@ msgstr "最低"
 #: selection:crm.lead.report,deadline_month:0
 #: selection:crm.meeting,month_list:0 selection:crm.phonecall.report,month:0
 msgid "February"
-msgstr "二月"
+msgstr "2月"
 
 #. module: crm
 #: field:base.action.rule,trg_section_id:0 field:crm.case.categ,section_id:0
@@ -3446,23 +3479,23 @@ msgstr "二月"
 #: view:crm.phonecall.report:0 field:crm.phonecall2phonecall,section_id:0
 #: field:res.partner,section_id:0 field:res.users,context_section_id:0
 msgid "Sales Team"
-msgstr "業務團隊"
+msgstr "銷售團隊"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_lead6 view:crm.lead:0
 msgid "Lost"
-msgstr ""
+msgstr "丟單"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Edit"
-msgstr ""
+msgstr "編輯"
 
 #. module: crm
 #: field:crm.lead,country_id:0 view:crm.lead.report:0
 #: field:crm.lead.report,country_id:0
 msgid "Country"
-msgstr "國家或地區"
+msgstr "國家"
 
 #. module: crm
 #: view:crm.lead:0 view:crm.lead2opportunity.partner:0
@@ -3471,12 +3504,12 @@ msgstr "國家或地區"
 #: selection:crm.lead2opportunity.partner.mass,name:0 view:crm.phonecall:0
 #: view:res.partner:0
 msgid "Convert to Opportunity"
-msgstr ""
+msgstr "轉換成商機"
 
 #. module: crm
 #: selection:crm.meeting,week_list:0
 msgid "Wednesday"
-msgstr "星期三"
+msgstr "週三"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_case_categ_phone_incoming0
@@ -3486,28 +3519,30 @@ msgid ""
 "partner. From the phone call form, you can trigger a request for another "
 "call, a meeting or an opportunity."
 msgstr ""
+"這個工具可以讓你迅速記錄接到的電話。每次你接到的電話都會出現在客戶的表單上用於記錄你和業務夥伴的每次通話。在電訪表單上，你可以安排另一次通話，或會面，或新"
+"建一個商機。"
 
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
 #: selection:crm.lead.report,deadline_month:0
 #: selection:crm.meeting,month_list:0 selection:crm.phonecall.report,month:0
 msgid "April"
-msgstr "四月"
+msgstr "4月"
 
 #. 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
 msgid "Phone calls by user and section"
-msgstr ""
+msgstr "按使用者及分類的電訪"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_case_channel_action
@@ -3515,13 +3550,13 @@ msgid ""
 "Track from where is coming your leads and opportunities by creating specific "
 "channels that will be maintained at the creation of a document in the "
 "system. Some examples of channels can be: Website, Phone Call, Reseller, etc."
-msgstr ""
+msgstr "管道用於記錄你的銷售潛在客戶或商機的來源，並利用系統建立的文件來記錄。例如：網站、電話、經銷商等"
 
 #. module: crm
 #: selection:crm.lead2opportunity.partner,name:0
 #: selection:crm.lead2opportunity.partner.mass,name:0
 msgid "Merge with existing Opportunity"
-msgstr "與現有機會合併"
+msgstr "合併現有的商機"
 
 #. module: crm
 #: field:crm.meeting,select1:0
@@ -3531,27 +3566,27 @@ msgstr "選項"
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_lead4
 msgid "Negotiation"
-msgstr "協商"
+msgstr "談判"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Exp.Closing"
-msgstr ""
+msgstr "結束中"
 
 #. module: crm
 #: field:crm.case.stage,sequence:0 field:crm.meeting,sequence:0
 msgid "Sequence"
-msgstr ""
+msgstr "序列"
 
 #. module: crm
 #: model:ir.model,name:crm.model_mail_compose_message
 msgid "E-mail composition wizard"
-msgstr ""
+msgstr "郵件合併精靈"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Accept"
-msgstr "接受"
+msgstr "同意"
 
 #. module: crm
 #: field:crm.segmentation.line,expr_name:0
@@ -3561,12 +3596,12 @@ msgstr "控制變量"
 #. module: crm
 #: selection:crm.meeting,byday:0
 msgid "Second"
-msgstr ""
+msgstr "第二"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_lead3
 msgid "Proposition"
-msgstr ""
+msgstr "建議"
 
 #. module: crm
 #: field:crm.lead.report,date_closed:0
@@ -3578,17 +3613,17 @@ msgstr "結束日期"
 #: view:crm.lead.report:0 view:crm.phonecall.report:0
 #: field:crm.phonecall.report,name:0
 msgid "Year"
-msgstr ""
+msgstr "年"
 
 #. module: crm
 #: constraint:res.partner:0
 msgid "Error ! You cannot create recursive associated members."
-msgstr ""
+msgstr "錯誤! 你不能建立循環引用的成員。"
 
 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_lead8
 msgid "Newsletter"
-msgstr ""
+msgstr "電子報"
 
 #~ msgid "Planned Costs"
 #~ msgstr "计划成本"
@@ -3782,3 +3817,18 @@ msgstr ""
 
 #~ msgid "Current Activity"
 #~ msgstr "當前動態"
+
+#~ msgid "Assigned opportunities to"
+#~ msgstr "已指派商機給"
+
+#~ msgid "Schedule/Log a call"
+#~ msgstr "安排/紀錄一個電話拜訪"
+
+#~ msgid "End of recurrency"
+#~ msgstr "循環結束"
+
+#~ msgid "Schedule call"
+#~ msgstr "安排電訪"
+
+#~ msgid "Referred By"
+#~ msgstr "介紹人"
diff --git a/addons/crm/report/crm_lead_report_view.xml b/addons/crm/report/crm_lead_report_view.xml
index 4283dd8fb3c..35ed9411215 100644
--- a/addons/crm/report/crm_lead_report_view.xml
+++ b/addons/crm/report/crm_lead_report_view.xml
@@ -105,21 +105,11 @@
                         <filter string="Company" icon="terp-go-home" domain="[]" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
                         <filter string="Stage" name="Stage" icon="terp-stage" domain="[]" context="{'group_by':'stage_id'}"/>
                         <filter string="Priority"  icon="terp-rating-rated" domain="[]" context="{'group_by':'priority'}" />
-                        <filter string="Campaign" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'type_id'}" />
-                        <filter string="Channel" icon="terp-call-start" domain="[]" context="{'group_by':'channel_id'}" />
-                        <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}" />
-                        <filter string="Year" icon="terp-go-year" domain="[]" context="{'group_by':'creation_year'}"/>
-                        <filter string="Month" icon="terp-go-month" domain="[]" context="{'group_by':'creation_month'}"/>
-                        <filter string="Day" icon="terp-go-today" domain="[]" context="{'group_by':'creation_day'}"/>
-                        <filter string="Exp. Closing"  icon="terp-go-month" domain="[]" context="{'group_by':'deadline_month'}"/>
                         <filter string="Campaign" icon="terp-gtk-jump-to-rtl"
                             domain="[]" context="{'group_by':'type_id'}" />
                         <filter string="Channel" icon="terp-call-start"
                             domain="[]" context="{'group_by':'channel_id'}" />
                         <separator orientation="vertical" />
-                        <filter string="Status" icon="terp-stock_effects-object-colorize"
-                            domain="[]" context="{'group_by':'state'}" />
-                        <separator orientation="vertical" />
                         <filter string="Year" icon="terp-go-year"
                             domain="[]" context="{'group_by':'creation_year'}"/>
                         <filter string="Month" icon="terp-go-month"
diff --git a/addons/crm/res_config.py b/addons/crm/res_config.py
index c6d33b4bec2..1d30abdc33c 100644
--- a/addons/crm/res_config.py
+++ b/addons/crm/res_config.py
@@ -38,7 +38,7 @@ class crm_configuration(osv.osv_memory):
         'module_import_google': fields.boolean("Google (Contacts and Calendar)",
             help="""Import google contact in partner address and add google calendar events details in Meeting.
                 This installs the module import_google."""),
-        'module_google_map': fields.boolean("add google maps on customer",
+        'module_google_map': fields.boolean("add google maps on customers",
             help="""Locate customers on Google Map.
                 This installs the module google_map."""),
         'group_fund_raising': fields.boolean("Manage Fund Raising",
diff --git a/addons/crm/test/process/communication_with_customer.yml b/addons/crm/test/process/communication_with_customer.yml
index 1653be10763..d18fa5495d9 100644
--- a/addons/crm/test/process/communication_with_customer.yml
+++ b/addons/crm/test/process/communication_with_customer.yml
@@ -23,7 +23,7 @@
   !python {model: mail.compose.message}: |
     lead_ids = self.pool.get('crm.lead').search(cr, uid, [('email_from','=', 'Mr. John Right <info@customer.com>')])
     context.update({'active_model': 'crm.lead','active_id': lead_ids[0]})
-    id = self.create(cr, uid, {'body_text': "Merci à l'intérêt pour notre produit.nous vous contacterons bientôt. Merci", 'email_from': 'sales@mycompany.com'}, context=context)
+    id = self.create(cr, uid, {'body': "Merci à l'intérêt pour notre produit.nous vous contacterons bientôt. Merci", 'email_from': 'sales@mycompany.com'}, context=context)
     try:
         self.send_mail(cr, uid, [id], context=context)
     except:
@@ -34,12 +34,6 @@
   !python {model: crm.lead}: |
     lead_ids = self.search(cr, uid, [('email_from','=', 'Mr. John Right <info@customer.com>')])
     self.convert_partner(cr, uid, lead_ids, context=context)
--
-  Now, I search customer in regular customer list.
--
-  !python {model: crm.lead}: |
-    partner_ids = self.message_partner_by_email(cr, uid, 'Mr. John Right <info@customer.com>')
-    assert partner_ids.get('partner_id'), "Customer is not found in regular customer list."
 -
   I convert one phonecall request as a customer and put into regular customer list. 
 -
diff --git a/addons/crm/test/process/lead2opportunity2win.yml b/addons/crm/test/process/lead2opportunity2win.yml
index 23713dfca2f..ed552421cf0 100644
--- a/addons/crm/test/process/lead2opportunity2win.yml
+++ b/addons/crm/test/process/lead2opportunity2win.yml
@@ -55,7 +55,7 @@
   After communicated  with customer, I put some notes with contract details.
 -
   !python {model: crm.lead}: |
-    self.message_append_note(cr, uid, [ref('crm_case_4')], subject='Test note', body='ces détails envoyés par le client sur ​​le FAX pour la qualité')
+    self.message_post(cr, uid, [ref('crm_case_4')], subject='Test note', body='ces détails envoyés par le client sur ​​le FAX pour la qualité')
 -
   I win this opportunity
 -
@@ -73,7 +73,7 @@
   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_4")}) 
+    context.update({'active_model': 'crm.lead', 'active_ids': [ref("crm_case_11"), ref("crm_case_2")], 'active_id': ref("crm_case_11")}) 
     id = self.create(cr, uid, {'user_ids': [ref('base.user_root')], 'section_id': ref('crm.section_sales_department')}, context=context)
     self.mass_convert(cr, uid, [id], context=context)
 -
@@ -83,7 +83,8 @@
     opp = self.browse(cr, uid, ref('crm_case_11'))
     assert opp.name == "Need estimated cost for new project", "Opportunity name not correct"
     assert opp.type == 'opportunity', 'Lead is not converted to opportunity!'
-    assert opp.partner_id.name == "Thomas Passot", 'Partner mismatch!'
+    expected_partner = "Thomas Passot"
+    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!'
 -
   Then check for second lead converted on opportunity.
diff --git a/addons/crm/wizard/crm_lead_to_opportunity.py b/addons/crm/wizard/crm_lead_to_opportunity.py
index 547d3ed299e..e90303dda66 100644
--- a/addons/crm/wizard/crm_lead_to_opportunity.py
+++ b/addons/crm/wizard/crm_lead_to_opportunity.py
@@ -24,8 +24,6 @@ from tools.translate import _
 import tools
 import re
 
-import time
-
 class crm_lead2opportunity_partner(osv.osv_memory):
     _name = 'crm.lead2opportunity.partner'
     _description = 'Lead To Opportunity Partner'
@@ -35,8 +33,8 @@ class crm_lead2opportunity_partner(osv.osv_memory):
         'action': fields.selection([('exist', 'Link to an existing partner'), \
                                     ('create', 'Create a new partner'), \
                                     ('nothing', 'Do not link to a partner')], \
-                                    'Action', required=True),
-        'name': fields.selection([('convert', 'Convert to Opportunity'), ('merge', 'Merge with existing Opportunity')],'Select Action', required=True),
+                                    'Related Partner', required=True),
+        'name': fields.selection([('convert', 'Convert to Opportunities'), ('merge', 'Merge with existing Opportunities')], 'Conversion Action', required=True),
         'opportunity_ids': fields.many2many('crm.lead', string='Opportunities', domain=[('type', '=', 'opportunity')]),
     }
 
@@ -68,8 +66,6 @@ class crm_lead2opportunity_partner(osv.osv_memory):
             if ids:
                 opportunities.append(ids[0])
         if not partner_id:
-            label = False
-            opp_ids = []
             if email:
                 # Find email of existing opportunity matches the email_from of the lead
                 cr.execute("""select id from crm_lead where type='opportunity' and
@@ -106,23 +102,36 @@ class crm_lead2opportunity_partner(osv.osv_memory):
         if context is None:
             context = {}
         lead = self.pool.get('crm.lead')
-        partner_id = self._create_partner(cr, uid, ids, context=context)
+        res = False
+        partner_ids_map = self._create_partner(cr, uid, ids, context=context)
         lead_ids = vals.get('lead_ids', [])
-        user_ids = vals.get('user_ids', False)
         team_id = vals.get('section_id', False)
-        return lead.convert_opportunity(cr, uid, lead_ids, partner_id, user_ids, team_id, context=context)
+        for lead_id in lead_ids:
+            partner_id = partner_ids_map.get(lead_id, False)
+            # FIXME: cannot pass user_ids as the salesman allocation only works in batch
+            res = lead.convert_opportunity(cr, uid, [lead_id], partner_id, [], team_id, context=context)
+        # FIXME: must perform salesman allocation in batch separately here  
+        user_ids = vals.get('user_ids', False)
+        if user_ids:
+            lead.allocate_salesman(cr, uid, lead_ids, user_ids, team_id=team_id, context=context)
+        return res
 
     def _merge_opportunity(self, cr, uid, ids, opportunity_ids, action='merge', context=None):
-        #TOFIX: is it usefully ?
         if context is None:
             context = {}
-        merge_opportunity = self.pool.get('crm.merge.opportunity')
         res = False
-        #If we convert in mass, don't merge if there is no other opportunity but no warning
-        if action == 'merge' and (len(opportunity_ids) > 1 or not context.get('mass_convert') ):
-            self.write(cr, uid, ids, {'opportunity_ids' : [(6,0, [opportunity_ids[0].id])]}, context=context)
-            context.update({'lead_ids' : record_id, "convert" : True})
-            res = merge_opportunity.merge(cr, uid, data.opportunity_ids, context=context)
+        # Expected: all newly-converted leads (active_ids) will be merged with the opportunity(ies)
+        # that have been selected in the 'opportunity_ids' m2m, with all these records
+        # merged into the first opportunity (and the rest deleted)
+        opportunity_ids = [o.id for o in opportunity_ids]
+        lead_ids = context.get('active_ids', [])
+        if action == 'merge' and lead_ids and opportunity_ids:
+            # Add the leads in the to-merge list, next to other opps
+            # (the fact that they're passed in context['lead_ids'] means that
+            # they cannot be selected to contain the result of the merge.
+            opportunity_ids.extend(lead_ids)
+            context.update({'lead_ids': lead_ids, "convert" : True})
+            res = self.pool.get('crm.lead').merge_opportunity(cr, uid, opportunity_ids, context=context)
         return res
 
     def action_apply(self, cr, uid, ids, context=None):
@@ -131,27 +140,37 @@ class crm_lead2opportunity_partner(osv.osv_memory):
         """
         if not context:
             context = {}
-
         lead = self.pool.get('crm.lead')
         lead_ids = context.get('active_ids', [])
         data = self.browse(cr, uid, ids, context=context)[0]
         self._convert_opportunity(cr, uid, ids, {'lead_ids': lead_ids}, context=context)
-        self._merge_opportunity(cr, uid, ids, data.opportunity_ids, data.action, context=context)
+        self._merge_opportunity(cr, uid, ids, data.opportunity_ids, data.name, context=context)
         return lead.redirect_opportunity_view(cr, uid, lead_ids[0], context=context)
 
-crm_lead2opportunity_partner()
 
 class crm_lead2opportunity_mass_convert(osv.osv_memory):
     _name = 'crm.lead2opportunity.partner.mass'
     _description = 'Mass Lead To Opportunity Partner'
     _inherit = 'crm.lead2opportunity.partner'
 
-
     _columns = {
-            'user_ids':  fields.many2many('res.users', string='Salesmans'),
+            'user_ids':  fields.many2many('res.users', string='Salesmen'),
             'section_id': fields.many2one('crm.case.section', 'Sales Team'),
-
     }
+
+    def default_get(self, cr, uid, fields, context=None):
+        res = super(crm_lead2opportunity_mass_convert, self).default_get(cr, uid, fields, context)
+        if 'partner_id' in fields:
+            # avoid forcing the partner of the first lead as default
+            res['partner_id'] = False
+        if 'action' in fields:
+            res['action'] = 'create'
+        if 'name' in fields:
+            res['name'] = 'convert'
+        if 'opportunity_ids' in fields:
+            res['opportunity_ids'] = False
+        return res
+
     def _convert_opportunity(self, cr, uid, ids, vals, context=None):
         data = self.browse(cr, uid, ids, context=context)[0]
         salesteam_id = data.section_id and data.section_id.id or False
@@ -162,9 +181,6 @@ class crm_lead2opportunity_mass_convert(osv.osv_memory):
         return super(crm_lead2opportunity_mass_convert, self)._convert_opportunity(cr, uid, ids, vals, context=context)
 
     def mass_convert(self, cr, uid, ids, context=None):
-        value = self.default_get(cr, uid, ['partner_id', 'opportunity_ids'], context=context)
-        value['opportunity_ids'] = [(6, 0, value['opportunity_ids'])]
-        self.write(cr, uid, ids, value, context=context)
         return self.action_apply(cr, uid, ids, context=context)
-crm_lead2opportunity_mass_convert()
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/crm/wizard/crm_lead_to_opportunity_view.xml b/addons/crm/wizard/crm_lead_to_opportunity_view.xml
index 8829749efa3..6a826f7bc0e 100644
--- a/addons/crm/wizard/crm_lead_to_opportunity_view.xml
+++ b/addons/crm/wizard/crm_lead_to_opportunity_view.xml
@@ -37,24 +37,38 @@
             <field name="model">crm.lead2opportunity.partner.mass</field>
             <field name="arch" type="xml">
                 <form string="Convert to Opportunity" version="7.0">
-                    <field name="action"/>
-                    <field name="name" colspan="4"/>
-                    <group string="Assigned Opportunities to">
-                        <field name="section_id"/>
+                    <group string="Conversion Options">
+                        <field name="action"/>
+                        <field name="partner_id" attrs="{'invisible':[('action','!=','exist')],'required': [('action', '=', 'exist')]}"/>
+                        <field name="name"/>
                     </group>
-                    <separator string="Select Salesman"/>
-                    <field name="user_ids">
+                    <group string="Select Opportunities" attrs="{'invisible': [('name', '=', 'convert')]}">
+                    <field name="opportunity_ids" colspan="4" nolabel="1" attrs="{'invisible': [('name', '=', 'convert')]}">
                         <tree>
-                            <field name="name"/>
+                            <field name="name" />
+                            <field name="partner_id" />
+                            <field name="user_id" />
+                            <field name="section_id" />
                         </tree>
                     </field>
+                    </group>
+                    
+                    <group string="Assign opportunities to">
+                        <field name="section_id" />
+                        <field name="user_ids" colspan="4">
+                            <tree>
+                                <field name="name" />
+                            </tree>
+                        </field>
+                    </group>
+                    
                     <footer>
-                        <button name="mass_convert" string="Convert into Opportunities" type="object" class="oe_highlight"/>
+                        <button name="mass_convert" string="Convert to Opportunities" type="object" class="oe_highlight"/>
                         or
                         <button string="Cancel" class="oe_link" special="cancel"/>
-                    </footer>
+                    </footer>                            
                 </form>
-            </field>
+              </field>
         </record>
 
         <record id="action_crm_lead2opportunity_partner" model="ir.actions.act_window">
diff --git a/addons/crm/wizard/crm_lead_to_partner.py b/addons/crm/wizard/crm_lead_to_partner.py
index 98f114b4088..9b239bab7b9 100644
--- a/addons/crm/wizard/crm_lead_to_partner.py
+++ b/addons/crm/wizard/crm_lead_to_partner.py
@@ -50,20 +50,20 @@ class crm_lead2partner(osv.osv_memory):
     def _select_partner(self, cr, uid, context=None):
         if context is None:
             context = {}
-        lead = self.pool.get('crm.lead')
-        partner = self.pool.get('res.partner')
-        lead_ids = list(context and context.get('active_ids', []) or [])
-        if not len(lead_ids):
+        if not context.get('active_model') == 'crm.lead' or not context.get('active_id'):
             return False
-        this = lead.browse(cr, uid, lead_ids[0], context=context)
-        # Find partner address matches the email_from of the lead
-        res = lead.message_partner_by_email(cr, uid, this.email_from, context=context)
-        partner_id = res.get('partner_id', False)      
-        # Find partner name that matches the name of the lead
-        if not partner_id and this.partner_name:
+        partner = self.pool.get('res.partner')
+        lead = self.pool.get('crm.lead')
+        this = lead.browse(cr, uid, context.get('active_id'), context=context)
+        partner_id = False
+        if this.email_from:
+            partner_ids = partner.search(cr, uid, [('email', '=', this.email_from)], context=context)
+            if partner_ids:
+                partner_id = partner_ids[0]
+        if not this.partner_id and this.partner_name:
             partner_ids = partner.search(cr, uid, [('name', '=', this.partner_name)], context=context)
-            if partner_ids and len(partner_ids):
-               partner_id = partner_ids[0]
+            if partner_ids:
+                partner_id = partner_ids[0]
         return partner_id
 
     def default_get(self, cr, uid, fields, context=None):
@@ -107,15 +107,16 @@ class crm_lead2partner(osv.osv_memory):
         lead_ids = context and context.get('active_ids') or []
         data = self.browse(cr, uid, ids, context=context)[0]
         partner_id = data.partner_id and data.partner_id.id or False
-        partner_ids = lead.convert_partner(cr, uid, lead_ids, data.action, partner_id, context=context)
-        return partner_ids[lead_ids[0]]
+        return lead.convert_partner(cr, uid, lead_ids, data.action, partner_id, context=context)
 
     def make_partner(self, cr, uid, ids, context=None):
         """
         This function Makes partner based on action.
         """
-        partner_id = self._create_partner(cr, uid, ids, context=context)
-        return self.pool.get('res.partner').redirect_partner_form(cr, uid, partner_id, context=context)
+        # Only called from Form view, so only meant to convert  one Lead. 
+        lead_id = context and context.get('active_id') or False
+        partner_ids_map = self._create_partner(cr, uid, ids, context=context)
+        return self.pool.get('res.partner').redirect_partner_form(cr, uid, partner_ids_map.get(lead_id, False), context=context)
 
 crm_lead2partner()
 
diff --git a/addons/crm/wizard/crm_partner_to_opportunity_view.xml b/addons/crm/wizard/crm_partner_to_opportunity_view.xml
index 765a22de0a6..7f0b5957071 100644
--- a/addons/crm/wizard/crm_partner_to_opportunity_view.xml
+++ b/addons/crm/wizard/crm_partner_to_opportunity_view.xml
@@ -23,23 +23,5 @@
           </field>
        </record>
 
-<!-- partner To Opportunity Action -->
-
-      <record model="ir.actions.act_window" id="action_view_crm_partner2opportunity">
-            <field name="name">Create Opportunity</field>
-            <field name="res_model">crm.partner2opportunity</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">form,tree,kanban,calendar</field>
-            <field name="target">new</field>
-     </record>
-
-        <!-- partner To Opportunity wizard -->
-
-     <act_window id="crm_partner2opportunity"
-            key2="client_action_multi" name="Create Opportunity"
-            res_model="crm.partner2opportunity" src_model="res.partner"
-            view_id="view_crm_partner2opportunity"
-            view_mode="form" target="new" view_type="form"
-            groups="base.group_sale_salesman"/>
      </data>
 </openerp>
diff --git a/addons/crm/wizard/crm_phonecall_to_partner.py b/addons/crm/wizard/crm_phonecall_to_partner.py
index 422af02f99d..715b7396c66 100644
--- a/addons/crm/wizard/crm_phonecall_to_partner.py
+++ b/addons/crm/wizard/crm_phonecall_to_partner.py
@@ -57,12 +57,10 @@ class crm_phonecall2partner(osv.osv_memory):
         if context is None:
             context = {}
         phonecall = self.pool.get('crm.phonecall')
-
         data = self.browse(cr, uid, ids, context=context)[0]
         call_ids = context and context.get('active_ids') or []
         partner_id = data.partner_id and data.partner_id.id or False
-        partner_ids = phonecall.convert_partner(cr, uid, call_ids, data.action, partner_id, context=context)
-        return partner_ids[call_ids[0]]
+        return phonecall.convert_partner(cr, uid, call_ids, data.action, partner_id, context=context)
 
 crm_phonecall2partner()
 
diff --git a/addons/crm_caldav/__openerp__.py b/addons/crm_caldav/__openerp__.py
index 6e4c108e5dd..f1f9f05cafd 100644
--- a/addons/crm_caldav/__openerp__.py
+++ b/addons/crm_caldav/__openerp__.py
@@ -34,13 +34,12 @@ Caldav features in Meeting.
     'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
     'depends': ['caldav', 'crm' ],
-    'init_xml': [
-                'crm_caldav_data.xml',
-                'crm_caldav_setup.xml',
-                ],
-
-    'update_xml': ['crm_caldav_view.xml'],
-    'demo_xml': [],
+    'data': [
+        'crm_caldav_data.xml',
+        'crm_caldav_setup.xml',
+        'crm_caldav_view.xml'
+    ],
+    'demo': [],
     'installable': True,
     'auto_install': False,
     'certificate' : '001088048737252670109',
diff --git a/addons/crm_caldav/i18n/ar.po b/addons/crm_caldav/i18n/ar.po
index a6bb14b28d3..296a8400066 100644
--- a/addons/crm_caldav/i18n/ar.po
+++ b/addons/crm_caldav/i18n/ar.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: crm_caldav
 #: model:ir.actions.act_window,name:crm_caldav.action_caldav_browse
diff --git a/addons/crm_caldav/i18n/bg.po b/addons/crm_caldav/i18n/bg.po
index 49894f89d75..1654d7758d8 100644
--- a/addons/crm_caldav/i18n/bg.po
+++ b/addons/crm_caldav/i18n/bg.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: crm_caldav
 #: model:ir.actions.act_window,name:crm_caldav.action_caldav_browse
diff --git a/addons/crm_caldav/i18n/ca.po b/addons/crm_caldav/i18n/ca.po
index c46fcb41093..0ba27f6829c 100644
--- a/addons/crm_caldav/i18n/ca.po
+++ b/addons/crm_caldav/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: crm_caldav
 #: model:ir.actions.act_window,name:crm_caldav.action_caldav_browse
diff --git a/addons/crm_caldav/i18n/cs.po b/addons/crm_caldav/i18n/cs.po
index a5603ae9d5c..99f0211c49d 100644
--- a/addons/crm_caldav/i18n/cs.po
+++ b/addons/crm_caldav/i18n/cs.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: crm_caldav
 #: model:ir.actions.act_window,name:crm_caldav.action_caldav_browse
diff --git a/addons/crm_caldav/i18n/da.po b/addons/crm_caldav/i18n/da.po
index c164c8c178d..7704a741204 100644
--- a/addons/crm_caldav/i18n/da.po
+++ b/addons/crm_caldav/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: crm_caldav
 #: model:ir.actions.act_window,name:crm_caldav.action_caldav_browse
diff --git a/addons/crm_caldav/i18n/de.po b/addons/crm_caldav/i18n/de.po
index 966089441a8..d8146304e2e 100644
--- a/addons/crm_caldav/i18n/de.po
+++ b/addons/crm_caldav/i18n/de.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: crm_caldav
 #: model:ir.actions.act_window,name:crm_caldav.action_caldav_browse
diff --git a/addons/crm_caldav/i18n/el.po b/addons/crm_caldav/i18n/el.po
index 527288a5ce2..249f1d6c07d 100644
--- a/addons/crm_caldav/i18n/el.po
+++ b/addons/crm_caldav/i18n/el.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: crm_caldav
 #: model:ir.actions.act_window,name:crm_caldav.action_caldav_browse
diff --git a/addons/crm_caldav/i18n/en_GB.po b/addons/crm_caldav/i18n/en_GB.po
index beb4de53e40..f6eec0a0306 100644
--- a/addons/crm_caldav/i18n/en_GB.po
+++ b/addons/crm_caldav/i18n/en_GB.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: crm_caldav
 #: model:ir.actions.act_window,name:crm_caldav.action_caldav_browse
diff --git a/addons/crm_caldav/i18n/es.po b/addons/crm_caldav/i18n/es.po
index 16145728eb6..17e9d656ed5 100644
--- a/addons/crm_caldav/i18n/es.po
+++ b/addons/crm_caldav/i18n/es.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: crm_caldav
 #: model:ir.actions.act_window,name:crm_caldav.action_caldav_browse
diff --git a/addons/crm_caldav/i18n/es_CR.po b/addons/crm_caldav/i18n/es_CR.po
index c0063cc2d65..998ab0208b7 100644
--- a/addons/crm_caldav/i18n/es_CR.po
+++ b/addons/crm_caldav/i18n/es_CR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 "Language: es\n"
 
 #. module: crm_caldav
diff --git a/addons/crm_caldav/i18n/es_EC.po b/addons/crm_caldav/i18n/es_EC.po
index 7d8e39197fb..6a6e80e07c9 100644
--- a/addons/crm_caldav/i18n/es_EC.po
+++ b/addons/crm_caldav/i18n/es_EC.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: crm_caldav
 #: model:ir.actions.act_window,name:crm_caldav.action_caldav_browse
diff --git a/addons/crm_caldav/i18n/es_PY.po b/addons/crm_caldav/i18n/es_PY.po
index 63ed40dac74..ed678aebab7 100644
--- a/addons/crm_caldav/i18n/es_PY.po
+++ b/addons/crm_caldav/i18n/es_PY.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: crm_caldav
 #: model:ir.actions.act_window,name:crm_caldav.action_caldav_browse
diff --git a/addons/crm_caldav/i18n/fi.po b/addons/crm_caldav/i18n/fi.po
index a845b515aea..4902963772f 100644
--- a/addons/crm_caldav/i18n/fi.po
+++ b/addons/crm_caldav/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: crm_caldav
 #: model:ir.actions.act_window,name:crm_caldav.action_caldav_browse
diff --git a/addons/crm_caldav/i18n/fr.po b/addons/crm_caldav/i18n/fr.po
index 77e2e9b75f4..10238c169d3 100644
--- a/addons/crm_caldav/i18n/fr.po
+++ b/addons/crm_caldav/i18n/fr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: crm_caldav
 #: model:ir.actions.act_window,name:crm_caldav.action_caldav_browse
diff --git a/addons/crm_caldav/i18n/gl.po b/addons/crm_caldav/i18n/gl.po
index 17555bfea0d..87278e6562a 100644
--- a/addons/crm_caldav/i18n/gl.po
+++ b/addons/crm_caldav/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: crm_caldav
 #: model:ir.actions.act_window,name:crm_caldav.action_caldav_browse
diff --git a/addons/crm_caldav/i18n/gu.po b/addons/crm_caldav/i18n/gu.po
index 8252e46307a..34cbcc852ae 100644
--- a/addons/crm_caldav/i18n/gu.po
+++ b/addons/crm_caldav/i18n/gu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: crm_caldav
 #: model:ir.actions.act_window,name:crm_caldav.action_caldav_browse
diff --git a/addons/crm_caldav/i18n/hi.po b/addons/crm_caldav/i18n/hi.po
index 405147f28f8..fcbe5c2962a 100644
--- a/addons/crm_caldav/i18n/hi.po
+++ b/addons/crm_caldav/i18n/hi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: crm_caldav
 #: model:ir.actions.act_window,name:crm_caldav.action_caldav_browse
diff --git a/addons/crm_caldav/i18n/hr.po b/addons/crm_caldav/i18n/hr.po
index f3d6f4ecbf8..e5d00fec2ea 100644
--- a/addons/crm_caldav/i18n/hr.po
+++ b/addons/crm_caldav/i18n/hr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: crm_caldav
 #: model:ir.actions.act_window,name:crm_caldav.action_caldav_browse
diff --git a/addons/crm_caldav/i18n/hu.po b/addons/crm_caldav/i18n/hu.po
index 28bbfc8eb0a..162aaea0a38 100644
--- a/addons/crm_caldav/i18n/hu.po
+++ b/addons/crm_caldav/i18n/hu.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: crm_caldav
 #: model:ir.actions.act_window,name:crm_caldav.action_caldav_browse
diff --git a/addons/crm_caldav/i18n/id.po b/addons/crm_caldav/i18n/id.po
index 6aa27436bf0..b64390df0f1 100644
--- a/addons/crm_caldav/i18n/id.po
+++ b/addons/crm_caldav/i18n/id.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: crm_caldav
 #: model:ir.actions.act_window,name:crm_caldav.action_caldav_browse
diff --git a/addons/crm_caldav/i18n/it.po b/addons/crm_caldav/i18n/it.po
index 6f90b9da135..a6799e76fe9 100644
--- a/addons/crm_caldav/i18n/it.po
+++ b/addons/crm_caldav/i18n/it.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: crm_caldav
 #: model:ir.actions.act_window,name:crm_caldav.action_caldav_browse
diff --git a/addons/crm_caldav/i18n/ja.po b/addons/crm_caldav/i18n/ja.po
index ea405a694cc..7b322885282 100644
--- a/addons/crm_caldav/i18n/ja.po
+++ b/addons/crm_caldav/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: crm_caldav
 #: model:ir.actions.act_window,name:crm_caldav.action_caldav_browse
diff --git a/addons/crm_caldav/i18n/ko.po b/addons/crm_caldav/i18n/ko.po
index aedc5dd4d2f..7f17feff1ed 100644
--- a/addons/crm_caldav/i18n/ko.po
+++ b/addons/crm_caldav/i18n/ko.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: crm_caldav
 #: model:ir.actions.act_window,name:crm_caldav.action_caldav_browse
diff --git a/addons/crm_caldav/i18n/lo.po b/addons/crm_caldav/i18n/lo.po
index d4060839890..4a380f97533 100644
--- a/addons/crm_caldav/i18n/lo.po
+++ b/addons/crm_caldav/i18n/lo.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: crm_caldav
 #: model:ir.actions.act_window,name:crm_caldav.action_caldav_browse
diff --git a/addons/crm_caldav/i18n/lt.po b/addons/crm_caldav/i18n/lt.po
index 70e99338be7..7f017346c93 100644
--- a/addons/crm_caldav/i18n/lt.po
+++ b/addons/crm_caldav/i18n/lt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: crm_caldav
 #: model:ir.actions.act_window,name:crm_caldav.action_caldav_browse
diff --git a/addons/crm_caldav/i18n/mn.po b/addons/crm_caldav/i18n/mn.po
index 0e657c0b45a..bde99db7e68 100644
--- a/addons/crm_caldav/i18n/mn.po
+++ b/addons/crm_caldav/i18n/mn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: crm_caldav
 #: model:ir.actions.act_window,name:crm_caldav.action_caldav_browse
diff --git a/addons/crm_caldav/i18n/nb.po b/addons/crm_caldav/i18n/nb.po
new file mode 100644
index 00000000000..c5a1c3cfe37
--- /dev/null
+++ b/addons/crm_caldav/i18n/nb.po
@@ -0,0 +1,33 @@
+# Norwegian Bokmal 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-02-08 00:36+0000\n"
+"PO-Revision-Date: 2012-09-04 14:04+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Norwegian Bokmal <nb@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:46+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
+
+#. module: crm_caldav
+#: model:ir.actions.act_window,name:crm_caldav.action_caldav_browse
+msgid "Caldav Browse"
+msgstr "CalDAV Bla"
+
+#. module: crm_caldav
+#: model:ir.ui.menu,name:crm_caldav.menu_caldav_browse
+msgid "Synchronize This Calendar"
+msgstr "Synkroniser denne kalenderen"
+
+#. module: crm_caldav
+#: model:ir.model,name:crm_caldav.model_crm_meeting
+msgid "Meeting"
+msgstr "Møte"
diff --git a/addons/crm_caldav/i18n/nl.po b/addons/crm_caldav/i18n/nl.po
index 29bd9d63c57..6d76202c6a6 100644
--- a/addons/crm_caldav/i18n/nl.po
+++ b/addons/crm_caldav/i18n/nl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: crm_caldav
 #: model:ir.actions.act_window,name:crm_caldav.action_caldav_browse
diff --git a/addons/crm_caldav/i18n/nl_BE.po b/addons/crm_caldav/i18n/nl_BE.po
index 0222e3928af..e1722263797 100644
--- a/addons/crm_caldav/i18n/nl_BE.po
+++ b/addons/crm_caldav/i18n/nl_BE.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: crm_caldav
 #: model:ir.actions.act_window,name:crm_caldav.action_caldav_browse
diff --git a/addons/crm_caldav/i18n/oc.po b/addons/crm_caldav/i18n/oc.po
index 1af2d6d2750..26c1f699820 100644
--- a/addons/crm_caldav/i18n/oc.po
+++ b/addons/crm_caldav/i18n/oc.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: crm_caldav
 #: model:ir.actions.act_window,name:crm_caldav.action_caldav_browse
diff --git a/addons/crm_caldav/i18n/pl.po b/addons/crm_caldav/i18n/pl.po
index 6dc755ad999..930719eb5e2 100644
--- a/addons/crm_caldav/i18n/pl.po
+++ b/addons/crm_caldav/i18n/pl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: crm_caldav
 #: model:ir.actions.act_window,name:crm_caldav.action_caldav_browse
diff --git a/addons/crm_caldav/i18n/pt.po b/addons/crm_caldav/i18n/pt.po
index 330fe090671..d67c22023ac 100644
--- a/addons/crm_caldav/i18n/pt.po
+++ b/addons/crm_caldav/i18n/pt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: crm_caldav
 #: model:ir.actions.act_window,name:crm_caldav.action_caldav_browse
diff --git a/addons/crm_caldav/i18n/pt_BR.po b/addons/crm_caldav/i18n/pt_BR.po
index b94d3aa8d5c..b4013e91734 100644
--- a/addons/crm_caldav/i18n/pt_BR.po
+++ b/addons/crm_caldav/i18n/pt_BR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: crm_caldav
 #: model:ir.actions.act_window,name:crm_caldav.action_caldav_browse
diff --git a/addons/crm_caldav/i18n/ro.po b/addons/crm_caldav/i18n/ro.po
index 36ffb02ad44..0ac10a93c46 100644
--- a/addons/crm_caldav/i18n/ro.po
+++ b/addons/crm_caldav/i18n/ro.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: crm_caldav
 #: model:ir.actions.act_window,name:crm_caldav.action_caldav_browse
diff --git a/addons/crm_caldav/i18n/ru.po b/addons/crm_caldav/i18n/ru.po
index 449151570a2..7acaa4224d6 100644
--- a/addons/crm_caldav/i18n/ru.po
+++ b/addons/crm_caldav/i18n/ru.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: crm_caldav
 #: model:ir.actions.act_window,name:crm_caldav.action_caldav_browse
diff --git a/addons/crm_caldav/i18n/sk.po b/addons/crm_caldav/i18n/sk.po
index 92cdd77148a..a077cb49ebf 100644
--- a/addons/crm_caldav/i18n/sk.po
+++ b/addons/crm_caldav/i18n/sk.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: crm_caldav
 #: model:ir.actions.act_window,name:crm_caldav.action_caldav_browse
diff --git a/addons/crm_caldav/i18n/sl.po b/addons/crm_caldav/i18n/sl.po
index b3fac57ddff..a5f886a755d 100644
--- a/addons/crm_caldav/i18n/sl.po
+++ b/addons/crm_caldav/i18n/sl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: crm_caldav
 #: model:ir.actions.act_window,name:crm_caldav.action_caldav_browse
diff --git a/addons/crm_caldav/i18n/sq.po b/addons/crm_caldav/i18n/sq.po
index 07d8569ccdd..57ab7a283dc 100644
--- a/addons/crm_caldav/i18n/sq.po
+++ b/addons/crm_caldav/i18n/sq.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: crm_caldav
 #: model:ir.actions.act_window,name:crm_caldav.action_caldav_browse
diff --git a/addons/crm_caldav/i18n/sr.po b/addons/crm_caldav/i18n/sr.po
index affb990d727..247968a0f1f 100644
--- a/addons/crm_caldav/i18n/sr.po
+++ b/addons/crm_caldav/i18n/sr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: crm_caldav
 #: model:ir.actions.act_window,name:crm_caldav.action_caldav_browse
diff --git a/addons/crm_caldav/i18n/sr@latin.po b/addons/crm_caldav/i18n/sr@latin.po
index 40d2ed220bf..f7e1412b38b 100644
--- a/addons/crm_caldav/i18n/sr@latin.po
+++ b/addons/crm_caldav/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: crm_caldav
 #: model:ir.actions.act_window,name:crm_caldav.action_caldav_browse
diff --git a/addons/crm_caldav/i18n/sv.po b/addons/crm_caldav/i18n/sv.po
index 42b5a60bb24..e2dfd6c8ffc 100644
--- a/addons/crm_caldav/i18n/sv.po
+++ b/addons/crm_caldav/i18n/sv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: crm_caldav
 #: model:ir.actions.act_window,name:crm_caldav.action_caldav_browse
diff --git a/addons/crm_caldav/i18n/ta.po b/addons/crm_caldav/i18n/ta.po
index 8f14c0d4f39..b3c82b19d91 100644
--- a/addons/crm_caldav/i18n/ta.po
+++ b/addons/crm_caldav/i18n/ta.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: crm_caldav
 #: model:ir.actions.act_window,name:crm_caldav.action_caldav_browse
diff --git a/addons/crm_caldav/i18n/tr.po b/addons/crm_caldav/i18n/tr.po
index 9fcfdeedf4d..48cdaf9c37e 100644
--- a/addons/crm_caldav/i18n/tr.po
+++ b/addons/crm_caldav/i18n/tr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: crm_caldav
 #: model:ir.actions.act_window,name:crm_caldav.action_caldav_browse
diff --git a/addons/crm_caldav/i18n/zh_CN.po b/addons/crm_caldav/i18n/zh_CN.po
index 197e56ba919..73b02f129a2 100644
--- a/addons/crm_caldav/i18n/zh_CN.po
+++ b/addons/crm_caldav/i18n/zh_CN.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: crm_caldav
 #: model:ir.actions.act_window,name:crm_caldav.action_caldav_browse
diff --git a/addons/crm_caldav/i18n/zh_TW.po b/addons/crm_caldav/i18n/zh_TW.po
new file mode 100644
index 00000000000..43731a6717d
--- /dev/null
+++ b/addons/crm_caldav/i18n/zh_TW.po
@@ -0,0 +1,33 @@
+# Chinese (Traditional) 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-02-08 00:36+0000\n"
+"PO-Revision-Date: 2012-08-29 02:56+0000\n"
+"Last-Translator: Bonnie Duan <bonnie.duan@cenoq.com>\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: 2012-08-30 05:12+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
+
+#. module: crm_caldav
+#: model:ir.actions.act_window,name:crm_caldav.action_caldav_browse
+msgid "Caldav Browse"
+msgstr "行事曆瀏覽"
+
+#. module: crm_caldav
+#: model:ir.ui.menu,name:crm_caldav.menu_caldav_browse
+msgid "Synchronize This Calendar"
+msgstr "同步行事曆"
+
+#. module: crm_caldav
+#: model:ir.model,name:crm_caldav.model_crm_meeting
+msgid "Meeting"
+msgstr "會議"
diff --git a/addons/crm_claim/__openerp__.py b/addons/crm_claim/__openerp__.py
index 9e7848eb6c3..f35dd306e93 100644
--- a/addons/crm_claim/__openerp__.py
+++ b/addons/crm_claim/__openerp__.py
@@ -34,23 +34,18 @@ automatically new claims based on incoming emails.
     'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
     'depends': ['crm'],
-    'init_xml': [
-         'crm_claim_data.xml',
-    ],
-
-    'update_xml': [
+    'data': [
         'crm_claim_view.xml',
         'crm_claim_menu.xml',
         'security/ir.model.access.csv',
         'report/crm_claim_report_view.xml',
         'res_config_view.xml',
+        'crm_claim_data.xml',
     ],
-    'demo_xml': [
-        'crm_claim_demo.xml',
-    ],
+    'demo': ['crm_claim_demo.xml'],
     'test': ['test/process/claim.yml',
              'test/ui/claim_demo.yml'
-             ],
+    ],
     'installable': True,
     'auto_install': False,
     'certificate' : '00612027414703404749',
diff --git a/addons/crm_claim/crm_claim.py b/addons/crm_claim/crm_claim.py
index ec6252bcdca..535f6d20367 100644
--- a/addons/crm_claim/crm_claim.py
+++ b/addons/crm_claim/crm_claim.py
@@ -72,7 +72,7 @@ class crm_claim(base_stage, osv.osv):
     _description = "Claim"
     _order = "priority,date desc"
     _inherit = ['mail.thread']
-    _mail_compose_message = True
+
     _columns = {
         'id': fields.integer('ID', readonly=True),
         'name': fields.char('Claim Subject', size=128, required=True),
@@ -194,13 +194,12 @@ class crm_claim(base_stage, osv.osv):
         if custom_values is None: custom_values = {}
         custom_values.update({
             'name': msg.get('subject') or _("No Subject"),
-            'description': msg.get('body_text'),
+            'description': msg.get('body'),
             'email_from': msg.get('from'),
             'email_cc': msg.get('cc'),
         })
         if msg.get('priority'):
             custom_values['priority'] = msg.get('priority')
-        custom_values.update(self.message_partner_by_email(cr, uid, msg.get('from'), context=context))
         return super(crm_claim,self).message_new(cr, uid, msg, custom_values=custom_values, context=context)
 
     def message_update(self, cr, uid, ids, msg, update_vals=None, context=None):
@@ -220,7 +219,7 @@ class crm_claim(base_stage, osv.osv):
             'revenue': 'planned_revenue',
             'probability':'probability'
         }
-        for line in msg['body_text'].split('\n'):
+        for line in msg['body'].split('\n'):
             line = line.strip()
             res = tools.misc.command_re.match(line)
             if res and maps.get(res.group(1).lower()):
@@ -239,16 +238,16 @@ class crm_claim(base_stage, osv.osv):
 
     def create_send_note(self, cr, uid, ids, context=None):
         msg = _('Claim has been <b>created</b>.')
-        return self.message_append_note(cr, uid, ids, body=msg, context=context)
+        return self.message_post(cr, uid, ids, body=msg, context=context)
 
     def case_refuse_send_note(self, cr, uid, ids, context=None):
         msg = _('Claim has been <b>refused</b>.')
-        return self.message_append_note(cr, uid, ids, body=msg, context=context)
+        return self.message_post(cr, uid, ids, body=msg, context=context)
 
     def stage_set_send_note(self, cr, uid, ids, stage_id, context=None):
         """ Override of the (void) default notification method. """
         stage_name = self.pool.get('crm.claim.stage').name_get(cr, uid, [stage_id], context=context)[0][1]
-        return self.message_append_note(cr, uid, ids, body= _("Stage changed to <b>%s</b>.") % (stage_name), context=context)
+        return self.message_post(cr, uid, ids, body= _("Stage changed to <b>%s</b>.") % (stage_name), context=context)
 
 
 class res_partner(osv.osv):
diff --git a/addons/crm_claim/crm_claim_menu.xml b/addons/crm_claim/crm_claim_menu.xml
index 46f8760387a..bb881d62a58 100644
--- a/addons/crm_claim/crm_claim_menu.xml
+++ b/addons/crm_claim/crm_claim_menu.xml
@@ -50,9 +50,9 @@
             parent="base.menu_aftersale" action="crm_case_categ_claim0" sequence="1"/>
 
         <!-- Claim Stages -->
+        <menuitem id="base.menu_definitions" name="Configuration" parent="base.menu_main_pm" sequence="60"/>
         <menuitem id="base.menu_project_config_project" name="Stages" parent="base.menu_definitions" sequence="1"/>
         <menuitem id="menu_claim_stage_view" name="Claim Stages" action="crm_claim_stage_act" parent="base.menu_project_config_project" sequence="20"/>
-        <menuitem id="base.menu_definitions" name="Configuration" parent="base.menu_main_pm" sequence="60"/>
 
     </data>
 </openerp>
diff --git a/addons/crm_claim/i18n/ar.po b/addons/crm_claim/i18n/ar.po
index 97b7f56b87f..50d289efbf8 100644
--- a/addons/crm_claim/i18n/ar.po
+++ b/addons/crm_claim/i18n/ar.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:32+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:37+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: crm_claim
 #: field:crm.claim.report,nbr:0
diff --git a/addons/crm_claim/i18n/bg.po b/addons/crm_claim/i18n/bg.po
index 832cc2ba63b..8f30b988ec4 100644
--- a/addons/crm_claim/i18n/bg.po
+++ b/addons/crm_claim/i18n/bg.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:32+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:37+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: crm_claim
 #: field:crm.claim.report,nbr:0
diff --git a/addons/crm_claim/i18n/ca.po b/addons/crm_claim/i18n/ca.po
index b74fc3fc721..1ece08f31da 100644
--- a/addons/crm_claim/i18n/ca.po
+++ b/addons/crm_claim/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:32+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:37+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: crm_claim
 #: field:crm.claim.report,nbr:0
diff --git a/addons/crm_claim/i18n/da.po b/addons/crm_claim/i18n/da.po
index b93fa1a3ff9..d880acdc30c 100644
--- a/addons/crm_claim/i18n/da.po
+++ b/addons/crm_claim/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:32+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:37+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: crm_claim
 #: field:crm.claim.report,nbr:0
diff --git a/addons/crm_claim/i18n/de.po b/addons/crm_claim/i18n/de.po
index b79e0fd8061..711aabb5e04 100644
--- a/addons/crm_claim/i18n/de.po
+++ b/addons/crm_claim/i18n/de.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:32+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:37+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: crm_claim
 #: field:crm.claim.report,nbr:0
diff --git a/addons/crm_claim/i18n/el.po b/addons/crm_claim/i18n/el.po
index b07f50d8e7a..26fc5f679c5 100644
--- a/addons/crm_claim/i18n/el.po
+++ b/addons/crm_claim/i18n/el.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:32+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:37+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: crm_claim
 #: field:crm.claim.report,nbr:0
diff --git a/addons/crm_claim/i18n/es.po b/addons/crm_claim/i18n/es.po
index 5e306f7d161..3b868721782 100644
--- a/addons/crm_claim/i18n/es.po
+++ b/addons/crm_claim/i18n/es.po
@@ -9,13 +9,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:36+0000\n"
 "PO-Revision-Date: 2012-03-12 08:00+0000\n"
-"Last-Translator: Carlos @ smile-iberia <Unknown>\n"
+"Last-Translator: Carlos Ch. <Unknown>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:32+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:37+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: crm_claim
 #: field:crm.claim.report,nbr:0
diff --git a/addons/crm_claim/i18n/es_CR.po b/addons/crm_claim/i18n/es_CR.po
index c784f51048b..3a00466a80f 100644
--- a/addons/crm_claim/i18n/es_CR.po
+++ b/addons/crm_claim/i18n/es_CR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:32+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:37+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 "Language: es\n"
 
 #. module: crm_claim
diff --git a/addons/crm_claim/i18n/es_EC.po b/addons/crm_claim/i18n/es_EC.po
index 400a75b20a1..b33b79a81a3 100644
--- a/addons/crm_claim/i18n/es_EC.po
+++ b/addons/crm_claim/i18n/es_EC.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:32+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:37+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: crm_claim
 #: field:crm.claim.report,nbr:0
diff --git a/addons/crm_claim/i18n/es_PY.po b/addons/crm_claim/i18n/es_PY.po
index 7140144392f..7205615072b 100644
--- a/addons/crm_claim/i18n/es_PY.po
+++ b/addons/crm_claim/i18n/es_PY.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:32+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:37+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: crm_claim
 #: field:crm.claim.report,nbr:0
diff --git a/addons/crm_claim/i18n/fi.po b/addons/crm_claim/i18n/fi.po
index e19300d1b28..6bffd834956 100644
--- a/addons/crm_claim/i18n/fi.po
+++ b/addons/crm_claim/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:32+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:37+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: crm_claim
 #: field:crm.claim.report,nbr:0
diff --git a/addons/crm_claim/i18n/fr.po b/addons/crm_claim/i18n/fr.po
index eddd44ad454..c73cc2e8c68 100644
--- a/addons/crm_claim/i18n/fr.po
+++ b/addons/crm_claim/i18n/fr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:32+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:37+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: crm_claim
 #: field:crm.claim.report,nbr:0
diff --git a/addons/crm_claim/i18n/gl.po b/addons/crm_claim/i18n/gl.po
index 31833f5ad86..bafc3f0b0b0 100644
--- a/addons/crm_claim/i18n/gl.po
+++ b/addons/crm_claim/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:32+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:37+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: crm_claim
 #: field:crm.claim.report,nbr:0
diff --git a/addons/crm_claim/i18n/gu.po b/addons/crm_claim/i18n/gu.po
index 8dbb5056490..a4d9c051a6e 100644
--- a/addons/crm_claim/i18n/gu.po
+++ b/addons/crm_claim/i18n/gu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:32+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:37+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: crm_claim
 #: field:crm.claim.report,nbr:0
diff --git a/addons/crm_claim/i18n/hr.po b/addons/crm_claim/i18n/hr.po
index 988f7b26265..c86ccb8288e 100644
--- a/addons/crm_claim/i18n/hr.po
+++ b/addons/crm_claim/i18n/hr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:32+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:37+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: crm_claim
 #: field:crm.claim.report,nbr:0
diff --git a/addons/crm_claim/i18n/hu.po b/addons/crm_claim/i18n/hu.po
index 3367a617a7d..268d6e9fdb5 100644
--- a/addons/crm_claim/i18n/hu.po
+++ b/addons/crm_claim/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:32+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:37+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: crm_claim
 #: field:crm.claim.report,nbr:0
diff --git a/addons/crm_claim/i18n/it.po b/addons/crm_claim/i18n/it.po
index e774dce9e43..58332eda427 100644
--- a/addons/crm_claim/i18n/it.po
+++ b/addons/crm_claim/i18n/it.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:32+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:37+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: crm_claim
 #: field:crm.claim.report,nbr:0
diff --git a/addons/crm_claim/i18n/ja.po b/addons/crm_claim/i18n/ja.po
index a572d48d0de..8d514aedc31 100644
--- a/addons/crm_claim/i18n/ja.po
+++ b/addons/crm_claim/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:32+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:37+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: crm_claim
 #: field:crm.claim.report,nbr:0
diff --git a/addons/crm_claim/i18n/lt.po b/addons/crm_claim/i18n/lt.po
index 4439522a85b..7f58a069b26 100644
--- a/addons/crm_claim/i18n/lt.po
+++ b/addons/crm_claim/i18n/lt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:32+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:37+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: crm_claim
 #: field:crm.claim.report,nbr:0
diff --git a/addons/crm_claim/i18n/mn.po b/addons/crm_claim/i18n/mn.po
index 452ce2b9610..42919a2267a 100644
--- a/addons/crm_claim/i18n/mn.po
+++ b/addons/crm_claim/i18n/mn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:32+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:37+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: crm_claim
 #: field:crm.claim.report,nbr:0
diff --git a/addons/crm_claim/i18n/nl.po b/addons/crm_claim/i18n/nl.po
index a5bf3c37ae4..ce3c226d60b 100644
--- a/addons/crm_claim/i18n/nl.po
+++ b/addons/crm_claim/i18n/nl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:32+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:37+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: crm_claim
 #: field:crm.claim.report,nbr:0
diff --git a/addons/crm_claim/i18n/pl.po b/addons/crm_claim/i18n/pl.po
index f96169981b0..e0b3a59a45c 100644
--- a/addons/crm_claim/i18n/pl.po
+++ b/addons/crm_claim/i18n/pl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:32+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:37+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: crm_claim
 #: field:crm.claim.report,nbr:0
diff --git a/addons/crm_claim/i18n/pt.po b/addons/crm_claim/i18n/pt.po
index 6dfc62445ed..98e4dd2c607 100644
--- a/addons/crm_claim/i18n/pt.po
+++ b/addons/crm_claim/i18n/pt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:32+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:37+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: crm_claim
 #: field:crm.claim.report,nbr:0
diff --git a/addons/crm_claim/i18n/pt_BR.po b/addons/crm_claim/i18n/pt_BR.po
index 27258da73a8..9bcbcccd6a8 100644
--- a/addons/crm_claim/i18n/pt_BR.po
+++ b/addons/crm_claim/i18n/pt_BR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:32+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:37+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: crm_claim
 #: field:crm.claim.report,nbr:0
diff --git a/addons/crm_claim/i18n/ro.po b/addons/crm_claim/i18n/ro.po
index b1d7fb2d185..90b8c1fd4eb 100644
--- a/addons/crm_claim/i18n/ro.po
+++ b/addons/crm_claim/i18n/ro.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:32+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:37+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: crm_claim
 #: field:crm.claim.report,nbr:0
diff --git a/addons/crm_claim/i18n/ru.po b/addons/crm_claim/i18n/ru.po
index 391cc28950c..693ad5d31cf 100644
--- a/addons/crm_claim/i18n/ru.po
+++ b/addons/crm_claim/i18n/ru.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:32+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:37+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: crm_claim
 #: field:crm.claim.report,nbr:0
diff --git a/addons/crm_claim/i18n/sq.po b/addons/crm_claim/i18n/sq.po
index 8788b9e00c6..feed60e1d93 100644
--- a/addons/crm_claim/i18n/sq.po
+++ b/addons/crm_claim/i18n/sq.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:32+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:37+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: crm_claim
 #: field:crm.claim.report,nbr:0
diff --git a/addons/crm_claim/i18n/sr.po b/addons/crm_claim/i18n/sr.po
index 1a5f19eca38..7ed41af7681 100644
--- a/addons/crm_claim/i18n/sr.po
+++ b/addons/crm_claim/i18n/sr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:32+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:37+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: crm_claim
 #: field:crm.claim.report,nbr:0
diff --git a/addons/crm_claim/i18n/sr@latin.po b/addons/crm_claim/i18n/sr@latin.po
index 513fd255f18..8070c4de10f 100644
--- a/addons/crm_claim/i18n/sr@latin.po
+++ b/addons/crm_claim/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:32+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:37+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: crm_claim
 #: field:crm.claim.report,nbr:0
diff --git a/addons/crm_claim/i18n/sv.po b/addons/crm_claim/i18n/sv.po
index b4c009e1aaf..b8d86890f77 100644
--- a/addons/crm_claim/i18n/sv.po
+++ b/addons/crm_claim/i18n/sv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:32+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:37+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: crm_claim
 #: field:crm.claim.report,nbr:0
diff --git a/addons/crm_claim/i18n/tr.po b/addons/crm_claim/i18n/tr.po
index 4394c08d43a..c57b862aed1 100644
--- a/addons/crm_claim/i18n/tr.po
+++ b/addons/crm_claim/i18n/tr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:32+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:37+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: crm_claim
 #: field:crm.claim.report,nbr:0
@@ -85,7 +85,7 @@ msgstr ""
 #: code:addons/crm_claim/crm_claim.py:132
 #, python-format
 msgid "The claim '%s' has been opened."
-msgstr ""
+msgstr "Şikayet '%s' açılmıştır."
 
 #. module: crm_claim
 #: view:crm.claim:0
@@ -151,12 +151,12 @@ msgstr "Referans"
 #. module: crm_claim
 #: view:crm.claim.report:0
 msgid "Date of claim"
-msgstr ""
+msgstr "Şikayet tarihi"
 
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "All pending Claims"
-msgstr ""
+msgstr "Bütün bekleyen Şikayetler"
 
 #. module: crm_claim
 #: view:crm.claim.report:0
@@ -187,7 +187,7 @@ msgstr "İş ortağı"
 #. module: crm_claim
 #: view:crm.claim.report:0
 msgid "Month of claim"
-msgstr ""
+msgstr "Şikayeyin ayı"
 
 #. module: crm_claim
 #: selection:crm.claim,type_action:0
@@ -380,7 +380,7 @@ msgstr "Güncelleme Tarihi"
 #. module: crm_claim
 #: view:crm.claim.report:0
 msgid "Year of claim"
-msgstr ""
+msgstr "Şikayetin yılı"
 
 #. module: crm_claim
 #: view:crm.claim.report:0
@@ -474,7 +474,7 @@ msgstr "Haziran"
 #. module: crm_claim
 #: view:res.partner:0
 msgid "Partners Claim"
-msgstr ""
+msgstr "Paydaş Şikayeti"
 
 #. module: crm_claim
 #: field:crm.claim,partner_phone:0
@@ -621,7 +621,7 @@ msgstr "Aç"
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "New Claims"
-msgstr ""
+msgstr "Yeni Şikayetler"
 
 #. module: crm_claim
 #: view:crm.claim:0
@@ -638,17 +638,17 @@ msgstr "Sorumlu"
 #. module: crm_claim
 #: view:crm.claim.report:0
 msgid "Claims created in current year"
-msgstr ""
+msgstr "Geçerli yılda oluşturulan şikayetler"
 
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Unassigned Claims"
-msgstr ""
+msgstr "İşleme konmamış Şikayetler"
 
 #. module: crm_claim
 #: view:crm.claim.report:0
 msgid "Claims created in current month"
-msgstr ""
+msgstr "Geçerli ayda oluşturulan Şikayetler"
 
 #. module: crm_claim
 #: field:crm.claim.report,delay_expected:0
@@ -718,7 +718,7 @@ msgstr "Biten Eylemler"
 #. module: crm_claim
 #: view:crm.claim.report:0
 msgid "Claims created in last month"
-msgstr ""
+msgstr "Geçen ayda oluşturulan Şikayetler"
 
 #. module: crm_claim
 #: model:crm.case.stage,name:crm_claim.stage_claim5
@@ -813,7 +813,7 @@ msgstr "Tarih Oluştur"
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "In Progress Claims"
-msgstr ""
+msgstr "Çalışılmakta olan Şikayetler"
 
 #~ msgid "Probability"
 #~ msgstr "Olasılık"
diff --git a/addons/crm_claim/i18n/zh_CN.po b/addons/crm_claim/i18n/zh_CN.po
index cbba8625743..616fd284ed6 100644
--- a/addons/crm_claim/i18n/zh_CN.po
+++ b/addons/crm_claim/i18n/zh_CN.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:32+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:37+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: crm_claim
 #: field:crm.claim.report,nbr:0
diff --git a/addons/crm_claim/i18n/zh_TW.po b/addons/crm_claim/i18n/zh_TW.po
new file mode 100644
index 00000000000..1346638c87a
--- /dev/null
+++ b/addons/crm_claim/i18n/zh_TW.po
@@ -0,0 +1,799 @@
+# Chinese (Traditional) 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-02-08 00:36+0000\n"
+"PO-Revision-Date: 2012-08-30 03:01+0000\n"
+"Last-Translator: Bonnie Duan <bonnie.duan@cenoq.com>\n"
+"Language-Team: Cenoq Corp. MIME-Version: 1.0\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-08-31 04:56+0000\n"
+"X-Generator: Launchpad (build 15887)\n"
+
+#. module: crm_claim
+#: field:crm.claim.report,nbr:0
+msgid "# of Cases"
+msgstr "# 業務量"
+
+#. module: crm_claim
+#: view:crm.claim:0
+#: view:crm.claim.report:0
+msgid "Group By..."
+msgstr "分類方式..."
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Responsibilities"
+msgstr "責任人"
+
+#. module: crm_claim
+#: field:crm.claim,date_action_next:0
+msgid "Next Action Date"
+msgstr "下一動作日期"
+
+#. module: crm_claim
+#: selection:crm.claim.report,month:0
+msgid "March"
+msgstr "3月"
+
+#. module: crm_claim
+#: field:crm.claim.report,delay_close:0
+msgid "Delay to close"
+msgstr "延遲關閉"
+
+#. module: crm_claim
+#: field:crm.claim,resolution:0
+msgid "Resolution"
+msgstr "解決方案"
+
+#. module: crm_claim
+#: field:crm.claim,company_id:0
+#: view:crm.claim.report:0
+#: field:crm.claim.report,company_id:0
+msgid "Company"
+msgstr "公司"
+
+#. module: crm_claim
+#: field:crm.claim,email_cc:0
+msgid "Watchers Emails"
+msgstr "視察者的電子郵件"
+
+#. module: crm_claim
+#: view:crm.claim.report:0
+msgid "#Claim"
+msgstr "#索賠"
+
+#. module: crm_claim
+#: model:ir.actions.act_window,help:crm_claim.crm_claim_stage_act
+msgid ""
+"You can create claim stages to categorize the status of every claim entered "
+"in the system. The stages define all the steps required for the resolution "
+"of a claim."
+msgstr "你能建立索賠階段的分類在系統輸入每個索賠的狀態度。階段定義索賠解決方案的所有需求的步驟。"
+
+#. module: crm_claim
+#: code:addons/crm_claim/crm_claim.py:132
+#, python-format
+msgid "The claim '%s' has been opened."
+msgstr "索賠'%s' 已被打開。"
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Date Closed"
+msgstr "結束日期"
+
+#. module: crm_claim
+#: view:crm.claim.report:0
+#: field:crm.claim.report,day:0
+msgid "Day"
+msgstr "日"
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Add Internal Note"
+msgstr "加入內部備註"
+
+#. module: crm_claim
+#: help:crm.claim,section_id:0
+msgid ""
+"Sales team to which Case belongs to.Define Responsible user and Email "
+"account for mail gateway."
+msgstr "銷售團隊屬於的業務，定義負責人和郵件地址的郵件閘道。"
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Claim Description"
+msgstr "索陪說明"
+
+#. module: crm_claim
+#: field:crm.claim,message_ids:0
+msgid "Messages"
+msgstr "訊息"
+
+#. module: crm_claim
+#: model:crm.case.categ,name:crm_claim.categ_claim1
+msgid "Factual Claims"
+msgstr "實際索賠"
+
+#. module: crm_claim
+#: selection:crm.claim,state:0
+#: selection:crm.claim.report,state:0
+msgid "Cancelled"
+msgstr "已取消"
+
+#. module: crm_claim
+#: model:crm.case.resource.type,name:crm_claim.type_claim2
+msgid "Preventive"
+msgstr "預防措施"
+
+#. module: crm_claim
+#: field:crm.claim.report,date_closed:0
+msgid "Close Date"
+msgstr "結束日期"
+
+#. module: crm_claim
+#: field:crm.claim,ref:0
+msgid "Reference"
+msgstr "關聯"
+
+#. module: crm_claim
+#: view:crm.claim.report:0
+msgid "Date of claim"
+msgstr "索賠日期"
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "All pending Claims"
+msgstr "所有未決索賠"
+
+#. module: crm_claim
+#: view:crm.claim.report:0
+msgid "# Mails"
+msgstr "#郵件"
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Reset to Draft"
+msgstr "重設為草稿"
+
+#. module: crm_claim
+#: view:crm.claim:0
+#: field:crm.claim,date_deadline:0
+#: field:crm.claim.report,date_deadline:0
+msgid "Deadline"
+msgstr "截止日期"
+
+#. module: crm_claim
+#: view:crm.claim:0
+#: field:crm.claim,partner_id:0
+#: view:crm.claim.report:0
+#: field:crm.claim.report,partner_id:0
+#: model:ir.model,name:crm_claim.model_res_partner
+msgid "Partner"
+msgstr "業務夥伴"
+
+#. module: crm_claim
+#: view:crm.claim.report:0
+msgid "Month of claim"
+msgstr "索賠月份"
+
+#. module: crm_claim
+#: selection:crm.claim,type_action:0
+#: selection:crm.claim.report,type_action:0
+msgid "Preventive Action"
+msgstr "預防措施的動作"
+
+#. module: crm_claim
+#: field:crm.claim.report,section_id:0
+msgid "Section"
+msgstr "劃分"
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Root Causes"
+msgstr "根本原因"
+
+#. module: crm_claim
+#: field:crm.claim,user_fault:0
+msgid "Trouble Responsible"
+msgstr "問題責任"
+
+#. module: crm_claim
+#: field:crm.claim,priority:0
+#: view:crm.claim.report:0
+#: field:crm.claim.report,priority:0
+msgid "Priority"
+msgstr "優先級"
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Send New Email"
+msgstr "發送新的電子郵件"
+
+#. module: crm_claim
+#: view:crm.claim:0
+#: selection:crm.claim,state:0
+#: view:crm.claim.report:0
+msgid "New"
+msgstr "新建"
+
+#. module: crm_claim
+#: view:crm.claim:0
+#: view:crm.claim.report:0
+msgid "Type"
+msgstr "類型"
+
+#. module: crm_claim
+#: field:crm.claim,email_from:0
+msgid "Email"
+msgstr "電子郵件"
+
+#. module: crm_claim
+#: selection:crm.claim,priority:0
+#: selection:crm.claim.report,priority:0
+msgid "Lowest"
+msgstr "最低"
+
+#. module: crm_claim
+#: field:crm.claim,action_next:0
+msgid "Next Action"
+msgstr "下一動作"
+
+#. module: crm_claim
+#: view:crm.claim.report:0
+msgid "My Sales Team(s)"
+msgstr "我的銷售團隊"
+
+#. module: crm_claim
+#: model:crm.case.stage,name:crm_claim.stage_claim3
+msgid "Won't fix"
+msgstr "不修正"
+
+#. module: crm_claim
+#: field:crm.claim,create_date:0
+msgid "Creation Date"
+msgstr "建立日期"
+
+#. module: crm_claim
+#: field:crm.claim,name:0
+msgid "Claim Subject"
+msgstr "索賠主題"
+
+#. module: crm_claim
+#: model:ir.actions.act_window,help:crm_claim.action_report_crm_claim
+msgid ""
+"Have a general overview of all claims processed in the system by sorting "
+"them with specific criteria."
+msgstr "為系統內所有的索賠處理指定一個排序標準"
+
+#. module: crm_claim
+#: selection:crm.claim.report,month:0
+msgid "July"
+msgstr "7月"
+
+#. module: crm_claim
+#: model:ir.actions.act_window,name:crm_claim.crm_claim_stage_act
+msgid "Claim Stages"
+msgstr "索賠階段"
+
+#. module: crm_claim
+#: model:ir.ui.menu,name:crm_claim.menu_crm_case_claim-act
+msgid "Categories"
+msgstr "分類"
+
+#. module: crm_claim
+#: view:crm.claim:0
+#: field:crm.claim,stage_id:0
+#: view:crm.claim.report:0
+#: field:crm.claim.report,stage_id:0
+msgid "Stage"
+msgstr "階段"
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "History Information"
+msgstr "日誌資訊"
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Dates"
+msgstr "日期"
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Contact"
+msgstr "聯繫人"
+
+#. module: crm_claim
+#: view:crm.claim.report:0
+msgid "Month-1"
+msgstr "上月"
+
+#. module: crm_claim
+#: model:ir.actions.act_window,name:crm_claim.action_report_crm_claim
+#: model:ir.ui.menu,name:crm_claim.menu_report_crm_claim_tree
+msgid "Claims Analysis"
+msgstr "索賠分析"
+
+#. module: crm_claim
+#: help:crm.claim.report,delay_close:0
+msgid "Number of Days to close the case"
+msgstr "到期天數"
+
+#. module: crm_claim
+#: model:ir.model,name:crm_claim.model_crm_claim_report
+msgid "CRM Claim Report"
+msgstr "客戶關係管理索賠報表"
+
+#. module: crm_claim
+#: model:crm.case.stage,name:crm_claim.stage_claim1
+msgid "Accepted as Claim"
+msgstr "作為索賠接受"
+
+#. module: crm_claim
+#: model:crm.case.resource.type,name:crm_claim.type_claim1
+msgid "Corrective"
+msgstr "糾正"
+
+#. module: crm_claim
+#: selection:crm.claim.report,month:0
+msgid "September"
+msgstr "9月"
+
+#. module: crm_claim
+#: selection:crm.claim.report,month:0
+msgid "December"
+msgstr "12月"
+
+#. module: crm_claim
+#: view:crm.claim.report:0
+#: field:crm.claim.report,month:0
+msgid "Month"
+msgstr "月"
+
+#. module: crm_claim
+#: field:crm.claim,type_action:0
+#: view:crm.claim.report:0
+#: field:crm.claim.report,type_action:0
+msgid "Action Type"
+msgstr "動作類型"
+
+#. module: crm_claim
+#: field:crm.claim,write_date:0
+msgid "Update Date"
+msgstr "更新日期"
+
+#. module: crm_claim
+#: view:crm.claim.report:0
+msgid "Year of claim"
+msgstr "索賠年份"
+
+#. module: crm_claim
+#: view:crm.claim.report:0
+msgid "Salesman"
+msgstr "業務員"
+
+#. module: crm_claim
+#: field:crm.claim,categ_id:0
+#: view:crm.claim.report:0
+#: field:crm.claim.report,categ_id:0
+msgid "Category"
+msgstr "分類"
+
+#. module: crm_claim
+#: model:crm.case.categ,name:crm_claim.categ_claim2
+msgid "Value Claims"
+msgstr "索賠金額"
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Responsible User"
+msgstr "負責使用者"
+
+#. module: crm_claim
+#: help:crm.claim,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: crm_claim
+#: selection:crm.claim.report,state:0
+msgid "Draft"
+msgstr "草稿"
+
+#. module: crm_claim
+#: selection:crm.claim,priority:0
+#: selection:crm.claim.report,priority:0
+msgid "Low"
+msgstr "低"
+
+#. module: crm_claim
+#: field:crm.claim,date_closed:0
+#: selection:crm.claim,state:0
+#: selection:crm.claim.report,state:0
+msgid "Closed"
+msgstr "已結束"
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Reply"
+msgstr "回覆"
+
+#. module: crm_claim
+#: view:crm.claim:0
+#: selection:crm.claim,state:0
+#: view:crm.claim.report:0
+#: selection:crm.claim.report,state:0
+msgid "Pending"
+msgstr "待處理"
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Communication & History"
+msgstr "溝通&日誌"
+
+#. module: crm_claim
+#: selection:crm.claim.report,month:0
+msgid "August"
+msgstr "8月"
+
+#. module: crm_claim
+#: selection:crm.claim,priority:0
+#: selection:crm.claim.report,priority:0
+msgid "Normal"
+msgstr "普通"
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Global CC"
+msgstr "完整副本"
+
+#. module: crm_claim
+#: selection:crm.claim.report,month:0
+msgid "June"
+msgstr "6月"
+
+#. module: crm_claim
+#: view:res.partner:0
+msgid "Partners Claim"
+msgstr "客戶抱怨"
+
+#. module: crm_claim
+#: field:crm.claim,partner_phone:0
+msgid "Phone"
+msgstr "電話"
+
+#. module: crm_claim
+#: field:crm.claim.report,user_id:0
+msgid "User"
+msgstr "使用者"
+
+#. module: crm_claim
+#: field:crm.claim,active:0
+msgid "Active"
+msgstr "啟用"
+
+#. module: crm_claim
+#: selection:crm.claim.report,month:0
+msgid "November"
+msgstr "11月"
+
+#. module: crm_claim
+#: view:crm.claim.report:0
+msgid "Extended Filters..."
+msgstr "增加篩選條件"
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Closure"
+msgstr "關閉"
+
+#. module: crm_claim
+#: view:crm.claim.report:0
+msgid "Search"
+msgstr "搜尋"
+
+#. module: crm_claim
+#: selection:crm.claim.report,month:0
+msgid "October"
+msgstr "10月"
+
+#. module: crm_claim
+#: selection:crm.claim.report,month:0
+msgid "January"
+msgstr "1月"
+
+#. module: crm_claim
+#: view:crm.claim:0
+#: field:crm.claim,date:0
+msgid "Claim Date"
+msgstr "索賠日期"
+
+#. module: crm_claim
+#: help:crm.claim,email_from:0
+msgid "These people will receive email."
+msgstr "這些人將收到電子郵件。"
+
+#. module: crm_claim
+#: model:ir.actions.act_window,name:crm_claim.crm_claim_categ_action
+msgid "Claim Categories"
+msgstr "索賠分類"
+
+#. module: crm_claim
+#: view:crm.claim:0
+#: view:crm.claim.report:0
+#: model:ir.actions.act_window,name:crm_claim.act_claim_partner
+#: model:ir.actions.act_window,name:crm_claim.act_claim_partner_address
+#: model:ir.actions.act_window,name:crm_claim.crm_case_categ_claim0
+#: model:ir.ui.menu,name:crm_claim.menu_crm_case_claims
+#: field:res.partner,claims_ids:0
+msgid "Claims"
+msgstr "索賠"
+
+#. module: crm_claim
+#: selection:crm.claim,type_action:0
+#: selection:crm.claim.report,type_action:0
+msgid "Corrective Action"
+msgstr "糾正的動作"
+
+#. module: crm_claim
+#: model:crm.case.categ,name:crm_claim.categ_claim3
+msgid "Policy Claims"
+msgstr "索賠政策"
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "History"
+msgstr "日誌"
+
+#. module: crm_claim
+#: model:ir.model,name:crm_claim.model_crm_claim
+#: model:ir.ui.menu,name:crm_claim.menu_config_claim
+msgid "Claim"
+msgstr "索賠"
+
+#. module: crm_claim
+#: selection:crm.claim,priority:0
+#: selection:crm.claim.report,priority:0
+msgid "Highest"
+msgstr "最高"
+
+#. module: crm_claim
+#: field:crm.claim,partner_address_id:0
+msgid "Partner Contact"
+msgstr "業務夥伴聯繫方式"
+
+#. module: crm_claim
+#: view:crm.claim:0
+#: field:crm.claim,state:0
+#: view:crm.claim.report:0
+#: field:crm.claim.report,state:0
+msgid "State"
+msgstr "狀態"
+
+#. module: crm_claim
+#: view:crm.claim:0
+#: view:crm.claim.report:0
+msgid "Done"
+msgstr "完成"
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Claim Reporter"
+msgstr "索賠者"
+
+#. module: crm_claim
+#: view:crm.claim:0
+#: view:crm.claim.report:0
+msgid "Cancel"
+msgstr "取消"
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Close"
+msgstr "結束"
+
+#. module: crm_claim
+#: view:crm.claim:0
+#: view:crm.claim.report:0
+#: selection:crm.claim.report,state:0
+msgid "Open"
+msgstr "開啟"
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "New Claims"
+msgstr "新抱怨"
+
+#. module: crm_claim
+#: view:crm.claim:0
+#: selection:crm.claim,state:0
+msgid "In Progress"
+msgstr "進行中"
+
+#. module: crm_claim
+#: view:crm.claim:0
+#: field:crm.claim,user_id:0
+msgid "Responsible"
+msgstr "負責人"
+
+#. module: crm_claim
+#: view:crm.claim.report:0
+msgid "Claims created in current year"
+msgstr "本年新建的抱怨"
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Unassigned Claims"
+msgstr "未分配的抱怨"
+
+#. module: crm_claim
+#: view:crm.claim.report:0
+msgid "Claims created in current month"
+msgstr "本月新建的抱怨"
+
+#. module: crm_claim
+#: field:crm.claim.report,delay_expected:0
+msgid "Overpassed Deadline"
+msgstr "超過截止日期"
+
+#. module: crm_claim
+#: field:crm.claim,cause:0
+msgid "Root Cause"
+msgstr "根本原因"
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Claim/Action Description"
+msgstr "索賠/動作說明"
+
+#. module: crm_claim
+#: field:crm.claim,description:0
+msgid "Description"
+msgstr "說明"
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Search Claims"
+msgstr "搜尋索賠"
+
+#. module: crm_claim
+#: field:crm.claim,section_id:0
+#: view:crm.claim.report:0
+msgid "Sales Team"
+msgstr "銷售團隊"
+
+#. module: crm_claim
+#: selection:crm.claim.report,month:0
+msgid "May"
+msgstr "5月"
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Resolution Actions"
+msgstr "決定採取的行動"
+
+#. module: crm_claim
+#: model:ir.actions.act_window,help:crm_claim.crm_case_categ_claim0
+msgid ""
+"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."
+msgstr ""
+"記錄和追蹤你客戶的索賠，索賠可以連結到一個或很多銷售訂單中。你可以發送帶附件的郵件和保留一個索賠的所有日誌（郵件發送，介入類型等）。索賠可以自動連結到電子"
+"郵件使用的閘道。"
+
+#. module: crm_claim
+#: field:crm.claim.report,email:0
+msgid "# Emails"
+msgstr "電子郵件"
+
+#. module: crm_claim
+#: model:crm.case.stage,name:crm_claim.stage_claim2
+msgid "Actions Done"
+msgstr "動作完成"
+
+#. module: crm_claim
+#: view:crm.claim.report:0
+msgid "Claims created in last month"
+msgstr "上個月新建的抱怨"
+
+#. module: crm_claim
+#: model:crm.case.stage,name:crm_claim.stage_claim5
+msgid "Actions Defined"
+msgstr "動作定義"
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Follow Up"
+msgstr "跟進"
+
+#. module: crm_claim
+#: help:crm.claim,state:0
+msgid ""
+"The state is set to 'Draft', when a case is created.                         "
+"         \n"
+"If the case is in progress the state is set to 'Open'.                       "
+"           \n"
+"When the case is over, the state is set to 'Done'.                           "
+"       \n"
+"If the case needs to be reviewed then the state is set to 'Pending'."
+msgstr ""
+"當一個業務建立時狀態設為'草稿'\n"
+"如果業務正在處理狀態設為'開啟'\n"
+"當業務結束狀態設為'完成'\n"
+"如果業務需要審查狀態設為'待處理'"
+
+#. module: crm_claim
+#: selection:crm.claim.report,month:0
+msgid "February"
+msgstr "2月"
+
+#. module: crm_claim
+#: view:crm.claim.report:0
+#: field:crm.claim.report,name:0
+msgid "Year"
+msgstr "年"
+
+#. module: crm_claim
+#: view:crm.claim.report:0
+msgid "My company"
+msgstr "我的公司"
+
+#. module: crm_claim
+#: selection:crm.claim.report,month:0
+msgid "April"
+msgstr "4月"
+
+#. module: crm_claim
+#: view:crm.claim.report:0
+msgid "My Case(s)"
+msgstr "我的業務"
+
+#. module: crm_claim
+#: field:crm.claim,id:0
+msgid "ID"
+msgstr "ID"
+
+#. module: crm_claim
+#: constraint:res.partner:0
+msgid "Error ! You cannot create recursive associated members."
+msgstr "錯誤，您不能建立循環引用的會員用戶"
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Actions"
+msgstr "動作"
+
+#. module: crm_claim
+#: selection:crm.claim,priority:0
+#: selection:crm.claim.report,priority:0
+msgid "High"
+msgstr "高"
+
+#. module: crm_claim
+#: model:ir.actions.act_window,help:crm_claim.crm_claim_categ_action
+msgid ""
+"Create claim categories to better manage and classify your claims. Some "
+"example of claims can be: preventive action, corrective action."
+msgstr "建立索賠的類型以更好管理和分類你的索賠。如：索賠可以是預防措施、糾正措施。"
+
+#. module: crm_claim
+#: field:crm.claim.report,create_date:0
+msgid "Create Date"
+msgstr "建立日期"
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "In Progress Claims"
+msgstr "正在處理的抱怨"
diff --git a/addons/crm_claim/test/ui/claim_demo.yml b/addons/crm_claim/test/ui/claim_demo.yml
index ad8fdf3aa44..044e0482e93 100644
--- a/addons/crm_claim/test/ui/claim_demo.yml
+++ b/addons/crm_claim/test/ui/claim_demo.yml
@@ -9,7 +9,6 @@
 -
   !python {model: crm.claim}: |
     try:
-      self.message_update(cr, uid,[ref('crm_claim_4')], {'subject': 'Claim Update record','body_text': 'first training session completed',})
+      self.message_update(cr, uid,[ref('crm_claim_4')], {'subject': 'Claim Update record','body': 'first training session completed',})
     except:
       pass
-  
\ No newline at end of file
diff --git a/addons/crm_helpdesk/__openerp__.py b/addons/crm_helpdesk/__openerp__.py
index 7e8b69bbc4c..e2d246cb2db 100644
--- a/addons/crm_helpdesk/__openerp__.py
+++ b/addons/crm_helpdesk/__openerp__.py
@@ -21,8 +21,8 @@
 
 
 {
-    'category': 'Customer Relationship Management', 
     'name': 'Helpdesk',
+    'category': 'Customer Relationship Management', 
     'version': '1.0',
     'description': """
 Helpdesk Management.
@@ -36,18 +36,14 @@ and categorize your interventions with a channel and a priority level.
     'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
     'depends': ['crm'],
-    'init_xml': [
-         'crm_helpdesk_data.xml',
-    ],
-    'update_xml': [
+    'data': [
         'crm_helpdesk_view.xml',
         'crm_helpdesk_menu.xml',
         'security/ir.model.access.csv',
         'report/crm_helpdesk_report_view.xml',
+        'crm_helpdesk_data.xml',
     ],
-    'demo_xml': [
-        'crm_helpdesk_demo.xml',
-    ],
+    'demo': ['crm_helpdesk_demo.xml'],
     'test': ['test/process/help-desk.yml'],
     'installable': True,
     'auto_install': False,
diff --git a/addons/crm_helpdesk/crm_helpdesk.py b/addons/crm_helpdesk/crm_helpdesk.py
index 4b0cb2e3ffa..612537bdb77 100644
--- a/addons/crm_helpdesk/crm_helpdesk.py
+++ b/addons/crm_helpdesk/crm_helpdesk.py
@@ -38,7 +38,7 @@ class crm_helpdesk(base_state, osv.osv):
     _description = "Helpdesk"
     _order = "id desc"
     _inherit = ['mail.thread']
-    _mail_compose_message = True
+
     _columns = {
             'id': fields.integer('ID', readonly=True),
             'name': fields.char('Name', size=128, required=True),
@@ -105,12 +105,11 @@ class crm_helpdesk(base_state, osv.osv):
         if custom_values is None: custom_values = {}
         custom_values.update({
             'name': msg.get('subject') or _("No Subject"),
-            'description': msg.get('body_text'),
+            'description': msg.get('body'),
             'email_from': msg.get('from'),
             'email_cc': msg.get('cc'),
             'user_id': False,
         })
-        custom_values.update(self.message_partner_by_email(cr, uid, msg.get('from'), context=context))
         return super(crm_helpdesk,self).message_new(cr, uid, msg, custom_values=custom_values, context=context)
 
     def message_update(self, cr, uid, ids, msg, update_vals=None, context=None):
@@ -130,7 +129,7 @@ class crm_helpdesk(base_state, osv.osv):
             'revenue': 'planned_revenue',
             'probability':'probability'
         }
-        for line in msg['body_text'].split('\n'):
+        for line in msg['body'].split('\n'):
             line = line.strip()
             res = tools.misc.command_re.match(line)
             if res and maps.get(res.group(1).lower()):
@@ -149,7 +148,7 @@ class crm_helpdesk(base_state, osv.osv):
 
     def create_send_note(self, cr, uid, ids, context=None):
         msg = _('Case has been <b>created</b>.')
-        self.message_append_note(cr, uid, ids, body=msg, context=context)
+        self.message_post(cr, uid, ids, body=msg, context=context)
         return True
 
 
diff --git a/addons/crm_helpdesk/i18n/ar.po b/addons/crm_helpdesk/i18n/ar.po
index cce0b0d46d4..5a230d020a8 100644
--- a/addons/crm_helpdesk/i18n/ar.po
+++ b/addons/crm_helpdesk/i18n/ar.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:34+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:38+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk.report,delay_close:0
diff --git a/addons/crm_helpdesk/i18n/bg.po b/addons/crm_helpdesk/i18n/bg.po
index 544831ed558..9f9be5a36cb 100644
--- a/addons/crm_helpdesk/i18n/bg.po
+++ b/addons/crm_helpdesk/i18n/bg.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:34+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:38+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk.report,delay_close:0
diff --git a/addons/crm_helpdesk/i18n/ca.po b/addons/crm_helpdesk/i18n/ca.po
index 6c2d1c06e9e..0ed45f367af 100644
--- a/addons/crm_helpdesk/i18n/ca.po
+++ b/addons/crm_helpdesk/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:34+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:38+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk.report,delay_close:0
diff --git a/addons/crm_helpdesk/i18n/da.po b/addons/crm_helpdesk/i18n/da.po
index 9c870aeaac4..37342f40ac3 100644
--- a/addons/crm_helpdesk/i18n/da.po
+++ b/addons/crm_helpdesk/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:34+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:38+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk.report,delay_close:0
diff --git a/addons/crm_helpdesk/i18n/de.po b/addons/crm_helpdesk/i18n/de.po
index a6e0b77dd79..1ed0c7c487d 100644
--- a/addons/crm_helpdesk/i18n/de.po
+++ b/addons/crm_helpdesk/i18n/de.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:34+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:38+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk.report,delay_close:0
diff --git a/addons/crm_helpdesk/i18n/el.po b/addons/crm_helpdesk/i18n/el.po
index 033cc19f789..f2d08c3ff08 100644
--- a/addons/crm_helpdesk/i18n/el.po
+++ b/addons/crm_helpdesk/i18n/el.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:34+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:38+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk.report,delay_close:0
diff --git a/addons/crm_helpdesk/i18n/es.po b/addons/crm_helpdesk/i18n/es.po
index 2a98213087a..533128799f0 100644
--- a/addons/crm_helpdesk/i18n/es.po
+++ b/addons/crm_helpdesk/i18n/es.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:34+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:38+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk.report,delay_close:0
diff --git a/addons/crm_helpdesk/i18n/es_CR.po b/addons/crm_helpdesk/i18n/es_CR.po
index 384de5710a4..758a9c3b344 100644
--- a/addons/crm_helpdesk/i18n/es_CR.po
+++ b/addons/crm_helpdesk/i18n/es_CR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:34+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:38+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 "Language: es\n"
 
 #. module: crm_helpdesk
diff --git a/addons/crm_helpdesk/i18n/es_PY.po b/addons/crm_helpdesk/i18n/es_PY.po
index fd0667f1745..fbe48f22340 100644
--- a/addons/crm_helpdesk/i18n/es_PY.po
+++ b/addons/crm_helpdesk/i18n/es_PY.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:34+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:38+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk.report,delay_close:0
diff --git a/addons/crm_helpdesk/i18n/fi.po b/addons/crm_helpdesk/i18n/fi.po
index 3e53d2f34b8..daa08a65569 100644
--- a/addons/crm_helpdesk/i18n/fi.po
+++ b/addons/crm_helpdesk/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:34+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:38+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk.report,delay_close:0
diff --git a/addons/crm_helpdesk/i18n/fr.po b/addons/crm_helpdesk/i18n/fr.po
index 4d75db97a1a..29835dc9a76 100644
--- a/addons/crm_helpdesk/i18n/fr.po
+++ b/addons/crm_helpdesk/i18n/fr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:34+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:38+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk.report,delay_close:0
diff --git a/addons/crm_helpdesk/i18n/gl.po b/addons/crm_helpdesk/i18n/gl.po
index cc556b289ac..4114b33a771 100644
--- a/addons/crm_helpdesk/i18n/gl.po
+++ b/addons/crm_helpdesk/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:34+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:38+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk.report,delay_close:0
diff --git a/addons/crm_helpdesk/i18n/gu.po b/addons/crm_helpdesk/i18n/gu.po
index 3eac083c369..488f859e45b 100644
--- a/addons/crm_helpdesk/i18n/gu.po
+++ b/addons/crm_helpdesk/i18n/gu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:34+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:38+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk.report,delay_close:0
diff --git a/addons/crm_helpdesk/i18n/hr.po b/addons/crm_helpdesk/i18n/hr.po
index fd60b596455..8bda8fa60e4 100644
--- a/addons/crm_helpdesk/i18n/hr.po
+++ b/addons/crm_helpdesk/i18n/hr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:34+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:38+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk.report,delay_close:0
diff --git a/addons/crm_helpdesk/i18n/hu.po b/addons/crm_helpdesk/i18n/hu.po
index 332e9e77642..0b9f37d067e 100644
--- a/addons/crm_helpdesk/i18n/hu.po
+++ b/addons/crm_helpdesk/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:34+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:38+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk.report,delay_close:0
diff --git a/addons/crm_helpdesk/i18n/it.po b/addons/crm_helpdesk/i18n/it.po
index bd32ba3fbdd..8af4a09d8e0 100644
--- a/addons/crm_helpdesk/i18n/it.po
+++ b/addons/crm_helpdesk/i18n/it.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:34+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:38+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk.report,delay_close:0
diff --git a/addons/crm_helpdesk/i18n/ja.po b/addons/crm_helpdesk/i18n/ja.po
index 4981c426c5c..749089f6b06 100644
--- a/addons/crm_helpdesk/i18n/ja.po
+++ b/addons/crm_helpdesk/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:34+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:38+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk.report,delay_close:0
diff --git a/addons/crm_helpdesk/i18n/lt.po b/addons/crm_helpdesk/i18n/lt.po
index 5d49ed06848..46e850d7e26 100644
--- a/addons/crm_helpdesk/i18n/lt.po
+++ b/addons/crm_helpdesk/i18n/lt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:34+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:38+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk.report,delay_close:0
diff --git a/addons/crm_helpdesk/i18n/lv.po b/addons/crm_helpdesk/i18n/lv.po
index 4f5a38c0683..015fdbfa96c 100644
--- a/addons/crm_helpdesk/i18n/lv.po
+++ b/addons/crm_helpdesk/i18n/lv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:34+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:38+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk.report,delay_close:0
diff --git a/addons/crm_helpdesk/i18n/mn.po b/addons/crm_helpdesk/i18n/mn.po
index 00c4d745f80..621ff1b4a31 100644
--- a/addons/crm_helpdesk/i18n/mn.po
+++ b/addons/crm_helpdesk/i18n/mn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:34+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:38+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk.report,delay_close:0
diff --git a/addons/crm_helpdesk/i18n/nl.po b/addons/crm_helpdesk/i18n/nl.po
index 5bdd9dcf18d..0a6a3c02453 100644
--- a/addons/crm_helpdesk/i18n/nl.po
+++ b/addons/crm_helpdesk/i18n/nl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:34+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:38+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk.report,delay_close:0
diff --git a/addons/crm_helpdesk/i18n/pl.po b/addons/crm_helpdesk/i18n/pl.po
index 5017b1591c5..937d2e9875c 100644
--- a/addons/crm_helpdesk/i18n/pl.po
+++ b/addons/crm_helpdesk/i18n/pl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:34+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:38+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk.report,delay_close:0
diff --git a/addons/crm_helpdesk/i18n/pt.po b/addons/crm_helpdesk/i18n/pt.po
index 5f9f7dd86da..4d3e6acbedd 100644
--- a/addons/crm_helpdesk/i18n/pt.po
+++ b/addons/crm_helpdesk/i18n/pt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:34+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:38+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk.report,delay_close:0
diff --git a/addons/crm_helpdesk/i18n/pt_BR.po b/addons/crm_helpdesk/i18n/pt_BR.po
index 3d6c93af0e2..2055641d688 100644
--- a/addons/crm_helpdesk/i18n/pt_BR.po
+++ b/addons/crm_helpdesk/i18n/pt_BR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:34+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:38+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk.report,delay_close:0
diff --git a/addons/crm_helpdesk/i18n/ro.po b/addons/crm_helpdesk/i18n/ro.po
index 614f0682bcf..0daf79f4c7a 100644
--- a/addons/crm_helpdesk/i18n/ro.po
+++ b/addons/crm_helpdesk/i18n/ro.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:34+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:38+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk.report,delay_close:0
diff --git a/addons/crm_helpdesk/i18n/ru.po b/addons/crm_helpdesk/i18n/ru.po
index cd808932f61..6884873a0b9 100644
--- a/addons/crm_helpdesk/i18n/ru.po
+++ b/addons/crm_helpdesk/i18n/ru.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:34+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:38+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk.report,delay_close:0
diff --git a/addons/crm_helpdesk/i18n/sl.po b/addons/crm_helpdesk/i18n/sl.po
index 53130554ac3..042e4177b12 100644
--- a/addons/crm_helpdesk/i18n/sl.po
+++ b/addons/crm_helpdesk/i18n/sl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:34+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:38+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk.report,delay_close:0
diff --git a/addons/crm_helpdesk/i18n/sq.po b/addons/crm_helpdesk/i18n/sq.po
index d8a8954fa78..35d054fadb0 100644
--- a/addons/crm_helpdesk/i18n/sq.po
+++ b/addons/crm_helpdesk/i18n/sq.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:34+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:38+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk.report,delay_close:0
diff --git a/addons/crm_helpdesk/i18n/sr.po b/addons/crm_helpdesk/i18n/sr.po
index 1e095c24a22..75fbe9b3fe8 100644
--- a/addons/crm_helpdesk/i18n/sr.po
+++ b/addons/crm_helpdesk/i18n/sr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:34+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:38+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk.report,delay_close:0
diff --git a/addons/crm_helpdesk/i18n/sr@latin.po b/addons/crm_helpdesk/i18n/sr@latin.po
index d2d7bacdc3d..75aadc6197d 100644
--- a/addons/crm_helpdesk/i18n/sr@latin.po
+++ b/addons/crm_helpdesk/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:34+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:38+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk.report,delay_close:0
diff --git a/addons/crm_helpdesk/i18n/sv.po b/addons/crm_helpdesk/i18n/sv.po
index d3062161c51..e75c78cd4c8 100644
--- a/addons/crm_helpdesk/i18n/sv.po
+++ b/addons/crm_helpdesk/i18n/sv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:34+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:38+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk.report,delay_close:0
diff --git a/addons/crm_helpdesk/i18n/tr.po b/addons/crm_helpdesk/i18n/tr.po
index b8ffc9968e7..26ba78f16a7 100644
--- a/addons/crm_helpdesk/i18n/tr.po
+++ b/addons/crm_helpdesk/i18n/tr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:34+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:38+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk.report,delay_close:0
diff --git a/addons/crm_helpdesk/i18n/zh_CN.po b/addons/crm_helpdesk/i18n/zh_CN.po
index e0fe8565296..522a5db72b9 100644
--- a/addons/crm_helpdesk/i18n/zh_CN.po
+++ b/addons/crm_helpdesk/i18n/zh_CN.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:34+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:38+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk.report,delay_close:0
diff --git a/addons/crm_helpdesk/i18n/zh_TW.po b/addons/crm_helpdesk/i18n/zh_TW.po
new file mode 100644
index 00000000000..6cddf9bd735
--- /dev/null
+++ b/addons/crm_helpdesk/i18n/zh_TW.po
@@ -0,0 +1,744 @@
+# Chinese (Traditional) 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-02-08 00:36+0000\n"
+"PO-Revision-Date: 2012-08-30 10:12+0000\n"
+"Last-Translator: Bonnie Duan <bonnie.duan@cenoq.com>\n"
+"Language-Team: Cenoq Corp.\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-08-31 04:56+0000\n"
+"X-Generator: Launchpad (build 15887)\n"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk.report,delay_close:0
+msgid "Delay to Close"
+msgstr "延遲關閉"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk.report,nbr:0
+msgid "# of Cases"
+msgstr "# 業務量"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+#: view:crm.helpdesk.report:0
+msgid "Group By..."
+msgstr "分類方式..."
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Today"
+msgstr "今日"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,month:0
+msgid "March"
+msgstr "3月"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "Helpdesk requests occurred in current year"
+msgstr "本年發生的服務需求"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,company_id:0
+#: view:crm.helpdesk.report:0
+#: field:crm.helpdesk.report,company_id:0
+msgid "Company"
+msgstr "公司"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,email_cc:0
+msgid "Watchers Emails"
+msgstr "視察者的電子郵件"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk,priority:0
+#: selection:crm.helpdesk.report,priority:0
+msgid "Highest"
+msgstr "最高"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+#: field:crm.helpdesk.report,day:0
+msgid "Day"
+msgstr "日"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Add Internal Note"
+msgstr "加入內部備註"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "Date of helpdesk requests"
+msgstr "客服需求日期"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Notes"
+msgstr "備註"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,message_ids:0
+msgid "Messages"
+msgstr "訊息"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "My company"
+msgstr "我的公司"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk,state:0
+#: selection:crm.helpdesk.report,state:0
+msgid "Cancelled"
+msgstr "已取消"
+
+#. module: crm_helpdesk
+#: model:ir.actions.act_window,name:crm_helpdesk.action_report_crm_helpdesk
+#: model:ir.ui.menu,name:crm_helpdesk.menu_report_crm_helpdesks_tree
+msgid "Helpdesk Analysis"
+msgstr "客服分析"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+#: field:crm.helpdesk.report,date_closed:0
+msgid "Close Date"
+msgstr "結束日期"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,ref:0
+msgid "Reference"
+msgstr "關聯"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,date_action_next:0
+msgid "Next Action"
+msgstr "下一動作"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Helpdesk Supports"
+msgstr "客服協助"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Extra Info"
+msgstr "額外資訊"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+#: field:crm.helpdesk,partner_id:0
+#: view:crm.helpdesk.report:0
+#: field:crm.helpdesk.report,partner_id:0
+msgid "Partner"
+msgstr "業務夥伴"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Estimates"
+msgstr "估計"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk.report,section_id:0
+msgid "Section"
+msgstr "劃分"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "Helpdesk requests occurred in last month"
+msgstr "上個月發生的客服需求"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Send New Email"
+msgstr "發送新的電子郵件"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Helpdesk requests during last 7 days"
+msgstr "之前7天內的客服需求"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+#: selection:crm.helpdesk,state:0
+#: view:crm.helpdesk.report:0
+msgid "New"
+msgstr "新建"
+
+#. module: crm_helpdesk
+#: model:ir.model,name:crm_helpdesk.model_crm_helpdesk_report
+msgid "Helpdesk report after Sales Services"
+msgstr "客服售後服務報表"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,email_from:0
+msgid "Email"
+msgstr "電子郵件"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,channel_id:0
+#: view:crm.helpdesk.report:0
+#: field:crm.helpdesk.report,channel_id:0
+msgid "Channel"
+msgstr "管道"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk,priority:0
+#: selection:crm.helpdesk.report,priority:0
+msgid "Lowest"
+msgstr "最低"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "# Mails"
+msgstr "郵件"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+#: view:crm.helpdesk.report:0
+msgid "My Sales Team(s)"
+msgstr "我的銷售團隊"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,create_date:0
+#: field:crm.helpdesk.report,create_date:0
+msgid "Creation Date"
+msgstr "建立日期"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Reset to Draft"
+msgstr "重設為草稿"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+#: selection:crm.helpdesk,state:0
+#: selection:crm.helpdesk.report,state:0
+msgid "Pending"
+msgstr "待處理"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+#: field:crm.helpdesk,date_deadline:0
+#: field:crm.helpdesk.report,date_deadline:0
+msgid "Deadline"
+msgstr "截止日期"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,month:0
+msgid "July"
+msgstr "7月"
+
+#. module: crm_helpdesk
+#: model:ir.actions.act_window,name:crm_helpdesk.crm_helpdesk_categ_action
+msgid "Helpdesk Categories"
+msgstr "客服分類"
+
+#. module: crm_helpdesk
+#: model:ir.ui.menu,name:crm_helpdesk.menu_crm_case_helpdesk-act
+msgid "Categories"
+msgstr "分類"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "New Helpdesk Request"
+msgstr "新的客服需求"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "History Information"
+msgstr "日誌資訊"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Dates"
+msgstr "日期"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "Month of helpdesk requests"
+msgstr "客服需求月份"
+
+#. module: crm_helpdesk
+#: code:addons/crm_helpdesk/crm_helpdesk.py:101
+#, python-format
+msgid "No Subject"
+msgstr "無主題"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "#Helpdesk"
+msgstr "客服"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "All pending Helpdesk Request"
+msgstr "所有暫停的客服需求"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "Year of helpdesk requests"
+msgstr "服務需求的年份"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "References"
+msgstr "關聯"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,month:0
+msgid "September"
+msgstr "9月"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Communication"
+msgstr "溝通"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+#: field:crm.helpdesk.report,month:0
+msgid "Month"
+msgstr "月份"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Escalate"
+msgstr "提升"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,write_date:0
+msgid "Update Date"
+msgstr "更新日期"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "Helpdesk requests occurred in current month"
+msgstr "當月發生的客服需求"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "Salesman"
+msgstr "業務員"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,ref2:0
+msgid "Reference 2"
+msgstr "關聯2"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,categ_id:0
+#: field:crm.helpdesk.report,categ_id:0
+msgid "Category"
+msgstr "分類"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Responsible User"
+msgstr "負責使用者"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Helpdesk Support"
+msgstr "客服協助"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,planned_cost:0
+#: field:crm.helpdesk.report,planned_cost:0
+msgid "Planned Costs"
+msgstr "計劃成本"
+
+#. module: crm_helpdesk
+#: help:crm.helpdesk,channel_id:0
+msgid "Communication channel."
+msgstr "通訊管道"
+
+#. module: crm_helpdesk
+#: help:crm.helpdesk,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: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Search Helpdesk"
+msgstr "搜索客服"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,state:0
+msgid "Draft"
+msgstr "草稿"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk,priority:0
+#: selection:crm.helpdesk.report,priority:0
+msgid "Low"
+msgstr "低"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,date_closed:0
+#: selection:crm.helpdesk,state:0
+#: view:crm.helpdesk.report:0
+#: selection:crm.helpdesk.report,state:0
+msgid "Closed"
+msgstr "已結束"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Reply"
+msgstr "回覆"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "7 Days"
+msgstr "7天"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Communication & History"
+msgstr "溝通&日誌"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,month:0
+msgid "August"
+msgstr "8月"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk,priority:0
+#: selection:crm.helpdesk.report,priority:0
+msgid "Normal"
+msgstr "普通"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Global CC"
+msgstr "完整副本"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,month:0
+msgid "June"
+msgstr "6月"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,planned_revenue:0
+msgid "Planned Revenue"
+msgstr "計劃收入"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk.report,user_id:0
+msgid "User"
+msgstr "使用者"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,active:0
+msgid "Active"
+msgstr "生效"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,month:0
+msgid "November"
+msgstr "11月"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "Extended Filters..."
+msgstr "增加篩選條件"
+
+#. module: crm_helpdesk
+#: model:ir.actions.act_window,name:crm_helpdesk.crm_case_helpdesk_act111
+msgid "Helpdesk Requests"
+msgstr "客服需求"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "Search"
+msgstr "搜索"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,month:0
+msgid "October"
+msgstr "10月"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,month:0
+msgid "January"
+msgstr "1月"
+
+#. module: crm_helpdesk
+#: help:crm.helpdesk,email_from:0
+msgid "These people will receive email."
+msgstr "這些人將收到電子郵件。"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+#: field:crm.helpdesk,date:0
+msgid "Date"
+msgstr "日期"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "History"
+msgstr "日誌"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+#: field:crm.helpdesk,priority:0
+#: view:crm.helpdesk.report:0
+#: field:crm.helpdesk.report,priority:0
+msgid "Priority"
+msgstr "優先級"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,partner_address_id:0
+msgid "Partner Contact"
+msgstr "業務夥伴聯絡人"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Misc"
+msgstr "雜項"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+#: field:crm.helpdesk,state:0
+#: view:crm.helpdesk.report:0
+#: field:crm.helpdesk.report,state:0
+msgid "State"
+msgstr "狀態"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "General"
+msgstr "一般"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Send Reminder"
+msgstr "傳送提醒"
+
+#. module: crm_helpdesk
+#: help:crm.helpdesk,section_id:0
+msgid ""
+"Sales team to which Case belongs to.                                 Define "
+"Responsible user and Email account for mail gateway."
+msgstr "屬於此種情況下，銷售團隊。定義負責用戶和電子郵件帳戶的郵件網關。"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Done"
+msgstr "完成"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,month:0
+msgid "December"
+msgstr "12月"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Cancel"
+msgstr "取消"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Close"
+msgstr "結束"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+#: view:crm.helpdesk.report:0
+#: selection:crm.helpdesk.report,state:0
+msgid "Open"
+msgstr "開啟"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Helpdesk Support Tree"
+msgstr "客服協助來源"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk,state:0
+msgid "In Progress"
+msgstr "進行中"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Categorization"
+msgstr "分類"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+#: model:ir.model,name:crm_helpdesk.model_crm_helpdesk
+#: model:ir.ui.menu,name:crm_helpdesk.menu_config_helpdesk
+msgid "Helpdesk"
+msgstr "客服"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+#: field:crm.helpdesk,user_id:0
+msgid "Responsible"
+msgstr "負責人"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk.report,delay_expected:0
+msgid "Overpassed Deadline"
+msgstr "超過截止日期"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,description:0
+msgid "Description"
+msgstr "說明"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,month:0
+msgid "May"
+msgstr "5月"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,probability:0
+msgid "Probability (%)"
+msgstr "概率(%)"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk.report,email:0
+msgid "# Emails"
+msgstr "電子郵件"
+
+#. module: crm_helpdesk
+#: model:ir.actions.act_window,help:crm_helpdesk.action_report_crm_helpdesk
+msgid ""
+"Have a general overview of all support requests by sorting them with "
+"specific criteria such as the processing time, number of requests answered, "
+"emails sent and costs."
+msgstr "為所有的支持請求排序指定具體標準如：處理時間，請求回覆的次數，發送的郵件，成本."
+
+#. module: crm_helpdesk
+#: help:crm.helpdesk,state:0
+msgid ""
+"The state is set to 'Draft', when a case is created.                         "
+"         \n"
+"If the case is in progress the state is set to 'Open'.                       "
+"           \n"
+"When the case is over, the state is set to 'Done'.                           "
+"       \n"
+"If the case needs to be reviewed then the state is set to 'Pending'."
+msgstr ""
+"當一個業務建立時狀態設為'草稿'\n"
+"如果業務正在處理狀態設為'開啟'\n"
+"當業務結束狀態設為'完成'\n"
+"如果業務需要審查狀態設為'待處理'"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,month:0
+msgid "February"
+msgstr "2月"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,name:0
+msgid "Name"
+msgstr "名稱"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "Month-1"
+msgstr "上月"
+
+#. module: crm_helpdesk
+#: model:ir.ui.menu,name:crm_helpdesk.menu_help_support_main
+msgid "Helpdesk and Support"
+msgstr "客服和協助"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,month:0
+msgid "April"
+msgstr "4月"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "My Case(s)"
+msgstr "我的業務"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Query"
+msgstr "提問"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,id:0
+msgid "ID"
+msgstr "ID"
+
+#. module: crm_helpdesk
+#: model:ir.actions.act_window,help:crm_helpdesk.crm_helpdesk_categ_action
+msgid ""
+"Create and manage helpdesk categories to better manage and classify your "
+"support requests."
+msgstr "建立和管理客服類型去更好管理和分類你的需求協助"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Todays's Helpdesk Requests"
+msgstr "今天的客服需求"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Request Date"
+msgstr "需求日期"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Open Helpdesk Request"
+msgstr "打開客服需求"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk,priority:0
+#: selection:crm.helpdesk.report,priority:0
+msgid "High"
+msgstr "高"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+#: field:crm.helpdesk,section_id:0
+#: view:crm.helpdesk.report:0
+msgid "Sales Team"
+msgstr "銷售團隊"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,date_action_last:0
+msgid "Last Action"
+msgstr "最近動作"
+
+#. module: crm_helpdesk
+#: model:ir.actions.act_window,help:crm_helpdesk.crm_case_helpdesk_act111
+msgid ""
+"Helpdesk and Support allow you to track your interventions. Select a "
+"customer, add notes and categorize interventions with partners if necessary. "
+"You can also assign a priority level. Use the OpenERP Issues system to "
+"manage your support activities. Issues can be connected to the email "
+"gateway: new emails may create issues, each of them automatically gets the "
+"history of the conversation with the customer."
+msgstr ""
+"客服和協助使你可以去追蹤.如果需要選擇一個客戶增加備註和類型這業務夥伴.你可以分配一優先級用系統問題模塊來管理的的支持活動.問題能鏈接郵件閘道.新的郵件可"
+"能建立新的問題,它們能自動寫入於客戶溝通的日誌."
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+#: field:crm.helpdesk.report,name:0
+msgid "Year"
+msgstr "年"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,duration:0
+msgid "Duration"
+msgstr "持續時間"
diff --git a/addons/crm_helpdesk/report/crm_helpdesk_report.py b/addons/crm_helpdesk/report/crm_helpdesk_report.py
index 93a33d62819..6496935c2d2 100644
--- a/addons/crm_helpdesk/report/crm_helpdesk_report.py
+++ b/addons/crm_helpdesk/report/crm_helpdesk_report.py
@@ -97,7 +97,7 @@ class crm_helpdesk_report(osv.osv):
                     c.planned_cost,
                     count(*) as nbr,
                     extract('epoch' from (c.date_closed-c.create_date))/(3600*24) as  delay_close,
-                    (SELECT count(id) FROM mail_message WHERE model='crm.helpdesk' AND res_id=c.id AND email_from IS NOT NULL) AS email,
+                    (SELECT count(id) FROM mail_message WHERE model='crm.helpdesk' AND res_id=c.id AND type = 'email') AS email,
                     abs(avg(extract('epoch' from (c.date_deadline - c.date_closed)))/(3600*24)) as delay_expected
                 from
                     crm_helpdesk c
diff --git a/addons/crm_helpdesk/test/process/help-desk.yml b/addons/crm_helpdesk/test/process/help-desk.yml
index 320bd61c2af..4fd6a9ee9d7 100644
--- a/addons/crm_helpdesk/test/process/help-desk.yml
+++ b/addons/crm_helpdesk/test/process/help-desk.yml
@@ -23,7 +23,7 @@
   !python {model: crm.helpdesk}: |
     question_ids = self.search(cr, uid, [('email_from','=', 'Mr. John Right <info@customer.com>')])
     try:
-      self.message_update(cr, uid, question_ids, {'subject': 'Link of product', 'body_text': 'www.openerp.com'})
+      self.message_update(cr, uid, question_ids, {'subject': 'Link of product', 'body': 'www.openerp.com'})
     except:
       pass
 
diff --git a/addons/crm_partner_assign/__openerp__.py b/addons/crm_partner_assign/__openerp__.py
index 5feb8c199d4..c9d6990025c 100644
--- a/addons/crm_partner_assign/__openerp__.py
+++ b/addons/crm_partner_assign/__openerp__.py
@@ -32,15 +32,14 @@ You can geolocalize your opportunities by using this module.
 
 Use geolocalization when assigning opportunities to partners.
 Determine the GPS coordinates according to the address of the partner.
+
 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_xml': [
-        'res_partner_demo.xml',
-    ],
-    'update_xml': [
+    'demo': ['res_partner_demo.xml'],
+    'data': [
         'security/ir.model.access.csv',
         'res_partner_view.xml',
         'wizard/crm_forward_to_partner_view.xml',
@@ -48,9 +47,7 @@ You can also use the geolocalization without using the GPS coordinates.
         'report/crm_lead_report_view.xml',
         'report/crm_partner_report_view.xml',
     ],
-    'test': [
-        'test/partner_assign.yml'
-    ],
+    'test': ['test/partner_assign.yml'],
     'installable': True,
     'auto_install': False,
     'certificate': '00503409558942442061',
diff --git a/addons/crm_partner_assign/crm_lead_view.xml b/addons/crm_partner_assign/crm_lead_view.xml
index d4ff93d52fd..cd2e3f08c9a 100644
--- a/addons/crm_partner_assign/crm_lead_view.xml
+++ b/addons/crm_partner_assign/crm_lead_view.xml
@@ -19,8 +19,7 @@
                                             attrs="{'invisible':[('partner_assigned_id','=',False)]}"
                                             name="%(crm_lead_forward_to_partner_act)d"
                                             icon="terp-mail-forward" type="action"
-                                            context="{'default_name': 'partner', 'default_partner_id': partner_assigned_id}"
-                                        />
+                                            context="{'default_composition_mode': 'forward', 'default_partner_ids': [partner_assigned_id]}"/>
                                     </div>
                                 </group>
                                 <group string="Geo Assignation">
@@ -37,8 +36,6 @@
             </field>
         </record>
 
-
-
         <record id="view_crm_opportunity_geo_assign_tree" model="ir.ui.view">
             <field name="name">crm.lead.geo_assign.tree.inherit</field>
             <field name="model">crm.lead</field>
@@ -49,6 +46,7 @@
                  </field>
             </field>
         </record>
+
         <record model="ir.ui.view" id="crm_opportunity_partner_filter">
             <field name="name">crm.opportunity.partner.filter.assigned</field>
             <field name="model">crm.lead</field>
@@ -63,5 +61,6 @@
                 </field>
             </field>
          </record>
+
     </data>
 </openerp>
diff --git a/addons/crm_partner_assign/i18n/ar.po b/addons/crm_partner_assign/i18n/ar.po
index af2b96e8019..53d88fd259a 100644
--- a/addons/crm_partner_assign/i18n/ar.po
+++ b/addons/crm_partner_assign/i18n/ar.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:59+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,send_to:0
@@ -74,7 +74,7 @@ msgid "Geo Localize"
 msgstr "التمركز الجغرافي"
 
 #. module: crm_partner_assign
-#: help:crm.lead.forward.to.partner,body_text:0
+#: help:crm.lead.forward.to.partner,body:0
 msgid "Plain-text version of the message"
 msgstr ""
 
@@ -134,7 +134,7 @@ msgid "Highest"
 msgstr "أعلى"
 
 #. module: crm_partner_assign
-#: field:crm.lead.forward.to.partner,body_text:0
+#: field:crm.lead.forward.to.partner,body:0
 msgid "Text contents"
 msgstr ""
 
diff --git a/addons/crm_partner_assign/i18n/bg.po b/addons/crm_partner_assign/i18n/bg.po
index dd7d8e8446d..cb670286522 100644
--- a/addons/crm_partner_assign/i18n/bg.po
+++ b/addons/crm_partner_assign/i18n/bg.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:59+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,send_to:0
@@ -74,7 +74,7 @@ msgid "Geo Localize"
 msgstr ""
 
 #. module: crm_partner_assign
-#: help:crm.lead.forward.to.partner,body_text:0
+#: help:crm.lead.forward.to.partner,body:0
 msgid "Plain-text version of the message"
 msgstr ""
 
@@ -133,7 +133,7 @@ msgid "Highest"
 msgstr "Най-висок"
 
 #. module: crm_partner_assign
-#: field:crm.lead.forward.to.partner,body_text:0
+#: field:crm.lead.forward.to.partner,body:0
 msgid "Text contents"
 msgstr ""
 
diff --git a/addons/crm_partner_assign/i18n/ca.po b/addons/crm_partner_assign/i18n/ca.po
index f012dc16dfb..1f73a19b35a 100644
--- a/addons/crm_partner_assign/i18n/ca.po
+++ b/addons/crm_partner_assign/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:59+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,send_to:0
@@ -74,7 +74,7 @@ msgid "Geo Localize"
 msgstr "Geo localitzar"
 
 #. module: crm_partner_assign
-#: help:crm.lead.forward.to.partner,body_text:0
+#: help:crm.lead.forward.to.partner,body:0
 msgid "Plain-text version of the message"
 msgstr ""
 
@@ -135,7 +135,7 @@ msgid "Highest"
 msgstr "El més alt"
 
 #. module: crm_partner_assign
-#: field:crm.lead.forward.to.partner,body_text:0
+#: field:crm.lead.forward.to.partner,body:0
 msgid "Text contents"
 msgstr ""
 
diff --git a/addons/crm_partner_assign/i18n/crm_partner_assign.pot b/addons/crm_partner_assign/i18n/crm_partner_assign.pot
index 3fb9fc0e915..c3ddc66fa3b 100644
--- a/addons/crm_partner_assign/i18n/crm_partner_assign.pot
+++ b/addons/crm_partner_assign/i18n/crm_partner_assign.pot
@@ -72,7 +72,7 @@ msgid "Geo Localize"
 msgstr ""
 
 #. module: crm_partner_assign
-#: help:crm.lead.forward.to.partner,body_text:0
+#: help:crm.lead.forward.to.partner,body:0
 msgid "Plain-text version of the message"
 msgstr ""
 
@@ -129,7 +129,7 @@ msgid "Highest"
 msgstr ""
 
 #. module: crm_partner_assign
-#: field:crm.lead.forward.to.partner,body_text:0
+#: field:crm.lead.forward.to.partner,body:0
 msgid "Text contents"
 msgstr ""
 
diff --git a/addons/crm_partner_assign/i18n/da.po b/addons/crm_partner_assign/i18n/da.po
index ae5ebe38ebb..5bb8265399f 100644
--- a/addons/crm_partner_assign/i18n/da.po
+++ b/addons/crm_partner_assign/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:59+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,send_to:0
@@ -74,7 +74,7 @@ msgid "Geo Localize"
 msgstr ""
 
 #. module: crm_partner_assign
-#: help:crm.lead.forward.to.partner,body_text:0
+#: help:crm.lead.forward.to.partner,body:0
 msgid "Plain-text version of the message"
 msgstr ""
 
@@ -133,7 +133,7 @@ msgid "Highest"
 msgstr ""
 
 #. module: crm_partner_assign
-#: field:crm.lead.forward.to.partner,body_text:0
+#: field:crm.lead.forward.to.partner,body:0
 msgid "Text contents"
 msgstr ""
 
diff --git a/addons/crm_partner_assign/i18n/de.po b/addons/crm_partner_assign/i18n/de.po
index 351a5d1f7b5..20a3352bc3f 100644
--- a/addons/crm_partner_assign/i18n/de.po
+++ b/addons/crm_partner_assign/i18n/de.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:59+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,send_to:0
@@ -74,7 +74,7 @@ msgid "Geo Localize"
 msgstr "Geogr. Lokalisierung"
 
 #. module: crm_partner_assign
-#: help:crm.lead.forward.to.partner,body_text:0
+#: help:crm.lead.forward.to.partner,body:0
 msgid "Plain-text version of the message"
 msgstr "Text Version der Mitteilung"
 
@@ -135,7 +135,7 @@ msgid "Highest"
 msgstr "Sehr Hoch"
 
 #. module: crm_partner_assign
-#: field:crm.lead.forward.to.partner,body_text:0
+#: field:crm.lead.forward.to.partner,body:0
 msgid "Text contents"
 msgstr "Text Inhalt"
 
diff --git a/addons/crm_partner_assign/i18n/el.po b/addons/crm_partner_assign/i18n/el.po
index 97bdb8238a8..edad942b005 100644
--- a/addons/crm_partner_assign/i18n/el.po
+++ b/addons/crm_partner_assign/i18n/el.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:59+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,send_to:0
@@ -74,7 +74,7 @@ msgid "Geo Localize"
 msgstr ""
 
 #. module: crm_partner_assign
-#: help:crm.lead.forward.to.partner,body_text:0
+#: help:crm.lead.forward.to.partner,body:0
 msgid "Plain-text version of the message"
 msgstr ""
 
@@ -133,7 +133,7 @@ msgid "Highest"
 msgstr "Υψηλότερο"
 
 #. module: crm_partner_assign
-#: field:crm.lead.forward.to.partner,body_text:0
+#: field:crm.lead.forward.to.partner,body:0
 msgid "Text contents"
 msgstr ""
 
diff --git a/addons/crm_partner_assign/i18n/es.po b/addons/crm_partner_assign/i18n/es.po
index 827161206de..f4e6d399e15 100644
--- a/addons/crm_partner_assign/i18n/es.po
+++ b/addons/crm_partner_assign/i18n/es.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:59+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,send_to:0
@@ -74,7 +74,7 @@ msgid "Geo Localize"
 msgstr "Geo localizar"
 
 #. module: crm_partner_assign
-#: help:crm.lead.forward.to.partner,body_text:0
+#: help:crm.lead.forward.to.partner,body:0
 msgid "Plain-text version of the message"
 msgstr ""
 
@@ -135,7 +135,7 @@ msgid "Highest"
 msgstr "Más alta"
 
 #. module: crm_partner_assign
-#: field:crm.lead.forward.to.partner,body_text:0
+#: field:crm.lead.forward.to.partner,body:0
 msgid "Text contents"
 msgstr ""
 
diff --git a/addons/crm_partner_assign/i18n/es_CR.po b/addons/crm_partner_assign/i18n/es_CR.po
index 249f9e9b24c..383f2669379 100644
--- a/addons/crm_partner_assign/i18n/es_CR.po
+++ b/addons/crm_partner_assign/i18n/es_CR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:59+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 "Language: es\n"
 
 #. module: crm_partner_assign
@@ -75,7 +75,7 @@ msgid "Geo Localize"
 msgstr "Geo localizar"
 
 #. module: crm_partner_assign
-#: help:crm.lead.forward.to.partner,body_text:0
+#: help:crm.lead.forward.to.partner,body:0
 msgid "Plain-text version of the message"
 msgstr "Versión en texto plano del mensaje"
 
@@ -136,7 +136,7 @@ msgid "Highest"
 msgstr "Más alta"
 
 #. module: crm_partner_assign
-#: field:crm.lead.forward.to.partner,body_text:0
+#: field:crm.lead.forward.to.partner,body:0
 msgid "Text contents"
 msgstr "Contenido del Texto"
 
diff --git a/addons/crm_partner_assign/i18n/es_PY.po b/addons/crm_partner_assign/i18n/es_PY.po
index 8c5343be3ac..b250c96e070 100644
--- a/addons/crm_partner_assign/i18n/es_PY.po
+++ b/addons/crm_partner_assign/i18n/es_PY.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:59+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,send_to:0
@@ -74,7 +74,7 @@ msgid "Geo Localize"
 msgstr "Geo localizar"
 
 #. module: crm_partner_assign
-#: help:crm.lead.forward.to.partner,body_text:0
+#: help:crm.lead.forward.to.partner,body:0
 msgid "Plain-text version of the message"
 msgstr ""
 
@@ -135,7 +135,7 @@ msgid "Highest"
 msgstr "Muy alto"
 
 #. module: crm_partner_assign
-#: field:crm.lead.forward.to.partner,body_text:0
+#: field:crm.lead.forward.to.partner,body:0
 msgid "Text contents"
 msgstr ""
 
diff --git a/addons/crm_partner_assign/i18n/fi.po b/addons/crm_partner_assign/i18n/fi.po
index 54cd578ce0b..9c237cf5495 100644
--- a/addons/crm_partner_assign/i18n/fi.po
+++ b/addons/crm_partner_assign/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:59+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,send_to:0
@@ -74,7 +74,7 @@ msgid "Geo Localize"
 msgstr "Alueellista"
 
 #. module: crm_partner_assign
-#: help:crm.lead.forward.to.partner,body_text:0
+#: help:crm.lead.forward.to.partner,body:0
 msgid "Plain-text version of the message"
 msgstr ""
 
@@ -133,7 +133,7 @@ msgid "Highest"
 msgstr "Korkein"
 
 #. module: crm_partner_assign
-#: field:crm.lead.forward.to.partner,body_text:0
+#: field:crm.lead.forward.to.partner,body:0
 msgid "Text contents"
 msgstr ""
 
diff --git a/addons/crm_partner_assign/i18n/fr.po b/addons/crm_partner_assign/i18n/fr.po
index 7499444cdce..0d3f4e07808 100644
--- a/addons/crm_partner_assign/i18n/fr.po
+++ b/addons/crm_partner_assign/i18n/fr.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:59+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,send_to:0
@@ -75,7 +75,7 @@ msgid "Geo Localize"
 msgstr "Géolocalisation"
 
 #. module: crm_partner_assign
-#: help:crm.lead.forward.to.partner,body_text:0
+#: help:crm.lead.forward.to.partner,body:0
 msgid "Plain-text version of the message"
 msgstr "Version plein texte du message"
 
@@ -136,7 +136,7 @@ msgid "Highest"
 msgstr "La Plus haute"
 
 #. module: crm_partner_assign
-#: field:crm.lead.forward.to.partner,body_text:0
+#: field:crm.lead.forward.to.partner,body:0
 msgid "Text contents"
 msgstr "Contenu du texte"
 
diff --git a/addons/crm_partner_assign/i18n/gl.po b/addons/crm_partner_assign/i18n/gl.po
index 93def92dc17..184f3a25386 100644
--- a/addons/crm_partner_assign/i18n/gl.po
+++ b/addons/crm_partner_assign/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:59+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,send_to:0
@@ -74,7 +74,7 @@ msgid "Geo Localize"
 msgstr "Xeolocalizar"
 
 #. module: crm_partner_assign
-#: help:crm.lead.forward.to.partner,body_text:0
+#: help:crm.lead.forward.to.partner,body:0
 msgid "Plain-text version of the message"
 msgstr ""
 
@@ -135,7 +135,7 @@ msgid "Highest"
 msgstr "A máis alta"
 
 #. module: crm_partner_assign
-#: field:crm.lead.forward.to.partner,body_text:0
+#: field:crm.lead.forward.to.partner,body:0
 msgid "Text contents"
 msgstr ""
 
diff --git a/addons/crm_partner_assign/i18n/hr.po b/addons/crm_partner_assign/i18n/hr.po
index d41efee23a3..3236f0bd3ac 100644
--- a/addons/crm_partner_assign/i18n/hr.po
+++ b/addons/crm_partner_assign/i18n/hr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:59+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,send_to:0
@@ -74,7 +74,7 @@ msgid "Geo Localize"
 msgstr ""
 
 #. module: crm_partner_assign
-#: help:crm.lead.forward.to.partner,body_text:0
+#: help:crm.lead.forward.to.partner,body:0
 msgid "Plain-text version of the message"
 msgstr ""
 
@@ -133,7 +133,7 @@ msgid "Highest"
 msgstr "Najviši"
 
 #. module: crm_partner_assign
-#: field:crm.lead.forward.to.partner,body_text:0
+#: field:crm.lead.forward.to.partner,body:0
 msgid "Text contents"
 msgstr ""
 
diff --git a/addons/crm_partner_assign/i18n/hu.po b/addons/crm_partner_assign/i18n/hu.po
index 96a1ea38f80..daaeca2363e 100644
--- a/addons/crm_partner_assign/i18n/hu.po
+++ b/addons/crm_partner_assign/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:59+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,send_to:0
@@ -74,7 +74,7 @@ msgid "Geo Localize"
 msgstr "Földrajzi fekvés meghatározása"
 
 #. module: crm_partner_assign
-#: help:crm.lead.forward.to.partner,body_text:0
+#: help:crm.lead.forward.to.partner,body:0
 msgid "Plain-text version of the message"
 msgstr ""
 
@@ -133,7 +133,7 @@ msgid "Highest"
 msgstr "Legmagasabb"
 
 #. module: crm_partner_assign
-#: field:crm.lead.forward.to.partner,body_text:0
+#: field:crm.lead.forward.to.partner,body:0
 msgid "Text contents"
 msgstr ""
 
diff --git a/addons/crm_partner_assign/i18n/it.po b/addons/crm_partner_assign/i18n/it.po
index 9ffbeac4a0d..21d3c30d82b 100644
--- a/addons/crm_partner_assign/i18n/it.po
+++ b/addons/crm_partner_assign/i18n/it.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:59+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,send_to:0
@@ -74,7 +74,7 @@ msgid "Geo Localize"
 msgstr "Geo localizzazione"
 
 #. module: crm_partner_assign
-#: help:crm.lead.forward.to.partner,body_text:0
+#: help:crm.lead.forward.to.partner,body:0
 msgid "Plain-text version of the message"
 msgstr ""
 
@@ -135,7 +135,7 @@ msgid "Highest"
 msgstr "Maggiore"
 
 #. module: crm_partner_assign
-#: field:crm.lead.forward.to.partner,body_text:0
+#: field:crm.lead.forward.to.partner,body:0
 msgid "Text contents"
 msgstr ""
 
diff --git a/addons/crm_partner_assign/i18n/ja.po b/addons/crm_partner_assign/i18n/ja.po
index 71118b510d3..93dcbe346ca 100644
--- a/addons/crm_partner_assign/i18n/ja.po
+++ b/addons/crm_partner_assign/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:59+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,send_to:0
@@ -74,7 +74,7 @@ msgid "Geo Localize"
 msgstr "ジオロカライゼーション"
 
 #. module: crm_partner_assign
-#: help:crm.lead.forward.to.partner,body_text:0
+#: help:crm.lead.forward.to.partner,body:0
 msgid "Plain-text version of the message"
 msgstr "メッセージのテキスト版"
 
@@ -133,7 +133,7 @@ msgid "Highest"
 msgstr "最高"
 
 #. module: crm_partner_assign
-#: field:crm.lead.forward.to.partner,body_text:0
+#: field:crm.lead.forward.to.partner,body:0
 msgid "Text contents"
 msgstr "テキストの内容"
 
diff --git a/addons/crm_partner_assign/i18n/lt.po b/addons/crm_partner_assign/i18n/lt.po
index bec6492db36..8e89e14575c 100644
--- a/addons/crm_partner_assign/i18n/lt.po
+++ b/addons/crm_partner_assign/i18n/lt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:59+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,send_to:0
@@ -74,7 +74,7 @@ msgid "Geo Localize"
 msgstr ""
 
 #. module: crm_partner_assign
-#: help:crm.lead.forward.to.partner,body_text:0
+#: help:crm.lead.forward.to.partner,body:0
 msgid "Plain-text version of the message"
 msgstr ""
 
@@ -133,7 +133,7 @@ msgid "Highest"
 msgstr ""
 
 #. module: crm_partner_assign
-#: field:crm.lead.forward.to.partner,body_text:0
+#: field:crm.lead.forward.to.partner,body:0
 msgid "Text contents"
 msgstr ""
 
diff --git a/addons/crm_partner_assign/i18n/lv.po b/addons/crm_partner_assign/i18n/lv.po
index cf9563af198..182f8990341 100644
--- a/addons/crm_partner_assign/i18n/lv.po
+++ b/addons/crm_partner_assign/i18n/lv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:59+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,send_to:0
@@ -74,7 +74,7 @@ msgid "Geo Localize"
 msgstr "Ģeo. lokalizācija"
 
 #. module: crm_partner_assign
-#: help:crm.lead.forward.to.partner,body_text:0
+#: help:crm.lead.forward.to.partner,body:0
 msgid "Plain-text version of the message"
 msgstr ""
 
@@ -133,7 +133,7 @@ msgid "Highest"
 msgstr "Augstākā"
 
 #. module: crm_partner_assign
-#: field:crm.lead.forward.to.partner,body_text:0
+#: field:crm.lead.forward.to.partner,body:0
 msgid "Text contents"
 msgstr ""
 
diff --git a/addons/crm_partner_assign/i18n/nl.po b/addons/crm_partner_assign/i18n/nl.po
index 3491555f881..ac9dc276e82 100644
--- a/addons/crm_partner_assign/i18n/nl.po
+++ b/addons/crm_partner_assign/i18n/nl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:59+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,send_to:0
@@ -74,7 +74,7 @@ msgid "Geo Localize"
 msgstr "Geo lokaliseren"
 
 #. module: crm_partner_assign
-#: help:crm.lead.forward.to.partner,body_text:0
+#: help:crm.lead.forward.to.partner,body:0
 msgid "Plain-text version of the message"
 msgstr "Platte tekst versie van het bericht"
 
@@ -135,7 +135,7 @@ msgid "Highest"
 msgstr "Hoogste"
 
 #. module: crm_partner_assign
-#: field:crm.lead.forward.to.partner,body_text:0
+#: field:crm.lead.forward.to.partner,body:0
 msgid "Text contents"
 msgstr "Tekst inhoud"
 
diff --git a/addons/crm_partner_assign/i18n/pl.po b/addons/crm_partner_assign/i18n/pl.po
index a069dbb164d..31936f2794c 100644
--- a/addons/crm_partner_assign/i18n/pl.po
+++ b/addons/crm_partner_assign/i18n/pl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:59+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,send_to:0
@@ -74,7 +74,7 @@ msgid "Geo Localize"
 msgstr "Lokalizacja geograficzna"
 
 #. module: crm_partner_assign
-#: help:crm.lead.forward.to.partner,body_text:0
+#: help:crm.lead.forward.to.partner,body:0
 msgid "Plain-text version of the message"
 msgstr ""
 
@@ -135,7 +135,7 @@ msgid "Highest"
 msgstr "Najwyższy"
 
 #. module: crm_partner_assign
-#: field:crm.lead.forward.to.partner,body_text:0
+#: field:crm.lead.forward.to.partner,body:0
 msgid "Text contents"
 msgstr ""
 
diff --git a/addons/crm_partner_assign/i18n/pt.po b/addons/crm_partner_assign/i18n/pt.po
index b6be865392d..ba250d4519b 100644
--- a/addons/crm_partner_assign/i18n/pt.po
+++ b/addons/crm_partner_assign/i18n/pt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:59+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,send_to:0
@@ -74,7 +74,7 @@ msgid "Geo Localize"
 msgstr "Localizar Geograficamente"
 
 #. module: crm_partner_assign
-#: help:crm.lead.forward.to.partner,body_text:0
+#: help:crm.lead.forward.to.partner,body:0
 msgid "Plain-text version of the message"
 msgstr "Formatação do texto da versão da mensagem"
 
@@ -135,7 +135,7 @@ msgid "Highest"
 msgstr "Maior"
 
 #. module: crm_partner_assign
-#: field:crm.lead.forward.to.partner,body_text:0
+#: field:crm.lead.forward.to.partner,body:0
 msgid "Text contents"
 msgstr "Conteúdos do texto"
 
diff --git a/addons/crm_partner_assign/i18n/pt_BR.po b/addons/crm_partner_assign/i18n/pt_BR.po
index 2cbcff71b56..fa7a7d0561c 100644
--- a/addons/crm_partner_assign/i18n/pt_BR.po
+++ b/addons/crm_partner_assign/i18n/pt_BR.po
@@ -9,13 +9,14 @@ msgstr ""
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:36+0000\n"
 "PO-Revision-Date: 2012-07-28 18:41+0000\n"
-"Last-Translator: Fábio Martinelli <webmaster@guaru.net>\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: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:59+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,send_to:0
@@ -74,7 +75,7 @@ msgid "Geo Localize"
 msgstr "Localização Geográfica"
 
 #. module: crm_partner_assign
-#: help:crm.lead.forward.to.partner,body_text:0
+#: help:crm.lead.forward.to.partner,body:0
 msgid "Plain-text version of the message"
 msgstr "Versão em texto"
 
@@ -135,7 +136,7 @@ msgid "Highest"
 msgstr "Mais Alta"
 
 #. module: crm_partner_assign
-#: field:crm.lead.forward.to.partner,body_text:0
+#: field:crm.lead.forward.to.partner,body:0
 msgid "Text contents"
 msgstr "Conteúdo"
 
diff --git a/addons/crm_partner_assign/i18n/ro.po b/addons/crm_partner_assign/i18n/ro.po
index e812b698222..c385587a99b 100644
--- a/addons/crm_partner_assign/i18n/ro.po
+++ b/addons/crm_partner_assign/i18n/ro.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:59+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,send_to:0
@@ -74,7 +74,7 @@ msgid "Geo Localize"
 msgstr "Localizare Geo"
 
 #. module: crm_partner_assign
-#: help:crm.lead.forward.to.partner,body_text:0
+#: help:crm.lead.forward.to.partner,body:0
 msgid "Plain-text version of the message"
 msgstr "Versiune text-simplu a mesajului"
 
@@ -135,7 +135,7 @@ msgid "Highest"
 msgstr "Cel mai ridicat (cea mai ridicata)"
 
 #. module: crm_partner_assign
-#: field:crm.lead.forward.to.partner,body_text:0
+#: field:crm.lead.forward.to.partner,body:0
 msgid "Text contents"
 msgstr "Cuprins text"
 
diff --git a/addons/crm_partner_assign/i18n/ru.po b/addons/crm_partner_assign/i18n/ru.po
index db52331d16c..0a354515bf8 100644
--- a/addons/crm_partner_assign/i18n/ru.po
+++ b/addons/crm_partner_assign/i18n/ru.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:59+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,send_to:0
@@ -74,7 +74,7 @@ msgid "Geo Localize"
 msgstr "Геолоцировать"
 
 #. module: crm_partner_assign
-#: help:crm.lead.forward.to.partner,body_text:0
+#: help:crm.lead.forward.to.partner,body:0
 msgid "Plain-text version of the message"
 msgstr ""
 
@@ -135,7 +135,7 @@ msgid "Highest"
 msgstr "Высший"
 
 #. module: crm_partner_assign
-#: field:crm.lead.forward.to.partner,body_text:0
+#: field:crm.lead.forward.to.partner,body:0
 msgid "Text contents"
 msgstr ""
 
diff --git a/addons/crm_partner_assign/i18n/sq.po b/addons/crm_partner_assign/i18n/sq.po
index 90730a5ed8a..7d2f01a6693 100644
--- a/addons/crm_partner_assign/i18n/sq.po
+++ b/addons/crm_partner_assign/i18n/sq.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:59+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,send_to:0
@@ -74,7 +74,7 @@ msgid "Geo Localize"
 msgstr ""
 
 #. module: crm_partner_assign
-#: help:crm.lead.forward.to.partner,body_text:0
+#: help:crm.lead.forward.to.partner,body:0
 msgid "Plain-text version of the message"
 msgstr ""
 
@@ -133,7 +133,7 @@ msgid "Highest"
 msgstr ""
 
 #. module: crm_partner_assign
-#: field:crm.lead.forward.to.partner,body_text:0
+#: field:crm.lead.forward.to.partner,body:0
 msgid "Text contents"
 msgstr ""
 
diff --git a/addons/crm_partner_assign/i18n/sr@latin.po b/addons/crm_partner_assign/i18n/sr@latin.po
index d01d4949341..0605ee65706 100644
--- a/addons/crm_partner_assign/i18n/sr@latin.po
+++ b/addons/crm_partner_assign/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:59+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,send_to:0
@@ -74,7 +74,7 @@ msgid "Geo Localize"
 msgstr ""
 
 #. module: crm_partner_assign
-#: help:crm.lead.forward.to.partner,body_text:0
+#: help:crm.lead.forward.to.partner,body:0
 msgid "Plain-text version of the message"
 msgstr ""
 
@@ -133,7 +133,7 @@ msgid "Highest"
 msgstr ""
 
 #. module: crm_partner_assign
-#: field:crm.lead.forward.to.partner,body_text:0
+#: field:crm.lead.forward.to.partner,body:0
 msgid "Text contents"
 msgstr ""
 
diff --git a/addons/crm_partner_assign/i18n/sv.po b/addons/crm_partner_assign/i18n/sv.po
index b691d189b8a..0605d54bcaa 100644
--- a/addons/crm_partner_assign/i18n/sv.po
+++ b/addons/crm_partner_assign/i18n/sv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:59+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,send_to:0
@@ -74,7 +74,7 @@ msgid "Geo Localize"
 msgstr "Geoplacering"
 
 #. module: crm_partner_assign
-#: help:crm.lead.forward.to.partner,body_text:0
+#: help:crm.lead.forward.to.partner,body:0
 msgid "Plain-text version of the message"
 msgstr "Textversion av meddelandet"
 
@@ -135,7 +135,7 @@ msgid "Highest"
 msgstr "Högsta"
 
 #. module: crm_partner_assign
-#: field:crm.lead.forward.to.partner,body_text:0
+#: field:crm.lead.forward.to.partner,body:0
 msgid "Text contents"
 msgstr "Textinnehåll"
 
diff --git a/addons/crm_partner_assign/i18n/tr.po b/addons/crm_partner_assign/i18n/tr.po
index fae0ed2b8f5..11fcc743002 100644
--- a/addons/crm_partner_assign/i18n/tr.po
+++ b/addons/crm_partner_assign/i18n/tr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:59+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,send_to:0
@@ -25,12 +25,12 @@ msgstr "Gönder"
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,subtype:0
 msgid "Message type"
-msgstr ""
+msgstr "Mesaj tipi"
 
 #. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,auto_delete:0
 msgid "Permanently delete emails after sending"
-msgstr ""
+msgstr "Gönderdikten sonra epostaları kalıcı olarak sil."
 
 #. module: crm_partner_assign
 #: field:crm.lead.report.assign,delay_close:0
@@ -40,7 +40,7 @@ msgstr "Kapanmada gecikme"
 #. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,email_to:0
 msgid "Message recipients"
-msgstr ""
+msgstr "Mesaj Alıcıları"
 
 #. module: crm_partner_assign
 #: field:crm.lead.report.assign,planned_revenue:0
@@ -61,7 +61,7 @@ msgstr "Grupla..."
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,template_id:0
 msgid "Template"
-msgstr ""
+msgstr "Şablon"
 
 #. module: crm_partner_assign
 #: view:crm.lead:0
@@ -74,14 +74,14 @@ msgid "Geo Localize"
 msgstr "Coğrafi konumlama"
 
 #. module: crm_partner_assign
-#: help:crm.lead.forward.to.partner,body_text:0
+#: help:crm.lead.forward.to.partner,body:0
 msgid "Plain-text version of the message"
-msgstr ""
+msgstr "Mesajın düz-metin versiyonu"
 
 #. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 msgid "Body"
-msgstr ""
+msgstr "Gövde"
 
 #. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
@@ -101,7 +101,7 @@ msgstr "Kapanmada gecikme"
 #. module: crm_partner_assign
 #: view:crm.partner.report.assign:0
 msgid "#Partner"
-msgstr ""
+msgstr "#Paydaş"
 
 #. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,history:0
@@ -135,9 +135,9 @@ msgid "Highest"
 msgstr "En yüksek"
 
 #. module: crm_partner_assign
-#: field:crm.lead.forward.to.partner,body_text:0
+#: field:crm.lead.forward.to.partner,body:0
 msgid "Text contents"
-msgstr ""
+msgstr "Metin içeriği"
 
 #. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
@@ -148,7 +148,7 @@ msgstr "Gün"
 #. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,message_id:0
 msgid "Message unique identifier"
-msgstr ""
+msgstr "Benzersiz mesaj tanımlayıcısı"
 
 #. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,history:0
@@ -167,6 +167,7 @@ msgid ""
 "Add here all attachments of the current document you want to include in the "
 "Email."
 msgstr ""
+"Epostada yer almasını istediğiniz dökümana ait tüm ekleri buraya ekleyiniz."
 
 #. module: crm_partner_assign
 #: selection:crm.lead.report.assign,state:0
@@ -194,17 +195,17 @@ msgstr ""
 #. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,body_html:0
 msgid "Rich-text/HTML version of the message"
-msgstr ""
+msgstr "Mesajın Zengin-metin/HTML versiyonu"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,auto_delete:0
 msgid "Auto Delete"
-msgstr ""
+msgstr "Otomatik Sil"
 
 #. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,email_bcc:0
 msgid "Blind carbon copy message recipients"
-msgstr ""
+msgstr "Mesaj alıcıları görünmeyen mektup kopyası"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,partner_id:0
@@ -253,7 +254,7 @@ msgstr "Bölüm"
 #. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 msgid "Send"
-msgstr ""
+msgstr "Gönder"
 
 #. module: crm_partner_assign
 #: view:res.partner:0
@@ -285,7 +286,7 @@ msgstr "Tür"
 #. module: crm_partner_assign
 #: view:crm.partner.report.assign:0
 msgid "Name"
-msgstr ""
+msgstr "Adı"
 
 #. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
@@ -298,11 +299,13 @@ msgid ""
 "Type of message, usually 'html' or 'plain', used to select plaintext or rich "
 "text contents accordingly"
 msgstr ""
+"Mesaj tipi, genellikle \"HTML\" ya da \"düz metin\", düz metin ya da HTML "
+"içerikleri seçmek için kullanılır."
 
 #. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Assign Date"
-msgstr ""
+msgstr "Tarih Ata"
 
 #. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
@@ -317,7 +320,7 @@ msgstr "Oluşturulma Tarihi"
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,res_id:0
 msgid "Related Document ID"
-msgstr ""
+msgstr "İlgili Döküman ID"
 
 #. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
@@ -348,7 +351,7 @@ msgstr "Aşama"
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,model:0
 msgid "Related Document model"
-msgstr ""
+msgstr "İlgili Döküman Modeli"
 
 #. module: crm_partner_assign
 #: code:addons/crm_partner_assign/wizard/crm_forward_to_partner.py:192
@@ -391,7 +394,7 @@ msgstr "Kapat"
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,use_template:0
 msgid "Use Template"
-msgstr ""
+msgstr "Şablon Kullan"
 
 #. module: crm_partner_assign
 #: model:ir.actions.act_window,name:crm_partner_assign.action_report_crm_opportunity_assign
@@ -463,12 +466,12 @@ msgstr "#Fırsatlar"
 #. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Team"
-msgstr ""
+msgstr "Takım"
 
 #. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Referred Partner"
-msgstr ""
+msgstr "Yönlendirilmiş Paydaş"
 
 #. module: crm_partner_assign
 #: selection:crm.lead.report.assign,state:0
@@ -489,7 +492,7 @@ msgstr "Kapandı"
 #. module: crm_partner_assign
 #: model:ir.actions.act_window,name:crm_partner_assign.action_crm_send_mass_forward
 msgid "Mass forward to partner"
-msgstr ""
+msgstr "Paydaşa toplu iletme"
 
 #. module: crm_partner_assign
 #: view:res.partner:0
@@ -569,7 +572,7 @@ msgstr "Coğ Boylam"
 #. module: crm_partner_assign
 #: field:crm.partner.report.assign,opp:0
 msgid "# of Opportunity"
-msgstr ""
+msgstr "# Fırsat"
 
 #. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
@@ -599,12 +602,12 @@ msgstr "Bu vak'anın iletildiği/ atandığı İş Ortağı"
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,date:0
 msgid "Date"
-msgstr ""
+msgstr "Tarih"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,body_html:0
 msgid "Rich-text contents"
-msgstr ""
+msgstr "Zengin-metin içeriği"
 
 #. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
@@ -619,18 +622,18 @@ msgstr "res.partner.grade"
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,message_id:0
 msgid "Message-Id"
-msgstr ""
+msgstr "Mesaj-Id"
 
 #. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 #: field:crm.lead.forward.to.partner,attachment_ids:0
 msgid "Attachments"
-msgstr ""
+msgstr "Ekler"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,email_cc:0
 msgid "Cc"
-msgstr ""
+msgstr "Cc"
 
 #. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
@@ -640,7 +643,7 @@ msgstr "Eylül"
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,references:0
 msgid "References"
-msgstr ""
+msgstr "Kaynaklar"
 
 #. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
@@ -666,7 +669,7 @@ msgstr "Açık"
 #. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,email_cc:0
 msgid "Carbon copy message recipients"
-msgstr ""
+msgstr "Mesaj alıcıları karbon kopyası"
 
 #. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,headers:0
@@ -674,6 +677,8 @@ msgid ""
 "Full message headers, e.g. SMTP session headers (usually available on "
 "inbound messages only)"
 msgstr ""
+"Tam mesaj başlığı, ör: SMTP oturum başlıkları (genelde sadece gelen "
+"mesajlarda bulunur)"
 
 #. module: crm_partner_assign
 #: field:res.partner,date_localization:0
@@ -696,11 +701,13 @@ msgid ""
 "Message sender, taken from user preferences. If empty, this is not a mail "
 "but a message."
 msgstr ""
+"Mesaj gönderen, kullanıcı önceliklerinden alındı. Eğer boşsa bu bir e-posta "
+"değil mesajdır."
 
 #. module: crm_partner_assign
 #: field:crm.partner.report.assign,nbr:0
 msgid "# of Partner"
-msgstr ""
+msgstr "Paydaş #"
 
 #. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
@@ -711,7 +718,7 @@ msgstr "Paydaşa İlet"
 #. module: crm_partner_assign
 #: field:crm.partner.report.assign,name:0
 msgid "Partner name"
-msgstr ""
+msgstr "Paydaş adı"
 
 #. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
@@ -726,7 +733,7 @@ msgstr "Olası Gelir"
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,reply_to:0
 msgid "Reply-To"
-msgstr ""
+msgstr "Yanıtla"
 
 #. module: crm_partner_assign
 #: field:crm.lead,partner_assigned_id:0
@@ -746,7 +753,7 @@ msgstr "Fırsat"
 #. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 msgid "Send Mail"
-msgstr ""
+msgstr "İleti Gönder"
 
 #. module: crm_partner_assign
 #: field:crm.lead.report.assign,partner_id:0
@@ -774,7 +781,7 @@ msgstr "Ülke"
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,headers:0
 msgid "Message headers"
-msgstr ""
+msgstr "İleti Başlıkları"
 
 #. module: crm_partner_assign
 #: view:res.partner:0
@@ -784,7 +791,7 @@ msgstr "Fırsata Dönüştür"
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,email_bcc:0
 msgid "Bcc"
-msgstr ""
+msgstr "Bcc"
 
 #. module: crm_partner_assign
 #: view:crm.lead:0
@@ -800,7 +807,7 @@ msgstr "Nisan"
 #: model:ir.actions.act_window,name:crm_partner_assign.action_report_crm_partner_assign
 #: model:ir.ui.menu,name:crm_partner_assign.menu_report_crm_partner_assign_tree
 msgid "Partnership Analysis"
-msgstr ""
+msgstr "Paydaşlık İncelemesi"
 
 #. module: crm_partner_assign
 #: model:ir.model,name:crm_partner_assign.model_crm_lead
@@ -815,7 +822,7 @@ msgstr "Bekliyor"
 #. module: crm_partner_assign
 #: view:crm.partner.report.assign:0
 msgid "Partner assigned Analysis"
-msgstr ""
+msgstr "İncelenmeye atanmış Aday"
 
 #. module: crm_partner_assign
 #: model:ir.model,name:crm_partner_assign.model_crm_lead_report_assign
@@ -825,12 +832,12 @@ msgstr "MİY Aday Raporu"
 #. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,references:0
 msgid "Message references, such as identifiers of previous messages"
-msgstr ""
+msgstr "Mesaj kaynakları, önceki mesajların tanımlayıcıları gibi"
 
 #. module: crm_partner_assign
 #: constraint:res.partner:0
 msgid "Error ! You cannot create recursive associated members."
-msgstr ""
+msgstr "Hata ! yinelenen ilişkili üyeler oluşturamazsınız."
 
 #. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,history:0
@@ -845,7 +852,7 @@ msgstr "Dizi"
 #. module: crm_partner_assign
 #: model:ir.model,name:crm_partner_assign.model_crm_partner_report_assign
 msgid "CRM Partner Report"
-msgstr ""
+msgstr "CRM Paydaş Raporu"
 
 #. module: crm_partner_assign
 #: model:ir.model,name:crm_partner_assign.model_crm_lead_forward_to_partner
@@ -871,7 +878,7 @@ msgstr "Tarih Oluştur"
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,filter_id:0
 msgid "Filters"
-msgstr ""
+msgstr "Süzgeçler"
 
 #. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
@@ -882,7 +889,7 @@ msgstr "Yıl"
 #. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,reply_to:0
 msgid "Preferred response address for the message"
-msgstr ""
+msgstr "Mesaj için tercih edilen yanıt adresi"
 
 #~ msgid "Reply-to of the Sales team defined on this case"
 #~ msgstr "Bu vak'ada tanımlanan Satış Ekibi'ne gönder"
@@ -939,3 +946,6 @@ msgstr ""
 #~ "müşterileri \n"
 #~ "paydaşlarına yönlendirmek için kullanılır.\n"
 #~ "    "
+
+#~ msgid "E-mail composition wizard"
+#~ msgstr "E-posta oluşturma sihirbazı"
diff --git a/addons/crm_partner_assign/i18n/zh_CN.po b/addons/crm_partner_assign/i18n/zh_CN.po
index cbba81541cd..ff25feafd25 100644
--- a/addons/crm_partner_assign/i18n/zh_CN.po
+++ b/addons/crm_partner_assign/i18n/zh_CN.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:59+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,send_to:0
@@ -74,7 +74,7 @@ msgid "Geo Localize"
 msgstr "geolocalization定位"
 
 #. module: crm_partner_assign
-#: help:crm.lead.forward.to.partner,body_text:0
+#: help:crm.lead.forward.to.partner,body:0
 msgid "Plain-text version of the message"
 msgstr "内容的纯文本版本"
 
@@ -133,7 +133,7 @@ msgid "Highest"
 msgstr "最高"
 
 #. module: crm_partner_assign
-#: field:crm.lead.forward.to.partner,body_text:0
+#: field:crm.lead.forward.to.partner,body:0
 msgid "Text contents"
 msgstr "文本内容"
 
diff --git a/addons/crm_partner_assign/i18n/zh_TW.po b/addons/crm_partner_assign/i18n/zh_TW.po
new file mode 100644
index 00000000000..4870b464035
--- /dev/null
+++ b/addons/crm_partner_assign/i18n/zh_TW.po
@@ -0,0 +1,885 @@
+# Chinese (Traditional) 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-02-08 00:36+0000\n"
+"PO-Revision-Date: 2012-08-30 10:14+0000\n"
+"Last-Translator: Bonnie Duan <bonnie.duan@cenoq.com>\n"
+"Language-Team: Cenoq Corp.MIME-Version: 1.0\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:59+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,send_to:0
+msgid "Send to"
+msgstr "傳送給"
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,subtype:0
+msgid "Message type"
+msgstr "訊息類型"
+
+#. module: crm_partner_assign
+#: help:crm.lead.forward.to.partner,auto_delete:0
+msgid "Permanently delete emails after sending"
+msgstr "電子郵件發送後永久刪除"
+
+#. module: crm_partner_assign
+#: field:crm.lead.report.assign,delay_close:0
+msgid "Delay to Close"
+msgstr "延遲關閉"
+
+#. module: crm_partner_assign
+#: help:crm.lead.forward.to.partner,email_to:0
+msgid "Message recipients"
+msgstr "收件人"
+
+#. module: crm_partner_assign
+#: field:crm.lead.report.assign,planned_revenue:0
+msgid "Planned Revenue"
+msgstr "計劃收入"
+
+#. module: crm_partner_assign
+#: field:crm.lead.report.assign,nbr:0
+msgid "# of Cases"
+msgstr "# 業務量"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+#: view:crm.partner.report.assign:0
+msgid "Group By..."
+msgstr "分組..."
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,template_id:0
+msgid "Template"
+msgstr "範本"
+
+#. module: crm_partner_assign
+#: view:crm.lead:0
+msgid "Forward"
+msgstr "轉寄"
+
+#. module: crm_partner_assign
+#: view:res.partner:0
+msgid "Geo Localize"
+msgstr "Geo 定位"
+
+#. module: crm_partner_assign
+#: help:crm.lead.forward.to.partner,body:0
+msgid "Plain-text version of the message"
+msgstr "內容的純文字版本"
+
+#. module: crm_partner_assign
+#: view:crm.lead.forward.to.partner:0
+msgid "Body"
+msgstr "內文"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,month:0
+msgid "March"
+msgstr "3月"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,type:0
+msgid "Lead"
+msgstr "潛在客戶"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+msgid "Delay to close"
+msgstr "延遲關閉"
+
+#. module: crm_partner_assign
+#: view:crm.partner.report.assign:0
+msgid "#Partner"
+msgstr "#Partner"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.forward.to.partner,history:0
+msgid "Whole Story"
+msgstr "完整的情況"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+#: field:crm.lead.report.assign,company_id:0
+msgid "Company"
+msgstr "公司"
+
+#. module: crm_partner_assign
+#: code:addons/crm_partner_assign/partner_geo_assign.py:37
+#, python-format
+msgid ""
+"Could not contact geolocation servers, please make sure you have a working "
+"internet connection (%s)"
+msgstr "無法連接到服務器，請確保你的連線(%s) 正常。"
+
+#. module: crm_partner_assign
+#: field:crm.lead.report.assign,date_assign:0
+msgid "Partner Date"
+msgstr "業務夥伴日期"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,priority:0
+msgid "Highest"
+msgstr "最高"
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,body:0
+msgid "Text contents"
+msgstr "文本內容"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+#: field:crm.lead.report.assign,day:0
+msgid "Day"
+msgstr "日"
+
+#. module: crm_partner_assign
+#: help:crm.lead.forward.to.partner,message_id:0
+msgid "Message unique identifier"
+msgstr "訊息唯一編號"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.forward.to.partner,history:0
+msgid "Latest email"
+msgstr "最近的郵件"
+
+#. module: crm_partner_assign
+#: field:crm.lead,partner_latitude:0
+#: field:res.partner,partner_latitude:0
+msgid "Geo Latitude"
+msgstr "Geo 緯度"
+
+#. module: crm_partner_assign
+#: view:crm.lead.forward.to.partner:0
+msgid ""
+"Add here all attachments of the current document you want to include in the "
+"Email."
+msgstr "在這裡加入你在郵件裡要加入現有的單據附件。"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,state:0
+msgid "Cancelled"
+msgstr "已取消"
+
+#. module: crm_partner_assign
+#: view:crm.lead:0
+msgid "Geo Assignation"
+msgstr "Geo 指派的"
+
+#. module: crm_partner_assign
+#: field:crm.lead.report.assign,date_closed:0
+msgid "Close Date"
+msgstr "結束日期"
+
+#. module: crm_partner_assign
+#: help:res.partner,partner_weight:0
+msgid ""
+"Gives the probability to assign a lead to this partner. (0 means no "
+"assignation.)"
+msgstr "為潛在客戶指定一個業務夥伴的概率（表示沒指派）"
+
+#. module: crm_partner_assign
+#: help:crm.lead.forward.to.partner,body_html:0
+msgid "Rich-text/HTML version of the message"
+msgstr "內容的富文本/HTML版本"
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,auto_delete:0
+msgid "Auto Delete"
+msgstr "自動刪除"
+
+#. module: crm_partner_assign
+#: help:crm.lead.forward.to.partner,email_bcc:0
+msgid "Blind carbon copy message recipients"
+msgstr "密件副本收件人"
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,partner_id:0
+#: selection:crm.lead.forward.to.partner,send_to:0
+#: view:crm.lead.report.assign:0
+#: field:crm.lead.report.assign,partner_assigned_id:0
+#: model:ir.model,name:crm_partner_assign.model_res_partner
+msgid "Partner"
+msgstr "業務夥伴"
+
+#. module: crm_partner_assign
+#: field:crm.lead.report.assign,probability:0
+msgid "Avg Probability"
+msgstr "平均概率"
+
+#. module: crm_partner_assign
+#: view:res.partner:0
+msgid "Previous"
+msgstr "前一個"
+
+#. module: crm_partner_assign
+#: code:addons/crm_partner_assign/partner_geo_assign.py:36
+#, python-format
+msgid "Network error"
+msgstr "網絡錯誤"
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,email_from:0
+msgid "From"
+msgstr "來自"
+
+#. module: crm_partner_assign
+#: model:ir.actions.act_window,name:crm_partner_assign.res_partner_grade_action
+#: model:ir.ui.menu,name:crm_partner_assign.menu_res_partner_grade_action
+#: field:res.partner,grade_id:0
+#: view:res.partner.grade:0
+msgid "Partner Grade"
+msgstr "業務夥伴級別"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+#: view:crm.partner.report.assign:0
+msgid "Section"
+msgstr "劃分"
+
+#. module: crm_partner_assign
+#: view:crm.lead.forward.to.partner:0
+msgid "Send"
+msgstr "發送"
+
+#. module: crm_partner_assign
+#: view:res.partner:0
+msgid "Next"
+msgstr "下一個"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+#: field:crm.lead.report.assign,priority:0
+msgid "Priority"
+msgstr "優先級"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+#: field:crm.lead.report.assign,state:0
+msgid "State"
+msgstr "狀態"
+
+#. module: crm_partner_assign
+#: field:crm.lead.report.assign,delay_expected:0
+msgid "Overpassed Deadline"
+msgstr "超過截止日期"
+
+#. module: crm_partner_assign
+#: field:crm.lead.report.assign,type:0
+msgid "Type"
+msgstr "類型"
+
+#. module: crm_partner_assign
+#: view:crm.partner.report.assign:0
+msgid "Name"
+msgstr "名稱"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,priority:0
+msgid "Lowest"
+msgstr "最低"
+
+#. module: crm_partner_assign
+#: help:crm.lead.forward.to.partner,subtype:0
+msgid ""
+"Type of message, usually 'html' or 'plain', used to select plaintext or rich "
+"text contents accordingly"
+msgstr "內容類型，一般是“html”或“純文本”，用於對應地選擇純文本或富文本"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+msgid "Assign Date"
+msgstr "分配日期"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+msgid "Leads Analysis"
+msgstr "潛在客戶分析"
+
+#. module: crm_partner_assign
+#: field:crm.lead.report.assign,creation_date:0
+msgid "Creation Date"
+msgstr "建立日期"
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,res_id:0
+msgid "Related Document ID"
+msgstr "相關單據編號"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+msgid "7 Days"
+msgstr "7天"
+
+#. module: crm_partner_assign
+#: view:crm.lead:0
+msgid "Partner Assignation"
+msgstr "指定業務夥伴"
+
+#. module: crm_partner_assign
+#: help:crm.lead.report.assign,type:0
+msgid "Type is used to separate Leads and Opportunities"
+msgstr "類型用於區分線索和商機"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,month:0
+msgid "July"
+msgstr "7月"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+#: field:crm.lead.report.assign,stage_id:0
+msgid "Stage"
+msgstr "階段"
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,model:0
+msgid "Related Document model"
+msgstr "相關單據模組"
+
+#. module: crm_partner_assign
+#: code:addons/crm_partner_assign/wizard/crm_forward_to_partner.py:192
+#, python-format
+msgid "Fwd"
+msgstr "轉發"
+
+#. module: crm_partner_assign
+#: view:res.partner:0
+msgid "Geo Localization"
+msgstr "Geo 定位"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+#: view:crm.partner.report.assign:0
+msgid "Opportunities Assignment Analysis"
+msgstr "商機指定分析"
+
+#. module: crm_partner_assign
+#: view:res.partner:0
+msgid "Cancel"
+msgstr "取消"
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,history:0
+msgid "Send history"
+msgstr "發送日誌"
+
+#. module: crm_partner_assign
+#: view:crm.lead.forward.to.partner:0
+msgid "Contact"
+msgstr "聯絡人"
+
+#. module: crm_partner_assign
+#: view:crm.lead.forward.to.partner:0
+#: view:res.partner:0
+msgid "Close"
+msgstr "結束"
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,use_template:0
+msgid "Use Template"
+msgstr "使用者範本"
+
+#. module: crm_partner_assign
+#: model:ir.actions.act_window,name:crm_partner_assign.action_report_crm_opportunity_assign
+#: model:ir.ui.menu,name:crm_partner_assign.menu_report_crm_opportunities_assign_tree
+msgid "Opp. Assignment Analysis"
+msgstr "商機指定分析"
+
+#. module: crm_partner_assign
+#: help:crm.lead.report.assign,delay_close:0
+msgid "Number of Days to close the case"
+msgstr "到期天數"
+
+#. module: crm_partner_assign
+#: field:res.partner,partner_weight:0
+msgid "Weight"
+msgstr "重要性"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+msgid "Delay to open"
+msgstr "延遲開啟"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+#: field:crm.lead.report.assign,grade_id:0
+#: view:crm.partner.report.assign:0
+#: field:crm.partner.report.assign,grade_id:0
+msgid "Grade"
+msgstr "級別"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,month:0
+msgid "December"
+msgstr "12月"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+#: field:crm.lead.report.assign,month:0
+msgid "Month"
+msgstr "月"
+
+#. module: crm_partner_assign
+#: field:crm.lead.report.assign,opening_date:0
+msgid "Opening Date"
+msgstr "開啟日期"
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,subject:0
+msgid "Subject"
+msgstr "主題"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+#: view:crm.partner.report.assign:0
+msgid "Salesman"
+msgstr "業務員"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+#: field:crm.lead.report.assign,categ_id:0
+msgid "Category"
+msgstr "分類"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+msgid "#Opportunities"
+msgstr "#商機"
+
+#. module: crm_partner_assign
+#: view:crm.lead:0
+msgid "Team"
+msgstr "團隊"
+
+#. module: crm_partner_assign
+#: view:crm.lead:0
+msgid "Referred Partner"
+msgstr "推薦的業務夥伴"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,state:0
+msgid "Draft"
+msgstr "草稿"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,priority:0
+msgid "Low"
+msgstr "低"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+#: selection:crm.lead.report.assign,state:0
+msgid "Closed"
+msgstr "已結束"
+
+#. module: crm_partner_assign
+#: model:ir.actions.act_window,name:crm_partner_assign.action_crm_send_mass_forward
+msgid "Mass forward to partner"
+msgstr "批量轉發給業務夥伴"
+
+#. module: crm_partner_assign
+#: view:res.partner:0
+#: field:res.partner,opportunity_assigned_ids:0
+msgid "Assigned Opportunities"
+msgstr "轉為商機"
+
+#. module: crm_partner_assign
+#: field:crm.lead,date_assign:0
+msgid "Assignation Date"
+msgstr "指定日期"
+
+#. module: crm_partner_assign
+#: field:crm.lead.report.assign,probability_max:0
+msgid "Max Probability"
+msgstr "最大可能"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,month:0
+msgid "August"
+msgstr "8月"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,priority:0
+msgid "Normal"
+msgstr "普通"
+
+#. module: crm_partner_assign
+#: view:res.partner:0
+msgid "Escalate"
+msgstr "提升"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,month:0
+msgid "June"
+msgstr "6月"
+
+#. module: crm_partner_assign
+#: help:crm.lead.report.assign,delay_open:0
+msgid "Number of Days to open the case"
+msgstr "業務開啟的天數"
+
+#. module: crm_partner_assign
+#: field:crm.lead.report.assign,delay_open:0
+msgid "Delay to Open"
+msgstr "延遲開啟"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.forward.to.partner,send_to:0
+#: field:crm.lead.forward.to.partner,user_id:0
+#: field:crm.lead.report.assign,user_id:0
+#: field:crm.partner.report.assign,user_id:0
+msgid "User"
+msgstr "使用者"
+
+#. module: crm_partner_assign
+#: field:res.partner.grade,active:0
+msgid "Active"
+msgstr "生效"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,month:0
+msgid "November"
+msgstr "11月"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+msgid "Extended Filters..."
+msgstr "增加篩選條件"
+
+#. module: crm_partner_assign
+#: field:crm.lead,partner_longitude:0
+#: field:res.partner,partner_longitude:0
+msgid "Geo Longitude"
+msgstr "Geo 經度"
+
+#. module: crm_partner_assign
+#: field:crm.partner.report.assign,opp:0
+msgid "# of Opportunity"
+msgstr "商機編號"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+msgid "Lead Assign"
+msgstr "潛在客戶指定"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,month:0
+msgid "October"
+msgstr "10月"
+
+#. module: crm_partner_assign
+#: view:crm.lead:0
+msgid "Assignation"
+msgstr "指定"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,month:0
+msgid "January"
+msgstr "1月"
+
+#. module: crm_partner_assign
+#: help:crm.lead,partner_assigned_id:0
+msgid "Partner this case has been forwarded/assigned to."
+msgstr "這業務的業務夥伴已提出/已指定"
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,date:0
+msgid "Date"
+msgstr "日期"
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,body_html:0
+msgid "Rich-text contents"
+msgstr "Rich-text內容"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+msgid "Planned Revenues"
+msgstr "已計劃收入"
+
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_res_partner_grade
+msgid "res.partner.grade"
+msgstr "res.partner.grade"
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,message_id:0
+msgid "Message-Id"
+msgstr "訊息-Id"
+
+#. module: crm_partner_assign
+#: view:crm.lead.forward.to.partner:0
+#: field:crm.lead.forward.to.partner,attachment_ids:0
+msgid "Attachments"
+msgstr "附件"
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,email_cc:0
+msgid "Cc"
+msgstr "副本收件人"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,month:0
+msgid "September"
+msgstr "9月"
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,references:0
+msgid "References"
+msgstr "關聯"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+msgid "Last 30 Days"
+msgstr "最近30天"
+
+#. module: crm_partner_assign
+#: field:res.partner.grade,name:0
+msgid "Grade Name"
+msgstr "級別名稱"
+
+#. module: crm_partner_assign
+#: help:crm.lead,date_assign:0
+msgid "Last date this case was forwarded/assigned to a partner"
+msgstr "這業務指定/轉發的業務夥伴的最後期限"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,state:0
+#: view:res.partner:0
+msgid "Open"
+msgstr "開啟"
+
+#. module: crm_partner_assign
+#: help:crm.lead.forward.to.partner,email_cc:0
+msgid "Carbon copy message recipients"
+msgstr "郵件副本收件人"
+
+#. module: crm_partner_assign
+#: help:crm.lead.forward.to.partner,headers:0
+msgid ""
+"Full message headers, e.g. SMTP session headers (usually available on "
+"inbound messages only)"
+msgstr "完整的郵件標題，例如僅SMTP會話頭（通常可在入站消息)"
+
+#. module: crm_partner_assign
+#: field:res.partner,date_localization:0
+msgid "Geo Localization Date"
+msgstr "Geo 定位的日期"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+msgid "Current"
+msgstr "當前的"
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,email_to:0
+msgid "To"
+msgstr "給"
+
+#. module: crm_partner_assign
+#: help:crm.lead.forward.to.partner,email_from:0
+msgid ""
+"Message sender, taken from user preferences. If empty, this is not a mail "
+"but a message."
+msgstr "郵件發件人，​​來自使用者的個人設置。如果為空，不發郵件而是發內部消息。"
+
+#. module: crm_partner_assign
+#: field:crm.partner.report.assign,nbr:0
+msgid "# of Partner"
+msgstr "# of Partner"
+
+#. module: crm_partner_assign
+#: view:crm.lead.forward.to.partner:0
+#: model:ir.actions.act_window,name:crm_partner_assign.crm_lead_forward_to_partner_act
+msgid "Forward to Partner"
+msgstr "轉發給業務夥伴"
+
+#. module: crm_partner_assign
+#: field:crm.partner.report.assign,name:0
+msgid "Partner name"
+msgstr "上級名稱"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,month:0
+msgid "May"
+msgstr "5月"
+
+#. module: crm_partner_assign
+#: field:crm.lead.report.assign,probable_revenue:0
+msgid "Probable Revenue"
+msgstr "預計收入"
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,reply_to:0
+msgid "Reply-To"
+msgstr "回覆給"
+
+#. module: crm_partner_assign
+#: field:crm.lead,partner_assigned_id:0
+msgid "Assigned Partner"
+msgstr "指定的業務夥伴"
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,address_id:0
+msgid "Address"
+msgstr "地址"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,type:0
+msgid "Opportunity"
+msgstr "商機"
+
+#. module: crm_partner_assign
+#: view:crm.lead.forward.to.partner:0
+msgid "Send Mail"
+msgstr "發送郵件"
+
+#. module: crm_partner_assign
+#: field:crm.lead.report.assign,partner_id:0
+msgid "Customer"
+msgstr "客戶"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,month:0
+msgid "February"
+msgstr "2月"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.forward.to.partner,send_to:0
+msgid "Email Address"
+msgstr "電子郵件地址"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+#: field:crm.lead.report.assign,country_id:0
+#: view:crm.partner.report.assign:0
+#: field:crm.partner.report.assign,country_id:0
+msgid "Country"
+msgstr "國家"
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,headers:0
+msgid "Message headers"
+msgstr "郵件頭"
+
+#. module: crm_partner_assign
+#: view:res.partner:0
+msgid "Convert to Opportunity"
+msgstr "轉換為商機"
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,email_bcc:0
+msgid "Bcc"
+msgstr "密件副本"
+
+#. module: crm_partner_assign
+#: view:crm.lead:0
+msgid "Geo Assign"
+msgstr "指定geolocalization"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,month:0
+msgid "April"
+msgstr "4月"
+
+#. module: crm_partner_assign
+#: model:ir.actions.act_window,name:crm_partner_assign.action_report_crm_partner_assign
+#: model:ir.ui.menu,name:crm_partner_assign.menu_report_crm_partner_assign_tree
+msgid "Partnership Analysis"
+msgstr "業務夥伴分析"
+
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_crm_lead
+msgid "crm.lead"
+msgstr "crm.lead"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,state:0
+msgid "Pending"
+msgstr "待處理"
+
+#. module: crm_partner_assign
+#: view:crm.partner.report.assign:0
+msgid "Partner assigned Analysis"
+msgstr "業務夥伴分配分析"
+
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_crm_lead_report_assign
+msgid "CRM Lead Report"
+msgstr "客戶關係管理 線索報表"
+
+#. module: crm_partner_assign
+#: help:crm.lead.forward.to.partner,references:0
+msgid "Message references, such as identifiers of previous messages"
+msgstr "郵件引用，例如前一個郵件的ID"
+
+#. module: crm_partner_assign
+#: constraint:res.partner:0
+msgid "Error ! You cannot create recursive associated members."
+msgstr "錯誤，您不能建立循環引用的會員用戶"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.forward.to.partner,history:0
+msgid "Case Information"
+msgstr "業務資訊"
+
+#. module: crm_partner_assign
+#: field:res.partner.grade,sequence:0
+msgid "Sequence"
+msgstr "順序"
+
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_crm_partner_report_assign
+msgid "CRM Partner Report"
+msgstr "CRM業務夥伴報表"
+
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_crm_lead_forward_to_partner
+msgid "Email composition wizard"
+msgstr "電子郵件成分嚮導"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,priority:0
+msgid "High"
+msgstr "高"
+
+#. module: crm_partner_assign
+#: field:crm.lead.report.assign,section_id:0
+#: field:crm.partner.report.assign,section_id:0
+msgid "Sales Team"
+msgstr "銷售團隊"
+
+#. module: crm_partner_assign
+#: field:crm.lead.report.assign,create_date:0
+msgid "Create Date"
+msgstr "建立日期"
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,filter_id:0
+msgid "Filters"
+msgstr "篩選"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+#: field:crm.lead.report.assign,year:0
+msgid "Year"
+msgstr "年"
+
+#. module: crm_partner_assign
+#: help:crm.lead.forward.to.partner,reply_to:0
+msgid "Preferred response address for the message"
+msgstr "本郵件推薦的回覆地址"
+
+#~ msgid "E-mail composition wizard"
+#~ msgstr "郵件協同作業"
diff --git a/addons/crm_partner_assign/test/partner_assign.yml b/addons/crm_partner_assign/test/partner_assign.yml
index bc4cd0d6e57..a055fc6cd6d 100644
--- a/addons/crm_partner_assign/test/partner_assign.yml
+++ b/addons/crm_partner_assign/test/partner_assign.yml
@@ -29,8 +29,8 @@
   I forward this opportunity to its nearest partner.
 -
   !python {model: crm.lead.forward.to.partner}: |
-    context.update({'active_model': 'crm.lead', 'active_id': ref('crm.crm_case_19'), 'active_ids': [ref('crm.crm_case_19')]})
-    forward_id = self.create(cr, uid, {'email_from': 'test@openerp.com', 'send_to': 'partner'}, context=context)
+    context.update({'default_model': 'crm.lead', 'default_res_id': ref('crm.crm_case_19'), 'active_ids': [ref('crm.crm_case_19')]})
+    forward_id = self.create(cr, uid, {}, context=context)
     try:
       self.action_forward(cr, uid, [forward_id], context=context)
     except:
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 d479f8b1bd5..0cac38e0163 100644
--- a/addons/crm_partner_assign/wizard/crm_forward_to_partner.py
+++ b/addons/crm_partner_assign/wizard/crm_forward_to_partner.py
@@ -20,186 +20,153 @@
 #
 ##############################################################################
 
-import time
 import re
+import time
+import tools
+
 from osv import osv, fields
 from tools.translate import _
-from mail.mail_message import to_email
 
 class crm_lead_forward_to_partner(osv.osv_memory):
-    """Forwards lead history"""
+    """ Forward info history to partners. """
     _name = 'crm.lead.forward.to.partner'
     _inherit = "mail.compose.message"
 
+    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'
+        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']
+        return res
+
+    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 = {
-        'send_to': fields.selection([('user', 'User'), ('partner', 'Partner'), \
-                         ('email', 'Email Address')], 'Send to', required=True),
-        'user_id': fields.many2one('res.users', "User"),
-        'attachment_ids': fields.many2many('ir.attachment','lead_forward_to_partner_attachment_rel', 'wizard_id', 'attachment_id', 'Attachments'),
-        'partner_id' : fields.many2one('res.partner', 'Partner'),
-        'history': fields.selection([('info', 'Case Information'), ('latest', 'Latest email'), ('whole', 'Whole Story')], 'Send history', required=True),
+        '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', 'Case Information'),
+            ('latest', 'Latest email'), ('whole', 'Whole Story')],
+            'Send history', required=True),
     }
 
     _defaults = {
-        'send_to' : 'email',
-        'history': 'latest',
-        'email_from': lambda s, cr, uid, c: s.pool.get('res.users').browse(cr, uid, uid, c).email,
+        'history_mode': 'latest',
+        'content_subtype': lambda self,cr, uid, context={}: 'html',
     }
 
-    def on_change_email(self, cr, uid, ids, user, context=None):
-        if not user:
-            return {'value': {'email_to': False}}
-        return {'value': {'email_to': self.pool.get('res.users').browse(cr, uid, uid, context=context).email}}
-
-    def on_change_history(self, cr, uid, ids, history_type, context=None):
-        """Gives message body according to type of history selected
-            * info: Forward the case information
-            * whole: Send the whole history
-            * latest: Send the latest histoy
+    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.
         """
-        #TODO: ids and context are not comming
-        res = {}
-        res_id = context.get('active_id')
-        model = context.get('active_model')
-        lead = self.pool.get(model).browse(cr, uid, res_id, context)
-        body_text = self._get_message_body_text(cr, uid, lead, history_type, context=context)
-        if body_text:
-            res = {'value': {'body_text' : body_text}}
+        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
+        lead_obj = self.pool.get(model)
+        lead = lead_obj.browse(cr, uid, res_id, context=context)
+        subject = '%s: %s - %s' % (_('Fwd'), _('Lead forward'), lead.name)
+        body = self._get_message_body(cr, uid, lead, 'info', context=context)
+        res.update({
+            'subject': subject,
+            'body': body,
+            })
         return res
-    
-    def on_change_partner(self, cr, uid, ids, partner_id):
-        """This function fills address information based on partner/user selected
-        """
-        if not partner_id:
-            return {'value' : {'email_to' : False}}
-        partner_obj = self.pool.get('res.partner')
-        data = {}
-        partner = partner_obj.browse(cr, uid, [partner_id])
-        user_id = partner and partner[0].user_id or False
-        data.update({'email_from': partner and partner[0].email or "", 
-                     'email_cc' : user_id and user_id.user or '', 
-                     'user_id': user_id and user_id.id or False})
-        return {'value' : data}
+
+    def on_change_history_mode(self, cr, uid, ids, history_mode, model, res_id, context=None):
+        """ Update body when changing history_mode """
+        if model and model == 'crm.lead' and res_id:
+            lead = self.pool.get(model).browse(cr, uid, res_id, context=context)
+            body = self._get_message_body(cr, uid, lead, history_mode, context=context)
+            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
-        """
+        """ Forward the lead to a partner """
         if context is None:
             context = {}
         res = {'type': 'ir.actions.act_window_close'}
-        model = context.get('active_model')
-        if model not in ('crm.lead'):
+        wizard = self.browse(cr, uid, ids[0], context=context)
+        if wizard.model not in ('crm.lead'):
             return res
 
-        this = self.browse(cr, uid, ids[0], context=context)
-        lead = self.pool.get(model)
-        lead_id = context and context.get('active_id', False) or False
-        lead_ids = lead_id and [lead_id] or []
-        mode = context.get('mail.compose.message.mode')
-        if mode == 'mass_mail':
+        lead = self.pool.get(wizard.model)
+        lead_ids = wizard.res_id and [wizard.res_id] or []
+
+        if wizard.composition_mode == 'mass_mail':
             lead_ids = context and context.get('active_ids', []) or []
-            value = self.default_get(cr, uid, ['body_text', 'email_to', 'email_cc', 'subject', 'history'], context=context)
+            value = self.default_get(cr, uid, ['body', 'email_to', 'email_cc', 'subject', 'history_mode'], context=context)
             self.write(cr, uid, ids, value, context=context)
-            context['mail.compose.message.mode'] = mode
 
         self.send_mail(cr, uid, ids, context=context)
-        for case in lead.browse(cr, uid, lead_ids, context=context):
-            if (this.send_to == 'partner' and this.partner_id):
-                lead.assign_partner(cr, uid, [case.id], this.partner_id.id, context=context)
+        # for case in lead.browse(cr, uid, lead_ids, context=context):
+            # TODO: WHAT TO DO WITH THAT ?
+            # if (this.send_to == 'partner' and this.partner_id):
+            #     lead.assign_partner(cr, uid, [case.id], this.partner_id.id, context=context)
 
-            if this.send_to == 'user':
-                lead.allocate_salesman(cr, uid, [case.id], [this.user_id.id], context=context)
-
-            email_cc = to_email(case.email_cc)
-            email_cc = email_cc and email_cc[0] or ''
-            new_cc = []
-            if email_cc:
-                new_cc.append(email_cc)
-            for to in this.email_to.split(','):
-                email_to = to_email(to)
-                email_to = email_to and email_to[0] or ''
-                if email_to not in new_cc:
-                    new_cc.append(to)
-            update_vals = {'email_cc' : ', '.join(new_cc) }
-            lead.write(cr, uid, [case.id], update_vals, context=context)
+            # if this.send_to == 'user':
+            #     lead.allocate_salesman(cr, uid, [case.id], [this.user_id.id], context=context)
         return res
 
-    def _get_info_body_text(self, cr, uid, lead, context=None):
+    def _get_info_body(self, cr, uid, lead, context=None):
         field_names = []
         proxy = self.pool.get(lead._name)
         if lead.type == 'opportunity':
             field_names += ['partner_id']
         field_names += [
-           'partner_name' , 'title', 'function', 'street', 'street2',
+            'partner_name' , 'title', 'function', 'street', 'street2',
             'zip', 'city', 'country_id', 'state_id', 'email_from',
             'phone', 'fax', 'mobile', 'categ_id', 'description',
         ]
-        return proxy._mail_body_text(cr, uid, lead, field_names, context=context)
+        return proxy._mail_body(cr, uid, lead, field_names, context=context)
 
-    def _get_message_body_text(self, cr, uid, lead, mode='whole', context=None):
-        """This function gets whole communication history and returns as top posting style
+    def _get_message_body(self, cr, uid, lead, history_mode='whole', context=None):
+        """ This function gets whole communication history and returns as top
+            posting style
+            #1: form a body, based on the lead
+            #2: append to the body the communication history, based on the
+                history_mode parameter
+
+            - info: Forward the case information
+            - latest: Send the latest history
+            - whole: Send the whole history
+
+            :param lead: browse_record on crm.lead
+            :param history_mode: 'whole' or 'latest'
         """
         mail_message = self.pool.get('mail.message')
-        message_ids = []
-        body = self._get_info_body_text(cr, uid, lead, context=context)
-        if mode in ('whole', 'latest'):
-            message_ids = lead.message_ids
-            message_ids = map(lambda x: x.id, filter(lambda x: x.email_from, message_ids))
-            if mode == 'latest' and len(message_ids):
-                message_ids = [message_ids[0]]
-            for message in mail_message.browse(cr, uid, message_ids, context=context):
-                header = '-------- Original Message --------'
-                sender = 'From: %s' %(message.email_from or '')
-                to = 'To: %s' % (message.email_to or '')
-                sentdate = 'Date: %s' % (message.date or '')
-                desc = '\n%s'%(message.body_text)
-                original = [header, sender, to, sentdate, desc, '\n']
-                original = '\n'.join(original)
-                body += original
+        body = self._get_info_body(cr, uid, lead, context=context)
+        if history_mode not in ('whole', 'latest'):
+            return body or ''
+        for message in lead.message_ids:
+            header = '-------- Original Message --------'
+            sentdate = 'Date: %s' % (message.date or '')
+            desc = '\n%s'%(message.body)
+            original = [header, sentdate, desc, '\n']
+            original = '\n'.join(original)
+            body += original
+            if history_mode == 'latest':
+                break
         return body or ''
 
-    def get_value(self, cr, uid, model, res_id, context=None):
-        if context is None:
-            context = {}
-        res = super(crm_lead_forward_to_partner, self).get_value(cr, uid,  model, res_id, context=context)
-        if model not in ("crm.lead"):
-            return res
-        proxy = self.pool.get(model)
-        partner = self.pool.get('res.partner')
-        lead = proxy.browse(cr, uid, res_id, context=context)
-        mode = context.get('mail.compose.message.mode')
-        if mode == "forward":
-            body_type = context.get('mail.compose.message.body')
-            email_cc = res.get('email_cc', "")
-            email = res.get('email_to', "")
-            subject = '%s: %s - %s' % (_('Fwd'), 'Lead forward', lead.name)
-            body = self._get_message_body_text(cr, uid, lead, body_type, context=context)
-            partner_assigned_id = lead.partner_assigned_id and lead.partner_assigned_id.id or False
-            user_id = False
-            if not partner_assigned_id:
-                partner_assigned_id = proxy.search_geo_partner(cr, uid, [lead.id], context=None).get(lead.id, False)
-            if partner_assigned_id:
-                assigned_partner = partner.browse(cr, uid, partner_assigned_id, context=context)
-                user_id = assigned_partner.user_id and assigned_partner.user_id.id or False
-                email_cc = assigned_partner.user_id and assigned_partner.user_id.email or ''
-                email = assigned_partner.email
-            
-            res.update({
-                'subject' : subject,
-                'body_text' : body,
-                'email_cc' : email_cc,
-                'email_to' : email,
-                'partner_assigned_id': partner_assigned_id,
-                'user_id': user_id,
-            })
-        return res
-        
 
-    def default_get(self, cr, uid, fields, context=None):
-        if context is None:
-            context = {}
-        context['mail.compose.message.mode'] = 'forward'
-        context['mail.compose.message.body'] = 'info'
-        return super(crm_lead_forward_to_partner, self).default_get(cr, uid, fields, context=context)
 # 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 cecf73954e5..0d8f27eec74 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
@@ -7,42 +7,31 @@
             <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" colspan="6">
-                        <field name="history" colspan="2" on_change="on_change_history(history, context)"/>
-                        <field name="send_to" colspan="2"/>
-                        <group col="2" colspan="2" attrs="{ 'invisible' : [('send_to','!=','user')]}">
-                            <field name="user_id"
-                                attrs="{ 'required' : [('send_to','=','user')]}"
-                                on_change="on_change_email(user_id)"/>
-                        </group>
-                        <group col="4" colspan="4" attrs="{'invisible' : [('send_to','!=','partner')]}">
-                            <field name="partner_id" attrs="{'required' : [('send_to','=','partner')]}" on_change="on_change_partner(partner_id)" colspan="2"/>
-                        </group>
+                    <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"
+                            on_change="onchange_partner_ids(partner_ids)"/>
+                        <notebook colspan="4">
+                            <page string="Body">
+                                <field name="body"/>
+                            </page>
+                            <page string="Attachments">
+                                <field name="attachment_ids"/>
+                            </page>
+                        </notebook>
                     </group>
-                    <separator string="" colspan="4"/>
-                    <group col="6" colspan="4">
-                        <field name="email_from" colspan="4" required="1"/>
-                        <field name="email_to" colspan="4" required="1"/>
-                        <field name="email_cc" colspan="4"/>
-                        <field name="email_bcc" colspan="4"/>
-                        <field name="reply_to" colspan="4"/>
-                        <field name="subject" colspan="4" widget="char" size="512"/>
-                    </group>
-                    <separator string="" colspan="4"/>
-                    <notebook colspan="4">
-                        <page string="Body">
-                            <field name="body_text" colspan="4" nolabel="1"/>
-                        </page>
-                        <page string="Attachments">
-                            <label string="Add here all attachments of the current document you want to include in the Email." colspan="4"/>
-                            <field name="attachment_ids" colspan="4" nolabel="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" class="oe_link" special="cancel"/>
+                        <button string="Cancel" special="cancel"
+                            class="oe_link"/>
                     </footer>
                 </form>
             </field>
@@ -57,18 +46,14 @@
             <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="{'mail.compose.message.mode' : 'mass_mail'}"
+            context="{'default_composition_mode' : 'mass_mail'}"
             view_id="crm_lead_forward_to_partner_form"
-       />
-
-
+        />
 
     </data>
 </openerp>
diff --git a/addons/crm_profiling/__openerp__.py b/addons/crm_profiling/__openerp__.py
index 68594281b9b..99e1b6c5f41 100644
--- a/addons/crm_profiling/__openerp__.py
+++ b/addons/crm_profiling/__openerp__.py
@@ -35,15 +35,13 @@ questionnaire and directly use it on a partner.
 It also has been merged with the earlier CRM & SRM segmentation tool because they 
 were overlapping.
 
-    * Note: this module is not compatible with the module segmentation, since 
-            it's the same which has been renamed.
+    **Note:** this module is not compatible with the module segmentation, since it's the same which has been renamed.
     """,
     'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
     'depends': ['base', 'crm'],
-    'init_xml': [],
-    'update_xml': ['security/ir.model.access.csv', 'wizard/open_questionnaire_view.xml', 'crm_profiling_view.xml'],
-    'demo_xml': ['crm_profiling_demo.xml'],
+    'data': ['security/ir.model.access.csv', 'wizard/open_questionnaire_view.xml', 'crm_profiling_view.xml'],
+    'demo': ['crm_profiling_demo.xml'],
     'test': [
         #'test/process/profiling.yml', #TODO:It's not debuging because problem to write data for open.questionnaire from partner section.
     ],
diff --git a/addons/crm_profiling/i18n/ar.po b/addons/crm_profiling/i18n/ar.po
index 4e288764ee1..c62465ae613 100644
--- a/addons/crm_profiling/i18n/ar.po
+++ b/addons/crm_profiling/i18n/ar.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:53+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:25+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: crm_profiling
 #: view:crm_profiling.questionnaire:0
diff --git a/addons/crm_profiling/i18n/bg.po b/addons/crm_profiling/i18n/bg.po
index aa3d39cafe4..0f9e5e308f1 100644
--- a/addons/crm_profiling/i18n/bg.po
+++ b/addons/crm_profiling/i18n/bg.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:53+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:25+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: crm_profiling
 #: view:crm_profiling.questionnaire:0
diff --git a/addons/crm_profiling/i18n/bs.po b/addons/crm_profiling/i18n/bs.po
index 9ab36cd9b2a..17f53523b3e 100644
--- a/addons/crm_profiling/i18n/bs.po
+++ b/addons/crm_profiling/i18n/bs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:53+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:25+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: crm_profiling
 #: view:crm_profiling.questionnaire:0
diff --git a/addons/crm_profiling/i18n/ca.po b/addons/crm_profiling/i18n/ca.po
index 015701431ff..87672984fd4 100644
--- a/addons/crm_profiling/i18n/ca.po
+++ b/addons/crm_profiling/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:53+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:25+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: crm_profiling
 #: view:crm_profiling.questionnaire:0
diff --git a/addons/crm_profiling/i18n/cs.po b/addons/crm_profiling/i18n/cs.po
index b8b067ea552..19ce03b1263 100644
--- a/addons/crm_profiling/i18n/cs.po
+++ b/addons/crm_profiling/i18n/cs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:53+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:25+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: crm_profiling
 #: view:crm_profiling.questionnaire:0
diff --git a/addons/crm_profiling/i18n/da.po b/addons/crm_profiling/i18n/da.po
index ec200a94112..fa1a3f9c4f7 100644
--- a/addons/crm_profiling/i18n/da.po
+++ b/addons/crm_profiling/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:53+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:25+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: crm_profiling
 #: view:crm_profiling.questionnaire:0
diff --git a/addons/crm_profiling/i18n/de.po b/addons/crm_profiling/i18n/de.po
index 903ca170874..894e7948958 100644
--- a/addons/crm_profiling/i18n/de.po
+++ b/addons/crm_profiling/i18n/de.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:53+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:25+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: crm_profiling
 #: view:crm_profiling.questionnaire:0
diff --git a/addons/crm_profiling/i18n/el.po b/addons/crm_profiling/i18n/el.po
index d11b4c42847..4bd82228a17 100644
--- a/addons/crm_profiling/i18n/el.po
+++ b/addons/crm_profiling/i18n/el.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:53+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:25+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
 "X-Poedit-SourceCharset: utf-8\n"
diff --git a/addons/crm_profiling/i18n/en_GB.po b/addons/crm_profiling/i18n/en_GB.po
index 5c06199a817..5731f47489b 100644
--- a/addons/crm_profiling/i18n/en_GB.po
+++ b/addons/crm_profiling/i18n/en_GB.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:53+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:25+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: crm_profiling
 #: view:crm_profiling.questionnaire:0
diff --git a/addons/crm_profiling/i18n/es.po b/addons/crm_profiling/i18n/es.po
index 8f306933852..faa61f0b931 100644
--- a/addons/crm_profiling/i18n/es.po
+++ b/addons/crm_profiling/i18n/es.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:53+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:25+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: crm_profiling
 #: view:crm_profiling.questionnaire:0
diff --git a/addons/crm_profiling/i18n/es_AR.po b/addons/crm_profiling/i18n/es_AR.po
index 56bb7c5d81d..f3b9b500c12 100644
--- a/addons/crm_profiling/i18n/es_AR.po
+++ b/addons/crm_profiling/i18n/es_AR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:53+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:25+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: crm_profiling
 #: view:crm_profiling.questionnaire:0
diff --git a/addons/crm_profiling/i18n/es_CR.po b/addons/crm_profiling/i18n/es_CR.po
index 1dab03e360a..28e8a69facf 100644
--- a/addons/crm_profiling/i18n/es_CR.po
+++ b/addons/crm_profiling/i18n/es_CR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:53+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:25+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 "Language: \n"
 
 #. module: crm_profiling
diff --git a/addons/crm_profiling/i18n/es_EC.po b/addons/crm_profiling/i18n/es_EC.po
index 4683c1f1749..54bd5fd281e 100644
--- a/addons/crm_profiling/i18n/es_EC.po
+++ b/addons/crm_profiling/i18n/es_EC.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:53+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:25+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: crm_profiling
 #: view:crm_profiling.questionnaire:0
diff --git a/addons/crm_profiling/i18n/es_PY.po b/addons/crm_profiling/i18n/es_PY.po
index c50d38652ab..5234086f46b 100644
--- a/addons/crm_profiling/i18n/es_PY.po
+++ b/addons/crm_profiling/i18n/es_PY.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:53+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:25+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: crm_profiling
 #: view:crm_profiling.questionnaire:0
diff --git a/addons/crm_profiling/i18n/et.po b/addons/crm_profiling/i18n/et.po
index 687ff3f6ed8..86dcc88be1d 100644
--- a/addons/crm_profiling/i18n/et.po
+++ b/addons/crm_profiling/i18n/et.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:53+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:25+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: crm_profiling
 #: view:crm_profiling.questionnaire:0
diff --git a/addons/crm_profiling/i18n/fi.po b/addons/crm_profiling/i18n/fi.po
index 402d48c3a18..6016d397f75 100644
--- a/addons/crm_profiling/i18n/fi.po
+++ b/addons/crm_profiling/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:53+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:25+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: crm_profiling
 #: view:crm_profiling.questionnaire:0
diff --git a/addons/crm_profiling/i18n/fr.po b/addons/crm_profiling/i18n/fr.po
index d73cb9ec4b2..2333d7ae9da 100644
--- a/addons/crm_profiling/i18n/fr.po
+++ b/addons/crm_profiling/i18n/fr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:53+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:25+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: crm_profiling
 #: view:crm_profiling.questionnaire:0
diff --git a/addons/crm_profiling/i18n/gl.po b/addons/crm_profiling/i18n/gl.po
index d75b0528b24..39608d4188c 100644
--- a/addons/crm_profiling/i18n/gl.po
+++ b/addons/crm_profiling/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:53+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:25+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: crm_profiling
 #: view:crm_profiling.questionnaire:0
diff --git a/addons/crm_profiling/i18n/gu.po b/addons/crm_profiling/i18n/gu.po
index 5fea19b2ed8..2ea4fa333ef 100644
--- a/addons/crm_profiling/i18n/gu.po
+++ b/addons/crm_profiling/i18n/gu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:53+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:25+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: crm_profiling
 #: view:crm_profiling.questionnaire:0
diff --git a/addons/crm_profiling/i18n/hr.po b/addons/crm_profiling/i18n/hr.po
index 637e8885b88..67fa018a010 100644
--- a/addons/crm_profiling/i18n/hr.po
+++ b/addons/crm_profiling/i18n/hr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:53+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:25+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 "Language: hr\n"
 
 #. module: crm_profiling
diff --git a/addons/crm_profiling/i18n/hu.po b/addons/crm_profiling/i18n/hu.po
index 52c05d01e5a..5555d4e7dd1 100644
--- a/addons/crm_profiling/i18n/hu.po
+++ b/addons/crm_profiling/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:53+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:25+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: crm_profiling
 #: view:crm_profiling.questionnaire:0
diff --git a/addons/crm_profiling/i18n/id.po b/addons/crm_profiling/i18n/id.po
index 174fda8f7ec..976cbdb3a11 100644
--- a/addons/crm_profiling/i18n/id.po
+++ b/addons/crm_profiling/i18n/id.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:53+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:25+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: crm_profiling
 #: view:crm_profiling.questionnaire:0
diff --git a/addons/crm_profiling/i18n/it.po b/addons/crm_profiling/i18n/it.po
index 7cb0b549ae5..262d69ef460 100644
--- a/addons/crm_profiling/i18n/it.po
+++ b/addons/crm_profiling/i18n/it.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:53+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:25+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: crm_profiling
 #: view:crm_profiling.questionnaire:0
diff --git a/addons/crm_profiling/i18n/ja.po b/addons/crm_profiling/i18n/ja.po
index ef0a9c5595a..d0ddf5a51d6 100644
--- a/addons/crm_profiling/i18n/ja.po
+++ b/addons/crm_profiling/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:53+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:25+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: crm_profiling
 #: view:crm_profiling.questionnaire:0
diff --git a/addons/crm_profiling/i18n/ko.po b/addons/crm_profiling/i18n/ko.po
index 388b1543f8c..7bd9789f6bf 100644
--- a/addons/crm_profiling/i18n/ko.po
+++ b/addons/crm_profiling/i18n/ko.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:53+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:25+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: crm_profiling
 #: view:crm_profiling.questionnaire:0
diff --git a/addons/crm_profiling/i18n/lt.po b/addons/crm_profiling/i18n/lt.po
index 29c7417e4d7..2b23c0fb49c 100644
--- a/addons/crm_profiling/i18n/lt.po
+++ b/addons/crm_profiling/i18n/lt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:53+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:25+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: crm_profiling
 #: view:crm_profiling.questionnaire:0
diff --git a/addons/crm_profiling/i18n/lv.po b/addons/crm_profiling/i18n/lv.po
index bd61cf86778..1293199d825 100644
--- a/addons/crm_profiling/i18n/lv.po
+++ b/addons/crm_profiling/i18n/lv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:53+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:25+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: crm_profiling
 #: view:crm_profiling.questionnaire:0
diff --git a/addons/crm_profiling/i18n/mn.po b/addons/crm_profiling/i18n/mn.po
index be36fa5aa50..f8478bac764 100644
--- a/addons/crm_profiling/i18n/mn.po
+++ b/addons/crm_profiling/i18n/mn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:53+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:25+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: crm_profiling
 #: view:crm_profiling.questionnaire:0
diff --git a/addons/crm_profiling/i18n/nb.po b/addons/crm_profiling/i18n/nb.po
new file mode 100644
index 00000000000..653dc05522e
--- /dev/null
+++ b/addons/crm_profiling/i18n/nb.po
@@ -0,0 +1,212 @@
+# Norwegian Bokmal 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-02-08 00:36+0000\n"
+"PO-Revision-Date: 2012-09-06 14:26+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Norwegian Bokmal <nb@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:58+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
+
+#. module: crm_profiling
+#: view:crm_profiling.questionnaire:0
+msgid "Questions List"
+msgstr "Spørsmål liste."
+
+#. module: crm_profiling
+#: model:ir.actions.act_window,help:crm_profiling.open_questionnaires
+msgid ""
+"You can create specific topic-related questionnaires to guide your team(s) "
+"in the sales cycle by helping them to ask the right questions. The "
+"segmentation tool allows you to automatically assign a partner to a category "
+"according to his answers to the different questionnaires."
+msgstr ""
+"Du kan opprette spesifikke tema-relaterte spørreskjemaer for å styre lag (e) "
+"i salgsperioden ved å hjelpe dem til å stille de riktige spørsmålene. "
+"Segmentering verktøyet lar deg automatisk tildele en partner til en kategori "
+"i henhold til hans svar til de ulike spørreskjemaer."
+
+#. module: crm_profiling
+#: field:crm_profiling.answer,question_id:0
+#: field:crm_profiling.question,name:0
+#: model:ir.model,name:crm_profiling.model_crm_profiling_question
+#: field:open.questionnaire.line,question_id:0
+msgid "Question"
+msgstr "Spørsmål"
+
+#. module: crm_profiling
+#: model:ir.actions.act_window,name:crm_profiling.action_open_questionnaire
+#: view:open.questionnaire:0
+msgid "Open Questionnaire"
+msgstr "åpen Spørreskjema"
+
+#. module: crm_profiling
+#: field:crm.segmentation,child_ids:0
+msgid "Child Profiles"
+msgstr "Barn profiler"
+
+#. module: crm_profiling
+#: view:crm.segmentation:0
+msgid "Partner Segmentations"
+msgstr "Partner segmenteringer"
+
+#. module: crm_profiling
+#: field:crm_profiling.answer,name:0
+#: model:ir.model,name:crm_profiling.model_crm_profiling_answer
+#: field:open.questionnaire.line,answer_id:0
+msgid "Answer"
+msgstr "Svar"
+
+#. module: crm_profiling
+#: model:ir.model,name:crm_profiling.model_open_questionnaire_line
+msgid "open.questionnaire.line"
+msgstr "Åpen.Spørreskjema.Linje"
+
+#. module: crm_profiling
+#: model:ir.model,name:crm_profiling.model_crm_segmentation
+msgid "Partner Segmentation"
+msgstr "Partnersegmentering"
+
+#. module: crm_profiling
+#: view:res.partner:0
+msgid "Profiling"
+msgstr "Profilering"
+
+#. module: crm_profiling
+#: view:crm_profiling.questionnaire:0
+#: field:crm_profiling.questionnaire,description:0
+msgid "Description"
+msgstr "Beskrivelse:"
+
+#. module: crm_profiling
+#: field:crm.segmentation,answer_no:0
+msgid "Excluded Answers"
+msgstr "Ekskluderte svar"
+
+#. module: crm_profiling
+#: view:crm_profiling.answer:0
+#: view:crm_profiling.question:0
+#: field:res.partner,answers_ids:0
+msgid "Answers"
+msgstr "Svar"
+
+#. module: crm_profiling
+#: model:ir.model,name:crm_profiling.model_open_questionnaire
+msgid "open.questionnaire"
+msgstr "Åpen.Spørresjema"
+
+#. module: crm_profiling
+#: field:open.questionnaire,questionnaire_id:0
+msgid "Questionnaire name"
+msgstr "Spørresjema navn."
+
+#. module: crm_profiling
+#: view:res.partner:0
+msgid "Use a questionnaire"
+msgstr "Bruk et spørresjema."
+
+#. module: crm_profiling
+#: view:open.questionnaire:0
+msgid "_Cancel"
+msgstr "_Avbryt"
+
+#. module: crm_profiling
+#: field:open.questionnaire,question_ans_ids:0
+msgid "Question / Answers"
+msgstr "Spørsmål / Svar"
+
+#. module: crm_profiling
+#: view:crm_profiling.questionnaire:0
+#: model:ir.actions.act_window,name:crm_profiling.open_questionnaires
+#: model:ir.ui.menu,name:crm_profiling.menu_segm_questionnaire
+#: view:open.questionnaire:0
+msgid "Questionnaires"
+msgstr "Spørreskjemaer"
+
+#. module: crm_profiling
+#: help:crm.segmentation,profiling_active:0
+msgid ""
+"Check                             this box if you want to use this tab as "
+"part of the                              segmentation rule. If not checked, "
+"the criteria beneath will be ignored"
+msgstr ""
+"Kryss av her hvis du ønsker å bruke denne kategorien som en del av "
+"segmentering regelen. Hvis det ikke er merket, vil kriteriene under bli "
+"ignorert."
+
+#. module: crm_profiling
+#: constraint:crm.segmentation:0
+msgid "Error ! You can not create recursive profiles."
+msgstr "Feil ! Du kan ikke lage rekursive profiler."
+
+#. module: crm_profiling
+#: field:crm.segmentation,profiling_active:0
+msgid "Use The Profiling Rules"
+msgstr "Bruk profileringen Regler"
+
+#. module: crm_profiling
+#: constraint:res.partner:0
+msgid "Error ! You cannot create recursive associated members."
+msgstr "Feil! Du kan ikke opprette rekursive tilknyttede medlemmer."
+
+#. module: crm_profiling
+#: view:crm_profiling.question:0
+#: field:crm_profiling.question,answers_ids:0
+msgid "Avalaible Answers"
+msgstr ""
+
+#. module: crm_profiling
+#: field:crm.segmentation,answer_yes:0
+msgid "Included Answers"
+msgstr "Inkluderte svar."
+
+#. module: crm_profiling
+#: view:crm_profiling.question:0
+#: field:crm_profiling.questionnaire,questions_ids:0
+#: model:ir.actions.act_window,name:crm_profiling.open_questions
+#: model:ir.ui.menu,name:crm_profiling.menu_segm_answer
+msgid "Questions"
+msgstr "Spørsmål"
+
+#. module: crm_profiling
+#: field:crm.segmentation,parent_id:0
+msgid "Parent Profile"
+msgstr "Overordnede profil"
+
+#. module: crm_profiling
+#: view:open.questionnaire:0
+msgid "Cancel"
+msgstr "Kanseller"
+
+#. module: crm_profiling
+#: model:ir.model,name:crm_profiling.model_res_partner
+msgid "Partner"
+msgstr "Partner"
+
+#. module: crm_profiling
+#: code:addons/crm_profiling/wizard/open_questionnaire.py:77
+#: field:crm_profiling.questionnaire,name:0
+#: model:ir.model,name:crm_profiling.model_crm_profiling_questionnaire
+#: view:open.questionnaire:0
+#: view:open.questionnaire.line:0
+#: field:open.questionnaire.line,wizard_id:0
+#, python-format
+msgid "Questionnaire"
+msgstr "Spørreskjemaet"
+
+#. module: crm_profiling
+#: view:open.questionnaire:0
+msgid "Save Data"
+msgstr "Lagre data"
+
+#~ msgid "Avalaible answers"
+#~ msgstr "Tilgjengelige svar."
diff --git a/addons/crm_profiling/i18n/nl.po b/addons/crm_profiling/i18n/nl.po
index e35cd232166..5930ec5b1ff 100644
--- a/addons/crm_profiling/i18n/nl.po
+++ b/addons/crm_profiling/i18n/nl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:53+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:25+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: crm_profiling
 #: view:crm_profiling.questionnaire:0
diff --git a/addons/crm_profiling/i18n/nl_BE.po b/addons/crm_profiling/i18n/nl_BE.po
index 56965202abb..cdae2f0ec14 100644
--- a/addons/crm_profiling/i18n/nl_BE.po
+++ b/addons/crm_profiling/i18n/nl_BE.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:53+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:25+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: crm_profiling
 #: view:crm_profiling.questionnaire:0
diff --git a/addons/crm_profiling/i18n/pl.po b/addons/crm_profiling/i18n/pl.po
index 0a7933e888b..96063b20cb4 100644
--- a/addons/crm_profiling/i18n/pl.po
+++ b/addons/crm_profiling/i18n/pl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:53+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:25+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: crm_profiling
 #: view:crm_profiling.questionnaire:0
diff --git a/addons/crm_profiling/i18n/pt.po b/addons/crm_profiling/i18n/pt.po
index fef3bf04c5c..24d30817bc2 100644
--- a/addons/crm_profiling/i18n/pt.po
+++ b/addons/crm_profiling/i18n/pt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:53+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:25+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: crm_profiling
 #: view:crm_profiling.questionnaire:0
diff --git a/addons/crm_profiling/i18n/pt_BR.po b/addons/crm_profiling/i18n/pt_BR.po
index 3deee53d950..449466abde0 100644
--- a/addons/crm_profiling/i18n/pt_BR.po
+++ b/addons/crm_profiling/i18n/pt_BR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:53+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:25+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: crm_profiling
 #: view:crm_profiling.questionnaire:0
diff --git a/addons/crm_profiling/i18n/ro.po b/addons/crm_profiling/i18n/ro.po
index d40999febce..58176faa5fe 100644
--- a/addons/crm_profiling/i18n/ro.po
+++ b/addons/crm_profiling/i18n/ro.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:53+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:25+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: crm_profiling
 #: view:crm_profiling.questionnaire:0
diff --git a/addons/crm_profiling/i18n/ru.po b/addons/crm_profiling/i18n/ru.po
index 9096decb1fa..8656a859f6a 100644
--- a/addons/crm_profiling/i18n/ru.po
+++ b/addons/crm_profiling/i18n/ru.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:53+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:25+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: crm_profiling
 #: view:crm_profiling.questionnaire:0
diff --git a/addons/crm_profiling/i18n/sk.po b/addons/crm_profiling/i18n/sk.po
index 708e6b0ad9e..082a9d13b49 100644
--- a/addons/crm_profiling/i18n/sk.po
+++ b/addons/crm_profiling/i18n/sk.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:53+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:25+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: crm_profiling
 #: view:crm_profiling.questionnaire:0
diff --git a/addons/crm_profiling/i18n/sl.po b/addons/crm_profiling/i18n/sl.po
index 00915158102..2e0415548fe 100644
--- a/addons/crm_profiling/i18n/sl.po
+++ b/addons/crm_profiling/i18n/sl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:53+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:25+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: crm_profiling
 #: view:crm_profiling.questionnaire:0
diff --git a/addons/crm_profiling/i18n/sq.po b/addons/crm_profiling/i18n/sq.po
index 548b9e13c1f..8bd0cede4be 100644
--- a/addons/crm_profiling/i18n/sq.po
+++ b/addons/crm_profiling/i18n/sq.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:53+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:25+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: crm_profiling
 #: view:crm_profiling.questionnaire:0
diff --git a/addons/crm_profiling/i18n/sr.po b/addons/crm_profiling/i18n/sr.po
index b8cfb81ab7b..146f25bc2f8 100644
--- a/addons/crm_profiling/i18n/sr.po
+++ b/addons/crm_profiling/i18n/sr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:53+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:25+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: crm_profiling
 #: view:crm_profiling.questionnaire:0
diff --git a/addons/crm_profiling/i18n/sr@latin.po b/addons/crm_profiling/i18n/sr@latin.po
index 145a067d28b..47952f69459 100644
--- a/addons/crm_profiling/i18n/sr@latin.po
+++ b/addons/crm_profiling/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:53+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:25+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: crm_profiling
 #: view:crm_profiling.questionnaire:0
diff --git a/addons/crm_profiling/i18n/sv.po b/addons/crm_profiling/i18n/sv.po
index 62d7e64ecdc..d615af45d8e 100644
--- a/addons/crm_profiling/i18n/sv.po
+++ b/addons/crm_profiling/i18n/sv.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:53+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:25+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: crm_profiling
 #: view:crm_profiling.questionnaire:0
diff --git a/addons/crm_profiling/i18n/tlh.po b/addons/crm_profiling/i18n/tlh.po
index d573b5d8e99..f760ef811a5 100644
--- a/addons/crm_profiling/i18n/tlh.po
+++ b/addons/crm_profiling/i18n/tlh.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:53+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:25+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: crm_profiling
 #: view:crm_profiling.questionnaire:0
diff --git a/addons/crm_profiling/i18n/tr.po b/addons/crm_profiling/i18n/tr.po
index e1faa9a2bb7..c444be9daa8 100644
--- a/addons/crm_profiling/i18n/tr.po
+++ b/addons/crm_profiling/i18n/tr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:53+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:25+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: crm_profiling
 #: view:crm_profiling.questionnaire:0
diff --git a/addons/crm_profiling/i18n/uk.po b/addons/crm_profiling/i18n/uk.po
index 405f0c0921d..f97f5524327 100644
--- a/addons/crm_profiling/i18n/uk.po
+++ b/addons/crm_profiling/i18n/uk.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:53+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:25+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: crm_profiling
 #: view:crm_profiling.questionnaire:0
diff --git a/addons/crm_profiling/i18n/vi.po b/addons/crm_profiling/i18n/vi.po
index 318a0411c11..d79cbd1e526 100644
--- a/addons/crm_profiling/i18n/vi.po
+++ b/addons/crm_profiling/i18n/vi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:53+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:25+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: crm_profiling
 #: view:crm_profiling.questionnaire:0
diff --git a/addons/crm_profiling/i18n/zh_CN.po b/addons/crm_profiling/i18n/zh_CN.po
index 95834983223..79527a5f895 100644
--- a/addons/crm_profiling/i18n/zh_CN.po
+++ b/addons/crm_profiling/i18n/zh_CN.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:53+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:25+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: crm_profiling
 #: view:crm_profiling.questionnaire:0
diff --git a/addons/crm_profiling/i18n/zh_TW.po b/addons/crm_profiling/i18n/zh_TW.po
index 8b2e24dab05..51632d83b0b 100644
--- a/addons/crm_profiling/i18n/zh_TW.po
+++ b/addons/crm_profiling/i18n/zh_TW.po
@@ -7,19 +7,19 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-05-10 18:26+0000\n"
-"Last-Translator: Walter Cheuk <wwycheuk@gmail.com>\n"
+"PO-Revision-Date: 2012-08-29 08:56+0000\n"
+"Last-Translator: Bonnie Duan <bonnie.duan@cenoq.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:53+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-30 05:12+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: crm_profiling
 #: view:crm_profiling.questionnaire:0
 msgid "Questions List"
-msgstr "問題表"
+msgstr "問題列表"
 
 #. module: crm_profiling
 #: model:ir.actions.act_window,help:crm_profiling.open_questionnaires
@@ -28,7 +28,7 @@ msgid ""
 "in the sales cycle by helping them to ask the right questions. The "
 "segmentation tool allows you to automatically assign a partner to a category "
 "according to his answers to the different questionnaires."
-msgstr ""
+msgstr "你能建立特定主題的問卷調查去指導你的團隊在銷售週期向客戶詢問合適的問題。這細分工具能根據不同問題的答案自動劃分業務夥伴到不同的類型。"
 
 #. module: crm_profiling
 #: field:crm_profiling.answer,question_id:0
@@ -47,12 +47,12 @@ msgstr "開啟問卷"
 #. module: crm_profiling
 #: field:crm.segmentation,child_ids:0
 msgid "Child Profiles"
-msgstr ""
+msgstr "子客戶特徵"
 
 #. module: crm_profiling
 #: view:crm.segmentation:0
 msgid "Partner Segmentations"
-msgstr "伙伴分割"
+msgstr "業務夥伴分類"
 
 #. module: crm_profiling
 #: field:crm_profiling.answer,name:0
@@ -64,17 +64,17 @@ msgstr "答案"
 #. module: crm_profiling
 #: model:ir.model,name:crm_profiling.model_open_questionnaire_line
 msgid "open.questionnaire.line"
-msgstr ""
+msgstr "open.questionnaire.line"
 
 #. module: crm_profiling
 #: model:ir.model,name:crm_profiling.model_crm_segmentation
 msgid "Partner Segmentation"
-msgstr "伙伴區間"
+msgstr "業務夥伴分類"
 
 #. module: crm_profiling
 #: view:res.partner:0
 msgid "Profiling"
-msgstr ""
+msgstr "紀錄運行效能(Profiling)"
 
 #. module: crm_profiling
 #: view:crm_profiling.questionnaire:0
@@ -97,7 +97,7 @@ msgstr "答案"
 #. module: crm_profiling
 #: model:ir.model,name:crm_profiling.model_open_questionnaire
 msgid "open.questionnaire"
-msgstr ""
+msgstr "open.questionnaire"
 
 #. module: crm_profiling
 #: field:open.questionnaire,questionnaire_id:0
@@ -112,12 +112,12 @@ msgstr "使用問卷"
 #. module: crm_profiling
 #: view:open.questionnaire:0
 msgid "_Cancel"
-msgstr ""
+msgstr "取消（_C）"
 
 #. module: crm_profiling
 #: field:open.questionnaire,question_ans_ids:0
 msgid "Question / Answers"
-msgstr ""
+msgstr "問/答"
 
 #. module: crm_profiling
 #: view:crm_profiling.questionnaire:0
@@ -133,22 +133,22 @@ msgid ""
 "Check                             this box if you want to use this tab as "
 "part of the                              segmentation rule. If not checked, "
 "the criteria beneath will be ignored"
-msgstr ""
+msgstr "勾選這選項，如果你想使用這標籤作為細分規則的一部分。如果勾選，這規則將被忽略"
 
 #. module: crm_profiling
 #: constraint:crm.segmentation:0
 msgid "Error ! You can not create recursive profiles."
-msgstr ""
+msgstr "錯誤! 你不能建立相關的簡介。"
 
 #. module: crm_profiling
 #: field:crm.segmentation,profiling_active:0
 msgid "Use The Profiling Rules"
-msgstr ""
+msgstr "使用這客戶特徵的規則"
 
 #. module: crm_profiling
 #: constraint:res.partner:0
 msgid "Error ! You cannot create recursive associated members."
-msgstr ""
+msgstr "錯誤! 您不能建立相關的會員用戶"
 
 #. module: crm_profiling
 #: view:crm_profiling.question:0
@@ -172,7 +172,7 @@ msgstr "問題"
 #. module: crm_profiling
 #: field:crm.segmentation,parent_id:0
 msgid "Parent Profile"
-msgstr ""
+msgstr "上級客戶簡介"
 
 #. module: crm_profiling
 #: view:open.questionnaire:0
diff --git a/addons/crm_todo/__openerp__.py b/addons/crm_todo/__openerp__.py
index 824dac13c21..255f7dce1c3 100644
--- a/addons/crm_todo/__openerp__.py
+++ b/addons/crm_todo/__openerp__.py
@@ -23,18 +23,15 @@
 {
     'name': 'Tasks on CRM',
     'version': '1.0',
-    "category": 'Customer Relationship Management',
+    'category': 'Customer Relationship Management',
     'description': """
 Todo list for CRM leads and opportunities.
+==========================================
     """,
     'author': 'OpenERP SA',
     'depends': ['crm','project_gtd'],
-    'update_xml': [
-        'crm_todo_view.xml',
-    ],
-    'demo': [
-        'crm_todo_demo.xml',
-    ],
+    'data': ['crm_todo_view.xml'],
+    'demo': ['crm_todo_demo.xml'],
     'installable': True,
     'auto_install': False,
 }
diff --git a/addons/crm_todo/i18n/ar.po b/addons/crm_todo/i18n/ar.po
index a1228c2f027..23706dc83e5 100644
--- a/addons/crm_todo/i18n/ar.po
+++ b/addons/crm_todo/i18n/ar.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:39+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:43+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: crm_todo
 #: model:ir.model,name:crm_todo.model_project_task
diff --git a/addons/crm_todo/i18n/de.po b/addons/crm_todo/i18n/de.po
index 6b8fbe1f16f..d769e5f4ea2 100644
--- a/addons/crm_todo/i18n/de.po
+++ b/addons/crm_todo/i18n/de.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:39+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:43+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: crm_todo
 #: model:ir.model,name:crm_todo.model_project_task
diff --git a/addons/crm_todo/i18n/en_GB.po b/addons/crm_todo/i18n/en_GB.po
index e8f5ca46b1f..341768a7ee1 100644
--- a/addons/crm_todo/i18n/en_GB.po
+++ b/addons/crm_todo/i18n/en_GB.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:39+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:43+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: crm_todo
 #: model:ir.model,name:crm_todo.model_project_task
diff --git a/addons/crm_todo/i18n/es_CR.po b/addons/crm_todo/i18n/es_CR.po
index a6293c64cde..223d597f63b 100644
--- a/addons/crm_todo/i18n/es_CR.po
+++ b/addons/crm_todo/i18n/es_CR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:39+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:43+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: crm_todo
 #: model:ir.model,name:crm_todo.model_project_task
diff --git a/addons/crm_todo/i18n/fi.po b/addons/crm_todo/i18n/fi.po
index 481421e8d29..16cc1352fa2 100644
--- a/addons/crm_todo/i18n/fi.po
+++ b/addons/crm_todo/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:39+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:43+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: crm_todo
 #: model:ir.model,name:crm_todo.model_project_task
diff --git a/addons/crm_todo/i18n/fr.po b/addons/crm_todo/i18n/fr.po
index 5436af50b3a..2c0078564ed 100644
--- a/addons/crm_todo/i18n/fr.po
+++ b/addons/crm_todo/i18n/fr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:39+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:43+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: crm_todo
 #: model:ir.model,name:crm_todo.model_project_task
diff --git a/addons/crm_todo/i18n/gu.po b/addons/crm_todo/i18n/gu.po
index 16a415cfde6..5a5168e85fe 100644
--- a/addons/crm_todo/i18n/gu.po
+++ b/addons/crm_todo/i18n/gu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:39+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:43+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: crm_todo
 #: model:ir.model,name:crm_todo.model_project_task
diff --git a/addons/crm_todo/i18n/it.po b/addons/crm_todo/i18n/it.po
index 012a769a70a..5f9f92f1eb8 100644
--- a/addons/crm_todo/i18n/it.po
+++ b/addons/crm_todo/i18n/it.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:39+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:43+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: crm_todo
 #: model:ir.model,name:crm_todo.model_project_task
diff --git a/addons/crm_todo/i18n/ja.po b/addons/crm_todo/i18n/ja.po
index 49855e7d195..195a1f30cff 100644
--- a/addons/crm_todo/i18n/ja.po
+++ b/addons/crm_todo/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:39+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:43+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: crm_todo
 #: model:ir.model,name:crm_todo.model_project_task
diff --git a/addons/crm_todo/i18n/lt.po b/addons/crm_todo/i18n/lt.po
index 92a1a6b1426..902b95da3af 100644
--- a/addons/crm_todo/i18n/lt.po
+++ b/addons/crm_todo/i18n/lt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:39+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:43+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: crm_todo
 #: model:ir.model,name:crm_todo.model_project_task
diff --git a/addons/crm_todo/i18n/mn.po b/addons/crm_todo/i18n/mn.po
index 1b3b6ed69ee..45eb8c2817c 100644
--- a/addons/crm_todo/i18n/mn.po
+++ b/addons/crm_todo/i18n/mn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:39+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:43+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: crm_todo
 #: model:ir.model,name:crm_todo.model_project_task
diff --git a/addons/crm_todo/i18n/nb.po b/addons/crm_todo/i18n/nb.po
new file mode 100644
index 00000000000..44a49165e40
--- /dev/null
+++ b/addons/crm_todo/i18n/nb.po
@@ -0,0 +1,95 @@
+# Norwegian Bokmal 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-02-08 00:36+0000\n"
+"PO-Revision-Date: 2012-09-04 14:07+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Norwegian Bokmal <nb@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-09-05 04:46+0000\n"
+"X-Generator: Launchpad (build 15901)\n"
+
+#. module: crm_todo
+#: model:ir.model,name:crm_todo.model_project_task
+msgid "Task"
+msgstr "Oppgave"
+
+#. module: crm_todo
+#: view:crm.lead:0
+msgid "Timebox"
+msgstr "Timeboks"
+
+#. module: crm_todo
+#: view:crm.lead:0
+msgid "For cancelling the task"
+msgstr "For å avbryte oppgaven"
+
+#. module: crm_todo
+#: constraint:project.task:0
+msgid "Error ! Task end-date must be greater then task start-date"
+msgstr "Feil! Oppgave sluttdato må være større enn oppgave startdato"
+
+#. module: crm_todo
+#: model:ir.model,name:crm_todo.model_crm_lead
+msgid "crm.lead"
+msgstr "crm.lead"
+
+#. module: crm_todo
+#: view:crm.lead:0
+msgid "Next"
+msgstr "Neste"
+
+#. 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 "Mine oppgaver"
+
+#. module: crm_todo
+#: view:crm.lead:0
+#: field:crm.lead,task_ids:0
+msgid "Tasks"
+msgstr "Oppgaver"
+
+#. module: crm_todo
+#: view:crm.lead:0
+msgid "Done"
+msgstr "Utført"
+
+#. module: crm_todo
+#: constraint:project.task:0
+msgid "Error ! You cannot create recursive tasks."
+msgstr "Feil! Du kan ikke lage en rekursive oppgaver."
+
+#. module: crm_todo
+#: view:crm.lead:0
+msgid "Cancel"
+msgstr "Kanseller"
+
+#. module: crm_todo
+#: view:crm.lead:0
+msgid "Extra Info"
+msgstr "Ekstra informasjon"
+
+#. module: crm_todo
+#: field:project.task,lead_id:0
+msgid "Lead / Opportunity"
+msgstr "Lede / mulighet"
+
+#. module: crm_todo
+#: view:crm.lead:0
+msgid "For changing to done state"
+msgstr "For å bytte til ferdig tilstand"
+
+#. module: crm_todo
+#: view:crm.lead:0
+msgid "Previous"
+msgstr "Tidligere"
diff --git a/addons/crm_todo/i18n/nl.po b/addons/crm_todo/i18n/nl.po
index f0f357bddeb..431242d80c4 100644
--- a/addons/crm_todo/i18n/nl.po
+++ b/addons/crm_todo/i18n/nl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:39+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:43+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: crm_todo
 #: model:ir.model,name:crm_todo.model_project_task
diff --git a/addons/crm_todo/i18n/pl.po b/addons/crm_todo/i18n/pl.po
index 36ae9707f34..39dd964a49f 100644
--- a/addons/crm_todo/i18n/pl.po
+++ b/addons/crm_todo/i18n/pl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:39+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:43+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: crm_todo
 #: model:ir.model,name:crm_todo.model_project_task
diff --git a/addons/crm_todo/i18n/pt.po b/addons/crm_todo/i18n/pt.po
index d4170a80627..261952c4f0f 100644
--- a/addons/crm_todo/i18n/pt.po
+++ b/addons/crm_todo/i18n/pt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:39+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:43+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: crm_todo
 #: model:ir.model,name:crm_todo.model_project_task
diff --git a/addons/crm_todo/i18n/pt_BR.po b/addons/crm_todo/i18n/pt_BR.po
index 5c8e5657723..672b10de908 100644
--- a/addons/crm_todo/i18n/pt_BR.po
+++ b/addons/crm_todo/i18n/pt_BR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:39+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:43+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: crm_todo
 #: model:ir.model,name:crm_todo.model_project_task
diff --git a/addons/crm_todo/i18n/ro.po b/addons/crm_todo/i18n/ro.po
index c0ebdc71182..61abfa26e23 100644
--- a/addons/crm_todo/i18n/ro.po
+++ b/addons/crm_todo/i18n/ro.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:39+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:43+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: crm_todo
 #: model:ir.model,name:crm_todo.model_project_task
diff --git a/addons/crm_todo/i18n/sr@latin.po b/addons/crm_todo/i18n/sr@latin.po
index 05161713988..19324c5e370 100644
--- a/addons/crm_todo/i18n/sr@latin.po
+++ b/addons/crm_todo/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:39+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:43+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: crm_todo
 #: model:ir.model,name:crm_todo.model_project_task
diff --git a/addons/crm_todo/i18n/sv.po b/addons/crm_todo/i18n/sv.po
index 56b6c302452..9f3c43c5899 100644
--- a/addons/crm_todo/i18n/sv.po
+++ b/addons/crm_todo/i18n/sv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:39+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:43+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: crm_todo
 #: model:ir.model,name:crm_todo.model_project_task
diff --git a/addons/crm_todo/i18n/tr.po b/addons/crm_todo/i18n/tr.po
index 26fecb4b419..e4b16d0ba67 100644
--- a/addons/crm_todo/i18n/tr.po
+++ b/addons/crm_todo/i18n/tr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:39+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:43+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: crm_todo
 #: model:ir.model,name:crm_todo.model_project_task
diff --git a/addons/crm_todo/i18n/zh_CN.po b/addons/crm_todo/i18n/zh_CN.po
index 9c6a8bd09bd..f09fb1c65be 100644
--- a/addons/crm_todo/i18n/zh_CN.po
+++ b/addons/crm_todo/i18n/zh_CN.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:39+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:43+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: crm_todo
 #: model:ir.model,name:crm_todo.model_project_task
diff --git a/addons/crm_todo/i18n/zh_TW.po b/addons/crm_todo/i18n/zh_TW.po
new file mode 100644
index 00000000000..e092528ac19
--- /dev/null
+++ b/addons/crm_todo/i18n/zh_TW.po
@@ -0,0 +1,95 @@
+# Chinese (Traditional) 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-02-08 00:36+0000\n"
+"PO-Revision-Date: 2012-08-29 09:15+0000\n"
+"Last-Translator: Bonnie Duan <bonnie.duan@cenoq.com>\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: 2012-08-30 05:12+0000\n"
+"X-Generator: Launchpad (build 15864)\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 "For cancelling the task"
+msgstr "取消任務"
+
+#. module: crm_todo
+#: constraint:project.task:0
+msgid "Error ! Task end-date must be greater then task start-date"
+msgstr "錯誤！任務結束日期必須大於任務開始日期"
+
+#. module: crm_todo
+#: model:ir.model,name:crm_todo.model_crm_lead
+msgid "crm.lead"
+msgstr "crm.lead"
+
+#. 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
+#: constraint:project.task:0
+msgid "Error ! You cannot create recursive tasks."
+msgstr "錯誤！不能創建循環引用的任務"
+
+#. module: crm_todo
+#: view:crm.lead:0
+msgid "Cancel"
+msgstr "刪除"
+
+#. module: crm_todo
+#: view:crm.lead:0
+msgid "Extra Info"
+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/__openerp__.py b/addons/decimal_precision/__openerp__.py
index 9da1f2161a1..107fb49a1c5 100644
--- a/addons/decimal_precision/__openerp__.py
+++ b/addons/decimal_precision/__openerp__.py
@@ -20,25 +20,24 @@
 ##############################################################################
 
 {
-    "name": "Decimal Precision Configuration",
-    "description": """
+    'name': 'Decimal Precision Configuration',
+    'description': """
 Configure the price accuracy you need for different kinds of usage: accounting, sales, purchases.
 =================================================================================================
 
 The decimal precision is configured per company.
 """,
-    "author": "OpenERP SA",
-    "version": "0.1",
-    "depends": ["base"],
-    "category" : "Hidden/Dependency",
-    "init_xml": [],
-    "update_xml": [
+    'author': 'OpenERP SA',
+    'version': '0.1',
+    'depends': ['base'],
+    'category' : 'Hidden/Dependency',
+    'data': [
         'decimal_precision_view.xml',
         'security/ir.model.access.csv',
     ],
-    "demo_xml": [],
-    "installable": True,
-    "certificate" : "001307317809612974621",
+    'demo': [],
+    'installable': True,
+    'certificate' : '001307317809612974621',
     'images': ['images/1_decimal_accuracy_form.jpeg','images/1_decimal_accuracy_list.jpeg'],
 }
 
diff --git a/addons/decimal_precision/decimal_precision.py b/addons/decimal_precision/decimal_precision.py
index d9f6aa7b8db..93d69eb3093 100644
--- a/addons/decimal_precision/decimal_precision.py
+++ b/addons/decimal_precision/decimal_precision.py
@@ -22,6 +22,7 @@
 from osv import osv, fields
 import tools
 import pooler
+from openerp import SUPERUSER_ID
 
 class decimal_precision(osv.osv):
     _name = 'decimal.precision'
@@ -56,7 +57,7 @@ decimal_precision()
 
 def get_precision(application):
     def change_digit(cr):
-        res = pooler.get_pool(cr.dbname).get('decimal.precision').precision_get(cr, 1, application)
+        res = pooler.get_pool(cr.dbname).get('decimal.precision').precision_get(cr, SUPERUSER_ID, application)
         return (16, res)
     return change_digit
 
diff --git a/addons/decimal_precision/i18n/ar.po b/addons/decimal_precision/i18n/ar.po
index ffe43df093e..6e4699b1816 100644
--- a/addons/decimal_precision/i18n/ar.po
+++ b/addons/decimal_precision/i18n/ar.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: decimal_precision
 #: field:decimal.precision,digits:0
diff --git a/addons/decimal_precision/i18n/bg.po b/addons/decimal_precision/i18n/bg.po
index 904f8b23333..6cd6229333b 100644
--- a/addons/decimal_precision/i18n/bg.po
+++ b/addons/decimal_precision/i18n/bg.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: decimal_precision
 #: field:decimal.precision,digits:0
diff --git a/addons/decimal_precision/i18n/ca.po b/addons/decimal_precision/i18n/ca.po
index b14c761b381..9fc3c0ecd31 100644
--- a/addons/decimal_precision/i18n/ca.po
+++ b/addons/decimal_precision/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: decimal_precision
 #: field:decimal.precision,digits:0
diff --git a/addons/decimal_precision/i18n/cs.po b/addons/decimal_precision/i18n/cs.po
index c64062971eb..1aa63038560 100644
--- a/addons/decimal_precision/i18n/cs.po
+++ b/addons/decimal_precision/i18n/cs.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: decimal_precision
 #: field:decimal.precision,digits:0
diff --git a/addons/decimal_precision/i18n/da.po b/addons/decimal_precision/i18n/da.po
index 5fc3e0e6878..4280e173506 100644
--- a/addons/decimal_precision/i18n/da.po
+++ b/addons/decimal_precision/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: decimal_precision
 #: field:decimal.precision,digits:0
diff --git a/addons/decimal_precision/i18n/de.po b/addons/decimal_precision/i18n/de.po
index 08311b1b80f..956106ad94d 100644
--- a/addons/decimal_precision/i18n/de.po
+++ b/addons/decimal_precision/i18n/de.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: decimal_precision
 #: field:decimal.precision,digits:0
diff --git a/addons/decimal_precision/i18n/el.po b/addons/decimal_precision/i18n/el.po
index bfb6152a204..48d33afc39e 100644
--- a/addons/decimal_precision/i18n/el.po
+++ b/addons/decimal_precision/i18n/el.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: decimal_precision
 #: field:decimal.precision,digits:0
diff --git a/addons/decimal_precision/i18n/en_GB.po b/addons/decimal_precision/i18n/en_GB.po
index d40d28963b2..51bdd155022 100644
--- a/addons/decimal_precision/i18n/en_GB.po
+++ b/addons/decimal_precision/i18n/en_GB.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: decimal_precision
 #: field:decimal.precision,digits:0
diff --git a/addons/decimal_precision/i18n/es.po b/addons/decimal_precision/i18n/es.po
index 1dc55b8a52d..8a474f33a02 100644
--- a/addons/decimal_precision/i18n/es.po
+++ b/addons/decimal_precision/i18n/es.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: decimal_precision
 #: field:decimal.precision,digits:0
diff --git a/addons/decimal_precision/i18n/es_CR.po b/addons/decimal_precision/i18n/es_CR.po
index 027718ff620..eedbe9711ad 100644
--- a/addons/decimal_precision/i18n/es_CR.po
+++ b/addons/decimal_precision/i18n/es_CR.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 "Language: es\n"
 
 #. module: decimal_precision
diff --git a/addons/decimal_precision/i18n/es_EC.po b/addons/decimal_precision/i18n/es_EC.po
index fced7f1ba60..50404788aeb 100644
--- a/addons/decimal_precision/i18n/es_EC.po
+++ b/addons/decimal_precision/i18n/es_EC.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: decimal_precision
 #: field:decimal.precision,digits:0
diff --git a/addons/decimal_precision/i18n/es_PY.po b/addons/decimal_precision/i18n/es_PY.po
index 8bcb235c12b..283e63a663e 100644
--- a/addons/decimal_precision/i18n/es_PY.po
+++ b/addons/decimal_precision/i18n/es_PY.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: decimal_precision
 #: field:decimal.precision,digits:0
diff --git a/addons/decimal_precision/i18n/fi.po b/addons/decimal_precision/i18n/fi.po
index f8ab99795ac..0bf930d632d 100644
--- a/addons/decimal_precision/i18n/fi.po
+++ b/addons/decimal_precision/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: decimal_precision
 #: field:decimal.precision,digits:0
diff --git a/addons/decimal_precision/i18n/fr.po b/addons/decimal_precision/i18n/fr.po
index 43f8a35e092..09e83c09be2 100644
--- a/addons/decimal_precision/i18n/fr.po
+++ b/addons/decimal_precision/i18n/fr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: decimal_precision
 #: field:decimal.precision,digits:0
diff --git a/addons/decimal_precision/i18n/gl.po b/addons/decimal_precision/i18n/gl.po
index 92cb7d78679..9909421cf8a 100644
--- a/addons/decimal_precision/i18n/gl.po
+++ b/addons/decimal_precision/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: decimal_precision
 #: field:decimal.precision,digits:0
diff --git a/addons/decimal_precision/i18n/gu.po b/addons/decimal_precision/i18n/gu.po
index bbf99985ea3..1d27e9eef78 100644
--- a/addons/decimal_precision/i18n/gu.po
+++ b/addons/decimal_precision/i18n/gu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: decimal_precision
 #: field:decimal.precision,digits:0
diff --git a/addons/decimal_precision/i18n/hr.po b/addons/decimal_precision/i18n/hr.po
index 6ea24610963..0f36a78fd48 100644
--- a/addons/decimal_precision/i18n/hr.po
+++ b/addons/decimal_precision/i18n/hr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: decimal_precision
 #: field:decimal.precision,digits:0
diff --git a/addons/decimal_precision/i18n/hu.po b/addons/decimal_precision/i18n/hu.po
index acf788fe025..93df71b6645 100644
--- a/addons/decimal_precision/i18n/hu.po
+++ b/addons/decimal_precision/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: decimal_precision
 #: field:decimal.precision,digits:0
diff --git a/addons/decimal_precision/i18n/id.po b/addons/decimal_precision/i18n/id.po
index 3efe692b376..e765b42e2a7 100644
--- a/addons/decimal_precision/i18n/id.po
+++ b/addons/decimal_precision/i18n/id.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: decimal_precision
 #: field:decimal.precision,digits:0
diff --git a/addons/decimal_precision/i18n/it.po b/addons/decimal_precision/i18n/it.po
index 698e1dab386..d178929919b 100644
--- a/addons/decimal_precision/i18n/it.po
+++ b/addons/decimal_precision/i18n/it.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: decimal_precision
 #: field:decimal.precision,digits:0
diff --git a/addons/decimal_precision/i18n/ja.po b/addons/decimal_precision/i18n/ja.po
index c306c8658c5..dbc661db549 100644
--- a/addons/decimal_precision/i18n/ja.po
+++ b/addons/decimal_precision/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: decimal_precision
 #: field:decimal.precision,digits:0
diff --git a/addons/decimal_precision/i18n/lt.po b/addons/decimal_precision/i18n/lt.po
index 5ef2ce51d5e..0cf792e40e0 100644
--- a/addons/decimal_precision/i18n/lt.po
+++ b/addons/decimal_precision/i18n/lt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: decimal_precision
 #: field:decimal.precision,digits:0
diff --git a/addons/decimal_precision/i18n/lv.po b/addons/decimal_precision/i18n/lv.po
index eb00fe3fa16..eb907142d8b 100644
--- a/addons/decimal_precision/i18n/lv.po
+++ b/addons/decimal_precision/i18n/lv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: decimal_precision
 #: field:decimal.precision,digits:0
diff --git a/addons/decimal_precision/i18n/mn.po b/addons/decimal_precision/i18n/mn.po
index 28da228a2da..63145d41e7a 100644
--- a/addons/decimal_precision/i18n/mn.po
+++ b/addons/decimal_precision/i18n/mn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: decimal_precision
 #: field:decimal.precision,digits:0
diff --git a/addons/decimal_precision/i18n/nb.po b/addons/decimal_precision/i18n/nb.po
index ef17a875801..5da2287b7cc 100644
--- a/addons/decimal_precision/i18n/nb.po
+++ b/addons/decimal_precision/i18n/nb.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: decimal_precision
 #: field:decimal.precision,digits:0
diff --git a/addons/decimal_precision/i18n/nl.po b/addons/decimal_precision/i18n/nl.po
index 5dc84b3e73a..88b6e0a94aa 100644
--- a/addons/decimal_precision/i18n/nl.po
+++ b/addons/decimal_precision/i18n/nl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: decimal_precision
 #: field:decimal.precision,digits:0
diff --git a/addons/decimal_precision/i18n/nl_BE.po b/addons/decimal_precision/i18n/nl_BE.po
index e9fc80cced0..37d0f16bf8d 100644
--- a/addons/decimal_precision/i18n/nl_BE.po
+++ b/addons/decimal_precision/i18n/nl_BE.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: decimal_precision
 #: field:decimal.precision,digits:0
diff --git a/addons/decimal_precision/i18n/pt.po b/addons/decimal_precision/i18n/pt.po
index 84478c3d123..00e4059a25f 100644
--- a/addons/decimal_precision/i18n/pt.po
+++ b/addons/decimal_precision/i18n/pt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: decimal_precision
 #: field:decimal.precision,digits:0
diff --git a/addons/decimal_precision/i18n/pt_BR.po b/addons/decimal_precision/i18n/pt_BR.po
index 08ea274ef4c..d5cddc4b085 100644
--- a/addons/decimal_precision/i18n/pt_BR.po
+++ b/addons/decimal_precision/i18n/pt_BR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: decimal_precision
 #: field:decimal.precision,digits:0
diff --git a/addons/decimal_precision/i18n/ro.po b/addons/decimal_precision/i18n/ro.po
index e2f31c4e0ff..a9ff344dc2f 100644
--- a/addons/decimal_precision/i18n/ro.po
+++ b/addons/decimal_precision/i18n/ro.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: decimal_precision
 #: field:decimal.precision,digits:0
diff --git a/addons/decimal_precision/i18n/ru.po b/addons/decimal_precision/i18n/ru.po
index f5c6aa388a9..eb823db5d61 100644
--- a/addons/decimal_precision/i18n/ru.po
+++ b/addons/decimal_precision/i18n/ru.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: decimal_precision
 #: field:decimal.precision,digits:0
diff --git a/addons/decimal_precision/i18n/sk.po b/addons/decimal_precision/i18n/sk.po
index 89f75649ac3..6055c35caca 100644
--- a/addons/decimal_precision/i18n/sk.po
+++ b/addons/decimal_precision/i18n/sk.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: decimal_precision
 #: field:decimal.precision,digits:0
diff --git a/addons/decimal_precision/i18n/sl.po b/addons/decimal_precision/i18n/sl.po
index 2e311bc1d56..b30a4beb0eb 100644
--- a/addons/decimal_precision/i18n/sl.po
+++ b/addons/decimal_precision/i18n/sl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: decimal_precision
 #: field:decimal.precision,digits:0
diff --git a/addons/decimal_precision/i18n/sr.po b/addons/decimal_precision/i18n/sr.po
index 28b590172a1..eb507f3da56 100644
--- a/addons/decimal_precision/i18n/sr.po
+++ b/addons/decimal_precision/i18n/sr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: decimal_precision
 #: field:decimal.precision,digits:0
diff --git a/addons/decimal_precision/i18n/sr@latin.po b/addons/decimal_precision/i18n/sr@latin.po
index 4c787801769..2e83aeaaf11 100644
--- a/addons/decimal_precision/i18n/sr@latin.po
+++ b/addons/decimal_precision/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: decimal_precision
 #: field:decimal.precision,digits:0
diff --git a/addons/decimal_precision/i18n/sv.po b/addons/decimal_precision/i18n/sv.po
index 265adf51edc..f7766588f76 100644
--- a/addons/decimal_precision/i18n/sv.po
+++ b/addons/decimal_precision/i18n/sv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: decimal_precision
 #: field:decimal.precision,digits:0
diff --git a/addons/decimal_precision/i18n/tr.po b/addons/decimal_precision/i18n/tr.po
index 9d2f56379d3..d76d8baed77 100644
--- a/addons/decimal_precision/i18n/tr.po
+++ b/addons/decimal_precision/i18n/tr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: decimal_precision
 #: field:decimal.precision,digits:0
diff --git a/addons/decimal_precision/i18n/vi.po b/addons/decimal_precision/i18n/vi.po
index c81e7b48008..4b2d6a536b1 100644
--- a/addons/decimal_precision/i18n/vi.po
+++ b/addons/decimal_precision/i18n/vi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: decimal_precision
 #: field:decimal.precision,digits:0
diff --git a/addons/decimal_precision/i18n/zh_CN.po b/addons/decimal_precision/i18n/zh_CN.po
index 5b3ecb3c4aa..3326eb0ca51 100644
--- a/addons/decimal_precision/i18n/zh_CN.po
+++ b/addons/decimal_precision/i18n/zh_CN.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: decimal_precision
 #: field:decimal.precision,digits:0
diff --git a/addons/decimal_precision/i18n/zh_TW.po b/addons/decimal_precision/i18n/zh_TW.po
index a1e73c5cbc5..511eb20fafb 100644
--- a/addons/decimal_precision/i18n/zh_TW.po
+++ b/addons/decimal_precision/i18n/zh_TW.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2011-09-27 08:06+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2012-08-29 07:43+0000\n"
+"Last-Translator: Bonnie Duan <bonnie.duan@cenoq.com>\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: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-30 05:12+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: decimal_precision
 #: field:decimal.precision,digits:0
@@ -46,7 +46,7 @@ msgstr "小數精確度"
 #. module: decimal_precision
 #: model:ir.model,name:decimal_precision.model_decimal_precision
 msgid "decimal.precision"
-msgstr ""
+msgstr "decimal.precision"
 
 #~ msgid "Decimal Precision Configuration"
 #~ msgstr "小數精確度設定"
diff --git a/addons/delivery/__openerp__.py b/addons/delivery/__openerp__.py
index 092258f5e91..6a355096e4e 100644
--- a/addons/delivery/__openerp__.py
+++ b/addons/delivery/__openerp__.py
@@ -33,17 +33,15 @@ invoices from picking, OpenERP is able to add and compute the shipping line.
 """,
     'author': 'OpenERP SA',
     'depends': ['sale', 'purchase', 'stock'],
-    'init_xml': ['delivery_data.xml'],
-    'update_xml': [
+    'data': [
         'security/ir.model.access.csv',
         'delivery_report.xml',
         'delivery_view.xml',
-        'partner_view.xml'
-    ],
-    'demo_xml': ['delivery_demo.xml'],
-    'test': [
-        'test/delivery_cost.yml',
+        'partner_view.xml',
+        'delivery_data.xml'
     ],
+    'demo': ['delivery_demo.xml'],
+    'test': ['test/delivery_cost.yml'],
     'installable': True,
     'auto_install': False,
     'certificate': '0033981912253',
diff --git a/addons/delivery/delivery_data.xml b/addons/delivery/delivery_data.xml
index c1d9d99b33a..fec56b329b3 100644
--- a/addons/delivery/delivery_data.xml
+++ b/addons/delivery/delivery_data.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-    <data noupdate="True">
+    <data noupdate="1">
         <record forcecreate="True" id="property_delivery_carrier" model="ir.property">
             <field name="name">property_delivery_carrier</field>
             <field name="fields_id" search="[('model','=','res.partner'),('name','=','property_delivery_carrier')]"/>
diff --git a/addons/delivery/i18n/ar.po b/addons/delivery/i18n/ar.po
index 9ff4e29dcbb..cd94bca8c98 100644
--- a/addons/delivery/i18n/ar.po
+++ b/addons/delivery/i18n/ar.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:53+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:59+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: delivery
 #: report:sale.shipping:0
diff --git a/addons/delivery/i18n/bg.po b/addons/delivery/i18n/bg.po
index 511b0b43353..bdc502cbb4d 100644
--- a/addons/delivery/i18n/bg.po
+++ b/addons/delivery/i18n/bg.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:53+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:00+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: delivery
 #: report:sale.shipping:0
diff --git a/addons/delivery/i18n/bs.po b/addons/delivery/i18n/bs.po
index dea64ae7dff..4c16dca970e 100644
--- a/addons/delivery/i18n/bs.po
+++ b/addons/delivery/i18n/bs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:53+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:00+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: delivery
 #: report:sale.shipping:0
diff --git a/addons/delivery/i18n/ca.po b/addons/delivery/i18n/ca.po
index 99ecde1b1c4..d0ecd640d48 100644
--- a/addons/delivery/i18n/ca.po
+++ b/addons/delivery/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:53+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:00+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: delivery
 #: report:sale.shipping:0
diff --git a/addons/delivery/i18n/cs.po b/addons/delivery/i18n/cs.po
index 8109457bd2d..af60b2630c9 100644
--- a/addons/delivery/i18n/cs.po
+++ b/addons/delivery/i18n/cs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:53+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:00+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 "X-Poedit-Language: Czech\n"
 
 #. module: delivery
diff --git a/addons/delivery/i18n/da.po b/addons/delivery/i18n/da.po
index ec301858065..5c9923b659a 100644
--- a/addons/delivery/i18n/da.po
+++ b/addons/delivery/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:53+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:00+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: delivery
 #: report:sale.shipping:0
diff --git a/addons/delivery/i18n/de.po b/addons/delivery/i18n/de.po
index 2a068d2494f..560cfa3cdeb 100644
--- a/addons/delivery/i18n/de.po
+++ b/addons/delivery/i18n/de.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:53+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:00+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: delivery
 #: report:sale.shipping:0
diff --git a/addons/delivery/i18n/el.po b/addons/delivery/i18n/el.po
index 1da5e618ec3..5e1312003c8 100644
--- a/addons/delivery/i18n/el.po
+++ b/addons/delivery/i18n/el.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:53+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:00+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: delivery
 #: report:sale.shipping:0
diff --git a/addons/delivery/i18n/es.po b/addons/delivery/i18n/es.po
index f44dbfd8e83..5809e3ad40f 100644
--- a/addons/delivery/i18n/es.po
+++ b/addons/delivery/i18n/es.po
@@ -8,13 +8,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 00:36+0000\n"
 "PO-Revision-Date: 2011-01-13 14:31+0000\n"
-"Last-Translator: Carlos @ smile-iberia <Unknown>\n"
+"Last-Translator: Carlos Ch. <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: 2012-08-07 04:53+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:00+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: delivery
 #: report:sale.shipping:0
diff --git a/addons/delivery/i18n/es_AR.po b/addons/delivery/i18n/es_AR.po
index a34cf1d70d6..96b950c88d3 100644
--- a/addons/delivery/i18n/es_AR.po
+++ b/addons/delivery/i18n/es_AR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:53+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:00+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: delivery
 #: report:sale.shipping:0
diff --git a/addons/delivery/i18n/es_CR.po b/addons/delivery/i18n/es_CR.po
index 8a6cff102da..da99c6963df 100644
--- a/addons/delivery/i18n/es_CR.po
+++ b/addons/delivery/i18n/es_CR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:53+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:00+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 "Language: \n"
 
 #. module: delivery
diff --git a/addons/delivery/i18n/es_EC.po b/addons/delivery/i18n/es_EC.po
index e7f21252e44..b52a1a03548 100644
--- a/addons/delivery/i18n/es_EC.po
+++ b/addons/delivery/i18n/es_EC.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:53+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:00+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: delivery
 #: report:sale.shipping:0
diff --git a/addons/delivery/i18n/es_PY.po b/addons/delivery/i18n/es_PY.po
index 54175e93a72..81dcb324fd7 100644
--- a/addons/delivery/i18n/es_PY.po
+++ b/addons/delivery/i18n/es_PY.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:53+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:00+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: delivery
 #: report:sale.shipping:0
diff --git a/addons/delivery/i18n/et.po b/addons/delivery/i18n/et.po
index ea1fe8b4a96..4741a8df5a4 100644
--- a/addons/delivery/i18n/et.po
+++ b/addons/delivery/i18n/et.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:53+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:00+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: delivery
 #: report:sale.shipping:0
diff --git a/addons/delivery/i18n/fi.po b/addons/delivery/i18n/fi.po
index 5e63e4716a0..c8bda2f24cf 100644
--- a/addons/delivery/i18n/fi.po
+++ b/addons/delivery/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:53+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:00+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: delivery
 #: report:sale.shipping:0
diff --git a/addons/delivery/i18n/fr.po b/addons/delivery/i18n/fr.po
index 1b420912e2e..b6dcb1f552b 100644
--- a/addons/delivery/i18n/fr.po
+++ b/addons/delivery/i18n/fr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:53+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:00+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "XML non valide pour l'architecture de la vue !"
diff --git a/addons/delivery/i18n/gl.po b/addons/delivery/i18n/gl.po
index 0502295e759..edd2bcba1de 100644
--- a/addons/delivery/i18n/gl.po
+++ b/addons/delivery/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:53+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:00+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: delivery
 #: report:sale.shipping:0
diff --git a/addons/delivery/i18n/hi.po b/addons/delivery/i18n/hi.po
index c4a0805c1c0..8bde315261a 100644
--- a/addons/delivery/i18n/hi.po
+++ b/addons/delivery/i18n/hi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:53+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:00+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: delivery
 #: report:sale.shipping:0
diff --git a/addons/delivery/i18n/hr.po b/addons/delivery/i18n/hr.po
index 6a77dce3999..09b67dc0f64 100644
--- a/addons/delivery/i18n/hr.po
+++ b/addons/delivery/i18n/hr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:53+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:00+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 "Language: hr\n"
 
 #. module: delivery
diff --git a/addons/delivery/i18n/hu.po b/addons/delivery/i18n/hu.po
index 253036b17d8..4b959563a7a 100644
--- a/addons/delivery/i18n/hu.po
+++ b/addons/delivery/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:53+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:00+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: delivery
 #: report:sale.shipping:0
diff --git a/addons/delivery/i18n/id.po b/addons/delivery/i18n/id.po
index f70c211f57d..04c9a8fc546 100644
--- a/addons/delivery/i18n/id.po
+++ b/addons/delivery/i18n/id.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:53+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:00+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: delivery
 #: report:sale.shipping:0
diff --git a/addons/delivery/i18n/it.po b/addons/delivery/i18n/it.po
index dc254d1581f..8be95a1c5cb 100644
--- a/addons/delivery/i18n/it.po
+++ b/addons/delivery/i18n/it.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:53+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:00+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: delivery
 #: report:sale.shipping:0
diff --git a/addons/delivery/i18n/ja.po b/addons/delivery/i18n/ja.po
index c00c2cdb51f..cfef0a94580 100644
--- a/addons/delivery/i18n/ja.po
+++ b/addons/delivery/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:53+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:00+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: delivery
 #: report:sale.shipping:0
diff --git a/addons/delivery/i18n/ko.po b/addons/delivery/i18n/ko.po
index 115fde6a36e..3c31903ce9b 100644
--- a/addons/delivery/i18n/ko.po
+++ b/addons/delivery/i18n/ko.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:53+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:00+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: delivery
 #: report:sale.shipping:0
diff --git a/addons/delivery/i18n/lt.po b/addons/delivery/i18n/lt.po
index fae87218ceb..cadb88c452e 100644
--- a/addons/delivery/i18n/lt.po
+++ b/addons/delivery/i18n/lt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:53+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:00+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: delivery
 #: report:sale.shipping:0
diff --git a/addons/delivery/i18n/lv.po b/addons/delivery/i18n/lv.po
index 6419cca483b..d89d40f8afc 100644
--- a/addons/delivery/i18n/lv.po
+++ b/addons/delivery/i18n/lv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:53+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:00+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: delivery
 #: report:sale.shipping:0
diff --git a/addons/delivery/i18n/mn.po b/addons/delivery/i18n/mn.po
index 7665b33fe96..0d0312cedd3 100644
--- a/addons/delivery/i18n/mn.po
+++ b/addons/delivery/i18n/mn.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:53+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:00+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: delivery
 #: report:sale.shipping:0
diff --git a/addons/delivery/i18n/nb.po b/addons/delivery/i18n/nb.po
index 8d0dc49852e..c19eb4992ad 100644
--- a/addons/delivery/i18n/nb.po
+++ b/addons/delivery/i18n/nb.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:53+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:00+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: delivery
 #: report:sale.shipping:0
diff --git a/addons/delivery/i18n/nl.po b/addons/delivery/i18n/nl.po
index 56eb7804dec..9d0666ac0eb 100644
--- a/addons/delivery/i18n/nl.po
+++ b/addons/delivery/i18n/nl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:53+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:00+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: delivery
 #: report:sale.shipping:0
diff --git a/addons/delivery/i18n/nl_BE.po b/addons/delivery/i18n/nl_BE.po
index 5b90799e8fd..bae6c25bdf1 100644
--- a/addons/delivery/i18n/nl_BE.po
+++ b/addons/delivery/i18n/nl_BE.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:53+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:00+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: delivery
 #: report:sale.shipping:0
diff --git a/addons/delivery/i18n/pl.po b/addons/delivery/i18n/pl.po
index 776071ea16a..f2d56a4a2bb 100644
--- a/addons/delivery/i18n/pl.po
+++ b/addons/delivery/i18n/pl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:53+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:00+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: delivery
 #: report:sale.shipping:0
diff --git a/addons/delivery/i18n/pt.po b/addons/delivery/i18n/pt.po
index 941565a1fd8..2a5d921325a 100644
--- a/addons/delivery/i18n/pt.po
+++ b/addons/delivery/i18n/pt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:53+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:00+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: delivery
 #: report:sale.shipping:0
diff --git a/addons/delivery/i18n/pt_BR.po b/addons/delivery/i18n/pt_BR.po
index d3bb29c0665..e0cb2fb91d8 100644
--- a/addons/delivery/i18n/pt_BR.po
+++ b/addons/delivery/i18n/pt_BR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:53+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:00+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: delivery
 #: report:sale.shipping:0
diff --git a/addons/delivery/i18n/ro.po b/addons/delivery/i18n/ro.po
index 50784682726..448d531e51f 100644
--- a/addons/delivery/i18n/ro.po
+++ b/addons/delivery/i18n/ro.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:53+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:00+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: delivery
 #: report:sale.shipping:0
diff --git a/addons/delivery/i18n/ru.po b/addons/delivery/i18n/ru.po
index c9039f999c9..89c461ef431 100644
--- a/addons/delivery/i18n/ru.po
+++ b/addons/delivery/i18n/ru.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:53+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:00+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: delivery
 #: report:sale.shipping:0
diff --git a/addons/delivery/i18n/sl.po b/addons/delivery/i18n/sl.po
index 8b88494882e..2cc27557d76 100644
--- a/addons/delivery/i18n/sl.po
+++ b/addons/delivery/i18n/sl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:53+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:00+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: delivery
 #: report:sale.shipping:0
diff --git a/addons/delivery/i18n/sq.po b/addons/delivery/i18n/sq.po
index b48e450e909..33be8869538 100644
--- a/addons/delivery/i18n/sq.po
+++ b/addons/delivery/i18n/sq.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:53+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:59+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: delivery
 #: report:sale.shipping:0
diff --git a/addons/delivery/i18n/sr.po b/addons/delivery/i18n/sr.po
index 36312862e3d..b56f0069954 100644
--- a/addons/delivery/i18n/sr.po
+++ b/addons/delivery/i18n/sr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:53+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:00+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: delivery
 #: report:sale.shipping:0
diff --git a/addons/delivery/i18n/sr@latin.po b/addons/delivery/i18n/sr@latin.po
index 45bd3c38a98..b3a7ebb6fcb 100644
--- a/addons/delivery/i18n/sr@latin.po
+++ b/addons/delivery/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:53+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:00+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: delivery
 #: report:sale.shipping:0
diff --git a/addons/delivery/i18n/sv.po b/addons/delivery/i18n/sv.po
index c7f1a27cffd..ab7a85ad458 100644
--- a/addons/delivery/i18n/sv.po
+++ b/addons/delivery/i18n/sv.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:53+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:00+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: delivery
 #: report:sale.shipping:0
diff --git a/addons/delivery/i18n/th.po b/addons/delivery/i18n/th.po
index b13458a1498..2bd4fa89f24 100644
--- a/addons/delivery/i18n/th.po
+++ b/addons/delivery/i18n/th.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:53+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:00+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: delivery
 #: report:sale.shipping:0
diff --git a/addons/delivery/i18n/tlh.po b/addons/delivery/i18n/tlh.po
index f954d69c1bf..1844e7a4d45 100644
--- a/addons/delivery/i18n/tlh.po
+++ b/addons/delivery/i18n/tlh.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:53+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:00+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: delivery
 #: report:sale.shipping:0
diff --git a/addons/delivery/i18n/tr.po b/addons/delivery/i18n/tr.po
index bf2022ac968..7a2a1b69ad7 100644
--- a/addons/delivery/i18n/tr.po
+++ b/addons/delivery/i18n/tr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:53+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:00+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: delivery
 #: report:sale.shipping:0
diff --git a/addons/delivery/i18n/uk.po b/addons/delivery/i18n/uk.po
index 4b042da3074..40c7f792153 100644
--- a/addons/delivery/i18n/uk.po
+++ b/addons/delivery/i18n/uk.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:53+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:00+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: delivery
 #: report:sale.shipping:0
diff --git a/addons/delivery/i18n/vi.po b/addons/delivery/i18n/vi.po
index e658f646c5e..a618d40633a 100644
--- a/addons/delivery/i18n/vi.po
+++ b/addons/delivery/i18n/vi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:53+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:00+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: delivery
 #: report:sale.shipping:0
diff --git a/addons/delivery/i18n/zh_CN.po b/addons/delivery/i18n/zh_CN.po
index 06bbdecf0b0..fedb9f2e2c4 100644
--- a/addons/delivery/i18n/zh_CN.po
+++ b/addons/delivery/i18n/zh_CN.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:53+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:00+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: delivery
 #: report:sale.shipping:0
diff --git a/addons/delivery/i18n/zh_TW.po b/addons/delivery/i18n/zh_TW.po
index e80d2e9599d..60c0cbe4e46 100644
--- a/addons/delivery/i18n/zh_TW.po
+++ b/addons/delivery/i18n/zh_TW.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:53+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:00+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: delivery
 #: report:sale.shipping:0
diff --git a/addons/document/__openerp__.py b/addons/document/__openerp__.py
index d9ad9a09675..212965a8162 100644
--- a/addons/document/__openerp__.py
+++ b/addons/document/__openerp__.py
@@ -37,6 +37,7 @@ This is a complete document management system.
         * Files Size by Month (graph)
 
 ATTENTION:
+----------
     - When you install this module in a running company that have already PDF 
       files stored into the database, you will lose them all.
     - After installing this module PDF's are no longer stored into the database,
@@ -45,8 +46,7 @@ ATTENTION:
     'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
     'depends': ['process','board', 'knowledge'],
-    'init_xml': [],
-    'update_xml': [
+    'data': [
         'security/document_security.xml',
         'document_view.xml',
         'document_data.xml',
@@ -55,10 +55,8 @@ ATTENTION:
         'report/document_report_view.xml',
         'board_document_view.xml',
     ],
-    'demo_xml': [ 'document_demo.xml','board_document_demo.xml'],
-    'test': [
-        'test/document_test2.yml',
-    ],
+    'demo': [ 'document_demo.xml','board_document_demo.xml'],
+    'test': ['test/document_test2.yml'],
     'installable': True,
     'auto_install': False,
     'certificate': '0070515416461',
diff --git a/addons/document/board_document_view.xml b/addons/document/board_document_view.xml
index a802d788e05..986b054383f 100644
--- a/addons/document/board_document_view.xml
+++ b/addons/document/board_document_view.xml
@@ -8,9 +8,6 @@
                 <form string="Document board" version="7.0">
                      <board style="2-1" >
                         <column>
-                            <action string="New Files"
-                                name="%(document.action_view_all_document_tree1)d"
-                                view_mode="tree,form"/>
                              <action string="Files by Month"
                                 name="%(document.action_view_files_by_month_graph)d"
                                 view_mode="graph,tree"/>
diff --git a/addons/document/i18n/ar.po b/addons/document/i18n/ar.po
index 49a0c9ad646..d2ef2aef2af 100644
--- a/addons/document/i18n/ar.po
+++ b/addons/document/i18n/ar.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:55+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:28+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: document
 #: field:document.directory,parent_id:0
diff --git a/addons/document/i18n/bg.po b/addons/document/i18n/bg.po
index 98952bd2806..eca85f00ad7 100644
--- a/addons/document/i18n/bg.po
+++ b/addons/document/i18n/bg.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:55+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:28+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: document
 #: field:document.directory,parent_id:0
diff --git a/addons/document/i18n/bs.po b/addons/document/i18n/bs.po
index 8e9cf19c19f..4e68d5aa0f0 100644
--- a/addons/document/i18n/bs.po
+++ b/addons/document/i18n/bs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:55+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:28+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: document
 #: field:document.directory,parent_id:0
diff --git a/addons/document/i18n/ca.po b/addons/document/i18n/ca.po
index 075eee4906a..5966795072a 100644
--- a/addons/document/i18n/ca.po
+++ b/addons/document/i18n/ca.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:55+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:28+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: document
 #: field:document.directory,parent_id:0
diff --git a/addons/document/i18n/cs.po b/addons/document/i18n/cs.po
index b64f9d34d34..62dd1dde6b0 100644
--- a/addons/document/i18n/cs.po
+++ b/addons/document/i18n/cs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:55+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:28+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 "X-Poedit-Language: Czech\n"
 
 #. module: document
diff --git a/addons/document/i18n/da.po b/addons/document/i18n/da.po
index 0478e923135..b0aa4b8ab29 100644
--- a/addons/document/i18n/da.po
+++ b/addons/document/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:55+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:28+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: document
 #: field:document.directory,parent_id:0
diff --git a/addons/document/i18n/de.po b/addons/document/i18n/de.po
index 6a22cbc0e83..aae303c2bba 100644
--- a/addons/document/i18n/de.po
+++ b/addons/document/i18n/de.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:55+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:28+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: document
 #: field:document.directory,parent_id:0
diff --git a/addons/document/i18n/el.po b/addons/document/i18n/el.po
index ff70f1473ca..fb4ff67a53d 100644
--- a/addons/document/i18n/el.po
+++ b/addons/document/i18n/el.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:55+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:28+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: document
 #: field:document.directory,parent_id:0
diff --git a/addons/document/i18n/es.po b/addons/document/i18n/es.po
index 7fac82bee79..56d03fb1b94 100644
--- a/addons/document/i18n/es.po
+++ b/addons/document/i18n/es.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:55+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:28+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: document
 #: field:document.directory,parent_id:0
diff --git a/addons/document/i18n/es_AR.po b/addons/document/i18n/es_AR.po
index 4b270f1a20e..fff2544d5be 100644
--- a/addons/document/i18n/es_AR.po
+++ b/addons/document/i18n/es_AR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:55+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:28+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: document
 #: field:document.directory,parent_id:0
diff --git a/addons/document/i18n/es_CR.po b/addons/document/i18n/es_CR.po
index acc6bad0d78..65c17cb402a 100644
--- a/addons/document/i18n/es_CR.po
+++ b/addons/document/i18n/es_CR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:55+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:28+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 "Language: \n"
 
 #. module: document
diff --git a/addons/document/i18n/es_EC.po b/addons/document/i18n/es_EC.po
index 69ed68fec0b..6cf54ff2182 100644
--- a/addons/document/i18n/es_EC.po
+++ b/addons/document/i18n/es_EC.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:55+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:28+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: document
 #: field:document.directory,parent_id:0
diff --git a/addons/document/i18n/es_PY.po b/addons/document/i18n/es_PY.po
index af09dc6bc79..9871351d1c4 100644
--- a/addons/document/i18n/es_PY.po
+++ b/addons/document/i18n/es_PY.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:55+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:28+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: document
 #: field:document.directory,parent_id:0
diff --git a/addons/document/i18n/et.po b/addons/document/i18n/et.po
index 60af115355c..ef4c30f5cf5 100644
--- a/addons/document/i18n/et.po
+++ b/addons/document/i18n/et.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:55+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:28+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: document
 #: field:document.directory,parent_id:0
diff --git a/addons/document/i18n/fi.po b/addons/document/i18n/fi.po
index 432079e9431..26d2bd11b39 100644
--- a/addons/document/i18n/fi.po
+++ b/addons/document/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:55+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:28+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: document
 #: field:document.directory,parent_id:0
diff --git a/addons/document/i18n/fr.po b/addons/document/i18n/fr.po
index 11ba811195a..c4b6d0b4d5f 100644
--- a/addons/document/i18n/fr.po
+++ b/addons/document/i18n/fr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:55+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:28+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: document
 #: field:document.directory,parent_id:0
diff --git a/addons/document/i18n/gl.po b/addons/document/i18n/gl.po
index 4bdcdcf1364..26dadbbfb9d 100644
--- a/addons/document/i18n/gl.po
+++ b/addons/document/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:55+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:28+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: document
 #: field:document.directory,parent_id:0
diff --git a/addons/document/i18n/gu.po b/addons/document/i18n/gu.po
index 81114cbb22c..d96e2dbcdd6 100644
--- a/addons/document/i18n/gu.po
+++ b/addons/document/i18n/gu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:55+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:28+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: document
 #: field:document.directory,parent_id:0
diff --git a/addons/document/i18n/hi.po b/addons/document/i18n/hi.po
index 5d8362dd745..0e5af91b729 100644
--- a/addons/document/i18n/hi.po
+++ b/addons/document/i18n/hi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:55+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:28+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: document
 #: field:document.directory,parent_id:0
diff --git a/addons/document/i18n/hr.po b/addons/document/i18n/hr.po
index 9d0fc7f18f4..1b089c87c5c 100644
--- a/addons/document/i18n/hr.po
+++ b/addons/document/i18n/hr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:55+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:28+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 "Language: hr\n"
 
 #. module: document
diff --git a/addons/document/i18n/hu.po b/addons/document/i18n/hu.po
index 49ac94305d0..fbb576107a3 100644
--- a/addons/document/i18n/hu.po
+++ b/addons/document/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:55+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:28+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: document
 #: field:document.directory,parent_id:0
diff --git a/addons/document/i18n/id.po b/addons/document/i18n/id.po
index a12b7e28ab2..2c562e9ed95 100644
--- a/addons/document/i18n/id.po
+++ b/addons/document/i18n/id.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:55+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:28+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: document
 #: field:document.directory,parent_id:0
diff --git a/addons/document/i18n/it.po b/addons/document/i18n/it.po
index 05b30fd5259..dd97c943c1f 100644
--- a/addons/document/i18n/it.po
+++ b/addons/document/i18n/it.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:55+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:28+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: document
 #: field:document.directory,parent_id:0
diff --git a/addons/document/i18n/ja.po b/addons/document/i18n/ja.po
index e89800eccf1..f2c12bd7209 100644
--- a/addons/document/i18n/ja.po
+++ b/addons/document/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:55+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:28+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: document
 #: field:document.directory,parent_id:0
diff --git a/addons/document/i18n/ko.po b/addons/document/i18n/ko.po
index 3cc699fa6d1..9faf8699a5e 100644
--- a/addons/document/i18n/ko.po
+++ b/addons/document/i18n/ko.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:55+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:28+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: document
 #: field:document.directory,parent_id:0
diff --git a/addons/document/i18n/lt.po b/addons/document/i18n/lt.po
index 7a24ef1b7ed..fc958406b2a 100644
--- a/addons/document/i18n/lt.po
+++ b/addons/document/i18n/lt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:55+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:28+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: document
 #: field:document.directory,parent_id:0
diff --git a/addons/document/i18n/lv.po b/addons/document/i18n/lv.po
index 9c45abbf1d1..a84a9d5ed56 100644
--- a/addons/document/i18n/lv.po
+++ b/addons/document/i18n/lv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:55+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:28+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: document
 #: field:document.directory,parent_id:0
diff --git a/addons/document/i18n/mn.po b/addons/document/i18n/mn.po
index 9696dc1f54a..28ea8eadb76 100644
--- a/addons/document/i18n/mn.po
+++ b/addons/document/i18n/mn.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:55+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:28+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: document
 #: field:document.directory,parent_id:0
diff --git a/addons/document/i18n/nl.po b/addons/document/i18n/nl.po
index afdb957d360..cb78afbdb86 100644
--- a/addons/document/i18n/nl.po
+++ b/addons/document/i18n/nl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:55+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:28+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: document
 #: field:document.directory,parent_id:0
diff --git a/addons/document/i18n/nl_BE.po b/addons/document/i18n/nl_BE.po
index cc83748032f..2985401bf32 100644
--- a/addons/document/i18n/nl_BE.po
+++ b/addons/document/i18n/nl_BE.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:55+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:28+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: document
 #: field:document.directory,parent_id:0
diff --git a/addons/document/i18n/pl.po b/addons/document/i18n/pl.po
index 0ba8695d695..227e07eb2d0 100644
--- a/addons/document/i18n/pl.po
+++ b/addons/document/i18n/pl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:55+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:28+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: document
 #: field:document.directory,parent_id:0
diff --git a/addons/document/i18n/pt.po b/addons/document/i18n/pt.po
index ce51edffd3f..40b86960004 100644
--- a/addons/document/i18n/pt.po
+++ b/addons/document/i18n/pt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:55+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:28+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: document
 #: field:document.directory,parent_id:0
diff --git a/addons/document/i18n/pt_BR.po b/addons/document/i18n/pt_BR.po
index d846deb6f9c..695f106083a 100644
--- a/addons/document/i18n/pt_BR.po
+++ b/addons/document/i18n/pt_BR.po
@@ -8,13 +8,14 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 00:36+0000\n"
 "PO-Revision-Date: 2012-07-28 18:51+0000\n"
-"Last-Translator: Fábio Martinelli <webmaster@guaru.net>\n"
+"Last-Translator: Fábio Martinelli - http://zupy.com.br "
+"<webmaster@guaru.net>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:55+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:28+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: document
 #: field:document.directory,parent_id:0
diff --git a/addons/document/i18n/ro.po b/addons/document/i18n/ro.po
index 2d377ccddc2..db47b206b59 100644
--- a/addons/document/i18n/ro.po
+++ b/addons/document/i18n/ro.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:55+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:28+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: document
 #: field:document.directory,parent_id:0
diff --git a/addons/document/i18n/ru.po b/addons/document/i18n/ru.po
index 217f3c830e8..2705617a161 100644
--- a/addons/document/i18n/ru.po
+++ b/addons/document/i18n/ru.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:55+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:28+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: document
 #: field:document.directory,parent_id:0
diff --git a/addons/document/i18n/sk.po b/addons/document/i18n/sk.po
index 674774572ab..0cc487b6548 100644
--- a/addons/document/i18n/sk.po
+++ b/addons/document/i18n/sk.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:55+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:28+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: document
 #: field:document.directory,parent_id:0
diff --git a/addons/document/i18n/sl.po b/addons/document/i18n/sl.po
index 4f43506b6b9..eb12a442bfa 100644
--- a/addons/document/i18n/sl.po
+++ b/addons/document/i18n/sl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:55+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:28+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: document
 #: field:document.directory,parent_id:0
diff --git a/addons/document/i18n/sq.po b/addons/document/i18n/sq.po
index f6c02e85169..8356f5f9a20 100644
--- a/addons/document/i18n/sq.po
+++ b/addons/document/i18n/sq.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:55+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:28+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: document
 #: field:document.directory,parent_id:0
diff --git a/addons/document/i18n/sr.po b/addons/document/i18n/sr.po
index 9e8ec311227..72acfdddd06 100644
--- a/addons/document/i18n/sr.po
+++ b/addons/document/i18n/sr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:55+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:28+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: document
 #: field:document.directory,parent_id:0
diff --git a/addons/document/i18n/sr@latin.po b/addons/document/i18n/sr@latin.po
index 49d06f208a4..a096766532b 100644
--- a/addons/document/i18n/sr@latin.po
+++ b/addons/document/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:55+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:28+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: document
 #: field:document.directory,parent_id:0
diff --git a/addons/document/i18n/sv.po b/addons/document/i18n/sv.po
index 9c3ec2c2f29..c8eaa4357b2 100644
--- a/addons/document/i18n/sv.po
+++ b/addons/document/i18n/sv.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:55+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:28+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: document
 #: field:document.directory,parent_id:0
diff --git a/addons/document/i18n/tlh.po b/addons/document/i18n/tlh.po
index 1b7ecdf8204..41b373f151e 100644
--- a/addons/document/i18n/tlh.po
+++ b/addons/document/i18n/tlh.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:55+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:28+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: document
 #: field:document.directory,parent_id:0
diff --git a/addons/document/i18n/tr.po b/addons/document/i18n/tr.po
index b828a9c0961..e9e94073d66 100644
--- a/addons/document/i18n/tr.po
+++ b/addons/document/i18n/tr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:55+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:28+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: document
 #: field:document.directory,parent_id:0
diff --git a/addons/document/i18n/uk.po b/addons/document/i18n/uk.po
index f1104ea53c7..03fff842b39 100644
--- a/addons/document/i18n/uk.po
+++ b/addons/document/i18n/uk.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:55+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:28+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: document
 #: field:document.directory,parent_id:0
diff --git a/addons/document/i18n/vi.po b/addons/document/i18n/vi.po
index 7709b3f5536..b286c555c10 100644
--- a/addons/document/i18n/vi.po
+++ b/addons/document/i18n/vi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:55+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:28+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: document
 #: field:document.directory,parent_id:0
diff --git a/addons/document/i18n/zh_CN.po b/addons/document/i18n/zh_CN.po
index 0de55fdab5a..4521ee4d950 100644
--- a/addons/document/i18n/zh_CN.po
+++ b/addons/document/i18n/zh_CN.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:55+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:28+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: document
 #: field:document.directory,parent_id:0
diff --git a/addons/document/i18n/zh_HK.po b/addons/document/i18n/zh_HK.po
index 2c4fc1ddbef..32690ccb60e 100644
--- a/addons/document/i18n/zh_HK.po
+++ b/addons/document/i18n/zh_HK.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:55+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:28+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: document
 #: field:document.directory,parent_id:0
diff --git a/addons/document/i18n/zh_TW.po b/addons/document/i18n/zh_TW.po
index 116ad3e0868..84e7f3c7cfa 100644
--- a/addons/document/i18n/zh_TW.po
+++ b/addons/document/i18n/zh_TW.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2011-01-28 03:53+0000\n"
-"Last-Translator: Walter Cheuk <wwycheuk@gmail.com>\n"
-"Language-Team: \n"
+"PO-Revision-Date: 2012-08-30 11:51+0000\n"
+"Last-Translator: Bonnie Duan <bonnie.duan@cenoq.com>\n"
+"Language-Team: Cenoq Corp.\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:55+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-31 04:56+0000\n"
+"X-Generator: Launchpad (build 15887)\n"
 
 #. module: document
 #: field:document.directory,parent_id:0
@@ -35,7 +35,7 @@ msgstr "名稱欄位"
 #. module: document
 #: view:board.board:0
 msgid "Document board"
-msgstr ""
+msgstr "文件佈告欄"
 
 #. module: document
 #: model:ir.model,name:document.model_process_node
@@ -58,7 +58,7 @@ msgstr "用作資源目錄名稱之欄位。如留空，會用該「名稱」。
 #: view:document.directory:0
 #: view:document.storage:0
 msgid "Group By..."
-msgstr "分組根據..."
+msgstr "分類方式..."
 
 #. module: document
 #: model:ir.model,name:document.model_document_directory_content_type
@@ -79,7 +79,7 @@ msgstr "檔案"
 #. module: document
 #: view:report.files.partner:0
 msgid "Files per Month"
-msgstr ""
+msgstr "當月文件"
 
 #. module: document
 #: selection:report.document.user,month:0
@@ -90,12 +90,12 @@ msgstr "三月"
 #. module: document
 #: view:document.configuration:0
 msgid "title"
-msgstr ""
+msgstr "抬頭"
 
 #. module: document
 #: field:document.directory.dctx,expr:0
 msgid "Expression"
-msgstr "表達式"
+msgstr "表達方式"
 
 #. module: document
 #: view:document.directory:0
@@ -111,7 +111,7 @@ msgstr "目錄內容"
 #. module: document
 #: view:document.directory:0
 msgid "Dynamic context"
-msgstr ""
+msgstr "動態背景"
 
 #. module: document
 #: model:ir.ui.menu,name:document.menu_document_management_configuration
@@ -125,11 +125,14 @@ msgid ""
 "You can use 'dir_id' for current dir, 'res_id', 'res_model' as a reference "
 "to the current record, in dynamic folders"
 msgstr ""
+"A python expression used to evaluate the field.\n"
+"You can use 'dir_id' for current dir, 'res_id', 'res_model' as a reference "
+"to the current record, in dynamic folders"
 
 #. module: document
 #: view:report.document.user:0
 msgid "This Year"
-msgstr "本年"
+msgstr "今年"
 
 #. module: document
 #: field:document.storage,path:0
@@ -146,7 +149,7 @@ msgstr "目錄名不能重覆！"
 #. module: document
 #: view:ir.attachment:0
 msgid "Filter on my documents"
-msgstr ""
+msgstr "過濾我的文件"
 
 #. module: document
 #: field:ir.attachment,index_content:0
@@ -158,12 +161,12 @@ msgstr "已索引內容"
 msgid ""
 "If true, all attachments that match this resource will  be located. If "
 "false, only ones that have this as parent."
-msgstr ""
+msgstr "如果正確，所有符合資源的附件會被發現。如果錯誤，只有符合資源的附件會被歸屬。"
 
 #. module: document
 #: model:ir.actions.todo.category,name:document.category_knowledge_mgmt_config
 msgid "Knowledge Management"
-msgstr ""
+msgstr "知識管理"
 
 #. module: document
 #: view:document.directory:0
@@ -175,7 +178,7 @@ msgstr "目錄"
 #. module: document
 #: model:ir.model,name:document.model_report_document_user
 msgid "Files details by Users"
-msgstr "各用戶檔案詳情"
+msgstr "各使用者檔案詳情"
 
 #. module: document
 #: code:addons/document/document_storage.py:573
@@ -187,17 +190,17 @@ msgstr "錯誤！"
 #. module: document
 #: field:document.directory,resource_find_all:0
 msgid "Find all resources"
-msgstr ""
+msgstr "尋找所有資源"
 
 #. module: document
 #: selection:document.directory,type:0
 msgid "Folders per resource"
-msgstr ""
+msgstr "按資源歸類檔案夾"
 
 #. module: document
 #: field:document.directory.content,suffix:0
 msgid "Suffix"
-msgstr "後綴"
+msgstr "字尾"
 
 #. module: document
 #: field:report.document.user,change_date:0
@@ -207,7 +210,7 @@ msgstr "修改日期"
 #. module: document
 #: view:document.configuration:0
 msgid "Knowledge Application Configuration"
-msgstr ""
+msgstr "文管設定"
 
 #. module: document
 #: view:ir.attachment:0
@@ -219,7 +222,7 @@ msgstr "伙伴"
 #. module: document
 #: view:board.board:0
 msgid "Files by Users"
-msgstr "各用戶檔案"
+msgstr "使用者檔案"
 
 #. module: document
 #: field:process.node,directory_id:0
@@ -239,7 +242,7 @@ msgstr "檢驗錯誤"
 #. module: document
 #: model:ir.model,name:document.model_ir_actions_report_xml
 msgid "ir.actions.report.xml"
-msgstr ""
+msgstr "ir.actions.report.xml"
 
 #. module: document
 #: model:ir.actions.act_window,name:document.action_document_file_form
@@ -252,13 +255,13 @@ msgstr "文件"
 #. module: document
 #: constraint:document.directory:0
 msgid "Error! You can not create recursive Directories."
-msgstr ""
+msgstr "錯誤! 您不可以建立循環目錄。"
 
 #. module: document
 #: view:document.directory:0
 #: field:document.directory,storage_id:0
 msgid "Storage"
-msgstr ""
+msgstr "存儲器"
 
 #. module: document
 #: field:document.directory,ressource_type_id:0
@@ -292,28 +295,28 @@ msgstr "類型"
 msgid ""
 "Select an object here and there will be one folder per record of that "
 "resource."
-msgstr ""
+msgstr "在這裡選擇一個目標，這個資源將會是一筆記錄一個檔案夾"
 
 #. module: document
 #: help:document.directory,domain:0
 msgid ""
 "Use a domain if you want to apply an automatic filter on visible resources."
-msgstr ""
+msgstr "請使用一個領域，如果您要將可見的資源自動過濾。"
 
 #. module: document
 #: model:ir.actions.act_window,name:document.action_view_files_by_partner
 msgid "Files Per Partner"
-msgstr ""
+msgstr "夥伴文件"
 
 #. module: document
 #: field:document.directory,dctx_ids:0
 msgid "Context fields"
-msgstr "脈絡欄位"
+msgstr "內文欄位"
 
 #. module: document
 #: field:ir.attachment,store_fname:0
 msgid "Stored Filename"
-msgstr ""
+msgstr "儲存名稱"
 
 #. module: document
 #: view:document.directory:0
@@ -336,7 +339,7 @@ msgstr "七月"
 #: model:ir.actions.act_window,name:document.open_board_document_manager
 #: model:ir.ui.menu,name:document.menu_reports_document_manager
 msgid "Document Dashboard"
-msgstr "文件儀錶板"
+msgstr "文件控制台"
 
 #. module: document
 #: field:document.directory.content.type,code:0
@@ -346,7 +349,7 @@ msgstr "延伸檔案"
 #. module: document
 #: view:ir.attachment:0
 msgid "Created"
-msgstr ""
+msgstr "已建立"
 
 #. module: document
 #: field:document.directory,content_ids:0
@@ -356,25 +359,25 @@ msgstr "虛擬檔案"
 #. module: document
 #: view:ir.attachment:0
 msgid "Modified"
-msgstr ""
+msgstr "已修改"
 
 #. module: document
 #: code:addons/document/document_storage.py:639
 #, python-format
 msgid "Error at doc write!"
-msgstr ""
+msgstr "文件書寫錯誤!"
 
 #. module: document
 #: view:document.directory:0
 msgid "Generated Files"
-msgstr ""
+msgstr "已產生檔案"
 
 #. module: document
 #: view:document.configuration:0
 msgid ""
 "When executing this wizard, it will configure your directories automatically "
 "according to modules installed."
-msgstr ""
+msgstr "執行這個精靈，它會根據已安裝的模組自動組態您的目錄。"
 
 #. module: document
 #: field:document.directory.content,directory_id:0
@@ -397,7 +400,7 @@ msgstr "安全"
 #: field:document.storage,write_uid:0
 #: field:ir.attachment,write_uid:0
 msgid "Last Modification User"
-msgstr "最後修改用戶"
+msgstr "最後修改使用者"
 
 #. module: document
 #: model:ir.actions.act_window,name:document.act_res_partner_document
@@ -425,7 +428,7 @@ msgstr "各目錄檔案詳情"
 #. module: document
 #: view:report.document.user:0
 msgid "All users files"
-msgstr "所有用戶檔案"
+msgstr "所有使用者檔案"
 
 #. module: document
 #: view:board.board:0
@@ -453,18 +456,18 @@ msgstr "靜態目錄"
 #. module: document
 #: field:document.directory,child_ids:0
 msgid "Children"
-msgstr ""
+msgstr "子目錄"
 
 #. module: document
 #: view:document.directory:0
 msgid "Define words in the context, for all child directories and files"
-msgstr ""
+msgstr "在內文中定義所有的子目錄及檔案"
 
 #. module: document
 #: help:document.storage,online:0
 msgid ""
 "If not checked, media is currently offline and its contents not available"
-msgstr ""
+msgstr "如果未檢查，媒體已離線且其內容也無法使用。"
 
 #. module: document
 #: view:document.directory:0
@@ -475,7 +478,7 @@ msgstr ""
 #: field:report.document.user,user_id:0
 #: field:report.document.wall,user_id:0
 msgid "Owner"
-msgstr ""
+msgstr "擁有人"
 
 #. module: document
 #: view:document.directory:0
@@ -492,7 +495,7 @@ msgstr "內容"
 #: field:document.storage,create_date:0
 #: field:report.document.user,create_date:0
 msgid "Date Created"
-msgstr ""
+msgstr "產生的日期"
 
 #. module: document
 #: help:document.directory.content,include_name:0
@@ -501,12 +504,14 @@ msgid ""
 "name.\n"
 "If set, the directory will have to be a resource one."
 msgstr ""
+"如果您要檔案名稱包含記錄名稱，請檢查這個欄位。\n"
+"如果設定, 這個目錄將會是第一個資源"
 
 #. module: document
 #: view:document.configuration:0
 #: model:ir.actions.act_window,name:document.action_config_auto_directory
 msgid "Configure Directories"
-msgstr ""
+msgstr "目錄組態"
 
 #. module: document
 #: field:document.directory.content,include_name:0
@@ -521,26 +526,26 @@ msgstr "附件"
 #. module: document
 #: field:ir.actions.report.xml,model_id:0
 msgid "Model Id"
-msgstr ""
+msgstr "模型 Id"
 
 #. module: document
 #: field:document.storage,online:0
 msgid "Online"
-msgstr ""
+msgstr "在線上"
 
 #. module: document
 #: help:document.directory,ressource_tree:0
 msgid ""
 "Check this if you want to use the same tree structure as the object selected "
 "in the system."
-msgstr ""
+msgstr "檢查這個項目，如果您要在系統中使用相同的樹狀結構當作選擇的目標。"
 
 #. module: document
 #: help:document.directory,ressource_id:0
 msgid ""
 "Along with Parent Model, this ID attaches this folder to a specific record "
 "of Parent Model."
-msgstr ""
+msgstr "隨著母模型，這個ID在這個檔案夾附屬在母模型的特定記錄上。"
 
 #. module: document
 #: selection:report.document.user,month:0
@@ -551,7 +556,7 @@ msgstr "八月"
 #. module: document
 #: sql_constraint:document.directory:0
 msgid "Directory cannot be parent of itself!"
-msgstr ""
+msgstr "目錄不能作自己的母目錄!"
 
 #. module: document
 #: selection:report.document.user,month:0
@@ -563,7 +568,7 @@ msgstr "六月"
 #: field:report.document.user,user:0
 #: field:report.document.wall,user:0
 msgid "User"
-msgstr "用戶"
+msgstr "使用者"
 
 #. module: document
 #: field:document.directory,group_ids:0
@@ -574,7 +579,7 @@ msgstr "群組"
 #. module: document
 #: field:document.directory.content.type,active:0
 msgid "Active"
-msgstr ""
+msgstr "啟用"
 
 #. module: document
 #: selection:report.document.user,month:0
@@ -596,6 +601,8 @@ msgid ""
 "record, just like attachments. Don't put a parent directory if you select a "
 "parent model."
 msgstr ""
+"如果您在這裡放置一個目標，這個目錄範本將會出現下列所有目標。這種目錄是 \"附件\" "
+"於特定的模型或記錄，就像附屬文件。如果您選擇一個母模型，就不要放置母目錄。"
 
 #. module: document
 #: view:document.directory:0
@@ -611,7 +618,7 @@ msgstr "十月"
 #. module: document
 #: view:document.directory:0
 msgid "Seq."
-msgstr ""
+msgstr "Seq."
 
 #. module: document
 #: selection:document.storage,type:0
@@ -637,12 +644,12 @@ msgstr ""
 #. module: document
 #: model:ir.ui.menu,name:document.menu_reports_document
 msgid "Dashboard"
-msgstr "儀錶板"
+msgstr "控制台"
 
 #. module: document
 #: model:ir.actions.act_window,name:document.action_view_user_graph
 msgid "Files By Users"
-msgstr "各用戶檔案"
+msgstr "各使用者檔案"
 
 #. module: document
 #: field:document.storage,readonly:0
@@ -652,7 +659,7 @@ msgstr "唯讀"
 #. module: document
 #: model:ir.actions.act_window,name:document.action_document_directory_form
 msgid "Document Directory"
-msgstr ""
+msgstr "文件目錄"
 
 #. module: document
 #: sql_constraint:document.directory:0
@@ -663,12 +670,12 @@ msgstr "目錄名不能重覆！"
 #: field:document.directory,create_uid:0
 #: field:document.storage,create_uid:0
 msgid "Creator"
-msgstr ""
+msgstr "建置者"
 
 #. module: document
 #: field:document.directory.content,sequence:0
 msgid "Sequence"
-msgstr ""
+msgstr "順序"
 
 #. module: document
 #: view:document.configuration:0
@@ -678,6 +685,8 @@ msgid ""
 "attached to the document, or to print and download any report. This tool "
 "will create directories automatically according to modules installed."
 msgstr ""
+"OpenERP's "
+"文件管理系統支援虛擬檔案夾與文件配對。文件的虛擬檔案夾可以用來管理文件的附件，或列印及下載任何報表。這個工具會根據安裝的模組自動產生目錄。"
 
 #. module: document
 #: view:board.board:0
@@ -695,7 +704,7 @@ msgstr "九月"
 #. module: document
 #: field:document.directory.content,prefix:0
 msgid "Prefix"
-msgstr "前綴"
+msgstr "字尾"
 
 #. module: document
 #: field:report.document.wall,last:0
@@ -710,7 +719,7 @@ msgstr "檔案名稱"
 #. module: document
 #: view:document.configuration:0
 msgid "res_config_contents"
-msgstr ""
+msgstr "res_config_contents"
 
 #. module: document
 #: field:document.directory,ressource_id:0
@@ -720,19 +729,19 @@ msgstr "資源ID"
 #. module: document
 #: selection:document.storage,type:0
 msgid "External file storage"
-msgstr ""
+msgstr "外部檔案儲存"
 
 #. module: document
 #: view:board.board:0
 #: model:ir.actions.act_window,name:document.action_view_wall
 #: view:report.document.wall:0
 msgid "Wall of Shame"
-msgstr ""
+msgstr "排行榜"
 
 #. module: document
 #: help:document.storage,path:0
 msgid "For file storage, the root path of the storage"
-msgstr ""
+msgstr "關於檔案儲存，儲存的根路徑"
 
 #. module: document
 #: model:ir.model,name:document.model_report_files_partner
@@ -747,17 +756,17 @@ msgstr "欄位"
 #. module: document
 #: model:ir.model,name:document.model_document_directory_dctx
 msgid "Directory Dynamic Context"
-msgstr ""
+msgstr "目錄動態內文"
 
 #. module: document
 #: field:document.directory,ressource_parent_type_id:0
 msgid "Parent Model"
-msgstr ""
+msgstr "母模型"
 
 #. module: document
 #: view:report.document.user:0
 msgid "Files by users"
-msgstr "各用戶檔案"
+msgstr "各使用者檔案"
 
 #. module: document
 #: field:report.document.file,month:0
@@ -771,12 +780,12 @@ msgstr "月"
 #. module: document
 #: view:report.document.user:0
 msgid "This Months Files"
-msgstr ""
+msgstr "當月檔案"
 
 #. module: document
 #: model:ir.ui.menu,name:document.menu_reporting
 msgid "Reporting"
-msgstr "報告"
+msgstr "報表"
 
 #. module: document
 #: field:document.directory,ressource_tree:0
@@ -792,29 +801,29 @@ msgstr "五月"
 #. module: document
 #: model:ir.actions.act_window,name:document.action_view_all_document_tree1
 msgid "All Users files"
-msgstr "所有用戶檔案"
+msgstr "所有使用者檔案"
 
 #. module: document
 #: model:ir.model,name:document.model_report_document_wall
 msgid "Users that did not inserted documents since one month"
-msgstr ""
+msgstr "使用者已經一個月未插入文件"
 
 #. module: document
 #: model:ir.actions.act_window,help:document.action_document_file_form
 msgid ""
 "The Documents repository gives you access to all attachments, such as mails, "
 "project documents, invoices etc."
-msgstr ""
+msgstr "文件儲存室讓您可以存取所有附件，如電郵、專案文件、商業發票等"
 
 #. module: document
 #: view:document.directory:0
 msgid "For each entry here, virtual files will appear in this folder."
-msgstr ""
+msgstr "對於每一輸入，虛擬檔案在檔案夾中出現"
 
 #. module: document
 #: model:ir.model,name:document.model_ir_attachment
 msgid "ir.attachment"
-msgstr ""
+msgstr "ir.attachment"
 
 #. module: document
 #: view:board.board:0
@@ -834,7 +843,7 @@ msgstr "各伙伴檔案"
 #. module: document
 #: view:ir.attachment:0
 msgid "Indexed Content - experimental"
-msgstr ""
+msgstr "已索引內容 - 實驗性質"
 
 #. module: document
 #: view:report.document.user:0
@@ -844,12 +853,12 @@ msgstr "本月"
 #. module: document
 #: view:ir.attachment:0
 msgid "Notes"
-msgstr "注解"
+msgstr "備註"
 
 #. module: document
 #: model:ir.model,name:document.model_document_configuration
 msgid "Directory Configuration"
-msgstr ""
+msgstr "目錄組態"
 
 #. module: document
 #: help:document.directory,type:0
@@ -860,6 +869,8 @@ msgid ""
 "resources automatically possess sub-directories for each of resource types "
 "defined in the parent directory."
 msgstr ""
+"每一個目錄可以是靜態或連接於另一個資源。一個靜態的目錄與其作業系統，是一個典型的目錄可以包含一組檔案。這個目錄連接於系統資源，在母目錄中按資源別自動持有次"
+"目錄。"
 
 #. module: document
 #: selection:report.document.user,month:0
@@ -871,14 +882,14 @@ msgstr "二月"
 #: model:ir.actions.act_window,name:document.open_board_document_manager1
 #: model:ir.ui.menu,name:document.menu_reports_document_manager1
 msgid "Statistics by User"
-msgstr "各用戶統計"
+msgstr "各使用者統計"
 
 #. module: document
 #: help:document.directory.dctx,field:0
 msgid ""
 "The name of the field. Note that the prefix \"dctx_\" will be prepended to "
 "what is typed here."
-msgstr ""
+msgstr "這個欄位名稱的字首包含\"dctx_\" 將會根據這裡的輸入預先決定。"
 
 #. module: document
 #: field:document.directory,name:0
@@ -889,7 +900,7 @@ msgstr "名稱"
 #. module: document
 #: sql_constraint:document.storage:0
 msgid "The storage path must be unique!"
-msgstr ""
+msgstr "儲存路徑不能重複!"
 
 #. module: document
 #: view:document.directory:0
@@ -899,7 +910,7 @@ msgstr "欄位"
 #. module: document
 #: help:document.storage,readonly:0
 msgid "If set, media is for reading only"
-msgstr ""
+msgstr "如果設定，媒體只能唯讀。"
 
 #. module: document
 #: selection:report.document.user,month:0
@@ -918,21 +929,21 @@ msgstr "檔案數"
 #: code:addons/document/document.py:209
 #, python-format
 msgid "(copy)"
-msgstr ""
+msgstr "(copy)"
 
 #. module: document
 #: view:document.directory:0
 msgid ""
 "Only members of these groups will have access to this directory and its "
 "files."
-msgstr ""
+msgstr "只有這個群組中的數字，才能存取這個目錄及其檔案。"
 
 #. module: document
 #: view:document.directory:0
 msgid ""
 "These groups, however, do NOT apply to children directories, which must "
 "define their own groups."
-msgstr ""
+msgstr "雖然這些模組沒有子目錄，但是還是要定義它們自己的群組。"
 
 #. module: document
 #: field:document.directory.content.type,mimetype:0
@@ -942,7 +953,7 @@ msgstr "Mime 類型"
 #. module: document
 #: view:report.document.user:0
 msgid "All Months Files"
-msgstr ""
+msgstr "所有月份文件"
 
 #. module: document
 #: field:document.directory.content,name:0
@@ -959,12 +970,12 @@ msgstr "檔案名不能重覆！"
 #. module: document
 #: selection:document.storage,type:0
 msgid "Internal File storage"
-msgstr ""
+msgstr "內部文件儲存"
 
 #. module: document
 #: sql_constraint:document.directory:0
 msgid "Directory must have a parent or a storage"
-msgstr ""
+msgstr "目錄必須要有母目錄或儲存"
 
 #. module: document
 #: model:ir.actions.act_window,name:document.action_document_directory_tree
@@ -1030,3 +1041,6 @@ msgstr "文件類型"
 
 #~ msgid "Product"
 #~ msgstr "產品"
+
+#~ msgid "Attached To"
+#~ msgstr "附屬於"
diff --git a/addons/document/report/document_report.py b/addons/document/report/document_report.py
index 7b09f131178..92e33c13746 100644
--- a/addons/document/report/document_report.py
+++ b/addons/document/report/document_report.py
@@ -32,7 +32,7 @@ class report_document_user(osv.osv):
         '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),
         'user_id':fields.integer('Owner', readonly=True),
-        'user':fields.char('User',size=64,readonly=True),
+        'user': fields.related('user_id', 'name', type='char', size=64, readonly=True),
         'directory': fields.char('Directory',size=64,readonly=True),
         'datas_fname': fields.char('File Name',size=64,readonly=True),
         'create_date': fields.datetime('Date Created', readonly=True),
@@ -50,7 +50,6 @@ class report_document_user(osv.osv):
                      to_char(f.create_date, 'YYYY') as name,
                      to_char(f.create_date, 'MM') as month,
                      f.user_id as user_id,
-                     u.name as user,
                      count(*) as nbr,
                      d.name as directory,
                      f.datas_fname as datas_fname,
@@ -60,8 +59,7 @@ class report_document_user(osv.osv):
                      f.write_date as change_date
                  FROM ir_attachment f
                      left join document_directory d on (f.parent_id=d.id and d.name<>'')
-                     inner join res_users u on (f.user_id=u.id)
-                 group by to_char(f.create_date, 'YYYY'), to_char(f.create_date, 'MM'),d.name,f.parent_id,d.type,f.create_date,f.user_id,f.file_size,u.name,d.type,f.write_date,f.datas_fname
+                 group by to_char(f.create_date, 'YYYY'), to_char(f.create_date, 'MM'),d.name,f.parent_id,d.type,f.create_date,f.user_id,f.file_size,d.type,f.write_date,f.datas_fname
              )
         """)
 
diff --git a/addons/document_ftp/__openerp__.py b/addons/document_ftp/__openerp__.py
index 17275eaebbd..f8968d6c3df 100644
--- a/addons/document_ftp/__openerp__.py
+++ b/addons/document_ftp/__openerp__.py
@@ -35,14 +35,13 @@ FTP client.
     'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
     'depends': ['base', 'document'],
-    'init_xml': [],
-    'update_xml': [
+    'data': [
         'wizard/ftp_configuration_view.xml',
         'wizard/ftp_browse_view.xml',
         'security/ir.model.access.csv',
         'res_config_view.xml',
     ],
-    'demo_xml': [],
+    'demo': [],
     'test': [
         'test/document_ftp_test2.yml',
         'test/document_ftp_test4.yml',
diff --git a/addons/document_ftp/i18n/ar.po b/addons/document_ftp/i18n/ar.po
index 7afe1f3c24f..ef35005be54 100644
--- a/addons/document_ftp/i18n/ar.po
+++ b/addons/document_ftp/i18n/ar.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:40+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: document_ftp
 #: model:ir.model,name:document_ftp.model_document_ftp_configuration
diff --git a/addons/document_ftp/i18n/bg.po b/addons/document_ftp/i18n/bg.po
index 65a3e6f4f22..c075569741f 100644
--- a/addons/document_ftp/i18n/bg.po
+++ b/addons/document_ftp/i18n/bg.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:40+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: document_ftp
 #: model:ir.model,name:document_ftp.model_document_ftp_configuration
diff --git a/addons/document_ftp/i18n/ca.po b/addons/document_ftp/i18n/ca.po
index 387f5aa3bb2..bb4eb1a0d42 100644
--- a/addons/document_ftp/i18n/ca.po
+++ b/addons/document_ftp/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:40+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: document_ftp
 #: model:ir.model,name:document_ftp.model_document_ftp_configuration
diff --git a/addons/document_ftp/i18n/cs.po b/addons/document_ftp/i18n/cs.po
index db81e19de42..3badc23aa44 100644
--- a/addons/document_ftp/i18n/cs.po
+++ b/addons/document_ftp/i18n/cs.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:40+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: document_ftp
 #: model:ir.model,name:document_ftp.model_document_ftp_configuration
diff --git a/addons/document_ftp/i18n/da.po b/addons/document_ftp/i18n/da.po
index 97fd3f343d1..9b878ff3026 100644
--- a/addons/document_ftp/i18n/da.po
+++ b/addons/document_ftp/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:40+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: document_ftp
 #: model:ir.model,name:document_ftp.model_document_ftp_configuration
diff --git a/addons/document_ftp/i18n/de.po b/addons/document_ftp/i18n/de.po
index 873fbc31195..1161671d5cf 100644
--- a/addons/document_ftp/i18n/de.po
+++ b/addons/document_ftp/i18n/de.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:40+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: document_ftp
 #: model:ir.model,name:document_ftp.model_document_ftp_configuration
diff --git a/addons/document_ftp/i18n/el.po b/addons/document_ftp/i18n/el.po
index 678f6d11951..0cf223776d4 100644
--- a/addons/document_ftp/i18n/el.po
+++ b/addons/document_ftp/i18n/el.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:40+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: document_ftp
 #: model:ir.model,name:document_ftp.model_document_ftp_configuration
diff --git a/addons/document_ftp/i18n/en_GB.po b/addons/document_ftp/i18n/en_GB.po
index 7ac3aeb0096..45334746c33 100644
--- a/addons/document_ftp/i18n/en_GB.po
+++ b/addons/document_ftp/i18n/en_GB.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:40+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: document_ftp
 #: model:ir.model,name:document_ftp.model_document_ftp_configuration
diff --git a/addons/document_ftp/i18n/es.po b/addons/document_ftp/i18n/es.po
index 57763cab2c5..217e8d5ea97 100644
--- a/addons/document_ftp/i18n/es.po
+++ b/addons/document_ftp/i18n/es.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:40+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: document_ftp
 #: model:ir.model,name:document_ftp.model_document_ftp_configuration
diff --git a/addons/document_ftp/i18n/es_CR.po b/addons/document_ftp/i18n/es_CR.po
index 09b71c7c254..bb831948586 100644
--- a/addons/document_ftp/i18n/es_CR.po
+++ b/addons/document_ftp/i18n/es_CR.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:40+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 "Language: es\n"
 
 #. module: document_ftp
diff --git a/addons/document_ftp/i18n/es_EC.po b/addons/document_ftp/i18n/es_EC.po
index aacdd74eff4..be8cc7d3c18 100644
--- a/addons/document_ftp/i18n/es_EC.po
+++ b/addons/document_ftp/i18n/es_EC.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:40+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: document_ftp
 #: model:ir.model,name:document_ftp.model_document_ftp_configuration
diff --git a/addons/document_ftp/i18n/es_PY.po b/addons/document_ftp/i18n/es_PY.po
index 34021fe7be3..9a9c031a18a 100644
--- a/addons/document_ftp/i18n/es_PY.po
+++ b/addons/document_ftp/i18n/es_PY.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:40+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: document_ftp
 #: model:ir.model,name:document_ftp.model_document_ftp_configuration
diff --git a/addons/document_ftp/i18n/et.po b/addons/document_ftp/i18n/et.po
index 03d9ce901b3..d2c4965e9e3 100644
--- a/addons/document_ftp/i18n/et.po
+++ b/addons/document_ftp/i18n/et.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:40+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: document_ftp
 #: model:ir.model,name:document_ftp.model_document_ftp_configuration
diff --git a/addons/document_ftp/i18n/fi.po b/addons/document_ftp/i18n/fi.po
index 5f294b5a59e..ea95cd55fa3 100644
--- a/addons/document_ftp/i18n/fi.po
+++ b/addons/document_ftp/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:40+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: document_ftp
 #: model:ir.model,name:document_ftp.model_document_ftp_configuration
diff --git a/addons/document_ftp/i18n/fr.po b/addons/document_ftp/i18n/fr.po
index b7c54bdf01e..e5524629266 100644
--- a/addons/document_ftp/i18n/fr.po
+++ b/addons/document_ftp/i18n/fr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:40+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: document_ftp
 #: model:ir.model,name:document_ftp.model_document_ftp_configuration
diff --git a/addons/document_ftp/i18n/gl.po b/addons/document_ftp/i18n/gl.po
index ce39b718655..99a88c8dbc2 100644
--- a/addons/document_ftp/i18n/gl.po
+++ b/addons/document_ftp/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:40+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: document_ftp
 #: model:ir.model,name:document_ftp.model_document_ftp_configuration
diff --git a/addons/document_ftp/i18n/hr.po b/addons/document_ftp/i18n/hr.po
index 4e276f18569..6aed090f5c5 100644
--- a/addons/document_ftp/i18n/hr.po
+++ b/addons/document_ftp/i18n/hr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:40+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: document_ftp
 #: model:ir.model,name:document_ftp.model_document_ftp_configuration
diff --git a/addons/document_ftp/i18n/hu.po b/addons/document_ftp/i18n/hu.po
index 7b9931056b8..785eae18678 100644
--- a/addons/document_ftp/i18n/hu.po
+++ b/addons/document_ftp/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:40+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: document_ftp
 #: model:ir.model,name:document_ftp.model_document_ftp_configuration
diff --git a/addons/document_ftp/i18n/it.po b/addons/document_ftp/i18n/it.po
index c2c72215bf8..c802ccb4199 100644
--- a/addons/document_ftp/i18n/it.po
+++ b/addons/document_ftp/i18n/it.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:40+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: document_ftp
 #: model:ir.model,name:document_ftp.model_document_ftp_configuration
diff --git a/addons/document_ftp/i18n/ja.po b/addons/document_ftp/i18n/ja.po
index 35d4ca095a7..607dd45daf0 100644
--- a/addons/document_ftp/i18n/ja.po
+++ b/addons/document_ftp/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:40+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: document_ftp
 #: model:ir.model,name:document_ftp.model_document_ftp_configuration
diff --git a/addons/document_ftp/i18n/mn.po b/addons/document_ftp/i18n/mn.po
new file mode 100644
index 00000000000..bbfe6e83f11
--- /dev/null
+++ b/addons/document_ftp/i18n/mn.po
@@ -0,0 +1,119 @@
+# 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-02-08 00:36+0000\n"
+"PO-Revision-Date: 2012-08-22 03:45+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: 2012-08-28 06:40+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
+
+#. module: document_ftp
+#: model:ir.model,name:document_ftp.model_document_ftp_configuration
+msgid "Auto Directory Configuration"
+msgstr "Автомат Директорын Тохиргоо"
+
+#. module: document_ftp
+#: view:document.ftp.configuration:0
+msgid ""
+"Indicate the network address on which your OpenERP server should be "
+"reachable for end-users. This depends on your network topology and "
+"configuration, and will only affect the links displayed to the users. The "
+"format is HOST:PORT and the default host (localhost) is only suitable for "
+"access from the server machine itself.."
+msgstr ""
+"Эцсийн хэрэглэгчидийн OpenERP-руу хандаж чадах сүлжээний хаягийг илэрхийлнэ. "
+"Энэ танай сүлжээний бүтэц, тохиргооноос хамаарах бөгөөд зөвхөн хэрэглэгчдэд "
+"харагдах холбоост л нөлөөтэй. Формат нь HOST:PORT гэсэн загвартай бөгөөд "
+"анхын host нь (localhost) гэж байдаг нь зөвхөн сервер машин дээрээс хандахад "
+"л тохирно."
+
+#. module: document_ftp
+#: model:ir.actions.url,name:document_ftp.action_document_browse
+msgid "Browse Files"
+msgstr "Файлуудыг тольдох"
+
+#. module: document_ftp
+#: field:document.ftp.configuration,config_logo:0
+msgid "Image"
+msgstr "Зураг"
+
+#. module: document_ftp
+#: field:document.ftp.configuration,host:0
+msgid "Address"
+msgstr "Хаяг"
+
+#. module: document_ftp
+#: field:document.ftp.browse,url:0
+msgid "FTP Server"
+msgstr "FTP Сервер"
+
+#. module: document_ftp
+#: model:ir.actions.act_window,name:document_ftp.action_config_auto_directory
+msgid "FTP Server Configuration"
+msgstr "FTP Серверийн тохиргоо"
+
+#. module: document_ftp
+#: view:document.ftp.browse:0
+msgid "_Browse"
+msgstr "_Тольдох"
+
+#. module: document_ftp
+#: help:document.ftp.configuration,host:0
+msgid ""
+"Server address or IP and port to which users should connect to for DMS access"
+msgstr "DMS хандалтаар хандах серверийн хаяг эсвэл IP болон порт."
+
+#. module: document_ftp
+#: model:ir.ui.menu,name:document_ftp.menu_document_browse
+msgid "Shared Repository (FTP)"
+msgstr "Агуулахыг хуваалцах (FTP)"
+
+#. module: document_ftp
+#: view:document.ftp.browse:0
+msgid "_Cancel"
+msgstr "_Цуцлах"
+
+#. module: document_ftp
+#: view:document.ftp.configuration:0
+msgid "Configure FTP Server"
+msgstr "FTP Сервэр тохируулах"
+
+#. module: document_ftp
+#: view:document.ftp.configuration:0
+msgid "title"
+msgstr "гарчиг"
+
+#. module: document_ftp
+#: model:ir.model,name:document_ftp.model_document_ftp_browse
+msgid "Document FTP Browse"
+msgstr "FTP-ээр баримт оруулах"
+
+#. module: document_ftp
+#: view:document.ftp.configuration:0
+msgid "Knowledge Application Configuration"
+msgstr "Мэдлэгийн Програмын Тохиргоо"
+
+#. module: document_ftp
+#: model:ir.actions.act_window,name:document_ftp.action_ftp_browse
+msgid "Document Browse"
+msgstr "Баримт оруулах"
+
+#. module: document_ftp
+#: view:document.ftp.browse:0
+msgid "Browse Document"
+msgstr "Оруулах баримт"
+
+#. module: document_ftp
+#: view:document.ftp.configuration:0
+msgid "res_config_contents"
+msgstr "res_config_contents"
diff --git a/addons/document_ftp/i18n/nb.po b/addons/document_ftp/i18n/nb.po
new file mode 100644
index 00000000000..3598b00f54c
--- /dev/null
+++ b/addons/document_ftp/i18n/nb.po
@@ -0,0 +1,121 @@
+# Norwegian Bokmal 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-02-08 00:36+0000\n"
+"PO-Revision-Date: 2012-09-06 14:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Norwegian Bokmal <nb@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:59+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
+
+#. module: document_ftp
+#: model:ir.model,name:document_ftp.model_document_ftp_configuration
+msgid "Auto Directory Configuration"
+msgstr "Automatisk Katalog Konfigurasjon."
+
+#. module: document_ftp
+#: view:document.ftp.configuration:0
+msgid ""
+"Indicate the network address on which your OpenERP server should be "
+"reachable for end-users. This depends on your network topology and "
+"configuration, and will only affect the links displayed to the users. The "
+"format is HOST:PORT and the default host (localhost) is only suitable for "
+"access from the server machine itself.."
+msgstr ""
+"Indikere nettverksadressen som din OpenERP server bør være tilgjengelige for "
+"sluttbrukerne. Dette avhenger av nettverkstopologi og konfigurasjon, og vil "
+"bare påvirke lenker som vises til brukerne. Formatet er HOST: PORT og "
+"standard verten (lokalhost) er bare egnet for tilgang fra serveren maskinen "
+"selv .."
+
+#. module: document_ftp
+#: model:ir.actions.url,name:document_ftp.action_document_browse
+msgid "Browse Files"
+msgstr "Bla i filer"
+
+#. module: document_ftp
+#: field:document.ftp.configuration,config_logo:0
+msgid "Image"
+msgstr "Bilde"
+
+#. module: document_ftp
+#: field:document.ftp.configuration,host:0
+msgid "Address"
+msgstr "Adresse"
+
+#. module: document_ftp
+#: field:document.ftp.browse,url:0
+msgid "FTP Server"
+msgstr "FTP-tjener"
+
+#. module: document_ftp
+#: model:ir.actions.act_window,name:document_ftp.action_config_auto_directory
+msgid "FTP Server Configuration"
+msgstr "FTP Serverkonfigurasjon"
+
+#. module: document_ftp
+#: view:document.ftp.browse:0
+msgid "_Browse"
+msgstr "_Bla gjennom"
+
+#. module: document_ftp
+#: help:document.ftp.configuration,host:0
+msgid ""
+"Server address or IP and port to which users should connect to for DMS access"
+msgstr ""
+"Server adresse eller IP og port til hvilke brukere som skal koble seg til "
+"for DMS tilgang"
+
+#. module: document_ftp
+#: model:ir.ui.menu,name:document_ftp.menu_document_browse
+msgid "Shared Repository (FTP)"
+msgstr "Wikimedia Commons (FTP)"
+
+#. module: document_ftp
+#: view:document.ftp.browse:0
+msgid "_Cancel"
+msgstr "_Avbryt"
+
+#. module: document_ftp
+#: view:document.ftp.configuration:0
+msgid "Configure FTP Server"
+msgstr "Konfigurer FTP serveren"
+
+#. module: document_ftp
+#: view:document.ftp.configuration:0
+msgid "title"
+msgstr "tittel"
+
+#. module: document_ftp
+#: model:ir.model,name:document_ftp.model_document_ftp_browse
+msgid "Document FTP Browse"
+msgstr "Document FTP Bla i."
+
+#. module: document_ftp
+#: view:document.ftp.configuration:0
+msgid "Knowledge Application Configuration"
+msgstr "Kunnskap Programkonfigurasjon"
+
+#. module: document_ftp
+#: model:ir.actions.act_window,name:document_ftp.action_ftp_browse
+msgid "Document Browse"
+msgstr "Dokument Bla i."
+
+#. module: document_ftp
+#: view:document.ftp.browse:0
+msgid "Browse Document"
+msgstr "Bla igjennom dokument"
+
+#. module: document_ftp
+#: view:document.ftp.configuration:0
+msgid "res_config_contents"
+msgstr "res_konfig_innhold"
diff --git a/addons/document_ftp/i18n/nl.po b/addons/document_ftp/i18n/nl.po
index 274c59eb134..43e9ed21050 100644
--- a/addons/document_ftp/i18n/nl.po
+++ b/addons/document_ftp/i18n/nl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:40+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: document_ftp
 #: model:ir.model,name:document_ftp.model_document_ftp_configuration
diff --git a/addons/document_ftp/i18n/pl.po b/addons/document_ftp/i18n/pl.po
index 408fd4f3a40..fdfd4b6379e 100644
--- a/addons/document_ftp/i18n/pl.po
+++ b/addons/document_ftp/i18n/pl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:40+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: document_ftp
 #: model:ir.model,name:document_ftp.model_document_ftp_configuration
diff --git a/addons/document_ftp/i18n/pt.po b/addons/document_ftp/i18n/pt.po
index 5fa71c57864..d16ae2e8a9c 100644
--- a/addons/document_ftp/i18n/pt.po
+++ b/addons/document_ftp/i18n/pt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:40+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: document_ftp
 #: model:ir.model,name:document_ftp.model_document_ftp_configuration
diff --git a/addons/document_ftp/i18n/pt_BR.po b/addons/document_ftp/i18n/pt_BR.po
index 7f7554a492b..8d8850c328b 100644
--- a/addons/document_ftp/i18n/pt_BR.po
+++ b/addons/document_ftp/i18n/pt_BR.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:40+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: document_ftp
 #: model:ir.model,name:document_ftp.model_document_ftp_configuration
diff --git a/addons/document_ftp/i18n/ro.po b/addons/document_ftp/i18n/ro.po
index a91527939f8..b749f0be742 100644
--- a/addons/document_ftp/i18n/ro.po
+++ b/addons/document_ftp/i18n/ro.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:40+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: document_ftp
 #: model:ir.model,name:document_ftp.model_document_ftp_configuration
diff --git a/addons/document_ftp/i18n/ru.po b/addons/document_ftp/i18n/ru.po
index e3ff6440252..eeafc805b6c 100644
--- a/addons/document_ftp/i18n/ru.po
+++ b/addons/document_ftp/i18n/ru.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:40+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: document_ftp
 #: model:ir.model,name:document_ftp.model_document_ftp_configuration
diff --git a/addons/document_ftp/i18n/sk.po b/addons/document_ftp/i18n/sk.po
index d99fb8e83bb..f1b8b4afad1 100644
--- a/addons/document_ftp/i18n/sk.po
+++ b/addons/document_ftp/i18n/sk.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:40+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: document_ftp
 #: model:ir.model,name:document_ftp.model_document_ftp_configuration
diff --git a/addons/document_ftp/i18n/sl.po b/addons/document_ftp/i18n/sl.po
index f1a9e21395f..26f80f33d8f 100644
--- a/addons/document_ftp/i18n/sl.po
+++ b/addons/document_ftp/i18n/sl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:40+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: document_ftp
 #: model:ir.model,name:document_ftp.model_document_ftp_configuration
diff --git a/addons/document_ftp/i18n/sr.po b/addons/document_ftp/i18n/sr.po
index aaa2cda98b7..03e64b85967 100644
--- a/addons/document_ftp/i18n/sr.po
+++ b/addons/document_ftp/i18n/sr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:40+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: document_ftp
 #: model:ir.model,name:document_ftp.model_document_ftp_configuration
diff --git a/addons/document_ftp/i18n/sr@latin.po b/addons/document_ftp/i18n/sr@latin.po
index ed919dbeb6e..d4a9d2b4740 100644
--- a/addons/document_ftp/i18n/sr@latin.po
+++ b/addons/document_ftp/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:40+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: document_ftp
 #: model:ir.model,name:document_ftp.model_document_ftp_configuration
diff --git a/addons/document_ftp/i18n/sv.po b/addons/document_ftp/i18n/sv.po
index ccf3b16ceea..91f44ed78e7 100644
--- a/addons/document_ftp/i18n/sv.po
+++ b/addons/document_ftp/i18n/sv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:40+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: document_ftp
 #: model:ir.model,name:document_ftp.model_document_ftp_configuration
diff --git a/addons/document_ftp/i18n/tr.po b/addons/document_ftp/i18n/tr.po
index dd79d1610b6..98e5b32cd13 100644
--- a/addons/document_ftp/i18n/tr.po
+++ b/addons/document_ftp/i18n/tr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:40+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: document_ftp
 #: model:ir.model,name:document_ftp.model_document_ftp_configuration
diff --git a/addons/document_ftp/i18n/zh_CN.po b/addons/document_ftp/i18n/zh_CN.po
index 20a52f0fd42..b1cb47017e8 100644
--- a/addons/document_ftp/i18n/zh_CN.po
+++ b/addons/document_ftp/i18n/zh_CN.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:40+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: document_ftp
 #: model:ir.model,name:document_ftp.model_document_ftp_configuration
diff --git a/addons/document_ftp/i18n/zh_TW.po b/addons/document_ftp/i18n/zh_TW.po
new file mode 100644
index 00000000000..90a9e531a96
--- /dev/null
+++ b/addons/document_ftp/i18n/zh_TW.po
@@ -0,0 +1,116 @@
+# Chinese (Traditional) 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-02-08 00:36+0000\n"
+"PO-Revision-Date: 2012-08-29 09:46+0000\n"
+"Last-Translator: Bonnie Duan <bonnie.duan@cenoq.com>\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: 2012-08-30 05:12+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
+
+#. module: document_ftp
+#: model:ir.model,name:document_ftp.model_document_ftp_configuration
+msgid "Auto Directory Configuration"
+msgstr "自動目錄配置"
+
+#. module: document_ftp
+#: view:document.ftp.configuration:0
+msgid ""
+"Indicate the network address on which your OpenERP server should be "
+"reachable for end-users. This depends on your network topology and "
+"configuration, and will only affect the links displayed to the users. The "
+"format is HOST:PORT and the default host (localhost) is only suitable for "
+"access from the server machine itself.."
+msgstr ""
+"說明OpenERP的服務器上的網絡地址應該為最終用戶訪問。這取決於您的網絡拓撲和配置，而且只會影響顯示給用戶的鏈接。的格式為HOST：PORT和預設的主機"
+"（localhost）的訪問從服務器本身只適合.."
+
+#. module: document_ftp
+#: model:ir.actions.url,name:document_ftp.action_document_browse
+msgid "Browse Files"
+msgstr "瀏覽檔案"
+
+#. module: document_ftp
+#: field:document.ftp.configuration,config_logo:0
+msgid "Image"
+msgstr "圖像"
+
+#. module: document_ftp
+#: field:document.ftp.configuration,host:0
+msgid "Address"
+msgstr "地址"
+
+#. module: document_ftp
+#: field:document.ftp.browse,url:0
+msgid "FTP Server"
+msgstr "FTP 伺服器"
+
+#. module: document_ftp
+#: model:ir.actions.act_window,name:document_ftp.action_config_auto_directory
+msgid "FTP Server Configuration"
+msgstr "FTP Server Configuration"
+
+#. module: document_ftp
+#: view:document.ftp.browse:0
+msgid "_Browse"
+msgstr "瀏覽(_B)"
+
+#. module: document_ftp
+#: help:document.ftp.configuration,host:0
+msgid ""
+"Server address or IP and port to which users should connect to for DMS access"
+msgstr "服務器地址或IP地址和端口，用戶應該連接到DMS訪問"
+
+#. module: document_ftp
+#: model:ir.ui.menu,name:document_ftp.menu_document_browse
+msgid "Shared Repository (FTP)"
+msgstr "供享的儲存庫"
+
+#. module: document_ftp
+#: view:document.ftp.browse:0
+msgid "_Cancel"
+msgstr "取消(_C)"
+
+#. module: document_ftp
+#: view:document.ftp.configuration:0
+msgid "Configure FTP Server"
+msgstr "設置FTP 伺服器"
+
+#. module: document_ftp
+#: view:document.ftp.configuration:0
+msgid "title"
+msgstr "標題"
+
+#. module: document_ftp
+#: model:ir.model,name:document_ftp.model_document_ftp_browse
+msgid "Document FTP Browse"
+msgstr "瀏覽FTP文件"
+
+#. module: document_ftp
+#: view:document.ftp.configuration:0
+msgid "Knowledge Application Configuration"
+msgstr "知識應用配置"
+
+#. module: document_ftp
+#: model:ir.actions.act_window,name:document_ftp.action_ftp_browse
+msgid "Document Browse"
+msgstr "文件瀏覽"
+
+#. module: document_ftp
+#: view:document.ftp.browse:0
+msgid "Browse Document"
+msgstr "瀏覽文件"
+
+#. module: document_ftp
+#: view:document.ftp.configuration:0
+msgid "res_config_contents"
+msgstr "res_config_contents"
diff --git a/addons/document_page/__openerp__.py b/addons/document_page/__openerp__.py
index bff40744805..a88e1d827d7 100644
--- a/addons/document_page/__openerp__.py
+++ b/addons/document_page/__openerp__.py
@@ -31,20 +31,15 @@ Web pages
     'author': ['OpenERP SA'],
     'website': 'http://www.openerp.com/',
     'depends': ['knowledge'],
-    'init_xml': [],
-    'update_xml': [
+    'data': [
         'wizard/document_page_create_menu_view.xml',
         'wizard/document_page_show_diff_view.xml',
         'document_page_view.xml',
         'security/document_page_security.xml',
         'security/ir.model.access.csv',
     ],
-    'demo_xml': [
-        'document_page_demo.xml'
-    ],
-    'test': [
-        'test/document_page_test00.yml'
-    ],
+    'demo': ['document_page_demo.xml'],
+    'test': ['test/document_page_test00.yml'],
     'installable': True,
     'auto_install': False,
     'certificate': '0086363630317',
@@ -53,8 +48,6 @@ Web pages
         'static/src/lib/wiky/wiky.js', 
         'static/src/js/document_page.js'
     ],
-    'css' : [
-        "static/src/css/document_page.css"
-    ],
+    'css' : ['static/src/css/document_page.css'],
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/document_page/i18n/ar.po b/addons/document_page/i18n/ar.po
index e6f5bc399a4..661fc2c2706 100644
--- a/addons/document_page/i18n/ar.po
+++ b/addons/document_page/i18n/ar.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-14 04:45+0000\n"
-"X-Generator: Launchpad (build 15791)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:43+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: document_page
 #: field:document.page.type,template:0
diff --git a/addons/document_page/i18n/bg.po b/addons/document_page/i18n/bg.po
index 87848f9e862..4af4f6dc1e9 100644
--- a/addons/document_page/i18n/bg.po
+++ b/addons/document_page/i18n/bg.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-14 04:45+0000\n"
-"X-Generator: Launchpad (build 15791)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:43+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: document_page
 #: field:document.page.type,template:0
diff --git a/addons/document_page/i18n/bs.po b/addons/document_page/i18n/bs.po
index 3f9add4b5ca..3e5f45a37b8 100644
--- a/addons/document_page/i18n/bs.po
+++ b/addons/document_page/i18n/bs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-14 04:45+0000\n"
-"X-Generator: Launchpad (build 15791)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:43+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: document_page
 #: field:document.page.type,template:0
diff --git a/addons/document_page/i18n/ca.po b/addons/document_page/i18n/ca.po
index f111b81d8ff..41eb6900fbf 100644
--- a/addons/document_page/i18n/ca.po
+++ b/addons/document_page/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-14 04:45+0000\n"
-"X-Generator: Launchpad (build 15791)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:43+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: document_page
 #: field:document.page.type,template:0
diff --git a/addons/document_page/i18n/cs.po b/addons/document_page/i18n/cs.po
index a5cc644f19d..22d654f3945 100644
--- a/addons/document_page/i18n/cs.po
+++ b/addons/document_page/i18n/cs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-14 04:45+0000\n"
-"X-Generator: Launchpad (build 15791)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:43+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 "X-Poedit-Language: Czech\n"
 
 #. module: document_page
diff --git a/addons/document_page/i18n/da.po b/addons/document_page/i18n/da.po
index 7d82dca7794..9b4f075dcf8 100644
--- a/addons/document_page/i18n/da.po
+++ b/addons/document_page/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-14 04:45+0000\n"
-"X-Generator: Launchpad (build 15791)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:43+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: document_page
 #: field:document.page.type,template:0
diff --git a/addons/document_page/i18n/de.po b/addons/document_page/i18n/de.po
index 616d1a36f6a..6ee48f2e39d 100644
--- a/addons/document_page/i18n/de.po
+++ b/addons/document_page/i18n/de.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-14 04:46+0000\n"
-"X-Generator: Launchpad (build 15791)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:43+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: document_page
 #: field:document.page.type,template:0
diff --git a/addons/document_page/i18n/el.po b/addons/document_page/i18n/el.po
index 7d87b199d23..a74b6b61bda 100644
--- a/addons/document_page/i18n/el.po
+++ b/addons/document_page/i18n/el.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-14 04:46+0000\n"
-"X-Generator: Launchpad (build 15791)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:43+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
 "X-Poedit-SourceCharset: utf-8\n"
diff --git a/addons/document_page/i18n/es.po b/addons/document_page/i18n/es.po
index af15cbc8e81..39beccd58e3 100644
--- a/addons/document_page/i18n/es.po
+++ b/addons/document_page/i18n/es.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-14 04:46+0000\n"
-"X-Generator: Launchpad (build 15791)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:43+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: document_page
 #: field:document.page.type,template:0
diff --git a/addons/document_page/i18n/et.po b/addons/document_page/i18n/et.po
index 5d6564fdf80..72234538beb 100644
--- a/addons/document_page/i18n/et.po
+++ b/addons/document_page/i18n/et.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-14 04:46+0000\n"
-"X-Generator: Launchpad (build 15791)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:43+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: document_page
 #: field:document.page.type,template:0
diff --git a/addons/document_page/i18n/fi.po b/addons/document_page/i18n/fi.po
index 1514c5937b3..224ee816d98 100644
--- a/addons/document_page/i18n/fi.po
+++ b/addons/document_page/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-14 04:46+0000\n"
-"X-Generator: Launchpad (build 15791)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:43+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: document_page
 #: field:document.page.type,template:0
diff --git a/addons/document_page/i18n/fr.po b/addons/document_page/i18n/fr.po
index 5bcab4d5ccd..24d1286ff3f 100644
--- a/addons/document_page/i18n/fr.po
+++ b/addons/document_page/i18n/fr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-14 04:46+0000\n"
-"X-Generator: Launchpad (build 15791)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:43+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: document_page
 #: field:document.page.type,template:0
diff --git a/addons/document_page/i18n/gl.po b/addons/document_page/i18n/gl.po
index 70d96a3954c..77ab07fff03 100644
--- a/addons/document_page/i18n/gl.po
+++ b/addons/document_page/i18n/gl.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-14 04:46+0000\n"
-"X-Generator: Launchpad (build 15791)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:43+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: document_page
 #: field:document.page.type,template:0
diff --git a/addons/document_page/i18n/hr.po b/addons/document_page/i18n/hr.po
index 3c5c2c6fd2d..ac4bf4fd8be 100644
--- a/addons/document_page/i18n/hr.po
+++ b/addons/document_page/i18n/hr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-14 04:46+0000\n"
-"X-Generator: Launchpad (build 15791)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:43+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: document_page
 #: field:document.page.type,template:0
diff --git a/addons/document_page/i18n/hu.po b/addons/document_page/i18n/hu.po
index b3048ad21f9..04edde523e8 100644
--- a/addons/document_page/i18n/hu.po
+++ b/addons/document_page/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-14 04:46+0000\n"
-"X-Generator: Launchpad (build 15791)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:43+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: document_page
 #: field:document.page.type,template:0
diff --git a/addons/document_page/i18n/id.po b/addons/document_page/i18n/id.po
index 6eeb7156829..35eb3b0bb20 100644
--- a/addons/document_page/i18n/id.po
+++ b/addons/document_page/i18n/id.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-14 04:46+0000\n"
-"X-Generator: Launchpad (build 15791)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:43+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: document_page
 #: field:document.page.type,template:0
diff --git a/addons/document_page/i18n/it.po b/addons/document_page/i18n/it.po
index 2d459fc5779..e869112dbad 100644
--- a/addons/document_page/i18n/it.po
+++ b/addons/document_page/i18n/it.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-14 04:46+0000\n"
-"X-Generator: Launchpad (build 15791)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:43+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: document_page
 #: field:document.page.type,template:0
diff --git a/addons/document_page/i18n/ja.po b/addons/document_page/i18n/ja.po
index 3bd025dd942..c0a44438903 100644
--- a/addons/document_page/i18n/ja.po
+++ b/addons/document_page/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-14 04:46+0000\n"
-"X-Generator: Launchpad (build 15791)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:43+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: document_page
 #: field:document.page.type,template:0
diff --git a/addons/document_page/i18n/ko.po b/addons/document_page/i18n/ko.po
index 373c112b907..8c98121f405 100644
--- a/addons/document_page/i18n/ko.po
+++ b/addons/document_page/i18n/ko.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-14 04:46+0000\n"
-"X-Generator: Launchpad (build 15791)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:43+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: document_page
 #: field:document.page.type,template:0
diff --git a/addons/document_page/i18n/lt.po b/addons/document_page/i18n/lt.po
index 14c4abbb279..db480e52d19 100644
--- a/addons/document_page/i18n/lt.po
+++ b/addons/document_page/i18n/lt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-14 04:46+0000\n"
-"X-Generator: Launchpad (build 15791)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:43+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 "Language: lt\n"
 
 #. module: document_page
diff --git a/addons/document_page/i18n/lv.po b/addons/document_page/i18n/lv.po
index c0073ae1ebf..3d912a286a0 100644
--- a/addons/document_page/i18n/lv.po
+++ b/addons/document_page/i18n/lv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-14 04:46+0000\n"
-"X-Generator: Launchpad (build 15791)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:43+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: document_page
 #: field:document.page.type,template:0
diff --git a/addons/document_page/i18n/mn.po b/addons/document_page/i18n/mn.po
index 48e0599dff2..9e34d791129 100644
--- a/addons/document_page/i18n/mn.po
+++ b/addons/document_page/i18n/mn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-14 04:46+0000\n"
-"X-Generator: Launchpad (build 15791)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:43+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: document_page
 #: field:document.page.type,template:0
diff --git a/addons/document_page/i18n/nb.po b/addons/document_page/i18n/nb.po
index 809b0cd1801..7c4108babda 100644
--- a/addons/document_page/i18n/nb.po
+++ b/addons/document_page/i18n/nb.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-14 04:46+0000\n"
-"X-Generator: Launchpad (build 15791)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:43+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: document_page
 #: field:document.page.type,template:0
diff --git a/addons/document_page/i18n/nl.po b/addons/document_page/i18n/nl.po
index fee40c3032c..021b1cfd59e 100644
--- a/addons/document_page/i18n/nl.po
+++ b/addons/document_page/i18n/nl.po
@@ -7,25 +7,25 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 01:37+0100\n"
-"PO-Revision-Date: 2012-08-13 12:14+0000\n"
-"Last-Translator: Antony Lesuisse (OpenERP) <al@openerp.com>\n"
+"PO-Revision-Date: 2012-08-26 14:00+0000\n"
+"Last-Translator: Erwin <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: 2012-08-14 04:46+0000\n"
-"X-Generator: Launchpad (build 15791)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:43+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: document_page
 #: field:document.page.type,template:0
 msgid "Document page Template"
-msgstr ""
+msgstr "Document pagina sjabloon"
 
 #. module: document_page
 #: model:ir.actions.act_window,name:document_page.action_wiki
 #: model:ir.ui.menu,name:document_page.menu_action_wiki_wiki
 msgid "Document Pages"
-msgstr ""
+msgstr "Document pagina's"
 
 #. module: document_page
 #: field:document.page.type,method:0
@@ -56,7 +56,7 @@ msgstr "Geeft aan of deze pagina's een inhoudsopgave hebben of niet"
 #. module: document_page
 #: model:ir.model,name:document_page.model_wiki_wiki_history view:document.page.history:0
 msgid "Document page History"
-msgstr ""
+msgstr "Document pagina historie"
 
 #. module: document_page
 #: field:document.page,minor_edit:0
@@ -270,7 +270,7 @@ msgstr "Historie van alle pagina's"
 #. module: document_page
 #: model:ir.model,name:document_page.model_wiki_wiki
 msgid "document.page"
-msgstr ""
+msgstr "document.page"
 
 #. module: document_page
 #: help:document.page.type,method:0
@@ -285,7 +285,7 @@ msgstr "Sluiten"
 #. module: document_page
 #: model:ir.model,name:document_page.model_wizard_wiki_history_show_diff
 msgid "wizard.document.page.history.show_diff"
-msgstr ""
+msgstr "wizard.document.page.history.show_diff"
 
 #. module: document_page
 #: field:document.page.history,wiki_id:0
@@ -357,7 +357,7 @@ msgstr "Is dit een grote wijziging?"
 #: model:ir.model,name:document_page.model_wiki_groups
 #: model:ir.ui.menu,name:document_page.menu_action_wiki_groups view:document.page.type:0
 msgid "Document Types"
-msgstr ""
+msgstr "Documentsoorten"
 
 #. module: document_page
 #: view:document.page:0
@@ -374,12 +374,12 @@ msgstr "Gewijzigd door"
 #: field:document.page,type:0
 #, python-format
 msgid "Type"
-msgstr ""
+msgstr "Soort"
 
 #. module: document_page
 #: view:document.page.type:0 view:document.page.page.open:0
 msgid "Open Document Page"
-msgstr ""
+msgstr "Open document pagina"
 
 #. module: document_page
 #: model:ir.model,name:document_page.model_wiki_wiki_page_open
diff --git a/addons/document_page/i18n/pl.po b/addons/document_page/i18n/pl.po
index 3fed2a579cb..52c0f17d4b5 100644
--- a/addons/document_page/i18n/pl.po
+++ b/addons/document_page/i18n/pl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-14 04:46+0000\n"
-"X-Generator: Launchpad (build 15791)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:43+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: document_page
 #: field:document.page.type,template:0
diff --git a/addons/document_page/i18n/pt.po b/addons/document_page/i18n/pt.po
index b85aabb87b5..ba5f05a4848 100644
--- a/addons/document_page/i18n/pt.po
+++ b/addons/document_page/i18n/pt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-14 04:46+0000\n"
-"X-Generator: Launchpad (build 15791)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:43+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: document_page
 #: field:document.page.type,template:0
diff --git a/addons/document_page/i18n/pt_BR.po b/addons/document_page/i18n/pt_BR.po
index 5c0f3097656..6d787998430 100644
--- a/addons/document_page/i18n/pt_BR.po
+++ b/addons/document_page/i18n/pt_BR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-14 04:46+0000\n"
-"X-Generator: Launchpad (build 15791)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:43+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: document_page
 #: field:document.page.type,template:0
diff --git a/addons/document_page/i18n/ro.po b/addons/document_page/i18n/ro.po
index f9ab8a23e12..059da0e578e 100644
--- a/addons/document_page/i18n/ro.po
+++ b/addons/document_page/i18n/ro.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-14 04:46+0000\n"
-"X-Generator: Launchpad (build 15791)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:43+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: document_page
 #: field:document.page.type,template:0
diff --git a/addons/document_page/i18n/ru.po b/addons/document_page/i18n/ru.po
index 9e362a098de..4a117339c3e 100644
--- a/addons/document_page/i18n/ru.po
+++ b/addons/document_page/i18n/ru.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-14 04:46+0000\n"
-"X-Generator: Launchpad (build 15791)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:43+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: document_page
 #: field:document.page.type,template:0
diff --git a/addons/document_page/i18n/sk.po b/addons/document_page/i18n/sk.po
index 6df87913768..bcd31911734 100644
--- a/addons/document_page/i18n/sk.po
+++ b/addons/document_page/i18n/sk.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-14 04:46+0000\n"
-"X-Generator: Launchpad (build 15791)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:43+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: document_page
 #: field:document.page.type,template:0
diff --git a/addons/document_page/i18n/sl.po b/addons/document_page/i18n/sl.po
index e5c48563eeb..a2e7c2555fa 100644
--- a/addons/document_page/i18n/sl.po
+++ b/addons/document_page/i18n/sl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-14 04:46+0000\n"
-"X-Generator: Launchpad (build 15791)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:43+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: document_page
 #: field:document.page.type,template:0
diff --git a/addons/document_page/i18n/sq.po b/addons/document_page/i18n/sq.po
index f6df8ed1b9e..55a1aad0116 100644
--- a/addons/document_page/i18n/sq.po
+++ b/addons/document_page/i18n/sq.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-14 04:45+0000\n"
-"X-Generator: Launchpad (build 15791)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:43+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: document_page
 #: field:document.page.type,template:0
diff --git a/addons/document_page/i18n/sr.po b/addons/document_page/i18n/sr.po
index 3b3f7ea8aef..3a018bf1630 100644
--- a/addons/document_page/i18n/sr.po
+++ b/addons/document_page/i18n/sr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-14 04:46+0000\n"
-"X-Generator: Launchpad (build 15791)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:43+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: document_page
 #: field:document.page.type,template:0
diff --git a/addons/document_page/i18n/sr@latin.po b/addons/document_page/i18n/sr@latin.po
index a6dd609306d..03f3ba8d30c 100644
--- a/addons/document_page/i18n/sr@latin.po
+++ b/addons/document_page/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-14 04:46+0000\n"
-"X-Generator: Launchpad (build 15791)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:43+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: document_page
 #: field:document.page.type,template:0
diff --git a/addons/document_page/i18n/sv.po b/addons/document_page/i18n/sv.po
index 7bc94e30a56..b48f057cba1 100644
--- a/addons/document_page/i18n/sv.po
+++ b/addons/document_page/i18n/sv.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-14 04:46+0000\n"
-"X-Generator: Launchpad (build 15791)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:43+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: document_page
 #: field:document.page.type,template:0
diff --git a/addons/document_page/i18n/tlh.po b/addons/document_page/i18n/tlh.po
index 6eeb7156829..35eb3b0bb20 100644
--- a/addons/document_page/i18n/tlh.po
+++ b/addons/document_page/i18n/tlh.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-14 04:46+0000\n"
-"X-Generator: Launchpad (build 15791)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:43+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: document_page
 #: field:document.page.type,template:0
diff --git a/addons/document_page/i18n/tr.po b/addons/document_page/i18n/tr.po
index 5c80ed29d1c..8a5a41f03e6 100644
--- a/addons/document_page/i18n/tr.po
+++ b/addons/document_page/i18n/tr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-14 04:46+0000\n"
-"X-Generator: Launchpad (build 15791)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:43+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: document_page
 #: field:document.page.type,template:0
diff --git a/addons/document_page/i18n/uk.po b/addons/document_page/i18n/uk.po
index 95a1cccd166..059ebf6d8a4 100644
--- a/addons/document_page/i18n/uk.po
+++ b/addons/document_page/i18n/uk.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-14 04:46+0000\n"
-"X-Generator: Launchpad (build 15791)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:43+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: document_page
 #: field:document.page.type,template:0
diff --git a/addons/document_page/i18n/vi.po b/addons/document_page/i18n/vi.po
index 53ca8599d2e..79cb446e11f 100644
--- a/addons/document_page/i18n/vi.po
+++ b/addons/document_page/i18n/vi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-14 04:46+0000\n"
-"X-Generator: Launchpad (build 15791)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:43+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: document_page
 #: field:document.page.type,template:0
diff --git a/addons/document_page/i18n/zh_CN.po b/addons/document_page/i18n/zh_CN.po
index 44468e289a1..50a5218f445 100644
--- a/addons/document_page/i18n/zh_CN.po
+++ b/addons/document_page/i18n/zh_CN.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-14 04:46+0000\n"
-"X-Generator: Launchpad (build 15791)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:43+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: document_page
 #: field:document.page.type,template:0
diff --git a/addons/document_page/i18n/zh_TW.po b/addons/document_page/i18n/zh_TW.po
index abfa870b47d..08d9b01e2d3 100644
--- a/addons/document_page/i18n/zh_TW.po
+++ b/addons/document_page/i18n/zh_TW.po
@@ -7,165 +7,165 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 01:37+0100\n"
-"PO-Revision-Date: 2012-08-13 12:08+0000\n"
-"Last-Translator: <>\n"
+"PO-Revision-Date: 2012-08-30 09:36+0000\n"
+"Last-Translator: Bonnie Duan <bonnie.duan@cenoq.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-14 04:46+0000\n"
-"X-Generator: Launchpad (build 15791)\n"
+"X-Launchpad-Export-Date: 2012-08-31 04:56+0000\n"
+"X-Generator: Launchpad (build 15887)\n"
 
 #. module: document_page
 #: field:document.page.type,template:0
 msgid "Document page Template"
-msgstr ""
+msgstr "文檔頁面範本"
 
 #. module: document_page
 #: model:ir.actions.act_window,name:document_page.action_wiki
 #: model:ir.ui.menu,name:document_page.menu_action_wiki_wiki
 msgid "Document Pages"
-msgstr ""
+msgstr "文檔頁面"
 
 #. module: document_page
 #: field:document.page.type,method:0
 msgid "Display Method"
-msgstr ""
+msgstr "展示方法"
 
 #. module: document_page
 #: view:document.page:0 field:document.page,create_uid:0
 msgid "Author"
-msgstr ""
+msgstr "作者"
 
 #. module: document_page
 #: model:ir.actions.act_window,name:document_page.action_view_wiki_wiki_page_open
 #: view:document.page.page.open:0
 msgid "Open Page"
-msgstr ""
+msgstr "開啓葉面"
 
 #. module: document_page
 #: field:document.page,menu_id:0
 msgid "Menu"
-msgstr ""
+msgstr "選單"
 
 #. module: document_page
 #: help:document.page,type:0
 msgid "Indicates that this pages have a table of contents or not"
-msgstr ""
+msgstr "表示，這個頁面至少有一個表的內容"
 
 #. module: document_page
 #: model:ir.model,name:document_page.model_wiki_wiki_history view:document.page.history:0
 msgid "Document page History"
-msgstr ""
+msgstr "頁面歷史文件"
 
 #. module: document_page
 #: field:document.page,minor_edit:0
 msgid "Minor edit"
-msgstr ""
+msgstr "小編輯"
 
 #. module: document_page
 #: view:document.page:0 field:document.page,content:0
 msgid "Content"
-msgstr ""
+msgstr "內容"
 
 #. module: document_page
 #: field:document.page,child_ids:0
 msgid "Child Pages"
-msgstr ""
+msgstr "子頁面"
 
 #. module: document_page
 #: field:document.page,parent_id:0
 msgid "Parent Page"
-msgstr ""
+msgstr "上級頁面"
 
 #. module: document_page
 #: view:document.page:0 field:document.page,write_uid:0
 msgid "Last Contributor"
-msgstr ""
+msgstr "最後的貢獻者"
 
 #. module: document_page
 #: field:document.page.create.menu,menu_parent_id:0
 msgid "Parent Menu"
-msgstr ""
+msgstr "上級選單"
 
 #. module: document_page
 #: field:document.page,name:0
 msgid "Title"
-msgstr ""
+msgstr "標題"
 
 #. module: document_page
 #: model:ir.model,name:document_page.model_wiki_create_menu
 msgid "Wizard Create Menu"
-msgstr ""
+msgstr "嚮導創建選單"
 
 #. module: document_page
 #: field:document.page,history_id:0
 msgid "History Lines"
-msgstr ""
+msgstr "歷史記錄"
 
 #. module: document_page
 #: view:document.page:0
 msgid "Page Content"
-msgstr ""
+msgstr "頁面內容"
 
 #. module: document_page
 #: code:addons/document_page/document_page.py:237 code:addons/wiki/wizard/wiki_make_index.py:52
 #, python-format
 msgid "Warning !"
-msgstr ""
+msgstr "警告！"
 
 #. module: document_page
 #: code:addons/document_page/document_page.py:237
 #, python-format
 msgid "There are no changes in revisions"
-msgstr ""
+msgstr "有沒有變化修訂"
 
 #. module: document_page
 #: field:document.page.create.menu,menu_name:0
 msgid "Menu Name"
-msgstr ""
+msgstr "選單名稱"
 
 #. module: document_page
 #: field:document.page.type,notes:0
 msgid "Description"
-msgstr ""
+msgstr "描述"
 
 #. module: document_page
 #: field:document.page,review:0
 msgid "Needs Review"
-msgstr ""
+msgstr "需要回顧"
 
 #. module: document_page
 #: help:document.page,review:0
 msgid ""
 "Indicates that this page should be reviewed, raising the attention of other "
 "contributors"
-msgstr ""
+msgstr "表示這個頁面應該檢討，提高其他出資人的注意"
 
 #. module: document_page
 #: view:document.page.create.menu:0 view:document.page.make.index:0
 msgid "Menu Information"
-msgstr ""
+msgstr "選單資訊"
 
 #. module: document_page
 #: model:ir.actions.act_window,name:document_page.act_wiki_wiki_history
 msgid "Page History"
-msgstr ""
+msgstr "頁面歷史記錄"
 
 #. module: document_page
 #: selection:document.page.type,method:0
 msgid "Tree"
-msgstr ""
+msgstr "目錄樹"
 
 #. module: document_page
 #: view:document.page.type:0
 msgid "Page Template"
-msgstr ""
+msgstr "頁面模版"
 
 #. module: document_page
 #: field:document.page,tags:0
 msgid "Keywords"
-msgstr ""
+msgstr "關鍵字"
 
 #. module: document_page
 #: model:ir.actions.act_window,help:document_page.action_wiki
@@ -175,173 +175,175 @@ msgid ""
 "(CRM, Sales, etc.). You can use keywords to ease access to your wiki pages. "
 "There is a basic wiki editing for text format."
 msgstr ""
+"Wiki頁面，您可以與您的同事的想法和問題。您可以創建一個新的文件，可以連接到一個或多個應用程序（客戶關係管理（CRM），銷售等）。您可以使用關鍵字，以便"
+"於訪問到您的wiki頁面。有一個基本的的維基編輯為文本格式。"
 
 #. module: document_page
 #: code:addons/document_page/wizard/document_page_show_diff.py:54
 #, python-format
 msgid "Warning"
-msgstr ""
+msgstr "警告"
 
 #. module: document_page
 #: help:document.page.type,home:0
 msgid "Required to select home page if display method is Home Page"
-msgstr ""
+msgstr "在首頁,需要選擇首頁顯示的方法"
 
 #. module: document_page
 #: field:document.page.history,create_date:0
 msgid "Date"
-msgstr ""
+msgstr "日期"
 
 #. module: document_page
 #: view:document.page.make.index:0
 msgid "Want to create a Index on Selected Pages ? "
-msgstr ""
+msgstr "要選定的頁面上創建一個索引呢？ "
 
 #. module: document_page
 #: model:ir.actions.act_window,name:document_page.action_view_wiki_show_diff
 #: model:ir.actions.act_window,name:document_page.action_view_wiki_show_diff_values
 #: view:wizard.document.page.history.show_diff:0
 msgid "Difference"
-msgstr ""
+msgstr "差異"
 
 #. module: document_page
 #: field:document.page.type,page_ids:0
 msgid "Pages"
-msgstr ""
+msgstr "頁面"
 
 #. module: document_page
 #: view:document.page.type:0
 msgid "Group Description"
-msgstr ""
+msgstr "群組敘述"
 
 #. module: document_page
 #: view:document.page.page.open:0
 msgid "Want to open a wiki page? "
-msgstr ""
+msgstr "要打開一個wiki頁面？ "
 
 #. module: document_page
 #: field:document.page.history,content:0
 msgid "Text area"
-msgstr ""
+msgstr "文本區域"
 
 #. module: document_page
 #: view:document.page:0
 msgid "Meta Information"
-msgstr ""
+msgstr "中繼資訊"
 
 #. module: document_page
 #: field:document.page,create_date:0
 msgid "Created on"
-msgstr ""
+msgstr "建立於"
 
 #. module: document_page
 #: view:document.page.type:0 view:wizard.document.page.history.show_diff:0
 msgid "Notes"
-msgstr ""
+msgstr "備註"
 
 #. module: document_page
 #: selection:document.page.type,method:0
 msgid "List"
-msgstr ""
+msgstr "列表"
 
 #. module: document_page
 #: field:document.page,summary:0 field:document.page.history,edit_summary:0
 msgid "Summary"
-msgstr ""
+msgstr "摘要"
 
 #. module: document_page
 #: field:document.page.groups,create_date:0
 msgid "Created Date"
-msgstr ""
+msgstr "建立日期"
 
 #. module: document_page
 #: model:ir.actions.act_window,name:document_page.action_history
 msgid "All Page Histories"
-msgstr ""
+msgstr "所有頁面的歷史記錄"
 
 #. module: document_page
 #: model:ir.model,name:document_page.model_wiki_wiki
 msgid "document.page"
-msgstr ""
+msgstr "document.page"
 
 #. module: document_page
 #: help:document.page.type,method:0
 msgid "Define the default behaviour of the menu created on this group"
-msgstr ""
+msgstr "本組創建的選單中定義默認行為"
 
 #. module: document_page
 #: view:wizard.document.page.history.show_diff:0
 msgid "Close"
-msgstr ""
+msgstr "結束"
 
 #. module: document_page
 #: model:ir.model,name:document_page.model_wizard_wiki_history_show_diff
 msgid "wizard.document.page.history.show_diff"
-msgstr ""
+msgstr "wizard.document.page.history.show_diff"
 
 #. module: document_page
 #: field:document.page.history,wiki_id:0
 msgid "Wiki Id"
-msgstr ""
+msgstr "維基標識"
 
 #. module: document_page
 #: field:document.page.type,home:0 selection:document.page.type,method:0
 msgid "Home Page"
-msgstr ""
+msgstr "首頁"
 
 #. module: document_page
 #: help:document.page,parent_id:0
 msgid "Allows you to link with the other page with in the current topic"
-msgstr ""
+msgstr "允許您與其他頁的鏈接，在當前主題"
 
 #. module: document_page
 #: view:document.page:0
 msgid "Modification Information"
-msgstr ""
+msgstr "修改信息"
 
 #. module: document_page
 #: model:ir.ui.menu,name:document_page.menu_wiki_configuration view:document.page:0
 msgid "Wiki"
-msgstr ""
+msgstr "維基 (Wiki)"
 
 #. module: document_page
 #: field:document.page,write_date:0
 msgid "Modification Date"
-msgstr ""
+msgstr "修改日期"
 
 #. module: document_page
 #: view:document.page.type:0
 msgid "Configuration"
-msgstr ""
+msgstr "設置"
 
 #. module: document_page
 #: model:ir.actions.act_window,name:document_page.action_view_wiki_make_index
 #: model:ir.actions.act_window,name:document_page.action_view_wiki_make_index_values
 #: model:ir.model,name:document_page.model_wiki_make_index view:document.page.make.index:0
 msgid "Create Index"
-msgstr ""
+msgstr "創建索引"
 
 #. module: document_page
 #: code:addons/document_page/wizard/document_page_show_diff.py:54
 #, python-format
 msgid "You need to select minimum 1 or maximum 2 history revision!"
-msgstr ""
+msgstr "您需要選擇最小或最大歷史修訂！"
 
 #. module: document_page
 #: view:document.page:0
 msgid "Group By..."
-msgstr ""
+msgstr "分類方式..."
 
 #. module: document_page
 #: model:ir.actions.act_window,name:document_page.action_wiki_create_menu
 #: view:document.page.create.menu:0 view:document.page.type:0 view:document.page.make.index:0
 msgid "Create Menu"
-msgstr ""
+msgstr "建立選單"
 
 #. module: document_page
 #: field:document.page.history,minor_edit:0
 msgid "This is a major edit ?"
-msgstr ""
+msgstr "這是一個主要的編輯嗎？"
 
 #. module: document_page
 #: model:ir.actions.act_window,name:document_page.action_wiki_groups
@@ -349,56 +351,56 @@ msgstr ""
 #: model:ir.model,name:document_page.model_wiki_groups
 #: model:ir.ui.menu,name:document_page.menu_action_wiki_groups view:document.page.type:0
 msgid "Document Types"
-msgstr ""
+msgstr "文件類型"
 
 #. module: document_page
 #: view:document.page:0
 msgid "Topic"
-msgstr ""
+msgstr "主題"
 
 #. module: document_page
 #: field:document.page.history,write_uid:0
 msgid "Modify By"
-msgstr ""
+msgstr "修改者"
 
 #. module: document_page
 #: code:addons/document_page/web/widgets/wikimarkup/__init__.py:1981
 #: field:document.page,type:0
 #, python-format
 msgid "Type"
-msgstr ""
+msgstr "類型"
 
 #. module: document_page
 #: view:document.page.type:0 view:document.page.page.open:0
 msgid "Open Document Page"
-msgstr ""
+msgstr "開啓文件"
 
 #. module: document_page
 #: model:ir.model,name:document_page.model_wiki_wiki_page_open
 msgid "wiz open page"
-msgstr ""
+msgstr "WIZ打開的頁面"
 
 #. module: document_page
 #: view:document.page.create.menu:0 view:document.page.make.index:0 view:document.page.page.open:0
 msgid "Cancel"
-msgstr ""
+msgstr "刪除"
 
 #. module: document_page
 #: field:wizard.document.page.history.show_diff,file_path:0
 msgid "Diff"
-msgstr ""
+msgstr "差異"
 
 #. module: document_page
 #: view:document.page:0
 msgid "Need Review"
-msgstr ""
+msgstr "需要回顧"
 
 #. module: document_page
 #: model:ir.actions.act_window,name:document_page.action_wiki_review
 msgid "Pages Waiting Review"
-msgstr ""
+msgstr "頁面等待審查"
 
 #. module: document_page
 #: model:ir.actions.act_window,name:document_page.act_wiki_group_open
 msgid "Search Page"
-msgstr ""
+msgstr "搜尋頁面"
diff --git a/addons/document_page/static/src/css/document_page.css b/addons/document_page/static/src/css/document_page.css
index 723ff8d9b11..77597fb4281 100644
--- a/addons/document_page/static/src/css/document_page.css
+++ b/addons/document_page/static/src/css/document_page.css
@@ -1,7 +1,3 @@
-.oe_form_readonly .oe_notebook {
-    display: none;
-}
-
 .oe_document_page ul, .oe_document_page li {
     padding: 2px 8px;
     margin: 2px 8px;
diff --git a/addons/document_page/static/src/js/document_page.js b/addons/document_page/static/src/js/document_page.js
index 555a39d7796..836803bf700 100644
--- a/addons/document_page/static/src/js/document_page.js
+++ b/addons/document_page/static/src/js/document_page.js
@@ -11,7 +11,7 @@ openerp.document_page = function (openerp) {
                 }
             } else {
                 var wiki_value = wiky.process(show_value || '');
-                this.$element.html(wiki_value);
+                this.$el.html(wiki_value);
             }
         },
     });
diff --git a/addons/document_webdav/__openerp__.py b/addons/document_webdav/__openerp__.py
index 4d39a4e8015..1f7cb20e795 100644
--- a/addons/document_webdav/__openerp__.py
+++ b/addons/document_webdav/__openerp__.py
@@ -29,12 +29,12 @@
 ##############################################################################
 
 {
-        "name" : "Shared Repositories (WebDAV)",
-        "version" : "2.3",
-        "author" : "OpenERP SA",
-        "category" : "Knowledge Management",
-        "website": "http://www.openerp.com",
-        "description": """
+    'name': 'Shared Repositories (WebDAV)',
+    'version': '2.3',
+    'author': 'OpenERP SA',
+    'category': 'Knowledge Management',
+    'website': 'http://www.openerp.com',
+    'description': """
 With this module, the WebDAV server for documents is activated.
 ===============================================================
 
@@ -42,35 +42,36 @@ You can then use any compatible browser to remotely see the attachments of OpenO
 
 After installation, the WebDAV server can be controlled by a [webdav] section in 
 the server's config.
-Server Configuration Parameter:
 
-    [webdav]
-    ; enable = True ; Serve webdav over the http(s) servers
-    ; vdir = webdav ; the directory that webdav will be served at
-    ; this default val means that webdav will be
-    ; on "http://localhost:8069/webdav/
-    ; verbose = True ; Turn on the verbose messages of webdav
-    ; debug = True ; Turn on the debugging messages of webdav
-    ; since the messages are routed to the python logging, with
-    ; levels "debug" and "debug_rpc" respectively, you can leave
-    ; these options on
+Server Configuration Parameter:
+-------------------------------
+[webdav]:
++++++++++ 
+    * enable = True ; Serve webdav over the http(s) servers
+    * vdir = webdav ; the directory that webdav will be served at
+    * this default val means that webdav will be
+    * on "http://localhost:8069/webdav/
+    * verbose = True ; Turn on the verbose messages of webdav
+    * debug = True ; Turn on the debugging messages of webdav
+    * since the messages are routed to the python logging, with
+    * levels "debug" and "debug_rpc" respectively, you can leave
+    * these options on
 
 Also implements IETF RFC 5785 for services discovery on a http server,
 which needs explicit configuration in openerp-server.conf too.
 """,
-        "depends" : ["base", "document"],
-        "init_xml" : [],
-        "update_xml" : ['security/ir.model.access.csv',
-                        'webdav_view.xml',
-                        'webdav_setup.xml',
-                        ],
-        "demo_xml" : [],
-        "test": [ #'test/webdav_test1.yml',
-                ],
-        "auto_install": False,
-        "installable": True,
-        "certificate" : "001236490750845657973",
-        'images': ['images/dav_properties.jpeg','images/directories_structure_principals.jpeg'],
+    'depends': ['base', 'document'],
+    'data': ['security/ir.model.access.csv',
+            'webdav_view.xml',
+            'webdav_setup.xml',
+    ],
+    'demo': [],
+    'test': [ #'test/webdav_test1.yml',
+    ],
+    'auto_install': False,
+    'installable': True,
+    'certificate' : '001236490750845657973',
+    'images': ['images/dav_properties.jpeg','images/directories_structure_principals.jpeg'],
 }
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/document_webdav/i18n/ar.po b/addons/document_webdav/i18n/ar.po
index be15d1886f1..9e294162c6c 100644
--- a/addons/document_webdav/i18n/ar.po
+++ b/addons/document_webdav/i18n/ar.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:30+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: document_webdav
 #: field:document.webdav.dir.property,create_date:0
diff --git a/addons/document_webdav/i18n/bg.po b/addons/document_webdav/i18n/bg.po
index fde05f6faab..a8243f6f059 100644
--- a/addons/document_webdav/i18n/bg.po
+++ b/addons/document_webdav/i18n/bg.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:30+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: document_webdav
 #: field:document.webdav.dir.property,create_date:0
diff --git a/addons/document_webdav/i18n/ca.po b/addons/document_webdav/i18n/ca.po
index 0d1409a37c7..29b6e744d75 100644
--- a/addons/document_webdav/i18n/ca.po
+++ b/addons/document_webdav/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:30+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: document_webdav
 #: field:document.webdav.dir.property,create_date:0
diff --git a/addons/document_webdav/i18n/cs.po b/addons/document_webdav/i18n/cs.po
index d98c27df5b2..bb37042c376 100644
--- a/addons/document_webdav/i18n/cs.po
+++ b/addons/document_webdav/i18n/cs.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:30+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: document_webdav
 #: field:document.webdav.dir.property,create_date:0
diff --git a/addons/document_webdav/i18n/da.po b/addons/document_webdav/i18n/da.po
index 79316ecf4ed..310918d06ce 100644
--- a/addons/document_webdav/i18n/da.po
+++ b/addons/document_webdav/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:30+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: document_webdav
 #: field:document.webdav.dir.property,create_date:0
diff --git a/addons/document_webdav/i18n/de.po b/addons/document_webdav/i18n/de.po
index be4b5dbd216..5ef52ff4cc5 100644
--- a/addons/document_webdav/i18n/de.po
+++ b/addons/document_webdav/i18n/de.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:30+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: document_webdav
 #: field:document.webdav.dir.property,create_date:0
diff --git a/addons/document_webdav/i18n/el.po b/addons/document_webdav/i18n/el.po
index cf4e4358a59..2bee1f221f9 100644
--- a/addons/document_webdav/i18n/el.po
+++ b/addons/document_webdav/i18n/el.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:30+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: document_webdav
 #: field:document.webdav.dir.property,create_date:0
diff --git a/addons/document_webdav/i18n/en_GB.po b/addons/document_webdav/i18n/en_GB.po
index 130cd04e8e9..bf03a3c7eaf 100644
--- a/addons/document_webdav/i18n/en_GB.po
+++ b/addons/document_webdav/i18n/en_GB.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:30+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: document_webdav
 #: field:document.webdav.dir.property,create_date:0
diff --git a/addons/document_webdav/i18n/es.po b/addons/document_webdav/i18n/es.po
index 0fddb6b85cc..8d944c6386a 100644
--- a/addons/document_webdav/i18n/es.po
+++ b/addons/document_webdav/i18n/es.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:30+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: document_webdav
 #: field:document.webdav.dir.property,create_date:0
diff --git a/addons/document_webdav/i18n/es_CR.po b/addons/document_webdav/i18n/es_CR.po
index 8405f5b3e09..c99e2d4fe65 100644
--- a/addons/document_webdav/i18n/es_CR.po
+++ b/addons/document_webdav/i18n/es_CR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:30+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 "Language: es\n"
 
 #. module: document_webdav
diff --git a/addons/document_webdav/i18n/es_EC.po b/addons/document_webdav/i18n/es_EC.po
index 69731b31a33..3d68da9840a 100644
--- a/addons/document_webdav/i18n/es_EC.po
+++ b/addons/document_webdav/i18n/es_EC.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:30+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: document_webdav
 #: field:document.webdav.dir.property,create_date:0
diff --git a/addons/document_webdav/i18n/es_PY.po b/addons/document_webdav/i18n/es_PY.po
index 53990abd187..776d203789a 100644
--- a/addons/document_webdav/i18n/es_PY.po
+++ b/addons/document_webdav/i18n/es_PY.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:30+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: document_webdav
 #: field:document.webdav.dir.property,create_date:0
diff --git a/addons/document_webdav/i18n/et.po b/addons/document_webdav/i18n/et.po
index 36ff37eab87..54147713cd8 100644
--- a/addons/document_webdav/i18n/et.po
+++ b/addons/document_webdav/i18n/et.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:30+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: document_webdav
 #: field:document.webdav.dir.property,create_date:0
diff --git a/addons/document_webdav/i18n/eu.po b/addons/document_webdav/i18n/eu.po
index 0abc054c139..7d401adbf20 100644
--- a/addons/document_webdav/i18n/eu.po
+++ b/addons/document_webdav/i18n/eu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:30+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: document_webdav
 #: field:document.webdav.dir.property,create_date:0
diff --git a/addons/document_webdav/i18n/fi.po b/addons/document_webdav/i18n/fi.po
index 053f8bed734..8c9797352ce 100644
--- a/addons/document_webdav/i18n/fi.po
+++ b/addons/document_webdav/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:30+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: document_webdav
 #: field:document.webdav.dir.property,create_date:0
diff --git a/addons/document_webdav/i18n/fr.po b/addons/document_webdav/i18n/fr.po
index 7b15e2a15c6..56a02aedf95 100644
--- a/addons/document_webdav/i18n/fr.po
+++ b/addons/document_webdav/i18n/fr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:30+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: document_webdav
 #: field:document.webdav.dir.property,create_date:0
diff --git a/addons/document_webdav/i18n/gl.po b/addons/document_webdav/i18n/gl.po
index d048adf1b40..48ad8c4e7d2 100644
--- a/addons/document_webdav/i18n/gl.po
+++ b/addons/document_webdav/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:30+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: document_webdav
 #: field:document.webdav.dir.property,create_date:0
diff --git a/addons/document_webdav/i18n/gu.po b/addons/document_webdav/i18n/gu.po
index b5768300597..1e430e9cb2c 100644
--- a/addons/document_webdav/i18n/gu.po
+++ b/addons/document_webdav/i18n/gu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:30+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: document_webdav
 #: field:document.webdav.dir.property,create_date:0
diff --git a/addons/document_webdav/i18n/hr.po b/addons/document_webdav/i18n/hr.po
index ac51f82627e..55659a43384 100644
--- a/addons/document_webdav/i18n/hr.po
+++ b/addons/document_webdav/i18n/hr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:30+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: document_webdav
 #: field:document.webdav.dir.property,create_date:0
diff --git a/addons/document_webdav/i18n/hu.po b/addons/document_webdav/i18n/hu.po
index 21d0c9974af..c431eaaab57 100644
--- a/addons/document_webdav/i18n/hu.po
+++ b/addons/document_webdav/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:30+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: document_webdav
 #: field:document.webdav.dir.property,create_date:0
diff --git a/addons/document_webdav/i18n/id.po b/addons/document_webdav/i18n/id.po
index 5ef97a916fe..6428cec4ed6 100644
--- a/addons/document_webdav/i18n/id.po
+++ b/addons/document_webdav/i18n/id.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:30+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: document_webdav
 #: field:document.webdav.dir.property,create_date:0
diff --git a/addons/document_webdav/i18n/it.po b/addons/document_webdav/i18n/it.po
index b6ca5326a8d..0de8cd2630f 100644
--- a/addons/document_webdav/i18n/it.po
+++ b/addons/document_webdav/i18n/it.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:30+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: document_webdav
 #: field:document.webdav.dir.property,create_date:0
diff --git a/addons/document_webdav/i18n/ja.po b/addons/document_webdav/i18n/ja.po
index 179a2772de7..aa22e3d33df 100644
--- a/addons/document_webdav/i18n/ja.po
+++ b/addons/document_webdav/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:30+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: document_webdav
 #: field:document.webdav.dir.property,create_date:0
diff --git a/addons/document_webdav/i18n/mn.po b/addons/document_webdav/i18n/mn.po
index 5734661e2ec..5a223ac7a9c 100644
--- a/addons/document_webdav/i18n/mn.po
+++ b/addons/document_webdav/i18n/mn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:30+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: document_webdav
 #: field:document.webdav.dir.property,create_date:0
@@ -37,7 +37,7 @@ msgstr ""
 #: view:document.webdav.dir.property:0
 #: view:document.webdav.file.property:0
 msgid "Search Document properties"
-msgstr ""
+msgstr "Баримтыг төлөвөөр хайх"
 
 #. module: document_webdav
 #: view:document.webdav.dir.property:0
@@ -191,4 +191,4 @@ msgstr ""
 #: field:document.webdav.dir.property,do_subst:0
 #: field:document.webdav.file.property,do_subst:0
 msgid "Substitute"
-msgstr ""
+msgstr "Орлуулах"
diff --git a/addons/document_webdav/i18n/nb.po b/addons/document_webdav/i18n/nb.po
new file mode 100644
index 00000000000..d51ade795b3
--- /dev/null
+++ b/addons/document_webdav/i18n/nb.po
@@ -0,0 +1,197 @@
+# Norwegian Bokmal 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-02-08 00:36+0000\n"
+"PO-Revision-Date: 2012-09-07 17:44+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Norwegian Bokmal <nb@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-09-08 04:54+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
+
+#. module: document_webdav
+#: field:document.webdav.dir.property,create_date:0
+#: field:document.webdav.file.property,create_date:0
+msgid "Date Created"
+msgstr "Dato opprettet"
+
+#. module: document_webdav
+#: model:ir.ui.menu,name:document_webdav.menu_document_props
+msgid "Documents"
+msgstr "Dokumenter"
+
+#. module: document_webdav
+#: constraint:document.directory:0
+msgid "Error! You can not create recursive Directories."
+msgstr "Feil! Du kan opprette rekursive kataloger."
+
+#. module: document_webdav
+#: view:document.webdav.dir.property:0
+#: view:document.webdav.file.property:0
+msgid "Search Document properties"
+msgstr "Søk Dokumentegenskaper."
+
+#. module: document_webdav
+#: view:document.webdav.dir.property:0
+#: field:document.webdav.dir.property,namespace:0
+#: view:document.webdav.file.property:0
+#: field:document.webdav.file.property,namespace:0
+msgid "Namespace"
+msgstr "Navnerom"
+
+#. module: document_webdav
+#: field:document.directory,dav_prop_ids:0
+msgid "DAV properties"
+msgstr "DAV egenskaper"
+
+#. module: document_webdav
+#: model:ir.model,name:document_webdav.model_document_webdav_file_property
+msgid "document.webdav.file.property"
+msgstr "Dokumentet.WebDAV.fil.egenskap"
+
+#. module: document_webdav
+#: view:document.webdav.dir.property:0
+#: view:document.webdav.file.property:0
+msgid "Group By..."
+msgstr "Grupper etter ..."
+
+#. module: document_webdav
+#: view:document.directory:0
+msgid "These properties will be added to WebDAV requests"
+msgstr "Disse egenskapene vil bli lagt til WebDAV-forespørsler"
+
+#. module: document_webdav
+#: model:ir.actions.act_window,name:document_webdav.action_file_props_form
+msgid "DAV Properties for Documents"
+msgstr "DAV Eiendommer for Dokumenter."
+
+#. module: document_webdav
+#: code:addons/document_webdav/webdav.py:37
+#, python-format
+msgid "PyWebDAV Import Error!"
+msgstr "PyWebDAV importere Feil!"
+
+#. module: document_webdav
+#: view:document.webdav.file.property:0
+#: field:document.webdav.file.property,file_id:0
+msgid "Document"
+msgstr "Dokument"
+
+#. module: document_webdav
+#: model:ir.ui.menu,name:document_webdav.menu_folder_props
+msgid "Folders"
+msgstr "Mapper"
+
+#. module: document_webdav
+#: sql_constraint:document.directory:0
+msgid "Directory cannot be parent of itself!"
+msgstr "Katalogen kan ikke være overordnede av seg selv!"
+
+#. module: document_webdav
+#: view:document.directory:0
+msgid "Dynamic context"
+msgstr "Dynamisk sammenheng"
+
+#. module: document_webdav
+#: view:document.directory:0
+msgid "WebDAV properties"
+msgstr "WebDAV egenskaper."
+
+#. module: document_webdav
+#: sql_constraint:document.directory:0
+msgid "The directory name must be unique !"
+msgstr "Katalogen Navnet må være unikt!"
+
+#. module: document_webdav
+#: code:addons/document_webdav/webdav.py:37
+#, python-format
+msgid ""
+"Please install PyWebDAV from "
+"http://code.google.com/p/pywebdav/downloads/detail?name=PyWebDAV-"
+"0.9.4.tar.gz&can=2&q=/"
+msgstr ""
+"Vennligst installer PyWebDAV fra "
+"http://code.google.com/p/pywebdav/downloads/detail?name=PyWebDAV-"
+"0.9.4.tar.gz&can=2&q=/"
+
+#. module: document_webdav
+#: model:ir.actions.act_window,name:document_webdav.action_dir_props_form
+msgid "DAV Properties for Folders"
+msgstr "DAV egenskaper for mapper."
+
+#. module: document_webdav
+#: view:document.directory:0
+#: view:document.webdav.dir.property:0
+#: view:document.webdav.file.property:0
+msgid "Properties"
+msgstr "Egenskaper"
+
+#. module: document_webdav
+#: field:document.webdav.dir.property,name:0
+#: field:document.webdav.file.property,name:0
+msgid "Name"
+msgstr "Navn"
+
+#. module: document_webdav
+#: model:ir.model,name:document_webdav.model_document_webdav_dir_property
+msgid "document.webdav.dir.property"
+msgstr "Dokumentet.WebDAV.dir.eiendom"
+
+#. module: document_webdav
+#: field:document.webdav.dir.property,value:0
+#: field:document.webdav.file.property,value:0
+msgid "Value"
+msgstr "Verdi"
+
+#. module: document_webdav
+#: field:document.webdav.dir.property,dir_id:0
+#: model:ir.model,name:document_webdav.model_document_directory
+msgid "Directory"
+msgstr "Katalog"
+
+#. module: document_webdav
+#: field:document.webdav.dir.property,write_uid:0
+#: field:document.webdav.file.property,write_uid:0
+msgid "Last Modification User"
+msgstr "Siste endring Bruker"
+
+#. module: document_webdav
+#: view:document.webdav.dir.property:0
+msgid "Dir"
+msgstr "Retn"
+
+#. module: document_webdav
+#: field:document.webdav.dir.property,write_date:0
+#: field:document.webdav.file.property,write_date:0
+msgid "Date Modified"
+msgstr "Dato endret"
+
+#. module: document_webdav
+#: field:document.webdav.dir.property,create_uid:0
+#: field:document.webdav.file.property,create_uid:0
+msgid "Creator"
+msgstr "Opprettet av"
+
+#. module: document_webdav
+#: model:ir.ui.menu,name:document_webdav.menu_properties
+msgid "DAV Properties"
+msgstr "DAV Egenskaper."
+
+#. module: document_webdav
+#: sql_constraint:document.directory:0
+msgid "Directory must have a parent or a storage"
+msgstr "Katalog må ha en overordnede eller en lagringsplass."
+
+#. module: document_webdav
+#: field:document.webdav.dir.property,do_subst:0
+#: field:document.webdav.file.property,do_subst:0
+msgid "Substitute"
+msgstr "Erstatte"
diff --git a/addons/document_webdav/i18n/nl.po b/addons/document_webdav/i18n/nl.po
index 1b48cc29f65..044f65580a3 100644
--- a/addons/document_webdav/i18n/nl.po
+++ b/addons/document_webdav/i18n/nl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:30+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: document_webdav
 #: field:document.webdav.dir.property,create_date:0
diff --git a/addons/document_webdav/i18n/pl.po b/addons/document_webdav/i18n/pl.po
index 7805c315607..11f668dea80 100644
--- a/addons/document_webdav/i18n/pl.po
+++ b/addons/document_webdav/i18n/pl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:30+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: document_webdav
 #: field:document.webdav.dir.property,create_date:0
diff --git a/addons/document_webdav/i18n/pt.po b/addons/document_webdav/i18n/pt.po
index fe61c9618ea..549d2129457 100644
--- a/addons/document_webdav/i18n/pt.po
+++ b/addons/document_webdav/i18n/pt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:30+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: document_webdav
 #: field:document.webdav.dir.property,create_date:0
diff --git a/addons/document_webdav/i18n/pt_BR.po b/addons/document_webdav/i18n/pt_BR.po
index 466d4a2a85d..9abfeeb1fe3 100644
--- a/addons/document_webdav/i18n/pt_BR.po
+++ b/addons/document_webdav/i18n/pt_BR.po
@@ -9,13 +9,14 @@ msgstr ""
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:36+0000\n"
 "PO-Revision-Date: 2012-07-28 18:55+0000\n"
-"Last-Translator: Fábio Martinelli <webmaster@guaru.net>\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: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:30+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: document_webdav
 #: field:document.webdav.dir.property,create_date:0
diff --git a/addons/document_webdav/i18n/ro.po b/addons/document_webdav/i18n/ro.po
index 9345eaa57d8..6ed40ca59c0 100644
--- a/addons/document_webdav/i18n/ro.po
+++ b/addons/document_webdav/i18n/ro.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:30+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: document_webdav
 #: field:document.webdav.dir.property,create_date:0
diff --git a/addons/document_webdav/i18n/ru.po b/addons/document_webdav/i18n/ru.po
index deef40433db..039a2a21ee9 100644
--- a/addons/document_webdav/i18n/ru.po
+++ b/addons/document_webdav/i18n/ru.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:30+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: document_webdav
 #: field:document.webdav.dir.property,create_date:0
diff --git a/addons/document_webdav/i18n/sl.po b/addons/document_webdav/i18n/sl.po
index d43c0e4ede7..795cfab3534 100644
--- a/addons/document_webdav/i18n/sl.po
+++ b/addons/document_webdav/i18n/sl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:30+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: document_webdav
 #: field:document.webdav.dir.property,create_date:0
diff --git a/addons/document_webdav/i18n/sr.po b/addons/document_webdav/i18n/sr.po
index 1667ac3f0c8..1996f38d4e2 100644
--- a/addons/document_webdav/i18n/sr.po
+++ b/addons/document_webdav/i18n/sr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:30+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: document_webdav
 #: field:document.webdav.dir.property,create_date:0
diff --git a/addons/document_webdav/i18n/sr@latin.po b/addons/document_webdav/i18n/sr@latin.po
index 5d4236ffd0f..e9df8df4c86 100644
--- a/addons/document_webdav/i18n/sr@latin.po
+++ b/addons/document_webdav/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:30+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: document_webdav
 #: field:document.webdav.dir.property,create_date:0
diff --git a/addons/document_webdav/i18n/sv.po b/addons/document_webdav/i18n/sv.po
index 1281ccaf622..6a7c4add48b 100644
--- a/addons/document_webdav/i18n/sv.po
+++ b/addons/document_webdav/i18n/sv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:30+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: document_webdav
 #: field:document.webdav.dir.property,create_date:0
diff --git a/addons/document_webdav/i18n/tr.po b/addons/document_webdav/i18n/tr.po
index f15d2c54680..6445ab242c4 100644
--- a/addons/document_webdav/i18n/tr.po
+++ b/addons/document_webdav/i18n/tr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:30+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: document_webdav
 #: field:document.webdav.dir.property,create_date:0
@@ -37,7 +37,7 @@ msgstr "Hata! Yinelenen Dizinler oluşturamazsınız."
 #: view:document.webdav.dir.property:0
 #: view:document.webdav.file.property:0
 msgid "Search Document properties"
-msgstr ""
+msgstr "Belge özelliklerini ara"
 
 #. module: document_webdav
 #: view:document.webdav.dir.property:0
@@ -45,17 +45,17 @@ msgstr ""
 #: view:document.webdav.file.property:0
 #: field:document.webdav.file.property,namespace:0
 msgid "Namespace"
-msgstr ""
+msgstr "İsimalanı"
 
 #. module: document_webdav
 #: field:document.directory,dav_prop_ids:0
 msgid "DAV properties"
-msgstr ""
+msgstr "DAV özellikleri"
 
 #. module: document_webdav
 #: model:ir.model,name:document_webdav.model_document_webdav_file_property
 msgid "document.webdav.file.property"
-msgstr ""
+msgstr "belge.webdav.dosya.özellik"
 
 #. module: document_webdav
 #: view:document.webdav.dir.property:0
@@ -66,49 +66,49 @@ msgstr "Grupla..."
 #. module: document_webdav
 #: view:document.directory:0
 msgid "These properties will be added to WebDAV requests"
-msgstr ""
+msgstr "Özellikler WebDAV isteklerine aklenecektir"
 
 #. module: document_webdav
 #: model:ir.actions.act_window,name:document_webdav.action_file_props_form
 msgid "DAV Properties for Documents"
-msgstr ""
+msgstr "Belgeler için DAV Özellikleri"
 
 #. module: document_webdav
 #: code:addons/document_webdav/webdav.py:37
 #, python-format
 msgid "PyWebDAV Import Error!"
-msgstr ""
+msgstr "PyWebDAV İçeaktarma Hatası!"
 
 #. module: document_webdav
 #: view:document.webdav.file.property:0
 #: field:document.webdav.file.property,file_id:0
 msgid "Document"
-msgstr ""
+msgstr "Belge"
 
 #. module: document_webdav
 #: model:ir.ui.menu,name:document_webdav.menu_folder_props
 msgid "Folders"
-msgstr ""
+msgstr "Klasörler"
 
 #. module: document_webdav
 #: sql_constraint:document.directory:0
 msgid "Directory cannot be parent of itself!"
-msgstr ""
+msgstr "Dizin kendisinin üstü olamaz!"
 
 #. module: document_webdav
 #: view:document.directory:0
 msgid "Dynamic context"
-msgstr ""
+msgstr "Dinamik içerik"
 
 #. module: document_webdav
 #: view:document.directory:0
 msgid "WebDAV properties"
-msgstr ""
+msgstr "WebDAV özellikleri"
 
 #. module: document_webdav
 #: sql_constraint:document.directory:0
 msgid "The directory name must be unique !"
-msgstr ""
+msgstr "Dizin adı eşsiz olmalı"
 
 #. module: document_webdav
 #: code:addons/document_webdav/webdav.py:37
@@ -118,77 +118,80 @@ msgid ""
 "http://code.google.com/p/pywebdav/downloads/detail?name=PyWebDAV-"
 "0.9.4.tar.gz&can=2&q=/"
 msgstr ""
+"Lütfen PyWebDAV2 "
+"http://code.google.com/p/pywebdav/downloads/detail?name=PyWebDAV-"
+"0.9.4.tar.gz&can=2&q=/ adresinden kurun"
 
 #. module: document_webdav
 #: model:ir.actions.act_window,name:document_webdav.action_dir_props_form
 msgid "DAV Properties for Folders"
-msgstr ""
+msgstr "Klasörler için DAV özellikleri"
 
 #. module: document_webdav
 #: view:document.directory:0
 #: view:document.webdav.dir.property:0
 #: view:document.webdav.file.property:0
 msgid "Properties"
-msgstr ""
+msgstr "Özellikler"
 
 #. module: document_webdav
 #: field:document.webdav.dir.property,name:0
 #: field:document.webdav.file.property,name:0
 msgid "Name"
-msgstr ""
+msgstr "Adı"
 
 #. module: document_webdav
 #: model:ir.model,name:document_webdav.model_document_webdav_dir_property
 msgid "document.webdav.dir.property"
-msgstr ""
+msgstr "belge.webdav.diz.özellik"
 
 #. module: document_webdav
 #: field:document.webdav.dir.property,value:0
 #: field:document.webdav.file.property,value:0
 msgid "Value"
-msgstr ""
+msgstr "Değer"
 
 #. module: document_webdav
 #: field:document.webdav.dir.property,dir_id:0
 #: model:ir.model,name:document_webdav.model_document_directory
 msgid "Directory"
-msgstr ""
+msgstr "Dizin"
 
 #. module: document_webdav
 #: field:document.webdav.dir.property,write_uid:0
 #: field:document.webdav.file.property,write_uid:0
 msgid "Last Modification User"
-msgstr ""
+msgstr "Son Değiştiren Kullanıcı"
 
 #. module: document_webdav
 #: view:document.webdav.dir.property:0
 msgid "Dir"
-msgstr ""
+msgstr "Dizin"
 
 #. module: document_webdav
 #: field:document.webdav.dir.property,write_date:0
 #: field:document.webdav.file.property,write_date:0
 msgid "Date Modified"
-msgstr ""
+msgstr "Değiştirilme Tarihi"
 
 #. module: document_webdav
 #: field:document.webdav.dir.property,create_uid:0
 #: field:document.webdav.file.property,create_uid:0
 msgid "Creator"
-msgstr ""
+msgstr "Oluşturan"
 
 #. module: document_webdav
 #: model:ir.ui.menu,name:document_webdav.menu_properties
 msgid "DAV Properties"
-msgstr ""
+msgstr "DAV Özellikleri"
 
 #. module: document_webdav
 #: sql_constraint:document.directory:0
 msgid "Directory must have a parent or a storage"
-msgstr ""
+msgstr "Dizinin bir üst dizini ya da depolaması olmalı"
 
 #. module: document_webdav
 #: field:document.webdav.dir.property,do_subst:0
 #: field:document.webdav.file.property,do_subst:0
 msgid "Substitute"
-msgstr ""
+msgstr "Yedek"
diff --git a/addons/document_webdav/i18n/zh_CN.po b/addons/document_webdav/i18n/zh_CN.po
index edfff77e05a..4833a90c96d 100644
--- a/addons/document_webdav/i18n/zh_CN.po
+++ b/addons/document_webdav/i18n/zh_CN.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:30+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: document_webdav
 #: field:document.webdav.dir.property,create_date:0
diff --git a/addons/document_webdav/i18n/zh_TW.po b/addons/document_webdav/i18n/zh_TW.po
new file mode 100644
index 00000000000..121d57b341a
--- /dev/null
+++ b/addons/document_webdav/i18n/zh_TW.po
@@ -0,0 +1,196 @@
+# Chinese (Traditional) 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-02-08 00:36+0000\n"
+"PO-Revision-Date: 2012-08-30 11:51+0000\n"
+"Last-Translator: Bonnie Duan <bonnie.duan@cenoq.com>\n"
+"Language-Team: Cenoq Corp.\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-08-31 04:56+0000\n"
+"X-Generator: Launchpad (build 15887)\n"
+
+#. module: document_webdav
+#: field:document.webdav.dir.property,create_date:0
+#: field:document.webdav.file.property,create_date:0
+msgid "Date Created"
+msgstr "建立日期"
+
+#. module: document_webdav
+#: model:ir.ui.menu,name:document_webdav.menu_document_props
+msgid "Documents"
+msgstr "文件"
+
+#. module: document_webdav
+#: constraint:document.directory:0
+msgid "Error! You can not create recursive Directories."
+msgstr "錯誤! 您不能建立循環的目錄"
+
+#. module: document_webdav
+#: view:document.webdav.dir.property:0
+#: view:document.webdav.file.property:0
+msgid "Search Document properties"
+msgstr "搜尋文件目錄"
+
+#. module: document_webdav
+#: view:document.webdav.dir.property:0
+#: field:document.webdav.dir.property,namespace:0
+#: view:document.webdav.file.property:0
+#: field:document.webdav.file.property,namespace:0
+msgid "Namespace"
+msgstr "Namespace"
+
+#. module: document_webdav
+#: field:document.directory,dav_prop_ids:0
+msgid "DAV properties"
+msgstr "DAV 內容"
+
+#. module: document_webdav
+#: model:ir.model,name:document_webdav.model_document_webdav_file_property
+msgid "document.webdav.file.property"
+msgstr "document.webdav.file.property"
+
+#. module: document_webdav
+#: view:document.webdav.dir.property:0
+#: view:document.webdav.file.property:0
+msgid "Group By..."
+msgstr "群組...."
+
+#. module: document_webdav
+#: view:document.directory:0
+msgid "These properties will be added to WebDAV requests"
+msgstr "這些內容將被加到 WebDAV 請求"
+
+#. module: document_webdav
+#: model:ir.actions.act_window,name:document_webdav.action_file_props_form
+msgid "DAV Properties for Documents"
+msgstr "文件的DAV 內容"
+
+#. module: document_webdav
+#: code:addons/document_webdav/webdav.py:37
+#, python-format
+msgid "PyWebDAV Import Error!"
+msgstr "PyWebDAV 匯入錯誤!"
+
+#. module: document_webdav
+#: view:document.webdav.file.property:0
+#: field:document.webdav.file.property,file_id:0
+msgid "Document"
+msgstr "文件"
+
+#. module: document_webdav
+#: model:ir.ui.menu,name:document_webdav.menu_folder_props
+msgid "Folders"
+msgstr "檔案夾"
+
+#. module: document_webdav
+#: sql_constraint:document.directory:0
+msgid "Directory cannot be parent of itself!"
+msgstr "目錄不能成為自己的母目錄!"
+
+#. module: document_webdav
+#: view:document.directory:0
+msgid "Dynamic context"
+msgstr "動態背景"
+
+#. module: document_webdav
+#: view:document.directory:0
+msgid "WebDAV properties"
+msgstr "WebDAV 內容"
+
+#. module: document_webdav
+#: sql_constraint:document.directory:0
+msgid "The directory name must be unique !"
+msgstr "目錄名不能重覆！"
+
+#. module: document_webdav
+#: code:addons/document_webdav/webdav.py:37
+#, python-format
+msgid ""
+"Please install PyWebDAV from "
+"http://code.google.com/p/pywebdav/downloads/detail?name=PyWebDAV-"
+"0.9.4.tar.gz&can=2&q=/"
+msgstr ""
+"從 http://code.google.com/p/pywebdav/downloads/detail?name=PyWebDAV-"
+"0.9.4.tar.gz&can=2&q=/，請安裝 PyWebDAV"
+
+#. module: document_webdav
+#: model:ir.actions.act_window,name:document_webdav.action_dir_props_form
+msgid "DAV Properties for Folders"
+msgstr "DAV 檔案夾內容"
+
+#. module: document_webdav
+#: view:document.directory:0
+#: view:document.webdav.dir.property:0
+#: view:document.webdav.file.property:0
+msgid "Properties"
+msgstr "內容"
+
+#. module: document_webdav
+#: field:document.webdav.dir.property,name:0
+#: field:document.webdav.file.property,name:0
+msgid "Name"
+msgstr "名稱"
+
+#. module: document_webdav
+#: model:ir.model,name:document_webdav.model_document_webdav_dir_property
+msgid "document.webdav.dir.property"
+msgstr "document.webdav.dir.property"
+
+#. module: document_webdav
+#: field:document.webdav.dir.property,value:0
+#: field:document.webdav.file.property,value:0
+msgid "Value"
+msgstr "價值"
+
+#. module: document_webdav
+#: field:document.webdav.dir.property,dir_id:0
+#: model:ir.model,name:document_webdav.model_document_directory
+msgid "Directory"
+msgstr "目錄"
+
+#. module: document_webdav
+#: field:document.webdav.dir.property,write_uid:0
+#: field:document.webdav.file.property,write_uid:0
+msgid "Last Modification User"
+msgstr "最後修改使用者"
+
+#. module: document_webdav
+#: view:document.webdav.dir.property:0
+msgid "Dir"
+msgstr "路徑"
+
+#. module: document_webdav
+#: field:document.webdav.dir.property,write_date:0
+#: field:document.webdav.file.property,write_date:0
+msgid "Date Modified"
+msgstr "修改日期"
+
+#. module: document_webdav
+#: field:document.webdav.dir.property,create_uid:0
+#: field:document.webdav.file.property,create_uid:0
+msgid "Creator"
+msgstr "建立者"
+
+#. module: document_webdav
+#: model:ir.ui.menu,name:document_webdav.menu_properties
+msgid "DAV Properties"
+msgstr "DAV 內容"
+
+#. module: document_webdav
+#: sql_constraint:document.directory:0
+msgid "Directory must have a parent or a storage"
+msgstr "目錄必須要有母目錄或儲存室"
+
+#. module: document_webdav
+#: field:document.webdav.dir.property,do_subst:0
+#: field:document.webdav.file.property,do_subst:0
+msgid "Substitute"
+msgstr "替代項目"
diff --git a/addons/document_webdav/nodes.py b/addons/document_webdav/nodes.py
index d6ceca458cd..a8fedee4fe3 100644
--- a/addons/document_webdav/nodes.py
+++ b/addons/document_webdav/nodes.py
@@ -25,6 +25,8 @@ from tools.safe_eval import safe_eval as eval
 import time
 import urllib
 import uuid
+from openerp import SUPERUSER_ID
+
 try:
     from tools.dict_tools import dict_filter
 except ImportError:
@@ -233,7 +235,7 @@ class node_acl_mixin(object):
         
         if props_to_delete:
             # explicitly delete, as admin, any of the ids we have identified.
-            propobj.unlink(cr, 1, props_to_delete)
+            propobj.unlink(cr, SUPERUSER_ID, props_to_delete)
         
         if lock_data.get('unlock_mode', False):
             return lock_found and True
diff --git a/addons/document_webdav/test_davclient.py b/addons/document_webdav/test_davclient.py
index f1f2e58c835..0f66363c553 100755
--- a/addons/document_webdav/test_davclient.py
+++ b/addons/document_webdav/test_davclient.py
@@ -42,6 +42,7 @@ from tools import config
 from xmlrpclib import Transport, ProtocolError
 import StringIO
 import base64
+from openerp import SUPERUSER_ID
 
 _logger = logging.getLogger(__name__)
 
@@ -361,7 +362,7 @@ class DAVClient(object):
         to break if "base_crypt" is used.
         """
         ruob = obj.pool.get('res.users')
-        res = ruob.read(cr, 1, [uid,], ['login', 'password'])
+        res = ruob.read(cr, SUPERUSER_ID, [uid,], ['login', 'password'])
         assert res, "uid %s not found" % uid
         self.user = res[0]['login']
         self.passwd = res[0]['password']
diff --git a/addons/edi/__openerp__.py b/addons/edi/__openerp__.py
index f441b1bbb89..eb64d9b3fdd 100644
--- a/addons/edi/__openerp__.py
+++ b/addons/edi/__openerp__.py
@@ -36,21 +36,11 @@ documentation at http://doc.openerp.com.
     'website': 'http://www.openerp.com',
     'depends': ['base', 'email_template'],
     'icon': '/edi/static/src/img/knowledge.png',
-    'data': [
-        'security/ir.model.access.csv',
-    ],
-    'test': [
-        'test/edi_partner_test.yml',
-    ],
-    'js': [
-        'static/src/js/edi.js',
-    ],
-    "css": [
-        "static/src/css/edi.css"
-    ],
-    'qweb': [
-        "static/src/xml/*.xml",
-    ],
+    'data': ['security/ir.model.access.csv'],
+    'test': ['test/edi_partner_test.yml'],
+    'js': ['static/src/js/edi.js'],
+    'css': ['static/src/css/edi.css'],
+    'qweb': ['static/src/xml/*.xml'],
     'installable': True,
     'auto_install': False,
     'certificate': '002046536359186',
diff --git a/addons/edi/i18n/ar.po b/addons/edi/i18n/ar.po
index 45ce2f2c34c..3f6b05d4d6f 100644
--- a/addons/edi/i18n/ar.po
+++ b/addons/edi/i18n/ar.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: edi
 #: sql_constraint:res.currency:0
diff --git a/addons/edi/i18n/de.po b/addons/edi/i18n/de.po
index 15bc8dd73b4..8016c93c2ba 100644
--- a/addons/edi/i18n/de.po
+++ b/addons/edi/i18n/de.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: edi
 #: sql_constraint:res.currency:0
diff --git a/addons/edi/i18n/es.po b/addons/edi/i18n/es.po
index 56dbdbf39d5..f512e4f3b2a 100644
--- a/addons/edi/i18n/es.po
+++ b/addons/edi/i18n/es.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: edi
 #: sql_constraint:res.currency:0
diff --git a/addons/edi/i18n/es_CR.po b/addons/edi/i18n/es_CR.po
index 9452e50c51d..b7281068f85 100644
--- a/addons/edi/i18n/es_CR.po
+++ b/addons/edi/i18n/es_CR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: edi
 #: sql_constraint:res.currency:0
diff --git a/addons/edi/i18n/fi.po b/addons/edi/i18n/fi.po
index 4b1b5b8d4e6..d8a956c7495 100644
--- a/addons/edi/i18n/fi.po
+++ b/addons/edi/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: edi
 #: sql_constraint:res.currency:0
diff --git a/addons/edi/i18n/fr.po b/addons/edi/i18n/fr.po
index 03037acd322..e7ab2a31d59 100644
--- a/addons/edi/i18n/fr.po
+++ b/addons/edi/i18n/fr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: edi
 #: sql_constraint:res.currency:0
diff --git a/addons/edi/i18n/ja.po b/addons/edi/i18n/ja.po
index 2e0cea1af7f..13804623d4b 100644
--- a/addons/edi/i18n/ja.po
+++ b/addons/edi/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: edi
 #: sql_constraint:res.currency:0
diff --git a/addons/edi/i18n/mn.po b/addons/edi/i18n/mn.po
index c5d63fb984a..1244ac3e8d4 100644
--- a/addons/edi/i18n/mn.po
+++ b/addons/edi/i18n/mn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: edi
 #: sql_constraint:res.currency:0
@@ -79,12 +79,12 @@ msgstr ""
 #. module: edi
 #: help:edi.document,document:0
 msgid "EDI document content"
-msgstr ""
+msgstr "Эди баримтын агуулга"
 
 #. module: edi
 #: model:ir.model,name:edi.model_edi_document
 msgid "EDI Document"
-msgstr ""
+msgstr "EDI баримт"
 
 #. module: edi
 #: code:addons/edi/models/edi.py:48
@@ -101,7 +101,7 @@ msgstr ""
 #: code:addons/edi/models/edi.py:152
 #, python-format
 msgid "Missing Application"
-msgstr ""
+msgstr "Байхгүй Аппликешн"
 
 #. module: edi
 #: field:edi.document,document:0
@@ -111,12 +111,12 @@ msgstr ""
 #. openerp-web
 #: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:23
 msgid "View/Print"
-msgstr ""
+msgstr "Харах/Хэвлэх"
 
 #. openerp-web
 #: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:28
 msgid "Import this document"
-msgstr ""
+msgstr "Баримт импортлох"
 
 #. openerp-web
 #: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:33
@@ -126,7 +126,7 @@ msgstr ""
 #. openerp-web
 #: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:36
 msgid "OpenERP instance address:"
-msgstr ""
+msgstr "OpenERP жишээ хаяг:"
 
 #. openerp-web
 #: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:39
@@ -146,7 +146,7 @@ msgstr ""
 #. openerp-web
 #: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:52
 msgid "Import into another application"
-msgstr ""
+msgstr "Импортлох бусад аппликешн"
 
 #. openerp-web
 #: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:54
@@ -177,7 +177,7 @@ msgstr ""
 #. openerp-web
 #: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:60
 msgid "OpenERP documentation"
-msgstr ""
+msgstr "OpenERP бичиг баримт"
 
 #. openerp-web
 #: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:61
@@ -252,7 +252,7 @@ msgstr ""
 #. openerp-web
 #: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:53
 msgid "Discount"
-msgstr ""
+msgstr "Хөнгөлөлт"
 
 #. openerp-web
 #: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:54
@@ -286,7 +286,7 @@ msgstr ""
 #. openerp-web
 #: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:107
 msgid "Base Amount"
-msgstr ""
+msgstr "Үндсэн дүн"
 
 #. openerp-web
 #: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:108
@@ -303,13 +303,13 @@ msgstr ""
 #: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:129
 #: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:121
 msgid "Pay Online"
-msgstr ""
+msgstr "Онлайн төлбөр"
 
 #. openerp-web
 #: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:133
 #: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:125
 msgid "Paypal"
-msgstr ""
+msgstr "Paypal"
 
 #. openerp-web
 #: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:135
@@ -321,13 +321,13 @@ msgstr ""
 #: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:145
 #: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:137
 msgid "Bank Wire Transfer"
-msgstr ""
+msgstr "Банк хоорондын шилжүүлэг"
 
 #. openerp-web
 #: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:147
 #: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:139
 msgid "Please transfer"
-msgstr ""
+msgstr "Шилжүүлэг хийнэ үү"
 
 #. openerp-web
 #: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:148
@@ -363,12 +363,12 @@ msgstr ""
 #. openerp-web
 #: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:43
 msgid "Payment terms"
-msgstr ""
+msgstr "Төлбөрийн хугацаа"
 
 #. openerp-web
 #: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:60
 msgid "Discount(%)"
-msgstr ""
+msgstr "Хөнгөлөлт(%)"
 
 #. openerp-web
 #: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:127
diff --git a/addons/edi/i18n/nb.po b/addons/edi/i18n/nb.po
new file mode 100644
index 00000000000..bc8add1e6e9
--- /dev/null
+++ b/addons/edi/i18n/nb.po
@@ -0,0 +1,411 @@
+# Norwegian Bokmal 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-02-08 01:37+0100\n"
+"PO-Revision-Date: 2012-09-08 19:13+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Norwegian Bokmal <nb@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-09-09 04:53+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
+
+#. module: edi
+#: sql_constraint:res.currency:0
+msgid "The currency code must be unique per company!"
+msgstr "Valutakode må være unik pr. firma!"
+
+#. module: edi
+#: model:ir.model,name:edi.model_res_partner_address
+msgid "Partner Addresses"
+msgstr "Partner adresser"
+
+#. module: edi
+#: sql_constraint:res.company:0
+msgid "The company name must be unique !"
+msgstr "Firmanavn må være unikt !"
+
+#. module: edi
+#: constraint:res.partner:0
+msgid "Error ! You cannot create recursive associated members."
+msgstr "Feil! Du kan ikke opprette rekursive tilknyttede medlemmer."
+
+#. module: edi
+#: field:edi.document,name:0
+msgid "EDI token"
+msgstr "EDI tegn."
+
+#. module: edi
+#: help:edi.document,name:0
+msgid "Unique identifier for retrieving an EDI document."
+msgstr "Unik identifikator for å hente en EDI dokument."
+
+#. module: edi
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr "Feil ! Du kan ikke lage rekursive firmaer."
+
+#. module: edi
+#: model:ir.model,name:edi.model_res_company
+msgid "Companies"
+msgstr "Firmaer"
+
+#. module: edi
+#: sql_constraint:edi.document:0
+msgid "EDI Tokens must be unique!"
+msgstr "EDI tegnet må være unikt!"
+
+#. module: edi
+#: model:ir.model,name:edi.model_res_currency
+msgid "Currency"
+msgstr "Valuta"
+
+#. module: edi
+#: code:addons/edi/models/edi.py:153
+#, 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 ""
+"Dokumentet du prøver å importere krever OpenERP `% s` søknad. Du kan "
+"installere det ved å koble som administrator og åpne konfigurasjonen "
+"assistent."
+
+#. module: edi
+#: help:edi.document,document:0
+msgid "EDI document content"
+msgstr "EDI dokumentinnhold"
+
+#. module: edi
+#: model:ir.model,name:edi.model_edi_document
+msgid "EDI Document"
+msgstr "EDI dokument."
+
+#. module: edi
+#: code:addons/edi/models/edi.py:48
+#, python-format
+msgid "'%s' is an invalid external ID"
+msgstr "'% s' er en ugyldig ekstern ID."
+
+#. module: edi
+#: model:ir.model,name:edi.model_res_partner
+msgid "Partner"
+msgstr "Partner"
+
+#. module: edi
+#: code:addons/edi/models/edi.py:152
+#, python-format
+msgid "Missing Application"
+msgstr "Manglende Søknad."
+
+#. module: edi
+#: field:edi.document,document:0
+msgid "Document"
+msgstr "Dokument"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:23
+msgid "View/Print"
+msgstr "Vis / Skriv ut"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:28
+msgid "Import this document"
+msgstr "Importer dette dokumentet."
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:33
+msgid "Import it into an existing OpenERP instance"
+msgstr "Importere den inn i en eksisterende OpenERP eksempel."
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:36
+msgid "OpenERP instance address:"
+msgstr "OpenERP eksempel adresse:"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:39
+msgid "Import"
+msgstr "Import"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:44
+msgid "Import it into a new OpenERP Online instance"
+msgstr "Importere den til en ny OpenERP Online eksempel."
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:47
+msgid "Create my new OpenERP instance"
+msgstr "Opprett min nye OpenERP eksempel."
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:52
+msgid "Import into another application"
+msgstr "Importere til et annet program."
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:54
+msgid ""
+"OpenERP's Electronic Data Interchange documents are based on a generic and "
+"language\n"
+"                            independent"
+msgstr ""
+"OpenERP's elektronisk Data utveksler dokumentene er basert på en generisk og "
+"språk.\n"
+"                                                                             "
+"                                                                 uavhengig."
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:56
+msgid "JSON"
+msgstr "JSON"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:56
+msgid ""
+"serialization of the document's attribute.\n"
+"                            It is usually very quick and straightforward to "
+"create a small plug-in for your preferred\n"
+"                            application that will be capable of importing "
+"any OpenERP EDI document.\n"
+"                            You can find out more details about how to do "
+"this and what the content of OpenERP EDI documents\n"
+"                            is like in the"
+msgstr ""
+"Serialisering av dokumentets attributtet.\n"
+"                             Det er vanligvis svært rask og grei å lage en "
+"liten plug-in for din foretrukne.\n"
+"                             program som vil være i stand til å importere "
+"noen OpenERP EDI dokument.\n"
+"                             Du kan finne ut mer informasjon om hvordan du "
+"gjør dette og hva innholdet i OpenERP EDI dokumenter\n"
+"                             er som i."
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:60
+msgid "OpenERP documentation"
+msgstr "OpenERP dokumentasjon."
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:61
+msgid "To get started immediately,"
+msgstr "Å komme i gang umiddelbart,"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:62
+msgid "see is all it takes to use this EDI document in Python"
+msgstr "Se er alt som trengs for å bruke denne EDI dokumentet i Python."
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:70
+msgid "You can download the raw EDI document here:"
+msgstr "Du kan laste ned den rå EDI dokumentet her:"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:73
+msgid "Download"
+msgstr "Nedlastning"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:87
+msgid "Powered by"
+msgstr "Drevet av."
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:87
+msgid "OpenERP"
+msgstr "OpenERP"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:34
+msgid "Invoice"
+msgstr "Faktura"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:37
+msgid "Description"
+msgstr "Beskrivelse:"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:38
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:41
+msgid "Date"
+msgstr "Dato"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:39
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:40
+msgid "Your Reference"
+msgstr "Din referanse."
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:50
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:57
+msgid "Product Description"
+msgstr "Produktbeskrivelse"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:51
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:58
+msgid "Quantity"
+msgstr "Antall"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:52
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:59
+msgid "Unit Price"
+msgstr "Enhetspris"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:53
+msgid "Discount"
+msgstr "Rabatt"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:54
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:61
+msgid "Price"
+msgstr "Pris"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:72
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:81
+msgid "Net Total:"
+msgstr "Netto total:"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:83
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:92
+msgid "Taxes:"
+msgstr "Avgifter:"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:94
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:103
+msgid "Total:"
+msgstr "Totalt:"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:106
+msgid "Tax"
+msgstr "Skatt"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:107
+msgid "Base Amount"
+msgstr "Grunnbeløp"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:108
+msgid "Amount"
+msgstr "Beløp"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:121
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:113
+msgid "Notes:"
+msgstr "Notater:"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:129
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:121
+msgid "Pay Online"
+msgstr "Betal online."
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:133
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:125
+msgid "Paypal"
+msgstr "Paypal"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:135
+msgid ""
+"You may directly pay this invoice online via Paypal's secure payment gateway:"
+msgstr ""
+"Du kan betale direkte denne fakturaen online via Paypal er sikker betaling "
+"gateway:"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:145
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:137
+msgid "Bank Wire Transfer"
+msgstr "Bank Tråd overføring."
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:147
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:139
+msgid "Please transfer"
+msgstr "Vennligst overfør."
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:148
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:140
+msgid "to"
+msgstr "til"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:149
+msgid ""
+"(postal address on the invoice header)\n"
+"                     using one of the following bank accounts. Be sure to "
+"mention the invoice\n"
+"                     reference"
+msgstr ""
+"(postadresse på fakturaen header)\n"
+"Ved hjelp av en av følgende bankkontoer. Sørg for å nevne faktura.\n"
+"Referanse."
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:151
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:143
+msgid "on the transfer:"
+msgstr "På overføring:"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:36
+msgid "Order"
+msgstr "Ordre"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:42
+msgid "Salesman"
+msgstr "Selger"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:43
+msgid "Payment terms"
+msgstr "Betalingsbetingelser"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:60
+msgid "Discount(%)"
+msgstr "Raball(%)"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:127
+msgid ""
+"You may directly pay this order online via Paypal's secure payment gateway:"
+msgstr ""
+"Du kan betale direkte i denne rekkefølgen online via Paypal's sikker "
+"betaling gateway."
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:141
+msgid ""
+"(postal address on the order header)\n"
+"                     using one of the following bank accounts. Be sure to "
+"mention the document\n"
+"                     reference"
+msgstr ""
+"Ostal adresse på bestillingen topp)\n"
+"Ved hjelp av en av følgende bankkontoer. Sørg for å nevne dokumentet.\n"
+"Referanse."
diff --git a/addons/edi/i18n/nl.po b/addons/edi/i18n/nl.po
index f0c17f06883..27e38ce6199 100644
--- a/addons/edi/i18n/nl.po
+++ b/addons/edi/i18n/nl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: edi
 #: sql_constraint:res.currency:0
diff --git a/addons/edi/i18n/pl.po b/addons/edi/i18n/pl.po
index b9e81e59f78..1efbd4977f2 100644
--- a/addons/edi/i18n/pl.po
+++ b/addons/edi/i18n/pl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: edi
 #: sql_constraint:res.currency:0
diff --git a/addons/edi/i18n/pt.po b/addons/edi/i18n/pt.po
index 7ba0c2f1359..ced87e79390 100644
--- a/addons/edi/i18n/pt.po
+++ b/addons/edi/i18n/pt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: edi
 #: sql_constraint:res.currency:0
diff --git a/addons/edi/i18n/pt_BR.po b/addons/edi/i18n/pt_BR.po
index 359c6c7796b..4dcb9d840e5 100644
--- a/addons/edi/i18n/pt_BR.po
+++ b/addons/edi/i18n/pt_BR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: edi
 #: sql_constraint:res.currency:0
diff --git a/addons/edi/i18n/ro.po b/addons/edi/i18n/ro.po
index b74cb3d16e1..0a8d9906526 100644
--- a/addons/edi/i18n/ro.po
+++ b/addons/edi/i18n/ro.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: edi
 #: sql_constraint:res.currency:0
diff --git a/addons/edi/i18n/sv.po b/addons/edi/i18n/sv.po
index 69bdba29c85..1ecc7a47a83 100644
--- a/addons/edi/i18n/sv.po
+++ b/addons/edi/i18n/sv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: edi
 #: sql_constraint:res.currency:0
diff --git a/addons/edi/i18n/tr.po b/addons/edi/i18n/tr.po
index 807b22a52d2..1da93b3254b 100644
--- a/addons/edi/i18n/tr.po
+++ b/addons/edi/i18n/tr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: edi
 #: sql_constraint:res.currency:0
diff --git a/addons/edi/i18n/zh_CN.po b/addons/edi/i18n/zh_CN.po
index 3251e188ef6..6a5f21f5c70 100644
--- a/addons/edi/i18n/zh_CN.po
+++ b/addons/edi/i18n/zh_CN.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: edi
 #: sql_constraint:res.currency:0
diff --git a/addons/edi/i18n/zh_TW.po b/addons/edi/i18n/zh_TW.po
new file mode 100644
index 00000000000..3ea35742e44
--- /dev/null
+++ b/addons/edi/i18n/zh_TW.po
@@ -0,0 +1,386 @@
+# Chinese (Traditional) 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-02-08 01:37+0100\n"
+"PO-Revision-Date: 2012-08-30 11:51+0000\n"
+"Last-Translator: Bonnie Duan <bonnie.duan@cenoq.com>\n"
+"Language-Team: Cenoq Corp.\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-08-31 04:56+0000\n"
+"X-Generator: Launchpad (build 15887)\n"
+
+#. module: edi
+#: sql_constraint:res.currency:0
+msgid "The currency code must be unique per company!"
+msgstr "每個公司的貨幣代碼必須唯一"
+
+#. module: edi
+#: model:ir.model,name:edi.model_res_partner_address
+msgid "Partner Addresses"
+msgstr "業務夥伴地址"
+
+#. module: edi
+#: sql_constraint:res.company:0
+msgid "The company name must be unique !"
+msgstr "公司名稱必須唯一！"
+
+#. module: edi
+#: constraint:res.partner:0
+msgid "Error ! You cannot create recursive associated members."
+msgstr "錯誤，您不能建立循環引用的會員"
+
+#. module: edi
+#: field:edi.document,name:0
+msgid "EDI token"
+msgstr "EDI權杖"
+
+#. module: edi
+#: help:edi.document,name:0
+msgid "Unique identifier for retrieving an EDI document."
+msgstr "接收EDI文件的唯一標識符"
+
+#. module: edi
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr "錯誤！您不能建立循環引用的公司."
+
+#. module: edi
+#: model:ir.model,name:edi.model_res_company
+msgid "Companies"
+msgstr "公司"
+
+#. module: edi
+#: sql_constraint:edi.document:0
+msgid "EDI Tokens must be unique!"
+msgstr "EDI權杖必須唯一"
+
+#. module: edi
+#: model:ir.model,name:edi.model_res_currency
+msgid "Currency"
+msgstr "貨幣"
+
+#. module: edi
+#: code:addons/edi/models/edi.py:153
+#, 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 "你要匯入的文件需要OpenERP的 %s 模組。你可以用管理員使用者安裝並打開配置精靈。"
+
+#. module: edi
+#: help:edi.document,document:0
+msgid "EDI document content"
+msgstr "EDI文件內容"
+
+#. module: edi
+#: model:ir.model,name:edi.model_edi_document
+msgid "EDI Document"
+msgstr "EDI文件"
+
+#. module: edi
+#: code:addons/edi/models/edi.py:48
+#, python-format
+msgid "'%s' is an invalid external ID"
+msgstr "%s是個無效的外部ID"
+
+#. module: edi
+#: model:ir.model,name:edi.model_res_partner
+msgid "Partner"
+msgstr "業務夥伴"
+
+#. module: edi
+#: code:addons/edi/models/edi.py:152
+#, python-format
+msgid "Missing Application"
+msgstr "不存在此功能"
+
+#. module: edi
+#: field:edi.document,document:0
+msgid "Document"
+msgstr "文件"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:23
+msgid "View/Print"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:28
+msgid "Import this document"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:33
+msgid "Import it into an existing OpenERP instance"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:36
+msgid "OpenERP instance address:"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:39
+msgid "Import"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:44
+msgid "Import it into a new OpenERP Online instance"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:47
+msgid "Create my new OpenERP instance"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:52
+msgid "Import into another application"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:54
+msgid ""
+"OpenERP's Electronic Data Interchange documents are based on a generic and "
+"language\n"
+"                            independent"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:56
+msgid "JSON"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:56
+msgid ""
+"serialization of the document's attribute.\n"
+"                            It is usually very quick and straightforward to "
+"create a small plug-in for your preferred\n"
+"                            application that will be capable of importing "
+"any OpenERP EDI document.\n"
+"                            You can find out more details about how to do "
+"this and what the content of OpenERP EDI documents\n"
+"                            is like in the"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:60
+msgid "OpenERP documentation"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:61
+msgid "To get started immediately,"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:62
+msgid "see is all it takes to use this EDI document in Python"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:70
+msgid "You can download the raw EDI document here:"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:73
+msgid "Download"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:87
+msgid "Powered by"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:87
+msgid "OpenERP"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:34
+msgid "Invoice"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:37
+msgid "Description"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:38
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:41
+msgid "Date"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:39
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:40
+msgid "Your Reference"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:50
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:57
+msgid "Product Description"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:51
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:58
+msgid "Quantity"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:52
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:59
+msgid "Unit Price"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:53
+msgid "Discount"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:54
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:61
+msgid "Price"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:72
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:81
+msgid "Net Total:"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:83
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:92
+msgid "Taxes:"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:94
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:103
+msgid "Total:"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:106
+msgid "Tax"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:107
+msgid "Base Amount"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:108
+msgid "Amount"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:121
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:113
+msgid "Notes:"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:129
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:121
+msgid "Pay Online"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:133
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:125
+msgid "Paypal"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:135
+msgid ""
+"You may directly pay this invoice online via Paypal's secure payment gateway:"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:145
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:137
+msgid "Bank Wire Transfer"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:147
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:139
+msgid "Please transfer"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:148
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:140
+msgid "to"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:149
+msgid ""
+"(postal address on the invoice header)\n"
+"                     using one of the following bank accounts. Be sure to "
+"mention the invoice\n"
+"                     reference"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:151
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:143
+msgid "on the transfer:"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:36
+msgid "Order"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:42
+msgid "Salesman"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:43
+msgid "Payment terms"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:60
+msgid "Discount(%)"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:127
+msgid ""
+"You may directly pay this order online via Paypal's secure payment gateway:"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:141
+msgid ""
+"(postal address on the order header)\n"
+"                     using one of the following bank accounts. Be sure to "
+"mention the document\n"
+"                     reference"
+msgstr ""
diff --git a/addons/edi/static/src/js/edi.js b/addons/edi/static/src/js/edi.js
index 78e90852c38..abb6d9a6232 100644
--- a/addons/edi/static/src/js/edi.js
+++ b/addons/edi/static/src/js/edi.js
@@ -28,14 +28,14 @@ openerp.edi.EdiView = openerp.web.Widget.extend({
         if (openerp.web.qweb.templates[template_content]) {
             this.content = openerp.web.qweb.render(template_content, param);
         }
-        this.$element.html(openerp.web.qweb.render("EdiView", param));
-        this.$element.find('button.oe_edi_action_print').bind('click', this.do_print);
-        this.$element.find('button#oe_edi_import_existing').bind('click', this.do_import_existing);
-        this.$element.find('button#oe_edi_import_create').bind('click', this.do_import_create);
-        this.$element.find('button#oe_edi_download').bind('click', this.do_download);
-        this.$element.find('.oe_edi_import_choice, .oe_edi_import_choice_label').bind('click', this.toggle_choice('import'));
-        this.$element.find('.oe_edi_pay_choice, .oe_edi_pay_choice_label').bind('click', this.toggle_choice('pay'));
-        this.$element.find('#oe_edi_download_show_code').bind('click', this.show_code);
+        this.$el.html(openerp.web.qweb.render("EdiView", param));
+        this.$el.find('button.oe_edi_action_print').bind('click', this.do_print);
+        this.$el.find('button#oe_edi_import_existing').bind('click', this.do_import_existing);
+        this.$el.find('button#oe_edi_import_create').bind('click', this.do_import_create);
+        this.$el.find('button#oe_edi_download').bind('click', this.do_download);
+        this.$el.find('.oe_edi_import_choice, .oe_edi_import_choice_label').bind('click', this.toggle_choice('import'));
+        this.$el.find('.oe_edi_pay_choice, .oe_edi_pay_choice_label').bind('click', this.toggle_choice('pay'));
+        this.$el.find('#oe_edi_download_show_code').bind('click', this.show_code);
     },
     on_document_failed: function(response) {
         var self = this;
@@ -85,7 +85,7 @@ openerp.edi.EdiView = openerp.web.Widget.extend({
     },
     do_import_existing: function(e) {
         var url_download = this.get_download_url();
-        var $edi_text_server_input = this.$element.find('#oe_edi_txt_server_url');
+        var $edi_text_server_input = this.$el.find('#oe_edi_txt_server_url');
         var server_url = $edi_text_server_input.val();
         $edi_text_server_input.removeClass('invalid');
         if (!server_url) {
@@ -138,14 +138,14 @@ openerp.edi.EdiImport = openerp.web.Widget.extend({
     show_login: function() {
         this.destroy_content();
         this.login = new openerp.web.Login(this);
-        this.login.appendTo(this.$element);
+        this.login.appendTo(this.$el);
     },
 
     destroy_content: function() {
         _.each(_.clone(this.getChildren()), function(el) {
             el.destroy();
         });
-        this.$element.children().remove();
+        this.$el.children().remove();
     },
 
     do_import: function() {
diff --git a/addons/edi/static/src/xml/edi.xml b/addons/edi/static/src/xml/edi.xml
index 88e09824b9b..111cb6d9d26 100644
--- a/addons/edi/static/src/xml/edi.xml
+++ b/addons/edi/static/src/xml/edi.xml
@@ -6,7 +6,7 @@
     <t t-call="WebClient"/>
 </t>
 <t t-name="EdiView">
-    <table border="0" cellpadding="0" cellspacing="0" width="100%" height="100%" id="oe_app" class="oe-application oe_forms">
+    <table border="0" cellpadding="0" cellspacing="0" width="100%" height="100%" id="oe_app" class="oe-application oe_forms oe_semantic_html_override">
     <tr>
         <td colspan="2" valign="top" id="oe_header" class="header">
             <div> <a href="/" class="company_logo_link">
diff --git a/addons/email_template/__openerp__.py b/addons/email_template/__openerp__.py
index 3ecf1db1aa0..aaf2f52289a 100644
--- a/addons/email_template/__openerp__.py
+++ b/addons/email_template/__openerp__.py
@@ -21,13 +21,13 @@
 ##############################################################################
 
 {
-    "name" : "Email Templates",
-    "version" : "1.1",
-    "author" : "OpenERP,OpenLabs",
-    "website" : "http://openerp.com",
-    "category" : "Marketing",
-    "depends" : ['mail'],
-    "description": """
+    'name' : 'Email Templates',
+    'version' : '1.1',
+    'author' : 'OpenERP,OpenLabs',
+    'website' : 'http://openerp.com',
+    'category' : 'Marketing',
+    'depends' : ['mail'],
+    'description': """
 Email Templating (simplified version of the original Power Email by Openlabs).
 ==============================================================================
 
@@ -53,22 +53,19 @@ These email templates are also at the heart of the marketing campaign system
 (see the ``marketing_campaign`` application), if you need to automate larger
 campaigns on any OpenERP document.
 
-Technical note: only the templating system of the original Power Email by
-Openlabs was kept.
+    **Technical note:** only the templating system of the original Power Email by Openlabs was kept.
     """,
-    "data": [
+    'data': [
         'wizard/email_template_preview_view.xml',
         'email_template_view.xml',
         'res_partner_view.xml',
         'wizard/mail_compose_message_view.xml',
         'security/ir.model.access.csv'
     ],
-    "demo": [
-        'res_partner_demo.yml',
-    ],
-    "installable": True,
-    "auto_install": False,
-    "certificate" : "00817073628967384349",
+    'demo': ['res_partner_demo.yml'],
+    'installable': True,
+    'auto_install': False,
+    'certificate' : '00817073628967384349',
     'images': ['images/1_email_account.jpeg','images/2_email_template.jpeg','images/3_emails.jpeg'],
 }
 
diff --git a/addons/email_template/email_template.py b/addons/email_template/email_template.py
index b43b7d19b85..4080e62f002 100644
--- a/addons/email_template/email_template.py
+++ b/addons/email_template/email_template.py
@@ -28,6 +28,8 @@ from osv import osv
 from osv import fields
 import tools
 from tools.translate import _
+from tools.html_sanitize import html_sanitize
+from tools import append_content_to_html
 from urllib import quote as quote
 _logger = logging.getLogger(__name__)
 
@@ -38,10 +40,8 @@ except ImportError:
 
 class email_template(osv.osv):
     "Templates for sending email"
-    _inherit = 'mail.message'
     _name = "email.template"
     _description = 'Email Templates'
-    _rec_name = 'name' # override mail.message's behavior
 
     def render_template(self, cr, uid, template, model, res_id, context=None):
         """Render the given template text, replace mako expressions ``${expr}``
@@ -99,66 +99,46 @@ class email_template(osv.osv):
         mod_name = False
         if model_id:
             mod_name = self.pool.get('ir.model').browse(cr, uid, model_id, context).model
-        return {'value':{'model': mod_name}}
-
-    def name_get(self, cr, uid, ids, context=None):
-        """ Override name_get of mail.message: return directly the template
-            name, and not the generated name from mail.message.common."""
-        return [(record.id, record.name) for record in self.browse(cr, uid, ids, context=context)]
+        return {'value': {'model': mod_name}}
 
     _columns = {
-        'name': fields.char('Name', size=250),
-        'model_id': fields.many2one('ir.model', 'Related document model'),
-        'lang': fields.char('Language Selection', size=250,
+        'name': fields.char('Name'),
+        'model_id': fields.many2one('ir.model', 'Applies to', help="The kind of document with with this template can be used"),
+        'model': fields.related('model_id', 'model', type='char', string='Related Document Model',
+                                size=128, select=True, store=True, readonly=True),
+        'lang': fields.char('Language',
                             help="Optional translation language (ISO code) to select when sending out an email. "
                                  "If not set, the english version will be used. "
                                  "This should usually be a placeholder expression "
                                  "that provides the appropriate language code, e.g. "
-                                 "${object.partner_id.lang.code}."),
+                                 "${object.partner_id.lang.code}.",
+                            placeholder="${object.partner_id.lang.code}"),
         'user_signature': fields.boolean('Add Signature',
                                          help="If checked, the user's signature will be appended to the text version "
                                               "of the message"),
-        'report_name': fields.char('Report Filename', size=200, translate=True,
-                                   help="Name to use for the generated report file (may contain placeholders)\n"
-                                        "The extension can be omitted and will then come from the report type."),
-        'report_template':fields.many2one('ir.actions.report.xml', 'Optional report to print and attach'),
-        'ref_ir_act_window':fields.many2one('ir.actions.act_window', 'Sidebar action', readonly=True,
-                                            help="Sidebar action to make this template available on records "
-                                                 "of the related document model"),
-        'ref_ir_value':fields.many2one('ir.values', 'Sidebar Button', readonly=True,
-                                       help="Sidebar button to open the sidebar action"),
-        'track_campaign_item': fields.boolean('Resource Tracking',
-                                              help="Enable this is you wish to include a special tracking marker "
-                                                   "in outgoing emails so you can identify replies and link "
-                                                   "them back to the corresponding resource record. "
-                                                   "This is useful for CRM leads for example"),
-
-        # Overridden mail.message.common fields for technical reasons:
-        'model': fields.related('model_id','model', type='char', string='Related Document Model',
-                                size=128, select=True, store=True, readonly=True),
-        # we need a separate m2m table to avoid ID collisions with the original mail.message entries
-        'attachment_ids': fields.many2many('ir.attachment', 'email_template_attachment_rel', 'email_template_id',
-                                           'attachment_id', 'Files to attach',
-                                           help="You may attach files to this template, to be added to all "
-                                                "emails created from this template"),
-
-        # Overridden mail.message.common fields to make tooltips more appropriate:
-        'subject':fields.char('Subject', size=512, translate=True, help="Subject (placeholders may be used here)",),
-        'email_from': fields.char('From', size=128, help="Sender address (placeholders may be used here)"),
-        'email_to': fields.char('To', size=256, help="Comma-separated recipient addresses (placeholders may be used here)"),
-        'email_cc': fields.char('Cc', size=256, help="Carbon copy recipients (placeholders may be used here)"),
-        'email_bcc': fields.char('Bcc', size=256, help="Blind carbon copy recipients (placeholders may be used here)"),
-        'reply_to': fields.char('Reply-To', size=250, help="Preferred response address (placeholders may be used here)"),
+        'subject': fields.char('Subject', translate=True, help="Subject (placeholders may be used here)",),
+        'email_from': fields.char('From', help="Sender address (placeholders may be used here)"),
+        'email_to': fields.char('To', help="Comma-separated recipient addresses (placeholders may be used here)"),
+        'email_cc': fields.char('Cc', help="Carbon copy recipients (placeholders may be used here)"),
+        'reply_to': fields.char('Reply-To', help="Preferred response address (placeholders may be used here)"),
         'mail_server_id': fields.many2one('ir.mail_server', 'Outgoing Mail Server', readonly=False,
                                           help="Optional preferred server for outgoing mails. If not set, the highest "
                                                "priority one will be used."),
-        'body_text': fields.text('Text Contents', translate=True, help="Plaintext version of the message (placeholders may be used here)"),
-        'body_html': fields.text('Rich-text Contents', translate=True, help="Rich-text/HTML version of the message (placeholders may be used here)"),
-        'message_id': fields.char('Message-Id', size=256, help="Message-ID SMTP header to use in outgoing messages based on this template. "
-                                                               "Please note that this overrides the 'Resource Tracking' option, "
-                                                               "so if you simply need to track replies to outgoing emails, enable "
-                                                               "that option instead.\n"
-                                                               "Placeholders must be used here, as this value always needs to be unique!"),
+        'body_html': fields.text('Body', translate=True, help="Rich-text/HTML version of the message (placeholders may be used here)"),
+        'report_name': fields.char('Report Filename', translate=True,
+                                   help="Name to use for the generated report file (may contain placeholders)\n"
+                                        "The extension can be omitted and will then come from the report type."),
+        'report_template': fields.many2one('ir.actions.report.xml', 'Optional report to print and attach'),
+        'ref_ir_act_window': fields.many2one('ir.actions.act_window', 'Sidebar action', readonly=True,
+                                            help="Sidebar action to make this template available on records "
+                                                 "of the related document model"),
+        'ref_ir_value': fields.many2one('ir.values', 'Sidebar Button', readonly=True,
+                                       help="Sidebar button to open the sidebar action"),
+        'attachment_ids': fields.many2many('ir.attachment', 'email_template_attachment_rel', 'email_template_id',
+                                           'attachment_id', 'Attachments',
+                                           help="You may attach files to this template, to be added to all "
+                                                "emails created from this template"),
+        'auto_delete': fields.boolean('Auto Delete', help="Permanently delete this email after sending it, to save space"),
 
         # Fake fields used to implement the placeholder assistant
         'model_object_field': fields.many2one('ir.model.fields', string="Field",
@@ -172,12 +152,12 @@ class email_template(osv.osv):
                                                   help="When a relationship field is selected as first field, "
                                                        "this field lets you select the target field within the "
                                                        "destination document model (sub-model)."),
-        'null_value': fields.char('Null value', help="Optional value to use if the target field is empty", size=128),
-        'copyvalue': fields.char('Expression', size=256, help="Final placeholder expression, to be copy-pasted in the desired template field."),
+        'null_value': fields.char('Default Value', help="Optional value to use if the target field is empty"),
+        'copyvalue': fields.char('Placeholder Expression', help="Final placeholder expression, to be copy-pasted in the desired template field."),
     }
 
     _defaults = {
-        'track_campaign_item': True
+        'auto_delete': True,
     }
 
     def create_action(self, cr, uid, ids, context=None):
@@ -195,7 +175,7 @@ class email_template(osv.osv):
                  'res_model': 'mail.compose.message',
                  'src_model': src_obj,
                  'view_type': 'form',
-                 'context': "{'mail.compose.message.mode':'mass_mail', 'mail.compose.template_id' : %d}" % (template.id),
+                 'context': "{'default_composition_mode': 'mass_mail', 'default_template_id' : %d}" % (template.id),
                  'view_mode':'form,tree',
                  'view_id': res_id,
                  'target': 'new',
@@ -222,7 +202,7 @@ class email_template(osv.osv):
                 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)
-            except:
+            except Exception:
                 raise osv.except_osv(_("Warning"), _("Deletion of the action record failed."))
         return True
 
@@ -294,65 +274,33 @@ class email_template(osv.osv):
            :param res_id: id of the record to use for rendering the template (model
                           is taken from template definition)
            :returns: a dict containing all relevant fields for creating a new
-                     mail.message entry, with the addition one additional
-                     special key ``attachments`` containing a list of
+                     mail.mail entry, with one extra key ``attachments``, in the
+                     format expected by :py:meth:`mail_thread.message_post`.
         """
         if context is None:
             context = {}
-        values = {
-                  'subject': False,
-                  'body_text': False,
-                  'body_html': False,
-                  'email_from': False,
-                  'email_to': False,
-                  'email_cc': False,
-                  'email_bcc': False,
-                  'reply_to': False,
-                  'auto_delete': False,
-                  'model': False,
-                  'res_id': False,
-                  'mail_server_id': False,
-                  'attachments': False,
-                  'attachment_ids': False,
-                  'message_id': False,
-                  'state': 'outgoing',
-                  'content_subtype': 'plain',
-                  'partner_ids': [],
-        }
-        if not template_id:
-            return values
-
         report_xml_pool = self.pool.get('ir.actions.report.xml')
         template = self.get_email_template(cr, uid, template_id, res_id, context)
-
-        for field in ['subject', 'body_text', 'body_html', 'email_from',
-                      'email_to', 'email_cc', 'email_bcc', 'reply_to',
-                      'message_id']:
+        values = {}
+        for field in ['subject', 'body_html', 'email_from',
+                      'email_to', 'email_cc', 'reply_to']:
             values[field] = self.render_template(cr, uid, getattr(template, field),
                                                  template.model, res_id, context=context) \
                                                  or False
-
-        # if email_to: find or create a partner
-        if values['email_to']:
-            partner_id = self.pool.get('mail.thread').message_partner_by_email(cr, uid, values['email_to'], context=context)['partner_id']
-            if not partner_id:
-                partner_id = self.pool.get('res.partner').name_create(cr, uid, values['email_to'], context=context)
-            values['partner_ids'] = [partner_id]
-
-        if values['body_html']:
-            values.update(content_subtype='html')
-
         if template.user_signature:
             signature = self.pool.get('res.users').browse(cr, uid, uid, context).signature
-            values['body_text'] += '\n\n' + signature
+            values['body_html'] = append_content_to_html(values['body_html'], signature)
 
-        values.update(mail_server_id = template.mail_server_id.id or False,
-                      auto_delete = template.auto_delete,
+        if values['body_html']:
+            values['body'] = html_sanitize(values['body_html'])
+
+        values.update(mail_server_id=template.mail_server_id.id or False,
+                      auto_delete=template.auto_delete,
                       model=template.model,
                       res_id=res_id or False)
 
-        attachments = {}
-        # Add report as a Document
+        attachments = []
+        # Add report in attachments
         if template.report_template:
             report_name = self.render_template(cr, uid, template.report_name, template.model, res_id, context=context)
             report_service = 'report.' + report_xml_pool.browse(cr, uid, template.report_template.id, context).report_name
@@ -368,12 +316,11 @@ class email_template(osv.osv):
             ext = "." + format
             if not report_name.endswith(ext):
                 report_name += ext
-            attachments[report_name] = result
+            attachments.append(report_name, result)
 
-        # Add document attachments
+        # Add template attachments
         for attach in template.attachment_ids:
-            # keep the bytes as fetched from the db, base64 encoded
-            attachments[attach.datas_fname] = attach.datas
+            attachments.append((attach.datas_fname, attach.datas))
 
         values['attachments'] = attachments
         return values
@@ -391,12 +338,12 @@ class email_template(osv.osv):
            :returns: id of the mail.message that was created 
         """
         if context is None: context = {}
-        mail_message = self.pool.get('mail.message')
+        mail_mail = self.pool.get('mail.mail')
         ir_attachment = self.pool.get('ir.attachment')
         values = self.generate_email(cr, uid, template_id, res_id, context=context)
         assert 'email_from' in values, 'email_from is missing or empty after template rendering, send_mail() cannot proceed'
         attachments = values.pop('attachments') or {}
-        msg_id = mail_message.create(cr, uid, values, context=context)
+        msg_id = mail_mail.create(cr, uid, values, context=context)
         # link attachments
         attachment_ids = []
         for fname, fcontent in attachments.iteritems():
@@ -404,15 +351,15 @@ class email_template(osv.osv):
                     'name': fname,
                     'datas_fname': fname,
                     'datas': fcontent,
-                    'res_model': mail_message._name,
+                    'res_model': mail_mail._name,
                     'res_id': msg_id,
             }
             context.pop('default_type', None)
             attachment_ids.append(ir_attachment.create(cr, uid, attachment_data, context=context))
         if attachment_ids:
-            mail_message.write(cr, uid, msg_id, {'attachment_ids': [(6, 0, attachment_ids)]}, context=context)
+            mail_mail.write(cr, uid, msg_id, {'attachment_ids': [(6, 0, attachment_ids)]}, context=context)
         if force_send:
-            mail_message.send(cr, uid, [msg_id], context=context)
+            mail_mail.send(cr, uid, [msg_id], context=context)
         return msg_id
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/email_template/email_template_view.xml b/addons/email_template/email_template_view.xml
index a04790d1c1c..448655a3121 100644
--- a/addons/email_template/email_template_view.xml
+++ b/addons/email_template/email_template_view.xml
@@ -1,99 +1,67 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <openerp>
     <data>
-
         <record model="ir.ui.view" id="email_template_form">
             <field name="name">email.template.form</field>
             <field name="model">email.template</field>
             <field name="arch" type="xml">
                 <form string="Templates" version="7.0">
-                  <sheet>
-                    <group col="4">
-                        <field name="name" required="1"/>
-                        <field name="model_id" required="1" on_change="onchange_model_id(model_id)"/>
-                        <field name="model" invisible="1"/>
-                    </group>
-                    <notebook>
-                        <page string="Email Details">
-                            <group>
-                                <field name="email_from" required="1"/>
-                                <field name="email_to" required="1"/>
-                                <field name="email_cc"/>
-                                <field name="email_bcc"/>
-                                <field name="reply_to"/>
-                                <field name="subject" required="1"/>
-                                <notebook  colspan="4">
-                                    <page string="Body (Text)">
-                                        <field name="body_text" colspan="4" width="250" height="250" nolabel="1"/>
-                                    </page>
-                                    <page string="Body (Rich/HTML)">
-                                        <field name="body_html" colspan="4" width="250" height="250" nolabel="1"/>
-                                        <label string="Note: This is Raw HTML." colspan="4"/>
-                                    </page>
-                                </notebook>
-                                <field name="user_signature"/>
-                            <notebook colspan="4">
-                                <page string="Dynamic Values Builder">
-                                    <group>
-                                        <field name="model_object_field"
-                                            domain="[('model_id','=',model_id),('ttype','!=','one2many'),('ttype','!=','many2many')]"
-                                            on_change="onchange_sub_model_object_value_field(model_object_field)"/>
-                                        <field name="sub_object" readonly="1"/>
-                                        <field name="sub_model_object_field"
-                                            domain="[('model_id','=',sub_object),('ttype','!=','one2many'),('ttype','!=','many2many')]"
-                                            attrs="{'readonly':[('sub_object','=',False)],'required':[('sub_object','!=',False)]}"
-                                            on_change="onchange_sub_model_object_value_field(model_object_field,sub_model_object_field)"/>
-                                        <field name="null_value" on_change="onchange_sub_model_object_value_field(model_object_field,sub_model_object_field,null_value)"/>
-                                        <field name="copyvalue"/>
+                    <sheet>
+                        <div class="oe_title">
+                            <label for="name" class="oe_edit_only"/><h1><field name="name" required="1"/></h1>
+                            <h3><label for="model_id"/><field name="model_id" required="1" on_change="onchange_model_id(model_id)" class="oe_inline"/></h3>
+                            <field name="model" invisible="1"/>
+                        </div>
+                        <div class="oe_right oe_button_box" name="buttons">
+                            <field name="ref_ir_act_window" invisible="1"/>
+                            <button name="create_action" string="Add context action" type="object"
+                                    attrs="{'invisible':[('ref_ir_act_window','!=',False)]}"
+                                    help="Display an option on related documents to open a composition wizard with this template"/>
+                            <button name="unlink_action" string="Remove context action" type="object" 
+                                    attrs="{'invisible':[('ref_ir_act_window','=',False)]}"
+                                    help="Remove the contextual action to use this template on related documents"/>
+                            <button name="%(wizard_email_template_preview)d" string="Preview"
+                                    type="action" target="new"
+                                    context="{'template_id':active_id}"/>
+                        </div>
+                        <notebook>
+                            <page string="Email Details">
+                                <group>
+                                    <group string="Addressing">
+                                      <field name="email_from" required="1"/>
+                                      <field name="email_to" required="1"/>
+                                      <field name="email_cc"/>
+                                      <field name="reply_to"/>
+                                      <field name="user_signature"/>
+                                    </group>
+                                    <group string="Dynamic Value Builder" class="oe_edit_only">
+                                            <field name="model_object_field" domain="[('model_id','=',model_id),('ttype','!=','one2many'),('ttype','!=','many2many')]" on_change="onchange_sub_model_object_value_field(model_object_field)"/>
+                                            <field name="sub_object" readonly="1"/>
+                                            <field name="sub_model_object_field" domain="[('model_id','=',sub_object),('ttype','!=','one2many'),('ttype','!=','many2many')]" attrs="{'readonly':[('sub_object','=',False)],'required':[('sub_object','!=',False)]}" on_change="onchange_sub_model_object_value_field(model_object_field,sub_model_object_field)"/>
+                                            <field name="null_value" on_change="onchange_sub_model_object_value_field(model_object_field,sub_model_object_field,null_value)"/>
+                                            <field name="copyvalue"/>
+                                    </group>
+                                    <group string="Contents" colspan="2">
+                                       <field name="subject" required="1"/>
+                                       <field name="body_html" width="250" height="450" nolabel="1" colspan="2" placeholder="Email contents (in raw HTML format)"/>
                                     </group>
-                                </page>
-                            </notebook>
-                            <button name="%(wizard_email_template_preview)d" string="Preview Template"
-                                type="action" colspan="4" target="new" icon="gtk-zoom-fit" context="{'template_id':active_id}"/>
-                            </group>
-                        </page>
-                        <page string="Advanced">
-                            <group colspan="2" col="2">
-                                <group colspan="2" col="2">
-                                    <separator string="Sidebar Button" colspan="2"/>
-                                    <button name="create_action" string="Add sidebar button" type="object" icon="gtk-execute"
-                                            colspan="2" attrs="{'invisible':[('ref_ir_act_window','!=',False)]}"
-                                            help="Display a button in the sidebar of related documents to open a composition wizard with this template"
-                                            />
-                                    <field name="ref_ir_act_window" attrs="{'invisible':[('ref_ir_act_window','=',False)]}"/>
-                                    <field name="ref_ir_value" attrs="{'invisible':[('ref_ir_act_window','=',False)]}"/>
-                                    <button name="unlink_action" string="Remove sidebar button" type="object" icon="gtk-delete"
-                                            colspan="2" attrs="{'invisible':[('ref_ir_act_window','=',False)]}"
-                                            help="Remove the sidebar button currently displayed on related documents"
-                                            />
                                 </group>
-                                <group colspan="2" col="2">
-                                    <separator string="Advanced Options" colspan="2"/>
-                                    <field name="mail_server_id"/>
-                                    <field name="track_campaign_item"/>
-                                    <field name="message_id"/>
-                                    <field name="auto_delete"/>
+                            </page>
+                            <page string="Advanced">
+                                <group>
                                     <field name="lang"/>
+                                    <field name="mail_server_id"/>
+                                    <field name="auto_delete"/>
+                                    <field name="report_template" domain="[('model','=',model)]"/>
+                                    <field name="report_name" class="oe_inline"
+                                           attrs="{'invisible':[('report_template','=',False)]}"/>
+                                    <field name="attachment_ids">
+                                       <tree><field name="name"/></tree>
+                                    </field>
                                 </group>
-                            </group>
-                            <group colspan="2" col="2">
-                                <separator string="Attachments" colspan="2"/>
-                                <notebook colspan="2">
-                                    <page string="Attach Report">
-                                        <group>
-                                            <field name="report_template" colspan="4"
-                                                domain="[('model','=',model)]"/>
-                                            <field name="report_name" colspan="4" />
-                                        </group>
-                                    </page>
-                                    <page string="Attach existing files">
-                                        <field name="attachment_ids" colspan="4" nolabel="1" height="350"/>
-                                    </page>
-                                </notebook>
-                            </group>
-                        </page>
-                    </notebook>
-                   </sheet>
+                            </page>
+                        </notebook>
+                       </sheet>
                 </form>
             </field>
         </record>
@@ -103,9 +71,9 @@
             <field name="model">email.template</field>
             <field name="arch" type="xml">
                 <tree string="Templates">
-                    <field name="model_id"/>
                     <field name="mail_server_id" invisible="1"/>
                     <field name="name"/>
+                    <field name="model_id"/>
                     <field name="subject"/>
                     <field name="email_from"/>
                     <field name="email_to"/>
diff --git a/addons/email_template/i18n/ar.po b/addons/email_template/i18n/ar.po
index 61144eb8625..777d520ab7b 100644
--- a/addons/email_template/i18n/ar.po
+++ b/addons/email_template/i18n/ar.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:58+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: email_template
 #: field:email.template,subtype:0
@@ -316,8 +316,8 @@ msgid "Add Signature"
 msgstr "إضافة توقيع"
 
 #. module: email_template
-#: help:email.template,body_text:0
-#: help:email_template.preview,body_text:0
+#: help:email.template,body:0
+#: help:email_template.preview,body:0
 msgid "Plaintext version of the message (placeholders may be used here)"
 msgstr "نص عادي نسخة من رسالة (ويمكن استخدام العناصر البديلة هنا)"
 
@@ -460,8 +460,8 @@ msgid "Cc"
 msgstr "نسخة"
 
 #. module: email_template
-#: field:email.template,body_text:0
-#: field:email_template.preview,body_text:0
+#: field:email.template,body:0
+#: field:email_template.preview,body:0
 msgid "Text Contents"
 msgstr ""
 
@@ -663,7 +663,7 @@ msgstr "زر الشريط الجانبي لفتح تأثير الشريط الج
 #. module: email_template
 #: constraint:res.partner:0
 msgid "Error ! You cannot create recursive associated members."
-msgstr ""
+msgstr "خطأ ! لا يمكنك إنشاء أعضاء مرتبطين و متداخلين."
 
 #. module: email_template
 #: code:addons/email_template/email_template.py:218
@@ -1435,3 +1435,6 @@ msgstr "إصدار Rich-text/HTML الرسالة (ويمكن استخدام ال
 
 #~ msgid "Rich-text contents"
 #~ msgstr "محتويات النص المنسق"
+
+#~ msgid "Opt-out"
+#~ msgstr "الانسحاب"
diff --git a/addons/email_template/i18n/bg.po b/addons/email_template/i18n/bg.po
index db2f357b079..511acb384a5 100644
--- a/addons/email_template/i18n/bg.po
+++ b/addons/email_template/i18n/bg.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:58+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: email_template
 #: field:email.template,subtype:0
@@ -303,8 +303,8 @@ msgid "Add Signature"
 msgstr ""
 
 #. module: email_template
-#: help:email.template,body_text:0
-#: help:email_template.preview,body_text:0
+#: help:email.template,body:0
+#: help:email_template.preview,body:0
 msgid "Plaintext version of the message (placeholders may be used here)"
 msgstr ""
 
@@ -445,8 +445,8 @@ msgid "Cc"
 msgstr ""
 
 #. module: email_template
-#: field:email.template,body_text:0
-#: field:email_template.preview,body_text:0
+#: field:email.template,body:0
+#: field:email_template.preview,body:0
 msgid "Text Contents"
 msgstr ""
 
diff --git a/addons/email_template/i18n/ca.po b/addons/email_template/i18n/ca.po
index f601ab66556..e53aadf814c 100644
--- a/addons/email_template/i18n/ca.po
+++ b/addons/email_template/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:58+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: email_template
 #: field:email.template,subtype:0
@@ -307,8 +307,8 @@ msgid "Add Signature"
 msgstr ""
 
 #. module: email_template
-#: help:email.template,body_text:0
-#: help:email_template.preview,body_text:0
+#: help:email.template,body:0
+#: help:email_template.preview,body:0
 msgid "Plaintext version of the message (placeholders may be used here)"
 msgstr ""
 
@@ -449,8 +449,8 @@ msgid "Cc"
 msgstr ""
 
 #. module: email_template
-#: field:email.template,body_text:0
-#: field:email_template.preview,body_text:0
+#: field:email.template,body:0
+#: field:email_template.preview,body:0
 msgid "Text Contents"
 msgstr ""
 
diff --git a/addons/email_template/i18n/da.po b/addons/email_template/i18n/da.po
index 60dcd387977..2a1f19128c4 100644
--- a/addons/email_template/i18n/da.po
+++ b/addons/email_template/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:58+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: email_template
 #: field:email.template,subtype:0
@@ -303,8 +303,8 @@ msgid "Add Signature"
 msgstr ""
 
 #. module: email_template
-#: help:email.template,body_text:0
-#: help:email_template.preview,body_text:0
+#: help:email.template,body:0
+#: help:email_template.preview,body:0
 msgid "Plaintext version of the message (placeholders may be used here)"
 msgstr ""
 
@@ -445,8 +445,8 @@ msgid "Cc"
 msgstr ""
 
 #. module: email_template
-#: field:email.template,body_text:0
-#: field:email_template.preview,body_text:0
+#: field:email.template,body:0
+#: field:email_template.preview,body:0
 msgid "Text Contents"
 msgstr ""
 
diff --git a/addons/email_template/i18n/de.po b/addons/email_template/i18n/de.po
index fe802944c77..838c035af4a 100644
--- a/addons/email_template/i18n/de.po
+++ b/addons/email_template/i18n/de.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:58+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: email_template
 #: field:email.template,subtype:0
@@ -317,8 +317,8 @@ msgid "Add Signature"
 msgstr "Signatur hinzufügen"
 
 #. module: email_template
-#: help:email.template,body_text:0
-#: help:email_template.preview,body_text:0
+#: help:email.template,body:0
+#: help:email_template.preview,body:0
 msgid "Plaintext version of the message (placeholders may be used here)"
 msgstr "Text-Version der Nachricht (Platzhalter können verwendet werden)"
 
@@ -465,8 +465,8 @@ msgid "Cc"
 msgstr "CC"
 
 #. module: email_template
-#: field:email.template,body_text:0
-#: field:email_template.preview,body_text:0
+#: field:email.template,body:0
+#: field:email_template.preview,body:0
 msgid "Text Contents"
 msgstr "Text Inhalt"
 
diff --git a/addons/email_template/i18n/email_template.pot b/addons/email_template/i18n/email_template.pot
index 0990a940397..519755ac8f0 100644
--- a/addons/email_template/i18n/email_template.pot
+++ b/addons/email_template/i18n/email_template.pot
@@ -289,8 +289,8 @@ msgid "Add Signature"
 msgstr ""
 
 #. module: email_template
-#: help:email.template,body_text:0
-#: help:email_template.preview,body_text:0
+#: help:email.template,body:0
+#: help:email_template.preview,body:0
 msgid "Plaintext version of the message (placeholders may be used here)"
 msgstr ""
 
@@ -425,8 +425,8 @@ msgid "Cc"
 msgstr ""
 
 #. module: email_template
-#: field:email.template,body_text:0
-#: field:email_template.preview,body_text:0
+#: field:email.template,body:0
+#: field:email_template.preview,body:0
 msgid "Text Contents"
 msgstr ""
 
diff --git a/addons/email_template/i18n/es.po b/addons/email_template/i18n/es.po
index 0da83a084fb..368f6ca8476 100644
--- a/addons/email_template/i18n/es.po
+++ b/addons/email_template/i18n/es.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:58+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: email_template
 #: field:email.template,subtype:0
@@ -307,8 +307,8 @@ msgid "Add Signature"
 msgstr ""
 
 #. module: email_template
-#: help:email.template,body_text:0
-#: help:email_template.preview,body_text:0
+#: help:email.template,body:0
+#: help:email_template.preview,body:0
 msgid "Plaintext version of the message (placeholders may be used here)"
 msgstr ""
 
@@ -449,8 +449,8 @@ msgid "Cc"
 msgstr ""
 
 #. module: email_template
-#: field:email.template,body_text:0
-#: field:email_template.preview,body_text:0
+#: field:email.template,body:0
+#: field:email_template.preview,body:0
 msgid "Text Contents"
 msgstr ""
 
diff --git a/addons/email_template/i18n/es_CL.po b/addons/email_template/i18n/es_CL.po
index 4922a58156b..94fbfad1d9f 100644
--- a/addons/email_template/i18n/es_CL.po
+++ b/addons/email_template/i18n/es_CL.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:59+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: email_template
 #: field:email.template,subtype:0
@@ -305,8 +305,8 @@ msgid "Add Signature"
 msgstr ""
 
 #. module: email_template
-#: help:email.template,body_text:0
-#: help:email_template.preview,body_text:0
+#: help:email.template,body:0
+#: help:email_template.preview,body:0
 msgid "Plaintext version of the message (placeholders may be used here)"
 msgstr ""
 
@@ -447,8 +447,8 @@ msgid "Cc"
 msgstr ""
 
 #. module: email_template
-#: field:email.template,body_text:0
-#: field:email_template.preview,body_text:0
+#: field:email.template,body:0
+#: field:email_template.preview,body:0
 msgid "Text Contents"
 msgstr ""
 
diff --git a/addons/email_template/i18n/es_CR.po b/addons/email_template/i18n/es_CR.po
index 8051c49aa96..5e2d107161d 100644
--- a/addons/email_template/i18n/es_CR.po
+++ b/addons/email_template/i18n/es_CR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:59+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 "Language: es\n"
 
 #. module: email_template
@@ -325,8 +325,8 @@ msgid "Add Signature"
 msgstr "Agregar Fima"
 
 #. module: email_template
-#: help:email.template,body_text:0
-#: help:email_template.preview,body_text:0
+#: help:email.template,body:0
+#: help:email_template.preview,body:0
 msgid "Plaintext version of the message (placeholders may be used here)"
 msgstr ""
 "Versión en formato texto del mensaje (marcadores de posición se pueden "
@@ -475,8 +475,8 @@ msgid "Cc"
 msgstr "Cc"
 
 #. module: email_template
-#: field:email.template,body_text:0
-#: field:email_template.preview,body_text:0
+#: field:email.template,body:0
+#: field:email_template.preview,body:0
 msgid "Text Contents"
 msgstr ""
 
diff --git a/addons/email_template/i18n/es_EC.po b/addons/email_template/i18n/es_EC.po
index 0e77178a415..74f8e228c91 100644
--- a/addons/email_template/i18n/es_EC.po
+++ b/addons/email_template/i18n/es_EC.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:59+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: email_template
 #: field:email.template,subtype:0
@@ -303,8 +303,8 @@ msgid "Add Signature"
 msgstr ""
 
 #. module: email_template
-#: help:email.template,body_text:0
-#: help:email_template.preview,body_text:0
+#: help:email.template,body:0
+#: help:email_template.preview,body:0
 msgid "Plaintext version of the message (placeholders may be used here)"
 msgstr ""
 
@@ -445,8 +445,8 @@ msgid "Cc"
 msgstr ""
 
 #. module: email_template
-#: field:email.template,body_text:0
-#: field:email_template.preview,body_text:0
+#: field:email.template,body:0
+#: field:email_template.preview,body:0
 msgid "Text Contents"
 msgstr ""
 
diff --git a/addons/email_template/i18n/et.po b/addons/email_template/i18n/et.po
index 5aad92ba65e..1407f14811b 100644
--- a/addons/email_template/i18n/et.po
+++ b/addons/email_template/i18n/et.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:58+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: email_template
 #: field:email.template,subtype:0
@@ -303,8 +303,8 @@ msgid "Add Signature"
 msgstr ""
 
 #. module: email_template
-#: help:email.template,body_text:0
-#: help:email_template.preview,body_text:0
+#: help:email.template,body:0
+#: help:email_template.preview,body:0
 msgid "Plaintext version of the message (placeholders may be used here)"
 msgstr ""
 
@@ -445,8 +445,8 @@ msgid "Cc"
 msgstr ""
 
 #. module: email_template
-#: field:email.template,body_text:0
-#: field:email_template.preview,body_text:0
+#: field:email.template,body:0
+#: field:email_template.preview,body:0
 msgid "Text Contents"
 msgstr ""
 
diff --git a/addons/email_template/i18n/fi.po b/addons/email_template/i18n/fi.po
index 5eeaed0d2db..fe4c40f5a95 100644
--- a/addons/email_template/i18n/fi.po
+++ b/addons/email_template/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:58+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: email_template
 #: field:email.template,subtype:0
@@ -308,8 +308,8 @@ msgid "Add Signature"
 msgstr "Lisää allekirjoitus"
 
 #. module: email_template
-#: help:email.template,body_text:0
-#: help:email_template.preview,body_text:0
+#: help:email.template,body:0
+#: help:email_template.preview,body:0
 msgid "Plaintext version of the message (placeholders may be used here)"
 msgstr "Tekstiversio viestistä (voit käyttä täytettä)"
 
@@ -450,8 +450,8 @@ msgid "Cc"
 msgstr "Kopio viestistä"
 
 #. module: email_template
-#: field:email.template,body_text:0
-#: field:email_template.preview,body_text:0
+#: field:email.template,body:0
+#: field:email_template.preview,body:0
 msgid "Text Contents"
 msgstr ""
 
diff --git a/addons/email_template/i18n/fr.po b/addons/email_template/i18n/fr.po
index b76f6555e96..204167b1448 100644
--- a/addons/email_template/i18n/fr.po
+++ b/addons/email_template/i18n/fr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:58+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: email_template
 #: field:email.template,subtype:0
@@ -322,8 +322,8 @@ msgid "Add Signature"
 msgstr "Ajouter une signature"
 
 #. module: email_template
-#: help:email.template,body_text:0
-#: help:email_template.preview,body_text:0
+#: help:email.template,body:0
+#: help:email_template.preview,body:0
 msgid "Plaintext version of the message (placeholders may be used here)"
 msgstr "Version texte du message (des variables peuvent être utilisées ici)"
 
@@ -469,8 +469,8 @@ msgid "Cc"
 msgstr "Copie à (CC)"
 
 #. module: email_template
-#: field:email.template,body_text:0
-#: field:email_template.preview,body_text:0
+#: field:email.template,body:0
+#: field:email_template.preview,body:0
 msgid "Text Contents"
 msgstr ""
 
diff --git a/addons/email_template/i18n/hr.po b/addons/email_template/i18n/hr.po
index 469d56fade2..b0d8757db77 100644
--- a/addons/email_template/i18n/hr.po
+++ b/addons/email_template/i18n/hr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:58+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: email_template
 #: field:email.template,subtype:0
@@ -303,8 +303,8 @@ msgid "Add Signature"
 msgstr ""
 
 #. module: email_template
-#: help:email.template,body_text:0
-#: help:email_template.preview,body_text:0
+#: help:email.template,body:0
+#: help:email_template.preview,body:0
 msgid "Plaintext version of the message (placeholders may be used here)"
 msgstr ""
 
@@ -445,8 +445,8 @@ msgid "Cc"
 msgstr ""
 
 #. module: email_template
-#: field:email.template,body_text:0
-#: field:email_template.preview,body_text:0
+#: field:email.template,body:0
+#: field:email_template.preview,body:0
 msgid "Text Contents"
 msgstr ""
 
diff --git a/addons/email_template/i18n/hu.po b/addons/email_template/i18n/hu.po
index 741905105a8..8e37f5cc98d 100644
--- a/addons/email_template/i18n/hu.po
+++ b/addons/email_template/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:58+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: email_template
 #: field:email.template,subtype:0
@@ -303,8 +303,8 @@ msgid "Add Signature"
 msgstr ""
 
 #. module: email_template
-#: help:email.template,body_text:0
-#: help:email_template.preview,body_text:0
+#: help:email.template,body:0
+#: help:email_template.preview,body:0
 msgid "Plaintext version of the message (placeholders may be used here)"
 msgstr ""
 
@@ -445,8 +445,8 @@ msgid "Cc"
 msgstr ""
 
 #. module: email_template
-#: field:email.template,body_text:0
-#: field:email_template.preview,body_text:0
+#: field:email.template,body:0
+#: field:email_template.preview,body:0
 msgid "Text Contents"
 msgstr ""
 
diff --git a/addons/email_template/i18n/it.po b/addons/email_template/i18n/it.po
index e490ec6a3da..e81017e9e8d 100644
--- a/addons/email_template/i18n/it.po
+++ b/addons/email_template/i18n/it.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:58+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: email_template
 #: field:email.template,subtype:0
@@ -307,8 +307,8 @@ msgid "Add Signature"
 msgstr ""
 
 #. module: email_template
-#: help:email.template,body_text:0
-#: help:email_template.preview,body_text:0
+#: help:email.template,body:0
+#: help:email_template.preview,body:0
 msgid "Plaintext version of the message (placeholders may be used here)"
 msgstr ""
 
@@ -449,8 +449,8 @@ msgid "Cc"
 msgstr ""
 
 #. module: email_template
-#: field:email.template,body_text:0
-#: field:email_template.preview,body_text:0
+#: field:email.template,body:0
+#: field:email_template.preview,body:0
 msgid "Text Contents"
 msgstr ""
 
diff --git a/addons/email_template/i18n/ja.po b/addons/email_template/i18n/ja.po
index 7f6b696ea95..58c19dad2e5 100644
--- a/addons/email_template/i18n/ja.po
+++ b/addons/email_template/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:58+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: email_template
 #: field:email.template,subtype:0
@@ -310,8 +310,8 @@ msgid "Add Signature"
 msgstr "署名を追加する"
 
 #. module: email_template
-#: help:email.template,body_text:0
-#: help:email_template.preview,body_text:0
+#: help:email.template,body:0
+#: help:email_template.preview,body:0
 msgid "Plaintext version of the message (placeholders may be used here)"
 msgstr "このメッセージのテキスト"
 
@@ -452,8 +452,8 @@ msgid "Cc"
 msgstr "写し(CC)"
 
 #. module: email_template
-#: field:email.template,body_text:0
-#: field:email_template.preview,body_text:0
+#: field:email.template,body:0
+#: field:email_template.preview,body:0
 msgid "Text Contents"
 msgstr "テキストの内容"
 
diff --git a/addons/email_template/i18n/mn.po b/addons/email_template/i18n/mn.po
index d64d8229f42..33c32862a0e 100644
--- a/addons/email_template/i18n/mn.po
+++ b/addons/email_template/i18n/mn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:58+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: email_template
 #: field:email.template,subtype:0
@@ -316,8 +316,8 @@ msgid "Add Signature"
 msgstr "Гарын үсэг нэмэх"
 
 #. module: email_template
-#: help:email.template,body_text:0
-#: help:email_template.preview,body_text:0
+#: help:email.template,body:0
+#: help:email_template.preview,body:0
 msgid "Plaintext version of the message (placeholders may be used here)"
 msgstr "Зурвасын цэвэр текст хувилбар (энд хувьсагч хэрэглэж болно)"
 
@@ -463,8 +463,8 @@ msgid "Cc"
 msgstr "Cc"
 
 #. module: email_template
-#: field:email.template,body_text:0
-#: field:email_template.preview,body_text:0
+#: field:email.template,body:0
+#: field:email_template.preview,body:0
 msgid "Text Contents"
 msgstr ""
 
diff --git a/addons/email_template/i18n/nb.po b/addons/email_template/i18n/nb.po
index f48dbe7672c..7ebba9bd384 100644
--- a/addons/email_template/i18n/nb.po
+++ b/addons/email_template/i18n/nb.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:58+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: email_template
 #: field:email.template,subtype:0
@@ -303,8 +303,8 @@ msgid "Add Signature"
 msgstr ""
 
 #. module: email_template
-#: help:email.template,body_text:0
-#: help:email_template.preview,body_text:0
+#: help:email.template,body:0
+#: help:email_template.preview,body:0
 msgid "Plaintext version of the message (placeholders may be used here)"
 msgstr ""
 
@@ -445,8 +445,8 @@ msgid "Cc"
 msgstr ""
 
 #. module: email_template
-#: field:email.template,body_text:0
-#: field:email_template.preview,body_text:0
+#: field:email.template,body:0
+#: field:email_template.preview,body:0
 msgid "Text Contents"
 msgstr ""
 
diff --git a/addons/email_template/i18n/nl.po b/addons/email_template/i18n/nl.po
index 693e476b981..b77f4ecd6e5 100644
--- a/addons/email_template/i18n/nl.po
+++ b/addons/email_template/i18n/nl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:58+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: email_template
 #: field:email.template,subtype:0
@@ -323,8 +323,8 @@ msgid "Add Signature"
 msgstr "Handtekening toevoegen"
 
 #. module: email_template
-#: help:email.template,body_text:0
-#: help:email_template.preview,body_text:0
+#: help:email.template,body:0
+#: help:email_template.preview,body:0
 msgid "Plaintext version of the message (placeholders may be used here)"
 msgstr ""
 "Platte tekst versie van het bericht (tijdelijke aanduidingen kan hier worden "
@@ -474,8 +474,8 @@ msgid "Cc"
 msgstr "Cc"
 
 #. module: email_template
-#: field:email.template,body_text:0
-#: field:email_template.preview,body_text:0
+#: field:email.template,body:0
+#: field:email_template.preview,body:0
 msgid "Text Contents"
 msgstr "Tekst inhoud"
 
diff --git a/addons/email_template/i18n/pl.po b/addons/email_template/i18n/pl.po
index baea1858c0a..327ab735302 100644
--- a/addons/email_template/i18n/pl.po
+++ b/addons/email_template/i18n/pl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:58+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: email_template
 #: field:email.template,subtype:0
@@ -306,8 +306,8 @@ msgid "Add Signature"
 msgstr ""
 
 #. module: email_template
-#: help:email.template,body_text:0
-#: help:email_template.preview,body_text:0
+#: help:email.template,body:0
+#: help:email_template.preview,body:0
 msgid "Plaintext version of the message (placeholders may be used here)"
 msgstr ""
 
@@ -448,8 +448,8 @@ msgid "Cc"
 msgstr ""
 
 #. module: email_template
-#: field:email.template,body_text:0
-#: field:email_template.preview,body_text:0
+#: field:email.template,body:0
+#: field:email_template.preview,body:0
 msgid "Text Contents"
 msgstr ""
 
diff --git a/addons/email_template/i18n/pt.po b/addons/email_template/i18n/pt.po
index a2404c73b8f..20a12007c16 100644
--- a/addons/email_template/i18n/pt.po
+++ b/addons/email_template/i18n/pt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:58+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: email_template
 #: field:email.template,subtype:0
@@ -322,8 +322,8 @@ msgid "Add Signature"
 msgstr "Adicionar Assinatura"
 
 #. module: email_template
-#: help:email.template,body_text:0
-#: help:email_template.preview,body_text:0
+#: help:email.template,body:0
+#: help:email_template.preview,body:0
 msgid "Plaintext version of the message (placeholders may be used here)"
 msgstr ""
 "Texto Simples sem formatação da mensagem (espaços reservados podem ser "
@@ -472,8 +472,8 @@ msgid "Cc"
 msgstr "Cc"
 
 #. module: email_template
-#: field:email.template,body_text:0
-#: field:email_template.preview,body_text:0
+#: field:email.template,body:0
+#: field:email_template.preview,body:0
 msgid "Text Contents"
 msgstr ""
 
diff --git a/addons/email_template/i18n/pt_BR.po b/addons/email_template/i18n/pt_BR.po
index 656452c7cde..ae61051acd4 100644
--- a/addons/email_template/i18n/pt_BR.po
+++ b/addons/email_template/i18n/pt_BR.po
@@ -9,13 +9,14 @@ msgstr ""
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:36+0000\n"
 "PO-Revision-Date: 2012-07-28 22:06+0000\n"
-"Last-Translator: Fábio Martinelli <webmaster@guaru.net>\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: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:59+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: email_template
 #: field:email.template,subtype:0
@@ -318,8 +319,8 @@ msgid "Add Signature"
 msgstr "Adicionar Assinatura"
 
 #. module: email_template
-#: help:email.template,body_text:0
-#: help:email_template.preview,body_text:0
+#: help:email.template,body:0
+#: help:email_template.preview,body:0
 msgid "Plaintext version of the message (placeholders may be used here)"
 msgstr "Versão em Texto da mensagem (placeholders podem ser usados aqui)"
 
@@ -466,8 +467,8 @@ msgid "Cc"
 msgstr "Cópia para"
 
 #. module: email_template
-#: field:email.template,body_text:0
-#: field:email_template.preview,body_text:0
+#: field:email.template,body:0
+#: field:email_template.preview,body:0
 msgid "Text Contents"
 msgstr "Conteúdo de Texto"
 
diff --git a/addons/email_template/i18n/ro.po b/addons/email_template/i18n/ro.po
index bbe86cdee12..8331071afb7 100644
--- a/addons/email_template/i18n/ro.po
+++ b/addons/email_template/i18n/ro.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:58+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: email_template
 #: field:email.template,subtype:0
@@ -320,8 +320,8 @@ msgid "Add Signature"
 msgstr "Adauga Semnatura"
 
 #. module: email_template
-#: help:email.template,body_text:0
-#: help:email_template.preview,body_text:0
+#: help:email.template,body:0
+#: help:email_template.preview,body:0
 msgid "Plaintext version of the message (placeholders may be used here)"
 msgstr "Versiunea simpla a mesajului (aici pot fi folositi inlocuitori)"
 
@@ -467,8 +467,8 @@ msgid "Cc"
 msgstr "Cc (copie carbon)"
 
 #. module: email_template
-#: field:email.template,body_text:0
-#: field:email_template.preview,body_text:0
+#: field:email.template,body:0
+#: field:email_template.preview,body:0
 msgid "Text Contents"
 msgstr ""
 
diff --git a/addons/email_template/i18n/ru.po b/addons/email_template/i18n/ru.po
index 2112f24a5fd..6b61705ff48 100644
--- a/addons/email_template/i18n/ru.po
+++ b/addons/email_template/i18n/ru.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:58+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: email_template
 #: field:email.template,subtype:0
@@ -303,8 +303,8 @@ msgid "Add Signature"
 msgstr ""
 
 #. module: email_template
-#: help:email.template,body_text:0
-#: help:email_template.preview,body_text:0
+#: help:email.template,body:0
+#: help:email_template.preview,body:0
 msgid "Plaintext version of the message (placeholders may be used here)"
 msgstr ""
 
@@ -445,8 +445,8 @@ msgid "Cc"
 msgstr ""
 
 #. module: email_template
-#: field:email.template,body_text:0
-#: field:email_template.preview,body_text:0
+#: field:email.template,body:0
+#: field:email_template.preview,body:0
 msgid "Text Contents"
 msgstr ""
 
diff --git a/addons/email_template/i18n/sr.po b/addons/email_template/i18n/sr.po
index 29886f01fad..703a71980d1 100644
--- a/addons/email_template/i18n/sr.po
+++ b/addons/email_template/i18n/sr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:58+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: email_template
 #: field:email.template,subtype:0
@@ -306,8 +306,8 @@ msgid "Add Signature"
 msgstr ""
 
 #. module: email_template
-#: help:email.template,body_text:0
-#: help:email_template.preview,body_text:0
+#: help:email.template,body:0
+#: help:email_template.preview,body:0
 msgid "Plaintext version of the message (placeholders may be used here)"
 msgstr ""
 
@@ -448,8 +448,8 @@ msgid "Cc"
 msgstr ""
 
 #. module: email_template
-#: field:email.template,body_text:0
-#: field:email_template.preview,body_text:0
+#: field:email.template,body:0
+#: field:email_template.preview,body:0
 msgid "Text Contents"
 msgstr ""
 
diff --git a/addons/email_template/i18n/sr@latin.po b/addons/email_template/i18n/sr@latin.po
index b6702fcd409..3ab2d2cf368 100644
--- a/addons/email_template/i18n/sr@latin.po
+++ b/addons/email_template/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:59+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: email_template
 #: field:email.template,subtype:0
@@ -306,8 +306,8 @@ msgid "Add Signature"
 msgstr ""
 
 #. module: email_template
-#: help:email.template,body_text:0
-#: help:email_template.preview,body_text:0
+#: help:email.template,body:0
+#: help:email_template.preview,body:0
 msgid "Plaintext version of the message (placeholders may be used here)"
 msgstr ""
 
@@ -448,8 +448,8 @@ msgid "Cc"
 msgstr ""
 
 #. module: email_template
-#: field:email.template,body_text:0
-#: field:email_template.preview,body_text:0
+#: field:email.template,body:0
+#: field:email_template.preview,body:0
 msgid "Text Contents"
 msgstr ""
 
diff --git a/addons/email_template/i18n/sv.po b/addons/email_template/i18n/sv.po
index 89e968a9799..bec8aeb784b 100644
--- a/addons/email_template/i18n/sv.po
+++ b/addons/email_template/i18n/sv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:59+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: email_template
 #: field:email.template,subtype:0
@@ -319,8 +319,8 @@ msgid "Add Signature"
 msgstr "Lägg till signatur"
 
 #. module: email_template
-#: help:email.template,body_text:0
-#: help:email_template.preview,body_text:0
+#: help:email.template,body:0
+#: help:email_template.preview,body:0
 msgid "Plaintext version of the message (placeholders may be used here)"
 msgstr "Ren textversion av meddelandet (platshållare kan användas här)"
 
@@ -465,8 +465,8 @@ msgid "Cc"
 msgstr "Kopia"
 
 #. module: email_template
-#: field:email.template,body_text:0
-#: field:email_template.preview,body_text:0
+#: field:email.template,body:0
+#: field:email_template.preview,body:0
 msgid "Text Contents"
 msgstr ""
 
diff --git a/addons/email_template/i18n/tr.po b/addons/email_template/i18n/tr.po
index 6289bb4c2b0..3770b758b47 100644
--- a/addons/email_template/i18n/tr.po
+++ b/addons/email_template/i18n/tr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:59+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: email_template
 #: field:email.template,subtype:0
@@ -54,13 +54,13 @@ msgstr "Yeni şablon olarak kaydet"
 #: help:email.template,subject:0
 #: help:email_template.preview,subject:0
 msgid "Subject (placeholders may be used here)"
-msgstr ""
+msgstr "Konu (burada yer tutucular kullanılabilir)"
 
 #. module: email_template
 #: help:email.template,email_cc:0
 #: help:email_template.preview,email_cc:0
 msgid "Carbon copy recipients (placeholders may be used here)"
-msgstr ""
+msgstr "Alıcı karbon kopyası (burada yer tutucular kullanılabilir)"
 
 #. module: email_template
 #: selection:email.template,state:0
@@ -82,6 +82,8 @@ msgid ""
 "Name to use for the generated report file (may contain placeholders)\n"
 "The extension can be omitted and will then come from the report type."
 msgstr ""
+"Oluşturulan rapor için kullanılacak ad (yer tutucular içerebilir)\n"
+"Uzantı atlanabilir ve sonra rapor türünden gelebilir."
 
 #. module: email_template
 #: view:email.template:0
@@ -157,6 +159,8 @@ msgid ""
 "Display a button in the sidebar of related documents to open a composition "
 "wizard with this template"
 msgstr ""
+"Bu şablon ile bir yazım sihirbazı açmak için ilgili dökümanın kenar "
+"çubuğunda bir düğme göster"
 
 #. module: email_template
 #: field:email.template,state:0
@@ -226,6 +230,9 @@ msgid ""
 "If it is a relationship field you will be able to select a target field at "
 "the destination of the relationship."
 msgstr ""
+"İlgili belge modelinden hedef dosyayı seç.\n"
+"Eğer bir ilişki alanı ise ilişkinin varışında bir hedef alan "
+"seçebilmelisiniz ."
 
 #. module: email_template
 #: view:email.template:0
@@ -283,7 +290,7 @@ msgstr "İlgili döküman modeli"
 #: help:email.template,email_from:0
 #: help:email_template.preview,email_from:0
 msgid "Sender address (placeholders may be used here)"
-msgstr ""
+msgstr "Gönderici adresi (burada yer tutucular kullanılabilir)"
 
 #. module: email_template
 #: help:res.partner,opt_out:0
@@ -311,10 +318,10 @@ msgid "Add Signature"
 msgstr "İmza Ekle"
 
 #. module: email_template
-#: help:email.template,body_text:0
-#: help:email_template.preview,body_text:0
+#: help:email.template,body:0
+#: help:email_template.preview,body:0
 msgid "Plaintext version of the message (placeholders may be used here)"
-msgstr ""
+msgstr "Mesajın düz metin biçimi (burada yer tutucular kullanılabilir)"
 
 #. module: email_template
 #: help:email.template,original:0
@@ -360,6 +367,8 @@ msgid ""
 "When a relationship field is selected as first field, this field shows the "
 "document model the relationship goes to."
 msgstr ""
+"İlk alan olarak bir ilişki alanı seçldiğinde, bu alan ilişkinin gideceği "
+"belge modelini gösterir."
 
 #. module: email_template
 #: model:ir.model,name:email_template.model_email_template
@@ -435,6 +444,7 @@ msgid ""
 "Final placeholder expression, to be copy-pasted in the desired template "
 "field."
 msgstr ""
+"Son yer tutucu tanımı, istenen şablon alanına kopyalanıp-yapıştırılmak üzere."
 
 #. module: email_template
 #: view:email.template:0
@@ -453,8 +463,8 @@ msgid "Cc"
 msgstr "Cc"
 
 #. module: email_template
-#: field:email.template,body_text:0
-#: field:email_template.preview,body_text:0
+#: field:email.template,body:0
+#: field:email_template.preview,body:0
 msgid "Text Contents"
 msgstr "Metin içeriği"
 
@@ -488,6 +498,8 @@ msgid ""
 "You may attach files to this template, to be added to all emails created "
 "from this template"
 msgstr ""
+"Bu şablona dosya eleyebilirsiniz, bu şablonda oluşturulan tüm epostalara "
+"eklenmek üzere"
 
 #. module: email_template
 #: help:email.template,headers:0
@@ -512,6 +524,7 @@ msgid ""
 "Sidebar action to make this template available on records of the related "
 "document model"
 msgstr ""
+"Kenar çubuğu bu şablonun ilgili belge modellerinde kullanılmasını sağlar"
 
 #. module: email_template
 #: field:email.template,model_object_field:0
@@ -541,7 +554,7 @@ msgstr ""
 #: help:email.template,email_bcc:0
 #: help:email_template.preview,email_bcc:0
 msgid "Blind carbon copy recipients (placeholders may be used here)"
-msgstr ""
+msgstr "Alıcıların görğnmez karbon kopyası (burada yer tutucular kullanılr)"
 
 #. module: email_template
 #: help:email.template,lang:0
@@ -552,6 +565,10 @@ msgid ""
 "a placeholder expression that provides the appropriate language code, e.g. "
 "${object.partner_id.lang.code}."
 msgstr ""
+"Bir eposta gönderilirken seçilecek seçime bağlı çeviri dili (ISO kodu). Eğer "
+"ayarlanmamışsa, İngilizce sürümü kullanılacaktır. Bu genellikle uygun dil "
+"kodunu belirten bir yertutucu ifadesi olabilir, örneğin; "
+"${object.partner_id.lang.code}."
 
 #. module: email_template
 #: field:email_template.preview,res_id:0
@@ -562,7 +579,7 @@ msgstr "Örnek Döküman"
 #: help:email.template,email_to:0
 #: help:email_template.preview,email_to:0
 msgid "Comma-separated recipient addresses (placeholders may be used here)"
-msgstr ""
+msgstr "Virgülle ayrılmış alıcı adresleri (burada yertutucular kullanılır)"
 
 #. module: email_template
 #: field:email.template,name:0
@@ -596,6 +613,10 @@ msgid ""
 "instead.\n"
 "Placeholders must be used here, as this value always needs to be unique!"
 msgstr ""
+"Giden mesajlarda Mesaj-SMTP Kimliği bu şablonu temel alır. Lütfen bunun "
+"'Kaynak İzleme' seçeneğini gçersiz kılacağını not edin, bunun yerine giden "
+"epostaların yanıtlarını izlemek için o seçeneği etkinleştirin.\n"
+"Bu değer her zaman benzersiz olacağından burada yertutucular kullanılmalıdır!"
 
 #. module: email_template
 #: field:email.template,headers:0
@@ -613,7 +634,7 @@ msgstr "Bcc"
 #: help:email.template,reply_to:0
 #: help:email_template.preview,reply_to:0
 msgid "Preferred response address (placeholders may be used here)"
-msgstr ""
+msgstr "Yeğlenen yanıtlama adresi (burada yertutucular kullanılır)"
 
 #. module: email_template
 #: view:email.template:0
@@ -624,7 +645,7 @@ msgstr "Kenar Çubuğu butonunu kaldır"
 #: help:email.template,null_value:0
 #: help:email_template.preview,null_value:0
 msgid "Optional value to use if the target field is empty"
-msgstr ""
+msgstr "Hedef alanı boşsa kullanılacak seçimli değer"
 
 #. module: email_template
 #: view:email.template:0
@@ -641,7 +662,7 @@ msgstr "Mesaj referansları, tanımlayıcılar ya da önceki mesajlar"
 #: help:email.template,ref_ir_value:0
 #: help:email_template.preview,ref_ir_value:0
 msgid "Sidebar button to open the sidebar action"
-msgstr ""
+msgstr "Kenar çubuğu işlevini açacak kenar çubuğu düğmesi"
 
 #. module: email_template
 #: constraint:res.partner:0
@@ -661,6 +682,8 @@ msgid ""
 "Optional preferred server for outgoing mails. If not set, the highest "
 "priority one will be used."
 msgstr ""
+"Giden postalar için yeğlenen seçimli sunucu. Eğer ayarlanmaışsa, en yüksek "
+"öncelikli olan kullanılacaktır."
 
 #. module: email_template
 #: selection:email.template,state:0
@@ -675,6 +698,8 @@ msgid ""
 "When a relationship field is selected as first field, this field lets you "
 "select the target field within the destination document model (sub-model)."
 msgstr ""
+"İlk alan olarak ilişki alanı seçilmişse, bu alan, varış belge modeli içinden "
+"hedef alanını seçmenizi sağlar."
 
 #. module: email_template
 #: view:email.template:0
@@ -692,6 +717,7 @@ msgstr "Yazdırıp eklemek için opsiyonel rapor"
 #: help:email_template.preview,body_html:0
 msgid "Rich-text/HTML version of the message (placeholders may be used here)"
 msgstr ""
+"Mesajın Zengin-metin/HTML sürümü (burada yertutucular kullanılmalıdır)"
 
 #, python-format
 #~ msgid ""
@@ -1416,3 +1442,6 @@ msgstr ""
 #~ "eposta belgesidir. Özel müşteri alanlarına uygun olarak "
 #~ "kişiselleştirebilirsiniz, böylece; bir paydaş adı ya da paydaşla ilintili "
 #~ "bilgiler otomatik olarak eklenir."
+
+#~ msgid "Opt-out"
+#~ msgstr "Ayrılma"
diff --git a/addons/email_template/i18n/zh_CN.po b/addons/email_template/i18n/zh_CN.po
index 953c17aface..66374b3d14b 100644
--- a/addons/email_template/i18n/zh_CN.po
+++ b/addons/email_template/i18n/zh_CN.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:59+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: email_template
 #: field:email.template,subtype:0
@@ -307,8 +307,8 @@ msgid "Add Signature"
 msgstr "添加签名"
 
 #. module: email_template
-#: help:email.template,body_text:0
-#: help:email_template.preview,body_text:0
+#: help:email.template,body:0
+#: help:email_template.preview,body:0
 msgid "Plaintext version of the message (placeholders may be used here)"
 msgstr "内容的纯文本版本（可以在这里用占位符）"
 
@@ -449,8 +449,8 @@ msgid "Cc"
 msgstr "抄送"
 
 #. module: email_template
-#: field:email.template,body_text:0
-#: field:email_template.preview,body_text:0
+#: field:email.template,body:0
+#: field:email_template.preview,body:0
 msgid "Text Contents"
 msgstr "文本内容"
 
diff --git a/addons/email_template/i18n/zh_TW.po b/addons/email_template/i18n/zh_TW.po
new file mode 100644
index 00000000000..c7526fbce77
--- /dev/null
+++ b/addons/email_template/i18n/zh_TW.po
@@ -0,0 +1,711 @@
+# Chinese (Traditional) 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-02-08 00:36+0000\n"
+"PO-Revision-Date: 2012-08-30 10:19+0000\n"
+"Last-Translator: Bonnie Duan <bonnie.duan@cenoq.com>\n"
+"Language-Team: Cenoq Corp.\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:59+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
+
+#. module: email_template
+#: field:email.template,subtype:0
+#: field:email_template.preview,subtype:0
+msgid "Message type"
+msgstr "訊息類型"
+
+#. module: email_template
+#: field:email.template,report_name:0
+#: field:email_template.preview,report_name:0
+msgid "Report Filename"
+msgstr "報表檔名"
+
+#. module: email_template
+#: view:email.template:0
+msgid "SMTP Server"
+msgstr "SMTP 伺服器"
+
+#. module: email_template
+#: view:email.template:0
+msgid "Remove the sidebar button currently displayed on related documents"
+msgstr "移除側邊欄按鈕目前顯示在相關的文件"
+
+#. module: email_template
+#: field:email.template,ref_ir_act_window:0
+#: field:email_template.preview,ref_ir_act_window:0
+msgid "Sidebar action"
+msgstr "側邊欄動作"
+
+#. module: email_template
+#: view:mail.compose.message:0
+msgid "Save as a new template"
+msgstr "另存新的範本"
+
+#. module: email_template
+#: help:email.template,subject:0
+#: help:email_template.preview,subject:0
+msgid "Subject (placeholders may be used here)"
+msgstr "主旨 (佔位符可在這裡使用)"
+
+#. module: email_template
+#: help:email.template,email_cc:0
+#: help:email_template.preview,email_cc:0
+msgid "Carbon copy recipients (placeholders may be used here)"
+msgstr "副本收件人 (佔位符可在這裡使用)"
+
+#. module: email_template
+#: selection:email.template,state:0
+#: selection:email_template.preview,state:0
+msgid "Received"
+msgstr "收到"
+
+#. module: email_template
+#: view:email.template:0
+#: field:email.template,ref_ir_value:0
+#: field:email_template.preview,ref_ir_value:0
+msgid "Sidebar Button"
+msgstr "側邊欄按鈕"
+
+#. module: email_template
+#: help:email.template,report_name:0
+#: help:email_template.preview,report_name:0
+msgid ""
+"Name to use for the generated report file (may contain placeholders)\n"
+"The extension can be omitted and will then come from the report type."
+msgstr ""
+"產生的報表文件命名(可能包含佔位符)\n"
+"可以省略分機號碼然後將會成為報表型態."
+
+#. module: email_template
+#: view:email.template:0
+msgid "Attach existing files"
+msgstr "附加現有文件"
+
+#. module: email_template
+#: view:email.template:0
+msgid "Email Content"
+msgstr "郵件內容"
+
+#. module: email_template
+#: selection:email.template,state:0
+#: selection:email_template.preview,state:0
+msgid "Cancelled"
+msgstr "已取消"
+
+#. module: email_template
+#: field:email.template,reply_to:0
+#: field:email_template.preview,reply_to:0
+msgid "Reply-To"
+msgstr "回覆給"
+
+#. module: email_template
+#: field:email.template,auto_delete:0
+#: field:email_template.preview,auto_delete:0
+msgid "Auto Delete"
+msgstr "自動刪除"
+
+#. module: email_template
+#: code:addons/email_template/email_template.py:218
+#, python-format
+msgid "Warning"
+msgstr "警告"
+
+#. module: email_template
+#: model:ir.model,name:email_template.model_res_partner
+msgid "Partner"
+msgstr "業務夥伴"
+
+#. module: email_template
+#: field:email.template,subject:0
+#: field:email_template.preview,subject:0
+msgid "Subject"
+msgstr "主旨"
+
+#. module: email_template
+#: field:email.template,email_from:0
+#: field:email_template.preview,email_from:0
+msgid "From"
+msgstr "從"
+
+#. module: email_template
+#: field:mail.compose.message,template_id:0
+msgid "Template"
+msgstr "範本"
+
+#. module: email_template
+#: field:email.template,partner_id:0
+#: field:email_template.preview,partner_id:0
+msgid "Related partner"
+msgstr "相關的合作夥伴"
+
+#. module: email_template
+#: field:email.template,sub_model_object_field:0
+#: field:email_template.preview,sub_model_object_field:0
+msgid "Sub-field"
+msgstr "子欄位"
+
+#. module: email_template
+#: view:email.template:0
+msgid ""
+"Display a button in the sidebar of related documents to open a composition "
+"wizard with this template"
+msgstr "相關文件螢幕上的精靈列按鈕可打開這範本之精靈"
+
+#. module: email_template
+#: field:email.template,state:0
+#: field:email_template.preview,state:0
+msgid "State"
+msgstr "狀態"
+
+#. module: email_template
+#: selection:email.template,state:0
+#: selection:email_template.preview,state:0
+msgid "Sent"
+msgstr "傳送"
+
+#. module: email_template
+#: help:email.template,subtype:0
+#: help:email_template.preview,subtype:0
+msgid ""
+"Type of message, usually 'html' or 'plain', used to select plaintext or rich "
+"text contents accordingly"
+msgstr "訊息類型, 經常是'html'或'plain', 用於選擇 plaintext 或 rich text 做為內容"
+
+#. module: email_template
+#: model:ir.model,name:email_template.model_mail_compose_message
+msgid "Email composition wizard"
+msgstr "電子郵件成分嚮導"
+
+#. module: email_template
+#: view:email.template:0
+msgid "Dynamic Values Builder"
+msgstr "建立動態值"
+
+#. module: email_template
+#: field:email.template,res_id:0
+msgid "Related Document ID"
+msgstr "相關文件 ID"
+
+#. module: email_template
+#: field:email.template,lang:0
+#: field:email_template.preview,lang:0
+msgid "Language Selection"
+msgstr "語言選擇"
+
+#. module: email_template
+#: view:email.template:0
+msgid "Advanced"
+msgstr "提出"
+
+#. module: email_template
+#: field:email.template,email_to:0
+#: field:email_template.preview,email_to:0
+msgid "To"
+msgstr "給"
+
+#. module: email_template
+#: field:email.template,model:0
+#: field:email_template.preview,model:0
+msgid "Related Document Model"
+msgstr "相關文檔模型"
+
+#. module: email_template
+#: help:email.template,model_object_field:0
+#: help:email_template.preview,model_object_field:0
+msgid ""
+"Select target field from the related document model.\n"
+"If it is a relationship field you will be able to select a target field at "
+"the destination of the relationship."
+msgstr ""
+"從相關文件類型選擇目標\n"
+"若它是關聯欄位，您就可以在這關聯關係中，取得這欄位"
+
+#. module: email_template
+#: view:email.template:0
+msgid "Preview Template"
+msgstr "預覽範本"
+
+#. module: email_template
+#: field:email.template,null_value:0
+#: field:email_template.preview,null_value:0
+msgid "Null value"
+msgstr "空值"
+
+#. module: email_template
+#: field:email.template,sub_object:0
+#: field:email_template.preview,sub_object:0
+msgid "Sub-model"
+msgstr "子類型"
+
+#. module: email_template
+#: help:email.template,track_campaign_item:0
+#: help:email_template.preview,track_campaign_item:0
+msgid ""
+"Enable this is you wish to include a special tracking marker in outgoing "
+"emails so you can identify replies and link them back to the corresponding "
+"resource record. This is useful for CRM leads for example"
+msgstr "啟用，這是您希望包括一個特殊的追蹤電子郵件標記，這樣您就可以找出答覆並連接到相應的資源記錄。這是有用的，例如CRM的線索"
+
+#. module: email_template
+#: field:mail.compose.message,use_template:0
+msgid "Use Template"
+msgstr "使用範本"
+
+#. module: email_template
+#: field:email.template,attachment_ids:0
+#: field:email_template.preview,attachment_ids:0
+msgid "Files to attach"
+msgstr "附加的文件"
+
+#. module: email_template
+#: view:email.template:0
+msgid "Options"
+msgstr "選項"
+
+#. module: email_template
+#: field:email.template,model_id:0
+#: field:email_template.preview,model_id:0
+msgid "Related document model"
+msgstr "相關文件類型"
+
+#. module: email_template
+#: help:email.template,email_from:0
+#: help:email_template.preview,email_from:0
+msgid "Sender address (placeholders may be used here)"
+msgstr "發信人地址(佔位符可以用在這)"
+
+#. module: email_template
+#: help:res.partner,opt_out:0
+msgid ""
+"If checked, this partner will not receive any automated email notifications, "
+"such as the availability of invoices."
+msgstr "若勾選, 這個合作夥伴將不會收到任何自動郵件回復, 例如有效發票"
+
+#. module: email_template
+#: view:email.template:0
+msgid "Note: This is Raw HTML."
+msgstr "備註: 這是Raw HTML."
+
+#. module: email_template
+#: view:email.template:0
+msgid "Group by..."
+msgstr "分類方式..."
+
+#. module: email_template
+#: field:email.template,user_signature:0
+#: field:email_template.preview,user_signature:0
+msgid "Add Signature"
+msgstr "加入簽名"
+
+#. module: email_template
+#: help:email.template,body:0
+#: help:email_template.preview,body:0
+msgid "Plaintext version of the message (placeholders may be used here)"
+msgstr "Plaintext 消息版本(佔位符可以用在這)"
+
+#. module: email_template
+#: help:email.template,original:0
+#: help:email_template.preview,original:0
+msgid "Original version of the message, as it was sent on the network"
+msgstr "消息原始版本, 因為它是在網路上發送"
+
+#. module: email_template
+#: code:addons/email_template/email_template.py:230
+#, python-format
+msgid "(copy)"
+msgstr "(副本)"
+
+#. module: email_template
+#: selection:email.template,state:0
+#: selection:email_template.preview,state:0
+msgid "Outgoing"
+msgstr "外送"
+
+#. module: email_template
+#: view:mail.compose.message:0
+msgid "Use a message template"
+msgstr "使用訊息範本"
+
+#. module: email_template
+#: help:email.template,user_signature:0
+#: help:email_template.preview,user_signature:0
+msgid ""
+"If checked, the user's signature will be appended to the text version of the "
+"message"
+msgstr "若勾選, 使用者的簽名將附加到郵件的文字版本"
+
+#. module: email_template
+#: view:email.template:0
+#: view:email_template.preview:0
+msgid "Body (Rich/HTML)"
+msgstr "內文 (Rich/HTML)"
+
+#. module: email_template
+#: help:email.template,sub_object:0
+#: help:email_template.preview,sub_object:0
+msgid ""
+"When a relationship field is selected as first field, this field shows the "
+"document model the relationship goes to."
+msgstr ""
+"當這相關欄位是選為第一欄位, this field shows the document model the relationship goes to."
+
+#. module: email_template
+#: model:ir.model,name:email_template.model_email_template
+msgid "Email Templates"
+msgstr "郵件範本"
+
+#. module: email_template
+#: field:email.template,date:0
+#: field:email_template.preview,date:0
+msgid "Date"
+msgstr "日期"
+
+#. module: email_template
+#: model:ir.actions.act_window,name:email_template.wizard_email_template_preview
+msgid "Template Preview"
+msgstr "預覽範本"
+
+#. module: email_template
+#: field:email.template,message_id:0
+#: field:email_template.preview,message_id:0
+msgid "Message-Id"
+msgstr "訊息-Id"
+
+#. module: email_template
+#: view:email.template:0
+msgid "Add sidebar button"
+msgstr "加入側邊欄按鈕"
+
+#. module: email_template
+#: view:email.template:0
+#: view:email_template.preview:0
+msgid "Body (Text)"
+msgstr "內文 (Text)"
+
+#. module: email_template
+#: view:email.template:0
+msgid "Advanced Options"
+msgstr "進階選項"
+
+#. module: email_template
+#: code:addons/email_template/email_template.py:183
+#, python-format
+msgid "Send Mail (%s)"
+msgstr "傳送郵件 (%s)"
+
+#. module: email_template
+#: field:email.template,body_html:0
+#: field:email_template.preview,body_html:0
+msgid "Rich-text Contents"
+msgstr "富文本內容"
+
+#. module: email_template
+#: field:email.template,copyvalue:0
+#: field:email_template.preview,copyvalue:0
+msgid "Expression"
+msgstr "表達"
+
+#. module: email_template
+#: field:email.template,original:0
+#: field:email_template.preview,original:0
+msgid "Original"
+msgstr "原作"
+
+#. module: email_template
+#: view:email.template:0
+msgid "Addresses"
+msgstr "地址"
+
+#. module: email_template
+#: help:email.template,copyvalue:0
+#: help:email_template.preview,copyvalue:0
+msgid ""
+"Final placeholder expression, to be copy-pasted in the desired template "
+"field."
+msgstr "最後的模板欄位，找到要複製-貼上的區塊"
+
+#. module: email_template
+#: view:email.template:0
+msgid "Attachments"
+msgstr "附件"
+
+#. module: email_template
+#: view:email.template:0
+msgid "Email Details"
+msgstr "郵件詳情"
+
+#. module: email_template
+#: field:email.template,email_cc:0
+#: field:email_template.preview,email_cc:0
+msgid "Cc"
+msgstr "副本"
+
+#. module: email_template
+#: field:email.template,body:0
+#: field:email_template.preview,body:0
+msgid "Text Contents"
+msgstr "文字內容"
+
+#. module: email_template
+#: help:email.template,auto_delete:0
+#: help:email_template.preview,auto_delete:0
+msgid "Permanently delete this email after sending it, to save space"
+msgstr "永久刪除已發送的郵件以節省空間"
+
+#. module: email_template
+#: field:email.template,references:0
+#: field:email_template.preview,references:0
+msgid "References"
+msgstr "參考"
+
+#. module: email_template
+#: field:email.template,display_text:0
+#: field:email_template.preview,display_text:0
+msgid "Display Text"
+msgstr "顯示文字"
+
+#. module: email_template
+#: view:email_template.preview:0
+msgid "Close"
+msgstr "關閉"
+
+#. module: email_template
+#: help:email.template,attachment_ids:0
+#: help:email_template.preview,attachment_ids:0
+msgid ""
+"You may attach files to this template, to be added to all emails created "
+"from this template"
+msgstr "這個範本您可以加入附件, 從這範本新建所有郵件"
+
+#. module: email_template
+#: help:email.template,headers:0
+#: help:email_template.preview,headers:0
+msgid ""
+"Full message headers, e.g. SMTP session headers (usually available on "
+"inbound messages only)"
+msgstr "完整的郵件標題，例如僅SMTP會話頭（通常可在入站消息)"
+
+#. module: email_template
+#: field:email.template,mail_server_id:0
+#: field:email_template.preview,mail_server_id:0
+msgid "Outgoing Mail Server"
+msgstr "發送郵件伺服器"
+
+#. module: email_template
+#: help:email.template,ref_ir_act_window:0
+#: help:email_template.preview,ref_ir_act_window:0
+msgid ""
+"Sidebar action to make this template available on records of the related "
+"document model"
+msgstr "側邊欄動作使這個範本記錄相關的文件類型"
+
+#. module: email_template
+#: field:email.template,model_object_field:0
+#: field:email_template.preview,model_object_field:0
+msgid "Field"
+msgstr "欄位"
+
+#. module: email_template
+#: field:email.template,user_id:0
+#: field:email_template.preview,user_id:0
+msgid "Related user"
+msgstr "相關使用者"
+
+#. module: email_template
+#: view:email.template:0
+#: model:ir.actions.act_window,name:email_template.action_email_template_tree_all
+#: model:ir.ui.menu,name:email_template.menu_email_templates
+msgid "Templates"
+msgstr "範本"
+
+#. module: email_template
+#: field:res.partner,opt_out:0
+msgid "Opt-Out"
+msgstr "不參加"
+
+#. module: email_template
+#: help:email.template,email_bcc:0
+#: help:email_template.preview,email_bcc:0
+msgid "Blind carbon copy recipients (placeholders may be used here)"
+msgstr "密件副本收件人（佔位符可以用在這裡）"
+
+#. module: email_template
+#: help:email.template,lang:0
+#: help:email_template.preview,lang:0
+msgid ""
+"Optional translation language (ISO code) to select when sending out an "
+"email. If not set, the english version will be used. This should usually be "
+"a placeholder expression that provides the appropriate language code, e.g. "
+"${object.partner_id.lang.code}."
+msgstr ""
+"選擇翻譯語言（ISO代碼）選擇發送電子郵件時。如果沒有設置，將使用英文版本。通常，這應該是一個佔位符，表達式，提供適當的語言代碼，例如$ "
+"{object.partner_id.lang.code}。"
+
+#. module: email_template
+#: field:email_template.preview,res_id:0
+msgid "Sample Document"
+msgstr "文件範本"
+
+#. module: email_template
+#: help:email.template,email_to:0
+#: help:email_template.preview,email_to:0
+msgid "Comma-separated recipient addresses (placeholders may be used here)"
+msgstr "逗號分隔的收件人地址（佔位符可以用在這裡）"
+
+#. module: email_template
+#: field:email.template,name:0
+#: field:email_template.preview,name:0
+msgid "Name"
+msgstr "名稱"
+
+#. module: email_template
+#: field:email.template,track_campaign_item:0
+#: field:email_template.preview,track_campaign_item:0
+msgid "Resource Tracking"
+msgstr "資源追蹤"
+
+#. module: email_template
+#: model:ir.model,name:email_template.model_email_template_preview
+msgid "Email Template Preview"
+msgstr "預覽郵件範本"
+
+#. module: email_template
+#: view:email_template.preview:0
+msgid "Email Preview"
+msgstr "預覽郵件"
+
+#. module: email_template
+#: help:email.template,message_id:0
+#: help:email_template.preview,message_id:0
+msgid ""
+"Message-ID SMTP header to use in outgoing messages based on this template. "
+"Please note that this overrides the 'Resource Tracking' option, so if you "
+"simply need to track replies to outgoing emails, enable that option "
+"instead.\n"
+"Placeholders must be used here, as this value always needs to be unique!"
+msgstr ""
+"消息ID SMTP頭使用在基於此模板的傳出消息。請注意，這將覆蓋'資源追蹤'選項，所以如果您只需要跟蹤答覆外發郵件，啟用該選項。\n"
+"佔位符必須用在這裡，這個值永遠必須是唯一的！"
+
+#. module: email_template
+#: field:email.template,headers:0
+#: field:email_template.preview,headers:0
+msgid "Message headers"
+msgstr "訊息頂端"
+
+#. module: email_template
+#: field:email.template,email_bcc:0
+#: field:email_template.preview,email_bcc:0
+msgid "Bcc"
+msgstr "密件副本收件人"
+
+#. module: email_template
+#: help:email.template,reply_to:0
+#: help:email_template.preview,reply_to:0
+msgid "Preferred response address (placeholders may be used here)"
+msgstr "首選的回覆地址（佔位符可以用在這裡）"
+
+#. module: email_template
+#: view:email.template:0
+msgid "Remove sidebar button"
+msgstr "移動側邊欄按鈕"
+
+#. module: email_template
+#: help:email.template,null_value:0
+#: help:email_template.preview,null_value:0
+msgid "Optional value to use if the target field is empty"
+msgstr "若欄位是空的需選擇使用值"
+
+#. module: email_template
+#: view:email.template:0
+msgid "Model"
+msgstr "型號"
+
+#. module: email_template
+#: help:email.template,references:0
+#: help:email_template.preview,references:0
+msgid "Message references, such as identifiers of previous messages"
+msgstr "消息引用，如以前的消息標識符"
+
+#. module: email_template
+#: help:email.template,ref_ir_value:0
+#: help:email_template.preview,ref_ir_value:0
+msgid "Sidebar button to open the sidebar action"
+msgstr "側邊欄按鈕來打開側邊欄動作"
+
+#. module: email_template
+#: constraint:res.partner:0
+msgid "Error ! You cannot create recursive associated members."
+msgstr "錯誤 ! 您不行建立相關成員"
+
+#. module: email_template
+#: code:addons/email_template/email_template.py:218
+#, python-format
+msgid "Deletion of the action record failed."
+msgstr "刪除的動作記錄失敗"
+
+#. module: email_template
+#: help:email.template,mail_server_id:0
+#: help:email_template.preview,mail_server_id:0
+msgid ""
+"Optional preferred server for outgoing mails. If not set, the highest "
+"priority one will be used."
+msgstr "可選擇伺服器發送的郵件。如果沒有設置，優先級最高的將被使用。"
+
+#. module: email_template
+#: selection:email.template,state:0
+#: selection:email_template.preview,state:0
+msgid "Delivery Failed"
+msgstr "傳送失敗"
+
+#. module: email_template
+#: help:email.template,sub_model_object_field:0
+#: help:email_template.preview,sub_model_object_field:0
+msgid ""
+"When a relationship field is selected as first field, this field lets you "
+"select the target field within the destination document model (sub-model)."
+msgstr "當相關欄位已被選擇為第一欄位, 這欄位，讓您選擇目標欄位內的目標文件類型（子類型型）。"
+
+#. module: email_template
+#: view:email.template:0
+msgid "Attach Report"
+msgstr "附加報表"
+
+#. module: email_template
+#: field:email.template,report_template:0
+#: field:email_template.preview,report_template:0
+msgid "Optional report to print and attach"
+msgstr "選擇報表列印與附加"
+
+#. module: email_template
+#: help:email.template,body_html:0
+#: help:email_template.preview,body_html:0
+msgid "Rich-text/HTML version of the message (placeholders may be used here)"
+msgstr "Rich-text/HTML版本的消息（佔位符可以用在這裡）"
+
+#~ msgid "Sidebar button"
+#~ msgstr "側邊欄按鈕"
+
+#~ msgid "E-mail composition wizard"
+#~ msgstr "郵件合併精靈"
+
+#~ msgid "Related Document model"
+#~ msgstr "相關文件類型"
+
+#~ msgid "Rich-text contents"
+#~ msgstr "豐富的文字內容"
+
+#~ msgid "Text contents"
+#~ msgstr "文字內容"
+
+#~ msgid "Opt-out"
+#~ msgstr "退出選擇"
diff --git a/addons/email_template/security/ir.model.access.csv b/addons/email_template/security/ir.model.access.csv
index d2d6adf3bf3..adce0420793 100644
--- a/addons/email_template/security/ir.model.access.csv
+++ b/addons/email_template/security/ir.model.access.csv
@@ -1,5 +1,3 @@
 id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
-access_email_template,email.template,model_email_template,,1,0,0,0
+access_email_template,email.template,model_email_template,,1,1,1,0
 access_email_template_system,email.template system,model_email_template,base.group_system,1,1,1,1
-access_email_template_manager,email.template,model_email_template,,1,1,1,1
-access_email_template_preview_system,email.template.preview system,model_email_template_preview,base.group_system,1,1,1,1
diff --git a/addons/hr_evaluation/wizard/__init__.py b/addons/email_template/tests/__init__.py
similarity index 82%
rename from addons/hr_evaluation/wizard/__init__.py
rename to addons/email_template/tests/__init__.py
index 64406ac6b1e..d63c5634cc3 100644
--- a/addons/hr_evaluation/wizard/__init__.py
+++ b/addons/email_template/tests/__init__.py
@@ -1,8 +1,8 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
 ##############################################################################
 #
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    OpenERP, Open Source Business Applications
+#    Copyright (c) 2012-TODAY OpenERP S.A. <http://openerp.com>
 #
 #    This program is free software: you can redistribute it and/or modify
 #    it under the terms of the GNU Affero General Public License as
@@ -18,8 +18,10 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
+from . import test_mail
 
-#import hr_evaluation_mail
-import mail_compose_message
+checks = [
+    test_mail,
+]
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/email_template/tests/test_mail.py b/addons/email_template/tests/test_mail.py
new file mode 100644
index 00000000000..85ab3afc902
--- /dev/null
+++ b/addons/email_template/tests/test_mail.py
@@ -0,0 +1,186 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Business Applications
+#    Copyright (c) 2012-TODAY OpenERP S.A. <http://openerp.com>
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    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 base64
+from openerp.tests import common
+
+class test_message_compose(common.TransactionCase):
+
+    def _mock_smtp_gateway(self, *args, **kwargs):
+        return True
+
+    def _mock_build_email(self, *args, **kwargs):
+        self._build_email_args = args
+        self._build_email_kwargs = kwargs
+        return self.build_email_real(*args, **kwargs)
+
+    def setUp(self):
+        super(test_message_compose, self).setUp()
+        self.mail_group = self.registry('mail.group')
+        self.mail_mail = self.registry('mail.mail')
+        self.mail_message = self.registry('mail.message')
+        self.res_users = self.registry('res.users')
+        self.res_partner = self.registry('res.partner')
+
+        # Install mock SMTP gateway
+        self.build_email_real = self.registry('ir.mail_server').build_email
+        self.registry('ir.mail_server').build_email = self._mock_build_email
+        self.registry('ir.mail_server').send_email = self._mock_smtp_gateway
+
+        # create a 'pigs' and 'bird' groups that will be used through the various tests
+        self.group_pigs_id = self.mail_group.create(self.cr, self.uid,
+            {'name': 'Pigs', 'description': 'Fans of Pigs, unite !'})
+        self.group_bird_id = self.mail_group.create(self.cr, self.uid,
+            {'name': 'Bird', 'description': 'I am angry !'})
+
+    def test_00_message_compose_wizard(self):
+        """ Tests designed for the mail.compose.message wizard updated by email_template. """
+        cr, uid = self.cr, self.uid
+        mail_compose = self.registry('mail.compose.message')
+        self.res_users.write(cr, uid, [uid], {'signature': 'Admin', 'email': 'a@a.a'})
+        user_admin = self.res_users.browse(cr, uid, uid)
+        p_a_id = user_admin.partner_id.id
+        group_pigs = self.mail_group.browse(cr, uid, self.group_pigs_id)
+        group_bird = self.mail_group.browse(cr, uid, self.group_bird_id)
+
+        # Mail data
+        _subject1 = 'Pigs'
+        _subject2 = 'Bird'
+        _body_html1 = 'Fans of Pigs, unite !\n<pre>Admin</pre>\n'
+        _body_html2 = 'I am angry !\n<pre>Admin</pre>\n'
+        _attachments = [
+            {'name': 'First', 'datas_fname': 'first.txt', 'datas': base64.b64encode('My first attachment')},
+            {'name': 'Second', 'datas_fname': 'second.txt', 'datas': base64.b64encode('My second attachment')}
+            ]
+        _attachments_test = [('first.txt', 'My first attachment'), ('second.txt', 'My second attachment')]
+
+        # Create template on mail.group, with attachments
+        group_model_id = self.registry('ir.model').search(cr, uid, [('model', '=', 'mail.group')])[0]
+        email_template = self.registry('email.template')
+        email_template_id = email_template.create(cr, uid, {'model_id': group_model_id,
+            'name': 'Pigs Template', 'subject': '${object.name}',
+            'body_html': '${object.description}', 'user_signature': True,
+            'attachment_ids': [(0, 0, _attachments[0]), (0, 0, _attachments[1])],
+            'email_to': 'b@b.b c@c.c', 'email_cc': 'd@d.d'})
+
+        # ----------------------------------------
+        # CASE1: comment and save as template
+        # ----------------------------------------
+
+        # 1. Comment on pigs
+        compose_id = mail_compose.create(cr, uid,
+            {'subject': 'Forget me subject', 'body': '<p>Dummy body</p>'},
+            {'default_composition_mode': 'comment', 'default_model': 'mail.group',
+                'default_res_id': self.group_pigs_id,
+                'default_template_id': email_template_id,
+                'active_ids': [self.group_pigs_id, self.group_bird_id]})
+        compose = mail_compose.browse(cr, uid, compose_id)
+
+        # 2. Save current composition form as a template
+        mail_compose.save_as_template(cr, uid, [compose_id], context={'default_model': 'mail.group'})
+        # Test: email_template subject, body_html, model
+        last_template_id = email_template.search(cr, uid, [('model', '=', 'mail.group'), ('subject', '=', 'Forget me subject')], limit=1)[0]
+        self.assertTrue(last_template_id, 'email_template not found for model mail.group, subject Forget me subject')
+        last_template = email_template.browse(cr, uid, last_template_id)
+        self.assertEqual(last_template.body_html, '<p>Dummy body</p>', 'email_template incorrect body_html')
+
+        # ----------------------------------------
+        # CASE2: comment with template, save as template
+        # ----------------------------------------
+
+        # 1. Comment on pigs
+        compose_id = mail_compose.create(cr, uid,
+            {'subject': 'Forget me subject', 'body': 'Dummy body'},
+            {'default_composition_mode': 'comment', 'default_model': 'mail.group',
+                'default_res_id': self.group_pigs_id,
+                'default_template_id': email_template_id,
+                'active_ids': [self.group_pigs_id, self.group_bird_id]})
+        compose = mail_compose.browse(cr, uid, compose_id)
+
+        # 2. Perform 'toggle_template', to set use_template and use template_id
+        mail_compose.toggle_template(cr, uid, [compose_id], {'default_composition_mode': 'comment', 'default_model': 'mail.group'})
+        compose.refresh()
+        message_pids = [partner.id for partner in compose.partner_ids]
+        partner_ids = self.res_partner.search(cr, uid, [('email', 'in', ['b@b.b', 'c@c.c', 'd@d.d'])])
+        # Test: mail.compose.message: subject, body, content_subtype, partner_ids
+        self.assertEqual(compose.subject, _subject1, 'mail.compose.message subject incorrect')
+        self.assertEqual(compose.body, _body_html1, 'mail.compose.message body incorrect')
+        self.assertEqual(compose.content_subtype, 'html', 'mail.compose.message content_subtype incorrect')
+        self.assertEqual(set(message_pids), set(partner_ids), 'mail.compose.message partner_ids incorrect')
+        # Test: mail.compose.message: attachments
+        # Test: mail.message: attachments
+        for attach in compose.attachment_ids:
+            self.assertEqual(attach.res_model, 'mail.group', 'mail.message attachment res_model incorrect')
+            self.assertEqual(attach.res_id, self.group_pigs_id, 'mail.message attachment res_id incorrect')
+            self.assertIn((attach.name, base64.b64decode(attach.datas)), _attachments_test,
+                'mail.message attachment name / data incorrect')
+
+        # 3. Perform 'toggle_template': template is not set anymore
+        mail_compose.toggle_template(cr, uid, [compose_id], {'default_composition_mode': 'comment', 'default_model': 'mail.group'})
+        compose.refresh()
+        # Test: subject, body, partner_ids
+        self.assertEqual(compose.subject, False, 'mail.compose.message subject incorrect')
+        self.assertEqual(compose.body, '', 'mail.compose.message body incorrect')
+
+        # ----------------------------------------
+        # CASE3: mass_mail with template
+        # ----------------------------------------
+
+        # 1. Mass_mail on pigs and bird, with a default_partner_ids set to check he is correctly added
+        compose_id = mail_compose.create(cr, uid,
+            {'subject': 'Forget me subject', 'body': 'Dummy body'},
+            {'default_composition_mode': 'mass_mail', 'default_model': 'mail.group',
+                'default_res_id': self.group_pigs_id,
+                'default_template_id': email_template_id,
+                'default_partner_ids': [p_a_id],
+                'active_ids': [self.group_pigs_id, self.group_bird_id]})
+        compose = mail_compose.browse(cr, uid, compose_id)
+
+        # 2. Perform 'toggle_template', to set use_template and use template_id
+        mail_compose.toggle_template(cr, uid, [compose_id], {'default_composition_mode': 'comment', 'default_model': 'mail.group'})
+        compose.refresh()
+        message_pids = [partner.id for partner in compose.partner_ids]
+        partner_ids = [p_a_id]
+        # Test: mail.compose.message: subject, body, content_subtype, partner_ids
+        self.assertEqual(compose.subject, '${object.name}', 'mail.compose.message subject incorrect')
+        self.assertEqual(compose.body, '${object.description}', 'mail.compose.message body incorrect')
+        self.assertEqual(compose.content_subtype, 'html', 'mail.compose.message content_subtype incorrect')
+        self.assertEqual(set(message_pids), set(partner_ids), 'mail.compose.message partner_ids incorrect')
+
+        # 3. Post the comment, get created message
+        mail_compose.send_mail(cr, uid, [compose_id],  {'default_res_id': -1, 'active_ids': [self.group_pigs_id, self.group_bird_id]})
+        group_pigs.refresh()
+        group_bird.refresh()
+        message_pigs = group_pigs.message_ids[0]
+        message_bird = group_bird.message_ids[0]
+        # Test: subject, body
+        self.assertEqual(message_pigs.subject, _subject1, 'mail.message subject on Pigs incorrect')
+        self.assertEqual(message_bird.subject, _subject2, 'mail.message subject on Bird incorrect')
+        self.assertEqual(message_pigs.body, _body_html1, 'mail.message body on Pigs incorrect')
+        self.assertEqual(message_bird.body, _body_html2, 'mail.message body on Bird incorrect')
+        # Test: partner_ids: p_a_id (default) + 3 newly created partners
+        message_pigs_pids = [partner.id for partner in message_pigs.partner_ids]
+        message_bird_pids = [partner.id for partner in message_bird.partner_ids]
+        partner_ids = self.res_partner.search(cr, uid, [('email', 'in', ['b@b.b', 'c@c.c', 'd@d.d'])]) + [p_a_id]
+        self.assertEqual(len(message_pigs_pids), len(partner_ids), 'mail.message on pigs incorrect number of partner_ids')
+        self.assertEqual(len(message_bird_pids), len(partner_ids), 'mail.message on bird partner_ids incorrect')
+        self.assertEqual(set(message_pigs_pids), set(partner_ids), 'mail.message on pigs incorrect number of partner_ids')
+        self.assertEqual(set(message_bird_pids), set(partner_ids), 'mail.message on bird partner_ids incorrect')
diff --git a/addons/email_template/wizard/email_template_preview.py b/addons/email_template/wizard/email_template_preview.py
index 4ef0e9fa156..862c34cc426 100644
--- a/addons/email_template/wizard/email_template_preview.py
+++ b/addons/email_template/wizard/email_template_preview.py
@@ -26,7 +26,6 @@ class email_template_preview(osv.osv_memory):
     _inherit = "email.template"
     _name = "email_template.preview"
     _description = "Email Template Preview"
-    _rec_name = "subject"
 
     def _get_records(self, cr, uid, context=None):
         """
@@ -66,30 +65,19 @@ class email_template_preview(osv.osv_memory):
         return result
 
     _columns = {
-        'res_id':fields.selection(_get_records, 'Sample Document'),
+        'res_id': fields.selection(_get_records, 'Sample Document'),
     }
 
     def on_change_res_id(self, cr, uid, ids, res_id, context=None):
-        if not res_id:
-            return {}
+        if not res_id: return {}
         vals = {}
         email_template = self.pool.get('email.template')
         template_id = context and context.get('template_id')
-        template = email_template.get_email_template(cr, uid, template_id=template_id, record_id=res_id, context=context)
-        model = template.model
-        vals['email_to'] = self.render_template(cr, uid, template.email_to, model, res_id, context)
-        vals['email_cc'] = self.render_template(cr, uid, template.email_cc, model, res_id, context)
-        vals['email_bcc'] = self.render_template(cr, uid, template.email_bcc, model, res_id, context)
-        vals['reply_to'] = self.render_template(cr, uid, template.reply_to, model, res_id, context)
-        vals['subject'] = self.render_template(cr, uid, template.subject, model, res_id, context)
-        description = self.render_template(cr, uid, template.body_text, model, res_id, context) or ''
-        if template.user_signature:
-            signature = self.pool.get('res.users').browse(cr, uid, uid, context).signature
-            description += '\n' + signature
-        vals['body_text'] = description
-        if template.body_html:
-            vals['body_html'] = self.render_template(cr, uid, template.body_html, model, res_id, context) or ''
-        vals['report_name'] = self.render_template(cr, uid, template.report_name, model, res_id, context)
+        template = email_template.browse(cr, uid, template_id, context=context)
+        vals['name'] = template.name
+        mail_values = email_template.generate_email(cr, uid, template_id, res_id, context=context)
+        for k in ('email_from','email_to','email_cc','reply_to','subject','body_html'):
+            vals[k] = mail_values[k]
         return {'value': vals}
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/email_template/wizard/email_template_preview_view.xml b/addons/email_template/wizard/email_template_preview_view.xml
index 39fb413fcde..f4f75567a42 100644
--- a/addons/email_template/wizard/email_template_preview_view.xml
+++ b/addons/email_template/wizard/email_template_preview_view.xml
@@ -6,27 +6,22 @@
             <field name="name">email_template.preview.form</field>
             <field name="model">email_template.preview</field>
             <field name="arch" type="xml">
-                <form string="Email Preview">
-                    <field name="model_id" invisible="1"/>
-                    <field name="res_id" on_change="on_change_res_id(res_id, context)"/>
-                    <group col="2" colspan="4">
-                        <field name="email_to" readonly="1"/>
-                        <field name="email_cc" readonly="1" attrs="{'invisible': [('email_cc','=',False)]}"/>
-                        <field name="email_bcc" readonly="1" attrs="{'invisible': [('email_bcc','=',False)]}"/>
-                        <field name="reply_to" readonly="1" attrs="{'invisible': [('reply_to','=',False)]}"/>
-                        <field name="subject" readonly="1"/>
+                <form string="Email Preview" version="7.0">
+                    <div>
+                        <h2>Preview of <field name="name" readonly="1" class="oe_inline"/></h2>
+                        <field name="model_id" invisible="1"/>
+                        <h3>Using sample document
+                        <field name="res_id" on_change="on_change_res_id(res_id, context)" class="oe_inline"/>
+                        </h3>
+                    </div>
+                    <group>
+                      <field name="email_from" readonly="1"/>
+                      <field name="email_to" readonly="1"/>
+                      <field name="email_cc" readonly="1" attrs="{'invisible':[('email_cc','=',False)]}"/>
+                      <field name="reply_to" readonly="1" attrs="{'invisible':[('reply_to','=',False)]}"/>
+                      <field name="subject" readonly="1"/>
+                      <field name="body_html" widget="html" readonly="1"/>
                     </group>
-                    <group col="4" colspan="4">
-                        <notebook>
-                            <page string="Body (Text)">
-                                <field name="body_text" nolabel="1" colspan="4" height="350" width="350" readonly="1"/>
-                            </page>
-                            <page string="Body (Rich/HTML)" attrs="{'invisible': [('body_html','=', False)]}">
-                                <field name="body_html" nolabel="1" colspan="4" height="350" width="350" readonly="1"/>
-                            </page>
-                        </notebook>
-                    </group>
-                    <field name="report_name" colspan="4" readonly="1"/>
                 </form>
             </field>
         </record>
diff --git a/addons/email_template/wizard/mail_compose_message.py b/addons/email_template/wizard/mail_compose_message.py
index 1b007a990c0..2baef6e6c90 100644
--- a/addons/email_template/wizard/mail_compose_message.py
+++ b/addons/email_template/wizard/mail_compose_message.py
@@ -19,138 +19,155 @@
 #
 ##############################################################################
 
-import base64
+import tools
 
 from osv import osv
 from osv import fields
-from tools.translate import _
-import tools
-
 
 class mail_compose_message(osv.osv_memory):
     _inherit = 'mail.compose.message'
 
     def _get_templates(self, cr, uid, context=None):
-        """
-        Return Email Template of particular  Model.
-        """
         if context is None:
             context = {}
-        record_ids = []
-        email_template= self.pool.get('email.template')
         model = False
-        if context.get('message_id'):
-            mail_message = self.pool.get('mail.message')
-            message_data = mail_message.browse(cr, uid, int(context.get('message_id')), context)
-            model = message_data.model
-        elif context.get('mail.compose.target.model') or context.get('active_model'):
-            model = context.get('mail.compose.target.model', context.get('active_model'))
+        email_template_obj = self.pool.get('email.template')
+        message_id = context.get('default_parent_id', context.get('message_id', context.get('active_id')))
+
+        if context.get('default_composition_mode') == 'reply' and message_id:
+            message_data = self.pool.get('mail.message').browse(cr, uid, message_id, context=context)
+            if message_data:
+                model = message_data.model
+        else:
+            model = context.get('default_model', context.get('active_model'))
+
         if model:
-            record_ids = email_template.search(cr, uid, [('model', '=', model)])
-            return email_template.name_get(cr, uid, record_ids, context) + [(False,'')]
+            record_ids = email_template_obj.search(cr, uid, [('model', '=', model)], context=context)
+            return email_template_obj.name_get(cr, uid, record_ids, context) + [(False, '')]
         return []
 
+    def default_get(self, cr, uid, fields, context=None):
+        if context is None:
+            context = {}
+        result = super(mail_compose_message, self).default_get(cr, uid, fields, context=context)
+        result['template_id'] = context.get('default_template_id', context.get('mail.compose.template_id', False))
+        # force html when using templates
+        if result.get('use_template'):
+            result['content_subtype'] = 'html'
+        return result
+
     _columns = {
         'use_template': fields.boolean('Use Template'),
-        'template_id': fields.selection(_get_templates, 'Template',
-                                        size=-1 # means we want an int db column
-                                        ),
-    }
-    
-    _defaults = {
-        'template_id' : lambda self, cr, uid, context={} : context.get('mail.compose.template_id', False)          
+        # incredible hack of the day: size=-1 means we want an int db column instead of an str one
+        'template_id': fields.selection(_get_templates, 'Template', size=-1),
     }
 
-    def on_change_template(self, cr, uid, ids, use_template, template_id, email_from=None, email_to=None, context=None):
-        if context is None:
-            context = {}
-        values = {}
-        if template_id:
-            res_id = context.get('active_id', False)
-            if context.get('mail.compose.message.mode') == 'mass_mail':
-                # use the original template values - to be rendered when actually sent
-                # by super.send_mail()
-                values = self.pool.get('email.template').read(cr, uid, template_id, self.fields_get_keys(cr, uid), context)
-            else:
-                # render the mail as one-shot
-                values = self.pool.get('email.template').generate_email(cr, uid, template_id, res_id, context=context)
-                # get partner_ids back
-                values['dest_partner_ids'] = values['partner_ids']
-                # retrofit generated attachments in the expected field format
-                if values['attachments']:
-                    attachment = values.pop('attachments')
-                    attachment_obj = self.pool.get('ir.attachment')
-                    att_ids = []
-                    for fname, fcontent in attachment.iteritems():
-                        data_attach = {
-                            'name': fname,
-                            'datas': fcontent,
-                            'datas_fname': fname,
-                            'description': fname,
-                            'res_model' : self._name,
-                            'res_id' : ids[0] if ids else False
-                        }
-                        att_ids.append(attachment_obj.create(cr, uid, data_attach))
-                    values['attachment_ids'] = att_ids
+    def onchange_template_id(self, cr, uid, ids, use_template, template_id, composition_mode, model, res_id, context=None):
+        """ - use_template not set: return default_get
+            - use_template set in mass_mailing: we cannot render, so return the template values
+            - use_template set: return rendered values """
+        if use_template and template_id and composition_mode == 'mass_mail':
+            values = self.pool.get('email.template').read(cr, uid, template_id, ['subject', 'body_html'], context)
+            values.pop('id')
+        elif use_template and template_id:
+            values = self.generate_email_for_composer(cr, uid, template_id, res_id, context=context)
+            # transform attachments into attachment_ids
+            values['attachment_ids'] = []
+            ir_attach_obj = self.pool.get('ir.attachment')
+            for attach_fname, attach_datas in values.pop('attachments', []):
+                data_attach = {
+                    'name': attach_fname,
+                    'datas': attach_datas,
+                    'datas_fname': attach_fname,
+                    'res_model': model,
+                    'res_id': res_id,
+                }
+                values['attachment_ids'].append(ir_attach_obj.create(cr, uid, data_attach, context=context))
         else:
-            # restore defaults
-            values = self.default_get(cr, uid, self.fields_get_keys(cr, uid), context)
-            values.update(use_template=use_template, template_id=template_id)
+            values = self.default_get(cr, uid, ['body', 'body_html', 'subject', 'partner_ids', 'attachment_ids'], context=context)
 
+        if values.get('body_html'):
+            values['body'] = values.pop('body_html')
+        values.update(use_template=use_template, template_id=template_id)
         return {'value': values}
 
-    def template_toggle(self, cr, uid, ids, context=None):
+    def toggle_template(self, cr, uid, ids, context=None):
+        """ hit toggle template mode button: calls onchange_use_template to
+            emulate an on_change, then writes the values to update the form. """
         for record in self.browse(cr, uid, ids, context=context):
-            values = {}
-            use_template = record.use_template
-            # simulate an on_change on use_template
-            values.update(self.onchange_use_template(cr, uid, ids, not use_template, context=context)['value'])
-            record.write(values)
-            return False
+            onchange_res = self.onchange_use_template(cr, uid, ids, not record.use_template,
+                record.template_id, record.composition_mode, record.model, record.res_id, context=context).get('value', {})
+            # update partner_ids and attachment_ids
+            onchange_res['partner_ids'] = [(4, partner_id) for partner_id in onchange_res.pop('partner_ids', [])]
+            onchange_res['attachment_ids'] = [(4, attachment_id) for attachment_id in onchange_res.pop('attachment_ids', [])]
+            record.write(onchange_res)
+        return True
 
-    def onchange_use_template(self, cr, uid, ids, use_template, context=None):
-        values = {'use_template': use_template}
-        for record in self.browse(cr, uid, ids, context=context):
-            if not use_template:
-                # equivalent to choosing an empty template
-                onchange_template_values = self.on_change_template(cr, uid, record.id, use_template,
-                    False, email_from=record.email_from, email_to=record.email_to, context=context)
-                values.update(onchange_template_values['value'])
-        return {'value': values}
+    def onchange_use_template(self, cr, uid, ids, use_template, template_id, composition_mode, model, res_id, context=None):
+        """ onchange_use_template (values: True or False).  If use_template is
+            False, we do as an onchange with template_id False for values """
+        values = self.onchange_template_id(cr, uid, ids, use_template,
+            template_id, composition_mode, model, res_id, context=context)
+        # force html when using templates
+        if use_template:
+            values['value']['content_subtype'] = 'html'
+        return values
 
     def save_as_template(self, cr, uid, ids, context=None):
-        if context is None:
-            context = {}
+        """ hit save as template button: current form value will be a new
+            template attached to the current document. """
         email_template = self.pool.get('email.template')
-        model_pool = self.pool.get('ir.model')
+        ir_model_pool = self.pool.get('ir.model')
         for record in self.browse(cr, uid, ids, context=context):
-            model = record.model or context.get('active_model')
-            model_ids = model_pool.search(cr, uid, [('model', '=', model)])
+            model_ids = ir_model_pool.search(cr, uid, [('model', '=', record.model)], context=context)
             model_id = model_ids and model_ids[0] or False
             model_name = ''
             if model_id:
-                model_name = model_pool.browse(cr, uid, model_id, context=context).name
+                model_name = ir_model_pool.browse(cr, uid, model_id, context=context).name
             template_name = "%s: %s" % (model_name, tools.ustr(record.subject))
             values = {
                 'name': template_name,
-                'email_from': record.email_from or False,
                 'subject': record.subject or False,
-                'body_text': record.body_text or False,
-                'email_to': record.email_to or False,
-                'email_cc': record.email_cc or False,
-                'email_bcc': record.email_bcc or False,
-                'reply_to': record.reply_to or False,
+                'body_html': record.body or False,
                 'model_id': model_id or False,
                 'attachment_ids': [(6, 0, [att.id for att in record.attachment_ids])]
             }
             template_id = email_template.create(cr, uid, values, context=context)
-            record.write({'template_id': template_id,
-                          'use_template': True})
+            record.write({'template_id': template_id, 'use_template': True})
+        return True
 
-        # _reopen same wizard screen with new template preselected
-        return False
+    #------------------------------------------------------
+    # Wizard validation and send
+    #------------------------------------------------------
+
+    def generate_email_for_composer(self, cr, uid, template_id, res_id, context=None):
+        """ Call email_template.generate_email(), get fields relevant for
+            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 = ['body', 'body_html', 'subject', 'email_to', 'email_cc', 'attachments']
+        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
+        values['partner_ids'] = []
+        mails = tools.email_split(values.pop('email_to', '') + ' ' + values.pop('email_cc', ''))
+        for mail in mails:
+            partner_id = self.pool.get('res.partner').find_or_create(cr, uid, mail, context=context)
+            values['partner_ids'].append(partner_id)
+        return values
+
+    def render_message(self, cr, uid, wizard, res_id, context=None):
+        """ Generate an email from the template for given (model, res_id) pair.
+            This method is meant to be inherited by email_template that will
+            produce a more complete dictionary, with email_to, ...
+        """
+        # generate the composer email
+        values = self.generate_email_for_composer(cr, uid, wizard.template_id, res_id, context=context)
+        # get values to return
+        email_dict = super(mail_compose_message, self).render_message(cr, uid, wizard, res_id, context)
+        email_dict.update(values)
+        return email_dict
 
-    # override the basic implementation 
     def render_template(self, cr, uid, template, model, res_id, context=None):
         return self.pool.get('email.template').render_template(cr, uid, template, model, res_id, context=context)
 
diff --git a/addons/email_template/wizard/mail_compose_message_view.xml b/addons/email_template/wizard/mail_compose_message_view.xml
index 0d4362d350e..96aaa1cfaae 100644
--- a/addons/email_template/wizard/mail_compose_message_view.xml
+++ b/addons/email_template/wizard/mail_compose_message_view.xml
@@ -10,15 +10,16 @@
                 <data>
                     <xpath expr="//form/footer/button" position="before">
                         <field name="use_template" invisible="1"/>
-                        <button icon="gtk-paste" type="object" name="template_toggle"
+                        <button icon="gtk-paste" type="object" name="toggle_template"
                                 string="" help="Use a message template" />
                         <button icon="gtk-save" type="object" name="save_as_template"
                                 string="" help="Save as a new template"/>
                     </xpath>
                     <xpath expr="//form/notebook" position="after">
                         <group attrs="{'invisible':[('use_template','=',False)]}" colspan="4" col="4">
+                            <field name="use_template" invisible="1"/>
                             <field name="template_id" colspan="3"
-                                   on_change="on_change_template(use_template, template_id, email_from, email_to, context)"/>
+                                on_change="onchange_template_id(use_template, template_id, composition_mode, model, res_id, context)"/>
                         </group>
                     </xpath>
                 </data>
@@ -31,20 +32,22 @@
             <field name="inherit_id" ref="mail.email_compose_message_wizard_form_chatter"/>
             <field name="arch" type="xml">
                 <data>
-                    <xpath expr="//field[@name='dest_partner_ids']" position="after">
+                    <xpath expr="//field[@name='partner_ids']" position="after">
                         <field name="use_template" colspan="2" nolabel="1" invisible="1"
-                            on_change="onchange_use_template(use_template, context)"/>
+                            on_change="onchange_use_template(use_template, template_id, composition_mode, model, res_id, context)"/>
                         <field name="template_id" colspan="2" nolabel="1"
                             attrs="{'invisible':[('use_template','=',False)]}"
-                            on_change="on_change_template(use_template, template_id, False, False, context)"/>
+                            on_change="onchange_template_id(use_template, template_id, composition_mode, model, res_id, context)"/>
                     </xpath>
-                    <xpath expr="//a[@class='oe_mail_compose_message_checklist']" position="before">
+                    <xpath expr="//button[@class='oe_mail_compose_message_attachment']" position="before">
                         <button icon="/email_template/static/src/img/email_template.png"
-                            type="object" name="template_toggle" string=""
-                            help="Use a message template"/>
+                            type="object" name="toggle_template" string=""
+                            help="Use a message template"
+                            attrs="{'invisible':[('content_subtype','!=','html')]}"/>
                         <button icon="/email_template/static/src/img/email_template_save.png"
                             type="object" name="save_as_template" string=""
-                            help="Save as a new template"/>
+                            help="Save as a new template"
+                            attrs="{'invisible':[('content_subtype','!=','html')]}"/>
                     </xpath>
                 </data>
             </field>
diff --git a/addons/event/__openerp__.py b/addons/event/__openerp__.py
index 46eb9759ec2..1e548f68991 100644
--- a/addons/event/__openerp__.py
+++ b/addons/event/__openerp__.py
@@ -30,19 +30,20 @@
 Organization and management of Events.
 ======================================
 
-This module allows you
+This module allows you:
+-----------------------
     * to manage your events and their registrations
     * to use emails to automatically confirm and send acknowledgements for any
       registration to an event
 
 Note that:
+----------
     - You can define new types of events in
-        Events/Configuration/Types of Events
+        **Events** / **Configuration** / **Types of Events**
 """,
     'author': 'OpenERP SA',
     'depends': ['base_setup', 'board', 'email_template', 'google_map'],
-    'init_xml': [],
-    'update_xml': [
+    'data': [
         'security/event_security.xml',
         'security/ir.model.access.csv',
         'wizard/event_confirm_view.xml',
@@ -52,7 +53,7 @@ Note that:
         'res_partner_view.xml',
         'email_template.xml',
     ],
-    'demo_xml': ['event_demo.xml'],
+    'demo': ['event_demo.xml'],
     'test': ['test/process/event_draft2done.yml'],
     'css': ['static/src/css/event.css'],
     'installable': True,
diff --git a/addons/event/board_association_view.xml b/addons/event/board_association_view.xml
index b38a78afac9..4f4fbd05109 100644
--- a/addons/event/board_association_view.xml
+++ b/addons/event/board_association_view.xml
@@ -50,7 +50,6 @@
                     <board style="2-1">
                         <column>
                             <action string="Next Events" name="%(act_event_view)d"/>
-                            <action string="New Registrations" name="%(act_event_view_registration)d"/>
                         </column>
                         <column>
                             <action string="Events Filling By Status" name="%(act_event_reg)d"/>
diff --git a/addons/event/email_template.xml b/addons/event/email_template.xml
index 2666ece9921..95ffbf46d8d 100644
--- a/addons/event/email_template.xml
+++ b/addons/event/email_template.xml
@@ -7,15 +7,12 @@
         <field name="email_from" >${object.user_id.email or object.company_id.email or 'noreply@' + object.company_id.name + '.com'}</field>
         <field name="email_to" >${object.email}</field>
         <field name="subject">Your registration at ${object.event_id.name}</field>
-        <field name="body_text">
-        hello ${object.name},
-
-        The event ${object.event_id.name} that you registered for is confirmed and will be held from ${object.event_id.date_begin} to ${object.event_id.date_end}. For any further information please contact our event department.
-
-        we thank you for your participation
-
-        best regards
-        </field>
+        <field name="body_html"><![CDATA[
+        <p>Hello ${object.name},</p>
+        <p>The event ${object.event_id.name} that you registered for is confirmed and will be held from ${object.event_id.date_begin} to ${object.event_id.date_end}.
+        For any further information please contact our event department.</p>
+        <p>Thank you for your participation!</p>
+        <p>Best regards</p>]]></field>
         </record>
 
     </data>
@@ -27,15 +24,12 @@
         <field name="email_from" >${object.user_id.email or object.company_id.email or 'noreply@' + object.company_id.name + '.com'}</field>
         <field name="email_to" >${object.email}</field>
         <field name="subject">Your registration at ${object.event_id.name}</field>
-        <field name="body_text">
-        hello ${object.name},
-
-        We confirm you that your registration to the event ${object.event_id.name} has been recorded. You will automatically receive an email providing you more practical information (such as the schedule, the plan...) as soon as the event will be confirmed to be held.
-
-        we thank you for your participation
-
-        best regards
-        </field>
+        <field name="body_html"><![CDATA[
+        <p>Hello ${object.name},</p>
+        <p>We confirm that your registration to the event ${object.event_id.name} has been recorded.
+        You will automatically receive an email providing you more practical information (such as the schedule, the agenda...) as soon as the event is confirmed.</p>
+        <p>Thank you for your participation!</p>
+        <p>Best regards</p>]]></field>
         </record>
 
         <!-- Default Values -->
diff --git a/addons/event/event.py b/addons/event/event.py
index 7f0c77661e4..747981f854b 100644
--- a/addons/event/event.py
+++ b/addons/event/event.py
@@ -19,10 +19,8 @@
 #
 ##############################################################################
 
-import time
 from osv import fields, osv
 from tools.translate import _
-import decimal_precision as dp
 from openerp import SUPERUSER_ID
 
 class event_type(osv.osv):
@@ -39,8 +37,8 @@ class event_type(osv.osv):
     }
     _defaults = {
         'default_registration_min': 0,
-        'default_registration_max':0,
-        }
+        'default_registration_max': 0,
+    }
 
 event_type()
 
@@ -49,11 +47,15 @@ class event_event(osv.osv):
     _name = 'event.event'
     _description = __doc__
     _order = 'date_begin'
-    _inherit = ['ir.needaction_mixin','mail.thread']
+    _inherit = ['mail.thread','ir.needaction_mixin']
 
     def name_get(self, cr, uid, ids, context=None):
         if not ids:
-              return []
+            return []
+
+        if isinstance(ids, (long, int)):
+            ids = [ids]
+
         res = []
         for record in self.browse(cr, uid, ids, context=context):
             date = record.date_begin.split(" ")[0]
@@ -99,7 +101,6 @@ class event_event(osv.osv):
         return self.write(cr, uid, ids, {'state': 'done'}, context=context)
 
     def check_registration_limits(self, cr, uid, ids, context=None):
-        register_pool = self.pool.get('event.registration')
         for self.event in self.browse(cr, uid, ids, context=context):
             total_confirmed = self.event.register_current
             if total_confirmed < self.event.register_min or total_confirmed > self.event.register_max and self.event.register_max!=0:
@@ -109,7 +110,7 @@ class event_event(osv.osv):
         for event in self.browse(cr, uid, ids, context=context):
             available_seats = event.register_avail
             if available_seats and no_of_registration > available_seats:
-                 raise osv.except_osv(_('Warning!'),_("Only %d Seats are Available!") % (available_seats))
+                raise osv.except_osv(_('Warning!'),_("Only %d Seats are Available!") % (available_seats))
             elif available_seats == 0:
                 raise osv.except_osv(_('Warning!'),_("No Tickets Available!"))
 
@@ -139,7 +140,6 @@ class event_event(osv.osv):
         @param context: A standard dictionary for contextual values
         @return: Dictionary of function fields value.
         """
-        register_pool = self.pool.get('event.registration')
         res = {}
         for event in self.browse(cr, uid, ids, context=context):
             res[event.id] = {}
@@ -262,33 +262,52 @@ class event_event(osv.osv):
             }
             return {'value': dic}
 
+    def on_change_address_id(self, cr, uid, ids, address_id, context=None):
+        values = {
+            'street' : False,
+            'city' : False,
+            'zip' : False,
+        }
+        if isinstance(address_id, (long, int)):
+            address = self.pool.get('res.partner').browse(cr, uid, address_id, context=context)
+
+            values.update({
+                'street' : address.street,
+
+                'city' : address.city,
+                'zip' : address.zip,
+            })
+
+        return {'value' : values}
+
+
     # ----------------------------------------
     # OpenChatter methods and notifications
     # ----------------------------------------
 
     def create_send_note(self, cr, uid, ids, context=None):
         message = _("Event has been <b>created</b>.")
-        self.message_append_note(cr, uid, ids, body=message, context=context)
+        self.message_post(cr, uid, ids, body=message, context=context)
         return True
 
     def button_cancel_send_note(self, cr, uid, ids, context=None):
         message = _("Event has been <b>cancelled</b>.")
-        self.message_append_note(cr, uid, ids, body=message, context=context)
+        self.message_post(cr, uid, ids, body=message, context=context)
         return True
 
     def button_draft_send_note(self, cr, uid, ids, context=None):
         message = _("Event has been set to <b>draft</b>.")
-        self.message_append_note(cr, uid, ids, body=message, context=context)
+        self.message_post(cr, uid, ids, body=message, context=context)
         return True
 
     def button_done_send_note(self, cr, uid, ids, context=None):
         message = _("Event has been <b>done</b>.")
-        self.message_append_note(cr, uid, ids, body=message, context=context)
+        self.message_post(cr, uid, ids, body=message, context=context)
         return True
 
     def button_confirm_send_note(self, cr, uid, ids, context=None):
         message = _("Event has been <b>confirmed</b>.")
-        self.message_append_note(cr, uid, ids, body=message, context=context)
+        self.message_post(cr, uid, ids, body=message, context=context)
         return True
 
 event_event()
@@ -334,7 +353,7 @@ class event_registration(osv.osv):
         return self.write(cr, uid, ids, {'state': 'draft'}, context=context)
 
     def confirm_registration(self, cr, uid, ids, context=None):
-        self.message_append(cr, uid, ids,_('State set to open'),body_text= _('Open'))
+        self.message_post(cr, uid, ids, body=_('State set to open'), context=context)
         return self.write(cr, uid, ids, {'state': 'open'}, context=context)
 
     def create(self, cr, uid, vals, context=None):
@@ -364,13 +383,13 @@ class event_registration(osv.osv):
             if today >= registration.event_id.date_begin:
                 values = {'state': 'done', 'date_closed': today}
                 self.write(cr, uid, ids, values)
-                self.message_append(cr, uid, ids, _('State set to Done'), body_text=_('Done'))
+                self.message_post(cr, uid, ids, body=_('State set to Done'), context=context)
             else:
                 raise osv.except_osv(_('Error!'),_("You must wait for the starting day of the event to do this action.") )
         return True
 
     def button_reg_cancel(self, cr, uid, ids, context=None, *args):
-        self.message_append(cr, uid, ids,_('State set to Cancel'),body_text= _('Cancel'))
+        self.message_post(cr, uid, ids, body=_('State set to Cancel'), context=context)
         return self.write(cr, uid, ids, {'state': 'cancel'})
 
     def mail_user(self, cr, uid, ids, context=None):
@@ -440,12 +459,12 @@ class event_registration(osv.osv):
 
     def create_send_note(self, cr, uid, ids, context=None):
         message = _("Registration has been <b>created</b>.")
-        self.message_append_note(cr, uid, ids, body=message, context=context)
+        self.message_post(cr, uid, ids, body=message, context=context)
         return True
 
     def do_draft_send_note(self, cr, uid, ids, context=None):
         message = _("Registration has been set as <b>draft</b>.")
-        self.message_append_note(cr, uid, ids, body=message, context=context)
+        self.message_post(cr, uid, ids, body=message, context=context)
         return True
 
 event_registration()
diff --git a/addons/event/event_data.xml b/addons/event/event_data.xml
index d8d75950bcc..2c19fdc574f 100644
--- a/addons/event/event_data.xml
+++ b/addons/event/event_data.xml
@@ -14,11 +14,13 @@
         </record>
 
         <!-- notify all employees of module installation -->
-        <function model="mail.group" name="message_append_note">
-            <!-- ids, subject, body, parent_id=False, type='notification', content_subtype='html' -->
-            <value eval="[ref('mail.group_all_employees')]"/>
-            <value>Module Events Organisation has been installed</value>
-            <value>From the top menu Events, you can organize events, manage registrations, automate communication around your event and sell events through your quotations.</value>
-        </function>
+        <record model="mail.message" id="module_install_notification">
+            <field name="model">mail.group</field>
+            <field name="res_id" ref="mail.group_all_employees"/>
+            <field name="type">notification</field>
+            <field name="subject">Events Organisation application installed!</field>
+            <field name="body">From the top Events menu, you can organize events, manage registrations, automate communication around your event and sell events through your quotations.</field>
+        </record>
+
     </data>
 </openerp>
diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index 27829129c15..e2ff2e67e87 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -124,7 +124,7 @@
                                 <group>
                                     <label for="address_id" string="Location Address"/>
                                     <div>
-                                        <field name="address_id" widget="many2one_address_google_map" widget_option="{'placeholder':'.oe_google_map'}"/>
+                                        <field name="address_id" widget="many2one_address_google_map" widget_option="{'placeholder':'.oe_google_map'}" on_change="on_change_address_id(address_id)" />
                                         <field name="street" placeholder="Street..."/>
                                         <div>
                                             <field name="zip" class="oe_inline" placeholder="Zip"/>
@@ -143,7 +143,7 @@
                                 </group>
                             </group>
                         </div>
-                        <!-- <div class="oe_right" style="height: 200px"></div> -->
+                        <div class="oe_google_map" style="height: 200px"></div>
                         <notebook>
                             <page string="Event Description">
                                 <field name="note" colspan="4" nolabel="1"/>
@@ -208,7 +208,7 @@
             <field name="name">event.event.tree</field>
             <field name="model">event.event</field>
             <field name="arch" type="xml">
-                <tree string="Events" fonts="bold:needaction_pending==True" colors="red:(register_min and register_min&gt;register_current) or (register_max and register_max&lt;register_current);grey:state=='cancel'">
+                <tree string="Events" fonts="bold:message_unread==True" colors="red:(register_min and register_min&gt;register_current) or (register_max and register_max&lt;register_current);grey:state=='cancel'">
                     <field name="name" string="Name"/>
                     <field name="type"/>
                     <field name="date_begin"/>
@@ -219,7 +219,7 @@
                     <field name="main_speaker_id" groups="base.extended"/>
                     <field name="user_id"/>
                     <field name="state"/>
-                    <field name="needaction_pending" invisible="1"/>
+                    <field name="message_unread" invisible="1"/>
                 </tree>
             </field>
         </record>
@@ -244,7 +244,7 @@
                     <templates>
                     <t t-name="kanban-box">
                       <div class="oe_module_vignette">
-                        <a type="edit" class="oe_module_icon">
+                        <a type="open" class="oe_module_icon">
                            <div class="oe_event_date "><t t-esc="record.date_begin.raw_value.getDate()"/></div>
                            <div class="oe_event_month_year">
                              <t t-esc="record.date_begin.raw_value.toString('MMM')"/>
@@ -253,7 +253,7 @@
                            <div class="oe_event_time"><t t-esc="record.date_begin.raw_value.toString('hh:mm tt')"/></div>
                         </a>
                         <div class="oe_module_desc">
-                            <h4><a type="edit"><field name="name"/></a></h4>
+                            <h4><a type="open"><field name="name"/></a></h4>
                             <p>
                               <t t-if="record.country_id.raw_value">@<field name="country_id"/><br/></t>
                               <t t-if="record.user_id.raw_value">Organized by <field name="user_id"/><br/></t>
@@ -326,7 +326,7 @@
             <field name="arch" type="xml">
                 <search string="Events">
                     <field name="name" string="Events"/>
-                    <filter icon="terp-mail-message-new" string="Inbox" help="Unread messages" name="needaction_pending" domain="[('needaction_pending','=',True)]"/>
+                    <filter icon="terp-mail-message-new" string="Inbox" help="Unread messages" name="message_unread" domain="[('message_unread','=',True)]"/>
                     <separator/>
                     <filter icon="terp-check" string="Unconfirmed" name="draft" domain="[('state','=','draft')]" help="Events in New state"/>
                     <filter icon="terp-camera_test" string="Confirmed" domain="[('state','=','confirm')]" help="Confirmed events"/>
@@ -421,7 +421,7 @@
             <field name="name">event.registration.tree</field>
             <field name="model">event.registration</field>
             <field name="arch" type="xml">
-                <tree string="Registration" fonts="bold:needaction_pending==True">
+                <tree string="Registration" fonts="bold:message_unread==True">
                     <field name="create_date"/>
                     <field name="partner_id"/>
                     <field name="name"/>
@@ -431,7 +431,7 @@
                     <field name="user_id"/>
                     <field name="origin"/>
                     <field name="state"/>
-                    <field name="needaction_pending" invisible="1"/>
+                    <field name="message_unread" invisible="1"/>
                 </tree>
             </field>
         </record>
@@ -516,7 +516,7 @@
             <field name="arch" type="xml">
                 <search string="Event Registration">
                     <field name="name" string="Participant" filter_domain="['|','|','|',('name','ilike',self),('partner_id','ilike',self),('email','ilike',self),('origin','ilike',self)]"/>
-                    <filter icon="terp-mail-message-new" string="Inbox" help="Unread messages" name="needaction_pending" domain="[('needaction_pending','=',True)]"/>
+                    <filter icon="terp-mail-message-new" string="Inbox" help="Unread messages" name="message_unread" domain="[('message_unread','=',True)]"/>
                     <separator/>
                     <filter icon="terp-check" string="New" name="draft" domain="[('state','=','draft')]" help="Registrations in unconfirmed state"/>
                     <filter icon="terp-camera_test" string="Confirmed" domain="[('state','=','open')]" help="Confirmed registrations"/>
diff --git a/addons/event/i18n/ar.po b/addons/event/i18n/ar.po
index 8af34665360..8b894a8ca2a 100644
--- a/addons/event/i18n/ar.po
+++ b/addons/event/i18n/ar.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:55+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:02+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: event
 #: view:event.event:0
diff --git a/addons/event/i18n/bg.po b/addons/event/i18n/bg.po
index 834bebd22dc..c456d33483c 100644
--- a/addons/event/i18n/bg.po
+++ b/addons/event/i18n/bg.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:55+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:02+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: event
 #: view:event.event:0
diff --git a/addons/event/i18n/bs.po b/addons/event/i18n/bs.po
index fa241378b70..d34f37c1b07 100644
--- a/addons/event/i18n/bs.po
+++ b/addons/event/i18n/bs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:55+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:02+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: event
 #: view:event.event:0
diff --git a/addons/event/i18n/ca.po b/addons/event/i18n/ca.po
index a082283cc1b..614ebfbd3c3 100644
--- a/addons/event/i18n/ca.po
+++ b/addons/event/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:55+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:02+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: event
 #: view:event.event:0
diff --git a/addons/event/i18n/cs.po b/addons/event/i18n/cs.po
index fb8a6d11a84..fc3984847bd 100644
--- a/addons/event/i18n/cs.po
+++ b/addons/event/i18n/cs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:55+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:02+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 "X-Poedit-Language: Czech\n"
 
 #. module: event
diff --git a/addons/event/i18n/da.po b/addons/event/i18n/da.po
index 14264ec0f60..bc21dc9e014 100644
--- a/addons/event/i18n/da.po
+++ b/addons/event/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:55+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:02+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: event
 #: view:event.event:0
diff --git a/addons/event/i18n/de.po b/addons/event/i18n/de.po
index dfa18ce67e1..2cef66276af 100644
--- a/addons/event/i18n/de.po
+++ b/addons/event/i18n/de.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:55+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:02+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: event
 #: view:event.event:0
diff --git a/addons/event/i18n/el.po b/addons/event/i18n/el.po
index c605a2d6538..1e52df2324a 100644
--- a/addons/event/i18n/el.po
+++ b/addons/event/i18n/el.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:55+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:02+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: event
 #: view:event.event:0
diff --git a/addons/event/i18n/es.po b/addons/event/i18n/es.po
index c043bb290da..0b5ab08079c 100644
--- a/addons/event/i18n/es.po
+++ b/addons/event/i18n/es.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:55+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:02+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: event
 #: view:event.event:0
diff --git a/addons/event/i18n/es_AR.po b/addons/event/i18n/es_AR.po
index 975ae48fe07..42764ff0b0d 100644
--- a/addons/event/i18n/es_AR.po
+++ b/addons/event/i18n/es_AR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:55+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:02+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: event
 #: view:event.event:0
diff --git a/addons/event/i18n/es_CR.po b/addons/event/i18n/es_CR.po
index 56f27a9761b..ff53117b8c9 100644
--- a/addons/event/i18n/es_CR.po
+++ b/addons/event/i18n/es_CR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:55+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:02+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 "Language: \n"
 
 #. module: event
diff --git a/addons/event/i18n/es_EC.po b/addons/event/i18n/es_EC.po
index fa694ae3056..16f6decb21e 100644
--- a/addons/event/i18n/es_EC.po
+++ b/addons/event/i18n/es_EC.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:55+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:02+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: event
 #: view:event.event:0
diff --git a/addons/event/i18n/et.po b/addons/event/i18n/et.po
index dd8bbad6cb4..85d8670f23e 100644
--- a/addons/event/i18n/et.po
+++ b/addons/event/i18n/et.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:55+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:02+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: event
 #: view:event.event:0
diff --git a/addons/event/i18n/fi.po b/addons/event/i18n/fi.po
index 841fff990bb..af2a5e3f3ef 100644
--- a/addons/event/i18n/fi.po
+++ b/addons/event/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:55+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:02+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: event
 #: view:event.event:0
diff --git a/addons/event/i18n/fr.po b/addons/event/i18n/fr.po
index 2271f7712f0..b0a85b49989 100644
--- a/addons/event/i18n/fr.po
+++ b/addons/event/i18n/fr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:55+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:02+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: event
 #: view:event.event:0
diff --git a/addons/event/i18n/gu.po b/addons/event/i18n/gu.po
index 61924d4b2a7..826bda46403 100644
--- a/addons/event/i18n/gu.po
+++ b/addons/event/i18n/gu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:55+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:02+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: event
 #: view:event.event:0
diff --git a/addons/event/i18n/hi.po b/addons/event/i18n/hi.po
index 1e533115d51..504654e708d 100644
--- a/addons/event/i18n/hi.po
+++ b/addons/event/i18n/hi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:55+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:02+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: event
 #: view:event.event:0
diff --git a/addons/event/i18n/hr.po b/addons/event/i18n/hr.po
index 22c96eb3d25..5dd1ecef40b 100644
--- a/addons/event/i18n/hr.po
+++ b/addons/event/i18n/hr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:55+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:02+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: event
 #: view:event.event:0
diff --git a/addons/event/i18n/hu.po b/addons/event/i18n/hu.po
index a533f8a6814..8cecbdd826e 100644
--- a/addons/event/i18n/hu.po
+++ b/addons/event/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:55+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:02+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: event
 #: view:event.event:0
diff --git a/addons/event/i18n/id.po b/addons/event/i18n/id.po
index 94cfd2e47ae..182c5cb804c 100644
--- a/addons/event/i18n/id.po
+++ b/addons/event/i18n/id.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:55+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:02+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: event
 #: view:event.event:0
diff --git a/addons/event/i18n/it.po b/addons/event/i18n/it.po
index efbabde64c9..7caa54734e6 100644
--- a/addons/event/i18n/it.po
+++ b/addons/event/i18n/it.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:55+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:02+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: event
 #: view:event.event:0
diff --git a/addons/event/i18n/ja.po b/addons/event/i18n/ja.po
index 10960bb1dcf..10b0988c8a9 100644
--- a/addons/event/i18n/ja.po
+++ b/addons/event/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:55+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:02+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: event
 #: view:event.event:0
diff --git a/addons/event/i18n/ko.po b/addons/event/i18n/ko.po
index 80a8f0648d6..62e7d662c4e 100644
--- a/addons/event/i18n/ko.po
+++ b/addons/event/i18n/ko.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:55+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:02+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: event
 #: view:event.event:0
diff --git a/addons/event/i18n/lt.po b/addons/event/i18n/lt.po
index 0f474a8ac2f..d996ab65dec 100644
--- a/addons/event/i18n/lt.po
+++ b/addons/event/i18n/lt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:55+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:02+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: event
 #: view:event.event:0
diff --git a/addons/event/i18n/mn.po b/addons/event/i18n/mn.po
index 7fa5b2d43f6..ac2acc2d094 100644
--- a/addons/event/i18n/mn.po
+++ b/addons/event/i18n/mn.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-07-18 08:15+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2012-08-24 09:26+0000\n"
+"Last-Translator: gobi <Unknown>\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: 2012-08-07 04:55+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:02+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: event
 #: view:event.event:0
@@ -25,34 +25,34 @@ msgstr "Нэхэмжлэлийн мэдээлэл"
 #. module: event
 #: view:partner.event.registration:0
 msgid "Event Details"
-msgstr ""
+msgstr "Үйл явдалын дэлгэрэнгүй"
 
 #. module: event
 #: field:event.event,main_speaker_id:0
 msgid "Main Speaker"
-msgstr ""
+msgstr "Үндсэн илтгэгч"
 
 #. module: event
 #: view:event.event:0
 #: view:event.registration:0
 #: view:report.event.registration:0
 msgid "Group By..."
-msgstr ""
+msgstr "Бүлэглэх..."
 
 #. module: event
 #: field:event.event,register_min:0
 msgid "Minimum Registrations"
-msgstr ""
+msgstr "Хамгийн бага бүртгэл"
 
 #. module: event
 #: model:ir.model,name:event.model_event_confirm_registration
 msgid "Confirmation for Event Registration"
-msgstr ""
+msgstr "Үйл явдлын бүртгэлийн магадлан"
 
 #. module: event
 #: field:event.registration.badge,title:0
 msgid "Title"
-msgstr ""
+msgstr "Гарчиг"
 
 #. module: event
 #: field:event.event,mail_registr:0
@@ -62,7 +62,7 @@ msgstr "Бүртгүүлсэн е-майл"
 #. module: event
 #: model:ir.actions.act_window,name:event.action_event_confirm_registration
 msgid "Make Invoices"
-msgstr ""
+msgstr "Нэхэмжлэл үүсгэх"
 
 #. module: event
 #: view:event.event:0
@@ -73,12 +73,12 @@ msgstr "Бүртгүүлсэн огноо"
 #. module: event
 #: view:partner.event.registration:0
 msgid "_Close"
-msgstr ""
+msgstr "_Хаах"
 
 #. module: event
 #: model:event.event,name:event.event_0
 msgid "Concert of Bon Jovi"
-msgstr ""
+msgstr "Bon Jovi-н концерт"
 
 #. module: event
 #: view:report.event.registration:0
@@ -88,7 +88,7 @@ msgstr "Зөвхөн бүртгүүлсэн үнийн нэхэмжлэл"
 #. module: event
 #: selection:report.event.registration,month:0
 msgid "March"
-msgstr ""
+msgstr "3-р сар"
 
 #. module: event
 #: field:event.event,mail_confirm:0
@@ -98,13 +98,13 @@ msgstr "Батлагдсан е-майл"
 #. module: event
 #: field:event.registration,nb_register:0
 msgid "Quantity"
-msgstr ""
+msgstr "Тоо хэмжээ"
 
 #. module: event
 #: code:addons/event/wizard/event_make_invoice.py:63
 #, python-format
 msgid "Registration doesn't have any partner to invoice."
-msgstr ""
+msgstr "Бүртгэлд нэхэмжлэх харилцагч алга байна."
 
 #. module: event
 #: field:event.event,company_id:0
@@ -112,17 +112,17 @@ msgstr ""
 #: view:report.event.registration:0
 #: field:report.event.registration,company_id:0
 msgid "Company"
-msgstr ""
+msgstr "Компани"
 
 #. module: event
 #: field:event.make.invoice,invoice_date:0
 msgid "Invoice Date"
-msgstr ""
+msgstr "Нэхэмжилсэн огноо"
 
 #. module: event
 #: help:event.event,pricelist_id:0
 msgid "Pricelist version for current event."
-msgstr ""
+msgstr "Одоогийн үйл явдлын үнийн жагсаалтын хувилбар"
 
 #. module: event
 #: code:addons/event/wizard/partner_event_registration.py:88
@@ -137,17 +137,17 @@ msgstr "Бүртгэгдсэн үйл ажиллагаа"
 #. module: event
 #: field:event.event,parent_id:0
 msgid "Parent Event"
-msgstr ""
+msgstr "Эцэг үйл явдал"
 
 #. module: event
 #: model:ir.actions.act_window,name:event.action_make_invoices
 msgid "Make Invoice"
-msgstr ""
+msgstr "Нэхэмжлэл үүсгэх"
 
 #. module: event
 #: field:event.registration,price_subtotal:0
 msgid "Subtotal"
-msgstr ""
+msgstr "Дэд дүн"
 
 #. module: event
 #: view:report.event.registration:0
@@ -157,12 +157,12 @@ msgstr "Үйл ажиллагааны бүртгэл"
 #. module: event
 #: help:event.event,reply_to:0
 msgid "The email address put in the 'Reply-To' of all emails sent by OpenERP"
-msgstr ""
+msgstr "OpenERP-н илгээж байгаа имэйлийн 'Хариулах' дээр тавигдах имэйл"
 
 #. module: event
 #: view:event.registration:0
 msgid "Add Internal Note"
-msgstr ""
+msgstr "Дотоод тэмдэглэл нэмэх"
 
 #. module: event
 #: view:event.event:0
@@ -185,17 +185,17 @@ msgstr "Үйл ажиллагааны анализ"
 #. module: event
 #: field:event.registration,message_ids:0
 msgid "Messages"
-msgstr ""
+msgstr "Зурвас"
 
 #. module: event
 #: model:ir.model,name:event.model_event_registration_badge
 msgid "event.registration.badge"
-msgstr ""
+msgstr "event.registration.badge"
 
 #. module: event
 #: field:event.event,mail_auto_confirm:0
 msgid "Mail Auto Confirm"
-msgstr ""
+msgstr "Мэйлийн Автомат Баталгаажуулалт"
 
 #. module: event
 #: model:product.template,name:event.event_product_1_product_template
@@ -214,12 +214,12 @@ msgstr "Үйл ажиллагааг батлах"
 #: selection:event.registration,state:0
 #: selection:report.event.registration,state:0
 msgid "Cancelled"
-msgstr ""
+msgstr "Цуцлагдсан"
 
 #. module: event
 #: field:event.event,reply_to:0
 msgid "Reply-To"
-msgstr ""
+msgstr "Хариулах"
 
 #. module: event
 #: model:ir.actions.act_window,name:event.open_board_associations_manager
@@ -230,12 +230,12 @@ msgstr "Үйл ажиллагааг хянах самбар"
 #. module: event
 #: model:event.event,name:event.event_1
 msgid "Opera of Verdi"
-msgstr ""
+msgstr "Verdi-н дуурь"
 
 #. module: event
 #: selection:report.event.registration,month:0
 msgid "July"
-msgstr ""
+msgstr "7-р сар"
 
 #. module: event
 #: help:event.event,register_prospect:0
@@ -248,11 +248,13 @@ msgid ""
 "Check this box if you want to use automatic confirmation emailing or "
 "reminder."
 msgstr ""
+"Хэрвээ энийг сонгосон бол автоматаар имэйл баталгаажуулалт болон сануулгыг "
+"хэрэглэнэ."
 
 #. module: event
 #: field:event.registration,ref:0
 msgid "Reference"
-msgstr ""
+msgstr "Код"
 
 #. module: event
 #: help:event.event,date_end:0
@@ -263,24 +265,24 @@ msgstr "Хаагдсан үйл ажиллагааны огноо"
 #. module: event
 #: view:event.registration:0
 msgid "Emails"
-msgstr ""
+msgstr "Имэйлүүд"
 
 #. module: event
 #: view:event.registration:0
 msgid "Extra Info"
-msgstr ""
+msgstr "Нэмэлт мэдээлэл"
 
 #. module: event
 #: code:addons/event/wizard/event_make_invoice.py:83
 #, python-format
 msgid "Customer Invoices"
-msgstr ""
+msgstr "Захиалагчийн нэхэмжлэл"
 
 #. module: event
 #: selection:event.event,state:0
 #: selection:report.event.registration,state:0
 msgid "Draft"
-msgstr ""
+msgstr "Ноорог"
 
 #. module: event
 #: field:event.type,name:0
@@ -290,7 +292,7 @@ msgstr "Үйл ажиллагааны төрөл"
 #. module: event
 #: model:ir.model,name:event.model_event_type
 msgid " Event Type "
-msgstr ""
+msgstr " Үйл ажиллагааны төрөл "
 
 #. module: event
 #: view:event.event:0
@@ -302,7 +304,7 @@ msgstr ""
 #: field:report.event.registration,event_id:0
 #: view:res.partner:0
 msgid "Event"
-msgstr ""
+msgstr "Үйл явдал"
 
 #. module: event
 #: view:event.registration:0
@@ -317,7 +319,7 @@ msgstr "Тэмдэг"
 #: selection:event.registration,state:0
 #: selection:report.event.registration,state:0
 msgid "Confirmed"
-msgstr ""
+msgstr "Батлагдсан"
 
 #. module: event
 #: view:event.confirm.registration:0
@@ -327,28 +329,28 @@ msgstr "Баталгаажсан бүртгэл"
 #. module: event
 #: view:event.event:0
 msgid "Events in New state"
-msgstr ""
+msgstr "Үйл ажиллагааын шинэ төлөв"
 
 #. module: event
 #: view:report.event.registration:0
 msgid "Confirm"
-msgstr ""
+msgstr "Батлах"
 
 #. module: event
 #: view:event.event:0
 #: field:event.event,speaker_ids:0
 msgid "Other Speakers"
-msgstr ""
+msgstr "Бусад илтгэгчид"
 
 #. module: event
 #: model:ir.model,name:event.model_event_make_invoice
 msgid "Event Make Invoice"
-msgstr ""
+msgstr "Үйл явдлын нэхэмжлэл үүсгэх"
 
 #. module: event
 #: help:event.registration,nb_register:0
 msgid "Number of Registrations or Tickets"
-msgstr ""
+msgstr "Бүртгэгсэд эсвэл Тасалбарын тоо"
 
 #. module: event
 #: code:addons/event/wizard/event_make_invoice.py:50
@@ -357,51 +359,51 @@ msgstr ""
 #: code:addons/event/wizard/event_make_invoice.py:62
 #, python-format
 msgid "Warning !"
-msgstr ""
+msgstr "Анхааруулга !"
 
 #. module: event
 #: view:event.registration:0
 msgid "Send New Email"
-msgstr ""
+msgstr "Шинэ имэйл илгээх"
 
 #. module: event
 #: help:event.event,register_min:0
 msgid "Provide Minimum Number of Registrations"
-msgstr ""
+msgstr "Хамгийн бага дугаарын бүртгэлүүд"
 
 #. module: event
 #: view:event.event:0
 msgid "Location"
-msgstr ""
+msgstr "Байрлал"
 
 #. module: event
 #: view:event.event:0
 #: view:event.registration:0
 #: view:report.event.registration:0
 msgid "New"
-msgstr ""
+msgstr "Шинэ"
 
 #. module: event
 #: field:event.event,register_current:0
 #: view:report.event.registration:0
 msgid "Confirmed Registrations"
-msgstr ""
+msgstr "Батлагдсан бүртгэлүүд"
 
 #. module: event
 #: field:event.event,mail_auto_registr:0
 msgid "Mail Auto Register"
-msgstr ""
+msgstr "Имэйлийн Автомат бүртгэл"
 
 #. module: event
 #: field:event.event,type:0
 #: field:partner.event.registration,event_type:0
 msgid "Type"
-msgstr ""
+msgstr "Төрөл"
 
 #. module: event
 #: field:event.registration,email_from:0
 msgid "Email"
-msgstr ""
+msgstr "Имэйл"
 
 #. module: event
 #: help:event.event,mail_confirm:0
@@ -410,33 +412,35 @@ msgid ""
 "subscribes to a confirmed event. This is also the email sent to remind "
 "someone about the event."
 msgstr ""
+"Үйл явдал батлагдахад эсвэл батлагдсан үйл явдалд хэн нэгэн бүртгүүлэхэд энэ "
+"имэйл илгээгдэнэ. Мөн үйл явдлыг сануулахад энэ имэйл илгээгдэнэ."
 
 #. module: event
 #: field:event.registration,tobe_invoiced:0
 msgid "To be Invoiced"
-msgstr ""
+msgstr "Нэхэмжлэх"
 
 #. module: event
 #: view:event.event:0
 msgid "My Sales Team(s)"
-msgstr ""
+msgstr "Миний Борлуулалтын Баг"
 
 #. module: event
 #: code:addons/event/event.py:398
 #, python-format
 msgid "Error !"
-msgstr ""
+msgstr "Алдаа !"
 
 #. module: event
 #: field:event.event,name:0
 #: field:event.registration,name:0
 msgid "Summary"
-msgstr ""
+msgstr "Хураангуй"
 
 #. module: event
 #: field:event.registration,create_date:0
 msgid "Creation Date"
-msgstr ""
+msgstr "Үүсгэсэн Огноо"
 
 #. module: event
 #: view:event.event:0
@@ -449,17 +453,17 @@ msgstr "Цуцласан бүртгэл"
 #: code:addons/event/event.py:399
 #, python-format
 msgid "Registered partner doesn't have an address to make the invoice."
-msgstr ""
+msgstr "Бүртгэгдсэн харилцагчийн нэхэмжлэлийн хаяг байхгүй байна."
 
 #. module: event
 #: view:report.event.registration:0
 msgid "Events created in last month"
-msgstr "Сарын сүүлд нэмэгдсэн үйл ажиллагаа"
+msgstr "Сүүлийн сард үүсгэгдсэн үйл явдал"
 
 #. module: event
 #: view:report.event.registration:0
 msgid "Events created in current year"
-msgstr "Жилийн эхэнд нэмэгдсэн үйл ажиллагаа"
+msgstr "Энэ жил үүсгэгдсэг үйл явдал"
 
 #. module: event
 #: help:event.event,type:0
@@ -469,7 +473,7 @@ msgstr "Үйл ажиллагааны төрөл сонгох Семинар, Ү
 #. module: event
 #: view:event.registration:0
 msgid "Confirmed registrations"
-msgstr ""
+msgstr "Батлагдсан бүртгэлүүд"
 
 #. module: event
 #: view:event.event:0
@@ -479,29 +483,30 @@ msgstr "Үйл ажиллагааны бүтэц"
 #. module: event
 #: view:event.registration:0
 msgid "History Information"
-msgstr ""
+msgstr "Түүхийн мэдээлэл"
 
 #. module: event
 #: view:event.registration:0
 msgid "Dates"
-msgstr ""
+msgstr "Огноонууд"
 
 #. module: event
 #: view:event.confirm:0
 #: view:event.confirm.registration:0
 msgid "Confirm Anyway"
-msgstr ""
+msgstr "Ямартай ч батлах"
 
 #. module: event
 #: code:addons/event/wizard/event_confirm_registration.py:54
 #, python-format
 msgid "Warning: The Event '%s' has reached its Maximum Limit (%s)."
 msgstr ""
+"Анхааруулга: '%s' үйл явдал нь хамгийн дээд хязгаартаа (%s) тулсан байна."
 
 #. module: event
 #: view:report.event.registration:0
 msgid "    Month-1    "
-msgstr ""
+msgstr "    Сар-1    "
 
 #. module: event
 #: view:event.event:0
@@ -519,7 +524,7 @@ msgstr "Үйл ажиллагааны дугаар"
 #. module: event
 #: help:event.event,main_speaker_id:0
 msgid "Speaker who will be giving speech at the event."
-msgstr ""
+msgstr "Үйл явдал дээр илтгэл хийх илтгэгч"
 
 #. module: event
 #: help:event.event,state:0
@@ -528,17 +533,21 @@ msgid ""
 "particular dates the state is set to 'Confirmed'. If the event is over, the "
 "state is set to 'Done'.If event is cancelled the state is set to 'Cancelled'."
 msgstr ""
+"Үйл явдал үүсгэгдсэн даруйдаа төлөв нь 'Ноорог' байдаг. Батлагдсан даруйдаа "
+"төлөв нь тодорхой хугацаанд 'Батлагдсан' төлөвтэй болдог. Үйл явдал "
+"өнгөрмөгц төлөв нь 'Хийгдсэн' болдог. Хэрэв үйл явдал нь цуцлагдсан бол "
+"'Цуцлагдсан' төлөвтэй болдог."
 
 #. module: event
 #: view:event.event:0
 msgid "Cancel Event"
-msgstr ""
+msgstr "Үйл ажиллагаа цуцлах"
 
 #. module: event
 #: view:event.event:0
 #: view:event.registration:0
 msgid "Contact"
-msgstr ""
+msgstr "Холбогч"
 
 #. module: event
 #: view:event.event:0
@@ -546,29 +555,29 @@ msgstr ""
 #: field:event.registration,partner_id:0
 #: model:ir.model,name:event.model_res_partner
 msgid "Partner"
-msgstr ""
+msgstr "Харилцагч"
 
 #. module: event
 #: view:board.board:0
 #: model:ir.actions.act_window,name:event.act_event_reg
 #: view:report.event.registration:0
 msgid "Events Filling Status"
-msgstr ""
+msgstr "Үйл явдлуудын дүүргэлтийн төлөв"
 
 #. module: event
 #: field:event.make.invoice,grouped:0
 msgid "Group the invoices"
-msgstr ""
+msgstr "Нэхэмжлэлийг бүлэглэх"
 
 #. module: event
 #: view:event.event:0
 msgid "Mailing"
-msgstr "Илгээх"
+msgstr "Мэйлүүд"
 
 #. module: event
 #: view:report.event.registration:0
 msgid "Events States"
-msgstr ""
+msgstr "Үйл ажиллагааны төлөв"
 
 #. module: event
 #: view:board.board:0
@@ -584,12 +593,12 @@ msgstr "Түншийн үнийн нэхэмжлэл"
 #. module: event
 #: help:event.event,register_max:0
 msgid "Provide Maximum Number of Registrations"
-msgstr ""
+msgstr "Хамгийн их бүртгэлийг өгнө үү"
 
 #. module: event
 #: field:event.registration,log_ids:0
 msgid "Logs"
-msgstr ""
+msgstr "Логууд"
 
 #. module: event
 #: view:event.event:0
@@ -599,17 +608,17 @@ msgstr ""
 #: view:report.event.registration:0
 #: field:report.event.registration,state:0
 msgid "State"
-msgstr ""
+msgstr "Төлөв"
 
 #. module: event
 #: selection:report.event.registration,month:0
 msgid "September"
-msgstr ""
+msgstr "9-р сар"
 
 #. module: event
 #: selection:report.event.registration,month:0
 msgid "December"
-msgstr ""
+msgstr "12-р сар"
 
 #. module: event
 #: field:event.registration,event_product:0
@@ -625,7 +634,7 @@ msgstr " Ноорог биш бүртгэлүүд"
 #: view:report.event.registration:0
 #: field:report.event.registration,month:0
 msgid "Month"
-msgstr ""
+msgstr "Сар"
 
 #. module: event
 #: view:event.event:0
@@ -640,45 +649,45 @@ msgstr "Батлагдаагүй бүртгэлүүдийн төлөв"
 #. module: event
 #: help:event.event,register_current:0
 msgid "Total of Open and Done Registrations"
-msgstr ""
+msgstr "Нээлттэй болон Хийгдсэн бүх бүртгэлүүд"
 
 #. module: event
 #: field:event.confirm.registration,msg:0
 msgid "Message"
-msgstr ""
+msgstr "Зурвас"
 
 #. module: event
 #: constraint:event.event:0
 msgid "Error ! You cannot create recursive event."
-msgstr ""
+msgstr "Алдаа ! Тойрог хамааралтай үйл явдлыг үүсгэж болохгүй."
 
 #. module: event
 #: field:event.registration,ref2:0
 msgid "Reference 2"
-msgstr ""
+msgstr "Дугаар 2"
 
 #. module: event
 #: code:addons/event/event.py:361
 #: view:report.event.registration:0
 #, python-format
 msgid "Invoiced"
-msgstr ""
+msgstr "Нэхэмжилсэн"
 
 #. module: event
 #: view:event.event:0
 #: view:report.event.registration:0
 msgid "My Events"
-msgstr ""
+msgstr "Миний үйл ажииллагаанууд"
 
 #. module: event
 #: view:event.event:0
 msgid "Speakers"
-msgstr ""
+msgstr "Илтгэгч"
 
 #. module: event
 #: view:event.make.invoice:0
 msgid "Create invoices"
-msgstr ""
+msgstr "Нэхэмжлэлүүд үүсгэх"
 
 #. module: event
 #: help:event.registration,email_cc:0
@@ -687,11 +696,13 @@ msgid ""
 "outbound emails for this record before being sent. Separate multiple email "
 "addresses with a comma"
 msgstr ""
+"Энэ бичлэгт харгалзах орох, гарах бүх э-мэйлийг илгээхийн өмнө СС талбарт "
+"эдгээр э-мэйл хаягуудыг нэмж өгнө. Э-мэйл хаягуудыг таслалаар тусгаарлана."
 
 #. module: event
 #: view:event.make.invoice:0
 msgid "Do you really want to create the invoice(s) ?"
-msgstr ""
+msgstr "Та үнэхээр нэхэмжлэл үүсгэхийг хүсч байна уу ?"
 
 #. module: event
 #: view:event.event:0
@@ -701,12 +712,12 @@ msgstr "Эхлэл огноо"
 #. module: event
 #: field:event.registration,date_closed:0
 msgid "Closed"
-msgstr ""
+msgstr "Хаагдсан"
 
 #. module: event
 #: view:report.event.registration:0
 msgid "Events which are in New state"
-msgstr ""
+msgstr "Шинэ төлөвтэй үйл явдлууд"
 
 #. module: event
 #: view:event.event:0
@@ -720,23 +731,23 @@ msgstr "Үйл ажиллагаанууд"
 #. module: event
 #: field:partner.event.registration,nb_register:0
 msgid "Number of Registration"
-msgstr ""
+msgstr "Бүртгэлийн дугаар"
 
 #. module: event
 #: field:event.event,child_ids:0
 msgid "Child Events"
-msgstr ""
+msgstr "Дэд үйл явдлууд"
 
 #. module: event
 #: selection:report.event.registration,month:0
 msgid "August"
-msgstr ""
+msgstr "8-р сар"
 
 #. module: event
 #: field:res.partner,event_ids:0
 #: field:res.partner,event_registration_ids:0
 msgid "unknown"
-msgstr ""
+msgstr "үл мэдэгдэх"
 
 #. module: event
 #: help:event.event,product_id:0
@@ -745,11 +756,14 @@ msgid ""
 "Thus it allows you to set the default label and the accounting info you want "
 "by default on these invoices."
 msgstr ""
+"Энэ үйл явдлын нэхэмжлэлүүд энэ бараагаар үүсгэгдэнэ. Иймээс шошгын анхны "
+"утгыг тогтоох боломж олгоно мөн эдгээр нэхэмжлэл дахь санхүүгийн мэдээллийн "
+"анхны утгуудыг тохируулах боломжийг олгоно."
 
 #. module: event
 #: selection:report.event.registration,month:0
 msgid "June"
-msgstr ""
+msgstr "6-р сар"
 
 #. module: event
 #: model:product.template,name:event.event_product_0_product_template
@@ -759,7 +773,7 @@ msgstr "Концертын тасалбар"
 #. module: event
 #: field:event.registration,write_date:0
 msgid "Write Date"
-msgstr ""
+msgstr "Бичих огноо"
 
 #. module: event
 #: view:event.registration:0
@@ -772,62 +786,64 @@ msgid ""
 "Warning: This Event has not reached its Minimum Registration Limit. Are you "
 "sure you want to confirm it?"
 msgstr ""
+"Анхааруулга: Энэ үйл явдал нь хамгийн бага хязгаартаа хүрээгүй байна. "
+"Батлахдаа та итгэлтэй байна уу?"
 
 #. module: event
 #: field:event.registration,active:0
 msgid "Active"
-msgstr ""
+msgstr "Идэвхитэй"
 
 #. module: event
 #: field:event.registration,date:0
 msgid "Start Date"
-msgstr ""
+msgstr "Эхлэл огноо"
 
 #. module: event
 #: selection:report.event.registration,month:0
 msgid "November"
-msgstr ""
+msgstr "11-р сар"
 
 #. module: event
 #: view:report.event.registration:0
 msgid "Extended Filters..."
-msgstr ""
+msgstr "Өргөтгөсөн Шүүлтүүр..."
 
 #. module: event
 #: field:partner.event.registration,start_date:0
 msgid "Start date"
-msgstr ""
+msgstr "Эхлэл огноо"
 
 #. module: event
 #: selection:report.event.registration,month:0
 msgid "October"
-msgstr ""
+msgstr "10-р сар"
 
 #. module: event
 #: field:event.event,language:0
 msgid "Language"
-msgstr ""
+msgstr "Хэл"
 
 #. module: event
 #: view:event.registration:0
 #: field:event.registration,email_cc:0
 msgid "CC"
-msgstr ""
+msgstr "CC"
 
 #. module: event
 #: selection:report.event.registration,month:0
 msgid "January"
-msgstr ""
+msgstr "1-р сар"
 
 #. module: event
 #: help:event.registration,email_from:0
 msgid "These people will receive email."
-msgstr ""
+msgstr "Эдгээр хүмүүс и-мэйл хүлээж авна"
 
 #. module: event
 #: view:event.event:0
 msgid "Set To Draft"
-msgstr ""
+msgstr "Ноороглох"
 
 #. module: event
 #: code:addons/event/event.py:499
@@ -836,77 +852,77 @@ msgstr ""
 #: view:res.partner:0
 #, python-format
 msgid "Confirm Registration"
-msgstr ""
+msgstr "Бүртгэлийг батлах"
 
 #. module: event
 #: view:event.event:0
 #: view:report.event.registration:0
 #: view:res.partner:0
 msgid "Date"
-msgstr ""
+msgstr "Огноо"
 
 #. module: event
 #: view:event.event:0
 msgid "Registration Email Body"
-msgstr ""
+msgstr "Бүртгэлийн Имэйлийн Бие"
 
 #. module: event
 #: view:event.event:0
 msgid "Confirmation Email Body"
-msgstr ""
+msgstr "Баталгаажуулах Имэйлийн Бие"
 
 #. module: event
 #: view:report.event.registration:0
 msgid "Registrations in confirmed or done state"
-msgstr ""
+msgstr "Батлагдсан эсвэл хийгдсэн төлөвтэй бүртгэлүүд"
 
 #. module: event
 #: view:event.registration:0
 #: view:res.partner:0
 msgid "History"
-msgstr ""
+msgstr "Түүх"
 
 #. module: event
 #: field:event.event,address_id:0
 msgid "Location Address"
-msgstr ""
+msgstr "Байрлалын хаяг"
 
 #. module: event
 #: model:ir.actions.act_window,name:event.action_event_type
 #: model:ir.ui.menu,name:event.menu_event_type
 msgid "Types of Events"
-msgstr ""
+msgstr "Үйл явдлын төрөлүүд"
 
 #. module: event
 #: field:event.registration,contact_id:0
 msgid "Partner Contact"
-msgstr ""
+msgstr "Харилцагчийн холбогч"
 
 #. module: event
 #: field:event.event,pricelist_id:0
 msgid "Pricelist"
-msgstr ""
+msgstr "Үнийн жагсаалт"
 
 #. module: event
 #: code:addons/event/wizard/event_make_invoice.py:59
 #, python-format
 msgid "Event related doesn't have any product defined"
-msgstr ""
+msgstr "Холбоотой үйл явдлуудад бараа алга байна."
 
 #. module: event
 #: view:event.event:0
 msgid "Auto Confirmation Email"
-msgstr ""
+msgstr "Автомат Баталгаажуулах Имэйл"
 
 #. module: event
 #: view:event.registration:0
 msgid "Misc"
-msgstr ""
+msgstr "Бусад"
 
 #. module: event
 #: constraint:event.event:0
 msgid "Error ! Closing Date cannot be set before Beginning Date."
-msgstr ""
+msgstr "Алдаа ! Хаагдах огноо нь Эхлэх огнооноос өмнө байж болохгүй."
 
 #. module: event
 #: code:addons/event/event.py:446
@@ -916,60 +932,60 @@ msgstr ""
 #: selection:report.event.registration,state:0
 #, python-format
 msgid "Done"
-msgstr ""
+msgstr "Хийгдсэн"
 
 #. module: event
 #: field:event.event,date_begin:0
 msgid "Beginning date"
-msgstr ""
+msgstr "Эхлэх огноо"
 
 #. module: event
 #: view:event.registration:0
 #: field:event.registration,invoice_id:0
 msgid "Invoice"
-msgstr ""
+msgstr "Нэхэмжлэл"
 
 #. module: event
 #: view:report.event.registration:0
 #: field:report.event.registration,year:0
 msgid "Year"
-msgstr ""
+msgstr "Он"
 
 #. module: event
 #: code:addons/event/event.py:465
 #, python-format
 msgid "Cancel"
-msgstr ""
+msgstr "Цуцлах"
 
 #. module: event
 #: view:event.confirm:0
 #: view:event.confirm.registration:0
 #: view:event.make.invoice:0
 msgid "Close"
-msgstr ""
+msgstr "Хаах"
 
 #. module: event
 #: view:event.event:0
 msgid "Event by Registration"
-msgstr ""
+msgstr "Үйл явдал бүртгэлээр"
 
 #. module: event
 #: code:addons/event/event.py:436
 #, python-format
 msgid "Open"
-msgstr ""
+msgstr "Нээх"
 
 #. module: event
 #: field:event.event,user_id:0
 msgid "Responsible User"
-msgstr ""
+msgstr "Хариуцагч хэрэглэгч"
 
 #. module: event
 #: code:addons/event/event.py:561
 #: code:addons/event/event.py:568
 #, python-format
 msgid "Auto Confirmation: [%s] %s"
-msgstr ""
+msgstr "Автомат баталгаажуулалт: [%s] %s"
 
 #. module: event
 #: view:event.event:0
@@ -978,60 +994,62 @@ msgstr ""
 #: view:report.event.registration:0
 #: field:report.event.registration,user_id:0
 msgid "Responsible"
-msgstr ""
+msgstr "Хариуцагч"
 
 #. module: event
 #: field:event.event,unit_price:0
 #: view:event.registration:0
 #: field:partner.event.registration,unit_price:0
 msgid "Registration Cost"
-msgstr ""
+msgstr "Бүртгэлийн өртөг"
 
 #. module: event
 #: field:event.registration,unit_price:0
 msgid "Unit Price"
-msgstr ""
+msgstr "Нэгж үнэ"
 
 #. module: event
 #: view:report.event.registration:0
 #: field:report.event.registration,speaker_id:0
 #: field:res.partner,speaker:0
 msgid "Speaker"
-msgstr ""
+msgstr "Илтгэгч"
 
 #. module: event
 #: model:event.event,name:event.event_2
 msgid "Conference on ERP Buisness"
-msgstr ""
+msgstr "ERP бизнесийн хурал"
 
 #. module: event
 #: view:event.registration:0
 msgid "Reply"
-msgstr ""
+msgstr "Хариулах"
 
 #. module: event
 #: view:report.event.registration:0
 msgid "Events created in current month"
-msgstr ""
+msgstr "Энэ сард үүсгэгдсэн үйл явдал"
 
 #. module: event
 #: help:event.event,mail_auto_registr:0
 msgid ""
 "Check this box if you want to use automatic emailing for new registration."
 msgstr ""
+"Шинэ бүртгэлд автомат имэйл ашиглахыг хүсч байгаа бол энэ сонголтыг "
+"тэмдэглэнэ."
 
 #. module: event
 #: field:event.event,date_end:0
 #: field:partner.event.registration,end_date:0
 msgid "Closing date"
-msgstr ""
+msgstr "Хаагах Огноо"
 
 #. module: event
 #: field:event.event,product_id:0
 #: view:report.event.registration:0
 #: field:report.event.registration,product_id:0
 msgid "Product"
-msgstr ""
+msgstr "Бараа"
 
 #. module: event
 #: view:event.event:0
@@ -1039,101 +1057,101 @@ msgstr ""
 #: view:event.registration:0
 #: field:event.registration,description:0
 msgid "Description"
-msgstr ""
+msgstr "Тодорхойлолт"
 
 #. module: event
 #: field:report.event.registration,confirm_state:0
 msgid " # No of Confirmed Registrations"
-msgstr ""
+msgstr " # Баталгаажсан бүртгэлийн тоо"
 
 #. module: event
 #: model:ir.actions.act_window,name:event.act_register_event_partner
 msgid "Subscribe"
-msgstr ""
+msgstr "Бүртгүүлэх"
 
 #. module: event
 #: selection:report.event.registration,month:0
 msgid "May"
-msgstr ""
+msgstr "5-р сар"
 
 #. module: event
 #: view:res.partner:0
 msgid "Events Registration"
-msgstr ""
+msgstr "Үйл явдлын бүртгэл"
 
 #. module: event
 #: help:event.event,mail_registr:0
 msgid "This email will be sent when someone subscribes to the event."
-msgstr ""
+msgstr "Хэн нэг нь үйл явдалд бүртгүүлсэн бол энэ имэйл нь илгээгдэх болно."
 
 #. module: event
 #: model:product.template,name:event.event_product_2_product_template
 msgid "Ticket for Conference"
-msgstr ""
+msgstr "Хурлын тасалбар"
 
 #. module: event
 #: model:ir.ui.menu,name:event.menu_event_type_association
 msgid "Events Type"
-msgstr ""
+msgstr "Үйл явдлын төрөл"
 
 #. module: event
 #: field:event.registration.badge,address_id:0
 msgid "Address"
-msgstr ""
+msgstr "Хаяг"
 
 #. module: event
 #: view:board.board:0
 #: model:ir.actions.act_window,name:event.act_event_view
 msgid "Next Events"
-msgstr ""
+msgstr "Дараагийн Үйл явдал"
 
 #. module: event
 #: view:partner.event.registration:0
 msgid "_Subcribe"
-msgstr ""
+msgstr "_Бүртгүүлэх"
 
 #. module: event
 #: model:ir.model,name:event.model_partner_event_registration
 msgid "  event Registration "
-msgstr ""
+msgstr "  үйл явдлын бүртгэл "
 
 #. module: event
 #: help:event.event,date_begin:0
 #: help:partner.event.registration,start_date:0
 msgid "Beginning Date of Event"
-msgstr ""
+msgstr "Үйл явдлын эхлэх огноо"
 
 #. module: event
 #: selection:event.registration,state:0
 msgid "Unconfirmed"
-msgstr ""
+msgstr "Батлагаажаагүй"
 
 #. module: event
 #: code:addons/event/event.py:565
 #, python-format
 msgid "Auto Registration: [%s] %s"
-msgstr ""
+msgstr "Автомат бүртгэл: [%s] %s"
 
 #. module: event
 #: field:event.registration,date_deadline:0
 msgid "End Date"
-msgstr ""
+msgstr "Дуусах огноо"
 
 #. module: event
 #: selection:report.event.registration,month:0
 msgid "February"
-msgstr ""
+msgstr "2-р сар"
 
 #. module: event
 #: view:board.board:0
 msgid "Association Dashboard"
-msgstr ""
+msgstr "Холбооны Хянах Самбар"
 
 #. module: event
 #: view:event.event:0
 #: field:event.registration.badge,name:0
 msgid "Name"
-msgstr ""
+msgstr "Нэр"
 
 #. module: event
 #: field:event.event,section_id:0
@@ -1141,18 +1159,18 @@ msgstr ""
 #: view:report.event.registration:0
 #: field:report.event.registration,section_id:0
 msgid "Sale Team"
-msgstr ""
+msgstr "Борлуулалтын Баг"
 
 #. module: event
 #: field:event.event,country_id:0
 msgid "Country"
-msgstr ""
+msgstr "Улс"
 
 #. module: event
 #: code:addons/event/wizard/event_make_invoice.py:55
 #, python-format
 msgid "Registration is set as Cannot be invoiced"
-msgstr ""
+msgstr "Бүртгэл нэхэмжилж болохгүй байхаар тэмдэглэгдсэн"
 
 #. module: event
 #: code:addons/event/event.py:527
@@ -1161,12 +1179,12 @@ msgstr ""
 #: view:res.partner:0
 #, python-format
 msgid "Close Registration"
-msgstr ""
+msgstr "Бүртгэлийг Хаах"
 
 #. module: event
 #: selection:report.event.registration,month:0
 msgid "April"
-msgstr ""
+msgstr "4-р сар"
 
 #. module: event
 #: help:event.event,unit_price:0
@@ -1174,11 +1192,13 @@ msgid ""
 "This will be the default price used as registration cost when invoicing this "
 "event. Note that you can specify a specific amount for each registration."
 msgstr ""
+"Үйл явдлыг нэхэмжлэхэд энэ нь анхны үнэ байх бүртгэлийн өртөг үнэ. Бүртгэл "
+"болгонд ялгаатай тусгай үнүүдийг зааж өгөх боломжтой."
 
 #. module: event
 #: view:report.event.registration:0
 msgid "Events which are in confirm state"
-msgstr ""
+msgstr "Батлагдсан төлөвтэй үйл явдлууд"
 
 #. module: event
 #: view:event.event:0
@@ -1186,7 +1206,7 @@ msgstr ""
 #: view:report.event.registration:0
 #: field:report.event.registration,type:0
 msgid "Event Type"
-msgstr ""
+msgstr "Үйл явдлын төрөл"
 
 #. module: event
 #: view:event.event:0
@@ -1195,63 +1215,63 @@ msgstr ""
 #: model:ir.ui.menu,name:event.menu_action_registration
 #: model:ir.ui.menu,name:event.menu_action_registration_association
 msgid "Registrations"
-msgstr ""
+msgstr "Бүртгэлүүд"
 
 #. module: event
 #: field:event.registration,id:0
 msgid "ID"
-msgstr ""
+msgstr "ID"
 
 #. module: event
 #: field:event.event,register_max:0
 #: field:report.event.registration,register_max:0
 msgid "Maximum Registrations"
-msgstr ""
+msgstr "Хамгийн их бүртгэлүүд"
 
 #. module: event
 #: constraint:res.partner:0
 msgid "Error ! You cannot create recursive associated members."
-msgstr ""
+msgstr "Алдаа ! Тойрч холбогдсон гишүүдийг үүсгэх боломжгүй."
 
 #. module: event
 #: field:report.event.registration,date:0
 msgid "Event Start Date"
-msgstr ""
+msgstr "Үйл явдлын эхлэл огноо"
 
 #. module: event
 #: view:partner.event.registration:0
 msgid "Event For Registration"
-msgstr ""
+msgstr "Бүртгэх Үйл явдлууд"
 
 #. module: event
 #: code:addons/event/wizard/event_make_invoice.py:51
 #, python-format
 msgid "Invoice cannot be created if the registration is in %s state."
-msgstr ""
+msgstr "%s гэсэн төлөвтэй бүртгэлийг нэхэмжилж болохгүй."
 
 #. module: event
 #: view:event.confirm:0
 #: model:ir.actions.act_window,name:event.action_event_confirm
 #: model:ir.model,name:event.model_event_confirm
 msgid "Event Confirmation"
-msgstr ""
+msgstr "Үйл явдлын баталгаажуулалт"
 
 #. module: event
 #: view:event.event:0
 msgid "Auto Registration Email"
-msgstr ""
+msgstr "Автомат Бүртгэлийн имэйл"
 
 #. module: event
 #: view:event.registration:0
 #: view:report.event.registration:0
 #: field:report.event.registration,total:0
 msgid "Total"
-msgstr ""
+msgstr "Нийт"
 
 #. module: event
 #: field:event.event,speaker_confirmed:0
 msgid "Speaker Confirmed"
-msgstr ""
+msgstr "Илтгэгч баталгаажсан"
 
 #. module: event
 #: model:ir.actions.act_window,help:event.action_event_view
@@ -1261,3 +1281,7 @@ msgid ""
 "caldav. Most of the users should work in the Calendar menu, and not in the "
 "list of events."
 msgstr ""
+"Үйл явдал гэдэг нь уулзалт болон бусад төрлийн баримтуудад хэрэглэгддэг доод "
+"түвшний обьект бөгөөд хөдөлгөөнт төхөөрөмжүүдийн цагалбартай caldav-р "
+"ижилтгэл хийгддэг. Ихэнх хэрэглэгчид нь үйл явдлын жагсаалт дээра "
+"ажиллахаасаа илүүтэйгээр цагалбар меню дээр ажилладаг."
diff --git a/addons/event/i18n/nb.po b/addons/event/i18n/nb.po
index f154034b81a..3f31c6afb14 100644
--- a/addons/event/i18n/nb.po
+++ b/addons/event/i18n/nb.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:55+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:02+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: event
 #: view:event.event:0
diff --git a/addons/event/i18n/nl.po b/addons/event/i18n/nl.po
index 052f4596347..351a23aa708 100644
--- a/addons/event/i18n/nl.po
+++ b/addons/event/i18n/nl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:55+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:02+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: event
 #: view:event.event:0
diff --git a/addons/event/i18n/nl_BE.po b/addons/event/i18n/nl_BE.po
index e67c4997c4e..31de5207ec4 100644
--- a/addons/event/i18n/nl_BE.po
+++ b/addons/event/i18n/nl_BE.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:55+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:02+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: event
 #: view:event.event:0
diff --git a/addons/event/i18n/pl.po b/addons/event/i18n/pl.po
index 1001e485392..91a6981a1e5 100644
--- a/addons/event/i18n/pl.po
+++ b/addons/event/i18n/pl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:55+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:02+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: event
 #: view:event.event:0
diff --git a/addons/event/i18n/pt.po b/addons/event/i18n/pt.po
index da39b96cff8..f91ec6cf45d 100644
--- a/addons/event/i18n/pt.po
+++ b/addons/event/i18n/pt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:55+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:02+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: event
 #: view:event.event:0
diff --git a/addons/event/i18n/pt_BR.po b/addons/event/i18n/pt_BR.po
index aa53b2f1a41..e49d3acce7f 100644
--- a/addons/event/i18n/pt_BR.po
+++ b/addons/event/i18n/pt_BR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:55+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:02+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: event
 #: view:event.event:0
diff --git a/addons/event/i18n/ro.po b/addons/event/i18n/ro.po
index bb1c7ff80de..b786f322835 100644
--- a/addons/event/i18n/ro.po
+++ b/addons/event/i18n/ro.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:55+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:02+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: event
 #: view:event.event:0
diff --git a/addons/event/i18n/ru.po b/addons/event/i18n/ru.po
index 24af7837171..c91f4a7e517 100644
--- a/addons/event/i18n/ru.po
+++ b/addons/event/i18n/ru.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:55+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:02+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: event
 #: view:event.event:0
diff --git a/addons/event/i18n/sk.po b/addons/event/i18n/sk.po
index 44631b460ef..9ad303a0f30 100644
--- a/addons/event/i18n/sk.po
+++ b/addons/event/i18n/sk.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:55+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:02+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: event
 #: view:event.event:0
diff --git a/addons/event/i18n/sl.po b/addons/event/i18n/sl.po
index 430602bc8d2..b80b87b5ba2 100644
--- a/addons/event/i18n/sl.po
+++ b/addons/event/i18n/sl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:55+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:02+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: event
 #: view:event.event:0
diff --git a/addons/event/i18n/sq.po b/addons/event/i18n/sq.po
index b63a8410811..a6b55bad548 100644
--- a/addons/event/i18n/sq.po
+++ b/addons/event/i18n/sq.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:55+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:02+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: event
 #: view:event.event:0
diff --git a/addons/event/i18n/sr.po b/addons/event/i18n/sr.po
index 212cfbb93b4..f143bf85f00 100644
--- a/addons/event/i18n/sr.po
+++ b/addons/event/i18n/sr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:55+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:02+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: event
 #: view:event.event:0
diff --git a/addons/event/i18n/sr@latin.po b/addons/event/i18n/sr@latin.po
index cbc57d51508..dee7a8862db 100644
--- a/addons/event/i18n/sr@latin.po
+++ b/addons/event/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:55+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:02+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: event
 #: view:event.event:0
diff --git a/addons/event/i18n/sv.po b/addons/event/i18n/sv.po
index 6d23e866959..1e499b67f95 100644
--- a/addons/event/i18n/sv.po
+++ b/addons/event/i18n/sv.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:55+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:02+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: event
 #: view:event.event:0
diff --git a/addons/event/i18n/tlh.po b/addons/event/i18n/tlh.po
index 898fa1a1fc6..71f7e0069e7 100644
--- a/addons/event/i18n/tlh.po
+++ b/addons/event/i18n/tlh.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:55+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:02+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: event
 #: view:event.event:0
diff --git a/addons/event/i18n/tr.po b/addons/event/i18n/tr.po
index c915bfb85cf..25aa60a34a3 100644
--- a/addons/event/i18n/tr.po
+++ b/addons/event/i18n/tr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:55+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:02+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: event
 #: view:event.event:0
diff --git a/addons/event/i18n/uk.po b/addons/event/i18n/uk.po
index 8a249deae2c..5960ef8c09a 100644
--- a/addons/event/i18n/uk.po
+++ b/addons/event/i18n/uk.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:55+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:02+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: event
 #: view:event.event:0
diff --git a/addons/event/i18n/vi.po b/addons/event/i18n/vi.po
index 4349df00c4c..943e97bd19e 100644
--- a/addons/event/i18n/vi.po
+++ b/addons/event/i18n/vi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:55+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:02+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: event
 #: view:event.event:0
diff --git a/addons/event/i18n/zh_CN.po b/addons/event/i18n/zh_CN.po
index d6d1d3de186..ba8b9151458 100644
--- a/addons/event/i18n/zh_CN.po
+++ b/addons/event/i18n/zh_CN.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:55+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:02+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: event
 #: view:event.event:0
diff --git a/addons/event/i18n/zh_TW.po b/addons/event/i18n/zh_TW.po
index 5d60b3686fd..a6c27495e1c 100644
--- a/addons/event/i18n/zh_TW.po
+++ b/addons/event/i18n/zh_TW.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2011-09-27 07:58+0000\n"
-"Last-Translator: Walter Cheuk <wwycheuk@gmail.com>\n"
-"Language-Team: \n"
+"PO-Revision-Date: 2012-08-30 10:20+0000\n"
+"Last-Translator: Bonnie Duan <bonnie.duan@cenoq.com>\n"
+"Language-Team: Cenoq Corp.\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:55+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-31 04:56+0000\n"
+"X-Generator: Launchpad (build 15887)\n"
 
 #. module: event
 #: view:event.event:0
@@ -24,55 +24,55 @@ msgstr "發票資訊"
 #. module: event
 #: view:partner.event.registration:0
 msgid "Event Details"
-msgstr "活動詳情"
+msgstr "事件細節"
 
 #. module: event
 #: field:event.event,main_speaker_id:0
 msgid "Main Speaker"
-msgstr "主講者"
+msgstr "主要關注者"
 
 #. module: event
 #: view:event.event:0
 #: view:event.registration:0
 #: view:report.event.registration:0
 msgid "Group By..."
-msgstr "分組根據..."
+msgstr "分類方式..."
 
 #. module: event
 #: field:event.event,register_min:0
 msgid "Minimum Registrations"
-msgstr "最小登記數"
+msgstr "最少的登記記錄"
 
 #. module: event
 #: model:ir.model,name:event.model_event_confirm_registration
 msgid "Confirmation for Event Registration"
-msgstr "活動登記確認"
+msgstr "確認事件的登記記錄"
 
 #. module: event
 #: field:event.registration.badge,title:0
 msgid "Title"
-msgstr "稱謂"
+msgstr "標題"
 
 #. module: event
 #: field:event.event,mail_registr:0
 msgid "Registration Email"
-msgstr "登記電郵"
+msgstr "登記記錄的郵件"
 
 #. module: event
 #: model:ir.actions.act_window,name:event.action_event_confirm_registration
 msgid "Make Invoices"
-msgstr "開立發票"
+msgstr "生成發票"
 
 #. module: event
 #: view:event.event:0
 #: view:event.registration:0
 msgid "Registration Date"
-msgstr "登記日期"
+msgstr "登錄日期"
 
 #. module: event
 #: view:partner.event.registration:0
 msgid "_Close"
-msgstr "結束(_C)"
+msgstr "結束"
 
 #. module: event
 #: model:event.event,name:event.event_0
@@ -82,17 +82,17 @@ msgstr "Bon Jovi 演唱會"
 #. module: event
 #: view:report.event.registration:0
 msgid "Invoiced Registrations only"
-msgstr ""
+msgstr "僅已開發票的報名者"
 
 #. module: event
 #: selection:report.event.registration,month:0
 msgid "March"
-msgstr "三月"
+msgstr "3月"
 
 #. module: event
 #: field:event.event,mail_confirm:0
 msgid "Confirmation Email"
-msgstr "確認電郵"
+msgstr "確認電子郵件"
 
 #. module: event
 #: field:event.registration,nb_register:0
@@ -103,7 +103,7 @@ msgstr "數量"
 #: code:addons/event/wizard/event_make_invoice.py:63
 #, python-format
 msgid "Registration doesn't have any partner to invoice."
-msgstr ""
+msgstr "登記記錄沒有給任何業務夥伴開發票"
 
 #. module: event
 #: field:event.event,company_id:0
@@ -121,7 +121,7 @@ msgstr "發票日期"
 #. module: event
 #: help:event.event,pricelist_id:0
 msgid "Pricelist version for current event."
-msgstr "當前活動價目表版本"
+msgstr "當前事件的價目表版本"
 
 #. module: event
 #: code:addons/event/wizard/partner_event_registration.py:88
@@ -131,17 +131,17 @@ msgstr "當前活動價目表版本"
 #: view:partner.event.registration:0
 #, python-format
 msgid "Event Registration"
-msgstr "活動登記"
+msgstr "事件登錄"
 
 #. module: event
 #: field:event.event,parent_id:0
 msgid "Parent Event"
-msgstr "上級活動"
+msgstr "上級事件"
 
 #. module: event
 #: model:ir.actions.act_window,name:event.action_make_invoices
 msgid "Make Invoice"
-msgstr "開立發票"
+msgstr "生成發票"
 
 #. module: event
 #: field:event.registration,price_subtotal:0
@@ -151,27 +151,27 @@ msgstr "小計"
 #. module: event
 #: view:report.event.registration:0
 msgid "Event on Registration"
-msgstr "正登記活動"
+msgstr "登錄的事件"
 
 #. module: event
 #: help:event.event,reply_to:0
 msgid "The email address put in the 'Reply-To' of all emails sent by OpenERP"
-msgstr ""
+msgstr "所有系統的電子郵件在「回覆」填入這郵件地址。"
 
 #. module: event
 #: view:event.registration:0
 msgid "Add Internal Note"
-msgstr "添加內部記事"
+msgstr "新增內部備註"
 
 #. module: event
 #: view:event.event:0
 msgid "Confirmed events"
-msgstr ""
+msgstr "已確認的活動"
 
 #. module: event
 #: view:report.event.registration:0
 msgid "Event Beginning Date"
-msgstr ""
+msgstr "活動開始日期"
 
 #. module: event
 #: model:ir.actions.act_window,name:event.action_report_event_registration
@@ -179,17 +179,17 @@ msgstr ""
 #: model:ir.ui.menu,name:event.menu_report_event_registration
 #: view:report.event.registration:0
 msgid "Events Analysis"
-msgstr "活動分析"
+msgstr "事件分析"
 
 #. module: event
 #: field:event.registration,message_ids:0
 msgid "Messages"
-msgstr "郵件"
+msgstr "訊息"
 
 #. module: event
 #: model:ir.model,name:event.model_event_registration_badge
 msgid "event.registration.badge"
-msgstr ""
+msgstr "event.registration.badge"
 
 #. module: event
 #: field:event.event,mail_auto_confirm:0
@@ -206,25 +206,25 @@ msgstr "歌劇門票"
 #: view:event.event:0
 #, python-format
 msgid "Confirm Event"
-msgstr "確認活動"
+msgstr "確認事件"
 
 #. module: event
 #: selection:event.event,state:0
 #: selection:event.registration,state:0
 #: selection:report.event.registration,state:0
 msgid "Cancelled"
-msgstr "取消"
+msgstr "已取消"
 
 #. module: event
 #: field:event.event,reply_to:0
 msgid "Reply-To"
-msgstr "回覆至"
+msgstr "回覆:"
 
 #. module: event
 #: model:ir.actions.act_window,name:event.open_board_associations_manager
 #: model:ir.ui.menu,name:event.menu_board_associations_manager
 msgid "Event Dashboard"
-msgstr "活動儀錶板"
+msgstr "事件控制台"
 
 #. module: event
 #: model:event.event,name:event.event_1
@@ -234,40 +234,40 @@ msgstr "威爾第歌劇"
 #. module: event
 #: selection:report.event.registration,month:0
 msgid "July"
-msgstr "七月"
+msgstr "7月"
 
 #. module: event
 #: help:event.event,register_prospect:0
 msgid "Total of Prospect Registrations"
-msgstr ""
+msgstr "意向報名者合計"
 
 #. module: event
 #: help:event.event,mail_auto_confirm:0
 msgid ""
 "Check this box if you want to use automatic confirmation emailing or "
 "reminder."
-msgstr ""
+msgstr "如果你想用自動確認郵件或提醒請勾選這裡。"
 
 #. module: event
 #: field:event.registration,ref:0
 msgid "Reference"
-msgstr "參照"
+msgstr "關聯"
 
 #. module: event
 #: help:event.event,date_end:0
 #: help:partner.event.registration,end_date:0
 msgid "Closing Date of Event"
-msgstr "活動結束日期"
+msgstr "事件的結束日期"
 
 #. module: event
 #: view:event.registration:0
 msgid "Emails"
-msgstr "電郵"
+msgstr "電子郵件"
 
 #. module: event
 #: view:event.registration:0
 msgid "Extra Info"
-msgstr "額外資訊"
+msgstr "附加資訊"
 
 #. module: event
 #: code:addons/event/wizard/event_make_invoice.py:83
@@ -279,17 +279,17 @@ msgstr "客戶發票"
 #: selection:event.event,state:0
 #: selection:report.event.registration,state:0
 msgid "Draft"
-msgstr "草案"
+msgstr "草稿"
 
 #. module: event
 #: field:event.type,name:0
 msgid "Event type"
-msgstr "活動類型"
+msgstr "事件類型"
 
 #. module: event
 #: model:ir.model,name:event.model_event_type
 msgid " Event Type "
-msgstr " 活動類型 "
+msgstr " 事件類型 "
 
 #. module: event
 #: view:event.event:0
@@ -301,13 +301,13 @@ msgstr " 活動類型 "
 #: field:report.event.registration,event_id:0
 #: view:res.partner:0
 msgid "Event"
-msgstr "活動"
+msgstr "事件"
 
 #. module: event
 #: view:event.registration:0
 #: field:event.registration,badge_ids:0
 msgid "Badges"
-msgstr "襟章"
+msgstr "標記"
 
 #. module: event
 #: view:event.event:0
@@ -316,38 +316,38 @@ msgstr "襟章"
 #: selection:event.registration,state:0
 #: selection:report.event.registration,state:0
 msgid "Confirmed"
-msgstr "確認"
+msgstr "已確認"
 
 #. module: event
 #: view:event.confirm.registration:0
 msgid "Registration Confirmation"
-msgstr "登記確認"
+msgstr "確認登記記錄"
 
 #. module: event
 #: view:event.event:0
 msgid "Events in New state"
-msgstr ""
+msgstr "在新建狀態的活動"
 
 #. module: event
 #: view:report.event.registration:0
 msgid "Confirm"
-msgstr ""
+msgstr "確認"
 
 #. module: event
 #: view:event.event:0
 #: field:event.event,speaker_ids:0
 msgid "Other Speakers"
-msgstr "其他講者"
+msgstr "其他關注者"
 
 #. module: event
 #: model:ir.model,name:event.model_event_make_invoice
 msgid "Event Make Invoice"
-msgstr "活動開立發票"
+msgstr "事件建立發票"
 
 #. module: event
 #: help:event.registration,nb_register:0
 msgid "Number of Registrations or Tickets"
-msgstr "登記或門票數量"
+msgstr "登錄編號或票"
 
 #. module: event
 #: code:addons/event/wizard/event_make_invoice.py:50
@@ -361,30 +361,30 @@ msgstr "警告！"
 #. module: event
 #: view:event.registration:0
 msgid "Send New Email"
-msgstr "發送新電郵"
+msgstr "發送新電子郵件"
 
 #. module: event
 #: help:event.event,register_min:0
 msgid "Provide Minimum Number of Registrations"
-msgstr ""
+msgstr "提供最小的報名人數"
 
 #. module: event
 #: view:event.event:0
 msgid "Location"
-msgstr "地點"
+msgstr "位置"
 
 #. module: event
 #: view:event.event:0
 #: view:event.registration:0
 #: view:report.event.registration:0
 msgid "New"
-msgstr ""
+msgstr "新建"
 
 #. module: event
 #: field:event.event,register_current:0
 #: view:report.event.registration:0
 msgid "Confirmed Registrations"
-msgstr "已確認登記"
+msgstr "確認登記記錄"
 
 #. module: event
 #: field:event.event,mail_auto_registr:0
@@ -400,7 +400,7 @@ msgstr "類型"
 #. module: event
 #: field:event.registration,email_from:0
 msgid "Email"
-msgstr "電郵"
+msgstr "電子郵件"
 
 #. module: event
 #: help:event.event,mail_confirm:0
@@ -408,17 +408,17 @@ msgid ""
 "This email will be sent when the event gets confirmed or when someone "
 "subscribes to a confirmed event. This is also the email sent to remind "
 "someone about the event."
-msgstr ""
+msgstr "這封郵件會在活動已確認或有人註冊了已確認的郵件時發送。此郵件也會發送關於本活動的提醒。"
 
 #. module: event
 #: field:event.registration,tobe_invoiced:0
 msgid "To be Invoiced"
-msgstr ""
+msgstr "待開票"
 
 #. module: event
 #: view:event.event:0
 msgid "My Sales Team(s)"
-msgstr ""
+msgstr "我的銷售團隊"
 
 #. module: event
 #: code:addons/event/event.py:398
@@ -430,55 +430,55 @@ msgstr "錯誤！"
 #: field:event.event,name:0
 #: field:event.registration,name:0
 msgid "Summary"
-msgstr "摘要"
+msgstr "概要"
 
 #. module: event
 #: field:event.registration,create_date:0
 msgid "Creation Date"
-msgstr ""
+msgstr "建立日期"
 
 #. module: event
 #: view:event.event:0
 #: view:event.registration:0
 #: view:res.partner:0
 msgid "Cancel Registration"
-msgstr "取消登記"
+msgstr "取消登記記錄"
 
 #. module: event
 #: code:addons/event/event.py:399
 #, python-format
 msgid "Registered partner doesn't have an address to make the invoice."
-msgstr ""
+msgstr "要開票的登記記錄裡的業務夥伴沒地址"
 
 #. module: event
 #: view:report.event.registration:0
 msgid "Events created in last month"
-msgstr ""
+msgstr "上個月新建的活動"
 
 #. module: event
 #: view:report.event.registration:0
 msgid "Events created in current year"
-msgstr ""
+msgstr "本年新建的活動"
 
 #. module: event
 #: help:event.event,type:0
 msgid "Type of Event like Seminar, Exhibition, Conference, Training."
-msgstr "活動類型，如座談會、展覽、會議、培訓"
+msgstr "事件類型如：研討會，展覽，會議，培訓。"
 
 #. module: event
 #: view:event.registration:0
 msgid "Confirmed registrations"
-msgstr ""
+msgstr "確認報名者"
 
 #. module: event
 #: view:event.event:0
 msgid "Event Organization"
-msgstr "活動組織"
+msgstr "事件結構"
 
 #. module: event
 #: view:event.registration:0
 msgid "History Information"
-msgstr "歷史資訊"
+msgstr "日誌資訊"
 
 #. module: event
 #: view:event.registration:0
@@ -489,18 +489,18 @@ msgstr "日期"
 #: view:event.confirm:0
 #: view:event.confirm.registration:0
 msgid "Confirm Anyway"
-msgstr "無論如何確認"
+msgstr "總是確認"
 
 #. module: event
 #: code:addons/event/wizard/event_confirm_registration.py:54
 #, python-format
 msgid "Warning: The Event '%s' has reached its Maximum Limit (%s)."
-msgstr ""
+msgstr "警告：這事件 '%s'已達到最高極限 (%s)。"
 
 #. module: event
 #: view:report.event.registration:0
 msgid "    Month-1    "
-msgstr ""
+msgstr "    上月    "
 
 #. module: event
 #: view:event.event:0
@@ -508,17 +508,17 @@ msgstr ""
 #: field:event.registration.badge,registration_id:0
 #: model:ir.actions.act_window,name:event.act_event_list_register_event
 msgid "Registration"
-msgstr "登記"
+msgstr "登記記錄"
 
 #. module: event
 #: field:report.event.registration,nbevent:0
 msgid "Number Of Events"
-msgstr "活動數目"
+msgstr "事件數"
 
 #. module: event
 #: help:event.event,main_speaker_id:0
 msgid "Speaker who will be giving speech at the event."
-msgstr ""
+msgstr "要在這次活動上發言的演講者"
 
 #. module: event
 #: help:event.event,state:0
@@ -527,17 +527,18 @@ msgid ""
 "particular dates the state is set to 'Confirmed'. If the event is over, the "
 "state is set to 'Done'.If event is cancelled the state is set to 'Cancelled'."
 msgstr ""
+"如果事件剛建立狀態是「草稿」。如果事件在具體的日期已確認狀態是「已確認」。如果事件結束狀態設為「完成」。如果事件已經取消狀態是「已取消」。"
 
 #. module: event
 #: view:event.event:0
 msgid "Cancel Event"
-msgstr "取消活動"
+msgstr "取消事件"
 
 #. module: event
 #: view:event.event:0
 #: view:event.registration:0
 msgid "Contact"
-msgstr "聯絡人"
+msgstr "聯繫方式"
 
 #. module: event
 #: view:event.event:0
@@ -545,45 +546,45 @@ msgstr "聯絡人"
 #: field:event.registration,partner_id:0
 #: model:ir.model,name:event.model_res_partner
 msgid "Partner"
-msgstr "伙伴"
+msgstr "業務夥伴"
 
 #. module: event
 #: view:board.board:0
 #: model:ir.actions.act_window,name:event.act_event_reg
 #: view:report.event.registration:0
 msgid "Events Filling Status"
-msgstr ""
+msgstr "事件填充狀態"
 
 #. module: event
 #: field:event.make.invoice,grouped:0
 msgid "Group the invoices"
-msgstr "發票分類"
+msgstr "發票組"
 
 #. module: event
 #: view:event.event:0
 msgid "Mailing"
-msgstr ""
+msgstr "郵遞"
 
 #. module: event
 #: view:report.event.registration:0
 msgid "Events States"
-msgstr ""
+msgstr "活動狀態"
 
 #. module: event
 #: view:board.board:0
 #: field:event.event,register_prospect:0
 msgid "Unconfirmed Registrations"
-msgstr "未確認登記"
+msgstr "不確認登記記錄"
 
 #. module: event
 #: field:event.registration,partner_invoice_id:0
 msgid "Partner Invoiced"
-msgstr ""
+msgstr "已開票業務夥伴"
 
 #. module: event
 #: help:event.event,register_max:0
 msgid "Provide Maximum Number of Registrations"
-msgstr ""
+msgstr "提供本次報名的最大人數"
 
 #. module: event
 #: field:event.registration,log_ids:0
@@ -598,17 +599,17 @@ msgstr "日誌"
 #: view:report.event.registration:0
 #: field:report.event.registration,state:0
 msgid "State"
-msgstr ""
+msgstr "狀態"
 
 #. module: event
 #: selection:report.event.registration,month:0
 msgid "September"
-msgstr "九月"
+msgstr "9月"
 
 #. module: event
 #: selection:report.event.registration,month:0
 msgid "December"
-msgstr "十二月"
+msgstr "12月"
 
 #. module: event
 #: field:event.registration,event_product:0
@@ -618,28 +619,28 @@ msgstr "發票名稱"
 #. module: event
 #: field:report.event.registration,draft_state:0
 msgid " # No of Draft Registrations"
-msgstr ""
+msgstr " # 沒草稿狀態的登記記錄"
 
 #. module: event
 #: view:report.event.registration:0
 #: field:report.event.registration,month:0
 msgid "Month"
-msgstr "月"
+msgstr "月份"
 
 #. module: event
 #: view:event.event:0
 msgid "Event Done"
-msgstr "活動完結"
+msgstr "事件完成"
 
 #. module: event
 #: view:event.registration:0
 msgid "Registrations in unconfirmed state"
-msgstr ""
+msgstr "未確認狀態的報名者"
 
 #. module: event
 #: help:event.event,register_current:0
 msgid "Total of Open and Done Registrations"
-msgstr "開放及完成登記總數"
+msgstr "開啟和完成的登記記錄共有"
 
 #. module: event
 #: field:event.confirm.registration,msg:0
@@ -649,35 +650,35 @@ msgstr "訊息"
 #. module: event
 #: constraint:event.event:0
 msgid "Error ! You cannot create recursive event."
-msgstr ""
+msgstr "錯誤！你不能建立互相調用的事件。"
 
 #. module: event
 #: field:event.registration,ref2:0
 msgid "Reference 2"
-msgstr "參照 2"
+msgstr "關聯2"
 
 #. module: event
 #: code:addons/event/event.py:361
 #: view:report.event.registration:0
 #, python-format
 msgid "Invoiced"
-msgstr "已開發票"
+msgstr "已開票"
 
 #. module: event
 #: view:event.event:0
 #: view:report.event.registration:0
 msgid "My Events"
-msgstr "我的活動"
+msgstr "我的事件"
 
 #. module: event
 #: view:event.event:0
 msgid "Speakers"
-msgstr "講者"
+msgstr "關注者"
 
 #. module: event
 #: view:event.make.invoice:0
 msgid "Create invoices"
-msgstr ""
+msgstr "開立發票"
 
 #. module: event
 #: help:event.registration,email_cc:0
@@ -685,12 +686,12 @@ 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 ""
+msgstr "這些郵箱地址將添加到所有接收的發送郵件的副本欄位，用逗號分隔多個郵件地址。"
 
 #. module: event
 #: view:event.make.invoice:0
 msgid "Do you really want to create the invoice(s) ?"
-msgstr ""
+msgstr "你真的要生成發票嗎 ？"
 
 #. module: event
 #: view:event.event:0
@@ -700,12 +701,12 @@ msgstr "開始日期"
 #. module: event
 #: field:event.registration,date_closed:0
 msgid "Closed"
-msgstr "結束"
+msgstr "已結束"
 
 #. module: event
 #: view:report.event.registration:0
 msgid "Events which are in New state"
-msgstr ""
+msgstr "新建狀態的活動"
 
 #. module: event
 #: view:event.event:0
@@ -714,28 +715,28 @@ msgstr ""
 #: model:ir.ui.menu,name:event.menu_event_event_assiciation
 #: view:res.partner:0
 msgid "Events"
-msgstr "活動"
+msgstr "事件"
 
 #. module: event
 #: field:partner.event.registration,nb_register:0
 msgid "Number of Registration"
-msgstr "登記數量"
+msgstr "登記記錄數"
 
 #. module: event
 #: field:event.event,child_ids:0
 msgid "Child Events"
-msgstr "子活動"
+msgstr "子事件"
 
 #. module: event
 #: selection:report.event.registration,month:0
 msgid "August"
-msgstr "八月"
+msgstr "8月"
 
 #. module: event
 #: field:res.partner,event_ids:0
 #: field:res.partner,event_registration_ids:0
 msgid "unknown"
-msgstr "不詳"
+msgstr "未知的"
 
 #. module: event
 #: help:event.event,product_id:0
@@ -743,39 +744,39 @@ msgid ""
 "The invoices of this event registration will be created with this Product. "
 "Thus it allows you to set the default label and the accounting info you want "
 "by default on these invoices."
-msgstr ""
+msgstr "將建立這事件登記記錄的產品發票。因此對這些預設發票它允許你設置預設的標籤和會計資訊。"
 
 #. module: event
 #: selection:report.event.registration,month:0
 msgid "June"
-msgstr "六月"
+msgstr "6月"
 
 #. module: event
 #: model:product.template,name:event.event_product_0_product_template
 msgid "Ticket for Concert"
-msgstr ""
+msgstr "合作的門票"
 
 #. module: event
 #: field:event.registration,write_date:0
 msgid "Write Date"
-msgstr ""
+msgstr "寫入日期"
 
 #. module: event
 #: view:event.registration:0
 msgid "My Registrations"
-msgstr "我的登記"
+msgstr "我的登記記錄"
 
 #. module: event
 #: view:event.confirm:0
 msgid ""
 "Warning: This Event has not reached its Minimum Registration Limit. Are you "
 "sure you want to confirm it?"
-msgstr "警告：本活動未達最少登記限制。是否確認？"
+msgstr "警告：這事件沒有達到最低登記記錄的規定，你肯定要確認它？"
 
 #. module: event
 #: field:event.registration,active:0
 msgid "Active"
-msgstr ""
+msgstr "生效"
 
 #. module: event
 #: field:event.registration,date:0
@@ -785,12 +786,12 @@ msgstr "開始日期"
 #. module: event
 #: selection:report.event.registration,month:0
 msgid "November"
-msgstr "十一月"
+msgstr "11月"
 
 #. module: event
 #: view:report.event.registration:0
 msgid "Extended Filters..."
-msgstr ""
+msgstr "增加篩選條件"
 
 #. module: event
 #: field:partner.event.registration,start_date:0
@@ -800,7 +801,7 @@ msgstr "開始日期"
 #. module: event
 #: selection:report.event.registration,month:0
 msgid "October"
-msgstr "十月"
+msgstr "10月"
 
 #. module: event
 #: field:event.event,language:0
@@ -811,22 +812,22 @@ msgstr "語言"
 #: view:event.registration:0
 #: field:event.registration,email_cc:0
 msgid "CC"
-msgstr "副本(CC)"
+msgstr "抄送"
 
 #. module: event
 #: selection:report.event.registration,month:0
 msgid "January"
-msgstr "一月"
+msgstr "1月"
 
 #. module: event
 #: help:event.registration,email_from:0
 msgid "These people will receive email."
-msgstr "此等人士會收到電郵"
+msgstr "這些人將收到電子郵件。"
 
 #. module: event
 #: view:event.event:0
 msgid "Set To Draft"
-msgstr "設為草案"
+msgstr "設為草稿"
 
 #. module: event
 #: code:addons/event/event.py:499
@@ -835,7 +836,7 @@ msgstr "設為草案"
 #: view:res.partner:0
 #, python-format
 msgid "Confirm Registration"
-msgstr "確認登記"
+msgstr "確認登記記錄"
 
 #. module: event
 #: view:event.event:0
@@ -847,39 +848,39 @@ msgstr "日期"
 #. module: event
 #: view:event.event:0
 msgid "Registration Email Body"
-msgstr "登記電郵內容"
+msgstr "登記記錄的郵件內容"
 
 #. module: event
 #: view:event.event:0
 msgid "Confirmation Email Body"
-msgstr "確認電郵內容"
+msgstr "確認郵件內容"
 
 #. module: event
 #: view:report.event.registration:0
 msgid "Registrations in confirmed or done state"
-msgstr ""
+msgstr "在已確認或已完成狀態的報名者"
 
 #. module: event
 #: view:event.registration:0
 #: view:res.partner:0
 msgid "History"
-msgstr "歷史"
+msgstr "日誌"
 
 #. module: event
 #: field:event.event,address_id:0
 msgid "Location Address"
-msgstr "地點位址"
+msgstr "地址"
 
 #. module: event
 #: model:ir.actions.act_window,name:event.action_event_type
 #: model:ir.ui.menu,name:event.menu_event_type
 msgid "Types of Events"
-msgstr "活動類型"
+msgstr "事件類型"
 
 #. module: event
 #: field:event.registration,contact_id:0
 msgid "Partner Contact"
-msgstr "伙伴聯絡人"
+msgstr "業務夥伴聯繫方式"
 
 #. module: event
 #: field:event.event,pricelist_id:0
@@ -890,12 +891,12 @@ msgstr "價目表"
 #: code:addons/event/wizard/event_make_invoice.py:59
 #, python-format
 msgid "Event related doesn't have any product defined"
-msgstr ""
+msgstr "事件沒關聯任何定義的產品"
 
 #. module: event
 #: view:event.event:0
 msgid "Auto Confirmation Email"
-msgstr "自動確認電郵"
+msgstr "自動確認郵件"
 
 #. module: event
 #: view:event.registration:0
@@ -905,7 +906,7 @@ msgstr "雜項"
 #. module: event
 #: constraint:event.event:0
 msgid "Error ! Closing Date cannot be set before Beginning Date."
-msgstr "錯誤！結束日期不能早於開始日期"
+msgstr "錯誤！結束日期不能在開始日期前。"
 
 #. module: event
 #: code:addons/event/event.py:446
@@ -932,7 +933,7 @@ msgstr "發票"
 #: view:report.event.registration:0
 #: field:report.event.registration,year:0
 msgid "Year"
-msgstr "年份"
+msgstr "年"
 
 #. module: event
 #: code:addons/event/event.py:465
@@ -945,30 +946,30 @@ msgstr "取消"
 #: view:event.confirm.registration:0
 #: view:event.make.invoice:0
 msgid "Close"
-msgstr "關閉"
+msgstr "結束"
 
 #. module: event
 #: view:event.event:0
 msgid "Event by Registration"
-msgstr "各登記活動"
+msgstr "事件登記記錄"
 
 #. module: event
 #: code:addons/event/event.py:436
 #, python-format
 msgid "Open"
-msgstr "開放"
+msgstr "開啟"
 
 #. module: event
 #: field:event.event,user_id:0
 msgid "Responsible User"
-msgstr "負責用戶"
+msgstr "責任用戶"
 
 #. module: event
 #: code:addons/event/event.py:561
 #: code:addons/event/event.py:568
 #, python-format
 msgid "Auto Confirmation: [%s] %s"
-msgstr "自動確認：[%s] %s"
+msgstr "自動確認： [%s] %s"
 
 #. module: event
 #: view:event.event:0
@@ -977,14 +978,14 @@ msgstr "自動確認：[%s] %s"
 #: view:report.event.registration:0
 #: field:report.event.registration,user_id:0
 msgid "Responsible"
-msgstr "負責"
+msgstr "負責人"
 
 #. module: event
 #: field:event.event,unit_price:0
 #: view:event.registration:0
 #: field:partner.event.registration,unit_price:0
 msgid "Registration Cost"
-msgstr "登記成本"
+msgstr "登記記錄的成本"
 
 #. module: event
 #: field:event.registration,unit_price:0
@@ -996,7 +997,7 @@ msgstr "單價"
 #: field:report.event.registration,speaker_id:0
 #: field:res.partner,speaker:0
 msgid "Speaker"
-msgstr "講者"
+msgstr "關注者"
 
 #. module: event
 #: model:event.event,name:event.event_2
@@ -1011,13 +1012,13 @@ msgstr "回覆"
 #. module: event
 #: view:report.event.registration:0
 msgid "Events created in current month"
-msgstr ""
+msgstr "本月新建的活動"
 
 #. module: event
 #: help:event.event,mail_auto_registr:0
 msgid ""
 "Check this box if you want to use automatic emailing for new registration."
-msgstr ""
+msgstr "如果你要自動發郵件給新的報名者請勾選此項。"
 
 #. module: event
 #: field:event.event,date_end:0
@@ -1038,12 +1039,12 @@ msgstr "產品"
 #: view:event.registration:0
 #: field:event.registration,description:0
 msgid "Description"
-msgstr "說明"
+msgstr "描述"
 
 #. module: event
 #: field:report.event.registration,confirm_state:0
 msgid " # No of Confirmed Registrations"
-msgstr " # 已確認登記數"
+msgstr " # 沒確認登記記錄"
 
 #. module: event
 #: model:ir.actions.act_window,name:event.act_register_event_partner
@@ -1053,17 +1054,17 @@ msgstr "訂閱"
 #. module: event
 #: selection:report.event.registration,month:0
 msgid "May"
-msgstr "五月"
+msgstr "5月"
 
 #. module: event
 #: view:res.partner:0
 msgid "Events Registration"
-msgstr "活動登記"
+msgstr "事件登記記錄"
 
 #. module: event
 #: help:event.event,mail_registr:0
 msgid "This email will be sent when someone subscribes to the event."
-msgstr ""
+msgstr "當有人讚同這事件時將發送這郵件"
 
 #. module: event
 #: model:product.template,name:event.event_product_2_product_template
@@ -1073,34 +1074,34 @@ msgstr "會議門票"
 #. module: event
 #: model:ir.ui.menu,name:event.menu_event_type_association
 msgid "Events Type"
-msgstr ""
+msgstr "活動類型"
 
 #. module: event
 #: field:event.registration.badge,address_id:0
 msgid "Address"
-msgstr "地址"
+msgstr "地址:"
 
 #. module: event
 #: view:board.board:0
 #: model:ir.actions.act_window,name:event.act_event_view
 msgid "Next Events"
-msgstr "下個活動"
+msgstr "下一個事件"
 
 #. module: event
 #: view:partner.event.registration:0
 msgid "_Subcribe"
-msgstr "訂閱(_S)"
+msgstr "訂閱"
 
 #. module: event
 #: model:ir.model,name:event.model_partner_event_registration
 msgid "  event Registration "
-msgstr "  活動登記 "
+msgstr "  事件登記記錄 "
 
 #. module: event
 #: help:event.event,date_begin:0
 #: help:partner.event.registration,start_date:0
 msgid "Beginning Date of Event"
-msgstr "活動開始日"
+msgstr "事件開始日期"
 
 #. module: event
 #: selection:event.registration,state:0
@@ -1111,22 +1112,22 @@ msgstr "未確認"
 #: code:addons/event/event.py:565
 #, python-format
 msgid "Auto Registration: [%s] %s"
-msgstr "自動登記：[%s] %s"
+msgstr "自動登記記錄： [%s] %s"
 
 #. module: event
 #: field:event.registration,date_deadline:0
 msgid "End Date"
-msgstr "結束日"
+msgstr "結束日期"
 
 #. module: event
 #: selection:report.event.registration,month:0
 msgid "February"
-msgstr "二月"
+msgstr "2月"
 
 #. module: event
 #: view:board.board:0
 msgid "Association Dashboard"
-msgstr ""
+msgstr "商會控制台"
 
 #. module: event
 #: view:event.event:0
@@ -1140,18 +1141,18 @@ msgstr "名稱"
 #: view:report.event.registration:0
 #: field:report.event.registration,section_id:0
 msgid "Sale Team"
-msgstr "業務團隊"
+msgstr "銷售團隊"
 
 #. module: event
 #: field:event.event,country_id:0
 msgid "Country"
-msgstr "國家或地區"
+msgstr "國家"
 
 #. module: event
 #: code:addons/event/wizard/event_make_invoice.py:55
 #, python-format
 msgid "Registration is set as Cannot be invoiced"
-msgstr ""
+msgstr "登記記錄設置為不能開發票"
 
 #. module: event
 #: code:addons/event/event.py:527
@@ -1160,24 +1161,24 @@ msgstr ""
 #: view:res.partner:0
 #, python-format
 msgid "Close Registration"
-msgstr "結束登記"
+msgstr "結束登記記錄"
 
 #. module: event
 #: selection:report.event.registration,month:0
 msgid "April"
-msgstr "四月"
+msgstr "4月"
 
 #. module: event
 #: help:event.event,unit_price:0
 msgid ""
 "This will be the default price used as registration cost when invoicing this "
 "event. Note that you can specify a specific amount for each registration."
-msgstr ""
+msgstr "這裡是開發票是預設的報名價格，注意你可以對每個報名者用不同的價格。"
 
 #. module: event
 #: view:report.event.registration:0
 msgid "Events which are in confirm state"
-msgstr ""
+msgstr "已確認狀態的活動"
 
 #. module: event
 #: view:event.event:0
@@ -1185,7 +1186,7 @@ msgstr ""
 #: view:report.event.registration:0
 #: field:report.event.registration,type:0
 msgid "Event Type"
-msgstr "活動類型"
+msgstr "事件類型"
 
 #. module: event
 #: view:event.event:0
@@ -1194,51 +1195,51 @@ msgstr "活動類型"
 #: model:ir.ui.menu,name:event.menu_action_registration
 #: model:ir.ui.menu,name:event.menu_action_registration_association
 msgid "Registrations"
-msgstr "登記"
+msgstr "登記記錄"
 
 #. module: event
 #: field:event.registration,id:0
 msgid "ID"
-msgstr ""
+msgstr "標識"
 
 #. module: event
 #: field:event.event,register_max:0
 #: field:report.event.registration,register_max:0
 msgid "Maximum Registrations"
-msgstr "最大登記數"
+msgstr "最多的登記記錄"
 
 #. module: event
 #: constraint:res.partner:0
 msgid "Error ! You cannot create recursive associated members."
-msgstr ""
+msgstr "錯誤，您不能建立循環引用的會員用戶"
 
 #. module: event
 #: field:report.event.registration,date:0
 msgid "Event Start Date"
-msgstr "活動開始日"
+msgstr "事件開始日期"
 
 #. module: event
 #: view:partner.event.registration:0
 msgid "Event For Registration"
-msgstr "可登記活動"
+msgstr "登記記錄引起的事件"
 
 #. module: event
 #: code:addons/event/wizard/event_make_invoice.py:51
 #, python-format
 msgid "Invoice cannot be created if the registration is in %s state."
-msgstr ""
+msgstr "如果登記記錄在 %s 狀態，不能開發票。"
 
 #. module: event
 #: view:event.confirm:0
 #: model:ir.actions.act_window,name:event.action_event_confirm
 #: model:ir.model,name:event.model_event_confirm
 msgid "Event Confirmation"
-msgstr "活動確認"
+msgstr "事件確認"
 
 #. module: event
 #: view:event.event:0
 msgid "Auto Registration Email"
-msgstr "自動登記電郵"
+msgstr "自動登記記錄郵件"
 
 #. module: event
 #: view:event.registration:0
@@ -1250,7 +1251,7 @@ msgstr "總計"
 #. module: event
 #: field:event.event,speaker_confirmed:0
 msgid "Speaker Confirmed"
-msgstr "已確認講者"
+msgstr "關注者確認"
 
 #. module: event
 #: model:ir.actions.act_window,help:event.action_event_view
@@ -1259,7 +1260,7 @@ msgid ""
 "should be synchronized with mobile devices or calendar applications through "
 "caldav. Most of the users should work in the Calendar menu, and not in the "
 "list of events."
-msgstr ""
+msgstr "事件是低層對象用於會議和其它文檔通過caldar同步移動設備或日程表應用程序。大多數用戶將使用日程表菜單而不是事件列表。"
 
 #~ msgid "Provide Maximun Number of Registrations"
 #~ msgstr "提供登記最大數"
diff --git a/addons/event_moodle/__openerp__.py b/addons/event_moodle/__openerp__.py
index 14f6de8668d..fdfb793b494 100644
--- a/addons/event_moodle/__openerp__.py
+++ b/addons/event_moodle/__openerp__.py
@@ -34,10 +34,10 @@ to avoid wasting time.
 Now you have a simple way to create training or courses with OpenERP and moodle.
 
 STEPS TO CONFIGURE:
-------------------
+-------------------
 
 1. Activate web service in moodle.
-----------------------------------
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 >site administration >plugins >web services >manage protocols activate the xmlrpc web service 
 
 
@@ -48,26 +48,27 @@ STEPS TO CONFIGURE:
 
 
 2. Create confirmation email with login and password.
------------------------------------------------------
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 We strongly suggest you to add those following lines at the bottom of your event
 confirmation email to communicate the login/password of moodle to your subscribers.
 
 
 ........your configuration text.......
 
-URL: your moodle link for exemple: http://openerp.moodle.com
-LOGIN: ${object.moodle_username}
-PASSWORD: ${object.moodle_user_password}
+**URL:** your moodle link for exemple: http://openerp.moodle.com
+
+**LOGIN:** ${object.moodle_username}
+
+**PASSWORD:** ${object.moodle_user_password}
 """,
     'author': 'OpenERP SA',
     'depends': ['event'],
-    'init_xml': [],
     'data': [
-            'wizard_moodle.xml',
-            'event_view.xml',
-            'security/ir.model.access.csv'
-            ],
-    'demo_xml': [],
+        'wizard_moodle.xml',
+        'event_view.xml',
+        'security/ir.model.access.csv'
+    ],
+    'demo': [],
     'test': [],
     'installable': True,
     'auto_install': False,
diff --git a/addons/event_project/__openerp__.py b/addons/event_project/__openerp__.py
index a843188de55..b6710c8bac4 100644
--- a/addons/event_project/__openerp__.py
+++ b/addons/event_project/__openerp__.py
@@ -32,9 +32,8 @@ This module allows you to create retro planning for managing your events.
     'author': 'OpenERP SA',
     'images': ['images/event.jpeg'],
     'depends': ['project_retro_planning', 'event'],
-    'init_xml': [],
-    'update_xml': ['wizard/event_project_retro_view.xml', 'event_project_view.xml'],
-    'demo_xml': [],
+    'data': ['wizard/event_project_retro_view.xml', 'event_project_view.xml'],
+    'demo': [],
     'installable': True,
     'auto_install': False,
     'certificate': '0069726863885',
diff --git a/addons/event_project/i18n/ar.po b/addons/event_project/i18n/ar.po
index 05b7fdc7a94..8b403552217 100644
--- a/addons/event_project/i18n/ar.po
+++ b/addons/event_project/i18n/ar.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: event_project
 #: model:ir.model,name:event_project.model_event_project
diff --git a/addons/event_project/i18n/bg.po b/addons/event_project/i18n/bg.po
index 80867fcdaff..6d016fae762 100644
--- a/addons/event_project/i18n/bg.po
+++ b/addons/event_project/i18n/bg.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: event_project
 #: model:ir.model,name:event_project.model_event_project
diff --git a/addons/event_project/i18n/bs.po b/addons/event_project/i18n/bs.po
index d4953b3725b..df0f4d2d09e 100644
--- a/addons/event_project/i18n/bs.po
+++ b/addons/event_project/i18n/bs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: event_project
 #: model:ir.model,name:event_project.model_event_project
diff --git a/addons/event_project/i18n/ca.po b/addons/event_project/i18n/ca.po
index 93eeb9bf30b..1da4d58fb09 100644
--- a/addons/event_project/i18n/ca.po
+++ b/addons/event_project/i18n/ca.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: event_project
 #: model:ir.model,name:event_project.model_event_project
diff --git a/addons/event_project/i18n/cs.po b/addons/event_project/i18n/cs.po
index 97a74e5c25d..3ae30961c5b 100644
--- a/addons/event_project/i18n/cs.po
+++ b/addons/event_project/i18n/cs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 "X-Poedit-Language: Czech\n"
 
 #. module: event_project
diff --git a/addons/event_project/i18n/da.po b/addons/event_project/i18n/da.po
index 7d4a80f401d..ded39f360bc 100644
--- a/addons/event_project/i18n/da.po
+++ b/addons/event_project/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: event_project
 #: model:ir.model,name:event_project.model_event_project
diff --git a/addons/event_project/i18n/de.po b/addons/event_project/i18n/de.po
index cdeb2576d1f..74162e2e8fc 100644
--- a/addons/event_project/i18n/de.po
+++ b/addons/event_project/i18n/de.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: event_project
 #: model:ir.model,name:event_project.model_event_project
diff --git a/addons/event_project/i18n/el.po b/addons/event_project/i18n/el.po
index e806d4d40a5..6994dd18abe 100644
--- a/addons/event_project/i18n/el.po
+++ b/addons/event_project/i18n/el.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: event_project
 #: model:ir.model,name:event_project.model_event_project
diff --git a/addons/event_project/i18n/en_GB.po b/addons/event_project/i18n/en_GB.po
index 648a041386a..7ab916c0467 100644
--- a/addons/event_project/i18n/en_GB.po
+++ b/addons/event_project/i18n/en_GB.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: event_project
 #: model:ir.model,name:event_project.model_event_project
diff --git a/addons/event_project/i18n/es.po b/addons/event_project/i18n/es.po
index 8e45be0b4dd..33e76cdd9da 100644
--- a/addons/event_project/i18n/es.po
+++ b/addons/event_project/i18n/es.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: event_project
 #: model:ir.model,name:event_project.model_event_project
diff --git a/addons/event_project/i18n/es_AR.po b/addons/event_project/i18n/es_AR.po
index 93af33db7ba..7262ec78e52 100644
--- a/addons/event_project/i18n/es_AR.po
+++ b/addons/event_project/i18n/es_AR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: event_project
 #: model:ir.model,name:event_project.model_event_project
diff --git a/addons/event_project/i18n/es_CR.po b/addons/event_project/i18n/es_CR.po
index 992efb18362..997e9b56690 100644
--- a/addons/event_project/i18n/es_CR.po
+++ b/addons/event_project/i18n/es_CR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 "Language: \n"
 
 #. module: event_project
diff --git a/addons/event_project/i18n/es_EC.po b/addons/event_project/i18n/es_EC.po
index 18e381c4b83..376606693d4 100644
--- a/addons/event_project/i18n/es_EC.po
+++ b/addons/event_project/i18n/es_EC.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: event_project
 #: model:ir.model,name:event_project.model_event_project
diff --git a/addons/event_project/i18n/es_PY.po b/addons/event_project/i18n/es_PY.po
index 23bf8400e1d..04ef0f852ad 100644
--- a/addons/event_project/i18n/es_PY.po
+++ b/addons/event_project/i18n/es_PY.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: event_project
 #: model:ir.model,name:event_project.model_event_project
diff --git a/addons/event_project/i18n/et.po b/addons/event_project/i18n/et.po
index 0bde280420b..7676f47f507 100644
--- a/addons/event_project/i18n/et.po
+++ b/addons/event_project/i18n/et.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: event_project
 #: model:ir.model,name:event_project.model_event_project
diff --git a/addons/event_project/i18n/fi.po b/addons/event_project/i18n/fi.po
index 4ab64581d90..a4f6b476dde 100644
--- a/addons/event_project/i18n/fi.po
+++ b/addons/event_project/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: event_project
 #: model:ir.model,name:event_project.model_event_project
diff --git a/addons/event_project/i18n/fr.po b/addons/event_project/i18n/fr.po
index 8029084a1af..4521550b23f 100644
--- a/addons/event_project/i18n/fr.po
+++ b/addons/event_project/i18n/fr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: event_project
 #: model:ir.model,name:event_project.model_event_project
diff --git a/addons/event_project/i18n/gl.po b/addons/event_project/i18n/gl.po
index 14a8ab4623c..12fd301f97f 100644
--- a/addons/event_project/i18n/gl.po
+++ b/addons/event_project/i18n/gl.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: event_project
 #: model:ir.model,name:event_project.model_event_project
diff --git a/addons/event_project/i18n/hi.po b/addons/event_project/i18n/hi.po
index 8c07aa5e9f7..87f32241827 100644
--- a/addons/event_project/i18n/hi.po
+++ b/addons/event_project/i18n/hi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: event_project
 #: model:ir.model,name:event_project.model_event_project
diff --git a/addons/event_project/i18n/hr.po b/addons/event_project/i18n/hr.po
index ac06fba269e..cb252e522d1 100644
--- a/addons/event_project/i18n/hr.po
+++ b/addons/event_project/i18n/hr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: event_project
 #: model:ir.model,name:event_project.model_event_project
diff --git a/addons/event_project/i18n/hu.po b/addons/event_project/i18n/hu.po
index 51977b06b40..f930567ef7b 100644
--- a/addons/event_project/i18n/hu.po
+++ b/addons/event_project/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: event_project
 #: model:ir.model,name:event_project.model_event_project
diff --git a/addons/event_project/i18n/id.po b/addons/event_project/i18n/id.po
index 87f99071f08..0ce170edb28 100644
--- a/addons/event_project/i18n/id.po
+++ b/addons/event_project/i18n/id.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: event_project
 #: model:ir.model,name:event_project.model_event_project
diff --git a/addons/event_project/i18n/it.po b/addons/event_project/i18n/it.po
index 4b52600eafc..1c1681b6274 100644
--- a/addons/event_project/i18n/it.po
+++ b/addons/event_project/i18n/it.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: event_project
 #: model:ir.model,name:event_project.model_event_project
diff --git a/addons/event_project/i18n/ja.po b/addons/event_project/i18n/ja.po
index 79f45008762..af5dac56a66 100644
--- a/addons/event_project/i18n/ja.po
+++ b/addons/event_project/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: event_project
 #: model:ir.model,name:event_project.model_event_project
diff --git a/addons/event_project/i18n/ko.po b/addons/event_project/i18n/ko.po
index 9c838c91f80..aaf633d6aa2 100644
--- a/addons/event_project/i18n/ko.po
+++ b/addons/event_project/i18n/ko.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: event_project
 #: model:ir.model,name:event_project.model_event_project
diff --git a/addons/event_project/i18n/lt.po b/addons/event_project/i18n/lt.po
index 51c9d772abb..aef9cee57c9 100644
--- a/addons/event_project/i18n/lt.po
+++ b/addons/event_project/i18n/lt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: event_project
 #: model:ir.model,name:event_project.model_event_project
diff --git a/addons/event_project/i18n/lv.po b/addons/event_project/i18n/lv.po
index 78138c88d01..17782355cb7 100644
--- a/addons/event_project/i18n/lv.po
+++ b/addons/event_project/i18n/lv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: event_project
 #: model:ir.model,name:event_project.model_event_project
diff --git a/addons/event_project/i18n/mn.po b/addons/event_project/i18n/mn.po
new file mode 100644
index 00000000000..43b3884e1e5
--- /dev/null
+++ b/addons/event_project/i18n/mn.po
@@ -0,0 +1,113 @@
+# 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-02-08 00:36+0000\n"
+"PO-Revision-Date: 2012-08-24 06:37+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: 2012-08-28 06:27+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
+
+#. module: event_project
+#: model:ir.model,name:event_project.model_event_project
+msgid "Event Project"
+msgstr "Үйл явдлын төсөл"
+
+#. module: event_project
+#: field:event.project,date:0
+msgid "Date End"
+msgstr "Дуусах огноо"
+
+#. module: event_project
+#: view:event.project:0
+msgid "Ok"
+msgstr "Тийм"
+
+#. module: event_project
+#: help:event.project,project_id:0
+msgid ""
+"This is Template Project. Project of event is a duplicate of this Template. "
+"After click on  'Create Retro-planning', New Project will be duplicated from "
+"this template project."
+msgstr ""
+"Энэ нь үлгэр төсөл. Үйл явдлын төсөл нь энэ төслийн хуулбар байна. 'Хойноос "
+"төлөвлөлтийг үүсгэх'-г дарсан дараа энэ төслийн хуулбар төсөл үүсэх болно."
+
+#. module: event_project
+#: view:event.project:0
+#: model:ir.actions.act_window,name:event_project.action_event_project
+msgid "Retro-Planning"
+msgstr "Хойноос-Төлөвлөлт"
+
+#. module: event_project
+#: constraint:event.event:0
+msgid "Error ! Closing Date cannot be set before Beginning Date."
+msgstr "Алдаа ! Хаагдах огноо нь Эхлэх огнооноос өмнө байж болохгүй."
+
+#. module: event_project
+#: field:event.event,project_id:0
+msgid "Project"
+msgstr "Төсөл"
+
+#. module: event_project
+#: field:event.project,project_id:0
+msgid "Template of Project"
+msgstr "Төслийн Үлгэр"
+
+#. module: event_project
+#: view:event.event:0
+msgid "All tasks"
+msgstr "Бүх даалгаврууд"
+
+#. module: event_project
+#: view:event.event:0
+#: model:ir.actions.act_window,name:event_project.act_event_task
+msgid "Tasks"
+msgstr "Даалгаврууд"
+
+#. module: event_project
+#: constraint:event.event:0
+msgid "Error ! You cannot create recursive event."
+msgstr "Алдаа ! Тойрог хамааралтай үйл явдлыг үүсгэж болохгүй."
+
+#. module: event_project
+#: field:event.event,task_ids:0
+msgid "Project tasks"
+msgstr "Төслийн даалгаврууд"
+
+#. module: event_project
+#: view:event.project:0
+msgid "Close"
+msgstr "Хаах"
+
+#. module: event_project
+#: field:event.project,date_start:0
+msgid "Date Start"
+msgstr "Эхлэх огноо"
+
+#. module: event_project
+#: view:event.event:0
+msgid "Create Retro-Planning"
+msgstr "Хойноос төлөвлөлтийг үүсгэх"
+
+#. module: event_project
+#: model:ir.model,name:event_project.model_event_event
+msgid "Event"
+msgstr "Үйл явдал"
+
+#. module: event_project
+#: view:event.event:0
+msgid "Tasks Management"
+msgstr ""
+
+#~ msgid "Tasks management"
+#~ msgstr "Даалгаврын менежмент"
diff --git a/addons/event_project/i18n/nb.po b/addons/event_project/i18n/nb.po
new file mode 100644
index 00000000000..ea1485578a7
--- /dev/null
+++ b/addons/event_project/i18n/nb.po
@@ -0,0 +1,114 @@
+# Norwegian Bokmal 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-02-08 00:36+0000\n"
+"PO-Revision-Date: 2012-09-07 17:58+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Norwegian Bokmal <nb@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-09-08 04:54+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
+
+#. module: event_project
+#: model:ir.model,name:event_project.model_event_project
+msgid "Event Project"
+msgstr "Arrangement Prosjekt"
+
+#. module: event_project
+#: field:event.project,date:0
+msgid "Date End"
+msgstr "Sluttdato"
+
+#. module: event_project
+#: view:event.project:0
+msgid "Ok"
+msgstr "Ok"
+
+#. module: event_project
+#: help:event.project,project_id:0
+msgid ""
+"This is Template Project. Project of event is a duplicate of this Template. "
+"After click on  'Create Retro-planning', New Project will be duplicated from "
+"this template project."
+msgstr ""
+"Dette er ett mal Prosjekt. Prosjektet av arrangementet er en dublett av "
+"denne malen. Etter klikk på \"Create Retro-planlegging\", vil New Project "
+"dupliseres fra denne malen prosjektet."
+
+#. module: event_project
+#: view:event.project:0
+#: model:ir.actions.act_window,name:event_project.action_event_project
+msgid "Retro-Planning"
+msgstr "Retro-Planlegging"
+
+#. module: event_project
+#: constraint:event.event:0
+msgid "Error ! Closing Date cannot be set before Beginning Date."
+msgstr "Feil ! Sluttdato kan ikke settes før startdato."
+
+#. module: event_project
+#: field:event.event,project_id:0
+msgid "Project"
+msgstr "Prosjekt"
+
+#. module: event_project
+#: field:event.project,project_id:0
+msgid "Template of Project"
+msgstr "Mal av prosjekt"
+
+#. module: event_project
+#: view:event.event:0
+msgid "All tasks"
+msgstr "Alle oppgaver"
+
+#. module: event_project
+#: view:event.event:0
+#: model:ir.actions.act_window,name:event_project.act_event_task
+msgid "Tasks"
+msgstr "Oppgaver"
+
+#. module: event_project
+#: constraint:event.event:0
+msgid "Error ! You cannot create recursive event."
+msgstr "Feil! Du kan ikke opprette rekursive hendelse."
+
+#. module: event_project
+#: field:event.event,task_ids:0
+msgid "Project tasks"
+msgstr "Prosjektoppgaver"
+
+#. module: event_project
+#: view:event.project:0
+msgid "Close"
+msgstr "Lukke"
+
+#. module: event_project
+#: field:event.project,date_start:0
+msgid "Date Start"
+msgstr "Startdato"
+
+#. module: event_project
+#: view:event.event:0
+msgid "Create Retro-Planning"
+msgstr "Opprett Retro - planlegging."
+
+#. module: event_project
+#: model:ir.model,name:event_project.model_event_event
+msgid "Event"
+msgstr "Arrangement"
+
+#. module: event_project
+#: view:event.event:0
+msgid "Tasks Management"
+msgstr ""
+
+#~ msgid "Tasks management"
+#~ msgstr "Oppgaver ledelse"
diff --git a/addons/event_project/i18n/nl.po b/addons/event_project/i18n/nl.po
index eedea1f8633..56092dbd7f1 100644
--- a/addons/event_project/i18n/nl.po
+++ b/addons/event_project/i18n/nl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: event_project
 #: model:ir.model,name:event_project.model_event_project
diff --git a/addons/event_project/i18n/nl_BE.po b/addons/event_project/i18n/nl_BE.po
index 21faf8614de..1fa96528f14 100644
--- a/addons/event_project/i18n/nl_BE.po
+++ b/addons/event_project/i18n/nl_BE.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: event_project
 #: model:ir.model,name:event_project.model_event_project
diff --git a/addons/event_project/i18n/pl.po b/addons/event_project/i18n/pl.po
index d77f668b468..38104141993 100644
--- a/addons/event_project/i18n/pl.po
+++ b/addons/event_project/i18n/pl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: event_project
 #: model:ir.model,name:event_project.model_event_project
diff --git a/addons/event_project/i18n/pt.po b/addons/event_project/i18n/pt.po
index 2af48b327b7..c36e73568fc 100644
--- a/addons/event_project/i18n/pt.po
+++ b/addons/event_project/i18n/pt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: event_project
 #: model:ir.model,name:event_project.model_event_project
diff --git a/addons/event_project/i18n/pt_BR.po b/addons/event_project/i18n/pt_BR.po
index 8573243618d..4a24a3fbfc1 100644
--- a/addons/event_project/i18n/pt_BR.po
+++ b/addons/event_project/i18n/pt_BR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: event_project
 #: model:ir.model,name:event_project.model_event_project
diff --git a/addons/event_project/i18n/ro.po b/addons/event_project/i18n/ro.po
index 7f4895a2215..2b269bc039d 100644
--- a/addons/event_project/i18n/ro.po
+++ b/addons/event_project/i18n/ro.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: event_project
 #: model:ir.model,name:event_project.model_event_project
diff --git a/addons/event_project/i18n/ru.po b/addons/event_project/i18n/ru.po
index 34066e462f1..aabb066160e 100644
--- a/addons/event_project/i18n/ru.po
+++ b/addons/event_project/i18n/ru.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: event_project
 #: model:ir.model,name:event_project.model_event_project
diff --git a/addons/event_project/i18n/sl.po b/addons/event_project/i18n/sl.po
index 423cc06f458..9ec34aede14 100644
--- a/addons/event_project/i18n/sl.po
+++ b/addons/event_project/i18n/sl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: event_project
 #: model:ir.model,name:event_project.model_event_project
diff --git a/addons/event_project/i18n/sq.po b/addons/event_project/i18n/sq.po
index fcbd7e03b4f..0fb07fdb5d8 100644
--- a/addons/event_project/i18n/sq.po
+++ b/addons/event_project/i18n/sq.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: event_project
 #: model:ir.model,name:event_project.model_event_project
diff --git a/addons/event_project/i18n/sr.po b/addons/event_project/i18n/sr.po
index 1c058891280..d72f768ec7f 100644
--- a/addons/event_project/i18n/sr.po
+++ b/addons/event_project/i18n/sr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: event_project
 #: model:ir.model,name:event_project.model_event_project
diff --git a/addons/event_project/i18n/sr@latin.po b/addons/event_project/i18n/sr@latin.po
index 922b9dcc091..f9156bf456f 100644
--- a/addons/event_project/i18n/sr@latin.po
+++ b/addons/event_project/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: event_project
 #: model:ir.model,name:event_project.model_event_project
diff --git a/addons/event_project/i18n/sv.po b/addons/event_project/i18n/sv.po
index 947cf08aa9e..7ee71598e19 100644
--- a/addons/event_project/i18n/sv.po
+++ b/addons/event_project/i18n/sv.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: event_project
 #: model:ir.model,name:event_project.model_event_project
diff --git a/addons/event_project/i18n/tlh.po b/addons/event_project/i18n/tlh.po
index 1f5b6ce77a1..05284848a3a 100644
--- a/addons/event_project/i18n/tlh.po
+++ b/addons/event_project/i18n/tlh.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: event_project
 #: model:ir.model,name:event_project.model_event_project
diff --git a/addons/event_project/i18n/tr.po b/addons/event_project/i18n/tr.po
index df9b66c63cd..ae341fc9b3c 100644
--- a/addons/event_project/i18n/tr.po
+++ b/addons/event_project/i18n/tr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: event_project
 #: model:ir.model,name:event_project.model_event_project
diff --git a/addons/event_project/i18n/uk.po b/addons/event_project/i18n/uk.po
index 0c87b46f713..a97691f4289 100644
--- a/addons/event_project/i18n/uk.po
+++ b/addons/event_project/i18n/uk.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: event_project
 #: model:ir.model,name:event_project.model_event_project
diff --git a/addons/event_project/i18n/vi.po b/addons/event_project/i18n/vi.po
index 78c14dc4bd4..92d3909087f 100644
--- a/addons/event_project/i18n/vi.po
+++ b/addons/event_project/i18n/vi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: event_project
 #: model:ir.model,name:event_project.model_event_project
diff --git a/addons/event_project/i18n/zh_CN.po b/addons/event_project/i18n/zh_CN.po
index 4dec256e017..20a0d63c561 100644
--- a/addons/event_project/i18n/zh_CN.po
+++ b/addons/event_project/i18n/zh_CN.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: event_project
 #: model:ir.model,name:event_project.model_event_project
diff --git a/addons/event_project/i18n/zh_TW.po b/addons/event_project/i18n/zh_TW.po
index ad81e8d0a91..764a9d8957f 100644
--- a/addons/event_project/i18n/zh_TW.po
+++ b/addons/event_project/i18n/zh_TW.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2009-01-23 17:18+0000\n"
-"Last-Translator: <>\n"
+"PO-Revision-Date: 2012-08-30 03:32+0000\n"
+"Last-Translator: Bonnie Duan <bonnie.duan@cenoq.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-31 04:56+0000\n"
+"X-Generator: Launchpad (build 15887)\n"
 
 #. module: event_project
 #: model:ir.model,name:event_project.model_event_project
@@ -29,7 +29,7 @@ msgstr "結束日期"
 #. module: event_project
 #: view:event.project:0
 msgid "Ok"
-msgstr ""
+msgstr "確認"
 
 #. module: event_project
 #: help:event.project,project_id:0
@@ -37,13 +37,13 @@ msgid ""
 "This is Template Project. Project of event is a duplicate of this Template. "
 "After click on  'Create Retro-planning', New Project will be duplicated from "
 "this template project."
-msgstr ""
+msgstr "這是模板專案。專案的事件是重複的，這個模板。點擊打造追朔規劃“後，新專案將被複製此模板的專案。"
 
 #. module: event_project
 #: view:event.project:0
 #: model:ir.actions.act_window,name:event_project.action_event_project
 msgid "Retro-Planning"
-msgstr ""
+msgstr "追溯計畫"
 
 #. module: event_project
 #: constraint:event.event:0
@@ -63,23 +63,23 @@ msgstr "專案範本"
 #. module: event_project
 #: view:event.event:0
 msgid "All tasks"
-msgstr ""
+msgstr "所有的工作任務"
 
 #. module: event_project
 #: view:event.event:0
 #: model:ir.actions.act_window,name:event_project.act_event_task
 msgid "Tasks"
-msgstr ""
+msgstr "任務"
 
 #. module: event_project
 #: constraint:event.event:0
 msgid "Error ! You cannot create recursive event."
-msgstr ""
+msgstr "錯誤！您不能創建遞歸的事件"
 
 #. module: event_project
 #: field:event.event,task_ids:0
 msgid "Project tasks"
-msgstr ""
+msgstr "專案任務"
 
 #. module: event_project
 #: view:event.project:0
@@ -94,7 +94,7 @@ msgstr "開始日期"
 #. module: event_project
 #: view:event.event:0
 msgid "Create Retro-Planning"
-msgstr ""
+msgstr "創建追溯計畫"
 
 #. module: event_project
 #: model:ir.model,name:event_project.model_event_event
@@ -104,7 +104,7 @@ msgstr "活動"
 #. module: event_project
 #: view:event.event:0
 msgid "Tasks Management"
-msgstr ""
+msgstr "任務管理"
 
 #~ msgid ""
 #~ "Organization and management of events.\n"
diff --git a/addons/event_sale/__openerp__.py b/addons/event_sale/__openerp__.py
index a0cd3521aa4..484ec43bab3 100644
--- a/addons/event_sale/__openerp__.py
+++ b/addons/event_sale/__openerp__.py
@@ -39,11 +39,9 @@ this event.
 """,
     'author': 'OpenERP SA',
     'depends': ['event', 'sale_crm'],
-    'update_xml': [
-        'event_sale_view.xml',
-    ],
-    'demo_xml': ['event_demo.xml'],
-    'test':['test/confirm.yml'],
+    'data': ['event_sale_view.xml'],
+    'demo': ['event_demo.xml'],
+    'test': ['test/confirm.yml'],
     'installable': True,
     'active': False,
 }
diff --git a/addons/event_sale/event_demo.xml b/addons/event_sale/event_demo.xml
index 3acd3c81f57..c3710623ef5 100644
--- a/addons/event_sale/event_demo.xml
+++ b/addons/event_sale/event_demo.xml
@@ -20,6 +20,7 @@
         <field name="supply_method">produce</field>
         <field name="uom_id" ref="product.product_uom_unit"/>
         <field name="uom_po_id" ref="product.product_uom_unit"/>
+        <field name="image">/9j/4AAQSkZJRgABAQEAZABkAAD/2wBDAAUDBAQEAwUEBAQFBQUGBwwIBwcHBw8LCwkMEQ8SEhEPERETFhwXExQaFRERGCEYGh0dHx8fExciJCIeJBweHx7/2wBDAQUFBQcGBw4ICA4eFBEUHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh7/wAARCAB+AJYDAREAAhEBAxEB/8QAHAAAAQUBAQEAAAAAAAAAAAAAAAMFBgcIBAIB/8QAPxAAAQMDAgMECAMFBwUAAAAAAQIDBAAFEQYSByExE0FRcQgUIjJhgZGhUoKxFUJywdEWFyMkQ2KzJURzksL/xAAUAQEAAAAAAAAAAAAAAAAAAAAA/8QAFBEBAAAAAAAAAAAAAAAAAAAAAP/aAAwDAQACEQMRAD8A2XQFAUBQFAUBQFAUBQFAUBQFAUBQFAUBQFAUBQFAUBQFAUBQFAUBQFAUCUuTHiMKfkyGWGk9VuLCUjzJoGyJqjTkuQI8a/2t50nAQiWgk+Qzz+VA8ZHiKAoCgKAoCgKAoG2RfLdHlLjPPlLiDhQ2mgEXy1K/71oeZxQLIuluX7s1k/moFky4qvdkMn84oFA62ejiD5KoPVAUBQRjiNq+Fo+wrnycOPL9iOznBcX/AEHfQZX1brG8ajnKlXSat3mShsEhDY8Ep7qBlVNb7NstuLLhz2gUOQ8MHvoLl4C8R5aLtH01eJSn40g7IrjhyppfcnP4T0+BxQaEHSgKAoCg4b1doFoiGVcJKGGgcZPUnwA76BtsesLBeJPqsScO3PutuJKSry8aCQA5oIBf9v8AaCYD+IfpQcmwGgiTkLXLIfZZmQJKFKJafdQA4kFRIBCUhJG3aOnjzNB5VcdVoffZbtdplSGmwSy3L2kKPTOeY8/hQKyJur4KWHf2cxM3MArYbdDaw7zJAVnBAAHd86D6nU2pWEFyRpu4JQhBUrs3gTy8OfX4UE94Z3V+7x2prgktokxUPJZfPtN7hnBHcedBNj0oMp+knqN2fr563doextzaWkp7txG5R+4oKldlfGgQ9b59aBysNycj3SM+wsh1t1KkEdxBGKDfSeaQSMUH2gKAoM/+k1eZMO+w4pWpLIi70+GSogn7CgpaHrN9q4NLTKUHEEbCFcxjpig2foa6LvekbXdXBhyTGQtf8WME/UUEQ1I+E6nmoJ7x+lAzyrukOuRoy0FbYJfdUf8ADYA6lR8fh9cUHXbJ9ucjbmbgw8MncvtQckHBoG24aZsF7kPTA8svqcBLjEg+ytIx3HHLwoO+PaIDBgNtvuboJ3ICnNylEoKcqz15ZoHRQGKB20Zyuj3/AIv50EvPSgxT6RUeRb+K96DoKQ+tLzZPekoHP6g0FYPyVZ60CIfJPU0FjcB9NP6q4hW2IEFUVhwSJSscg2g5IPnyHzoNyjpQFAUBQVdx40/pzUlpbjXG7xrbc2gVRluZOQeoIGTgkUGcNGcNU3HVTcSXerfFY7TBfUsjcM/ugjqe7OKDY0aRZNN2WNA9bYYjRmktNJKwVEJGBgDmT5UFF611Ym861kQ7E46e1WA64k4LKMYJJHQnuHWgkDcSPF0xMaaEVlAjOEqko3Ne6clwfvJ8fEZoI1AYhSw/siaPku9in1VLO5C1P4SfbSB7Kep5cxyoHJ7Tr0bcYuj7eoyGVJkdjcFtElQ3KA6dVJAzyOKBNGmUvxz61peTFeLpGYt2XnakFSVbs5ySSMfGgXsdhekz3y8xqK0BtxDiHFXPel1QOSNvPly5560FnaO5XZY8Wj+tBMKCqfSB4WnXltan2ottXmIkpb3HAeR+AnuPgaDHmptN6gsM9cO72mZDeSSMOtEA/EHvHxFA9aA4Z6v1fNbRbbRJTGJ9uW82UMoHjuPXyGTQbJ4R8PLXw/sPqcUh+a9hUqURguK8B4JHcKCbUBQFBzXSYzb7fInSFbWY7anFnwAGTQYk4iaouGotXSZq3VJU6sqIzyQjolI8hQJ2h07E5PMUFx6P4X6h1VZYdwl6w9RtElvIjw2Al5SQSCFr5Z5g8+dB1OaRtemtQybbamlIjtbcFatylHHMk95NBJoLSey2EApIwQe+gWRAgpd7UQ44czneGxn60HVQN94vVstHZ/tGUljtc7MgnOPKg52tUafdRuRdGCPHn/SgetHX+xquxWLtDCS2RlToTz5eNBNHLvbRDflInR3WmGy44W3QrakDJPI0GcNb8bNRXOS4zYli1w8kJUkBTqh4knp5D60Fc3PWGpZruJeoLs+euFTF4HkM4FA66Z4kawsb6Fxr5NdbSebUl0vII8MKzj5YoNWcONTtau0lDvTbXZKdBS63nOxaThQ8sigkdAUBQV16Qt2Nt4cyGkKwqY6lk+O33lfpj50GZnLGGND269vI/wAxd57qmyR/osjby81qV/6igbIqwh0p+NBrngS923C20HvR2qT8nV0DFq8gavmk/wC39KDzHfSlI50HQmU3nrQLJcQeeaCA8a0g2iC+kn2H1JOPiKDxZNIWmdZoclK32y40lSil5XM/pQdK9D23ACJUjPeS7z/SgTctUfSVkv01qU8sy7VIi7VqBG5ScpPTxT96CjQQRmgb1qCpisd1B0o6ig0j6J91L9hutmWcmI8l9H8LgIx9UE/Ogu2gKAoKO9LFco2iyx2I7zodddSkNoKtyyEgDl3+FBC+MkFdiiaXsLkd1LdstKEqUEHap1XNzB6HmPvQVU24V7nkjCAeqiBQay9HAPf3XRe1QUpMh0tE9Fp3dR8M5HyoLDXHYWoqWy2pR6koBNB5MSKesZg+bYoGd2DED91mertewz2afYGBtSSfuaDpsduiosUJpyM0pQjISpSkAknaOZPjQVvxztrKOFKlNMoDkSWkFQT7RGSOZ+YoGLhzLS9o2BhSApKNvM+BxQPNxuEWBEMmY+w02nAKldM92KCtOMmr7bJsrVst8huQt1YccUg+4B0Hmf5UFSGUlLfMjlQIwV9otTh/e50DpGYkPjczHedSORLbZUB9KC7vRVQ9D1BenZaVRmTDaSC8Nm5W9XTPXkDQaIZfZeBLLrbgHXYoHH0oFKAoPDjTbm3tEJXtO5O4ZwfEfGgo/wBKxzZEs4z0Q+f+OgzM+r/IoH4lqI/Sg3Pwst5tfDqwQVDapuC0VDwUpO4j6k0EloPh6ZoG19J/YM1eMKcadV9QcUDiykIZQkdAkAUEE4xxDI4c6kYSklXZpeQAM89wzQZitUzVkWImNbnrg2ynO1LbTmBk5/DQSXV1xud50pHgCx3IS2dq3Hi2ohwgYPLFBTt2dlBZBaWDnHMGg5ZcafGKGpkd5hx1AWlLiSklB6HB7jQdyP8ABjDu8aC3NHRHW9OQWG1rRlsOr28txVz5/LFA8pt7hVlS3D5qNBaXBBlTX7SBJx7HU+dBZlAUBmgoP0t1hMWznP8ApyP1boKB0va13vUthsiASZchtKsdySrKj8hQbzaU000ltOAlIAAHcBQejIb/ABUCUmW2lhZBydpxQIyX2RBUwFfuBH8qDoTLZwBuoG6+Nrmx3Y8Z5lCpDRaV2qNySnvBHxBxQUzA4ei43G4i2smMuFILZWxMUhLijnmARju7/GgQv+ltUWNltbs6Uhpa9iMqS7k+GQaBum6F19EYkXl1uIyiOhTynFttqcCQMk8+ZNBVHEJqcvUDci5zW5sh6MhztEbeQOcAhPIEeFBHpCCY5AFBdmhZ9vkaehqVLjoWGUIUlTgBBCQOlBIm3IbjoZaktOOlW0IQoKUSe7A76C0uF9ufhWyS8+ytpT7g2hacEgDr96CX0HO4p3ngUHM85IHROaCnPSH03ftUxICLcy1uZDiSFrxndt5/agi/CTh5d7BrmPe7k2y6I0cpjtoJ5KIwVE+WfrQX2zJeUPbYUD50C6VZ6tn60A4lKk+4rqKD0ppsjHZk/Og9pab7msfOgFJbSpKyjARlR591AwcNG/8AosiYpGVS5jrufhnb/I0CfFIhVstw24HrqMn50FB8b+Ldw1BcZNjsspUeyMktktnCpRHUqP4fAfWgqhLqFoClrGcnOTQekvx/d7VH1oFbcmMu6Q0IWklT6Bgd/MUE40q/Pd1PMeskd2TPRd2VMobSSdwXkfLlzPTFBssYzQfaD4Ug0Hktg0HJOgofSAoA4oEmbc2hSFBIymg7BGR4UB6unwFAdgMYxQfeyAoPvZjwoOG/rTGsc+QeWyOsg/lOKDm0TE9V0pbWiMK7BK1D4q9o/c0Eb45+xol1Y5FO9WfyKoMLXOYtcgoSojJ50DtpV2yt3JEa9tKLLiNwUXNoSru7qCwzYtLpSHRYt6e5RcVg0DpZGLA2pBhacjmSk5TtSpxWR3gAZoJYzP1La4i7pFs78COwk7n0RlNhIJAOenU4oLd4WNX5y1Lul9nOvLlY7BpSwQhA7+XeTQTOgKAoCgMUBQBNB5KhQeVLxQeC8PGgYNev7tLS2EKwt8oZT5qUBQPDD7TLDbSeSUJCQPIUEF47PpXoCXtPMIX/AMaqDEEKJ61eGGzzDjqUn5mgdtYWfsddXC17doRNLSR/t3YH2IoNtcJI8EaFh5YaWpTjm8qQDkhZT/8AIHyoGXQMBpnXcxaW0J7N2SeQxjc4cUFhX6CzdrJNtr2OzlMLaPwyCM0Ef4SSnH9HMMP8n4i1MOJ8Ck4P3zQS+gKAoCgKD4TQeCaBJSjQIuKOKDmdWRmgjWq5ILlujLVgLlpWfygn+lApIuhT0NBDeJkp656VlwWRudcQpKE56kpOKDLFlaXF1LEalsONrTIRuQpJB94UFkcQrC5L4pNXyCkPQpbzbjuDzbUnGcjw9kUF0cH7tIhaLjRriksSO2fcKFHmAt1Sh9jQPWmJDaNU3N9KgQrmkj44JoJi1OCse1QR3SaxbtYX63g7WpCkzGh/F733B+tBMkvg99AvQFAUBQfCM0HhQoE1JoEHE8qDleFAyXiM247HU4kK2r5ZHwoOGZCQQcHFBFtSQ1tsb0LT73fQRI2pl2UlxaGyvPvFOT9aDzcowadKxjkcCgerWVhhHtc8UDlZXltzXSCcnrQS2DLcOBk0CUx0s6qtUtPvPJcjr+IxuH6UEtZcVtoP/9k=</field>
     </record>
     </data>
 </openerp>
diff --git a/addons/event_sale/event_sale.py b/addons/event_sale/event_sale.py
index 681116d064e..1d7a30ee2ee 100644
--- a/addons/event_sale/event_sale.py
+++ b/addons/event_sale/event_sale.py
@@ -88,5 +88,5 @@ class sale_order_line(osv.osv):
                 }
                 registration_id = registration_obj.create(cr, uid, dic, context=context)
                 message = _("The registration %s has been created from the Sale Order %s.") % (registration_id, order_line.order_id.name)
-                registration_obj.message_append_note(cr, uid, [registration_id], body=message, context=context)
+                registration_obj.message_post(cr, uid, [registration_id], body=message, context=context)
         return super(sale_order_line, self).button_confirm(cr, uid, ids, context=context)
diff --git a/addons/event_sale/event_sale_view.xml b/addons/event_sale/event_sale_view.xml
index 82c1c05b714..c39cff04bd9 100644
--- a/addons/event_sale/event_sale_view.xml
+++ b/addons/event_sale/event_sale_view.xml
@@ -8,8 +8,9 @@
              <field name="arch" type="xml">
                 <field name="purchase_ok" position="after">
                     <field name="event_ok" on_change="onchange_event_ok(event_ok, context)"/>
+                    <label for="event_ok"/>
                 </field>
-                <field name='supply_method' position='after'>
+                <field name='default_code' position='before'>
                     <field name="event_type_id" attrs="{'readonly': [('event_ok', '=', False)]}"/>
                 </field>
              </field>
diff --git a/addons/fetchmail/__openerp__.py b/addons/fetchmail/__openerp__.py
index 1e8c57a9524..3bfcf4d95a3 100644
--- a/addons/fetchmail/__openerp__.py
+++ b/addons/fetchmail/__openerp__.py
@@ -21,12 +21,12 @@
 ##############################################################################
 
 {
-    "name" : "Email Gateway",
-    "version" : "1.0",
-    "depends" : ["base", 'mail'],
-    "author" : "OpenERP SA",
-    "category": 'Tools',
-    "description": """
+    'name' : 'Email Gateway',
+    'version' : '1.0',
+    'depends' : ['base', 'mail'],
+    'author' : 'OpenERP SA',
+    'category': 'Tools',
+    'description': """
 Retrieve incoming email on POP/IMAP servers.
 ============================================
 
@@ -35,9 +35,8 @@ these accounts will be automatically downloaded into your OpenERP system. All
 POP3/IMAP-compatible servers are supported, included those that require an
 encrypted SSL/TLS connection.
 
-This can be used to easily create email-based workflows for many email-enabled
-OpenERP documents, such as:
-
+This can be used to easily create email-based workflows for many email-enabled OpenERP documents, such as:
+----------------------------------------------------------------------------------------------------------
     * CRM Leads/Opportunities
     * CRM Claims
     * Project Issues
@@ -56,16 +55,13 @@ For more specific needs, you may also assign custom-defined actions
 (technically: Server Actions) to be triggered for each incoming mail.
     """,
     'website': 'http://www.openerp.com',
-    'init_xml': [],
-    'update_xml': [
-        "fetchmail_view.xml",
-        "fetchmail_data.xml",
+    'data': [
+        'fetchmail_view.xml',
+        'fetchmail_data.xml',
         'security/ir.model.access.csv',
         'fetchmail_installer_view.xml'
     ],
-    'demo_xml': [
-
-    ],
+    'demo': [],
     'installable': True,
     'auto_install': False,
     'certificate' : '00692978332890137453',
diff --git a/addons/fetchmail/fetchmail.py b/addons/fetchmail/fetchmail.py
index 544a4f81b96..70a05c6bd0e 100644
--- a/addons/fetchmail/fetchmail.py
+++ b/addons/fetchmail/fetchmail.py
@@ -77,7 +77,7 @@ class fetchmail_server(osv.osv):
                                                                                              "emails to the existing conversations (documents)."),
         'priority': fields.integer('Server Priority', readonly=True, states={'draft':[('readonly', False)]}, help="Defines the order of processing, "
                                                                                                                   "lower values mean higher priority"),
-        'message_ids': fields.one2many('mail.message', 'fetchmail_server_id', 'Messages', readonly=True),
+        'message_ids': fields.one2many('mail.mail', 'fetchmail_server_id', 'Messages', readonly=True),
         'configuration' : fields.text('Configuration'),
         'script' : fields.char('Script', readonly=True, size=64),
     }
@@ -232,8 +232,8 @@ openerp_mailgate.py -u %(uid)d -p PASSWORD -o %(model)s -d %(dbname)s --host=HOS
             server.write({'date': time.strftime(tools.DEFAULT_SERVER_DATETIME_FORMAT)})
         return True
 
-class mail_message(osv.osv):
-    _inherit = "mail.message"
+class mail_mail(osv.osv):
+    _inherit = "mail.mail"
     _columns = {
         'fetchmail_server_id': fields.many2one('fetchmail.server', "Inbound Mail Server",
                                                readonly=True,
@@ -247,7 +247,7 @@ class mail_message(osv.osv):
         fetchmail_server_id = context.get('fetchmail_server_id')
         if fetchmail_server_id:
             values['fetchmail_server_id'] = fetchmail_server_id
-        res = super(mail_message,self).create(cr, uid, values, context=context)
+        res = super(mail_mail,self).create(cr, uid, values, context=context)
         return res
 
     def write(self, cr, uid, ids, values, context=None):
@@ -256,7 +256,7 @@ class mail_message(osv.osv):
         fetchmail_server_id = context.get('fetchmail_server_id')
         if fetchmail_server_id:
             values['fetchmail_server_id'] = server_id
-        res = super(mail_message,self).write(cr, uid, ids, values, context=context)
+        res = super(mail_mail,self).write(cr, uid, ids, values, context=context)
         return res
 
 
diff --git a/addons/fetchmail/fetchmail_view.xml b/addons/fetchmail/fetchmail_view.xml
index cf651b5fd3d..3cdc886ba2b 100644
--- a/addons/fetchmail/fetchmail_view.xml
+++ b/addons/fetchmail/fetchmail_view.xml
@@ -104,27 +104,16 @@
         />
 
       <record model="ir.ui.view" id="email_message_tree_view">
-          <field name="name">mail.message.list.fetchmail</field>
-          <field name="model">mail.message</field>
-          <field name="inherit_id" ref="mail.view_email_message_tree"/>
+          <field name="name">mail.mail.form.fetchmail</field>
+          <field name="model">mail.mail</field>
+          <field name="inherit_id" ref="mail.view_mail_form"/>
           <field name="arch" type="xml">
-              <field name="user_id" position="after">
+              <field name="references" position="after">
                   <field name="fetchmail_server_id"/>
               </field>
           </field>
       </record>
 
-      <record model="ir.ui.view" id="email_message_search_view">
-          <field name="name">mail.message.inherit.search</field>
-          <field name="model">mail.message</field>
-          <field name="inherit_id" ref="mail.view_email_message_search"/>
-          <field name="arch" type="xml">
-            <xpath expr="/search/group/filter[@string='Thread']" position="before">
-                <filter string="Mail Server" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'fetchmail_server_id'}"/>
-            </xpath>
-          </field>
-      </record>
-
       <act_window
             context="{'search_default_server_id': active_id, 'default_fetchmail_server_id': active_id}"
             id="act_server_history" name="Messages" domain="[('email_from', '!=', False), ('fetchmail_server_id', '=', active_id)]"
diff --git a/addons/fetchmail/i18n/ar.po b/addons/fetchmail/i18n/ar.po
index 02433f440f0..ffdaf6143c5 100644
--- a/addons/fetchmail/i18n/ar.po
+++ b/addons/fetchmail/i18n/ar.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:57+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: fetchmail
 #: selection:fetchmail.server,state:0
diff --git a/addons/fetchmail/i18n/bg.po b/addons/fetchmail/i18n/bg.po
index c5eb7c5a44f..932dcf99845 100644
--- a/addons/fetchmail/i18n/bg.po
+++ b/addons/fetchmail/i18n/bg.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:57+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: fetchmail
 #: selection:fetchmail.server,state:0
diff --git a/addons/fetchmail/i18n/ca.po b/addons/fetchmail/i18n/ca.po
index c2a988a1901..8fd57dc55d5 100644
--- a/addons/fetchmail/i18n/ca.po
+++ b/addons/fetchmail/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:57+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: fetchmail
 #: selection:fetchmail.server,state:0
diff --git a/addons/fetchmail/i18n/da.po b/addons/fetchmail/i18n/da.po
index e100b324619..2b8d0dcfa39 100644
--- a/addons/fetchmail/i18n/da.po
+++ b/addons/fetchmail/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:57+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: fetchmail
 #: selection:fetchmail.server,state:0
diff --git a/addons/fetchmail/i18n/de.po b/addons/fetchmail/i18n/de.po
index ed78821a00a..4317544b430 100644
--- a/addons/fetchmail/i18n/de.po
+++ b/addons/fetchmail/i18n/de.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:57+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: fetchmail
 #: selection:fetchmail.server,state:0
diff --git a/addons/fetchmail/i18n/el.po b/addons/fetchmail/i18n/el.po
index 3b0c95d2464..74fc6c0df0c 100644
--- a/addons/fetchmail/i18n/el.po
+++ b/addons/fetchmail/i18n/el.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:57+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: fetchmail
 #: selection:fetchmail.server,state:0
diff --git a/addons/fetchmail/i18n/en_GB.po b/addons/fetchmail/i18n/en_GB.po
index 51747757b22..785fadf21b1 100644
--- a/addons/fetchmail/i18n/en_GB.po
+++ b/addons/fetchmail/i18n/en_GB.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:57+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: fetchmail
 #: selection:fetchmail.server,state:0
diff --git a/addons/fetchmail/i18n/es.po b/addons/fetchmail/i18n/es.po
index a5fdef5a3e0..b42da3f6cc5 100644
--- a/addons/fetchmail/i18n/es.po
+++ b/addons/fetchmail/i18n/es.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:57+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: fetchmail
 #: selection:fetchmail.server,state:0
diff --git a/addons/fetchmail/i18n/es_CR.po b/addons/fetchmail/i18n/es_CR.po
index 5483228cf7d..010d6d3e260 100644
--- a/addons/fetchmail/i18n/es_CR.po
+++ b/addons/fetchmail/i18n/es_CR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:57+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 "Language: es\n"
 
 #. module: fetchmail
diff --git a/addons/fetchmail/i18n/et.po b/addons/fetchmail/i18n/et.po
index 63761cd852a..38baac7e9d6 100644
--- a/addons/fetchmail/i18n/et.po
+++ b/addons/fetchmail/i18n/et.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:57+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: fetchmail
 #: selection:fetchmail.server,state:0
diff --git a/addons/fetchmail/i18n/fi.po b/addons/fetchmail/i18n/fi.po
index f9839235091..187dbb9de71 100644
--- a/addons/fetchmail/i18n/fi.po
+++ b/addons/fetchmail/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:57+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: fetchmail
 #: selection:fetchmail.server,state:0
diff --git a/addons/fetchmail/i18n/fr.po b/addons/fetchmail/i18n/fr.po
index 6481d741ada..59e140a6aa8 100644
--- a/addons/fetchmail/i18n/fr.po
+++ b/addons/fetchmail/i18n/fr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:57+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: fetchmail
 #: selection:fetchmail.server,state:0
diff --git a/addons/fetchmail/i18n/gl.po b/addons/fetchmail/i18n/gl.po
index aabcae6dea5..cbdc063ed84 100644
--- a/addons/fetchmail/i18n/gl.po
+++ b/addons/fetchmail/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:57+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: fetchmail
 #: selection:fetchmail.server,state:0
diff --git a/addons/fetchmail/i18n/hr.po b/addons/fetchmail/i18n/hr.po
index 49701e03c33..b4dec5f89b3 100644
--- a/addons/fetchmail/i18n/hr.po
+++ b/addons/fetchmail/i18n/hr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:57+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: fetchmail
 #: selection:fetchmail.server,state:0
diff --git a/addons/fetchmail/i18n/hu.po b/addons/fetchmail/i18n/hu.po
index a0f8aeb1655..80bca3399ae 100644
--- a/addons/fetchmail/i18n/hu.po
+++ b/addons/fetchmail/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:57+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: fetchmail
 #: selection:fetchmail.server,state:0
diff --git a/addons/fetchmail/i18n/it.po b/addons/fetchmail/i18n/it.po
index 7066ff9cdba..4b44b893b67 100644
--- a/addons/fetchmail/i18n/it.po
+++ b/addons/fetchmail/i18n/it.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:57+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: fetchmail
 #: selection:fetchmail.server,state:0
diff --git a/addons/fetchmail/i18n/ja.po b/addons/fetchmail/i18n/ja.po
index fa5535c5174..3545b0a9929 100644
--- a/addons/fetchmail/i18n/ja.po
+++ b/addons/fetchmail/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:57+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: fetchmail
 #: selection:fetchmail.server,state:0
diff --git a/addons/fetchmail/i18n/lt.po b/addons/fetchmail/i18n/lt.po
index 82df0314d33..7d63dd80c30 100644
--- a/addons/fetchmail/i18n/lt.po
+++ b/addons/fetchmail/i18n/lt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:57+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: fetchmail
 #: selection:fetchmail.server,state:0
diff --git a/addons/fetchmail/i18n/lv.po b/addons/fetchmail/i18n/lv.po
index a13aea17ef8..675d47aba73 100644
--- a/addons/fetchmail/i18n/lv.po
+++ b/addons/fetchmail/i18n/lv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:57+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: fetchmail
 #: selection:fetchmail.server,state:0
diff --git a/addons/fetchmail/i18n/mn.po b/addons/fetchmail/i18n/mn.po
index 91bed8ff2cb..7f5119d8fcf 100644
--- a/addons/fetchmail/i18n/mn.po
+++ b/addons/fetchmail/i18n/mn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:57+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: fetchmail
 #: selection:fetchmail.server,state:0
diff --git a/addons/fetchmail/i18n/nb.po b/addons/fetchmail/i18n/nb.po
new file mode 100644
index 00000000000..b5a6c409b79
--- /dev/null
+++ b/addons/fetchmail/i18n/nb.po
@@ -0,0 +1,335 @@
+# Norwegian Bokmal 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-02-08 00:36+0000\n"
+"PO-Revision-Date: 2012-09-08 18:59+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Norwegian Bokmal <nb@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-09-09 04:52+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
+
+#. module: fetchmail
+#: selection:fetchmail.server,state:0
+msgid "Confirmed"
+msgstr "Bekreftet"
+
+#. module: fetchmail
+#: field:fetchmail.server,server:0
+msgid "Server Name"
+msgstr "Tjener navn"
+
+#. module: fetchmail
+#: field:fetchmail.server,script:0
+msgid "Script"
+msgstr "Manus"
+
+#. module: fetchmail
+#: help:fetchmail.server,priority:0
+msgid "Defines the order of processing, lower values mean higher priority"
+msgstr ""
+"Definerer rekkefølgen av behandlingen, lavere verdier betyr høyere prioritet."
+
+#. 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 ""
+"Tilkoblinger er kryptert med SSL / TLS gjennom en egen port (standard: IMAPS "
+"= 993, POP3S = 995)"
+
+#. module: fetchmail
+#: field:fetchmail.server,attach:0
+msgid "Keep Attachments"
+msgstr "Hold Vedlegg"
+
+#. 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 ""
+"Om en full original kopi av hver e-post bør holdes for referenceand festet "
+"til hver bearbeidet melding. Dette vil vanligvis doble størrelsen på "
+"meldingen database."
+
+#. module: fetchmail
+#: field:fetchmail.server,priority:0
+msgid "Server Priority"
+msgstr "Tjener prioritet."
+
+#. module: fetchmail
+#: field:fetchmail.server,state:0
+msgid "State"
+msgstr "Stat"
+
+#. module: fetchmail
+#: view:fetchmail.server:0
+msgid "POP"
+msgstr "POP"
+
+#. module: fetchmail
+#: view:fetchmail.server:0
+msgid "Fetch Now"
+msgstr "Hente nå."
+
+#. 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 "Innkommende Mail Tjenere."
+
+#. module: fetchmail
+#: field:fetchmail.server,port:0
+msgid "Port"
+msgstr "Port"
+
+#. module: fetchmail
+#: view:fetchmail.server:0
+msgid "POP/IMAP Servers"
+msgstr "POP/IMAP tjenere."
+
+#. module: fetchmail
+#: selection:fetchmail.server,type:0
+msgid "Local Server"
+msgstr "Lokal tjener."
+
+#. module: fetchmail
+#: field:fetchmail.server,user:0
+msgid "Username"
+msgstr "Brukernavn:"
+
+#. module: fetchmail
+#: model:ir.model,name:fetchmail.model_fetchmail_server
+msgid "POP/IMAP Server"
+msgstr "POP/IMAP Tjener."
+
+#. module: fetchmail
+#: view:fetchmail.server:0
+msgid "Reset Confirmation"
+msgstr "Tilbakestille Bekreftelse."
+
+#. module: fetchmail
+#: view:fetchmail.server:0
+msgid "SSL"
+msgstr "SSL"
+
+#. module: fetchmail
+#: model:ir.model,name:fetchmail.model_mail_message
+msgid "Email Message"
+msgstr "E-post Melding."
+
+#. module: fetchmail
+#: field:fetchmail.server,date:0
+msgid "Last Fetch Date"
+msgstr "Siste Hente Dato."
+
+#. 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 ""
+"Ekstra tilpasset server tiltak for å utløse for hver innkommende e-post, på "
+"plata som ble opprettet eller oppdatert i denne posten."
+
+#. module: fetchmail
+#: view:fetchmail.server:0
+msgid "# of emails"
+msgstr "# Av e-post."
+
+#. module: fetchmail
+#: field:fetchmail.server,original:0
+msgid "Keep Original"
+msgstr "Hold Original"
+
+#. module: fetchmail
+#: code:addons/fetchmail/fetchmail.py:155
+#, python-format
+msgid ""
+"Here is what we got instead:\n"
+" %s"
+msgstr ""
+"Her er hva vi fikk i stedet:\n"
+"  % s"
+
+#. module: fetchmail
+#: view:fetchmail.server:0
+#: field:fetchmail.server,configuration:0
+msgid "Configuration"
+msgstr "Konfigurasjon"
+
+#. module: fetchmail
+#: view:fetchmail.server:0
+msgid "Incoming Mail Server"
+msgstr "Innkommende E-post tjener."
+
+#. module: fetchmail
+#: code:addons/fetchmail/fetchmail.py:155
+#, python-format
+msgid "Connection test failed!"
+msgstr "Tilkoblingen var mislykket!"
+
+#. module: fetchmail
+#: help:fetchmail.server,server:0
+msgid "Hostname or IP of the mail server"
+msgstr "Vertsnavn eller IP for e-postserveren."
+
+#. module: fetchmail
+#: view:fetchmail.server:0
+msgid "Server type IMAP."
+msgstr "Tjener type IMAP."
+
+#. module: fetchmail
+#: field:fetchmail.server,name:0
+msgid "Name"
+msgstr "Navn"
+
+#. module: fetchmail
+#: field:fetchmail.server,is_ssl:0
+msgid "SSL/TLS"
+msgstr "SSL/TLS"
+
+#. module: fetchmail
+#: view:fetchmail.server:0
+msgid "Test & Confirm"
+msgstr "Test & Bekreft"
+
+#. module: fetchmail
+#: field:fetchmail.server,action_id:0
+msgid "Server Action"
+msgstr "Tjenerhandling"
+
+#. module: fetchmail
+#: field:mail.message,fetchmail_server_id:0
+msgid "Inbound Mail Server"
+msgstr "Inngående E-post tjener."
+
+#. module: fetchmail
+#: field:fetchmail.server,message_ids:0
+#: model:ir.actions.act_window,name:fetchmail.act_server_history
+msgid "Messages"
+msgstr "Meldinger"
+
+#. module: fetchmail
+#: view:fetchmail.server:0
+msgid "Search Incoming Mail Servers"
+msgstr "Søk innkommende post tjenere."
+
+#. module: fetchmail
+#: field:fetchmail.server,active:0
+msgid "Active"
+msgstr "Aktiv"
+
+#. 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 ""
+"Om vedlegg skal lastes ned. Hvis ikke er aktivert, vil innkommende e-post "
+"blir fratatt eventuelle vedlegg før de behandles."
+
+#. module: fetchmail
+#: view:fetchmail.server:0
+msgid "Advanced Options"
+msgstr ""
+
+#. module: fetchmail
+#: selection:fetchmail.server,type:0
+msgid "IMAP Server"
+msgstr "IMAP-tjener"
+
+#. module: fetchmail
+#: view:fetchmail.server:0
+msgid "IMAP"
+msgstr "IMAP"
+
+#. module: fetchmail
+#: view:fetchmail.server:0
+msgid "Server type POP."
+msgstr "Tjener type POP."
+
+#. module: fetchmail
+#: field:fetchmail.server,password:0
+msgid "Password"
+msgstr "Passord:"
+
+#. module: fetchmail
+#: view:fetchmail.server:0
+msgid "Actions to Perform on Incoming Mails"
+msgstr "Tiltak for å utføre på innkommende post."
+
+#. module: fetchmail
+#: field:fetchmail.server,type:0
+msgid "Server Type"
+msgstr "Tjener Type."
+
+#. module: fetchmail
+#: view:fetchmail.server:0
+msgid "Login Information"
+msgstr "Inn loggings informasjon."
+
+#. module: fetchmail
+#: view:fetchmail.server:0
+msgid "Server Information"
+msgstr "Tjenerinformasjon"
+
+#. module: fetchmail
+#: view:fetchmail.server:0
+msgid "If SSL required."
+msgstr "Hvis SSL nødvendig."
+
+#. module: fetchmail
+#: view:fetchmail.server:0
+msgid "Advanced"
+msgstr "Avansert"
+
+#. module: fetchmail
+#: view:fetchmail.server:0
+msgid "Server & Login"
+msgstr "Tjener og Logg inn."
+
+#. 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 ""
+"Behandle hver innkommende post som del av en samtale tilsvarende denne "
+"dokumenttypen. Dette vil skape nye dokumenter for nye samtaler, eller legge "
+"oppfølging e-post til de eksisterende samtaler (dokumenter)."
+
+#. module: fetchmail
+#: field:fetchmail.server,object_id:0
+msgid "Create a New Record"
+msgstr "Oppretter en ny oppføring."
+
+#. module: fetchmail
+#: selection:fetchmail.server,state:0
+msgid "Not Confirmed"
+msgstr "Ikke bekreftet."
+
+#. module: fetchmail
+#: selection:fetchmail.server,type:0
+msgid "POP Server"
+msgstr "POP tjener."
+
+#. module: fetchmail
+#: view:mail.message:0
+msgid "Mail Server"
+msgstr "E-posttjener"
+
+#~ msgid "Advanced options"
+#~ msgstr "Avanserte alternativer"
diff --git a/addons/fetchmail/i18n/nl.po b/addons/fetchmail/i18n/nl.po
index 762de66b43f..005ec9c4274 100644
--- a/addons/fetchmail/i18n/nl.po
+++ b/addons/fetchmail/i18n/nl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:57+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: fetchmail
 #: selection:fetchmail.server,state:0
diff --git a/addons/fetchmail/i18n/pl.po b/addons/fetchmail/i18n/pl.po
index e03a62c6d93..b2e262784da 100644
--- a/addons/fetchmail/i18n/pl.po
+++ b/addons/fetchmail/i18n/pl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:57+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: fetchmail
 #: selection:fetchmail.server,state:0
diff --git a/addons/fetchmail/i18n/pt.po b/addons/fetchmail/i18n/pt.po
index 6b71ea2bb59..b8af0df7c7b 100644
--- a/addons/fetchmail/i18n/pt.po
+++ b/addons/fetchmail/i18n/pt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:57+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: fetchmail
 #: selection:fetchmail.server,state:0
diff --git a/addons/fetchmail/i18n/pt_BR.po b/addons/fetchmail/i18n/pt_BR.po
index 4454f778eb9..7631191c8ab 100644
--- a/addons/fetchmail/i18n/pt_BR.po
+++ b/addons/fetchmail/i18n/pt_BR.po
@@ -9,13 +9,14 @@ msgstr ""
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:36+0000\n"
 "PO-Revision-Date: 2012-07-28 22:38+0000\n"
-"Last-Translator: Fábio Martinelli <webmaster@guaru.net>\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: 2012-08-09 04:57+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: fetchmail
 #: selection:fetchmail.server,state:0
diff --git a/addons/fetchmail/i18n/ro.po b/addons/fetchmail/i18n/ro.po
index ea90ab4e12d..c129aafd8c8 100644
--- a/addons/fetchmail/i18n/ro.po
+++ b/addons/fetchmail/i18n/ro.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:57+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: fetchmail
 #: selection:fetchmail.server,state:0
diff --git a/addons/fetchmail/i18n/ru.po b/addons/fetchmail/i18n/ru.po
index 13eedc91a61..6b48d2027bf 100644
--- a/addons/fetchmail/i18n/ru.po
+++ b/addons/fetchmail/i18n/ru.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:57+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: fetchmail
 #: selection:fetchmail.server,state:0
diff --git a/addons/fetchmail/i18n/sl.po b/addons/fetchmail/i18n/sl.po
index f92973e54e9..bdd17693db6 100644
--- a/addons/fetchmail/i18n/sl.po
+++ b/addons/fetchmail/i18n/sl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:57+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: fetchmail
 #: selection:fetchmail.server,state:0
diff --git a/addons/fetchmail/i18n/sr.po b/addons/fetchmail/i18n/sr.po
index ed2232fca1e..b7b64e92867 100644
--- a/addons/fetchmail/i18n/sr.po
+++ b/addons/fetchmail/i18n/sr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:57+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: fetchmail
 #: selection:fetchmail.server,state:0
diff --git a/addons/fetchmail/i18n/sr@latin.po b/addons/fetchmail/i18n/sr@latin.po
index e1f9053bae9..ad87b56076b 100644
--- a/addons/fetchmail/i18n/sr@latin.po
+++ b/addons/fetchmail/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:57+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: fetchmail
 #: selection:fetchmail.server,state:0
diff --git a/addons/fetchmail/i18n/sv.po b/addons/fetchmail/i18n/sv.po
index dbc3651bdcb..39d6f253494 100644
--- a/addons/fetchmail/i18n/sv.po
+++ b/addons/fetchmail/i18n/sv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:57+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: fetchmail
 #: selection:fetchmail.server,state:0
diff --git a/addons/fetchmail/i18n/tr.po b/addons/fetchmail/i18n/tr.po
index 24f71adcc74..cd8db66335b 100644
--- a/addons/fetchmail/i18n/tr.po
+++ b/addons/fetchmail/i18n/tr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:57+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: fetchmail
 #: selection:fetchmail.server,state:0
diff --git a/addons/fetchmail/i18n/vi.po b/addons/fetchmail/i18n/vi.po
index 9a7a7d4228e..96a1bdc7108 100644
--- a/addons/fetchmail/i18n/vi.po
+++ b/addons/fetchmail/i18n/vi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:57+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: fetchmail
 #: selection:fetchmail.server,state:0
diff --git a/addons/fetchmail/i18n/zh_CN.po b/addons/fetchmail/i18n/zh_CN.po
index fe94ff020b8..ddea1f2a142 100644
--- a/addons/fetchmail/i18n/zh_CN.po
+++ b/addons/fetchmail/i18n/zh_CN.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:57+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: fetchmail
 #: selection:fetchmail.server,state:0
diff --git a/addons/google_base_account/__openerp__.py b/addons/google_base_account/__openerp__.py
index 9dc4a233dcb..b4d996f2807 100644
--- a/addons/google_base_account/__openerp__.py
+++ b/addons/google_base_account/__openerp__.py
@@ -24,16 +24,18 @@
     'name': 'Google Users',
     'version': '1.0',
     'category': 'Tools',
-    'description': """The module adds google user in res user.""",
+    'description': """
+The module adds google user in res user.
+========================================
+""",
     'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
     'depends': ['base'],
-    'init_xml': [],
-    'update_xml': [
-                  'google_base_account_view.xml',
-                  'wizard/google_login_view.xml',
-                   ],
-    'demo_xml': [],
+    'data': [
+        'google_base_account_view.xml',
+        'wizard/google_login_view.xml',
+    ],
+    'demo': [],
     'installable': True,
     'auto_install': False,
 }
diff --git a/addons/google_base_account/i18n/ar.po b/addons/google_base_account/i18n/ar.po
index 5f486db31ae..e54964a9665 100644
--- a/addons/google_base_account/i18n/ar.po
+++ b/addons/google_base_account/i18n/ar.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:43+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: google_base_account
 #: field:res.users,gmail_user:0
diff --git a/addons/google_base_account/i18n/de.po b/addons/google_base_account/i18n/de.po
index 6a5090f22ed..dc9eace16ba 100644
--- a/addons/google_base_account/i18n/de.po
+++ b/addons/google_base_account/i18n/de.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:43+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: google_base_account
 #: field:res.users,gmail_user:0
diff --git a/addons/google_base_account/i18n/es_CR.po b/addons/google_base_account/i18n/es_CR.po
index acbc66c7e66..3f9b02968d0 100644
--- a/addons/google_base_account/i18n/es_CR.po
+++ b/addons/google_base_account/i18n/es_CR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:43+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: google_base_account
 #: field:res.users,gmail_user:0
diff --git a/addons/google_base_account/i18n/fi.po b/addons/google_base_account/i18n/fi.po
index 0e8231c4e38..55b4195267d 100644
--- a/addons/google_base_account/i18n/fi.po
+++ b/addons/google_base_account/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:43+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: google_base_account
 #: field:res.users,gmail_user:0
diff --git a/addons/google_base_account/i18n/fr.po b/addons/google_base_account/i18n/fr.po
index 882dc8da7c9..7b0facfb6ca 100644
--- a/addons/google_base_account/i18n/fr.po
+++ b/addons/google_base_account/i18n/fr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:43+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: google_base_account
 #: field:res.users,gmail_user:0
diff --git a/addons/google_base_account/i18n/it.po b/addons/google_base_account/i18n/it.po
index db9c09edd4b..a63e3da0ad0 100644
--- a/addons/google_base_account/i18n/it.po
+++ b/addons/google_base_account/i18n/it.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:43+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: google_base_account
 #: field:res.users,gmail_user:0
diff --git a/addons/google_base_account/i18n/ja.po b/addons/google_base_account/i18n/ja.po
index b6329507d3d..e4cdd04ac63 100644
--- a/addons/google_base_account/i18n/ja.po
+++ b/addons/google_base_account/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:43+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: google_base_account
 #: field:res.users,gmail_user:0
diff --git a/addons/google_base_account/i18n/nb.po b/addons/google_base_account/i18n/nb.po
new file mode 100644
index 00000000000..7b14c1d29b4
--- /dev/null
+++ b/addons/google_base_account/i18n/nb.po
@@ -0,0 +1,122 @@
+# Norwegian Bokmal 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-02-08 00:36+0000\n"
+"PO-Revision-Date: 2012-09-07 19:23+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Norwegian Bokmal <nb@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-09-08 04:54+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
+
+#. module: google_base_account
+#: field:res.users,gmail_user:0
+msgid "Username"
+msgstr "Brukernavn:"
+
+#. module: google_base_account
+#: model:ir.actions.act_window,name:google_base_account.act_google_login_form
+msgid "Google Login"
+msgstr "Google Logg inn"
+
+#. module: google_base_account
+#: code:addons/google_base_account/wizard/google_login.py:29
+#, python-format
+msgid "Google Contacts Import Error!"
+msgstr "Google kontakter Import Feil!"
+
+#. module: google_base_account
+#: view:res.users:0
+msgid " Synchronization "
+msgstr " Synkronisering "
+
+#. module: google_base_account
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr "Du kan ikke ha to brukere med samme login!"
+
+#. module: google_base_account
+#: code:addons/google_base_account/wizard/google_login.py:75
+#, python-format
+msgid "Error"
+msgstr "Feil"
+
+#. module: google_base_account
+#: view:google.login:0
+msgid "Google login"
+msgstr "Google Logg Inn."
+
+#. module: google_base_account
+#: model:ir.model,name:google_base_account.model_res_users
+msgid "res.users"
+msgstr "res.Brukere."
+
+#. module: google_base_account
+#: field:google.login,password:0
+msgid "Google Password"
+msgstr "Google passord."
+
+#. module: google_base_account
+#: view:google.login:0
+msgid "_Cancel"
+msgstr "_Avbryt"
+
+#. module: google_base_account
+#: view:res.users:0
+msgid "Google Account"
+msgstr "Google-konto"
+
+#. module: google_base_account
+#: field:google.login,user:0
+msgid "Google Username"
+msgstr "Google Brukernavn."
+
+#. module: google_base_account
+#: code:addons/google_base_account/wizard/google_login.py:29
+#, python-format
+msgid ""
+"Please install gdata-python-client from http://code.google.com/p/gdata-"
+"python-client/downloads/list"
+msgstr ""
+"Vennligst Installer gdata-python-client from http://code.google.com/p/gdata-"
+"python-client/downloads/list"
+
+#. module: google_base_account
+#: model:ir.model,name:google_base_account.model_google_login
+msgid "Google Contact"
+msgstr "Google kontakt"
+
+#. module: google_base_account
+#: view:google.login:0
+msgid "_Login"
+msgstr "_Logg inn"
+
+#. module: google_base_account
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr ""
+"Det valgte firmaet er ikke i listen over tillatte firmaer for denne brukeren"
+
+#. module: google_base_account
+#: field:res.users,gmail_password:0
+msgid "Password"
+msgstr "Passord:"
+
+#. module: google_base_account
+#: code:addons/google_base_account/wizard/google_login.py:75
+#, python-format
+msgid "Authentication fail check the user and password !"
+msgstr "Autentisering mislykkes sjekk brukernavn og passord!"
+
+#. module: google_base_account
+#: view:google.login:0
+msgid "ex: user@gmail.com"
+msgstr "Ex:Bruker@gmail.com"
diff --git a/addons/google_base_account/i18n/nl.po b/addons/google_base_account/i18n/nl.po
index 5b592546bcc..a5df7334b84 100644
--- a/addons/google_base_account/i18n/nl.po
+++ b/addons/google_base_account/i18n/nl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:43+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: google_base_account
 #: field:res.users,gmail_user:0
diff --git a/addons/google_base_account/i18n/pt.po b/addons/google_base_account/i18n/pt.po
index e55a46b1c5c..33fbf1abfe3 100644
--- a/addons/google_base_account/i18n/pt.po
+++ b/addons/google_base_account/i18n/pt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:43+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: google_base_account
 #: field:res.users,gmail_user:0
diff --git a/addons/google_base_account/i18n/pt_BR.po b/addons/google_base_account/i18n/pt_BR.po
index c1ac6c5e6f2..80037705a4b 100644
--- a/addons/google_base_account/i18n/pt_BR.po
+++ b/addons/google_base_account/i18n/pt_BR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:43+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: google_base_account
 #: field:res.users,gmail_user:0
diff --git a/addons/google_base_account/i18n/ro.po b/addons/google_base_account/i18n/ro.po
index 09c868e8b45..f643e5e3bae 100644
--- a/addons/google_base_account/i18n/ro.po
+++ b/addons/google_base_account/i18n/ro.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:43+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: google_base_account
 #: field:res.users,gmail_user:0
diff --git a/addons/google_base_account/i18n/sl.po b/addons/google_base_account/i18n/sl.po
index 00b1a739f32..b59073cd752 100644
--- a/addons/google_base_account/i18n/sl.po
+++ b/addons/google_base_account/i18n/sl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:43+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: google_base_account
 #: field:res.users,gmail_user:0
diff --git a/addons/google_base_account/i18n/sr@latin.po b/addons/google_base_account/i18n/sr@latin.po
index 9fcd82281da..1235bfc17b3 100644
--- a/addons/google_base_account/i18n/sr@latin.po
+++ b/addons/google_base_account/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:43+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: google_base_account
 #: field:res.users,gmail_user:0
diff --git a/addons/google_base_account/i18n/sv.po b/addons/google_base_account/i18n/sv.po
index 50f76ee5b23..1112dac6989 100644
--- a/addons/google_base_account/i18n/sv.po
+++ b/addons/google_base_account/i18n/sv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:43+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: google_base_account
 #: field:res.users,gmail_user:0
diff --git a/addons/google_base_account/i18n/tr.po b/addons/google_base_account/i18n/tr.po
index 7c13b07fb22..f5c85345a6d 100644
--- a/addons/google_base_account/i18n/tr.po
+++ b/addons/google_base_account/i18n/tr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:43+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: google_base_account
 #: field:res.users,gmail_user:0
diff --git a/addons/google_base_account/i18n/zh_CN.po b/addons/google_base_account/i18n/zh_CN.po
index 2c8161a73ed..ae68c47d05c 100644
--- a/addons/google_base_account/i18n/zh_CN.po
+++ b/addons/google_base_account/i18n/zh_CN.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:43+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: google_base_account
 #: field:res.users,gmail_user:0
diff --git a/addons/google_docs/__openerp__.py b/addons/google_docs/__openerp__.py
index 8cc5671e08a..b02f2e912fc 100644
--- a/addons/google_docs/__openerp__.py
+++ b/addons/google_docs/__openerp__.py
@@ -29,10 +29,13 @@
     'auto_install': False,
     'web': True,
     'js': ['static/src/js/gdocs.js'],
-    'update_xml': [
+    'data': [
         'security/ir.model.access.csv',
         'res_config_user_view.xml'
     ],
     'depends': ['google_base_account'],
-    'description': 'Module to attach a google document to any model.'
+    'description': """
+Module to attach a google document to any model.
+================================================
+"""
 }
diff --git a/addons/google_docs/static/src/js/gdocs.js b/addons/google_docs/static/src/js/gdocs.js
index 8f41a9d7b21..694f5736c72 100644
--- a/addons/google_docs/static/src/js/gdocs.js
+++ b/addons/google_docs/static/src/js/gdocs.js
@@ -3,7 +3,7 @@ var _t = instance.web._t;
 
     instance.web.Sidebar = instance.web.Sidebar.extend({
         on_attachments_loaded: function(attachments) {
-            self = this
+            var self = this;
             self._super(attachments);
             // if attachment contains a google doc url do nothing
             // else display a button to create a google doc
diff --git a/addons/google_map/__openerp__.py b/addons/google_map/__openerp__.py
index 33e28aa8f84..f5577b17994 100644
--- a/addons/google_map/__openerp__.py
+++ b/addons/google_map/__openerp__.py
@@ -33,9 +33,8 @@ Using this you can directly open Google Map from the URL widget.""",
     'website': 'http://www.openerp.com',
     'images': ['images/google_map.jpeg'],
     'depends': ['base'],
-    'init_xml': [],
-    'update_xml': [ ],
-    'demo_xml': [],
+    'data': [],
+    'demo': [],
     'js': ['static/src/js/google_map.js'],
     'installable': True,
     'auto_install': False,
diff --git a/addons/google_map/i18n/ar.po b/addons/google_map/i18n/ar.po
index bcbd6fc7df3..520a32bcab0 100644
--- a/addons/google_map/i18n/ar.po
+++ b/addons/google_map/i18n/ar.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:48+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:56+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: google_map
 #: view:res.partner:0
diff --git a/addons/google_map/i18n/bg.po b/addons/google_map/i18n/bg.po
index d1dc0a0fd40..4b82862138a 100644
--- a/addons/google_map/i18n/bg.po
+++ b/addons/google_map/i18n/bg.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:48+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:56+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: google_map
 #: view:res.partner:0
diff --git a/addons/google_map/i18n/br.po b/addons/google_map/i18n/br.po
index 0dd63ea3f49..0198b8c8b46 100644
--- a/addons/google_map/i18n/br.po
+++ b/addons/google_map/i18n/br.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:48+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:56+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: google_map
 #: view:res.partner:0
diff --git a/addons/google_map/i18n/bs.po b/addons/google_map/i18n/bs.po
index 78443b59e10..1aebeb74a5f 100644
--- a/addons/google_map/i18n/bs.po
+++ b/addons/google_map/i18n/bs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:48+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:56+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: google_map
 #: view:res.partner:0
diff --git a/addons/google_map/i18n/ca.po b/addons/google_map/i18n/ca.po
index 71d03d4bf38..e48e314d91e 100644
--- a/addons/google_map/i18n/ca.po
+++ b/addons/google_map/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:48+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:56+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: google_map
 #: view:res.partner:0
diff --git a/addons/google_map/i18n/cs.po b/addons/google_map/i18n/cs.po
index 53325c42e9b..33a2831884c 100644
--- a/addons/google_map/i18n/cs.po
+++ b/addons/google_map/i18n/cs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:48+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:56+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: google_map
 #: view:res.partner:0
diff --git a/addons/google_map/i18n/da.po b/addons/google_map/i18n/da.po
index 0fbe30ca441..de732e91da0 100644
--- a/addons/google_map/i18n/da.po
+++ b/addons/google_map/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:48+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:56+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: google_map
 #: view:res.partner:0
diff --git a/addons/google_map/i18n/de.po b/addons/google_map/i18n/de.po
index 8b5cdc52e14..70b6c88b040 100644
--- a/addons/google_map/i18n/de.po
+++ b/addons/google_map/i18n/de.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:48+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:56+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: google_map
 #: view:res.partner:0
diff --git a/addons/google_map/i18n/el.po b/addons/google_map/i18n/el.po
index 36419d05744..cbfd9759b68 100644
--- a/addons/google_map/i18n/el.po
+++ b/addons/google_map/i18n/el.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:48+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:56+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: google_map
 #: view:res.partner:0
diff --git a/addons/google_map/i18n/en_GB.po b/addons/google_map/i18n/en_GB.po
index 5fac8ddaf11..2a633852f56 100644
--- a/addons/google_map/i18n/en_GB.po
+++ b/addons/google_map/i18n/en_GB.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:48+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:56+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: google_map
 #: view:res.partner:0
diff --git a/addons/google_map/i18n/es.po b/addons/google_map/i18n/es.po
index 342ef119707..defcba02e94 100644
--- a/addons/google_map/i18n/es.po
+++ b/addons/google_map/i18n/es.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:48+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:56+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: google_map
 #: view:res.partner:0
diff --git a/addons/google_map/i18n/es_AR.po b/addons/google_map/i18n/es_AR.po
index 1659a2a4f70..71956a59a38 100644
--- a/addons/google_map/i18n/es_AR.po
+++ b/addons/google_map/i18n/es_AR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:48+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:56+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: google_map
 #: view:res.partner:0
diff --git a/addons/google_map/i18n/es_CR.po b/addons/google_map/i18n/es_CR.po
index af12bb30830..7421fe83562 100644
--- a/addons/google_map/i18n/es_CR.po
+++ b/addons/google_map/i18n/es_CR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:48+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:56+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 "Language: \n"
 
 #. module: google_map
diff --git a/addons/google_map/i18n/es_EC.po b/addons/google_map/i18n/es_EC.po
index 7ae47d38acc..81e73281cd9 100644
--- a/addons/google_map/i18n/es_EC.po
+++ b/addons/google_map/i18n/es_EC.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:48+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:56+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: google_map
 #: view:res.partner:0
diff --git a/addons/google_map/i18n/es_PY.po b/addons/google_map/i18n/es_PY.po
index 0a10a4c3526..4839cdb9623 100644
--- a/addons/google_map/i18n/es_PY.po
+++ b/addons/google_map/i18n/es_PY.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:48+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:56+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: google_map
 #: view:res.partner:0
diff --git a/addons/google_map/i18n/et.po b/addons/google_map/i18n/et.po
index 01e369f3599..fdd8410cb99 100644
--- a/addons/google_map/i18n/et.po
+++ b/addons/google_map/i18n/et.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:48+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:56+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: google_map
 #: view:res.partner:0
diff --git a/addons/google_map/i18n/eu.po b/addons/google_map/i18n/eu.po
index dca70071050..782d8c9a09f 100644
--- a/addons/google_map/i18n/eu.po
+++ b/addons/google_map/i18n/eu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:48+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:56+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: google_map
 #: view:res.partner:0
diff --git a/addons/google_map/i18n/fi.po b/addons/google_map/i18n/fi.po
index ab64a615a94..3d69fb36c48 100644
--- a/addons/google_map/i18n/fi.po
+++ b/addons/google_map/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:48+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:56+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: google_map
 #: view:res.partner:0
diff --git a/addons/google_map/i18n/fr.po b/addons/google_map/i18n/fr.po
index a29737763e2..e308a3f87d3 100644
--- a/addons/google_map/i18n/fr.po
+++ b/addons/google_map/i18n/fr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:48+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:56+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: google_map
 #: view:res.partner:0
diff --git a/addons/google_map/i18n/gl.po b/addons/google_map/i18n/gl.po
index 749ff00f18c..74124350163 100644
--- a/addons/google_map/i18n/gl.po
+++ b/addons/google_map/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:48+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:56+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: google_map
 #: view:res.partner:0
diff --git a/addons/google_map/i18n/gu.po b/addons/google_map/i18n/gu.po
index c303c173506..a4874cbbb1f 100644
--- a/addons/google_map/i18n/gu.po
+++ b/addons/google_map/i18n/gu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:48+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:56+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: google_map
 #: view:res.partner:0
diff --git a/addons/google_map/i18n/hi.po b/addons/google_map/i18n/hi.po
index 5f8655772ff..35636a9b51f 100644
--- a/addons/google_map/i18n/hi.po
+++ b/addons/google_map/i18n/hi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:48+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:56+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: google_map
 #: view:res.partner:0
diff --git a/addons/google_map/i18n/hr.po b/addons/google_map/i18n/hr.po
index f63034a08f7..6bfeb1b4d66 100644
--- a/addons/google_map/i18n/hr.po
+++ b/addons/google_map/i18n/hr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:48+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:56+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: google_map
 #: view:res.partner:0
diff --git a/addons/google_map/i18n/hu.po b/addons/google_map/i18n/hu.po
index 43a7be19217..64fe052ce8e 100644
--- a/addons/google_map/i18n/hu.po
+++ b/addons/google_map/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:48+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:56+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: google_map
 #: view:res.partner:0
diff --git a/addons/google_map/i18n/id.po b/addons/google_map/i18n/id.po
index 28cc783035b..9ef7abcce98 100644
--- a/addons/google_map/i18n/id.po
+++ b/addons/google_map/i18n/id.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:48+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:56+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: google_map
 #: view:res.partner:0
diff --git a/addons/google_map/i18n/it.po b/addons/google_map/i18n/it.po
index 8b1b0de0a88..dafa43aca0a 100644
--- a/addons/google_map/i18n/it.po
+++ b/addons/google_map/i18n/it.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:48+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:56+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: google_map
 #: view:res.partner:0
diff --git a/addons/google_map/i18n/ja.po b/addons/google_map/i18n/ja.po
index 4631750611e..cc9edd7ef04 100644
--- a/addons/google_map/i18n/ja.po
+++ b/addons/google_map/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:48+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:56+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: google_map
 #: view:res.partner:0
diff --git a/addons/google_map/i18n/ko.po b/addons/google_map/i18n/ko.po
index e036dfef7ab..658eaaf05f0 100644
--- a/addons/google_map/i18n/ko.po
+++ b/addons/google_map/i18n/ko.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:48+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:56+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: google_map
 #: view:res.partner:0
diff --git a/addons/google_map/i18n/lo.po b/addons/google_map/i18n/lo.po
index 65068c78a1c..dc9f838ca74 100644
--- a/addons/google_map/i18n/lo.po
+++ b/addons/google_map/i18n/lo.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:48+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:56+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: google_map
 #: view:res.partner:0
diff --git a/addons/google_map/i18n/lt.po b/addons/google_map/i18n/lt.po
index 1eb9cc9a23f..4cd93d8aa7d 100644
--- a/addons/google_map/i18n/lt.po
+++ b/addons/google_map/i18n/lt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:48+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:56+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: google_map
 #: view:res.partner:0
diff --git a/addons/google_map/i18n/lv.po b/addons/google_map/i18n/lv.po
index f7db14b5387..d15d8cd03f4 100644
--- a/addons/google_map/i18n/lv.po
+++ b/addons/google_map/i18n/lv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:48+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:56+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: google_map
 #: view:res.partner:0
diff --git a/addons/google_map/i18n/mk.po b/addons/google_map/i18n/mk.po
index e4b8a64d376..e1c7137a55e 100644
--- a/addons/google_map/i18n/mk.po
+++ b/addons/google_map/i18n/mk.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:48+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:56+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: google_map
 #: view:res.partner:0
diff --git a/addons/google_map/i18n/mn.po b/addons/google_map/i18n/mn.po
index 7e972fa679d..a68277a5713 100644
--- a/addons/google_map/i18n/mn.po
+++ b/addons/google_map/i18n/mn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:48+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:56+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: google_map
 #: view:res.partner:0
diff --git a/addons/google_map/i18n/nb.po b/addons/google_map/i18n/nb.po
index 189a84dcf8f..b8f400d83e4 100644
--- a/addons/google_map/i18n/nb.po
+++ b/addons/google_map/i18n/nb.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:48+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:56+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: google_map
 #: view:res.partner:0
diff --git a/addons/google_map/i18n/nl.po b/addons/google_map/i18n/nl.po
index ed38eaa8ae1..33cf0a92711 100644
--- a/addons/google_map/i18n/nl.po
+++ b/addons/google_map/i18n/nl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:48+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:56+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: google_map
 #: view:res.partner:0
diff --git a/addons/google_map/i18n/nl_BE.po b/addons/google_map/i18n/nl_BE.po
index ad58d4dcd66..9fcd9931763 100644
--- a/addons/google_map/i18n/nl_BE.po
+++ b/addons/google_map/i18n/nl_BE.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:48+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:56+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: google_map
 #: view:res.partner:0
diff --git a/addons/google_map/i18n/oc.po b/addons/google_map/i18n/oc.po
index 7d3312c422a..618b73675b9 100644
--- a/addons/google_map/i18n/oc.po
+++ b/addons/google_map/i18n/oc.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:48+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:56+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: google_map
 #: view:res.partner:0
diff --git a/addons/google_map/i18n/pl.po b/addons/google_map/i18n/pl.po
index 459f5f2f56a..7f6d150e744 100644
--- a/addons/google_map/i18n/pl.po
+++ b/addons/google_map/i18n/pl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:48+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:56+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: google_map
 #: view:res.partner:0
diff --git a/addons/google_map/i18n/pt.po b/addons/google_map/i18n/pt.po
index 810202f2819..85390254ded 100644
--- a/addons/google_map/i18n/pt.po
+++ b/addons/google_map/i18n/pt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:48+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:56+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: google_map
 #: view:res.partner:0
diff --git a/addons/google_map/i18n/pt_BR.po b/addons/google_map/i18n/pt_BR.po
index 3bfbc2a7d1f..07af84a5004 100644
--- a/addons/google_map/i18n/pt_BR.po
+++ b/addons/google_map/i18n/pt_BR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:48+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:56+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: google_map
 #: view:res.partner:0
diff --git a/addons/google_map/i18n/ro.po b/addons/google_map/i18n/ro.po
index 8428c76eabf..69bf7970261 100644
--- a/addons/google_map/i18n/ro.po
+++ b/addons/google_map/i18n/ro.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:48+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:56+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: google_map
 #: view:res.partner:0
diff --git a/addons/google_map/i18n/ru.po b/addons/google_map/i18n/ru.po
index 6bd28a2ee23..3856ac4af84 100644
--- a/addons/google_map/i18n/ru.po
+++ b/addons/google_map/i18n/ru.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:48+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:56+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: google_map
 #: view:res.partner:0
diff --git a/addons/google_map/i18n/sk.po b/addons/google_map/i18n/sk.po
index 0ae1320b1c8..08a670e44a1 100644
--- a/addons/google_map/i18n/sk.po
+++ b/addons/google_map/i18n/sk.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:48+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:56+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: google_map
 #: view:res.partner:0
diff --git a/addons/google_map/i18n/sl.po b/addons/google_map/i18n/sl.po
index 02eaeff336c..b88f6f50e64 100644
--- a/addons/google_map/i18n/sl.po
+++ b/addons/google_map/i18n/sl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:48+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:56+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: google_map
 #: view:res.partner:0
diff --git a/addons/google_map/i18n/sq.po b/addons/google_map/i18n/sq.po
index 1ca5472d0e6..b5b933e5bee 100644
--- a/addons/google_map/i18n/sq.po
+++ b/addons/google_map/i18n/sq.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:48+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:56+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: google_map
 #: view:res.partner:0
diff --git a/addons/google_map/i18n/sr.po b/addons/google_map/i18n/sr.po
index 23e903e5fc2..cf035f3c8b8 100644
--- a/addons/google_map/i18n/sr.po
+++ b/addons/google_map/i18n/sr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:48+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:56+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: google_map
 #: view:res.partner:0
diff --git a/addons/google_map/i18n/sr@latin.po b/addons/google_map/i18n/sr@latin.po
index 57d2b68228a..1f8eb9bc2ab 100644
--- a/addons/google_map/i18n/sr@latin.po
+++ b/addons/google_map/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:48+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:56+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: google_map
 #: view:res.partner:0
diff --git a/addons/google_map/i18n/sv.po b/addons/google_map/i18n/sv.po
index 4f41bd0ecdc..872491a877b 100644
--- a/addons/google_map/i18n/sv.po
+++ b/addons/google_map/i18n/sv.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:48+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:56+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: google_map
 #: view:res.partner:0
diff --git a/addons/google_map/i18n/tlh.po b/addons/google_map/i18n/tlh.po
index 21ad1acc2d2..7f9cae0f150 100644
--- a/addons/google_map/i18n/tlh.po
+++ b/addons/google_map/i18n/tlh.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:48+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:56+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: google_map
 #: view:res.partner:0
diff --git a/addons/google_map/i18n/tr.po b/addons/google_map/i18n/tr.po
index 524f8581ed5..95da27d2731 100644
--- a/addons/google_map/i18n/tr.po
+++ b/addons/google_map/i18n/tr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:48+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:56+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: google_map
 #: view:res.partner:0
diff --git a/addons/google_map/i18n/uk.po b/addons/google_map/i18n/uk.po
index 2d03a57adff..f829936b247 100644
--- a/addons/google_map/i18n/uk.po
+++ b/addons/google_map/i18n/uk.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:48+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:56+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: google_map
 #: view:res.partner:0
diff --git a/addons/google_map/i18n/vi.po b/addons/google_map/i18n/vi.po
index be51c5a4263..0b83b86b374 100644
--- a/addons/google_map/i18n/vi.po
+++ b/addons/google_map/i18n/vi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:48+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:56+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: google_map
 #: view:res.partner:0
diff --git a/addons/google_map/i18n/zh_CN.po b/addons/google_map/i18n/zh_CN.po
index e1a6446f6ae..24479acd514 100644
--- a/addons/google_map/i18n/zh_CN.po
+++ b/addons/google_map/i18n/zh_CN.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:48+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:56+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: google_map
 #: view:res.partner:0
diff --git a/addons/google_map/i18n/zh_TW.po b/addons/google_map/i18n/zh_TW.po
index b2f6067c6b3..75b7ecb946a 100644
--- a/addons/google_map/i18n/zh_TW.po
+++ b/addons/google_map/i18n/zh_TW.po
@@ -7,26 +7,26 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2009-01-30 13:19+0000\n"
-"Last-Translator: <>\n"
+"PO-Revision-Date: 2012-08-19 10:39+0000\n"
+"Last-Translator: Eric Huang <eh@cenoq.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:48+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:56+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: google_map
 #: view:res.partner:0
 msgid "Map"
-msgstr ""
+msgstr "地圖"
 
 #. module: google_map
 #: model:ir.model,name:google_map.model_res_partner_address
 msgid "Partner Addresses"
-msgstr ""
+msgstr "業務夥伴地址"
 
 #. module: google_map
 #: view:res.partner:0
 msgid "Street2 : "
-msgstr ""
+msgstr "街道地址2 "
diff --git a/addons/google_map/static/src/js/google_map.js b/addons/google_map/static/src/js/google_map.js
index bd871eafe6b..23b70f5f6c3 100644
--- a/addons/google_map/static/src/js/google_map.js
+++ b/addons/google_map/static/src/js/google_map.js
@@ -59,7 +59,7 @@ openerp.event = function(instance, mod) {
                     address = _.str.sprintf('%(street)s, %(zip)s %(city)s', value);
                 }
                 // TODO repalce by widget_option selector self.options.selector
-                var el = self.view.$element.find(".oe_google_map")[0];
+                var el = self.view.$el.find(".oe_google_map")[0];
                 self.map.render_map(address,el);
             });
         },
diff --git a/addons/hr/__openerp__.py b/addons/hr/__openerp__.py
index 65b2d5fc08f..8dc202230e6 100644
--- a/addons/hr/__openerp__.py
+++ b/addons/hr/__openerp__.py
@@ -20,18 +20,19 @@
 ##############################################################################
 
 {
-    "name": "Employee Directory",
-    "version": "1.1",
-    "author": "OpenERP SA",
-    "category": "Human Resources",
-    "sequence": 12,
-    "website": "http://www.openerp.com",
-    "summary": "All Infos on Employees",
-    "description": """
+    'name': 'Employee Directory',
+    'version': '1.1',
+    'author': 'OpenERP SA',
+    'category': 'Human Resources',
+    'sequence': 12,
+    'website': 'http://www.openerp.com',
+    'summary': 'All Infos on Employees',
+    'description': """
 Module for Human Resource Management.
 =====================================
 
 You can manage:
+---------------
     * Employees and hierarchies : You can define your employee with User and display hierarchies
     * HR Departments
     * HR Jobs
@@ -45,8 +46,7 @@ You can manage:
         'static/src/img/default_image.png',
     ],
     'depends': ['base_setup','mail', 'resource', 'board'],
-    'init_xml': [],
-    'update_xml': [
+    'data': [
         'security/hr_security.xml',
         'security/ir.model.access.csv',
         'board_hr_view.xml',
@@ -57,17 +57,15 @@ You can manage:
         'hr_data.xml',
         'res_config_view.xml',
     ],
-    'demo_xml': [
-        'hr_demo.xml',
-    ],
+    'demo': ['hr_demo.xml'],
     'test': [
-             'test/open2recruit2close_job.yml',
-             'test/hr_demo.yml',
-             ],
+        'test/open2recruit2close_job.yml',
+        'test/hr_demo.yml',
+    ],
     'installable': True,
     'application': True,
     'auto_install': False,
     'certificate': '0086710558965',
-    "css": [ 'static/src/css/hr.css' ],
+    'css': [ 'static/src/css/hr.css' ],
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr/hr.py b/addons/hr/hr.py
index 966c29cab07..3c307b9fee8 100644
--- a/addons/hr/hr.py
+++ b/addons/hr/hr.py
@@ -212,7 +212,7 @@ class hr_employee(osv.osv):
         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_append_note(cr, uid, [mail_group_id], body='Welcome to %s! Please help him make its first steps in OpenERP!' % (employee.name), context=context)
+            self.pool.get('mail.group').message_post(cr, uid, [mail_group_id], body='Welcome to %s! Please help them take the first steps with OpenERP!' % (employee.name), context=context)
         except:
             pass # group deleted: do not push a message
         return employee_id
diff --git a/addons/hr/hr_data.xml b/addons/hr/hr_data.xml
index 18c50836f07..514cf1f80f6 100644
--- a/addons/hr/hr_data.xml
+++ b/addons/hr/hr_data.xml
@@ -2,14 +2,16 @@
 <openerp>
     <data noupdate="1">
         <!-- notify all employees of module installation -->
-        <function model="mail.group" name="message_append_note">
-            <!-- ids, subject, body, parent_id=False, type='notification', content_subtype='html' -->
-            <value eval="[ref('mail.group_all_employees')]"/>
-            <value>Module Employee Directory has been installed</value>
-            <value>Manage your human resources in OpenERP: employees and hierarchy, HR departments and jobs.
+        <record model="mail.message" id="module_install_notification">
+            <field name="model">mail.group</field>
+            <field name="res_id" ref="mail.group_all_employees"/>
+            <field name="type">notification</field>
+            <field name="subject">Employee Directory application installed!</field>
+            <field name="body">Manage your human resources with OpenERP: employees and their hierarchy, HR departments and job positions.
 
-More HR features are available from the following modules: Recruitment Process (manage job positions and recruitment), Timesheets Validation (record timesheets and attendance), Leaves Management (keep track of employee leaves), Expenses Management (manage employee expenses), Employee Appraisals (organize employee surveys, where employees evaluate their subordinates or their manager.)</value>
-        </function>
+More HR features are available via extra applications: Recruitment Process (manage job positions and recruitment), Timesheet Validation (record timesheets and attendance),
+Leave Management (keep track of employee leaves), Expense Management (manage employee expenses), Employee Appraisals (organize employee surveys, where employees evaluate their subordinates or their manager).</field>
+        </record>
 
         <record id="employee" model="hr.employee">
             <field name="name">Administrator</field>
diff --git a/addons/hr/hr_demo.xml b/addons/hr/hr_demo.xml
index 20d3e093505..8cb5ade52fe 100644
--- a/addons/hr/hr_demo.xml
+++ b/addons/hr/hr_demo.xml
@@ -4,107 +4,6 @@
 
     <!--Users-->
 
-      <record id="base.user_root" model="res.users">
-          <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>
-
-
-      <record id="base.user_fp" model="res.users">
-          <field name="name">Fabien</field>
-          <field name="login">fp</field>
-          <field name="password">fp</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>
-
-      <record id="base.user_al" model="res.users">
-          <field name="name">Antony</field>
-          <field name="login">al</field>
-          <field name="password">al</field>
-          <field name="image">/9j/4AAQSkZJRgABAQEASABIAAD/2wBDAAUDBAQEAwUEBAQFBQUGBwwIBwcHBw8LCwkMEQ8SEhEPERETFhwXExQaFRERGCEYGh0dHx8fExciJCIeJBweHx7/wAALCADmAJMBAREA/8QAHQAAAQQDAQEAAAAAAAAAAAAAAAQGBwgBAwUCCf/EAEAQAAEDAwIEAwYEBQIGAQUAAAECAwQABREGIQcSMUETUWEIFCJxgZEyQqGxFSNSwfAkchYzYoLR4Rc0c5Ki8f/aAAgBAQAAPwCEXGmWYiz4YB6nA61iKGRFUhSwkY2yQMUztXW6EorltPkSPzpG6VevoaaZrFFFZAycCsUUUUUV7YDanUpdUUIJwpQGcDzxSl2OwISn25CVOJd5SjzSRsR+1IzRRU0upCmilDyCDnIJ/vXHlSCEBlCEE46qwcbU07+UuOKXIlJKEDZAO6leg9OlNo0UUUUUUUUUUUUUUVIb9mk5Kmprg36EnFc+5Rp0KGVvSEgYwCNyPp2poyXA48pQzjO2fKtVFL7TFZdK5ElQ8Fr8nNhTisHCRgelI3lBbhUEhI8hXiiiiiiisgZ6CsVnBIzisUVN0tKMEkjPkO1N/VEXxbY4TzDKCcY9evyqMjWK3QmUvyW2lr8NClAKWR+EedbnJSUs+Aw0lk/hWtJyVD5+p8qR0UUUUUUUrtiYq5ITKdLST+FXLzAH1Hl0H1rfdYhtt05XY+WichBOyk9xn+9bn7ehcBcy2rLrYf8ABI6LAUAU7dx1Hz/XVGtL8kIU3jw1N+IXB0CckKJ8sEH5gZFZbtyOX4mZSiCRzITlJweoqYQ0hX5Rygbk1xdWyi3a5BaZ5llBAPYf5tUSnrQnJOBvmtqscoQlHxnAwM7f+zUpcFuEsrV8p25XQLYs0E5lLBwSQOYoB88fvXK406Vtem58JdtBQmYhTnh/0pzhJx2yMHFR5RRRRRRWQcHNbnZch5hDDrqltoOUg9qwFJMZSSohQOw7KH+f3pQzcHmreuMhRSSrqBvynqM/MDt9a8i5TUgJS+tIA6Cp3DaAccmaZHEy6hmEqC20nnc2UvskeXzqM63Q0qVISlAWpatkhI3Ksbfriu7pKyO3LUbFvCFqkc+VJB/CR5n51d+PpyPo/gfbrKygtPzjzyP6yt1JUQe+cfDVZPaKtTke6txveBIdjvojOLJH/MUnOB5gYx9Kj2fpibHRcWnY5Eu3rS2tDR5grYlR+w5vvTbNYoooorOKFApUQRgjrR0O9KXobzcJmYUHwncgH1H+f5sSmqxbg5G1YOd+bGOu3/8AahziJOQ/djHbXzBCipZ/6j2+g/emtSu0uOMzm3G1+GQcc22wOxxnvg1Yz2UtItXfVrs5BbdbbaGVr655sHPmScH6GrS8Ureu4rtq2sBEee2AQoAKcIIbT9CM/aqle1Ha5Vq4gQS6SpUgtXAHHY7DoMbBOKdOttMTZet5uotPRR4ztviXARm0/wDObUhTanB/3AfPnqtGqLYuFNcdEZcdpazhtQ/B6fL/ADyrjUUUVkAk4Aya3x1xwhTchtfTKVIxkH1z1Hp+1YlvPSHfeHlcylHHMdyf/PXvWxmXyRlMORmXgTkFaTlPyIIrWt4mOhlLjoQCSpsqyjPYgfX/ADNaasQpfMhQ2HN3zUCX9p5m9TESEkOeMonPcE7GkNe2vxAAbk1d32NrQqBaZbr7CUqRGZeSkHdSllZAI/2kVPOsYrMnSaUrKkvolJknk/rB+EfQEfaoB9q2xLcladvHgNOcqVROflzzq5QpA+pSofWt/CK/L0/q62Wm6crTFwt6o1pnLyfESleWEK27HmbI8ljyrr8dODNm1MF3GG0LZcA2tx5jk5krcxkKAGOYK6HB8j1O9G9TWeVZrq/EksKZKFnCTnpntnqK5VFZTjO9e2uVLiStPOjO4BxkdxXZ1TEgQ3oMu0+KliQwHOV3BwoHBx1BB2OOxyO1cdtC3SrGyUjKj2A869vstNthbcltzJxygEKx59MfrmtFGD5VY4tjlwB1OKYHFLTrshDVzioBW2gh3A3UBuP71GFOvhbpmTqfUzcVtpSozQ8SSsJzyo7/AFNfQD2c7QmLapVxeirabmPczIUN1JSMJP1+Ij05alGVF/iAdZdaACWyeQjopfxb/LGPrUNceoridCe8spUty3zosptJ68iVf+FHP0pv8RuH0k6XEm2JbXYZKhOhOJCvFtcnGFJGN/DVufQjtgYc/BLiMzrW0vWrUSogvEJoNoUk/wD1CU5HNj5/alHHH2ftM6/tjs+LH9xviM8r7fR7/ck7Z9e/6ilGsuC+qdMXURLiz4bLiyhmRjLTihvy8w6Kxvjr6Uy2bBLavnuE1hbfItIcCgRsTj/CNvI0q1VZYlkcSlEgSedSwlII5kpxsT6g1xJD8chBjs+CtOQo8xPON+3bbFeVSueD7qtsK5F8zS/zJGMEeoO3yx6mu6W4cfRQXIjFT0hf8h9BCgkjcpPcHBH/AOPl14ERKVPBS0eIhvC1o3+JIIyNt+lKFWyQt6QIg94aZcUkOJIwoA4yPuPvSbwnF/ERv02Tj+1WUQgAAFINI7nHMmOWUt8yd8+RqHL9pWTHmyXkYEcKUrP9Pf61aj2ZuGVmVZY8uS26UPhDjjK3uUO5A/EBuQfLIHY96tfYIUeOwlTTaQAMJ+H8I7AfSugtKW+ZacJKzlRpt680zH1BpG425xoJcdYUltSTuO4rTw4Ycb0qxb5zQWhLSUr5jkc2ACPvUfcTuDbb17TqLTDr0J8qSp5lgDC1D82DtzYzv379SacvDGDNfgBxep5zilAgxl/CE4OCnlOceXp2pdqvhrpm6l+TNjOvmQjw3ud1SiTn4VJ3+EgntjqaoP7R9gvWguIj9onIWuKUBUV07+M2R15sfLPqKiNch1aita1OKIIJXv1+daaK9+IvkKAohJxkDYHHTNeaV264SYC1KjqThWMpUMg/Tv3+9JCcknGKtElI/pHSsOp5hgkgHqMUyOI9wtlrsjzBcb98dSQhsH4txj7b1KHsy8TrTF8KBebiw0+6lICiQEoA7Dy7Vc+xSY0q2tvRXEONq6KSrNLHEhYwemQftWSAUkEbHbFR/wAEJ7lw0/NQ66tww7g/HUVDGVJWf8+1SBTY1PaG0SW7rFcUxISolS0ucmdjtnyO/WlOmbpEuUIcz63lFahl0Y+JJwoEflUCMFPpt51H/tP8MoPEXhxcY6GG/wCNRAJFuex8SVAY5M/0qxgj5HtVBtBcJ9U61gzX7DFEh+Hgux+blcKd9052P4SMZ61pVwp1sq4e5xrJNeXzlBHgKSpBHUKSRlP7etI9c8O9U6LQhV/t64oUEkZH9QJTv03we/Y00qxRRVopDrUdhx99aUNNJK1LVsEgDc/aow1jxILq1QdOkDOQqS4QB0/KD+5+1Rm485LmeLMfWtbix4jijzH5+tWE0FwHt2o9ORr5p/VkV2cElZiuLAC/kR0PoafmnNS644ZXWJZrkiU1b0PcqyolbZwcZSsDp03HSrTaN1dEvUFhQdCnF4KgTukEbE+e9OgLCiAjfzNR3wSdbb/40icyv9LqeaAVf0khX7lVLdd6j1TFipe0nbYUsBRSoyXCArtkY7DI3/sc1FcSHxe1Ihki/tHxApRjlpbbbSl9U8+DkJAO4J9Kemj+HWtLExzq1VDceWtLjzJYK2lqAKSTnB3TgHp9O72mW268qDlD4RgJCHSkpG2+43rg6d0rbdKNOfwW2qZUVLWApOFbqKyM+QVkjturzp5WeREmR0yGW20ukfzBy4Uk9we9MziLw8t+t4F7tF5j88KY2jwFADmbdSk8q0ntgk/Taqx6w9lnRmkbZLul/wBe+6xUNqKVuNhAScbDqSTkEd+tVIcACyEnIB2PnWKkfTHA7ijqSwxL5Z9Ky34ExHiMO8yU86ckZwTnBxUq3eH7/aZUFRwJDK2if9wIz+tK/Z64cw5fAzVlwVpyzz9Us6gTbULnwUSi03yNcobS4CAVLdxkDJyPKmLJ0TZESXkTbY0Hdgrly2AemwTgD6VH3u8CLeVx7VIusSYlzkbMZwqPNnYJAGfXrTka1DxYi3RenWZl8uS0Ml5UObHK1htKedSileSAEgk4PQZp26O9omXpGVbVwbK5IQhhPv7Mh0AF4KO7RAylJTy9e5PbFTxbPbS4fripVcLBqBh7HxobbbWAfQ84z+lJYPtccPUT5CbHo7Uzrsl/x1oajtErXy4JwHO+BXi6+0tM5FiHwt1Y0hQOPEglIx1+29IrV7TcpopbuGhNUIQkYy1EJP709rV7Vug0p5b3btRWvHVci2rwPny5p4WP2h+EF4WluNrOC0pRACZWY5yf/uctdb/5i4VvpeSrWtnHgq5HOd3HIfXPSo51r7S3DDSFx5oNyN8eKMLagK8T6c34R8s1APEn2v8AX1/8WJpaJE07DVslwJD0gj/cr4QfkPrTQ01we44cWp6LrKt11dakDm/id8fU03y9inn+JSf9iTTG1hoS86Uul5tN4QG7hapHhONpGUOJBIK0K7jYHp0P0rjabs8q+3mPbIfIX31hKQtQSDn1NfVjQD0ax6GsdmkeC09Ct7LC0s/gBSgA436bVT4kDfOKlr2VXmDddYWBSmUOSPc7rGSsn+Y4gqQtWPJJbj5x/WK4PHey2V2+Ku+m0l2LJW4JDiR/LDgPxJHcHmKgRjbGPlAXDSAtjiSp5DaEvGQosqX+ELCvPtUr8UbJK1nck6oYYk2C7JbLMh9l5SPFTjBUCDkZSSD5g/eDY3DyTqPinZND2tK8vNpDz6cq5G+ZSlOY7AJPTzx51O3FH2OoFu0NMvehr5d5lzhsF82+chDhkhIypKC2lJCsZwMKycDbOakX2MrLFi8A7XeoQYKpanzICWgHEuIeWj4ldVAgA79Pl06/F/TkWXBTNB5VupAUAgkE7nO2/ln6U3OFXCPTupbW87N1HcETUFSAzDUlpKRjY/EkqI6Ht9KYNjuXEXQE646TS5fF3pF2Q4ytwh2M4wEkcnIRzHKlJVkZBB7YBPf1yqbNuTdh4h6RtMyVIaSpbngJUnKh0CvxNqGd+VQI86rOrRutpesLzwx0lCn3Bh2c3JMNsDBCUqLK1qOAnCHTkkgb79BU98MfYsmSWW5vEPUfuWSCbfawFrA8lPKHKD6BKh61Zbh7wY4aaCId03pSC3MA2mSQX3wcdlryU57hOBT+WpKEFajsOtVV9vHTtub04zqpmK21PYeaS86lP/PbUVJKVb/FjCdj2+VN72MuG9mRoCVrydb2p1wekqRG8VAWGmm8HmTnooq79dvU1PDFgvN2aTcGpJaQ8MpRvsBt/aqykbZGfrSeZHcLrMqHMlQJsZXiR5UdfK40r9QpJ2ykggjY+jlRxH1jKtIsd00pbdQeIrPvttcEV9Zx+NbS/hUvzwoZpmT0TrNJVcP+DtUQ2nFeIVTrLIbx3JStCVpI+RNYl8VPj8BdpuLrQV093dGAMeaPT9amT2R7N/HL3f8AiHItC4EiW6mFBadQQWWWwFHGRkcyj+lWhQCEgHGcdqg7h1Fa4acTNY8PHf8AT2S+81/05zqSEla8NyYyCSPiSvwylAz8Jz33dkxm2aitv+nktOoT8SRzYKTt8Kh2I327Uk0lY/4atTafDCg58Kx8KvlmpIisoDTZdSFuAZ5lbn6H603NVWyHJXzCEyV9lKSN6h7gnDZHtR8QVtISA1BtxOB0V7uRj7GrHVhSgElR6AZrjT54W/4KVgNhWFEdetRn7QGnn9b6bXZkJbU2t1KlAnpyhWP1I6edOng3pqHpLQdrsMZALQKuoG53Uf8APSnhZo6I9tZaBStIyUH/AKSSU/oRVHhnvQR59KVWRzwLtEWjAUHU4J6ZyMf2q1gDjtsjDmACm0A8pwMkdv0rc86+iMpa5C0gJ+IZ6Drn9KT8Im1OW6ZcHUqC5UlbiSoblOcJP2SKekx9EaOp1eSAOg6n0pua00tpTiFZP4TqC2RLpFCgtIdHxNnupChhSFY7gg0xHuAkGMla9P671db3SMITKkonNIG22HUFeNh0WOlcdfBribFfDsHiqw+QSR49ueRj0wmQRj6V07ZpTj3bOVLOttLykJBx7xHex18sE/rSy66N4zX0tibxE07ZUpBClWuxrcWR83XcfpTl4T8MrFw7jz12+TPuVzubiXbhcp7ocfkKAwASAAlI3wkDbPenxXKu88tp5GSCBhRIPVO//gfem/GU0iUFKAUHBsc75FbZsYh5wNpzzYyT50osoUmJGjKJCmwU5BzglJH96UNaRtSGwlTk1wjbmVJVk/baqZUHpWFg8ux36g+R7frVleHF6RdNKwnHHkrUE8i8HoR2/aurqha5UaFaWif9YpSnlg4w2nBUPqVJHyJp7WSMiLAbaSjkwBtj0pW+lKm1cwBwD1qO4Ei5QZ8hxptSW0uZ5D6/2p7WC5oucRbgHKttZbWn1FdGiiig0zL46Pf3FAFr8nKD+tabQj+ctZUSAOYZ3wNv/YpbzKLzuMp5+XI9ANv3rbp50GeErI/Nue5pzZqidFZHr0qROC10THui7a6sht5BU2nO3ONyfrnFTJLnMQ5sOfKOGmVEOkA5CFY3x5ApTT4g3KHMa8Rl0FOM5Nc24X9lCloaQtxLZw4UDm/bpSS43G3tW5UtMN5Pj7hRaIzjpuaUaGhuMW96U6hTZlueIlB7Jxt/enDRRWFEJSVHoBmtMp0tILnMkISkk57+VM64h2ZIccTlCs7gdzWWkuxm1OED+YAceWN/tWX3QhhS15Odsn071AHtSa4n2DTkKFBluRm5UxkreZcUhwISsKO43GwH3qpquKfEkrUoa81KnJJwLm9gZ/7qnoVnqcCgDJxSqz3WNZLzBuT6jlt0BI8ycjH6g/Spi1VfuWzFUZclx19P8lJb5idgQcd85xSrhz7y7DDT9zmRVqJCgEpUlJ/pwc+fY7VJelkx7IHYDssyH3F8+Qk5UT5+Xau057rIlhEk7pSSloq+HbGTjucmugMY26VmiivKjhafixkEAeZpHIYdkuhKyQ0Acgdz0rQ5ARyyQCASObIHQ4/9Vyng2hS0JQojmGBnqMdPvTW1LdEtMOsMrPMTygBOQBt+u+1VA9rK5uyfdmln4Q78IzkAb9PtVeqtZyHbHlmsp2CgADnvQoYOP8NcjUbLz0aOIxHjJfQUbZ3JwP3qX9Gqiv215VwZdhz3ORrmW4cFPXIHfOf08zUkWPTL7UdDUENrab5lBOwJBJJyfr+1ehAv72r0T2W3WWUsg8mAckEnHp0rroRqCYOeXGdQ+pKQtQHUFQUpP6AZ9KURp94gw4q5jLjbDbobWlIJUc5IPqN8H6UtvGq0RlrDTLyuQFSQEZ58YyPMd/18qU6f1MxcZJjuBTS1kFoKGCQRkenypx0EA9RWEjlAA6UnmPIjNLWSnmIzvTeuam23HHUkcpJO4/N8/rUQ328i6XSQyyUNIQg/EobEevke1VD9pG8JuGrm4jTnMiOk5wMJJPcfb9aiurWhSubOa5l8vlqssfxrlNbYBGyScqV8kjc/Sol1hxLudwkLYsylQYg2C8DxV+pPb6femi3fLuiU1JNylrcaWHE87ylDIORsTV8tK6ntHEHhdb5TsRLyVRyog/8AMYcGyiCNxvtselcvSEjW0eW43ClOvxAtKGA6vCypSsJAV36Hr5U+0an1Lb5KEz2pCXyj8CEjfcdCNj1rtWrWWpJmFRbbMX8S0AOtgAlPU7/In6GnCLvf34SfebK04Fcqh8Q8sg4+eK2uRrxLQZyrewxyfE2y4oFSsnJHTboK5NrtrsiUu3uNOoa5McyF5KSADkb/AA4JOPlT6LpStlGcHGVJJ3/zfP0pQkgpBB2NYX2xnOegNcy5S0NNuqeUhxGU+GAOnzqIOImpXZxRbIil+M6o48M4OMDJV5DHeo+1NIdsulHDIKPeH1fhB+I7DYb/AC+5qoHENTx1C547hcUoc+Sc9T0+Qxj6U26sLxB1azpe2pKQHp74IjtE7Jx+dXoPLv8Ac1Al0uEy5zXJs99b77h+JSv2HkPSktFTL7M+t3LFeXbIt0NtyyVNqV06YWn6gDf0PnVxNIOYAchlDpb/AJgbQrKk/iz9tvWnsm4olTGXpEcLLasdBjA9P+0V14rinXkpYQUNlSlpSE9VKyVfua7sdvkRjAB+e+PWthGRiuLd3G7fPjPtONpceWGvDOwOc4/WtlrfacdWt5YMgKOT1G/TH0wPpSwyit5DbPKQRkknoKR3S4tRBkrBe5TkDr0OKjrVV+kvRU+G94SHhkkkZWT0A8/X6Uw0Oe7yXZa0OuuuuBvwyMkgq2SkDsRnp2pqcRrTcCJMq5OIakkKPhY+CMgHqe3QffaqhaxuKLnqOXJZz4AXyNb/AJU7A/Xr9a49LLtc592mGXcZTkl8jHOs9vIeQpHRRW+BJehTGpcdZQ60sKSodiKvvwPLmp9FQrkiU634zYCnGVcpOd8EfMmpOg2W5w49sjMPPKAUPHUeruMZ6eeD96flqjOtt87rylZGAnGAMV0K0SXw1sQoFQPKcZGaZWqQ6bmyh9/xWEJUV+iglOCB8lfcV4t0+RAIQgg+ICG8nJwMnf1wKXfxLwWlOc5LnLylHNjcbnOfr9BUf6s1ShqNKejvASClPL8OV5P5Rv5K233J7U3NJ2O96lmMuR43N4DfguOqPIyx3yTjrg42327dalqzaUgWrldgAyJoRyKnOkhCE+SBnby2yfWqo+2TxEgW9D2gNPv+NKcXzXOSPxY7IPlsenYeu9VPNFFFFFZq2vsS68iM2qTpSY+pKkKK20kbYPXB8/8AxVv7aHnWXEeMk8gRuDlSQSckfQGu3DmxpTa1sOBSUHCj9M1skPtMMqedWENpGSo9BSVyfHMR2RzAtMqIWoHpj9+tRJrbW9ot1zZZTOQ2t54ZWpPM2EZ5SsjOwI648jUZW3jExDkXCK66tTaXlKZWocx5NiR26gnb1xWtq86o1fcy1AMt9pxakseCk86kncKVgYzuR9qmDQvDFxCVS9SpLjviFSWfE6gj8yhvttgJx8+1SUxb4sVktnw0R0n4GUpCG0DsMDr9arT7UftHwNLsSNK6PkNyr2FFt5aRluHtg8xGxWD+Xt37ZopcJkqfNemzX3JEl9ZW64s5UtR6kmtFFFFFFFd3Q2pp+kdRxr1biPFZO6T0UO4NW+4Ke0fp5+AqJeluQ5Ia/mFY5knJPNg+ucjy6VIFr4v6ajBh5N3jiLKTkgLThIPKOnXO/wBK9Xvj7pO1QGi1cW5o5DhCDk42ASR8iTvUY6h413XUNuesOl7bIfbdAacdaCwVHuE7fIDrtn68ax8FeK2povx2x2ApzmSZV0k+GEgqJADe6sd/w9zUw8NfZmsVlkfxHVtyXfZyslSEjw2snrnuofapxslltNkje7Wm3xobXQpaQBn5nqaxqK+WfTloeu99ucS2wGBlyRJdCEJ9MnqT2A3PaqTe0h7VkjUTbmnOGi5Vvt24euygW33wRjDSerY6/Efi8gnG9UlKUpRUolSicknqTWKKKKKKKKKenBWZHh8Rbb72yl6M8otOoUMhST2x36dK+gsPRGjbhATjS1pdbcayMxG84OM4OM52G/pXCHBfQcm9tSY9hiMqa5VFnH8p05/MPLbGKmDS8GDaLaiJCszNtRgEpjsBKVHpn4R+9dsEEZ/fatM+ZEgQ3ps+UxEispK3XnnAhDaR3Uo7AepqtfGL2vtH6bMi2aGi/wDE9ySFJEoqKITS9wDzfidAO/w4BHRdUt4k8RNX8RLyq6arvL81fMS0xzFLDA8m0dE/Pqe5NNSiiiiiiiiiildpnv2y4MzYxHiNKCgFDIPoavHwO4/6DudkjQrvfGbBcWkJQtu4HkbVgDJDh+Hz6kH0qTXuL3CuNID0zXenD8JAUzPbcCuh/IT9jXB1L7VPB7TsUpiXm4X55HwhiBFKv/3c5EY+RNQzr72177KCo+idKxLaggj3q4uF9zfoQhPKlJHqViq56/4ja416+l3V2prhdQhZW2y4vlZbUe6Wk4Qk/ICmqaxRRRRRRRRRRRRWRRRWKKKKKKKKKKKKKKKKKKKKKKKKKKKK/9k=</field>
-      </record>
-
-      <record id="base.user_mit" model="res.users">
-          <field name="name">Minh</field>
-          <field name="login">mit</field>
-          <field name="password">mit</field>
-          <field name="image">/9j/4AAQSkZJRgABAQAAAQABAAD//gA7Q1JFQVRPUjogZ2QtanBlZyB2MS4wICh1c2luZyBJSkcgSlBFRyB2ODApLCBxdWFsaXR5ID0gNzUK/9sAQwAIBgYHBgUIBwcHCQkICgwUDQwLCwwZEhMPFB0aHx4dGhwcICQuJyAiLCMcHCg3KSwwMTQ0NB8nOT04MjwuMzQy/9sAQwEJCQkMCwwYDQ0YMiEcITIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIy/8AAEQgAoACgAwEiAAIRAQMRAf/EAB8AAAEFAQEBAQEBAAAAAAAAAAABAgMEBQYHCAkKC//EALUQAAIBAwMCBAMFBQQEAAABfQECAwAEEQUSITFBBhNRYQcicRQygZGhCCNCscEVUtHwJDNicoIJChYXGBkaJSYnKCkqNDU2Nzg5OkNERUZHSElKU1RVVldYWVpjZGVmZ2hpanN0dXZ3eHl6g4SFhoeIiYqSk5SVlpeYmZqio6Slpqeoqaqys7S1tre4ubrCw8TFxsfIycrS09TV1tfY2drh4uPk5ebn6Onq8fLz9PX29/j5+v/EAB8BAAMBAQEBAQEBAQEAAAAAAAABAgMEBQYHCAkKC//EALURAAIBAgQEAwQHBQQEAAECdwABAgMRBAUhMQYSQVEHYXETIjKBCBRCkaGxwQkjM1LwFWJy0QoWJDThJfEXGBkaJicoKSo1Njc4OTpDREVGR0hJSlNUVVZXWFlaY2RlZmdoaWpzdHV2d3h5eoKDhIWGh4iJipKTlJWWl5iZmqKjpKWmp6ipqrKztLW2t7i5usLDxMXGx8jJytLT1NXW19jZ2uLj5OXm5+jp6vLz9PX29/j5+v/aAAwDAQACEQMRAD8A77avUmnBY+c8+5oZVVsbweeueKNsanLSrj65/lWhAp2YxtHtRvGRxj6UI8B3jDsT93CnikfbjKBsHpuGKYhDNjI5pPNBwTmk+XAGVyfU4wKaQo5DK2OwB/nQA7zlBJAxUbzEDcT8o7mnKJDglFAJ7jFcP478ZRaPaz6ZBCXu5oirMThY1YHn3OM0hWOw+3QyRxSRMsiSnajJggnnv+FY3iG+WS0NnDLG1y7j5G6EDkj615H4dvZQ1jbXF1MtnFcboI88K5HUenPPpXcReXNFJ+9y8Fw43IeRzkH8Qf0p3A0rJizBZIHib03BgfxFcr4ouI5dZRVUZhQrnvnPNb9xqiW1m8odGl+7kevqa4HU7mV9QQwsHJUluepz60iytrCmS2RiBlXFR2bDkN6VLNILq0aMhkdTkhh6VAPlm46E8fWmDJLvzsRSI5xEflU9uc0698Vard6haXdw6ma0bfF5a7QO5HHb/GrKQPdBYowTI52qPU1j3cMlpeTQTY3xuU+XnkEioktR20PoPTb+LVLCG7t5UdZEViFbO0kZIPvVtVYtgDJPGK4DwDdtbyW8LDEd9ab1x0MkR2k/UrtNd8ZOOrD8atbGfkBjbuKAppyTYA2kZXsBSGck8g0wJDDI4yCoz2dqlSGSMF/OCj/ZHWgMgfdjJ9cf40bWc/NMqr6Z/pUhoO+bKsbhY1IxknJ/Hk0ixRu2d8sh/wBletKirFki5UfRc0b1bg3MuPYUegxfsqLHuEMjP6MKRonC5KrGo65f9MCms0CfdVn93Y1EZYieYxj2oAcrF258pQOhY5x+deQ/FXVtLnvoYIUWS/iUCWZMbdvZeOtd9431U6Z4VupLeApM42LKpJZc/wAVfO80jSOWdixPc0myooRrqZlUF2wowoz0pY7u4iOUldfdWIpkYDv8wJrWttBudQfbbrg4zg+lQ5WLUHLYhttUukBBkZlP3gT1rV0uWKZpmZsMzZAzVWXwxqdvIE8gsT6dKgNncWN4kc8TRN1B9aIzTYSpzjq0aOqQTLbtIkzkZGQcdPrVTeYU/eBzkZ5FbM8ZmsnQg8pS6eVlsYyQDgYOa0ZJh/2nJt2xl0bs6kgitbQ9C1DxNO95/ro4Zo4p/mAkfd/dz1PB/OnTWhbUY5VQbeAeOnrXaeCbiK016fTTiOK+h81MDpKhyCPfBP5UmhSZq6haRaTa6TeWpRYLG9TbtXaRDIPLIPfOTz7iusCbjyQD71W1vRpdQ0O8s0KmadSVkYYAbII/DIq9DbzrbxCdVEu0BsHILY7U0QyHbjjApmDkjnFXTCYz84Gcd6hdMnn9KoQKjnopb/gNIxZSQQFx2xT/AN5nBkYj03YqVGiVkZow20fMC33j60hlUuegJz6VIrRjGVMhIz97FSEK0u9FCD0HOKsieJSVy5TGBljQNFQJySYicdjnipPtnljCwQr9VzTljBctMpWPGASMc/4UgaIfLuXaf7opBY4z4pXM8/guUliFWZAQowME4/wrwEozMa+mfGdnDqfg7U7URgOIC6HHJZeR/Kvnz+xbsQGdVQqq5cZwVH+cVMmjSEXJaEOlWguLyKNuAW5NetaPp1vB+8Tkng/SuE8MxWsNyZZnjLqPl5yBXSXPiKPTn2BkYlQ4/iGD6kHg1zVE5StE66NoR5pHUXUUYYbR1rk/FVmr2cdxt+eGVeg7E4P+NXtP8QjUVfeUVlXdj2rMv9XM87W7MhToyqv9amNOSlY6alWHs73KA5XFUtLfyzNAT9xiRXWR6PafZBOXl2lN3zcdvSseXSftGpQxm3kgSJCZXwcsxHH9K6nUR5dr7DoY3lOEVmJ9Bmtm30vUVj+028RjvbUefbEnBLD+HHowyK1dLTbbopChgMNgYyR3rQaY2bC4ETP5ZDFE6ms/bNu1g5dDp/D+qw+I9Htr+CLBlX5kJyQw6r+B4q5NFGjlCD/tZHf0rjPDDX9n4x1fTmR7bTLpDf26H72SVDHHbJJ4rsmZEchZG3f7bdK2M0iVBbLGVZVHIIY9T/8AWpryQswSOEEngMvf86q7jICAQf8AdFRfaJEk5cooH5U7BewcMTtxj3pFA34z+NIOhO4A+mKBn1FMTJQqK33SwHcnFTRTx8sUAbsV4qrj3pB/vUDRLLK8x/euSB0zVW81ew0mF5rqYRrGu4tjcQPoKq3l+6B4bNRJMv32zwn59TXN3elzXkE0VyS3mjDMeefX8KmUkikmU/FWu+ILkRjTiBYzod5WMFyD2yfaufjeLU9HSNBIbmFsNGHC4HOePyrc0+XyLp9Hvh5bKA0LseDj0NM8R+HfOgkvbTdFqEIydnHmj0+uOlYzfMdeHqeyb0vc5bT7eGIP8qsCckMM1efw9aakjMly0BPUAZB/wrGtJ3Pyk4OcEHrXSadE8kLsjAsuMAmsHJpnZBQktUTafbWGknyBIqSsNjySDBcfyxUEegWTXwlEpYFvujGCCfWtePynti93ctEV/gNsWz9CDzVnSNNaa6ErnKLyOMden40KTvdCqKCha2hoWOnfbb6NX2raod8oI6gdB+J/Sk8X6czPHqts7B1wkxA6jscfpVw6taaSGFwUWEnmUsAB7e9bO2G4g5Cywyrj1DAj/wCvXVCK5TypNpnB6ZdlpWVyOcMCvTHT8OR+tdFgSxZHUVz91ZvperLESI2UHZNt3LInYMPbpmt+1k82NSyYJ67DkE1zzTTKRa0a0dtQfWLuXzLt7dbYxk/KqqTyPrwa2sgk4VeetUNL8sGVN4Vs5UH0q5ja3XI/KuqnK6uZNO5IJXTIREBPemMkbt+8J24PpyaBtHr19aC2ScZwParuIQDHVRnNOkbcBhQmB270zkgkMpAOOvNLk5O4HpQMAc8k/pWTrWqLYp5Ubfv3HbkqPWtKeVbW3eebKxKpYt7VxLeZqV9NclSvmHPvjsPypSdkNK7JbVJp45ZIyVVOTjktzWlBHMsYYMJF74NVrKT7PIFRGIJ7VryQNCheEbj1KAY3CsJSNUjE1nS01a3KcJcRndFJjHPofY1zZ1PU7YG1uM/JgFX+8pByMGvQB5c8auvQ9D3+lZut2Pn2wmSNHkhHzRuMiVO445BHY1N7Fo4i+0hNVYXOnbIrxvvxE7Vf3HvUFjfSabcm3vonhkAwyuMZHr9K1SbUndaF43HIyCSD7irQ1Xz40hv9NklB4DeXvU/4VMopmsKjiRrPaTlBHcM2eig5rS1DWYND0ld3JPO0cFj6fT3rG1K50/w/bC5tbCOOaXKqDn8fpXEXl7d6pc+bcM0jfwqo6D0A9KqnS6k1sRzKx0Njp2oeLr5rq4dktN2Ax+6PZR0rufD0U1nepZaVJJPp0eRciRtyo3YIeu7PUDiua8I+HtWe3bz7mS1sZuGRfvMPb+79a7VPM0+NYLFdgQBcDsKu7UvIwtzK7L2raYmqWw58u4jH7pyOh9D7Vz1k7QyFCWilBw6EcZrehvb1Yz9oWMj/AGeGNU9WsfNP9pWh3Mq4ljH8aj+opzSmtCVeOjLMfI3jCv6gVetLoFsSBS44K46j2zWPY3IliVlbIIyPpVh8giRchhyDWEJODLaTNvzdrghAoHbNNfBJPAzjp2qCCUXEQfkHv9akBAHfNdid1dGJ5PLHLbSmNwyOvBGMGmi6uVPyzOR2+Y13N94YmvwBNqbybT8vmIP5isxvBE+75LxAO2VP+NdEakdpGDg+hjQXs8iLHPdTNHxiJpCRxyK6G3MUMalz8zDIUHmsbUvD8ulNBI86yrKxTKqRg9RSo+7gHPzbR/Wuao+Z6HTT91HRK6uRtUH2x0q7HOyKEK/L096o6ZZkwEyEjIwMelXPsm0grdzhR/CxBH61hKxsncUlIy8qcAnLL6e9R+fuMm0/cAYfiaSUNuGz5kHfp/kVWsUV31ACQsDMoGRgqoCnH4c0mhmj9nhdt7xqJMZDDgn8RTJLVJQUcuSeATyR+NTO2E3cDAz9KhdmC70kB75U84pINjzCPR9S8Q3t1G5LrYfugzttDncRnOD6E10Nn4HSKFi8uGIx+5JGD9Tyf0+lanhGNotLmjlw0y3MiufXB4/TFbyja208r2PpVOT2JSV7lezaa30+NbllaVflZh0bHQ/yqRZUiiUucyPyT6morzOYSoBXJZsnFZdnd/2gXkRsxtIQhHZeg/kT+IqRm2twqLvlYKD0zRHOI2EkZDK3UetQPJFEVTAkmI+UHmp0lWMfvDuYjt/nimtHdA0mZuoWw09hd2inyGb94mfuH1+lWre6WaIcmpJGgmglhJ2pKpVgawbR5rG48iYEY6Hs3uDRNX1RK0OitpliuMZ+Rzj6GtMMAK5wyAg4PX1NbOn3SXEIK4Lp8r89DVUZdGTUj1NAxyHB2Dn0pgQg42nNPWc7dnykDnkc0skjPtJRsjjIroM7XOU8b3kdtp1tETiV5gyqR6A8/mRXL6FJ9t1WKEsAhBbk9hya1viXA7WtldiXEkbFPLbuDzkfl+tcVpN2TcRTLwwOCCe9S9ho9XaWNFCxLuxwOwFEStISXcknjA4x9BWRpt08smwnI25z6VqW9wot3mxlWfYgHfFc+xve5I1sFO5rhwPTAqq8qQSErITk8qQCTj3qaNZGJeQ5Zu3YCgRxM5Ujn2oABcechJTaOwJqIQ7CXgIVCfmjPTPt3FPmjCsqqxLkZVAO2cZpjR3GWCkqre3NFuwrsjsdkOp30IGN+ybHuQQf/Qats5yozxmoIrbZceaSd23YWPUjrj86SeaOKIPJIiAN1dgo/Wkxoqa3eG10y7k43CLao/2jwP1NccNYk0TzooJBlbZcBuQGLcHHsBW14mDX628Fq8chkfAKyDDHqBnpzj8689vVvbrUWtVhnlvGwohSMluB6f561UUDasejeHNTGoWokkl33GcMe9bivG9w8O/dMqh2jU8qD0z6Zry3Q31XQdaeKWGNbhY932SaUIW449s85xwauN4niu1ntZpbrSLySQGa6UE7yBjDL1X8OlNrsSpHpXmQI2wqGI6gdqrahbC4hHkEiRDuCnv7A1wdrq2v+HWS4vYmvdLdx/pC/vEYequOn0Neh2mqWd4QkFwhcqGMR+VwD04PNLbcFqecav4m1KCX7KsT2wwd24Yf/wCt+FdN4M1T+zYreC7uIZItRk3Q7W3MrdDu9OgFQ+ObKBUs7xogZDJsdx1KDnB/z0qDQDHd6g9xbW6wsybI1SPLM3ryMKPcVpFK10ZTvex6ftXgqSCDmh3J58zJz0rZXSY0jU/eI7Z4NZ+rQ2unafcahMpiihUsxLDH0A96vmCzPI/iJqrS6w1ouXW3jC+25huP8xXEWUzW05LYAYjp2Na3iTUjrepy3RjWENg7F9uMn3xWHtPXdQwR6Bo2qkFwSSzrtzXR6TKz2xJOQrEL7V5TZan9lfDnHoa6Sw8STQjAb5GOQKyavsaRfc9CEpRT69qRG2sOfnbkn0rnrXxAJtokXB9a1I7nzG3dazaaLUrmgjFrmSY8AgIo9h/9cmrK/MKopM204jP1pRc+WCWBA9e1Ayy5JB3oVAwPY15v8TEXdp7oMr86n68dq9Akuw2wYYqe4GAa86+Jl4HNhbjadu5iRz6Afypx3E2cW8d1BChIkiicAr1ANMtr29gmeSC6mjmkG1mVzuYehP5Vq3+r2t7olva/ZvKmgJw4/izgAewGM/jWArEjOK2Zl0uddZ2uk6rCbLVZJtP1lW4uJSWWYHoGz0/D/wCtVfUtMvNImFrrlrIUZtqXUXJ+oPRh7GtLwnFpurWh0rXbhkMpzZTSPhcdCit/Cc8+nPStnUdO8SeELF4ZY01fQuN0U652Lz+I+oyPpUXs7AjmkttU0WwW/wBNv1n02ZxGXjOVzn7rxnoeKdr/AIkvp/EaXEjRCazbyo3jQKcA8g+vORWZE1k+ry3VtHKljF++2SsCwx0XI6/NgA+lR6ZYza9rMdokgWSZizSNzjgmqS7jses2gj8a+HLR9/lBpNzZwSpGQetdJonh/TdMU+W2JMY3udze/wBPwrL8PaJdaZpX2W4ugxVj5TwJtO3HQg575rQOlrMxWW4uHUjBXfgEfhTSsiG0yqvxH1FSQ1nbH0GTXG+O/GV/riw27oqQL83ko3Bb1Pr7ZqSdLCWN3tfOiVB8rSMfn+nWuVvtAlklnuBcypOSG8uQdQeRyOh+tdUqWnurX/M5o4iPNaT0MiWaZE3Mqj2HNUTPO/PAB9qfOJoJjHODvU4IJpnmqRzjPYVztWdmdKd1dFSd33bWYmpIJ7hEBjlPsCelQTK4O4g81JG37k+opK1xtmlbeINQtmwdrY7NXQWfjqaKMLLZ89ij/wBDXHsQX3dcsBT93IH40+RPcXMzv08biS2P+k3FrL2xErj8QTVSL4iXkE5WeJZ4zwWi+Un361x0bg5JHXoKcRnsAKapRBzZ1GoePbgXavpVu0MG3DpKd28+/pWDrmr3GtrFqEyIgjxDtQn0znn/ADxVJl+X5cZ9+9RLA0qyKSFIBfGeOP8A61JwS2BSbK7zF+OgpvnP0zxTAOv5UnQ9Kgsvx6gUgMOWMZbcYzyufUDsa2LTxnrGmQG2s9UuTblceVLiRfphs8VzSJufHSr0cSKAAAT700rkt2Bbme4Vo8hVZ974GMn/ACauwXdzaxPFBO8SOQWCHGSPcc1AoWMcAZoB5LHr2FaqK6kuTPWfBXjhdRWPTNSfF2PljlJ/1nsf9r+dd3uI4r5sRmWQOpIZSCpB5B9a9s8AeKotf057TUELahbDJcNgyp/ex6+tNx6onyOeurOxhVzAzyQKOFMn3mz2x68/lVGQalaRzwpuitwFdw+OATx/n0riF1e98oRm7l2DohbIFLcane3mWluXkJxnnHTgVr9ZXLyNXXnr/kc7wvvc19fLQ2NX8Pzs81w93awjB5llA3sMcD0JBBrjmjk3cg1bydxPf1NPB4ya5pylKV2dUI8q5dytHKR8sgOD3NSGNfvIRyKlyPTIpMoD93H0qUyiFuFUcdaX70h9BUjRgn1FRO4Ube9Vcmw9DuYL0FTnB4xVaIgAmrCgEbia0RLF46cGnW8Ya5EeOJfkw3qabgsf7opJJGiKyIfnRgQabEtynPavDJhvwxTHj2qCM8danlkkmcu2Dli3HvyaRuh9KysmattFYHnI5qzG5GOetaXhnwvf+KdU+w2AUMFLvI/3VHufeqNzZz2F89rcxGOaN9rK3UULQT1JCcYA6nrSswAIHU1C77WYj1xUZYsRzVOViVG5bGQox1q3pmpXej6lDfWj7J4jlT2Psfas/cUwAcmpI3BJ8xscZHGapTT0YONj/9k=</field>
-      </record>
-
-      <record id="base.user_niv" model="res.users">
-          <field name="name">Nicolas</field>
-          <field name="login">niv</field>
-          <field name="password">niv</field>
-          <field name="image">/9j/4AAQSkZJRgABAQAAAQABAAD//gA7Q1JFQVRPUjogZ2QtanBlZyB2MS4wICh1c2luZyBJSkcgSlBFRyB2NjIpLCBxdWFsaXR5ID0gODUK/9sAQwAFAwQEBAMFBAQEBQUFBgcMCAcHBwcPCwsJDBEPEhIRDxERExYcFxMUGhURERghGBodHR8fHxMXIiQiHiQcHh8e/9sAQwEFBQUHBgcOCAgOHhQRFB4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4e/8AAEQgA4wDIAwEiAAIRAQMRAf/EAB8AAAEFAQEBAQEBAAAAAAAAAAABAgMEBQYHCAkKC//EALUQAAIBAwMCBAMFBQQEAAABfQECAwAEEQUSITFBBhNRYQcicRQygZGhCCNCscEVUtHwJDNicoIJChYXGBkaJSYnKCkqNDU2Nzg5OkNERUZHSElKU1RVVldYWVpjZGVmZ2hpanN0dXZ3eHl6g4SFhoeIiYqSk5SVlpeYmZqio6Slpqeoqaqys7S1tre4ubrCw8TFxsfIycrS09TV1tfY2drh4uPk5ebn6Onq8fLz9PX29/j5+v/EAB8BAAMBAQEBAQEBAQEAAAAAAAABAgMEBQYHCAkKC//EALURAAIBAgQEAwQHBQQEAAECdwABAgMRBAUhMQYSQVEHYXETIjKBCBRCkaGxwQkjM1LwFWJy0QoWJDThJfEXGBkaJicoKSo1Njc4OTpDREVGR0hJSlNUVVZXWFlaY2RlZmdoaWpzdHV2d3h5eoKDhIWGh4iJipKTlJWWl5iZmqKjpKWmp6ipqrKztLW2t7i5usLDxMXGx8jJytLT1NXW19jZ2uLj5OXm5+jp6vLz9PX29/j5+v/aAAwDAQACEQMRAD8A+YLpJGifLBtpwSDkH6VnNGpcDOD6V0AtlkjRYwWKgKcjrWLPDJDNlkYDPUjrXPFmvLZ3JGTbgD0rQ0dsq6Hsc1TMbyKGRSRVjTVMdx8xABGOTWMk2rHp0akVJWJtVRDbrvHAkXv71V1Kyiig3xAqQRnk07UbhLmNoVU4DZyDnpUEt1JJaiAuDgYJxyRRTjKyFXq05SaZQZfkLAnNRMPm65q8IJPKD7G2NkKxXAOOuKqEcDjBHBrqTvsefytbkYRc8Uo44x+VOx6CrMFnIzAyIUTPPrRcEiBf9W/4UzPPStGa1iDuIchOPvH0qWDTZJXKInzKu7GDkipckUkZYUnn1oVGZgFGTWxHYuTtUKWzgKOT+lPhtQBhjtUnG7Hek5FoxGUgkEVFJgcAc11i6EJ418mUGNs4d12gn/Prim3fgjVAC0GyVhnKqwPfBwe+KIzjcU07aHIGgdKt6jYXVhcNb3MZjkHUVUwc1te+xy2a3A0DpSnpSdKRQlBpcUUCsFIvFL0HQUAE9jQMRThqKCCvJ/Siiwr2Op/tBIuUUmoZriW5ZR5JYdwBmtN20u0ODChb/aOaY2uQxqNsYCE9dnFcCqPoj1nSivikZjXEMPylJMgdMYxTneU2S3a2/wC5Z/LD5/ixmte4FvqUG4qoyOCKz47jy9Lu9NcD76unsRnP86bm101Lp4eDbu+mhjysN+MHd0PPelhUuwGcDuSabNBIuZSGwW4wOuaYgkjlUuCARuA9RXXe60PLacZ6nsvxE0KLR/hT4RhDq7tH9oJ24IMo3Efhx+VeSTRb5WQDmu38YeK5/EOlaJZMjpFYWSRHd/EwGC30wB+tZ3hLTra91tDcgtFGu58H3rzsthVo0W627bf4noY6UKlRKn0SIPDPhWa7KTXSssZIwqjLf4fnXSW2g2caPI93axquCqyYdm56YBrpL+W3jt1iSMQwMuB/ESAOP8k1iNp9vdQrDYu4ZWzudQAPrVyrORCo2KuoWWnBl8lWW4VxtbyFRSMeh4HPFV9U0+YRhfs9tNklhNGPLcdM5A4AH079615tB1CMhZQssYx80fzY9xWvY+Hbt4mbfvwnyFgTuHceoI9vWkqttx+yOP0y1uLGWLV9sTAFlBY5+Yrjp6jOfwpmhaE93qUSi3aRFUyOD02LySfyr0vw/oNquj6lZ3iKglVSjHqjrkqR+ZqW08NmCOe3uL1o7drQKJ0XAfDAsox144pe2KVE5u7ubC9uIbPTWS18hQmYgEjTAwzE8s7HnHSrmmRKhKWssIhVsPOYW3yE4+XJOKdYab9muXgtrNYzMvM0p2HYeMD09z1roYY9CtNMtYpZhOI5T58pGFJ7KvP1zWbqLoN0mjg/Emm6ZdQSW1/LK7gHyjLwU9MHOe/cV5Vr2mf2de+WrmSNhlGIwcH2r6E1vSbC+nW8sGNvuJVI1RcEdyc9Rz1rzf4j6IsGnSujJL5T7hICBxnHTt9K6aFazsYVqV1c8wI4pp64qcpjHeomJ78etdyOHZDcH6UDBOM5oGD0PWnWzRJdI0sZlRWBZA23cPTPah6E3uxpJGMCnRyld29QwYcZ7fSrOrz21zfNNZ2UdjAcbYUdnxx6sSTVVkZcMTtzzzQtRyVnZMTJcgY4xjAopuSP8aKr0IOxvY8xyEpyy5BIrKBaS2UYyAABXSSqZFCOTtXoM0yO1gjGAgXFeWpdz3qlJt6FPQ4mhtCXyAWJA9BVG/KteSFT1Nb89vPPEY7YoGCknPpWFdW8trOEuI+TyMHg++atSTZMocsUkO86MadsJUHzMbfUVWhfy7pJSgcDjkdqJlZZMDaoAA6d8DNTW1jdXCb1+72JOM4rWNlHU5Zqc5qy2LN9P5sCSxDbgEENxXWfBvE9xfebgpgbvlBOPQE9K4G7jMYZHX5weua7/wCDKh1v4TIVJAbHqBUzXLTY781TXc7mazK6Wz2aRSkngKq5Oe3qT9KzNP8ADl3eT77narKcY3f0FdloUOLYL5KYIwWC43GvRPA+gRlleSGMBeT8oOa86U3sd0NDl/CPgp4bRyw37lwMHgVdvNE1JoGtILTHz7sjqD6g17NaW0CAKqL9AK0YILZSCIUz64qbNl2tqzxD/hFfEdxp2ya0ilYHIkC4fr0PrWtoPg++nsxbXls0ZhfcoIyPfFe220SfKNi/lUl1Ei4IQZ+lP2d9zL26TtY8dv8A4ZWs7tdSyNK7cgYx9K5nW/hhbbVZGZCvQAZFe7XI9qwdZQNGcAUcqRrzNo8FudDl0WbLQpImzG8sR+dcP8SrCW98M3KQrbIx2sXZwqnBz948V7vrlvFcwTwuASBkGvn34uxHTvD1zFDMdsrBcZPHPP6VrQ+NWOat8LbPFbmAwNsZ0Y4z8pyPzqjIpyT71aBJyCxPHFQz8Hj0r25OPN7ux5PLpqQFHxkCmgc1LuKg8ZqIkk5PWhamckktB6cnjBxViOwupIzM0TrGMZZhxz0qC2dUmBfGK6dbj7VoYjjfasSKHUj7xBwCPwxWFWbjsdGHpxqfEc3JA8Jw6Yz3orWnjUoM42YwaKuMtAnRs9DormQxxs+Mt2FYF7qF4C/zBdrbTiuiu03Qvx1HFczfKN8u7o2D+OBXHRXMz0cW5RehY07Vri2uEEr70bjNb+rwrNp/mgD5PnX6d647BII646V17Zj0AeZnf5GCD9OKqrTSd0Rh6jaakYN4G+0kFSDtH51JbX81tEI02YznkZNNnYO0TZJO3afyq5oixtduGRSduVyM45ouuXUaT9pZMy7ljIWcvuPtXZfBqQx+ImjOMPH3PvWB4iiiSRZFChj2HcVq/CaZYvGVqXICkNnI9qG1Ok7Gc4uFWzZ9GaVZRRruyc/e+mfSvRPB00RtwEjIGOM15rNqRjWSJhggAA4ruvBJkFqsjbgD0z3ryJSsz0oQujurRieelaEUyhgDWba7fKAzljWjbwM2CRVQbZq0ktTWtbhVx/KrMswkHUCqdrbbzhjirDWLKeH4rpSdjzZqCkZt6eTiuc1mRwhwOldbeQJGv3sk1gav9kjiZrieONe5ZsVnKB105xcTgdYwYWkU8kFa+e/jApk8PXxlKq8M6jGeT717R408SaRp0pijuhIrd0ORXjPxJ0278Rx3D6SqzHyPOfDYyqtzVYe6nZmddc0NDw1xzgA+lROmARk/jVp05I6HPPtUOCCQQa9pHiO5WIY9CB/WmMAR0wassdsRwOp5OaiIHU/4VSZDK+Dmr2lXps5WDH91IhRwPQ96qOMnpTQMUpxUlZhGbg7o1/OilhKCUc9/SiscdaKj2dti3XctWekuu/jOe1ZU+iSzSttkRVPrV7E0gB83ZnnCrzWZrglt44ZPtE5jdirfN3GD2+tebSlrY97E07w52ixb6TY2R3XVyrEDOCQBUeq6hFPtt7di0efmbsaxDPB2Qk+uKako3DaOBiuqzerPO50tEXnHyZHVSD+taFlYvOBIJvLzx8vWqGePqK2NBcbCnoc1lOTUdDto04zmrjNQ0qOGJXLySFuCWNdP4A8DeKr23j8QaRphmghkyCGAZwOuB3rK1GW3NvteQBgeAa+tfhtHYn4a6Dc6WVCGCNQU6hsYYfmDWPtZqJ1rDU5TPNNLuPt2tWiXMbxkN80bjByPb8K9Ta/jsbUM/Cg8cdBWH4v0xf8AhM7W7jgCF1/eso4LAdfyNb/9inVJo1dz5aYJGetebN3ZtyqKsRWGvazfXGNOhUQp94nqT6ZNXbjxJ4vtSBFYW8gXqN4bP61HrOm6hBCkFgGCZwx7AfTvU2n+HreTUILny53CgeYJTuyRjp9cV0UUpaXsY1Yu10rkmieOteknMV5pGxc/fB6V3Gk6rPeQBnUqTzgZrLh0uCSV7gwJCh6RgHH/ANan6VJ9nunhXgenpTTnFkunCS0WpD4t1ma0i2RAmZvuLnvXl/inTtWuiRqd1PiXjZGmQRz3Yj9K9D1tUOux/aFLLIpVecYOc0/VLV9QEYfomMNnJ/M1cWr+8S4OySPHZ9C0aS4OiT6c8NzsLBpXJJ+hzjvVXwVpC6d4yksryPEDWkgBPQDg/wBDXpV14fVdQW8kLSuowGc5NcZ8QUMcWuTxS+TLHo0zRsODuBH+NKOs7IbSWp8j63EsOp3MSfdEjbfTGeKzn9+ea6FBZajCqSErOPl981HpWjGW+YT8LFzg/wAQr1VWSvc8iWHlOV49TnpAQOgFRkEcnn2rvpNKs7m0mj+zxrMoyrbcc81xmoW0lpI0Lg5B64qqVaMzPE4SVHXoU442m3Ku4kDI96rsSDjGKuWU5t5S+3ORjIqvLiSRn6ZNbq9zkdrEXHvRSgc0VRJ6ROoSUBeMD0rN123e6s2jTJZWDgD8q1b5SsoI71AeG3N3XtXz1OTTufa1aalBxZzEekS7dz5A7Z4qwunxxqSTz6AVqyYUEHsagmbIBA6iuv2smeYsJTiUHXaRjp0q5orlbgr2ZTj61VkGRzTrGTy7qN/Q1e8RR92asGps32j5s173+yP4tkj1KfwneTZtZf8ASLcMfuuMBgPqOfwrxXWLZXi8xetM8Ha3d+HvEFnq9k22a2kDjPf1B9iKElOnYcr06tz7l8eNbiWzeMgkSbW+pB/+tT/D037wrwOKyNN1ez8XeAl1Kw/eNIgnX1Rl6r/MVJ4cuBujk3cMOa8isvePQjblO7iiV1zjOfWrduiJ0jH5VUsZFZB9K0IsY5ramluc9RhPnZnGOOgrDVxHfE/xZ5rW1Wd1tZDEhLAcVzWnuvmu8ko3s3c1U3rYuhH3bsb4tYt5Myg/I2SRV7TWE1orD07Ua5FajTZHa4UnHrVXwg5fSQz8/MwB9RTad7l+70JNUGyJjnivGvivfhNO1V42jBNsICT1+c9B78V674mmEdnIx7Cvlv4nahJPrckXmEp94rnjPat8NDmqI4sXU5IM8lsfKhkmEjqsscmQD1Na0M4+1rMuQSMGub1net/MWGCXJFSWuollUtwyDn6V21qOt0edRxKUbM7Ka8tLOBrlgVXqRn9BXCaxfyahdNNJ8q5+VOwFJqN/LdsAxIjX7q/1qkcnmroUOTV7kYnFuqlFbDWA74o+TaARQ3PB603FdLOEaQD0opTxRQB6bfruAOM4NUZQPLHGQOtaF4vyEcc1nnlSDXzUGfdTKjfM7E55qCThM4qd+D61DJ0NdcTgqKxUk5qIHDVM3HeoTwxrojqjkk7M6RFF1ZLyOVrnbiFoLgrit3QZN9vsP8Jq3HpKaxqCWds0XmkFizvtUADJyf8APas6cnCTRtXip0076nT/AAM1/XbHXjZ2OozQWjxs00QAKtx6HpXu/hW5eKaaxlfLwP8AKfVTgg/kRXA/CzwW2maSbmeMLPNjcR/CPT9a7XV4JrGaz1ONSAV8qb8Oh/mK8vEV1UqtR2OmjBxpLm3PUtGuMqPet2OTjtXC+HdRSWFW3DkA4zXX2cgliLA5pxbSM5WZZaeMkru5rNu9It50eQwAE91ODUWqQajD+/s5lPrGVzge1ZyaprAVh8hI7Zx+ldEWmXSozmrxY2bRGjHmyNNKAejHgCrkE8VvbrCqbABjAHSsTVdT1l49okVCx4CjJrQ0qzdbQyXk8jSkZJY/06VM2uhVWlOktWYvje+2adINwzivlrxPdC41i5k6qXIB+le0/GjxNb6XaSR+aFd/kX6mvBJJlmywYNu5yO9enl1LeTPCx9W9onF66pk1GZiRnPbpWU6lcEcf1rRvCftMoPUO2fzqhPnIGe9d73PNuNxnmmk88mnjFMYd8UwA+uOKacdqcPXPFNxz6UBYa1FB680UxHqc4+Tis08PjrWjKxwV61SuAFO6vl4H3tQz5hhsn1qvMeetWrnqfeqkhBFdkNjz6qsyvJ1NV2+9jnNWJf0pqqAckZNddOLZ51eoo6E+nvLGrqDjd1rpPBOoW2leIrW9vIzJbq+JFHXB7j6VzsIwM/j9aswEt1NaypRaaOJ1ZNp9j7T8NQWF/pEVzp8sc0E8e6N15BFWjpcd/ps1o65J5H1r58+BPxEk8LaoumapKX0e5b5snPkMf4x7eo/HtX01ZNGLwmF1eN8SRsvIZT3FfO1cK6E/I9qlifbR8zzS1muvD+rfZrjd5DNhG9PY16P4f1JJI1IYEHtTvE/h621W1LbFJI+bivPSmr+F7tiUkuLTPUZLJ/jVpMHJNnscL+Z8ygVU1OwM43JGu76VzfhbxbY38atFOhboyk4Irpl1m0QbpZVHGetbwiTzuL0KMOlxxZaQKH/PFYHjHV7fSrCaeWdURATnNa2teJNNjt3ma5iRFySxcCvl/wCOXxATW7g6Tpc5a1T/AFsitw59B7VrSoynIyr10o3ZwvxG8SzeI9bkuNxFujERKT+tc1Bcy28m6NiQeozxRIQevNQP04r2IR5VZHi1Jc7uyrftuvJXAwHbdVK6+6CPUVoOofg+tULqNkIG4kfTpWlzCxCDxjFGRSj2oYZpgMLBW6U0lmPFOPX3pOnagLiYz1NFO6UUxnp2Tmqd4MpzVt+H6VWuDlG/Svlon3dRWMyY/KKrSEKDk4qxcMqIQx+btVAku2TzXp0KfOePi66p6dRCSwyegp6r0yaAgqeIDcBjp1r0IxUVY8WU3J3ZIqAD5TmnJxwR9KMZP3fyoJ2n2oM7lmGTkZ4r3D4FfEf7LPbeHdauD5OdlrO7fcyfuH2z09K8KQke4FTwyYOQSCK561FVI2ZtSquDuj9A7SUFB0INU9V06G4RvlGT2rwT4JfGGONIfD3iu42gYS3vXPvwrn+v519ApOksKyRMrowyrKcgivMdJwdmelGqp6o871/wdYTTmdI2t5s/6yBih/SsJ/C8zs0cmvalsH8JlHT8q9J1eRQrEH9a828YXjssio5QAHcwbGB9aqK1shSkeWfF+8sNItjpNhLLcXEn+tlkkLbR6DtXkkjk8+tavinURqGuTSIxaFWKISeoHf8AGsbPykehr1aMOWJ5tafNIa/X61G5wKc5+U4qFmGDx2rc52xgPrzTZFVlPGfrSjBzSE5BFAjOljaNyD09aYTxxWhIoZSGGc/pVKWMxtg00SQnnnvQB7n86celBGQKYDc5/Cil49MUUBY9PnHB9qoXUgjRmY8YrRuxjPzdRXN+I5zhLdSAWPP0r5mhHnkkfdYqapxbZQaVriVpD0PQe1SLjGOlQooAwB0FTRjpmvehFRWh8jVm5yuyRB7mpoV+UtkjNNVRipwuIwOOKu5ixq+1OODwe9G0EgngUjEZxmkSKrHoTTwdvIqE5HTGRTt3GaBj3k28nkdeK7nwF8V/FHhFEtrecX2njpb3BJC/7pzla4IEdD0qJsryvT0pOKe5UZtbHv8Ae/H/AE+6sSH0O5juCPurICufr1ry7xl8QNV8QI1vGFs7Rz8yIfmf6muPLA8+vamFsHgUlSitUipVW1YQkButNU/vWFI3DA+9BbE2R6VsjIR+GIqCQYNSyNkg96hl/vGgljenPT0FAGBSDn6n9KcBxgdO9AhoU9TTZIg64IzmpV+dgO1a3hrRbvXNZtdLsYzJPcSBFGOnqT7AZP4UpS5VcaV3Yy77w7qdrpcGptbs1nMCVkAyBg459KyCnHSvtGbwbZ2nh230hUV4reBYhkdcDBP414l4/wDhb5Mkl1pACHqYj0P09K46eMTdpHZPBu14njJznFFXdRsLiynMFzE0Ui9QaK7VJPY43FrRnoF5KNik8ADmuLuZftOoSy9Qp2rXQ61I8NrIw6beDXLWHMQbuxJryMBT3kfS5vVekS4lSxjBpsSljgVbt1UAHH516iR4DdhwUlRx9akYenSlVyM4pvmEHIP/ANegybAEgcjFMk/vDrTpXLAdD9Ki39/50xXFVtw96RDgEGmE7TkHijd/EKZSHFiM+1MJ460snYjp0qInBosFwJ+Y0E4ppPNIx4HNMVwc/MDTGP7xeeMUr5wDmmOfmWgVxZODUUh9TwKlc8Cs/UnZICV4O6mS2WAy560pIPA4+tYyXcgPIBFdd4K/4Ra8uki1y4u7cEjJQqF/PFTN8quOOrsQ6PY3N/eRWdjbyTzysFjjRcsxNfWHwP8AhjH4Q046pqYR9ZuY8EdRAp/hHv6n8Kg+F+meEdFtVl0K1h8yRRm4Zt7t/wAC/wAK9Ktb1XUAGvPq1XN26HZSpcurIr23LEgqNvauZ1jS0k3AqCK7Qsjqc1QvLcEHgVzTh1O2E7HhnjjwRZ6lE3mwDcOjAciivU9QsUlypAz9KKzVWcdLmjpwlq0fIfik40txXO6eM26fSuk8WrjTHI7cVzelkeSoPoa7MA/cYZv/ABUaUWAVHqantzww96rREbh6Cp7Y8Me26u88dkqt82M9RSHJGR1FI3PPSkDfNkHg9KaIdgyAcj8RTHw2QRgkU5yPxpuRjP8AkUxELMycN0pA2MqPqKlkUMOaqB2VwrZ46UKwXsWg2V571G36ilRhkj06U2QndntTACQQajOe9L1z1zSH3NMQjkcCmMSCKVjznimSEkr9aQNj5D8tUNSP7vGOpq23TrVHUjiNfrTQiiEDDtTVDI2CeaFJB4okJJzVMSOq8GeN9Z8N3Cm2uGeDI3QsePw9K+i/h38VNN12JYzMIbkABonIB/D1r5MABGRwamtbia3lWWGRo3U5DKcEVzVaMZm9Os4n31Y6ykqgq4I+taK3quBzx618g+CPizqWmNHb6puuYRx5g+8P8a9v8K+P9K1i3DW13G5x93d8w/CuGpSlE7oVYyPQJ5R5ue1FYZ1FZlykgPsKK5JXudd0fKnilz/ZcjN1Jrm7A7FUf7Na3iaUnTSM9TWNCcLHz0OK78DG1MjNZXqmlE3yD1JqxakYOecNVVegx29qntT8rH3ruPILJGR2pmMp7jpQDnimvxyOxoJG7xjmhgMZHHrTH4O4dPSnK2Rkc0wGFiOR0qCfDkOvUdRU7euP0qF+DkUxMcjDK+9E33QfQ1G2Aw+vFStzGfpQIYTkA01jjp3pI24A9qH5XGeaAGluaZIRxRk801z0x60CHN93rVLUOYPoatk8VWuxmF/pTQGaeMH1ppoz2pAfU1RI5Dg4708NhhUXfpn1p2eRSGT47gkGprS6ubSUSwSyRup4ZGwaijGY885zS5xRy3DmsegeE/ijq+mOsd+TdQ9znDD/ABorz513DK0Vzyw0W7nRHESS3Og8SE/ZVHq2KzScJn0xUmp3D3ALuSfm4GeBUTZyRnrWeHg4wszsx1RTqXL6NkZqzanMZ+tUbVswoevFXLUnyifc10HCT59KD05pN3OM0jEnvxTJeoxgMn3pnKNx0qRzxTCcjHGaaCw4nIBB4NRS8gggYpnzJ90ZXuPSkd9y8GgQw8EfWplztHOaryNgZFTJIrKCO4oEiIfK3tmnHrnJpJepx6ZpobKjmgQ0ghjzTZPQUsvY+lMc0BsLn5e1QzcxsPUVITTG5pgZIRmcKOucCr7aVKIGldwMDIAGaqR4F2oc8bq6NS7RBAoZMelROTjYqKT3OXVym4eowaWMgEHGSe2akvAqXUgXpu6DtUSkK6mrXcjYs5wAO9GfT9abnJJxQOa0IJVOOaKENFF7DvYtXX+pb6ilk6L9BRRXJS2O2t0J7L/Un2Y1dtfuCiitTFkx603tRRTYgwD1qM9aKKEAMSGGO9QyABuKKKBEM33jRb/doopoSJJOq1Evf60UUmHUa/SmP2oooExhJpO1FFAkZtx/r2+tPFzcLHsWZwvpmiihjID60hoopslk0Z/d1JF80iA8gnFFFaEs7Cxs7WPayQIG25zjnpRRRWTJZ//Z</field>
-      </record>
-
-      <record id="base.user_stw" model="res.users">
-          <field name="name">Stéphane</field>
-          <field name="login">stw</field>
-          <field name="password">stw</field>
-          <field name="image">/9j/4AAQSkZJRgABAgAAAQABAAD//gAEKgD/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/2wBDAAUEBAUEAwUFBAUGBgUGCA4JCAcHCBEMDQoOFBEVFBMRExMWGB8bFhceFxMTGyUcHiAhIyMjFRomKSYiKR8iIyL/2wBDAQYGBggHCBAJCRAiFhMWIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiL/wgARCACvALQDACIAAREBAhEB/8QAHAAAAQUBAQEAAAAAAAAAAAAABgIDBAUHAQAI/8QAGQEAAwEBAQAAAAAAAAAAAAAAAQIDAAQF/8QAGQEAAwEBAQAAAAAAAAAAAAAAAQIDAAQF/9oADAMAAAERAhEAAAHJi4NLM9joubaLWJH5KivIcgZQuiC7fnsLxL2EGq4E+uEpUupdwu/Vy2MpTK6G6MM2Uywau8QrBhOOXxpaWtSy8iJIt5GJJwhaTBtdwoa9g7U2lG2lUNrWnngRlRxGcuC6Mdx1DdMZQrTOMTb0CwIzq6o7UXIX45DSFT4v8uBJZhUo5BT1wCnQWVqqU6zTXWLTqlcSkIjrElsbSqgcY6HHmZ1seqj3G2PTIb46CklGiKvMR9R0BUCdADSxCIOx7dPA4MQpbLqLUrWQCYX3MiVFeOKq6KaK03PCWzpu29YoDLiFnVN0ELk+BXmqoUuGAr3FDZhBIwqdySBDi4ySUQuil+Ca3kmnx53oeTdURYUmQi2JVVuC7WwVrWQ6RHs1amtau/JRhJlkqterH9DwEo80WnWXx5IL0OH0qVjJ9n9Jrdj+V9Et8kcBPKahLs42iW03NVXcaRzex9BV+Z0FYH+XIU/PzQs8P3hVB5mGKZLL8FWa8rpXSc007MqLzvvI3lJ4GlWlT6fXIRH9XhKKe6Ho9klhaZei2tlVuBR4BbZfhCg36SBwcxhmntgZJU6QXY3v2QEDvFpRuc97ZcuFPWilEL7wH4EbyVdm1smXf5bfGm79K/P2/wB+Ga2w6whsWtGdXrjuuq87PgFcCI7yNE+50ZRYJWjA4bsuPPL2rBMOuukqa2savjeN7pGN24r9Evhhjfk7Tz0vOu7fihCAc3Edsx773PRHU92UpCti5dTKdKVpSZuhDjO3kqTj2VE6GNNWxc+pY4lDt/XjWOT64jo/fQdsU57nPT3OpBV5Pjl9T3D/xAAtEAABBAIBBAAFAwUBAAAAAAABAAIDBAUREgYQEyEUICIjMRUlMyQyNDVBRf/aAAgBAAABBQJh1JGfpCxR/oOxOkLDXLIz8VNYc5GYlhl+kva5OPKXn6hd6XrvXvSwKvehnV+3K+6ojtiw/uh2fotmi4t3JalGPZGyUaTWMcbdbxmJnJzzxlZJxlEpLmShy5hB7V5GryNThC8qA/a/7Dkpqcf65aRzdpHLW3ts2nDH0YRXhsTMEVg8iXoHk1v0Sl6L0yQ8g9zZI2hsPxtVCMSI26rXeWKROGjV9wKX89gVU1NdUrXEWQGNKCuDRHvsCg7k9v8AqCVW/wAb/wBCoNxE7VP+MIVZLC/TJ1+lzqfHWGqm0xZQysiFjKQKW0HiSw0IWmFWvdaP0bHaL3JVgZJX+AgQrMAOPgKFONvakfqCota5eJi8Ma8MadCGZbIw2JHOY/dSo+WOWN3NrHKQf0uuInP0KEbe0luKbZn5M/xjasB+Oc59RVTqwPzjvz3s/ShKArb4nzNDK+LemuCIMql1G5xJ7M9IyMONZQeW/ir4WF2O9UlEdTLHf3d7g3TltFwMp5zTc38ncmOPOk/+vzEXjuL/AKoP5MhJFFiqEXmi+AroVY2gKlibN6CvjYBjzSrxxWIfE7sfavxOq2IH7lmglEbSQnS7dhmfdyTfPiP+FEaAOqkcj7EYbLE2KHJyJld4ZbpfDu6XjDcY6bipJtqWUkdyHZOsdxP+KeWOk2o2GR3xPwsnKP8ATAoY+T5g1pGzWpY15aC2JS3mtD8k7kXue7pJw8EganjRtTsrxTZzZGVtcMbA/JZiO0/HWp5obTjChEuQjD5A919s2Pdy0BK4JkrQ7HWqETZMnXBnyYIbBbup0WnBYCWSvbeNh6yMZkpaDe3SY/ds3H+98SEyUCOScaJ32zbfJjfkb2xtmRleT+QKDflbLuCxO0K7kI42H8rpL/adQt1nzoKN3ht2HeabWu1r7nSfyN/KgnbHA6Zpdeg8F3fjrHOWBWkuTTlzi+Tt0p6y3Uzf3/x+w2SaUk79lcUBz6O+YtJXicsuzcsqaPtnij36V9ZfqYfvbf761yaonvMkmwtqnC2XowjXygoO0A7ayB4RlRJ2gt7W+2ArEYeWlWsx2uma3OTptzXO6YlCPT9kKLA2HPqV2w47KUhj7x+VkEjlFj4XxXpfJO53EQkmVwG/WtIDk+GIV64PvW06vyM+o2s+okpjtO6naBlz8uKsfS7HQPIOkGl5cfe+TQPZesPH5szz97+246kJ9WXaQTvTF1J/P2PejL4rvkK4enPTWFx8Lk8fbLOKx04q3YuoYy6Jwfj5PcO/UkfJ0EBlfaI866jH2+x7j0WzyOa5zFzDV5XIyOXkcVvaB0WO2MLfjOPHuqw/TI3kowI4i7k9dQDeO+aCwGxH8u9/NA/Tqj+Ela6A2M9rD9V+2YbyxHbX099po2SnI/LWfyDXbjrz67WX7W+1tvko9t/T8n//xAAjEQABBAICAgIDAAAAAAAAAAABAAIQEQMSBDEgIRMiI0FR/9oACAECEQE/AXoyzESLRxIiouKh/SC1C190qRTxJMWn9RssZtyddp10vdeNp3UsNFbBFyc71LQD2iILvrfgbai9GyIDfraulsrK0LmGoBj5LFFekXILYpuNj3LNgGNuwjhamy7oIcIn2Ss2MM6gJ0Nhhorke2Q3LphI/qxHbACuVRFw3tEwJ+T6alWnLiZwGlhXJeC2vFsnqNG/ty/EFkyB56WEMeKIWRmjqlvfhXgx2rrXK9kGCh4//8QAIREAAgICAgMAAwAAAAAAAAAAAAECEBExEiEDIEETMlH/2gAIAQERAT8Bju5Nom8s4o48SPTOXdKWKjsb6Ms5PIq2hGCKyJHFC3WCUfpG/tIVK3oSvGKbawkfq6j2YHWzB9HUdnE4xE8Omu641gkuzBlxQptup/MH5kiM+V4VTp6IbqMctEupHjENHH6YHeO81HpHki85IIjSqerVcv4diWBykiLys19Ja9M+j7PDqkPXr//EADkQAAEDAgMFBQUGBwEAAAAAAAEAAhEDIRASMSAyQVFhBBMicZFScoGhsSMwQoKSwRRDYnPR4fCi/9oACAEAAAY/AghgPM7FvReExZWMNKAdwRAHFMBwg7VjLfZKAnK/kU85yOmAw/NjB4rPTMcV3bDPtPUtZJ5laKKgQLD4UDKE6K+FirrVarVS4AnBqCyUsmU3uF/L/St5v6UWmpwjQKi0Eklg8SaOPFQ0Xxyu0Kex3AWV9g1X3bC0PomPZurKTdTTNvJdEEEMT5Kkzg2+0yoNdEcQvIfuneSZ5JyPvYEdcPs4tqtQtR6JuQF3ujRNaRfKpquhFragVl4jhI54A4N81eSOUrdUAv8A1FbvzUNzAdDg4YPzAFbjfRbjfRbjfRUXNEBzSFmp08zY5q4Ce46MGHD0UFdUydcBKeW/BDxn1TZ9lEB5jzUvMmcB1QVT4bFN/suUuROnknXbcSbqcBTZvOMIsI8Q5oTh8EWNQqNY8t4GF+RXdrqm4N88KmxUjUXVjwV1LBFrxhdUneyZU8KgnYbI8JdCbQY05iU7vZLRpdbnzUDMB72D6vZg0hh0J1TabqcZh4p1WSlTDf6uK8M5eeMcEaZ3TdpV1na0QvFGD6r9MpDf3XZ6zJJZrjqFPHMI9FSFSHOLiBPwTpcwANs1o4q8NHVAVHtLl9m7M3mi/u4LnHx810RUcNjtOffZU8PRRxCgnDoqRa1rmt/A4SE40mhtPupAjCfwjVQ1ZeOb9lTdUzMDDI5qW0785koz81ZS8knqu0tvMjyxz1TDVHZqfxciHOZJ4huio0qz3OYTLr8FVpVGzByO+CkCCrFXx7plV3dVGacOqthLmz5r2avN6jvQfJfZX+CzU2HLzUHXBtGpXIpv/lC914cKjWiSRYK2FQ8qJ+oXa517w4faLwY9krf9cbN8K8ulrW+GeaPTBtTMQ6ZkcE19iCOChFs+Iq2Fb+yfqF2rzB/8jBrnMztbwRc1mUY03ey1v+NtzXficEVUaN3UIEawmta1jDFyG6qX1HH4rXGp/ZP1Cq+636YOFCm5518IlXx/L9HbdsKbxxsgwaK87LutI/UJ3uBN80/uXQHiHSnPfEnF/Pu6n7/cWBVOTJldSiMbYUXE7xJWXtFJtT3kHdmqPp303grdqn8n+14e0MP5Vv0j8T/hfaOYxnOZX8CHS1zXNzHqjQD89pnLG0zLTJzaJrqvamtceHJBsyGfVX3l5q6jCG6nRUqI0pMDU3DUqJvyhXVkCg8fjpA/XadQeMzNVPd+hUqSrLW+Fl2Vp9vN6XT/ACTHdV54dTgOuHZz/RH/AHrtU3dYW781LlDdFZfh/UFlHJaj1TK28W8F46LhLYs6UxzdDdNdgXO0VtFlbusth2V3vD6bYdm16r/Ss354WKucZQ7PUMPabI7BPPCkeVT9tvK7h9xHNBZKu7zxd6Y1f6SD88Z2ev3AOADtMAMe0M5sOI2f/8QAJxABAAICAQMDBAMBAAAAAAAAAQARITFBUWFxEIGRobHB8CDR8eH/2gAIAQAAAT8hufeWQUv7Er9AFsqF315EwBFtnMx28VfvLTq6IHBbZgWQpUwRQGNxd+5AcHgnLBQcM3Besqz45/5CEvfuMrTroDgzol030l57QcnvFZ5/Y9SnThGI1suDP9zIMBm4vifMAFzWSVvEYgp5iWLffTzFpdt4YyHaOu4COGNRBWQlxsnVU9J/jyv/AIZi/rO4LE9GbuhB+p+JTaxvLfz2ijinu/uZeDwJhdKVFx1qCXfyzaF35jmM897AHcGWiSgogrkxQm7p5SwyvPxHdcTcLxAVYvMaErNBdegCcB7E3GoKbKgLtEjgb6o/BxCPo5zC/rAq2rfEv8xXv6TCMwtqYC2wO2Kdba0CcWqxEw8YlaRlXvDGDDkIPScJlt+79pb+6Js612jvovRyrrzTrxuP1fWB5CsFZY1RlEJ4uUk6dZ0kZSUB0idZrrGBopCZNSpQFvJDQwUHAi2ZuY8tT9bKgh0JLWu2C/DFPT2cMeTz+GC4pVWX1n+Yn+AleviQluFOpHJh24e0M8s3hmBm43EOtS+beYXt0+8sl7cDFec3iLQVABpT9orNOLXFFiWHl6K/ErFziAL32XsTiUjoSL9PMV/o5/hntxQ+GGqe0UKK97MPL2spdsqXh8xBZNrKQgyQ9moQVddPRjthGNULBhWkLXPnPwjZ7N5agwOsNS5+EOHoxfAfmDLlxuJae2YlIKNCxhLcA5d4LbEttCU8L7CC5NHRzz+95nFytGaqdXGVvzMAyt4ARmxqB2PJ+9Yt/wBpeEnAvRRtFgq6EwTw858+YD8RWvfcIS6m3WXLgoqrHMyKe2IKHOC7GWWkGcdcQvbzMFV5hr8iKYoBB2p+pL2m1w9s9pfHtXlcA+/iwBoU1W0yNly4fG7bYXnNJiVa93T09q8QFUCgalzu3oTjmKK+iqwfSByw0qHIaj6T6oMXdPX+oe8OwaeMLqUulxEKlobVKBeW7uAAMtjsD+5c66/Ccf1LOzz/ADERkjD3nXmMmvariKRtry39dzgMsLbI8pT0uXGf+uI3ogC4y4aa1ynvr3h6k3dtUSr788JMu0xjiEuc8wfjapyarF+feFihbywuuHtGN+lUrgET4v2j+y8n7RZ8hDTkG+JbKo3mZMux9VVvfr2ljZYHmOlrAgCjCCsg86qtRyT5JfbXdFG4ikorYE8yBfufj+CdJkdUMaZcdhCustTEDsiRE4hXLRM5StqNnR7wIwpLxK4qMVn3lLcO/ot0M7jh9EICKyW5w/nMyinARexCC+39Gn8Sl3Ob4PgjEq28Qt7OusMHxCrmUxVqsutRZ1Jp9IoVPmMqGI7+6n0QsS9szxexUHXEtgImElcTFBklrXC/X2/jqXNGnYhO73PsJ+ZdNRtg8zu6lerGDSu4yosvgwycV8X7xGsEAG47afNFSiZ6JUGB79KiL+NbnUHLEFrOxGxcP0P8i+5KObXEBXWY9CdIzG+sZWV4eX+oIOGkWnh2Tvu7g8c/WUoO+XTkvKIxj25Ag5J9of5HLkjcZ3j3mALL6n3YM+j6eYHQbaYa/WGSK3E8MsMsAymur7B7TMbPpAG+Et7cT3HWBMxCJWoHWVO0D2K/E90siC3sxDvRzOvPQi63xUK+k3Ov43NAn1ofiPPo+hFtGgVddfafSqgfAzde0Y6eYAeiBse4RWwY6wrqA0gC/TtG3YT8TKT4Mz3Ey6g0zA2ufos/lD2bi8+nD1c682h0Y9X8IUGA7y80Ri/8QtzAiNtRbx8xzn2Qwk7PTsr8xTzt+RqJtZUZ3kQveWToSpijtjDqKR1L+nf0e3rt6ESCQMLC42UXof8AVxZh9/6VF6cHgv7y8Kj8RRdj3zFbRTTZK8SxSBfSb/v0a6KNcS9GCrjL8r9PGL9Xozn1Mw+DamZt0S2N8x3iXK9cn1D+VL2UzHTMO5tCYY7whr0z/YfwPyxjqae6vWpjuBl7CLZOHzFmceo02TqldMqfEq8B8Qee0odP0XDc6LzWI7nEcDv6VMks5J//2gAMAwAAARECEQAAEBdEOjLEJ/si44FIY7sRfZh+We9X51X0GL/Me04gpkGvqiG2MaP/AK53RzpXcZRfettJIrv0dBr4MUxqzvmNNzBW+fC9FStO0Gg8a5N8Dj9HtAVqRV22QzmNXu5/d5fhG5AHJyv/xAAjEQADAAICAgICAwAAAAAAAAAAAREQITFBUWGBkSAwccHh/9oACAECEQE/EF1kiiaRDSKILJqyLEibjPWJGqDTSXQ1LqkxBaG3Lgps2ihiEMtIbgGqXNLNkCUPEdjUivR1c1PA6SEoFGLZoHahKmIbTrSHs3BNwsd4ulyMWlxs9iYBpFTwDXZqj2iOd+/8K1+ysRG6is16V3BOk2x8C1oZ1+McMR2In/yhJIkfMr4IWl8+hIA+Bkkfs6Coa5uikfaSFc91GiN/0NOHAxs5ZWisnxfCbL5H9IXnpNcnPgWfHDUX6S9S9EJeGh4cvx//xAAfEQEBAQADAAMBAQEAAAAAAAABABEQITFBUWEgccH/2gAIAQERAT8Qk48Ty9KG7mj2TvpDsk1++BDRftPUfqUSdUJgiBc5LNLNkQGR7ab1Cup8gpDbP26M8HUcQZBrkF5PcoH1y0QlGw41DODEkfaMOke+peyChDcf+N2VeuAAImfxfEndI2JliTeVlinh/wCjeANkXnD1Gm/Nl6ODuLpO7afBDUbY5DWR8jL07tfUXreTOFjCFATDvAOAHsd1ysbC1mC7s/yu5GxJ5Ds9uT+Qxl2Z9Sce6P42/8QAJxABAAICAQMEAwEBAQEAAAAAAQARITFBUWFxgZGhscHR8BDhIPH/2gAIAQAAAT8QyW4EtVIVpYQ+YVt0vm/zKJj/ADIir4gAgFCb/wCmsd4iAQtQyaCnZv56RDmzea5dXG4WV5AsVdH4MQJZ0EZOfuVNWmisr3413xGAbGjtnv3rEzb3RvKbHthIFFtSlzrj3meWk8wgLUyDeZamveULLLzA1T21+h36PZmFji4Bemh8Ye0y7wCpEFnBLCN5ToJQ+Zjep+EoPAfy/mVDH7hALmVvO/HmIML2WBh1KFa1004RGviyDoHlynAXiYoEtOy7zMJY9QvC48/ESqqo4T/kEpQrnlg/aehGVhbVNa+IE1tUVZA466jZ18hd1R/cRJKpa2o9DtAdgoFZOmvSYDwgXEFT7Lynya4/RF/2Jd1TLrY6qMAq2+CewwWvpSQQF2DGH8xMq66DA8n85ib4Geiz1vJ+JgT4Ot8BYxycxuJgUxgqugOFy2Zg1KLnKtXcopZ2YKTglujOMYsgNcOrl24LDGeKS4YPN/3aMF1LFO1n/wA9YoFg6uczAWNHpWT6lB2gqcX/AN+IvcVVRbbuuTXSGRo5bP7lFxFHHLH1DEXRDY+JTjXLfP8AVAWYwBH6xFDdrfk/8m3Vn5qYeg+YJpd7z0/5zEGqzw78nruEcNQUfcemJY4muDYGH1MKctlRQUa2kpGZyhUDYYvdRSpqLZTyJAoZpYXnfETQ0DmMm837wxZYT4qIcu1MmlTZF7R7/wDIKr0s2A9LL/LnyaniKlyCgt06ENTn9kP1KKefwxJAx+XVe0G0fSzvz0nVIoGzAChcwmgK5iESTK0XrjZHvVcy+kAAisE9NS/K0u+ubjFFak5fJmuDzEWEoJyQgrBtL73GxxbdWW08Z+WWAZpuAlogcC5fuWVI4YC3q84R9YqGN+f7gOi6AD2uJdgLa2L7UrRL67iYGUOvIPRT8zB3lECThd09Xifz34my/wCrtOI/H6oqanSjI3XcT2gkxmO1z1e0IAtQLrleBLKjOju79pxCO0upRLo4ofe4hIW89kxaWu45eSAD2IUJnEby2YRF2qfKvmKcPBoiUdcdfWJKuigyXmOJK3C3msJGWDiXjmNnuqlgaxnHDv3+JQnf8ftLFkQwuD/CWDoMOwi/UBkAWwkAIovsREbHBrQq7ukJjAjlICJfcmsJb1q9okEoKAu7zT04IBDQdH9/XFcDEFqWwObz/wAlqxdNXVz3rHpFJqvC7lwZBH2loWUa7NJnLyC6oZXg13ZU8hX0H+V14AL1x+YVKUo/X5igdVjBCCGoKAgvY+gxDJYDMokB268sW0IihgHqihgebbuATJu+Lmf27g1VLfa0hkqe+dLN5yXrgcSsAaND0mkMTJo+sJZnChZYjDurhDdPbXm76ta29oli6CwI6HIUPa0UdFcoH5g/XwcPn/BgPsO9yYukcod7xMFECjirZONK4iRfFnFdXk+WYPkGn3U4+PthYJSpTVMEFv61OAAMo7fIlekowwC+8bLJUGvFxJVbTMxQpKd3WBfEYXg6vHvQKB24ohPEBNzedw9SioDvZVfHmw/MAq1ZWaV/oTtnjCABM8vxKKnFrymay0nv6yoGiRV11w18kJ1Gaxb7D9sG2VlAVXAOTvWM3woVtwaoIZJdLhdnrYWKdQkMC9BTiBWYEzi/EErn0iKHM2kMM6mUB0duYeMvW3mX2uD5uaHTF6lmNLmX4tkjXEoSXWQdYYFMTbKaG/LQjTshVwKr5lCy+1z2GnMXCMK93wM4eCXVWLkqg9vtCmEB2Sr5Snl7QCwKttVXNK1ooqAE62Gs9K5+IjMnAqL74iFRtRfMKVqWkKAHTku8VVU2NsAepdRqRbvrK9qFtlugI9iZBUnmn7gFWkouzr3GWaRLgwrpQpWkQKKgYUg7KU12XcQoC8KV/v7iJfsHMByI6SkQJwEosoYaHrKzRLHSGAtvDQekQtgMF1EWDu0+TMu4VZAXF8NnGWu8WSYFhZ6sweWnpzGYFi6L6hH3hKDDmX4Ny5FUtLPQWvi5Y11JtmXAC10S4IgVhWXlou7uKcQmUrnb63KoD/szkXAtuFK5BXvraRMU6u19YFzcI4tIvFhcDKBV5EWz4jtjRARc5I4Z2VWPeEBc7UySzKsfHEAQtsDpnfH/ADBWPeYeJyKkyMS1lHf+7S2CHmZLJURimWhawdojXqe0D8RmaVZEEQRUQ2M9uoQL4JgQTArHtOEvcceZXBWDKcKLDH2cy+wtsIBfQ1G+OIlC3IwBCjW1flYsg6zUtjCmIqLrW3sgAVDXPoz7QYWPMHOPEJAqt9/pl/8AIAOsF4PrBZvPqq269WvaKEkbG8wA0yRcmg7NnpEIK5oZLZ+MRFfIVgzdi3xXSoFUu6o+xD0mUUYVbUy4ilw1Nxu4iIFBxrmr8Q0swMyhDLHRlAULd95dAVgpE4ijZ6QI+pOfF3XaxzOZ0jLsJszNrDs94QLJL/3T9yxBTUTFDnyvWK0ShfdlQwK62Jp4mRboOIijNjnROzXaXlG0M82/iNxr9+mIDdmQ9EJzkqEbHJvee8JA5RDVcRIyiqwfmI4t1GkNZ7TOPeM6RY59olCtN3GndZRO52gl92a1WXEOxYtr4iUeVjV6PQmXMBYE3NiO5hLy4l8EnACrmRGYBqr9/UhCPcA9fpElFOXRphZlQ9VKAZOQrtVpkLVlKr0WU+n4HfP5QjOcafgDL5YI2wZcLAYo0Fe6y4aeMFLCvycwTDXSczRhMeEYrL0dAtRaHXLhgCVtWsbAtnipQCRvlWHYP08INDddL/EI7oGhm+h7ywBRp3mbAF8U47wmQso2CtBMlgA00W+XvAAvB+thOMyokWOij9kVUkKAWu+IrIBbgqDZYyrrLs013zcoIbD1T6Jln+HidK/wZGrTWXkU7OfMxnBMDXOABvpBCVug9esQF5J5gS6sVAJMqacye1cEzV7SgquHSFr9fWVYfqQBBDOnk6IEZUaInmUGqgqqaNSxHO5lINY9jLBAxGWlJxGyuLFB0mqhIouSrw780+kW/Z+yJnmWPR/2KAU/MLFrtVAeVoIWzHn90MoHkJIi5djrEirPKew3EmScd7ds92uJRKXRZLmlJQ3s3JhioXSMAeCZlqdjUCWFl4P3CaoIHXb8s4I9Jhh8iPtL/wAVj/WAlER7xPELBEyEt2h+1T2lsQ1ZnAhmANgGHujwuu6fwjFGld3vFcCzoRg8kNNh+GGdrKy8C+G32EdbktPeKR2lBbeISyPQZmRdW3mOT9xwDUq4FfwRscxYGXY/1Uq8xvBAJ0uz7go5SrtnUoJ0pbxKWFq9ZKpjmYHeJ1VLj3lgvSvhmVMUYgvibMjn15gOITNI2JB8pNOE/tgq0dJArPRFsPtBC9O3+L3ay74JZBJd0wWOTEmWlmb6Z9JyVmXyf35iW9ucj+e0swp0xVWM3HXadInIGZ0CwOgcogLFxYzlzKa9D1lL3StI4URvfWCz17gJXuR5FZGmLnLOlT71DJ/gswwbkZ//2Q==</field>
-      </record>
-
-      <record id="base.user_chs" model="res.users">
-          <field name="name">Christophe</field>
-          <field name="login">chs</field>
-          <field name="password">chs</field>
-          <field name="image">/9j/4AAQSkZJRgABAQEASABIAAD/4gv4SUNDX1BST0ZJTEUAAQEAAAvoAAAAAAIAAABtbnRyUkdCIFhZWiAH2QADABsAFQAkAB9hY3NwAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAA9tYAAQAAAADTLQAAAAAp+D3er/JVrnhC+uTKgzkNAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABBkZXNjAAABRAAAAHliWFlaAAABwAAAABRiVFJDAAAB1AAACAxkbWRkAAAJ4AAAAIhnWFlaAAAKaAAAABRnVFJDAAAB1AAACAxsdW1pAAAKfAAAABRtZWFzAAAKkAAAACRia3B0AAAKtAAAABRyWFlaAAAKyAAAABRyVFJDAAAB1AAACAx0ZWNoAAAK3AAAAAx2dWVkAAAK6AAAAId3dHB0AAALcAAAABRjcHJ0AAALhAAAADdjaGFkAAALvAAAACxkZXNjAAAAAAAAAB9zUkdCIElFQzYxOTY2LTItMSBibGFjayBzY2FsZWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWFlaIAAAAAAAACSgAAAPhAAAts9jdXJ2AAAAAAAABAAAAAAFAAoADwAUABkAHgAjACgALQAyADcAOwBAAEUASgBPAFQAWQBeAGMAaABtAHIAdwB8AIEAhgCLAJAAlQCaAJ8ApACpAK4AsgC3ALwAwQDGAMsA0ADVANsA4ADlAOsA8AD2APsBAQEHAQ0BEwEZAR8BJQErATIBOAE+AUUBTAFSAVkBYAFnAW4BdQF8AYMBiwGSAZoBoQGpAbEBuQHBAckB0QHZAeEB6QHyAfoCAwIMAhQCHQImAi8COAJBAksCVAJdAmcCcQJ6AoQCjgKYAqICrAK2AsECywLVAuAC6wL1AwADCwMWAyEDLQM4A0MDTwNaA2YDcgN+A4oDlgOiA64DugPHA9MD4APsA/kEBgQTBCAELQQ7BEgEVQRjBHEEfgSMBJoEqAS2BMQE0wThBPAE/gUNBRwFKwU6BUkFWAVnBXcFhgWWBaYFtQXFBdUF5QX2BgYGFgYnBjcGSAZZBmoGewaMBp0GrwbABtEG4wb1BwcHGQcrBz0HTwdhB3QHhgeZB6wHvwfSB+UH+AgLCB8IMghGCFoIbgiCCJYIqgi+CNII5wj7CRAJJQk6CU8JZAl5CY8JpAm6Cc8J5Qn7ChEKJwo9ClQKagqBCpgKrgrFCtwK8wsLCyILOQtRC2kLgAuYC7ALyAvhC/kMEgwqDEMMXAx1DI4MpwzADNkM8w0NDSYNQA1aDXQNjg2pDcMN3g34DhMOLg5JDmQOfw6bDrYO0g7uDwkPJQ9BD14Peg+WD7MPzw/sEAkQJhBDEGEQfhCbELkQ1xD1ERMRMRFPEW0RjBGqEckR6BIHEiYSRRJkEoQSoxLDEuMTAxMjE0MTYxODE6QTxRPlFAYUJxRJFGoUixStFM4U8BUSFTQVVhV4FZsVvRXgFgMWJhZJFmwWjxayFtYW+hcdF0EXZReJF64X0hf3GBsYQBhlGIoYrxjVGPoZIBlFGWsZkRm3Gd0aBBoqGlEadxqeGsUa7BsUGzsbYxuKG7Ib2hwCHCocUhx7HKMczBz1HR4dRx1wHZkdwx3sHhYeQB5qHpQevh7pHxMfPh9pH5Qfvx/qIBUgQSBsIJggxCDwIRwhSCF1IaEhziH7IiciVSKCIq8i3SMKIzgjZiOUI8Ij8CQfJE0kfCSrJNolCSU4JWgllyXHJfcmJyZXJocmtyboJxgnSSd6J6sn3CgNKD8ocSiiKNQpBik4KWspnSnQKgIqNSpoKpsqzysCKzYraSudK9EsBSw5LG4soizXLQwtQS12Last4S4WLkwugi63Lu4vJC9aL5Evxy/+MDUwbDCkMNsxEjFKMYIxujHyMioyYzKbMtQzDTNGM38zuDPxNCs0ZTSeNNg1EzVNNYc1wjX9Njc2cjauNuk3JDdgN5w31zgUOFA4jDjIOQU5Qjl/Obw5+To2OnQ6sjrvOy07azuqO+g8JzxlPKQ84z0iPWE9oT3gPiA+YD6gPuA/IT9hP6I/4kAjQGRApkDnQSlBakGsQe5CMEJyQrVC90M6Q31DwEQDREdEikTORRJFVUWaRd5GIkZnRqtG8Ec1R3tHwEgFSEtIkUjXSR1JY0mpSfBKN0p9SsRLDEtTS5pL4kwqTHJMuk0CTUpNk03cTiVObk63TwBPSU+TT91QJ1BxULtRBlFQUZtR5lIxUnxSx1MTU19TqlP2VEJUj1TbVShVdVXCVg9WXFapVvdXRFeSV+BYL1h9WMtZGllpWbhaB1pWWqZa9VtFW5Vb5Vw1XIZc1l0nXXhdyV4aXmxevV8PX2Ffs2AFYFdgqmD8YU9homH1YklinGLwY0Njl2PrZEBklGTpZT1lkmXnZj1mkmboZz1nk2fpaD9olmjsaUNpmmnxakhqn2r3a09rp2v/bFdsr20IbWBtuW4SbmtuxG8eb3hv0XArcIZw4HE6cZVx8HJLcqZzAXNdc7h0FHRwdMx1KHWFdeF2Pnabdvh3VnezeBF4bnjMeSp5iXnnekZ6pXsEe2N7wnwhfIF84X1BfaF+AX5ifsJ/I3+Ef+WAR4CogQqBa4HNgjCCkoL0g1eDuoQdhICE44VHhauGDoZyhteHO4efiASIaYjOiTOJmYn+imSKyoswi5aL/IxjjMqNMY2Yjf+OZo7OjzaPnpAGkG6Q1pE/kaiSEZJ6kuOTTZO2lCCUipT0lV+VyZY0lp+XCpd1l+CYTJi4mSSZkJn8mmia1ZtCm6+cHJyJnPedZJ3SnkCerp8dn4uf+qBpoNihR6G2oiailqMGo3aj5qRWpMelOKWpphqmi6b9p26n4KhSqMSpN6mpqhyqj6sCq3Wr6axcrNCtRK24ri2uoa8Wr4uwALB1sOqxYLHWskuywrM4s660JbSctRO1irYBtnm28Ldot+C4WbjRuUq5wro7urW7LrunvCG8m70VvY++Cr6Evv+/er/1wHDA7MFnwePCX8Lbw1jD1MRRxM7FS8XIxkbGw8dBx7/IPci8yTrJuco4yrfLNsu2zDXMtc01zbXONs62zzfPuNA50LrRPNG+0j/SwdNE08bUSdTL1U7V0dZV1tjXXNfg2GTY6Nls2fHadtr724DcBdyK3RDdlt4c3qLfKd+v4DbgveFE4cziU+Lb42Pj6+Rz5PzlhOYN5pbnH+ep6DLovOlG6dDqW+rl63Dr++yG7RHtnO4o7rTvQO/M8Fjw5fFy8f/yjPMZ86f0NPTC9VD13vZt9vv3ivgZ+Kj5OPnH+lf65/t3/Af8mP0p/br+S/7c/23//2Rlc2MAAAAAAAAALklFQyA2MTk2Ni0yLTEgRGVmYXVsdCBSR0IgQ29sb3VyIFNwYWNlIC0gc1JHQgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABYWVogAAAAAAAAYpkAALeFAAAY2lhZWiAAAAAAAAAAAABQAAAAAAAAbWVhcwAAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACWFlaIAAAAAAAAAMWAAADMwAAAqRYWVogAAAAAAAAb6IAADj1AAADkHNpZyAAAAAAQ1JUIGRlc2MAAAAAAAAALVJlZmVyZW5jZSBWaWV3aW5nIENvbmRpdGlvbiBpbiBJRUMgNjE5NjYtMi0xAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABYWVogAAAAAAAA9tYAAQAAAADTLXRleHQAAAAAQ29weXJpZ2h0IEludGVybmF0aW9uYWwgQ29sb3IgQ29uc29ydGl1bSwgMjAwOQAAc2YzMgAAAAAAAQxEAAAF3///8yYAAAeUAAD9j///+6H///2iAAAD2wAAwHX/2wBDAAUDBAQEAwUEBAQFBQUGBwwIBwcHBw8LCwkMEQ8SEhEPERETFhwXExQaFRERGCEYGh0dHx8fExciJCIeJBweHx7/2wBDAQUFBQcGBw4ICA4eFBEUHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh7/wAARCAEOALQDASIAAhEBAxEB/8QAHAAAAQQDAQAAAAAAAAAAAAAAAwACBAYBBQcI/8QAPRAAAQMDAwIEBAQDBgYDAAAAAQACAwQFERIhMQZBEyJRYQcycYEUkaGxQlLBCBUjM2LhFiQlQ/DxRHKC/8QAGgEAAgMBAQAAAAAAAAAAAAAAAAEDBAUCBv/EACoRAAICAgICAQMEAgMAAAAAAAABAhEDBCExEkEiBRNRFDJhgRVxkcHw/9oADAMBAAIRAxEAPwDy3rS1E8lDynZXBKP1LOooWVkcoFQUOOOSmvckhyOCaE0Aq5dEZxyeFryi1MniSHHAQkCEkEkkAZWQm8DJT45S1p8jDnjIQBuOm5dNaYzxI39VYnBU63TGOqik/lcM/RXTGrBHBQKgJamkIzghuCAAuCYUUhMcEDBEJpCI4YTSECB4TSnkbprggBuPdJZwkgKNWs5TR9Usj1SJB4IwntPsha8cBY8UgbIAK4kDhQ6uTSzGdynSSOPdQZnFzznshCbMZSymjlLumcj0k1Intn6oAyTnfsllY7rI33PCACRbu3+yvFql8e3xSZ304P2VGjOHAq19Jyh9PLATu05H0KANqQhuCkOHshuBQABwQnBSHBDcEAAcExwR3BDcEABITSikJpCABFJPI3SQBospZQDOwcbphnPYLkmUWScphd7qM6V5HOEwkkbkosf2wk8mBsd0OV24OdiEI8oh3hB7tOF0iJoblPY0ucPRYijMh2x75OFtaemp4qds879GHYxn5vyzhFhRDZT9wSQ35i0Zx6IrqVrHOe9rmx6A5p9z/wC0QMzKXwNByflHv2T6vU9scTS8sa0HSeQfT6JCIUbA92wGBsPqnPpyB7lbKOn0+JoaHA58vJbjfnuiVVIxkXkOoHDmuJ5BONkWNI0jmgE6DkD1W06drm09c3UcNeNJQqiibG3LycZxgcnda2UPjk1AadJyAmhM6GKmMtBJG6zqY7ghU3+8ZDGwAnYKRRXN4maHHZAi0FqG4J1PM2ZmppBTnBAEdwQ3BSHBDcEAAcEwhGcEwhAAiN0k/A9kkAUwLKSyuC4JJJYLh6oCxjxgp8ADiYyQNXc8BNcQ5uQi2+MSTDW7SwcldLognSZKpKfQ3LmskBbqBbICP0P6KfHQy1LTIWSyuxgaG5+30RrfBTtk8INLADjOMucfoun9CdKuqXMrHF+l2HDJOdlHOairY4Y3N0iidP8AT8lW0tbHK1+PIQ3Baff2ypr+m7pLORBbp3iMYOWEcBek+nrHSwMa8UrC/nOkb/dWWOghG7YYw4j+VVHtO+C9HTXs8mW7o291NR4TKSaBryCHaO2crZ3n4ZXinifJDIHsAwMjgH/deoxb4tG0bG49G8LWXC3hzX+X7YUf6mZKtOFHjqvgnoKgU9wgLHt8oceFAuFOWE5wQ4ZDtPZeiOu+j4K6J7vCaSQc7LiFZaKijnkpJC5pjyW53GFbw5vMo59d43/BU2DA0+myyCQchSrhEY5SCGk86mnOQVFVkqG1s1e6KVrXHYnCtgw5oI7rn7HFrgR2KudhqfxNECeW7IAkuahkbqQ8ZQnDdAAHDdMIRnD2Q3BAgeAknJIEUbX6BZbqc4N4ymBZ16e6fijt5ZB56Z0bcucCgcJOmc4EkkprXkoo4tsc35i31RKR5YXaMh3YoXDwVOtFOKitMJdgObnJ4HuVyyTuKN1YpzJOGN5J3d3K9I/D+nbNSRtYPK1oAAHC842amfR3CJ7wcFxIzsML0f8AChzRbY36nbu1k5yd1Q3HSs0NFcs6ZbqQBg5GMcdlsm0zWAZIO6g0UzXfJuf0W4p2SOjyGgjGDlUezSqkR/BbjIPAUK4MYY85O3IBWynikyCAAPohOotTTq2ASOik3MtcHNcO2xwuL/E23Mpar8XpGhx3x2Xd+qRaqSAmprqeAkcukDcrjXX9XQV1FNDBVtkAGW78+49VZw+UWVc6UotHF+oqZ0bHTNaWxu9d9RHOP3WiVivVQZrRJESQ+LYgHGr3VdactBWrHoxJcMRVh6Om88kJPO4VeW06XeW3Zgz8wITEXBzUJzVIcENwygRHLUwtUjGyG4BAiOW7pIpASQBz5ww4hMkG2UeVu4IQn/KiLtHeSPjJoE07/VZZkOwmg4OU885XRwPdu1bCyuIuMJa7GoEZ+ygDhHopTDNHI3mN4d+q5kSY/aOjQRRy0LJHgahs1v8AKBuSut/C6sJo43ua2KJ5y0YwAB7/AEXImzg28NiIa5zwGt5xn3985XU7PbwJrfb5pRBTtixKXA89gB3POwVDYXlSNDUfjbOhUnUz43vjt9H+LbH/ANzxA1mfcnj91mD4lXOCuZTzWqCSI4BfAyR2k5xgnGM/v+i2nSUloFbS2ezW+Gor6o4jNQRGHHGds+b8gFr7h1bdDUVbG22AtopzTz5YfI8dj3H1Oyi8HGNqPBY+6nKr5OidO3OO7UAkdFofqwRjBH2K1XV8lVFb5m08oZJkhhPuMKqUvWlbbrhRCrooDTVuY2GmLnSNkxloLXdiM757LXfEa/Xt0Yqae0Sx00Tg6SWSdgwOPlGSeVD4ybTJFPho0LugqeuuElx6ov58A7iFmxIHqTwot6t/w28B1PRETTMBAEfiyPP3GR9ltutOjRdfhzSXKhuLBXVnhaIZXu1SZb/iF7uW+bIAGOFQoena22dM0VM+IC5U0hcahvl1b/KcbuA539dlZlHwXylyVoSeR/GPH5Oa9UdPvhuFfNbWST2+JuqUkAPiae5bnOMn0VHja9gLHtLXDsRhd0ntzG3WeeVmkVlvqIZQwbbROIJ9gQue9ZXKG+Wbp6jobVS0j7Pb308xga4OnJcZHPfnl2S4kj1VvFkTiUMuOSm1RTlLs8oiuULydg5RFlrtLg4chTEJ0Rs8cnykJOCq9gqpZqprMnAO6tLggQL6oTkV6G4ICwZO6SyRukgRRHbtUc7qR2wo5GCQlAs7C6YE8lOWJB5lkb4XZVCM3CLEPPj1QmZGQVdvg50pD1h1rT2qoP8AgtjfNI3VgvDQNs/cLibUYtslwJyyJL2R7dd46SzRzOjbJJBK1waTjU4HIB9jj8l23o25ir6htk8F8fcoaumGqaCEN/CyzwOHhEAY1NeQM98jvlbO4/B7p1luq5rNamR18T2afEkLmEhwJbgkjJGRwrR0yyhrLfLbDC1kEgA0xjQRwQRjgggEHthZ89iPDSNL9JNNxsH0wyqgrmXFsboKgwtbG8OLX05GMgY4OR/RWPqKjr6qonrKSJrGVeh1VJG3QZHNGMk85IxlbO39Os8QyCtrZHuOomR7SSTyc6clbmpsdLUxNhqTPWjH/fneWt//ACCB+ihWT4ePlwWPt/NS8eTnDmxSS2+jjbTaqarfO5w80jWiIt83YAuO3flbW8U5uVhnjazJcwg7/wBFL6tooLcyGnpYY4GSEMDY2Bo254W86atjKi3uOpoAA1AnhRXb4LcIqCbl7OTdDT3GR81ARDO+mf5oaiRwLTvuNj9VZ66w3atjLhPa4Wk7hscj3D89K1HXkI6c64o7nQkvfANdZG0f5lOTh2fcHce4910DXGBradYIyCO4K7lP20QrCq4Zy7qXpOOO11H4u4VFQdB1RMAhjd7EN3P0JK5v8JrZbK7rC7UlRTxkspJgzO+jIAJ/UrtnXEgbRSBg7LgfQtULfX9YXw5H4eJ2hw2GcPyP0UuNuUX/AER1GGVOvycme0Me5gOQ0kA+uE0psbi6NpPON1krUMI3fR2DcXNIzlqtzxsqr0THquEj/wCVitj0HIBwQyiu5QigBpG6SwfqkgRQkOVvccIiw4ZGFxF8l7KrgR8AndZGBwEQta3krHiMHAUpREGudwF0L4BX6m6Z+Jltr69zW0suqmkeTgMEgwHH2zhC+G/RH/Fcji2p2ZguY3nCD8Suk5OkeoP7vc1xhljEkZd3HdKeO40/Y8WXwmpLtHs+x2ptbdK8OlxEJGlo9iM/n2VBf/0TrWekOBTzSGSEjjBcdvscj8lVfgF8SzcbZH0/ca/wrtSM0QukcB+KjaPJueXN4I5IwVfeubdJXWCC8QPLp6U+I/yjIjPzceh3/NY0sfg/Fnonk+5FZIF6slUSBl4O+30W+EjNJxt3GFzzpC5+PRMcXN1txk+qtLqsNYTnG3P9FBJNMmhNSIPVUrZK6nlMWtkORxnBI5x7LUdP2+7UtNUPguzqwySF7jJsBnsB2x6LaSh1U7S0A57k7YU2igZSwaQ9rnHtkDI9cLuKa7JPuRl8Uig3i01MNRUy1ThLNX6W1Mj9yI2naNg7N3P15U+kuh8IRuABaOAey3nUNRRGEmTwnyN50jP2yqY2rtlRW+C2XRNpJ9z9k3FS7OZynBdEfrGua63yu/0H77LzXdrs2j6duduhkxVV1UWzAdoRh36uGF3frVzqWzhr3Yc4vbv6Y/3XmK8TCS5VLhwZDhXtSCa5MbbytPghwHLCPREKBCcSY9UdXjPLh0TTaKOSoI+c4C3kg7qJ01H4dkgGNyMqW9IVgXoLu6O/dBcgQJ3KSy7lJAihJLAWVGadWhs7QdJzj3TGxsPmJyivGYiO4UYHbCl7M5qm0dm/st18VH1nUMldiKWHScnbK2v9p/qKz3W6UNBTtP46jJD3Y20kLlPRN4NollmjJbJjYpvV12N2uP46RxMhAyVK38aIq+Vmrc98NUySN7mOBy1zTgg+oKu9J8V+u6awvs0N7cKd0ZiL3QtdLpO2NZGf6qjTnVGHhSLZUtpqkTvjbIwDcFV5Ri3yi7Ccljfi6PSvwi6kFystPUfLMGhk7fRw7j68rr1LOyrp9Adl3IwvJnSPXkP9+W6kjhZTNld4EjuGnPy5++PzXerBeHOk8N5dHM3YtJwf/PdZ2xiqVl3XzOUS2dSXKrtdNG2lp3FpOl7ttsrSR1V5rIT+Dhge7G7pJSCtk28RTHwqqMFp23GQiOp6OZh/C6WHGdm8lVYyr9xr4MuOCpoq9fSXeeKSS4XGGGIjAhgG5x6uP7rR22mNFXS1zGlkL24Afu5wG/Kuz7YZnD8SJpADs0YH54VY61BpIMOIZG1uSG/wrtc8Ie1txcaiqKF8WeofFpnCI5MbS1rfV5C8/PcS4l3Od/qu3WK1HqCoqrhUN108Ac2Bh4Lzy4/QKj3npGpmsVFc4oTHJI18bnEjEjmOLTn0OwO61deKpwj6PN7L6m/ZRs4eD7rYUEP4irjiz8xUGphlp5nwzxujkYcOa4YIKk0MzoZI5hy0qYrnTaeIQ0scY/hGE161VnvUdUwMkcA5bN5zukIE9BcUV/KE9AAyUkjykg5KE3hZTGuGOydkeqjZoxdoyP3UY+V5CkoE4w8Ed1JDoq541Kx0bi3cFZdIwjDmklYYMhMlaQclSEAdjg6PAWGnyEEZwm05GS1OGziPVRy/JLi5dDQ8xva+NmHtILXDkHsvVdjgqbjZ6SSuifTV4hjdI0OGpji0HkLhHwas5u3XEMvhNlZb4nVjmuAIJb8uc/6iF6LobhDUTwVcY0axokiP8AJJaM9+4z9FDsY7h5L0T6snGfi+mDgutTbpWtro/GiJwZANx9R/VXO03SE07ZKeOOpa7dpatPV0MUuCWAtI5/oo1F044Sk2+unpXH5hG7Y/Y7LPqL7L0nKPRvbhcY2OfI/Vkj/KHK5j13WT3h7rPQOEk0hBqZmnLYW+me5V4qOkXTAurK2rqC4bjXpH6LVyWiltrHQ08QYMngf+bruDjHlHElOfZrelbRHQ2V8LG4aBtv7ItLb6H/gSKkkEP4iKpleG5ydDpHDJHpv+isFspHG3kFpBwdgtJ11Zb7aKGWRr45ooaNkpjY/JZ5skgEe/ZWtJv7jZDuQi8ajaTOY/GT4eFllZe6TaeNzGPa5uMtI237491yZ1iulNIYpabB5HmC9Z3q8UF7+GdSx8bnOdRNOWlrgHceuRyuIV8XjPpJMAl8QJx7rcxa0c7bffBi5M0sKX9lJo7HWsHjGZseOw3W/inljhY0vbIcb7EFbWrgAjaAAPZQ54WtGQz7gKw/p2NIrrbmyLJLM8bENQD+IB/wA1p9iFJAPABLjsBhbGO2NbDqlGHEJLQxvhIb2pLs0ZM+f81v5JLZPovNs3P3SS/wAfAP1kjmWUgcLCysijTUmhwe4d0nvLhgpqSVUDk32Oa8tCUkjnDGE0hLHb3TOQkIw7JKK/ZwIUd7tLi3nCOzL2AAEk8AIfI4unZefgvPVxdU1MFAGmpqaR0ceo7Z1tP9F0it6gNLNbxGGt8aNrJ2O+aCaNxyAPRwdyeMED1VI+CFqroOtKO4g+G+MO0NI3Jxn+iv8A8VKKlpOvob7A1raC6NJeztT1DvX0BOfoSPVOSlCFyXoljOMslRfs6lZ5mVtHG4HdzcggqTSCWnmyw4I7Huqv0HUSQU0UEp3YMHJ59Fd54hhs7Rkd1iPhmvdom0VU2V2iUN1Bu2Qq1WQieoe4+YNPGP1W8NLHOzUHY9MFCFJFC0Nbue3umFoJYaZjXQ+IGlpeMh7tIIBzjOCpfX1yo7hNXRSUMWXUBwYJw5zSD/KQCftlbbpGkfLO+X8A6rbCzGkOwA4/1x+6j9VUlBUV1VFU2qsg1UDxq06tK1dGMYxt9syfqEnKfiukcstfQ1Nc7AyeN1RpqoZA0R6dJO+MZGRuBsuPTQGnrDRvD9VI98RzzsTj9CF37oqK4xdNg0xkqKeGpJD2VDmDBwcHHdcW64t77P1xX08hjIlHjx6Xlw/lO5J7aD91t6rUMq/m1/2ZWeUsmJpvqn/zwaqZrXPAzyd0q1rGRaQAogkfLPhudjypFSC6SOIjJWs+jNqmNtVMHzGolb5W7MH9VNkzNJjGAOESENDgwcAcJ72Bu4/dOMaRxKVuyE+EtdgE4+qSlvd5thn7JIoPI4ekkkvInozCyFgrKAMp9NGZZw0DPcpjGuc4NaCSdgArNbLY2CmPi7zSDzY/hHomouTqPYWkrZoaGgqK+pLIW4bnzPPAV5svT0dNE1zMPcRu8jf/AGUemhZTMDY4w1g4AC3FqrAwhhJx6Fa+rqRi/l2Z2fPKX7SxdEVH91Xulq3f/HqmyHP8p2P6Lq96obJc+sWWmuZm0XIAho/hyDsD2IP6YXHA/RKKhhy0jS4Z7LovQc1yvldTNa1znW1wMZ5GG+bJ9yHY+wXe5iVJ/wBHOrN88/8AuiyXbpK59EysdNNLcbG4AQXHT5oh2bMBx7P4PfHJstgrGTsEEjgcjbfkey13V/V90mb030jZpY6WouFY5zpHt1s8ONjpC0juHHS0+yfX2212y001XBM+yVbATIIw6WiD+SNO+lpOcaXDHp2Xmsum+4m9i3EuJG8mphEcsy0LEDRkve4Na3dznbAD3Kg2bqSjr4YIagxh8h0eLDJ4kOrsNWxGe2QFpvivW1NNb6eyULyyavOJXBmotiyBx6k/soIYJSyKDVFnJnjHG5p2b+xdZVzri99prmU9qZHpiEkLcTkneV2o53/hGQNIGecKZ1D8TKK0zMqbgxlQ2eF0B/BkksPqcjB54BXE+mKrVd5ZH/LDVOijYXFxaGhg/UHP5pfECsJujaEhw/Dtw/Ix5j7fTC9Jg1ISnGNcHnc2xJRcr5Ou9B1HRtxp6uNtdRNE0Yk0yTiMFwc4eZpI82NK5T8frfQx3yxS0cUbPFEjHOjGzgGuHPfZrfyVOeA9mkAOzsduyRIOkHcNHlz2+nori0FGakpe7Ky3Pi012qAxQshZkNGw9FGhPiVjn52CPXP8OLGd/qhUDNLC88nlX3+CourJUbsyEZ2KL8zMADZRm7aiOUWN22BlNM5Yi453ICSa93mO6SQqOJJJBJeRPSmCp1Ba6msY10enB7kqEVZ+mnhtu1NPm1EJNSdKJ3BR5cuh9ttUdFJnUJZ/Xs36LeU1Nj5huUyjpy17XPG/K20UWRqW9q6yxx/kydjO5v8AgFT07JNnAYT6m1DT4kBOQpUcWMFS6d+2Crygim5tdGroZ3MzBP8ATddh+AlzjppaukkDWvDmyF5/k4P6bfZcsrqUSHWwDV6LZdF3j+5r5BUVAd4GdMzR/Ew8qHZxOeNpE2vkSnf5LR17eDbvihRtjhjmbb6Sokax42hNQ8CM44zpZnfbDlc5K+e+WdlS+qdJ40YIDtmk/wD14G4wuP1dVUXi73O6Vx/52rq3yaj3YDpjaPQBjW4Vo+GfVkfTd2Yy4wGa3yuHiYaC+E/zsz+o7qo9N/aUo/uJltL7jT6KtNab9brxWttkVTFpkDwSCIpIjwDnY6cj8vZd5+HfQ1xu7Ka5XyWYvbABFDr1CNrufM7PvxlF+IVLbaiipOpLZJFUU7sAysOpskbuN+2Dke2oLrnT8TYbPTPOGtdBGSSeBgd1RzZOuC3CLfs4zTW+2dIV9/Mw0RU7Y6vyfM7LSwjVjJJcWrid1rqi43OeuqSXT1Ehkec53Jyuof2jLlTHqhtFR1IefC/5gMdsPMXNBPfY5/JcmaHElwPsFr6cGoeT9mZsyTl4r0Ocd84HomucGtc/b2WJDgbn7qJVSEt8Np/JWyslZHeHVE+AQWjupewjw3ttsmUsbWtyR+ac5wGRhJHbE0kZx/7RGP3wSEJp3zlLIByTunYmh0nzbZx7JJhfk8D8kkWc0ca4SKSS8ielErZ0dQl9slqCeX+Uew5VTXQ+ji1tgp9tzqz9cq5o41PLz6K21NxhwbEMBY0j0wVMpSNm4Udh9sdsI0QDTt27reiZMicG7bBMI0uyMJzHbLEgxg442XZGFY4H6p5jjeNWkZ+iBHzjgo+cNwmcsa6M48pwRwsE6zh+0g4908E57ZKxI0P5IHugLNhZeorvZYailpZ9VNUMcyWnlGqN2RjVjsRsQR6LtNm+J/SzeiYRLU1b7pS0gD4Z248SQAABp3BBP3XAiXDDXjUOx9FmIFxPhuy4Hg8qtn1Mef8AcWMWxPGqRMvNwqbrc6ivqnl888hc89gT2HsOAgZIGG8DYLE7/wDAYwDGsajn07bpoJGRqzjhWUkuEQN3ywUxLRySQgMbqdkoz3ZOyG52Bho+pSGhznBp2CETkHdIuJ+qbknuOdkDHZ2+iaXE9sLBdv8ARMJw5IYTDj3SQS8g7bpJWFHJEkkl5Q9AYwTsOV0i105prVHANixgO3r3VCs0QnutNEeHSDP05XShh244K0/p0O5FHcl1EdA7xI9R2d3UiI+UbBQKWTRO+B2xByPcKeMY52O611+Sg0SGOxjhE2wd1HYdt+yK12cBdkbQ9g29fqnFwaAScpbY7ZQi4A+6LEGa7O5GVkOP1JQmnOM8Hung8gYwixUPdnOywA0uDtIy05HsmB+cjO+FkHt3TsKHEnOSSmSDnBynOOOOUGV+4GMfdIaBvcRzv/RNOT2/VZkx6e6YThuMoOqGkjPO/wCqzkBv7phPcbn2WHHO53SsYVo/mPbKFJ6/+BIP+iY8jPPKTY0jBJHdJDkLg7bj6JLmxnLVgrKwvLG6bHpva90uf5j+xV5op/MY3EbHZc/tEnh3SmeO0rf3V4qGOZL4ozz2Wr9PlUH/ALKO2rkiXVsdls0e72Ht3CmQyiSJrxvsoNLOHjSTv2ysteYJg0bMkO3+l3+60k65KTj6NmzH5o8ZwFDjcDwco7XD0xlSJkbRIJGAQhlwB4OU0Oz9fdIuyNt07OaHB254T2u7ZQc9wUtR7IsKCl2+w/JZ1HOMYQy7AzlY18nsmFBXHg/+0GTcauPZEDhjOUCU5PO6VjSMPJGN0PUT6LDiQ3Y5TNQzuErOkghd75WM7YAwmB+ThIvHABSsZknG+6G9+2wwk88ZKFI4bpWNIRcfXH3SQXOyf9klHY/E5wsJFYXmjbNj0/SOq7nEBnTGQ9x9gVfSA75gq/0zA2ltoqNi+bzH2HYKa+vdnSGra04LHjt+zO2Jec+PRLfGyN4J8qPO0SQ4J2cMZ9D2KiQzGdpilAO2QUSmccPhccgbgq2mnwVn+SVRyv8ADHiDztOl3pt3Uprs+31UKBxcHBGa/thdro4fZMac7fukxxzuUBpzj0SJIdyurESScnf90teNwgSHGFlpIbkosVBHOyceqYCSTwsOeW+6ZqxuUASWnbJO6HKccBY17D6Jkmcn2QCGl+DgIbztssPdsUw4G3fC5s7RnX7rAk3OyY7YZTR9N0hhdY5QnHOfRLKYTvjCTY0Ncd+Uk4t9ElwFn//Z</field>
-      </record>
-
-      <record id="base.user_qdp" model="res.users">
-          <field name="name">Quentin</field>
-          <field name="login">qdp</field>
-          <field name="password">qdp</field>
-          <field name="image">/9j/4AAQSkZJRgABAQAAAQABAAD//gA7Q1JFQVRPUjogZ2QtanBlZyB2MS4wICh1c2luZyBJSkcgSlBFRyB2NjIpLCBxdWFsaXR5ID0gOTAK/9sAQwADAgIDAgIDAwMDBAMDBAUIBQUEBAUKBwcGCAwKDAwLCgsLDQ4SEA0OEQ4LCxAWEBETFBUVFQwPFxgWFBgSFBUU/9sAQwEDBAQFBAUJBQUJFA0LDRQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQU/8AAEQgAUABQAwEiAAIRAQMRAf/EAB8AAAEFAQEBAQEBAAAAAAAAAAABAgMEBQYHCAkKC//EALUQAAIBAwMCBAMFBQQEAAABfQECAwAEEQUSITFBBhNRYQcicRQygZGhCCNCscEVUtHwJDNicoIJChYXGBkaJSYnKCkqNDU2Nzg5OkNERUZHSElKU1RVVldYWVpjZGVmZ2hpanN0dXZ3eHl6g4SFhoeIiYqSk5SVlpeYmZqio6Slpqeoqaqys7S1tre4ubrCw8TFxsfIycrS09TV1tfY2drh4uPk5ebn6Onq8fLz9PX29/j5+v/EAB8BAAMBAQEBAQEBAQEAAAAAAAABAgMEBQYHCAkKC//EALURAAIBAgQEAwQHBQQEAAECdwABAgMRBAUhMQYSQVEHYXETIjKBCBRCkaGxwQkjM1LwFWJy0QoWJDThJfEXGBkaJicoKSo1Njc4OTpDREVGR0hJSlNUVVZXWFlaY2RlZmdoaWpzdHV2d3h5eoKDhIWGh4iJipKTlJWWl5iZmqKjpKWmp6ipqrKztLW2t7i5usLDxMXGx8jJytLT1NXW19jZ2uLj5OXm5+jp6vLz9PX29/j5+v/aAAwDAQACEQMRAD8A/VHijilpCcCgA4qG4ZRyew7Ul3eRWkZeVtqiua1TxC9yClsMKRg56kGha7AeUaL+218JdW+LF98PT4lFn4jtbo2ZF7C0MEswODGkp4LZ7Zr3iORdoO4MD0I71+XPjHwH4el8ffErwzrumRXUFxrstxHfR/Jc2zSKrpNG3XgvnHQ4r339l39oTUJfD3iLwl4y1BpfEXgyA3L6gFJOoaeFwkyju4VcNjvj1rsqYZwgprY6J0WoKSPoX45/G7wx8CfBF94j8RX8MQijb7PaPMqSXcm0lYowTyTjFfnbZftOfF342ftLeFtJg12XS9L/ALUgF34f0aRBEipIWdWlyS42clgdp5GOa474jfHzWv2ifi5qt8PB0c93aWpTStL1cY+x2wG5pXEmE81wynkcAhRX2h+w1+zj4U8H+A/DvjqGFLrxNqdkZJLjcWWFHbd5aqR8pXAUkd1PavIvVqS2tE+gjhcJhMJ7es1KUlpboz65s8EDGMYxxVniordCuCcE4qbtXWfLK/UKr3d0ltA8j8BRn61OeAa5fxTdlnW2B4AyaBmPqF/LqUpd247KOlQYJwBydwK9yCO4Hc01eAKZPKsMbSu/lpH+8ZvQAgk57YxTjordwaPzd/aDk8Wah+0B8QNQTUIPCum2U9uFs5kSRbsLAuHd8/KrLt4HPNcNL8ej4I8ZeH/EvhmG4g13TF/4m0bWZbytPcqJ1kR8BjjBTg889K7z4h61P471XX/Elkj3Eeoav9uiRGAM1vE+yMqCQG+VAwH06ZryrSo9Y1fXLTSpbzV9ankmlk1S+v4ZdkcDRGN4t8nJZiUbA4GFI7mu6rXq0nDDtaM3rYmpTlChy7npHibVW+LPjTVfiTdx3PhZ7zY9pb2kgjlS0ijwDMcEMzqMt2GBjpX3r+zbFc+H/gv4ODho7mSwS4dGGCPNJl2kdsb/ANK/Pb4LaLqHxh1vRPhfEsrT6fKYPElzhgIrCF9vBxy0yBVHsSelfqHHEttEI41SNEGxY0GNgHQfgKrFSjCKpwR04ieipvod9pt6t/bJMgGDwQOxq5XI+Gb37PdGDpHIMhfQ11oORXnHngehrhNckZtRmY8kHAruz0NcRrsRh1O4zyHAK8dD7UAc/reu2PhvR7nVNUuoLCws42kuLqdysaKOST3HHP6V8afGv9oLx78TobnQvCtrF4L8I31syPqmooTqV7AwwTHD/wAsVZTxuO7Br0T9s7xzF4VTwRZ6phfC13fyT3zOMrcPCheCJ8cbWcg7e4T3r5u1/WPFF34n0G8u9AuLLSdfe5l+3amfJmlRRy6RYDAEsoDEY5yBgV6mDo0pazep6WFoQm1KbEGnW2mx+H9EVW+wvOkEsanyzJGkLtsLDpuKKmc/x8da4HxB451Wzsp9a1jQLDw59gnSK3gtrL7OVHm7BED1mLLuyfbmu/8AEMsV0bHS0sF1fUdTnENpYOwTewOS7P8Awqq8liOMVws/wx8LWmry6xL4h0vxamknz7izs7u5kWz+faXHmNtk2k56AYFeTmvJTzCmnUsjwc2XJj4KVS1uh9dfsaSaXZeJvHNvDYR2+pXYtdQNwUAd0wYivrgbRx/tV9T53dDkds18efszXMlt8bLRFBKXel3EWP75Do/H4V9huGXOcZGenYelduLShUt1PWxCSno73LNn+7vYHXhgwxXfJyK4LTkNxe28YPIkyfp1rvVrkORC1zniqzJRbgAsV4IFdGeaingE8ZR13KaTGebXWn2t5BGl1bRXESEOqTRiTa394E8ZFfHX7Tl+b/4/W1t5h/4lmgxskbdIzLM+7/0Bfyr7e1fSZNNcuuTCcngZx7Yr8/v2vbmTwl+01o13fAxaV4h0VbS2uDwn2iGR22E+4fvXfgnD2seY6cM/3i5mefa9ol0fEGjazYxxXU2mpcW8lpM5QTxSxlHG7swyAK881+yuLLTG8JeFvB+sQapru6xgmvLqOaOOJiGbaU5xx36c8DNeq65rll4f0+W8v50htogWJfnf1wo9ST0A6ng8GtX4Q+E9a1/xDbyrbB/FutR740ckx6Tp4I5c8YPOSByzHGcCvL4mpYeElOOtR7LoePxJDD05KpBXqvYq2nwr8F/DfTtPvviBrd/r3iURCJZ7XUJLVLc4A2QLCQTjoTg+9e8/sl+OtX1bxv8AEHwnNq1/r3h3RPsr2FzqchmuYPMDFoWkOCwAVThuRml0z9jy9hmle48as09y5abUo7AG6KFiQFdnYJgNgbVHA6Zr3T4PfBfQPhvpEumeHbF4Ip5/tF3eXDF57iTGC8jnlyf8ivAy3DY1VfbYmd/LoeJluHxyqe1xMvkeheF7HzJftDdY+Aex9T/KuqBqvbWqW0SxRjaFFWAMCvpdz6oWkI4opaAIZohIpDAMDxg18Kf8FEPhrpXjfxJ8MdF1JLiPTp5b/a9tJtaOVYQ6kHB/u96+7pBlfSvEf2qfhDf/ABY8Axf2FPFaeKNHuU1LS5pj8nmrkGNv9l1JU/WuXEwqSpSVJ2l0OPFwqToyVF2l0Pz50b9nvwl8OVk13U77U9aXTlNyg1S4DwxbRkHbjBPBwfUDj1+0v2UfhXfaf4I/4S/VbXb4h8TBbuRX+U2tsB+4tx6BVO4+rOfQV4ToHwZ+JnxT8WaP4a8SeDrjwn4cgukn1m8uLqORZUQ7hBDtOSHOMkgcD3r9C9Ps4rSzigt1EcMahUVewA4r5/J8Ji4t1sc+aXQ+byTB4yHNXzB80uhmWnhYbxJcMHIP3V6GtyK3WFAqqFA6YFSquABS19Xd2sfXrYMc0Uv4UlIZ/9k=</field>
-      </record>
-
-      <record id="base.user_fme" model="res.users">
-          <field name="name">Fabien M.</field>
-          <field name="login">fme</field>
-          <field name="password">fme</field>
-      </record>
-
-      <record id="base.user_fpi" model="res.users">
-          <field name="name">Francois</field>
-          <field name="login">fpi</field>
-          <field name="password">fpi</field>
-          <field name="image">/9j/4AAQSkZJRgABAQAAAQABAAD//gA7Q1JFQVRPUjogZ2QtanBlZyB2MS4wICh1c2luZyBJSkcgSlBFRyB2NjIpLCBxdWFsaXR5ID0gODUK/9sAQwAFAwQEBAMFBAQEBQUFBgcMCAcHBwcPCwsJDBEPEhIRDxERExYcFxMUGhURERghGBodHR8fHxMXIiQiHiQcHh8e/9sAQwEFBQUHBgcOCAgOHhQRFB4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4e/8AAEQgAlgDIAwEiAAIRAQMRAf/EAB8AAAEFAQEBAQEBAAAAAAAAAAABAgMEBQYHCAkKC//EALUQAAIBAwMCBAMFBQQEAAABfQECAwAEEQUSITFBBhNRYQcicRQygZGhCCNCscEVUtHwJDNicoIJChYXGBkaJSYnKCkqNDU2Nzg5OkNERUZHSElKU1RVVldYWVpjZGVmZ2hpanN0dXZ3eHl6g4SFhoeIiYqSk5SVlpeYmZqio6Slpqeoqaqys7S1tre4ubrCw8TFxsfIycrS09TV1tfY2drh4uPk5ebn6Onq8fLz9PX29/j5+v/EAB8BAAMBAQEBAQEBAQEAAAAAAAABAgMEBQYHCAkKC//EALURAAIBAgQEAwQHBQQEAAECdwABAgMRBAUhMQYSQVEHYXETIjKBCBRCkaGxwQkjM1LwFWJy0QoWJDThJfEXGBkaJicoKSo1Njc4OTpDREVGR0hJSlNUVVZXWFlaY2RlZmdoaWpzdHV2d3h5eoKDhIWGh4iJipKTlJWWl5iZmqKjpKWmp6ipqrKztLW2t7i5usLDxMXGx8jJytLT1NXW19jZ2uLj5OXm5+jp6vLz9PX29/j5+v/aAAwDAQACEQMRAD8A+hI4anSEVLGlTqlXzkcpCsNSLD6VOqVIqUcw7FdYqd5QqyqUoSi4WK/le1HlVa2e1Gyi4WKvlUnlg1a2UhXvii4WKpjHpSeUPSrRX2ppWncLFYxj0ppj9qtEYrJ1/XtF0GDztX1G3s0PQSP8zfRRyfwFFwsWTHUbJivLPFPxx0a03RaDYS38nI82b91GPcD7x/HbXk/iL4n+LNYZxPq0tvE2f3VqfKQA9uOSPqTVJCsfS+paxo2nhzfapZW2w4bzZ1Ug+hyawNQ+IPgqz3CXxBaOQOkW6X/0EGvlWa+lbJLZJ5JPeq8l6TzxnueaYcp9Rj4n+Bn3n+2cBDjJt5efp8tVrj4p+CI1kP8AacrbACNttJ8/GeOP54r5fe7cg8gA9hUL3JPH8OehFHMhcp9K6T8XPCd5G7Xr3GmkYx5sZcN9Nmf1FJefFnwbFKI4p7u4yfvRwYH/AI8Qf0r5rN2p4wVx0xTHvMLwSW9TRzByH0hc/FjwZGQBcXcmRklLc4Htz/Tiud1T406LE+2y0i8uOesjrHx68bq8HmumYn09KqyTvnOafOw9mj2jUvjU32iP7JoSLCDmTzZyWYcdMAAHr60V4ZK7Nkk0UvaMPZo/RqPHY5qZMV5pD9pIGS65JICyY/StC31LUbdwn2qQYGQWYEEfQ/0rzli4vc73hJLqegKBUigVx8HiW74LRQMoPJGQf51b/wCEqjXbus3wT1Vx/WtVWg+pi6E10OpAFO4rNsNVtbtB5UmGP8LDB/8Ar/hV3zBWiaexm01uS4HrSEj1rO1fWdN0e0N3ql9b2cA43zSBQT6DPU+w5ry7xX8dtCsWaHQrOXVJB/y1cmKIfTI3H8hTEewkiqOsavpWkW32jVdQtbKLs08oQH6Z6/hXy34n+M/jPVg0cN7HpkJ/gs12H/vskt+RFeeX2p3V3MZbq5lnkPVpHLE/iapRFc+qPEPxq8F6cjiznn1SYcBYIyq592bH5gGvPNd+P2tTMU0rSrKzX1lYzP8AnwP0rw57hjxnmopJiO+KpJBY9Pn+JHxF8RtJbWmp3r4UsyWcSxlV9SUAOPxrg9Qvrx7mVrtpmmDESGTJbd05z3pPC2uXejX017ay7HSBiOAQfwPB/HsTXSeKdYx8NdJlW1gS81qSWS6lK7nIVwcAnpljnjnj3rCdWUJqNtGdUKEJU3K+qOMe5LE8/nVeS5z0NUXmOc5qIyn1Nb3OexdM/PJqN5x/eqmzHP3qTeM0XFYtljsLjp3qPzAVDZyDUBk4OTx+lMLZ7j6UrhYnMh6gHFMd39OahLZPJxQZX2bQBnqT3ouA5idwUkDIzzSTeQIQQ7tITyMcAfWoi7YwRn60wjPTOPpSbuNCTFNgKtknt6UU14j/ABHbkcUUBY+1LLWNOnSRfs0si7fkZYn6+/I/rUk11GkJkXquWPmxnC+nP/1qp2sOrRAql6VDf9Mk44xxxWhFNrg35vImDjBBgX+nNed9SqX6fed/1un5kVvrylVDpHGAMKyIBkfhyRUzT2wkw8jF8HMa5Vge4wRWX/YdyZvOa4jLFs826Y+n+eazvEfhDWddkZr3xHdFCNojWMBQvYcHJH1JrVYKXczeLitkWtR8baHpanfcLNID/qkXe2fz4/HFcprXxj8QNC1vo6pZJ/z1k/eSfhuyB+R+tKfhLKQQNbcZ9YBx/wCPVWn+EFw3/Mf/AANuP/i66aeF5DnqYjnPPNc1rUdWuWutSvp7yf8AvyyFiB6DPQewrKeTABPGefwr0uf4O3WNqa8g/wC3f/7Oqcvwh1BTka3ExHf7P/8AZ1uqbMPaRPOJHU/xE/rVdmHT5h9RXpY+FmoIuJNWhYf9cf8A7Knj4cFYVjllSQqMZUbM/XrmjkkP2kO55fkMpAkOOvAqNmCjOQfxr0if4cADEbAHud/+Aqu3w5DD97cMGHcc5/l/OocZLoWpQfU4ayhkk067uuQigD9QP6/pW/4yVh4E8Mtg4jNzH+qH/Gn6lZR2Hh+5s4lZmW8WDGOSBksfwxmut/seHX/A+mxBF3xTsduCRggZ6fhXBVqe/F+f6HqU6NqT9Dxds980hJx0Nenz+B9LgcicKjZ4Xeyj/wAe/wAatweCNJKBWWDGOrT44+o+tbuvBbnD7GR5E2eaQgn1+levnwHo64drnTwAOA1zkDH0qjL4Q0aGYn7dprZUjC736+2P5UKvF7A6TR5aCQcAc0c7uBmvSz4f0mGVW8u2kA/h8o46Ut1YaU+Cmi2b4YEhS6cenBp876InkXc802Hqoxxg5pFikkkCxoXJPRRzXbavotvcPG1pZRaeoB3IJ3kB9/m/+vUK6HGcGabzNvZySF+gpqTauDikczFp1y0ixNGI5DjiZwnHr8xHFTX2lPaFEnvLL5lz+6nWUA+h2Zrbbw/aGVnFywU9FAA/z9KtfYrSKLy41xkYyBz+eKNe4tF0OUkggfLfa49wA2qwYAnvzjFFdBcWcckex2UgDCryFH+Jop69xXXY+mY0lP8AHg9uKehm3bfPB+i4BqvGDkqWB44JNSJLtX7zD1JHFdaOYtLG6/N5/HU4p7Bv+fjI9AAarpMjEYZZPcLkYp7SRK2RJnHXAwPypiJVAUHMvOPb/CkKsqBjMwHuMfpTXmxHuLZYnPP/ANYVH5u8Bg3HoP8AP+FK5LQj5ILJNkH2qJg23/WEE+9LPOoOWQFVP905FQTT+YpCo5PYlCP51VxWGTbuu8ke4qrIDnHmn6VNKwCjcwyOoPSq0rg4IbH41SZNiCYNyS5GTVSZgoJZ+nXJqeWRQDggk++a5nxJ4i0qztblZL+DMY/ehZASnbBA5yTxihy0HGN3Y57xBBPHpcN7xi71CUD33RkZ/In866+OwbT/AA9psMqFJCjFiBxnivFPGXjy/wBUt7CzskNrawlwm5ssWOPn9AcED8OtdT8PLibYkUl35zSxMxBYk7gw/wAa8ynTftYyfdnt1aqdKUY9l+B2s0zvHsebKn19Kw73SiCZ4EZkXkCJSzH3x0/DFa1yrKQrJnIz8rDFVLtpltZFjIXjpk/XsM16M4xluebFtGCTcpziN0/2xtb8qYtwZTwp3D+HHH8jT7JeXYRyxFTgqS2CT6A8fpUd7DIz+ZvVcf7Rya4JwVzojK6LSQsRukjyP9g4qQfZgMByv15qC3bcgdV5/wBpgB+mTQ6vI3ykjHUKpH86xaa2KvcsNGmPlLSfgMfyqvOkpzuhP0H+eKI4Z0/i/IVYilcDD9R601Jg0UZI04JRx74qB7KVm3BwVxwMHitdzDJ94DpndUEsAK5jc/ic/wA6tMkx57Fsfe/pRVy4WRQc7icdOn40VVxWPaIp12ZLFuBk4/TipGuIEcEyRL6ZOCf0rHTUIwcvIxx0wcD+ZFWjeh/khUh+oO3P412nGaS3LMCYuc8Bt3+PFOV5FzycDgcg4/D/ABzWabt3UI06pg5J3KOfxzViMjepkkGD0JOfyI6UCLqsoBARnbkt0Apks8zpmKMbeufX8cVVmurKEkGQMc9ACSc+/aq0moYH7lSqg8MznP8AOhahojSWR8fvG2nHIB4qpdXqpyCM+nWsya9klYZl2H09B9ce1RmZdqjc0g54GT+tUl3IuWXvlckBnDdMYqtNeJkiOPPqfWmNIvl/MCueMlsfhVMy7M4AJz+nbtVqwWZJJcOeN65xkDaRXz74/kibxdqMcTuY2uiWXOBuA+Y4+pNe7TMzAMsjoc89s14V8Tbea18W3TSNE3nESIVPRSMAH34P1696zq7G1NWZha4D/aUMUcRVY4QOORnJ/wDrivSPAEm29szC8iu8Um8ZxjPJB/KvPy6z35eU/KijO3uCc/8As1em+AIbhnM8srmJISATnli3GPwH61xx+KKO+1oyZ2HPPJz7EVGx56inN0PcVXkDnLqyhR1OP/r12XOMWREkKpI3H8KhsAn/AD3rFuo4grLMQNpxnOOau6jdSrmOJo9mMEo3zH6/y4rJmMezlwn481y1ZJmsERrJFFMBAGdieRVzdeytmOWJE9CuTWQnlpPvklVxnoB1/Stm3VRyoQA88CsXozQmgRwvzusjDrgY/rRKm8ZctntilXeGySCB2AxSyyLgkkAd6loCk3mqpClmHuKhW4JOGcqfrjBq08ysMKykfWqU4GSG2kHn3FSNai3F9tDAruB6Y9qKqTKgxgIw75FFUmxWPV4XVIgXcx5HdiT/ADpyS228Zcybc5w+M+xAJ/UVmW5glwqlnx6gkj8jgVoIYoYh5hijQcZaTB3emP8ACvSucNrl6OeKJC4jCIw5wWz+Oef0pkksBIV0VmIx+8OQfb/Iqo1zBHEr+bIxPClZQR+vJFRGVt7lcHOM5Gc/jj+VLcGi+suxs+XZRDH8CZb8Mnj9ailvUkOBbq2B953wB+FVRtPMssUWOcKBu/maabuxiGPNZj/vqpHHfoaeguVkwkuXYlVgVR/cAGPxwahuBduysHUjPysz8r9OOagfUE3fL9odTwGwNoppuAT8yk+igDB/LkU0xpBI9yPkM2TngAHP5VEZWUeXIzOc8ZcCpDK6DZHtjLdlOP0qCZ8HcEPfHzE5/I0cxaiLNMWbocetcD488NJrWsxTC4aGVowuNm4cE/412M9wVYE7V9MqR/OsS9uDJqIkVslGUj8+lc9epaOh2YSiqlRJ7HMWPw11J9Zlsor6BnhVNxZCAwKg479jiu6tdNv9ML2U5WaVW5dc7fujjntjFa2lTKnja8m6ZhjOP+2a1o+JsLdx3AwRKg6DPI4/wrzMLXlKtaXY9bH4ONLD80F1MBbeRAzsWbHOxcgH61nahdnJBXg9scCtuSVYVLs3/Ac1zmoXImcgACvUlKyPBitSk0inPGao3MpIICY9jV84z1qGVIiSxRWx65rmbN0ULZJJJBlMqDz6VuwFdoxx7VmCWNHwECgf3avRSB0BByDSAuq+V4zUMsYdecg+wB/pTY3YcEDA6HOc053J9hUiKyW/lbgCwB5yWz+nalMfBJIyfenBjkjLN3GV6VGzf3uo96GMpzQIM5DMaKkmOeMY9z1ooSFc7V7tokzNK8fOARwPphev41Vk1eKMth53YdN2Co9eM8VnR23nPuklTH8QV8/oKt29tZRMBvLMvQOrJj8Rz+tejY5GSJfTSMNsTbm/iEfX+fH41ajS7mGNvA43KBn+WKeWit0zs8pDyV3Bs/nmmyagDjy4xECMBgQPzGf60BYcloXzkyH1YKSPoR1/KlFsq/MxOR0O09Ppmq81/tB8y7jPPcnP6Aiqkmp2bHBkLbupKFifoaG0OxoSSqjgbo3z8vHP58ZFK0z4JCvgHspH86zjfhQBDaKrHoWK5/IVWuL66l+Q3CxjP3VxmodQtIv3V3DbjMpCsRnCglsf0qg+rwsMRxOT7qP/ANX86iKwYO/czn+L1qS2giQCSQDPZc8Co5m2VawGOe5Tzbg+UgG4KWySeuSfT2rF025jOpiBnLbDu/D0+netXX7gJpkzDjI25rz3W4Xi0B9UlJZ5pRAgyRtAyS3/AI7j86yrQ5lY7sHWVH32egLqhXxa08S7422oSp6jaAea6+8vIr2yS4gckQMUdeu3OMfyrwbwPdFdXjgfDQz/ACOn17j3HrXqHhq88j7do4/eFlLxyE8nndz+ORXD7H2Uo1F0PTli1iqcqVtXqWdUnBXGWrBLtk5xmpLu782TAyfXFQ5HpXdOVzw4xsOMmPXn2qvLIwJ71MSOoOKZKYyvJFZlIoMWd+oXnn3q5akZwwBI9aqvgMcAnP6U+CTDfNnAoGzUEhIz0HenLIWGDkfSqqOHQdPw5odyuNigj64qSCV3RSCWx9TUZmVyMSKfUdaaz89Mj3qGR9vXoe9ACzMcfJ680VXlfcMKRg9SDzRRcTNiK7gQ7SFk9mmY/oR/KpDq8kWY44gmOm6QsPy7VkmUIAgQIcfwyAj8B/8AXpyXDBNpkOD2bB/pXfzGFrF2S/vGzlmHuCTj6EdKI/tkpyHkkPruyR+dRW2GJkjIDDqyuc/kARUxvVIwxkk+oBB/Hg1LaAsW1izjLrL74bp+VWG+wWgzJuDA8gSZJ+oFUcXk8W4yrbW3dlbbn8zyaqypHGxCybh2JHP5VLlbYpRL8+pSODHb7YEP8KALn6nrUKvI2QrOeex61XjVmHzqFGMYPWpwyp93avuOP61OrK0RYjGwgngjp/n1qUynoapmbjBbA9c1GZFJwJBj8aey0C92LqCpeXFvYzSNEkjEsy9RxVTVdPsbrRn0tm2RAYVtuWU5yG/Ojdv1VPnOUiY5B9SBUknyn5Wy3qeayV+Zs6J2VOKMjwl4ct9Kumu2vUupgCI/kKhAe/J61s6rM8Bhvozh4pFOV9CcEfTmqqSSox3vuGf7oAFMvZfNtZIwc5HSlN3i0FFuNRSRb1Vit7J5AQBjvxnHXmq0U0pUGRAvPP0qS9kjjZTI4XcoCjPXgVXcK64Vyp64yc1jFuyNai99lneCcZxTXUYyWqrko/3yVAxjsKckgUjY7MP4lboB7HrTuZ8qFcKrY4B+tV5WCn075qaeQBeADxxWcznozBt3IIH6VSEzRsZS+ecgd6t5wMbifrWdZSjYwxg+1WXc470iSTzJNxBUBccHPNMlO7grke9R7n9c01nYZ5z7cVKYrCEKgwqgD0AoqCZm4xwO/FFNCHoIGAw+G+oX+tSmWKJRwjn18zn8hxWZ9sLNhFGTxuUbasq8cCB5Q0knVdwwp/qa67mRoRStcHiObjujE4Ht6VMs9raffk+0PjhQTgH3IP8AKscXNzcEgyEJ2VeAPwFWIYgBzgH/AGgam7Y9EXp7uW/IeaTbgYUBTgfzp8RVBlVU/wC0vJqquxf4JPwORTt/IID+xwR/LmmtALnnKTwwP9KaX5IR8fif6VVEmTtbYSR1A/8ArUhkOeXU/Uii4WJy4J+ZgSO+c1Fc7ljzHk5I+YHFMMqsOST7Hn9aTIxweDSbKSsyc3dvG3l+QzGRNvmP1HIIx+Wfx9slA6c/Ov8A3yOKpXDAbSecHjpUgl3ryFrOPum05OdmTttYcOPXpVO5QNkZGMduPennaD/9emkZ78UpMS0I7Yzz7oJctk5UnpjFWECxkoDyDggDvUafK2VbBp38RbPJ6ms7alOTY6RWwXTBwOM+tMZmCjPLH2okYlQPMIAqGR2CjJ5Hf1pBcc0m4cgelVJXG/aFfkdewp+75jj7vX8ahm5GAAfXI61SEx9nMElB6g8Vpblxx+lYWcFiSPbHarVtc5G3aTg07EM0DJn2+tMZzUbP+NRMcg5/Q0CJJG6Hg/jRVUnAIHT0ooQWK63IgJ8pPnHcgf8A66IC80hJOSfU0UVsnqJl0FkwC5/CnCXb1z+QooqrkEizBeSOP90U6OYt0PHb5cfyNFFSxolikCsxPG3qAOD/ACqMSHls/pRRSLsJ5uDyM0vmZNFFA7DZGG0g1HDJ8vTpRRUyKWxIH9qXf14ooqWMN4x0o8w5I9KKKkBjSEcc88VE0uT34FFFAFSSVgCVJGDgc0vm5jV8dQDRRQgKsswUlQCehqe0kxgD+KiimySz5gGM55pkjEg4JFFFIkhDlU+Zi3viiiimmB//2Q==</field>
-      </record>
-
-      <record id="base.user_jth" model="res.users">
-          <field name="name">Julien</field>
-          <field name="login">jth</field>
-          <field name="password">jth</field>
-          <field name="image">/9j/4AAQSkZJRgABAQEASABIAAD/2wBDAAUDBAQEAwUEBAQFBQUGBwwIBwcHBw8LCwkMEQ8SEhEPERETFhwXExQaFRERGCEYGh0dHx8fExciJCIeJBweHx7/2wBDAQUFBQcGBw4ICA4eFBEUHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh7/wAARCAC2AIkDASIAAhEBAxEB/8QAHwAAAQUBAQEBAQEAAAAAAAAAAAECAwQFBgcICQoL/8QAtRAAAgEDAwIEAwUFBAQAAAF9AQIDAAQRBRIhMUEGE1FhByJxFDKBkaEII0KxwRVS0fAkM2JyggkKFhcYGRolJicoKSo0NTY3ODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZnaGlqc3R1dnd4eXqDhIWGh4iJipKTlJWWl5iZmqKjpKWmp6ipqrKztLW2t7i5usLDxMXGx8jJytLT1NXW19jZ2uHi4+Tl5ufo6erx8vP09fb3+Pn6/8QAHwEAAwEBAQEBAQEBAQAAAAAAAAECAwQFBgcICQoL/8QAtREAAgECBAQDBAcFBAQAAQJ3AAECAxEEBSExBhJBUQdhcRMiMoEIFEKRobHBCSMzUvAVYnLRChYkNOEl8RcYGRomJygpKjU2Nzg5OkNERUZHSElKU1RVVldYWVpjZGVmZ2hpanN0dXZ3eHl6goOEhYaHiImKkpOUlZaXmJmaoqOkpaanqKmqsrO0tba3uLm6wsPExcbHyMnK0tPU1dbX2Nna4uPk5ebn6Onq8vP09fb3+Pn6/9oADAMBAAIRAxEAPwD2Dwnq9n4d0C1sJt6YTk44J71pnxZochxcXO8Y4GK4e5RJI/LEwmj6hC/8qz3s7QSFXR0YdAK914GdV8/c8tYunTVn0NfVNVtra5km00gLIdxAGKpy+Jry5uA+8oQMAg1JdmzESpE8+7A6oDzVGSF5kA+xnzB/GgOT+FdlPLlPWZyVMyULpIrz6pqF1P8AvZnmboMtxirA167OnmxmjDgfccdUp0GjX033LaQe7jH86Zd6Xc2p/fwPH7noa9P2GEb5bI8361i0ufWwunakbV/tBubgS4x8p5qze+JtSkGyK7keJxykgyRWd9n/ANmj7P8A7NUsDhk72E8xrtWuVNRlnv7jz7pzJJjbk+npVb7N/s1sC39qX7NXXBqCsjic23dmN9m/2aYbX2rd+y+1IbX2q+cVzANr/s1GbX2roDae1MNp/s0e0QXZzxtfao3tfauhe09qie09qOcd2c3LaA9qg+xrXSvaf7NQ/Zfak5oaZ1CBWBPlYkPcf4UC2rfhhW5cLJgjGRsAGPariaZaxyRRO7hnyeccYryFjadNWZ6E8JUqPTVHMJBggheRVyOe7RNscjoe5B612kemeEnt133jxsD88hk5PsBUWqz+D50jhsoxE/TeMj/9dc08yozlZwb+RrDLa8NVNI46Sa8l+WSYmoXjlcbXdyOuCa7az0bQ45YpbrUEkiwS6b8Ejt070upDwqUMdsgRhyCknJ9qFmVCErQh+BX9nYmavN/icL9mpRa10U8EMrqtrbugx3Oc0+0t7a0LS3kCTDGFjLkc/hXZPGqELv7jihgpznyL7+hzwtasW+nXE5xDBJJzj5EJro4LqEguNHg3E4yc4A9hVptT1azijS0kso4cfdByR9RXHPMp/YgdsMrV/fmZf/CG6sHg324Cy4+YHhM+tOvfBt9BeLbRPFcB/wDlovAH1rUfVdZmjANwh+X+5xUQOoPjE5Q9yD1rBYvGbuyNfqmDWiuzP1fwsmm2TSTXsbzg8RqOCPWsP7IR0WuokspZpN80xkPc96ljsbAf6zP4vitqeN9nD947syqYL2k/3SsjjXs/aoXsv9mu5uItKjA/dIT6JzUB/s7AAREPvgU/7Uj2J/sqfc5KLQrudN0cfHqTiof7Ff8A56wf9/BXW3AhyAJkbHoc1S+yW3+z/wB9Vk8xqM6lllNb3AaUhLPvmJc5OCangsFiO5Fct6nk1agmX/lo/H1q5BdrEVMD+WQOp5NczxT7G31VPqYHiyKS08OahclXjaOEuH2cg+v614nbaxrFtLPapqVwYhhgCc4JHvX0Lr7JqGjX0F3dGYPbOAMcdMj9RXzrHJDLemXY4ymDgcivnM4xVT2id7aH0+RYWn7Oaavr19D0T4aa/NqGgatLqiR3c2nlHBwA5jPHOP516MlrCAMQoMcj5BXz9p1yLB7jycjzUKExqeQexr3bwnqlvqfhyyu48kmMK+eu8cGt8tzF1f3b6GGcZaqH71bN/wBfqaIDY4z9KUQoeqjNOFwAcBTz6055oweUyP8AexXqOszxFTRF5MZxliaZcG1tYPNmuIYIx/HIQB+tJ9rtuRvj3DqM9K84+Il++paqttEvmWcCYXZhwXPeufFY10Kd2duBwCxNTlR6iL6SODyY5o9jrnOAc1Cbmdvk89B/wCuc8DX0I8L2kDygSwAxkOeRz3rXe7gGf3qU6danOCl3IrUKlOo6fYdPLcFj/pDtmq5kfn97g/7gqOW9tx/GKpz39tzvkAx61v7an3M/Y1uzOH+J/jZ9KN5YQT+S1vGHnuAATymQg9PrXB+H72a+0yK/e5uHmnQSklyNmaz/AIz6XqviDWb2fToY3i+0nDmQJvjCJg+/INa2h74dIs7ZoAhjgjUgkZyBivmcfXVRt3vr+B9bleHcLLktp+LO5+Gep3kjzWEu9x5fmoDzs5wcH3rtN1x/tf8AfNef+DtQj0/UJrmZB5jwiJOeMZ/+tXVf8JKP+eSfnXq5bi4qgk2eNm+CqvEt01oY/wDwlkmf3flgfQmgeMbiNgxf5f7gjHNcPGVQcrUiOoThCD/vHNeVWz+ta0PyPVo8O0N6n5m/4l8VX2qRC2VXt4D1RM5k+vtWCI/RpM+vSnXH2oiLyUnkZ89MkgfSrtpo2sSgeY4j5zlxz+Irw6+InXfPUd2erQnTw/7qjDRFaziQSR/6wg9Setb2mXVzYBjZXDxxnrGeAff6+9OtPD8yRr5tzv7udner9xovmR7YJ3gk9c5/SohUnB88NGb1pwqQtNX8h8ev3jfJK9xGR3J4/OptOuTqsZfzpnIc8FzVaLSJggWS7QnvgVWi8MoJS76jdhR9wRP5f5kda1rY7EzVudmNHCYVO/IX7w3MYkSFsKB3yM/jWPKHij2yJ5Y962otHgilEm+6mx0SWd3T8jVuW2jl2eau/HTNYvFVJ/xHc6FRp0/4SscskssUmYrgI3qKnHiFvLOMzEfeMcZNdCLW2HSNPypQqJwOB7UfWmtjOpRnU3a+45w3L3YybW6Pfo6VVntbyTHlwTD2JOP1NdS5X1qN34OVU/Wh4ubVrhDCqGvU5iTRb6QBZVABHfHNRnQroDhoQfeuneRQNu39KgeR+cdu9QqjN9UYSaRcrlWuIwvWk/sn/p6StiUSuGPYHB9vaquG9X/Oq9pIPmQRaZZrgEF+O9XbawsbfHlwRg+uMmmxhiiqFc/SrkVtckBfLk68HZWrTOS8OpNGVA2gAVIGYgf0pLewvj85tyPYmrsWlXb/ADbUHrk1k4TH7SmiAf3TnH86UbAetaMWjzFOXQZ9Kmi0X+/IT9BR7OQfWIIzAVxxnFSg8fdrX/sqAffdzS/ZNOiHz4/4G+Kn2Pdh9aXRGSMntihAR8xx+FbA+wAj/UY+tS+dp0Y/5Zg+y5pclNdQ9vUe0GYBRieFJphicjiN+PaugfUrMH5M/glVZNTiGWCuR74FTz0V1LvXf2DINpcc4hkx7im/2feOOLf9a0X1dccQD8XqF9XfP+pjH41Pt6JfscT2KX9lXhw2ET1BakbSJTnLxj6GpZdWfOB5eeuKrSapLyxdMZwvFNYimL2FcU6Q43bJo138njqaZ/Y8v/PxH/3waY+qS5ZA4JA5wOlU/wDhIJfST8hT+sQY/q9fujdGp2ygeXDIfySh9V6YhA+r5rmI5nSAvKwcheCCc1JbFcFRNN5jjI4rN1qz3ZssLQXQ6H+03b7rIPoKjTUJyTi5cY6YrHgeZJOWcDHHpUkqf6Mdk+zPR85rlfO92aqFNbQNgajdnpdSY+opDfSuNzyye+TWa8beXGvySdzgYz71IgidSd2z6kUWb3ZXuLZEmoavYWEAm1K9gt1zgGV8Z+masxXMMo3xyxn3HNfMfj3U7zXvGF0kkgISc28CB8xoM4GK+ifC+nvpmh2diW3tHGPMf1OOa7cRgFQhBt6s5aGNdebSWiKfxIGqz+Db5NHkcXYG793w5QdQPfFcZ8B9fu7q21GxvtQ8zyiGhjlfLj169qo/GD4g3VtqM/h7RmhjWIbbm46uSR9wemPWvH0lcE4JUnrg16OFy7nwzU9L7Hn4jHqnXTjrY+u3lbBKvketQ+YSMyPj3NeX/AfxBc31pdaFfPJJHaIJYHP9wnlCf5V6dKzyQbUiAXuMZNeVXw/sKjps9ShX9rBSQzzf3e/dsGepqORyqDk7uvSnPvkx5bGONDy5xz9KquY5JzEJTIqcnnj8TWfIac4GRfvx4JHBJ7VCZBL827Izs9OfapOTudFQR9veoZdqyb/N4x0HOapJCuOJJBG+KPBx5hOc1N9p/wCnxP8Avgf4VTH7w71TZHn+M9TSeXN/s/m9Hs7BzXJ4jJ+8SYeZySHqO0WAyEFjBN1QEkACi485fLWPzkLkfPgHj0pUmcSSwzSHahGw7OuRWvJoRzk15aedErQuUlyCcHrT0EqSx25ijGzl+elRnaLcKHeTByRnH8qnB3n/AFO8bMBw/T2rJpheIefDFdtmaNFcfxtsH0ryf4u+NL+21htC0a5FvDAmLmSLrISOn0Ar0zxBq0Wl6HeX93s8uCBzzzk44H54r5w8Q2rW0Fk9y5N7exm6m+boHPyD645/GvUyvDqc+eZ5uZYhwhyQKdncyWt3Fcw4EsTh0JGeRX0N8Ptf1rX/AANLqJ8uTVAZI4QE2I7jpmvm7OOtfQfwPfHw8iSPBYzSnBB6/Wu/NYL2anbW5w5XN+0cL6WPCdTN2NQulvmP2sTP5+efnzz+tVwwPei+d3vJ3kbcxkcnnvmog/0xXppaHmt6nsP7PT2xGrpv/wBLPlkIR1T/APXXq8iAJseU5PJxXhHwHmaLxrJEkyJ5to6YPfkHAr3FyI84kR+fnKfyr5rMadq7Z9Jl1S9BDn2YCjftHAQ8D65qKQ/ugkZGM/OSf09qbuYpukbd7JUMnlu/Kfc6d8E1wpHbzDpD5hALJgjIH+AqGT5YgIkTdgnlOlDybOVBB6ZHWoZD8jIHKE+vrVqBPOPzkjEuc9ML39ai87/bH5Gh3AIAyVHRB/WovJuP+fz/AMco5Bc5OJZdnIIA71J5nK/P3zz3rNE2DJ5jlACQRv6VIsvHDEEe+Qa2aITL4mXODIPoRUvmqenb8KzkuMgjgntSPdbIDNITtjznjkAd/pWXIyudHI/FjUFv7nTPDfm+XFITc3z5+5EnPP615Hr+of2nrF1fBdkcj/u0/uIOAPyxWp4w8RJqesatPAv/AB8OIUcdPKTsPqa5lywHbPpX02Coeygrny+NxHtZu39f1+pIDzXuHwEuXfwndW5J2x3Z79MgV4Pl+Pmr2j4KbrWw1ez3xvJHdJn0OUqMyV6BplbtXPLNdiNvrl/bvkGO5kH6mqRrT8Yyeb4r1NwQc3L/AHOlZOa66fwI46mk2afhjVH0fxBZapGxH2eYE+6d/wBK+moruOaCOWFx5bgMjgZyK+Uute2fCTXf7S8NJZzN++sP3RO7GU/gP9K83NKF0qi6Hp5VXs3TfU78yb8qXH41DvDfN35wfT3qpvHlfvF389x1pJJXALgA+9eNyHtXLDttHTg96iDjHrnqc9ahkkOeWIOemcfnUUhYoVD49xVJBcstL/CDTPn96qu6jCI5/GofOf8AvD9abRmmPDhE5wPqetIJXB4TA9TURfcP3bAjBA45z6UIfkBkMnX866LaGXO7lpyxQ/PsYe9ct8SNebR/D8cNvN/pt4DEMcfJ3NbssnlIJZv3IPygFsmvMfjEkp1m0nDSfZng2xhz36n+dbYSmp1kmc+NqOFFtHE9KZRjI9aCDwOeOte8fOCBg5KjqK9R+C9w8Oia7cOxEMYD59whrgPCemnV/ENrZ5AV/vk9ABmvUn0Gz8O+BtRgEhnlMMjvMDjkj6/hXFjakLeye7PRwFOd/a9EeQu5Z2ctkuScmm+uajQ4wKtadAt1qEFs3SWQLx712PQ89akOa7H4T6l9i8T/AGRziO7TZg/3xyK42RXilkifqhKflT7O6e0vIbmFsSROJB9RU1Ie0g0aUans5qZ9HmU9A4H1Bx+lRSFg4cYfH3cdqqW1+l9p0FzFs8q4hDI/uRT0hhjEWJpptiZcykIZD/wAcCvmrW3Pqee+xPiYgOUKJ603dn5mJAx6dKqT3sSbUuJkjPQRjmmS3UJTcLjEcZ+cjAA9c0kmDaRZMo2ZEvPaq3nN/wBM/wAjTJJELl9+9fLGwxjJJJ/LGKg82f8A55W//f4f4VdiLl/zGeBlLDOfl396WfzZEKw/JKBkxh8Z/PiqMl05tIr3bN5OM7OAQcZ5B71Kl3ZyuJoZzNA8eUORz+XcVrsjN6suReXIg+0lxM68ITz7j8K8V8d6o+o6/MguBNBbEwwuBjIB5OK9I8SaqNG8PXd55qGaeMLAM5y5GMj09a8WJ967sBR1czzsxraKmX9Dthe6lFCx2RjMkh9EAyf5VUnlMsjynguSa2NMD2Hha+1I8SXriygOOo6yf0FYLliMIvOcV6MHds82atBHffBgomt3sxRCwgCISOmTXaeO5o28L6ixRH2QEZPJBP8AWsf4WW88HhuFxb7BcyPIZeDnsB7dK3PEtpdato11p1tJHD5qbSkg4znOf0rx6819aue3h6b+q8p4ZnA45qbT7hob+CY4HlzI/Psaua/oWo6K8cd/EieZkoUfOah0OKK51mzt5hmKSZEf6Zr2OdOF1seJyNTs9y54xgW28S3yRDbG8nmJ9Dz/AFrJjDyyCONN7PwoHUmvRfifots1kdatYiJYykcmzps6CvPbC5axv4rxeWicOPbms6FT2lO6NsRR9nWsz2fwBZX1j4agttQJGCSiddgPOK3jbKY48TcbskH07Vn2l959utwFmjilAIdIySfcD9M0+5uLeYNEXnSQDIAbgemK8GfO53Z70ORQsuhJJZ2jyCSWINJH3I5+tMfyPkQs7kkguQAPpSJKpgHlrMe+NmCarb2uF3PDG5yAgHB+p9h/WqgtWKbVkWisbhnkfzGJxkjj/wDVUf2dP+ep/KmGVI3CTYhzwiDO/PsKm5/55T/98GhtoEk+liGe2ubu0ktruaFIzJlQBjZkDgn+vSlgtnt5XiiuYS2Ml40CE/Qd8E57cUFJdg2yfMODjIxUWqXy6VZT6ldND5caZ/effc+g/GtLu3IZ2XxnmXxI1ea+1n+ziCkVk5TZvzl+544rltjyMEjXe5IAA75p93cS3NzLdS48yVyx/Gul+GWi/wBr6+ZpYkktbMCSQSdCTwBXspKhT9DwW3XrepJ8Q47bT00nRLfINtah5zkEGQ1yaI8koSMHL4CoPWtHxXdC78Q3t3Dv8rziI8kEhBwOlS+B7f7T4ns0OMI/mHPTjmiF6dO7Km1VrWR7LpVl/Z+lW9nFzHHGI8om/wCfHIJ7H61FBdLKPNhYSHnCCTvn74yKjkLxygozvNJgO285x1yB/n2p8sW+T7fcTJgjAI+cuD39un8q8K122+p9Bz2SS6HCfFu9nuLmxSaCOGQBz8gweccf/XrlPDgeTXtPRB8xnTg/Wug+Kohj1i0ihQD9yWc9ySe9Yvgof8VTYs+co+cD2FezQSWG0PExDbxWvc9c1W5W8srrSikc8ssZEgiHlxxZ6D614ddK8cslvJwyOVP4V7pblLsx5tgAnzmFxg89815X8Q7H7H4qutqMFlAlAOOh61z4F2bgzpx6vBTR3Xw21D7X4XWF3fdaHyiU4OO34100iohXZHHCw5OwA5FeWfC7U5bTW5bRGAW5j756ivSL/dLJFMHEcicb+enfj8K5sRDkrW7nVhZ+0op9i3HHFFl/3xYp9w9T+HaoZDc+fCqPGkWH84OfnH9zHbr61XJlfEqSImD8hGf0qR5H52Yc4xkdK5etzp3ViQzZnLRtNHgBBITkkfWqXkQf8/t//wCBr/41JBJcrE1uPLHzjJ7kfWmbf+mMn/j9ElZji01qPf8A4+4yoHnLuwx+6c+orgPipqNxPq9tpROEhTe/913PfFFFd+DSdRXPOxkmqMrHEZwMmvTdBFz4e+HN5dILd5Z4/NDgHKh1wv4iiiuzGawhfujjwWk527M8x3lgc9T1rsvhFHG3iKeRkBEdscDOO9FFaYr+CzHCfxkek9cxqdzx43MRt9OR1yfrT4JSI920d93/ANaiivCex78Nzyv4nSb/ABTIqjAWBAKoeC5fJ8T2Dtk/vOcUUV7kP4HyPFn/AL18z2kMrxl9u0ZHArzX4tR7bqxuicmRCoHpg0UV5eC/jI9TH/wWcho85h1W0nVnDLKnQ9s17ZKdyFzyq9Qe9FFdOY7wOXLdpjJn8vllDeYQD9M4qC3mV4UeNNiAlUXPQA4oori+ydy3JC+1QFGGLZJpvnS/89WooqDQ/9k=</field>
-      </record>
-
-      <record id="base.user_ngh" model="res.users">
-          <field name="name">Nicoleta</field>
-          <field name="login">ngh</field>
-          <field name="password">ngh</field>
-          <field name="image">/9j/4AAQSkZJRgABAQEASABIAAD/4gv4SUNDX1BST0ZJTEUAAQEAAAvoAAAAAAIAAABtbnRyUkdCIFhZWiAH2QADABsAFQAkAB9hY3NwAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAA9tYAAQAAAADTLQAAAAAp+D3er/JVrnhC+uTKgzkNAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABBkZXNjAAABRAAAAHliWFlaAAABwAAAABRiVFJDAAAB1AAACAxkbWRkAAAJ4AAAAIhnWFlaAAAKaAAAABRnVFJDAAAB1AAACAxsdW1pAAAKfAAAABRtZWFzAAAKkAAAACRia3B0AAAKtAAAABRyWFlaAAAKyAAAABRyVFJDAAAB1AAACAx0ZWNoAAAK3AAAAAx2dWVkAAAK6AAAAId3dHB0AAALcAAAABRjcHJ0AAALhAAAADdjaGFkAAALvAAAACxkZXNjAAAAAAAAAB9zUkdCIElFQzYxOTY2LTItMSBibGFjayBzY2FsZWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWFlaIAAAAAAAACSgAAAPhAAAts9jdXJ2AAAAAAAABAAAAAAFAAoADwAUABkAHgAjACgALQAyADcAOwBAAEUASgBPAFQAWQBeAGMAaABtAHIAdwB8AIEAhgCLAJAAlQCaAJ8ApACpAK4AsgC3ALwAwQDGAMsA0ADVANsA4ADlAOsA8AD2APsBAQEHAQ0BEwEZAR8BJQErATIBOAE+AUUBTAFSAVkBYAFnAW4BdQF8AYMBiwGSAZoBoQGpAbEBuQHBAckB0QHZAeEB6QHyAfoCAwIMAhQCHQImAi8COAJBAksCVAJdAmcCcQJ6AoQCjgKYAqICrAK2AsECywLVAuAC6wL1AwADCwMWAyEDLQM4A0MDTwNaA2YDcgN+A4oDlgOiA64DugPHA9MD4APsA/kEBgQTBCAELQQ7BEgEVQRjBHEEfgSMBJoEqAS2BMQE0wThBPAE/gUNBRwFKwU6BUkFWAVnBXcFhgWWBaYFtQXFBdUF5QX2BgYGFgYnBjcGSAZZBmoGewaMBp0GrwbABtEG4wb1BwcHGQcrBz0HTwdhB3QHhgeZB6wHvwfSB+UH+AgLCB8IMghGCFoIbgiCCJYIqgi+CNII5wj7CRAJJQk6CU8JZAl5CY8JpAm6Cc8J5Qn7ChEKJwo9ClQKagqBCpgKrgrFCtwK8wsLCyILOQtRC2kLgAuYC7ALyAvhC/kMEgwqDEMMXAx1DI4MpwzADNkM8w0NDSYNQA1aDXQNjg2pDcMN3g34DhMOLg5JDmQOfw6bDrYO0g7uDwkPJQ9BD14Peg+WD7MPzw/sEAkQJhBDEGEQfhCbELkQ1xD1ERMRMRFPEW0RjBGqEckR6BIHEiYSRRJkEoQSoxLDEuMTAxMjE0MTYxODE6QTxRPlFAYUJxRJFGoUixStFM4U8BUSFTQVVhV4FZsVvRXgFgMWJhZJFmwWjxayFtYW+hcdF0EXZReJF64X0hf3GBsYQBhlGIoYrxjVGPoZIBlFGWsZkRm3Gd0aBBoqGlEadxqeGsUa7BsUGzsbYxuKG7Ib2hwCHCocUhx7HKMczBz1HR4dRx1wHZkdwx3sHhYeQB5qHpQevh7pHxMfPh9pH5Qfvx/qIBUgQSBsIJggxCDwIRwhSCF1IaEhziH7IiciVSKCIq8i3SMKIzgjZiOUI8Ij8CQfJE0kfCSrJNolCSU4JWgllyXHJfcmJyZXJocmtyboJxgnSSd6J6sn3CgNKD8ocSiiKNQpBik4KWspnSnQKgIqNSpoKpsqzysCKzYraSudK9EsBSw5LG4soizXLQwtQS12Last4S4WLkwugi63Lu4vJC9aL5Evxy/+MDUwbDCkMNsxEjFKMYIxujHyMioyYzKbMtQzDTNGM38zuDPxNCs0ZTSeNNg1EzVNNYc1wjX9Njc2cjauNuk3JDdgN5w31zgUOFA4jDjIOQU5Qjl/Obw5+To2OnQ6sjrvOy07azuqO+g8JzxlPKQ84z0iPWE9oT3gPiA+YD6gPuA/IT9hP6I/4kAjQGRApkDnQSlBakGsQe5CMEJyQrVC90M6Q31DwEQDREdEikTORRJFVUWaRd5GIkZnRqtG8Ec1R3tHwEgFSEtIkUjXSR1JY0mpSfBKN0p9SsRLDEtTS5pL4kwqTHJMuk0CTUpNk03cTiVObk63TwBPSU+TT91QJ1BxULtRBlFQUZtR5lIxUnxSx1MTU19TqlP2VEJUj1TbVShVdVXCVg9WXFapVvdXRFeSV+BYL1h9WMtZGllpWbhaB1pWWqZa9VtFW5Vb5Vw1XIZc1l0nXXhdyV4aXmxevV8PX2Ffs2AFYFdgqmD8YU9homH1YklinGLwY0Njl2PrZEBklGTpZT1lkmXnZj1mkmboZz1nk2fpaD9olmjsaUNpmmnxakhqn2r3a09rp2v/bFdsr20IbWBtuW4SbmtuxG8eb3hv0XArcIZw4HE6cZVx8HJLcqZzAXNdc7h0FHRwdMx1KHWFdeF2Pnabdvh3VnezeBF4bnjMeSp5iXnnekZ6pXsEe2N7wnwhfIF84X1BfaF+AX5ifsJ/I3+Ef+WAR4CogQqBa4HNgjCCkoL0g1eDuoQdhICE44VHhauGDoZyhteHO4efiASIaYjOiTOJmYn+imSKyoswi5aL/IxjjMqNMY2Yjf+OZo7OjzaPnpAGkG6Q1pE/kaiSEZJ6kuOTTZO2lCCUipT0lV+VyZY0lp+XCpd1l+CYTJi4mSSZkJn8mmia1ZtCm6+cHJyJnPedZJ3SnkCerp8dn4uf+qBpoNihR6G2oiailqMGo3aj5qRWpMelOKWpphqmi6b9p26n4KhSqMSpN6mpqhyqj6sCq3Wr6axcrNCtRK24ri2uoa8Wr4uwALB1sOqxYLHWskuywrM4s660JbSctRO1irYBtnm28Ldot+C4WbjRuUq5wro7urW7LrunvCG8m70VvY++Cr6Evv+/er/1wHDA7MFnwePCX8Lbw1jD1MRRxM7FS8XIxkbGw8dBx7/IPci8yTrJuco4yrfLNsu2zDXMtc01zbXONs62zzfPuNA50LrRPNG+0j/SwdNE08bUSdTL1U7V0dZV1tjXXNfg2GTY6Nls2fHadtr724DcBdyK3RDdlt4c3qLfKd+v4DbgveFE4cziU+Lb42Pj6+Rz5PzlhOYN5pbnH+ep6DLovOlG6dDqW+rl63Dr++yG7RHtnO4o7rTvQO/M8Fjw5fFy8f/yjPMZ86f0NPTC9VD13vZt9vv3ivgZ+Kj5OPnH+lf65/t3/Af8mP0p/br+S/7c/23//2Rlc2MAAAAAAAAALklFQyA2MTk2Ni0yLTEgRGVmYXVsdCBSR0IgQ29sb3VyIFNwYWNlIC0gc1JHQgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABYWVogAAAAAAAAYpkAALeFAAAY2lhZWiAAAAAAAAAAAABQAAAAAAAAbWVhcwAAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACWFlaIAAAAAAAAAMWAAADMwAAAqRYWVogAAAAAAAAb6IAADj1AAADkHNpZyAAAAAAQ1JUIGRlc2MAAAAAAAAALVJlZmVyZW5jZSBWaWV3aW5nIENvbmRpdGlvbiBpbiBJRUMgNjE5NjYtMi0xAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABYWVogAAAAAAAA9tYAAQAAAADTLXRleHQAAAAAQ29weXJpZ2h0IEludGVybmF0aW9uYWwgQ29sb3IgQ29uc29ydGl1bSwgMjAwOQAAc2YzMgAAAAAAAQxEAAAF3///8yYAAAeUAAD9j///+6H///2iAAAD2wAAwHX/2wBDAAUDBAQEAwUEBAQFBQUGBwwIBwcHBw8LCwkMEQ8SEhEPERETFhwXExQaFRERGCEYGh0dHx8fExciJCIeJBweHx7/2wBDAQUFBQcGBw4ICA4eFBEUHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh7/wAARCAEGAMMDASIAAhEBAxEB/8QAHAAAAQUBAQEAAAAAAAAAAAAABQADBAYHAgEI/8QAQhAAAgEDAwIEAgkCAwYFBQAAAQIDAAQRBRIhMUEGE1FhByIUIzJxgZGhscFC0RXw8QgkUmJy4RYlQ4KSMzSDorL/xAAbAQACAwEBAQAAAAAAAAAAAAADBAECBQAGB//EACcRAAICAgIBAwUBAQEAAAAAAAABAhEDIQQSMSJBUQUGExQyYSNC/9oADAMBAAIRAxEAPwD44AzXqk+nSuhG4PSlsbsDXaOED64/LmvS5J5J5rtIJZGwijI9TUlNKvXAIi6981HavJeKlLVENiM9TXPU9OKJDRrs5yEHPc1y2k3C874hj/mqO6ZMsU/cgIxU7gfwpwKkudnDVKXTJTwJrf8AFxTq6LOSCtza/jLXd0iFjYLZcEblw1d7G2eZ2JwKMjR7kn5prJv/AMtezaRcmNEW4tQg6KJAar+SJd4ZJWBcfpXoUkCpf0R0mZHYEjuOQalW1qM8pwe+ataB9QWsTnkBjzUhLOc87G69jVw0ixslGZ5UdmXhVUcGiNzprpB9VCvIyAEyaq5UXUEUT/DZduQDk9jTT2F0FzsyParJdQ3S/Zhb3JWmFklVwpVQD14ru5zgVySGVT86EfhXAXIq1vaxz7iqqT354odfaQyndEuARnGalSK9QMAM8ilzng96eaF0bG1gR7VyEfrsJOasmRTOAvrivMcHNPGGQ9EauRGzOECMW9K6yKZwo7mnrUYuYzgY3DivWt7joYmHPpTsFrN5isUAUEE81HdE9WglK2ZGOe9Kuzt7DilVbKng0xM5xwacTSYc5Iqr/Srk9Z5OOnzmvWurrvPJ+DGqdJfI3+bH8Fjk0ZMbsEE9+a6jsdRgA8ibcOykGq4Lu6I5uZj/AO410Ly8AwLiXH/Ua7pIn80PZBu9lvYxi4t2QH+oAkftUItvyVfd7UPN5ddPpEmP+o0ypfcWy2T71ZQoFky34LFpmmT3zfUx/L3JqyWXhYjmcqB7YqiWt9fQjy4LuaMZ6KxAorp93qMsh33tx5acsS559qXy4py8Ma4+fFB+pFm1Gw0vToi0rbmP9A61V7y7R5Asa7Uz6U5K11cvLLvd8DO5jnApswIAHcknirYcPXcjuRn7fyRQxJIIHBp9HOdvH4GunJZjhFX7hTlrDuk+sJUH070fQmE9HtZp8NHJ5bZxxknFW2C0+iwebNKwYDjeRk/v/FA9HliiKoqqGzgl8E/saf1O6eeEW8bgIPtMCf7/AMVVl0iHq+o26uUWQ+/TP5CgVzcQvJ8kbH3p25hhz8gLEdWPQ/dUCXO/CgjHrUJEStD8dx5ZPDj2WpsN4oK5Y5xzuoSQcc9Sea6WYouzG7PbFWoqmGZrZZcScH0IofPbxGRirc9+K4t7l42HzEqPWnbiYuvmHIznkVHVl1JDTwSqAyHIz1BqNLHMreaqsrg9RXbPN5TAOeD1FNGe4Az5jHIrqfuVlJEuK+MoCPw2PuzSG5m6E0OILNuOc+oFP29xMh2iQ7T2NS40Qp2Ek3bRlqVeIPlH9qVUBWis+U+cHg139HlK5GMU5blpC25wMDj3pku4GCc80d2WHVtZDgAA596mWGi3l4dsGxiO2eaHBn6hj+ddpNMjhldl9wcVDtrRaDipeosEfg/VGOCYo8n+pqfTwNqJwTc2f/zP9qHWniXV7dQi3LOno+CKen8SXUy/OCh9QaWaz3o0IviNb8hCPwNfLuL3tmq9T9Yf7VzDYHAtIGLgttJUcn7qj2Vxc3aSDzdzOQoB6D3qz2Ma6ZZi9+1M2Ut/XPdh6Yzx71W5p+o5wxP+URJrKCyiNtGitLj6znqar12QJmBKgDptoxezEiTMjLK/Vsf555oatjO4+rhJHXOe3+RRof6K5FuiMhaThEU+po/oWh3U7+Y2YoSMkkct93pU7w9okUUf0m4ZVRR82epJ7Yqw2q/SZPK3eVABwgwC2PUkgY71ZsrGIKWyWKMGJERS3Dn5s/3obqEZdst8xHHfj7hV1s7e3uyYxIJJAcEqMAD24wKE6zbRRS+XGS23r0OeBQ7YekUmaGUMSwwPXBqFJH82EBb1zR+9tsqX6HPAJzUFrRgTxjcM81ZMo4MFPGUOcH7yaSxytjCnn0olHZM822NQxH40VTw7qDxeesBKeoPT9alzSIjhb9ivxFAGRiwbuCOK5YAJuwD2/wC9G5NDu/M2vE498cVzN4fukZQjA54wM8VH5Yos8EvgFQW6yRHYVYkcjqaizw+U5TYxGOKJfR59OuC7gjnBxnmiMUNvfwllH1g/OpUk9oE4OPlFUWCRzlUJ7dealR6VehPNaAhF5JJFdahbywPnyyoz+tR47i481VMjbScY3VzZFRS2T1L7RtBx2pUgB70qpsBaKuBXo5pDjivVFMlhKM9672tn2rxB8xx2qy6TpNtc2MUsqncwJ4ah5cscatjHG40+Q+sUVzYc9a9VG6A9autt4esZCAY3/wDlRSHwppfltJ5UgKjPLUnLn406ZqR+gZ2uyRV9LCwhFH2iMsSOKLSztLIhL/ZOE54UdaESMFuZFHyopwOalW6GacQxE7mYAEHgUX+toSd4/SyRbp5+6dlYqN20Due5/KjXh7Tllld5nKQj7b9QMEfL+eAPvpWFtDNfiztUjwifKxPyjHU/f/FE7nZCy6db4AfDPt/4ccfp2qzkvAOMXJnsoa5kjji2iIE+Wnf/AKm9vSoZlaa5aygRpTuCts7t7e1P3F5HGkqwgebIuxGPUL3qDHqJ06L6gKHJ5fuPWoRzVFx0K2gsoCrTA3Dg/KG49Mf3Nd3lmJIdyLsJGSyJye2PuqoaXdmW8DzXLKpI56EVoGl3EE0axQkZU4GDnI9a5o5Oil3em+UX3KQM/MWGSaHpp9xdXUcUSl5mO1EUflWj6jZq0RTyUbOSDnkmr78EPAMT3q69fRB1RsxK44LcUGclBbHMEO7Bvw++EEdrpqXmqpK1yyhvLwueQOOatcvgi1lZYYLWTC8lpP261rLWoIIyDzycd6Ze0jUg7Rke1ZmTJJvyaePHFGRXfw6tpSsbAoAcll7+woVqfw+t44XA8117A4zW13UC4zjg0Lu7YMGz0oX5JfIdY4s+dfFfgq3ksTDb27gjk5FY9qdjdaBqflNxg5FfYWuacjo20c4r5/8Ai9owMxl2gEGnOLmd0xLmcZdbRSp7WLUrbzo8F2+0B61V9SsntLsBhgBvl96sXhWaSK72bj5Z4x2zT/iG1hnE7qAhhO4YFafYxXjTRXgAe4pVyiqyBmK5PXilV9CvQq3WulrlRxXQ4+6jFT2Lhzmr94ci3aTCSO1UKMZJzWkeF4z/AINbn/lrP+oS6wPQ/b0O2cMabagkcZqfrNxa6dpMrSsN7KQqg80R8KWH0y5SLBycAYqh/FS11Ky12WO6jkSIk+UCMcCvOcZR5PI6t+D1/wBT5P6fHcktsqZk3MWJwck4qTa3TWjGVCGcjK+xocHyBnO7HJFdx5GWG7kYGa9aopKj5vKfeTa9y3+GJDGrzNNljkFu5z1/TP51IurwCVplJDuSEOecetBLS58m2jQYXC4OPfiu0k8yQc5C4FBkt2NRaSoJTTMoMnb+n+aGSvl8t8zHp7U7POWOM4A7VFjbc561aKYOdBGxDEjzD8vcDqav3hy5MUKJGxXOAEUcmqHYxZdQCc461uPwc8A3mqFb+8jaK0wCueC//auyTUEFw4XNh3wF4WudXmilmTETHOSMjHoPWt30qxi0+2jtYV2qgxUbRdNt9Ot1ihGCBj8KMQqSM1k5cjmzUjBY1Rw3A455piU9TU5k46VCuIyMkUKUdF8bRHn5ReaH3KdeT1og2emKjzxEoTjvQfA3BIrOqKcHAFYz8XrTfZF1Ugnrj7ia2zUkYZ44zWa/Ea2LaPPIE3lUJH37TRMLqVlc6uDR866fBFGeWAYnPXpyf7Cu74/7jcuzMd5PT0FR7tm/x0QRkAEgZx3IGf5rzXWeK4a0VyVWI/jW4tpHnJKrRXUcbByv5UqYjZdgpVcUsC9u9dDkd65B4rpfXBxTAI6i75rV/CVuX0O1IB5XNZTCMk5revh5YCbw9YEjgxCsP67m/FgTPWfaePvnkEPD8ktlMJkGGByD6VUPjPd3eqvHez3JcxsyDLdvSvoTwV4DtdWA83I+Qtx+dfOXxZK3dxc3ds2y0iuTEqdSxyQSfyrz30iUsvI7rweg+u5sLxSxe6M9gQMoUY55waeADOAcBV6AVxEGC7sYNPIBsGPxr3DPnUUds5x6A1IhfbGBnGevNRT6g4xXUZ+Y/NkY5wKrVhO1EmWXJCqOT1qVaQM0gRQST3Fc6RYzXkrHhUTlpCOFHp71tvwb+HJv9Th1LUbUi0hwywt19i370KeRQQzhwObGfhr8NtQuYotXutMMy8GGB2K7vdvb2rb7DS/HE1usMV1pumwKuBHCuSo/Kj5eO0iVFCoqjAxwPagereP9J0iTy7i5+sA+z2NZss7mzTjjUEP3XhjxusHmQeKomcAbUI25P30Dfxb468L3ITWdKN1bjrMoyD+NDLz43acyyxwwzyGMclF6nPueKm6V8QrXVVgWS0mjScEiSSIqh9hkAMfuq9SSuirp+5ZPD/xZ0zU5lgu7C4sZDxlhlc5q+xTR3EQljOVYZBHeqHaQabNIJTaQsDyTsH+fSrhphQQKkYwq9KBOd+wZY6Vjkq4YkVxIV8v5qWoSCFCxJGKrer6qXs3it5QJCOCO1B8sKrqx7UmhO5d6g9xkA1nHjPY8Lxf0kEYJ6UJ1nwl4h1S9aRtRABOd/m4xQfV/AWvWML3B8Ql2CHCqCaYx44+bAZMkvBjogz4qkO0FvOYgH0BqH4j+XWtijll2kn34H70U092/xtxcHbJG5y3XPOc4/CvBbLqXiaCS4DGNAu4D0GM/lmtWGkYuS7ZQBkDtSp2WERSNHI5RlJBXPSlRROgCMgdqcjDMR0FN/wBIqRblcEnjFGK0SLWzZ1kKldygt161vvw0uEGgaagXnyhWART+XLkLkdPwrYvhvqkEdvZIJB8sYTHvXnfuHE8nGaR677Wyxx5n/p9Z/CyeK3iM821ESIkt6YFfDHju8b/xHq9rAZUsnv5ZI4yMcbzg47da+wPBmrwSWLwFhkxMBlwMnHTmvkP4mgyeKr6U4Mhmctzk9c9R99Y3206fSSCfXsMoZZZPkrQOeQMn3roZPoBUdTggY5POadjUtjgAE8+1e2Z5VOzouM7UzU3S7aS5nWFFzkgH1Ne6fptxeNtt4mZsE8DNaj8LPCr2+uW8k6CSY5ITGdnuaFOaihjDgc5qywfDfwGVkt3uYVaTh1i6rH/zH/mr6G8N2EFjZpBGgwq9utAdIsUsosDBkb7R9TVq0kEjJzmsnNNyZ6TFijGJIns0uh9YoYH1FANR8BaNezebNbQs3qygmrjAigY9a6ljPXFBVrwDkk9Mx7W/hDMn0k6JqU1tHcAJLF1DDII6e4o/pWgzab4UtdAlsIHWEn55Dk7upI4yKvTowBAP61H+jmV/n/ej/sSqmDeCLdgrwvoz29iwupI5NnKbD0H3Ud0+RVVcYHtXLxrDEVj4HfmmrRWdiQCFHel5y7BFHRC8c3hh08+Wxy/Ax61kureMH0uc2kNhPc3CxtIRuVFwBnO4+2eK1PxVG7Wg3nhCCMffVc1Pwl4b1y0Iu7GPe0eFkBKtjHr+VGwdb9QKcZeEUDTPG3iLU7C41C00stbW5HmKrbigwct06cYp6LxfBrWiyzJuj2Ag7+DuA5/f9Ksdn4PuND0650/S5Y1tpyWk3J82B2yDz1rOPFvhAada6jfRkowhZyAvBOKY/wCbehWUZx8mR2tyz6+84ON8rLnHbOfT2olojEX94kxYMLZ/nHUAjGf/ANhQa0hT6R5Scow3gjjBGTmpy3KxXUUkLBvpNq0UoPY5GP0ApyPgRyoA67EDrF06ElXkLj/3c/zSp97xHILLzgA8egxSolCVFDJIHepcKgRgkcnmvPoq4Hzc969dTkjPAFMWBs9iQuSc4q0+FtRbTvmdgISQGJGSD2IqswZOFAzmjOnWck8YjG7JbjBoGaMZRaY3xZShNSiaNb+Kr4WbLZykuchZAcFQR1zVI8QsqAKz+ZM5Jd+vX1NFlnh0izMMUTtKV+YsRnP9qrV2ZJ59+DyepNI8Xi48UrijR5vMyZorsxi1iWRwCATnHXFWrT9NtvIUuqAucHjJx99VeBisvHGG6mrFZ3YDQckEEZ9+aem2Z+LrZuXw98DPa6ePMtXhN1GZBMVBAUj5QPx/erP4T0iKynlnK/WtwT3AzRv4O3l5e6BHFcwN5EYRYpihTK4HHPXFcSqLfXbm3Q5VHI9utZM5tyaNvGkkmg3aoXZQB07VaNNj2r0xxVf0ZGb5nxnnpVnsl+X8KXkx1PRPgWpSwlhUaJtuKmxTKq4PNFx17imVy9iLcQbQcioQx5mM1I1G9VQcnFCZWuPKa4wUB4Ve9DyedBsSdbJV0V3Ydxj2NewSqEwuMULhtbmTLySEkjvRS0tj5YzycVRKw0kktgnxXIBp8mD1BoXpKG50uKTo6rgn1o34htPNtGQDBA70O8LqptjHx5iHDCrLRKSaEp3DEmc9+eKqPxIsoZtAvFxtLQuMg+1X27tRtZhwRWcfFi/+g+FtQkZuViYL+IxRMatg86XU+VrUyeYNpVSitGQO45/vSkAFwhjLFQ7kE9SByP5pq2aRJmyCcnn8P8ijVzBDDa2Tk4naMmRewXACn8Qc/jWnF+xi51aKy7RKxV0O4daVRp7mWWeSUuFLsWx6ZOaVHM6wUhGDwDXIiZ2UAc56V5DhkA9aP6daJDb+fcIuSOFNEnKimPH2ZFsbBlPzjB7VfPC1lbwRfSdiyuBkljhRVRS5YKWHSpX+JSSgZkKRqOFzjP30rNSl4H8ShAJaxHcX95NMCojUFgF6fh7UNvrIR20Lxgn5d7H78jH6UR0y83QXjyquxIcJz1JqZKkQ0+JeAwiw2D3H+tVUnEu4qSKS6kYJGfm7VMLtHKh9MEfhzT0tsct8pBzupicZdMnNH7WLJdWfRnwx+I8t/o8enW9tMZ7ZQoLH5PSrPYvJ/iztNKWd2DMR0JrEvg1Olpru2VCySgdBzWzyKYtbgZM+VKu4E9sHp+orNyRUZGriyNo0jRApgXHU1YrVNoxVY8PSoNoLZ9KtsP2QcjOKUmPX6UJuKh3N7IX8i3Xe57noKnSKcEiq/qUtzZ2UlzbR+YyhmKdzVVKiYpMK2tmNwln+skx36CpM6LIpQjiq1p3ikTxRmWzuELAkYAYYHXGDRW11uwlAxMoz0DAgn86Ik6Iadkf6NNEXVLmRHHKZOV+6pWn3sqbVugofpkHg1JaWGVM5Rx1GDQa+sZp33RymPByMc1G0y9OSCGv6jax2ryvIgAByTVZ8KGV9RmulRhBIM7iMZNQtSsZWuQ11cPIitkIen5UV0i5M8WwdV6VMnS2QvSqDtyQImJxXz9/tNaqIfDyWaMVkuJgpwccDk1tWrXMkEIDYLN0H+e1fKfxy1WbWPE7RwkSRWmQB1+ZvtfxRsFWC5MrjSM+t23SKJAd24ZGPz+/oKLXsrNBI7t8qLkkjsOF/z7UJ0+GQzbmBwOeala7KsejPbgfWl1JOegwa0Ek2ZMm1F2BBCJR5nk7t3OfWlUq3tmEKDcelKi6Mq2CfD9p9KuFUg7EOWJoprN3ljFGxJU4A7YqVpMK2GkrMV+slGW45xQ6K3e7vTHEpaQ/M3HQVDlcrGlGo0NwwllDTEhMZrh2RmIA6dj3qdqSC2QQ7jkDn2oeiAkYzk9W9atZV/AS08/UOjt9px8varDkNpZbODnv0qtw7YlAJJL9MDpR7c6W0MTfZOMUGStjWKVI7MJkiJDZZUUn7j/rQiSHEzDIPcYogl0W1fEQ2qMIBng4UCvbq123UjIcLlgPwrraOa7B/wWXtLyG4RvmVguD+Y/z7Vu95F9J0m11K07YPHuMEfnisB0sSQpHcAnDEDI7ECtx+GupxXelNptw4aKQAdeFaleQn5GcL1RafCOp+bMqNw69VJ6VpVi6lA3dqxWJZNH1xo2yBuwDWqeHL5ZoBg54pOfyPwdqixDnPNRmhBVlIzk09E2RXrrxniheSVplfkgk0pmltkE1swO6EAfLnrjFENOl0bVbWC1l8snsjcEfzUqRN6nPIoVcaJG83nRHy3zkkUxjleizgprzTCd14Pgmkle1vJbccbQnQfhQK98MeIoLaVxrC7EyVUpywH407Pd6to6nyrzejH+sk0M1vxTq02nNbpJFGSMbsUaXUjHxuT/5doz/xBq2v2/iRdGiuYZZNoaQopIXLH+BWmeFrBbayUyOzO2N7H9az3SLBpdd+lSAvI3LyHvV/lv0s9OkfPIHHrS+RX4GMq6LZXfiVr1vpemahfSOojt49ignqf++R+tfKbyy3NzJczfM8pLufUk8/vWg/G3X21WaXRraZfIswZrl+zvnhfwzVK0DQr6awhluYipmTdGjHDBP+I/xTMMVRszXmi5bBscfnTjIG1e54HXvQ3xBbeTeNE00MwY5Oxs4I/wBatV5o0V9DNaRzvGqnG5e5Hb3FZ3bRNDe3ETtuZWKk/jTuGOjL5WS/AXiHyDgUqUOREvLdPWlRKMqz3UptwMaqMRKAB0qLY6g9hbyPCAJpeGbGTRHVbeW8kkNvG2x32owBIOAPTmos2kS24Cz/AFYHc8dvuoaZqyi2BroytJvdizN1Jru3IVt8mfxp2WNA5AkEkmccDiiOj6Lc3socopVexOM1dySQNQbZFtoZZ5DIiPtHeiUsxiXzZCTxhc9jRS/t3tYBEoghJ4wDk0Cvk2ShZZkDHgIDkj3NUTb8BXURzSFAdruRiqr8+T60Yss30IOTnCsffsarF7qP1IsbfBA+03qatXgthPLDb/1MpUn7wf5qMqpWWwSTdBiws3MMkIJK/aAzRvwHfS6dqqwux+jzHbyeUb3/AB/igWkXZt9eSCVvlkAKbuxGOKm6yw0+U3MOPtguuc59/wDPpQ5eqIf+ZG36nA2pR296SCwG1gB0ajHhK/ktZvo1wdp7Z71WPh1qseqaWkjScPjK9uw6fl+VXO90osqOu1ZRyrA9/wDSs960x6NrZcre6U4ORg1PDBlBqjabqMkbfR7kBXXgHsasumagjny2cZHqaF1CXYTIx91dEDZSQbuldldqkGrxTRDewLqcSSj5sECg1xpts+TtzntVinjTnIofdoETKVF/I7CbS0Ao7RUuQQoGOuKzv4z+NY9A0kQRSD6TKCI07k+v3Vpd1KtvZXE0jKMKeT24r48+KviA654vub3czwRkxxjtgd/zpnjx7SM/l5OqI9xqSJwzCZ3ctKx53tz/AH/Sm9R8ZXMEQXeWxwFHp/pVcaSSYMyAAhck/dQQuxJYnO4kmtNY09GHLM4+DYYL21XSo7mE5WQA5B6E9azktu1e8K5wzZ/Wu/Cd/PNIumGQ7WPyg/tXt1F5GsXkYGCpANco0ymWfaFk5Psjj9aVewj6pfmHSlXWIErULkWNo7wSyI7sVCq5HHr+lVq51NmdmkleU/8AMxNSvEMyzXbKmML8uM9TQMxuWJwevFdjh8mjmyPwiUNRnRg0QI9xUyLxBqMfO9gPUCodvZ7j8+AR156V61vLn/dkLDkE7aJSBdpIVxqV1OWeW9lyTyMYzUR7himxXbHfmvJUZD8ykHvTbBj7VekDcmzqN2BCqWBrQPBcxtxbkcOwXaT0zWfKzAgHA/Crl4fdyLRcnK4P60DkL0jPEfrDGuyka/CqBUZX6g9DnOfwo3eXSTaYsl1Gcuu3zAOA3Y/carPinEGoh+xLYPc1YNIaO/8ACIiYkspY4/AYoK8Djbci6/A+4d5nslO4q2QPv4/mvojSWE+noJMM3IB9hwP0x+tfGHhLWr3QNYimSV0j3YOO3sa+xfh7fRav4ciuoxtD8n3JpHkwraNDBPtGiZdaUlwu1wQezelB7+y1GwxLHudF6MOv41cogUbaw5HenXWNhgHg9qWTou1vRXPD/ieOUCG4fbKOobirC96jpkMOnrVc1zRNPmJk8ny3/wCNDtNZ74x8Q6p4WhZ7e5S5jVSSJuCAPeixd6RynGO5GuidWbGR+dR9QaNUO5lHHevmi1/2iGiYefocrH1SXIP6U1q3x01nV4mg0jSvJdhjfK+QvvRP1psj97Gi5/HrxrFo+hSaXaSBru6zGMHlVI5PFfNdxteB2dQ3Q/nUjVb+81C7mutTuZLi5Zjljxj2A9KHXkw+jYXIbIXB9Kdw4upncrP+Twc3gRbF2iOMKRxVbUgsw6ADij7D/wAskzncM45oGYyGySBkU5BGXkO7CWS3uIp4yVZGBBBxRcXf02+ubroJX3Y+/PH7UF2ggAEk0Q0vCh9w2/fUyQJ3VB+Er5S8dqVRFvYFAX096VC6FOpEureQ3T7vkIJJ965uLTySkQIY7QzsO2QDR7xHBHFekW7L9au7G3GPlGf3oPdmbZFERsaRfmz146VMHY7kjTGpZX86IW6lY05Vcfa9zRCae6VVFvJJBGw+wo6nvT2lXVhpcn10SXE4XIPUA0RtNTtJGWV4YlyDmQjOPYCpZRbKvLa7oS0wlzkkMcAH8KHum5uhxVs1zVdOltzGsUj3Oev9G2qpLM7Pltqj0FSisqGlBeUAHABq3+HSi3cDAMyhMsfeqgpH/pp35Jq5aTC64CLg7CcL14FC5HgY4q9VhTU7WLUZ2yzFYrRm6dGwTXXg68K2kSuDtOQ2aO+H9Njl0fWbj/1VteCeo4ql6P5tvLCXO5ZVLKCOCeR/FAhLVDklTCl1pzSeIBaMWjFxKuAB0ycCvpP/AGZ9Ra48M3en3JJntJyhz1x/kVjPhu1fUvH+jl0U/NG5X2UA/wAVtHwqsG0n4heJLJGCxkxSBR2LLk/qP1oGWV6G+OqRrUpG3AGcdDUd5BjJHNOlcAAu5GajXnCEK2RnvSNB1dgXxBqEcELZkIx2FfPPxw1lv8IuG34Zz5Sep5B/bNbN4vdhG5ZwBg9K+aPjrqAOoWWnBsbFMzDHcjH8Gm+LC5ivKn1hRnUSlpR5fzEkgDHPJ4FWa2BtLBlLEPIQnHt1/eg2hrGZQ5G3bzuPrRK5nja+JUZjjACntnvWnN6MrGrdgq5k8s7mJABIP51E836QDxkbvlr3VzJLduY1wmc80zYkRONxzmrQWrKZJbokyFjYMOo4wKHiPgSP16ECp842IV7F8D/P400sRyykcZ/OrxBT2NKp4IUAemKejQscsePenY4+20kDpT2NvyhRmpIob8lRwQM/fSroHj7JpVB1BjVw1w8VxIzfKx+z6Y/0qDdeaZcOS0soBUY5HoBXsFwLr6Oke0k4B9sCrV9FtbVZLsIDKigRnrjjr/FBVoZm1Ipt7YPYyCKV189xuKg525qWhjgttnyMNvOTzTapJe3UreWX3ks7ZOQf7VGvokj3JtDMTweoH3Va9lPCIl5/9Tfxnt3wKhMNzZPGPUVPhsJpVZ1Q4HJryCBCN83HdV9T6VePkG18kvwlpQ1TU0iZtqp8xyetaB4Ks4zNqM0mzZHGVQ9j0zVE0e8NheC5iOOCvHU5q86bJL9FttKsoJDdT8yLtyWJOR+4/KlOQmP8RIsGi25Tw/rN2+EhkiOGJwApDAfsPzqlzwER6fFFwI4CxOem5iRWua94au9I+G19HqRZbqcRpFEAAoLEAfl1qjaxpj2104JH1axRNgY6IpP7il8cvYZlHZePg5ZfTfGIunX5beAAnHrnGK0bwUWn+KHiS8xhCsKg+uBj+Kg/CWwWx8Om8ZAJZyAOMfLjiinw/kSXVdTuEBBM2wnHUr/rQZu5DWM0J5QAR70L1KcLH1pyWfgjPrVf1u8xEQDyPeg0ERVPF94XLAn5VBJz0wK+U/GmoPrHiu8uVOY92xM91XpX0J46nkltXtkmWGS5YRKzMF27uM5JA4znqK+evGWmDQ/EVxp8NzFcLCxAkiyUIJzkEjkds9M9M07xGrozOdLwNWcbRxZLDOema7kfy4eenXbUe2vUlZYmC4zjJHWpF+B9K8vphex604ouxZzUY6BkrGWYMecjpXKxgN0IxXWAuRz14OaTAsckGj0Kbbs7vHKKuM9Qea7iAYbskgnPNMgGSdQF3bRUqSN41iByAy7hxUIlneCFPTnp/NefLtPPQcGkcnbjpnGadjglZRhcBmxmrHDRYZpVOj0xGQM6szHqc9aVRRxWNNuZIJsqccYqyjUJZIEhDth/l+4VUJAVyT0q2eD4PPl82Ty9sYJO70qJI7G/YOIINH0cNK6rLP8AtntVZvL0mRjGqruPXHP+tda/dyXt40jbhjplwFGOmO/6UJBDSKpccnknOPzqkY/JeUgsLgtZmIbgxHLHvXttDaRREz5c7coqt0NR5ZE2gQ4OOGINcLJFtVfmJHXJBolUDts9mMfnnygVA5Wt5/2efDk1882vTlWltwBGX5+Y/wCg/OsGUqXLuQBngVrfwD8U31hqF5ZC5s44TC0wW6nEScDoCc5J6UryF6BvjZOr2at8UXutTudG0qQxoJJ/NcZ5IQHJP4kVR7qzfUb6KONd/wBJnJXueWOPyXZRXxRrcepa3d6zbt9Xa2Swxnrtlfr/AP0oqX4AtTc+K7eJSWjtYS2ffgZ+/GKRjo016jUmhttM0UBmBht4M8dyB1/egvwpDf8Ahj/EJF2teTyzc9cFjj9MV38V74WPhs2doP8Aeb1hbQIOuW4/vROzs00fQbOxjGPIiC498DJ/el3rYxFEm4ujuIBFBdRzNuOTjvUmIPMc56mnri1xCxIzgZzVLZaqMf8AHUZvL4QjJSMZxnqf+/TFY18QtIlsdaWQI4hliG1iBywHI6nnr159q3rVLbzbu5kOQGJ/Gsu+Iem3c8WGcmGBSIFMhIQZ7DOR0HtTnGmoz2ZvMxdlZl0se0oQM4J7U7Zu0snLsrDuT1p1gBjIy4BDCmoY2YvuGG+0vvjk/pWt52ZO09nXl4PHI5r1sgZbdjGRjtSVvNzIMqMdMYxTch4VVYktwfXFSSdWZ2sXDHk8g+lT55C0cIPWOML+pqJbxHoOB0GadYkuetccdofnGOmRiiyruYLnCo4oSAcAAcetHLZC8bscjKhuBXHHrQ8n5W/+VKpDhd55NKps4zmRSQ3tUjTdTurWJo4HIVhh+3FeSriJRt5Y802yBGIQHOMcVzVoGnRYdI1bcWWa2ikRl2jKDP35qF4g0tre4zEkhR/mU8kYPWhtu0kUikAgirRp+qXl7pz2G6PLjbyuSFqlNBYu9FWhkZCEJ6np2qfH5YU71AI6Y71HvrGa1k8uZWVu2e1e20rv9SfrAO5q3lFdokxRs3zPgDrRPQrxtK1aCeUt5JYBivB2k4PNQNqbgB2GDivJRNEEYEspPGTUSjcdkp7s13SLtnsrK2SKVk1G+eVeBl8bdo46/ZHOMc1q3w8kt7PVZrh0RWlWQxljztUhfTpxWD6bfi88P6NC4Cm380A5OMgK3PI9K0Dwbqtrd3lpptrtik+jKkl27dGP4cMeR16VlZY9Ta48k0rNH01H8U+OzqD5OnaUW2+jze33c8+59KtfiE7UBBwBx/NcaLaWukaelnaIscaKAuO/qTzTeqSme2KEZ5pOTH6vwe6UgYKQM96IX8JNuwAIyMVC0CQLGFPJFGpB5qe1d7EMzTV7MxFuMcnn9qz/AMR2ccs80Cwwl3X52ZwSc5IwD06dvz7Vsviex/3ZmUYxWSa2Hj1yPyQjtKnzJIxAHUZAHfmujtgeRCLijDte06bTNQcvGNjMcEZwfzqBCplmjIG3HNaj4x0dbqGZOAxGQwwOR9381l8yKjeUQcqORW1gn3VGLyMX43ZKvBbqvEkRZuoU1GihQFpHkiUHuT0qHMPLZCB8uafAUkEMT9xpiha7JDyxsCseQB3Pf7q5UFiDkcetcZATjFOQ4JBIrqOQ6VKgA9hzj1NGrD/7eM4J+QrzQcgux5wMiiFiQsarnO2TPWuJHluY9o3A570qiSHbIynGQTSrjittzMFbkKOKbKhvMfuDSpVIIYKkuVOOB1orot21vMrLngUqVQ/AXH5DfjK5ttQ02G98uRbg4Uk4xiqzaRbI974YmlSrkdPySxg7SR+VeMpaIuGIIz3pUqkog34WmRljtpPMISVsYY45T0z7Vvdp4bjh1NpLaby4IraB/K28McE8/jSpVm8vwa/H/gutv4wtzawCe3lWaXIwgG0EEDrkcYPpUzU71IVU7XJf7qVKsqG/I7gbsf0eVg3H9VWaBjtBNKlVkMS8g/XnD2UysM/LkZ9a+a9c1D6VrDi4mlhltZ2RnhTO8AhgMbhx2/X2pUqNEU5XsWjWLRXO5sEkcjtjrWM+N7BNO1p/LwVkTdj0OaVKm+L/AGLcxLoV6ULtVjknBpm0fcGUilSrUMcfU/L+OKkQkAZx2pUqhkofQkOfwFSLIHMp4JxnmlSriw7IgZyxzzSpUq44/9k=</field>
-      </record>
-
-      <record id="base.user_vad" model="res.users">
-          <field name="name">Valérie</field>
-          <field name="login">vad</field>
-          <field name="password">vad</field>
-          <field name="image">/9j/4AAQSkZJRgABAQEASABIAAD/4gv4SUNDX1BST0ZJTEUAAQEAAAvoAAAAAAIAAABtbnRyUkdCIFhZWiAH2QADABsAFQAkAB9hY3NwAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAA9tYAAQAAAADTLQAAAAAp+D3er/JVrnhC+uTKgzkNAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABBkZXNjAAABRAAAAHliWFlaAAABwAAAABRiVFJDAAAB1AAACAxkbWRkAAAJ4AAAAIhnWFlaAAAKaAAAABRnVFJDAAAB1AAACAxsdW1pAAAKfAAAABRtZWFzAAAKkAAAACRia3B0AAAKtAAAABRyWFlaAAAKyAAAABRyVFJDAAAB1AAACAx0ZWNoAAAK3AAAAAx2dWVkAAAK6AAAAId3dHB0AAALcAAAABRjcHJ0AAALhAAAADdjaGFkAAALvAAAACxkZXNjAAAAAAAAAB9zUkdCIElFQzYxOTY2LTItMSBibGFjayBzY2FsZWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWFlaIAAAAAAAACSgAAAPhAAAts9jdXJ2AAAAAAAABAAAAAAFAAoADwAUABkAHgAjACgALQAyADcAOwBAAEUASgBPAFQAWQBeAGMAaABtAHIAdwB8AIEAhgCLAJAAlQCaAJ8ApACpAK4AsgC3ALwAwQDGAMsA0ADVANsA4ADlAOsA8AD2APsBAQEHAQ0BEwEZAR8BJQErATIBOAE+AUUBTAFSAVkBYAFnAW4BdQF8AYMBiwGSAZoBoQGpAbEBuQHBAckB0QHZAeEB6QHyAfoCAwIMAhQCHQImAi8COAJBAksCVAJdAmcCcQJ6AoQCjgKYAqICrAK2AsECywLVAuAC6wL1AwADCwMWAyEDLQM4A0MDTwNaA2YDcgN+A4oDlgOiA64DugPHA9MD4APsA/kEBgQTBCAELQQ7BEgEVQRjBHEEfgSMBJoEqAS2BMQE0wThBPAE/gUNBRwFKwU6BUkFWAVnBXcFhgWWBaYFtQXFBdUF5QX2BgYGFgYnBjcGSAZZBmoGewaMBp0GrwbABtEG4wb1BwcHGQcrBz0HTwdhB3QHhgeZB6wHvwfSB+UH+AgLCB8IMghGCFoIbgiCCJYIqgi+CNII5wj7CRAJJQk6CU8JZAl5CY8JpAm6Cc8J5Qn7ChEKJwo9ClQKagqBCpgKrgrFCtwK8wsLCyILOQtRC2kLgAuYC7ALyAvhC/kMEgwqDEMMXAx1DI4MpwzADNkM8w0NDSYNQA1aDXQNjg2pDcMN3g34DhMOLg5JDmQOfw6bDrYO0g7uDwkPJQ9BD14Peg+WD7MPzw/sEAkQJhBDEGEQfhCbELkQ1xD1ERMRMRFPEW0RjBGqEckR6BIHEiYSRRJkEoQSoxLDEuMTAxMjE0MTYxODE6QTxRPlFAYUJxRJFGoUixStFM4U8BUSFTQVVhV4FZsVvRXgFgMWJhZJFmwWjxayFtYW+hcdF0EXZReJF64X0hf3GBsYQBhlGIoYrxjVGPoZIBlFGWsZkRm3Gd0aBBoqGlEadxqeGsUa7BsUGzsbYxuKG7Ib2hwCHCocUhx7HKMczBz1HR4dRx1wHZkdwx3sHhYeQB5qHpQevh7pHxMfPh9pH5Qfvx/qIBUgQSBsIJggxCDwIRwhSCF1IaEhziH7IiciVSKCIq8i3SMKIzgjZiOUI8Ij8CQfJE0kfCSrJNolCSU4JWgllyXHJfcmJyZXJocmtyboJxgnSSd6J6sn3CgNKD8ocSiiKNQpBik4KWspnSnQKgIqNSpoKpsqzysCKzYraSudK9EsBSw5LG4soizXLQwtQS12Last4S4WLkwugi63Lu4vJC9aL5Evxy/+MDUwbDCkMNsxEjFKMYIxujHyMioyYzKbMtQzDTNGM38zuDPxNCs0ZTSeNNg1EzVNNYc1wjX9Njc2cjauNuk3JDdgN5w31zgUOFA4jDjIOQU5Qjl/Obw5+To2OnQ6sjrvOy07azuqO+g8JzxlPKQ84z0iPWE9oT3gPiA+YD6gPuA/IT9hP6I/4kAjQGRApkDnQSlBakGsQe5CMEJyQrVC90M6Q31DwEQDREdEikTORRJFVUWaRd5GIkZnRqtG8Ec1R3tHwEgFSEtIkUjXSR1JY0mpSfBKN0p9SsRLDEtTS5pL4kwqTHJMuk0CTUpNk03cTiVObk63TwBPSU+TT91QJ1BxULtRBlFQUZtR5lIxUnxSx1MTU19TqlP2VEJUj1TbVShVdVXCVg9WXFapVvdXRFeSV+BYL1h9WMtZGllpWbhaB1pWWqZa9VtFW5Vb5Vw1XIZc1l0nXXhdyV4aXmxevV8PX2Ffs2AFYFdgqmD8YU9homH1YklinGLwY0Njl2PrZEBklGTpZT1lkmXnZj1mkmboZz1nk2fpaD9olmjsaUNpmmnxakhqn2r3a09rp2v/bFdsr20IbWBtuW4SbmtuxG8eb3hv0XArcIZw4HE6cZVx8HJLcqZzAXNdc7h0FHRwdMx1KHWFdeF2Pnabdvh3VnezeBF4bnjMeSp5iXnnekZ6pXsEe2N7wnwhfIF84X1BfaF+AX5ifsJ/I3+Ef+WAR4CogQqBa4HNgjCCkoL0g1eDuoQdhICE44VHhauGDoZyhteHO4efiASIaYjOiTOJmYn+imSKyoswi5aL/IxjjMqNMY2Yjf+OZo7OjzaPnpAGkG6Q1pE/kaiSEZJ6kuOTTZO2lCCUipT0lV+VyZY0lp+XCpd1l+CYTJi4mSSZkJn8mmia1ZtCm6+cHJyJnPedZJ3SnkCerp8dn4uf+qBpoNihR6G2oiailqMGo3aj5qRWpMelOKWpphqmi6b9p26n4KhSqMSpN6mpqhyqj6sCq3Wr6axcrNCtRK24ri2uoa8Wr4uwALB1sOqxYLHWskuywrM4s660JbSctRO1irYBtnm28Ldot+C4WbjRuUq5wro7urW7LrunvCG8m70VvY++Cr6Evv+/er/1wHDA7MFnwePCX8Lbw1jD1MRRxM7FS8XIxkbGw8dBx7/IPci8yTrJuco4yrfLNsu2zDXMtc01zbXONs62zzfPuNA50LrRPNG+0j/SwdNE08bUSdTL1U7V0dZV1tjXXNfg2GTY6Nls2fHadtr724DcBdyK3RDdlt4c3qLfKd+v4DbgveFE4cziU+Lb42Pj6+Rz5PzlhOYN5pbnH+ep6DLovOlG6dDqW+rl63Dr++yG7RHtnO4o7rTvQO/M8Fjw5fFy8f/yjPMZ86f0NPTC9VD13vZt9vv3ivgZ+Kj5OPnH+lf65/t3/Af8mP0p/br+S/7c/23//2Rlc2MAAAAAAAAALklFQyA2MTk2Ni0yLTEgRGVmYXVsdCBSR0IgQ29sb3VyIFNwYWNlIC0gc1JHQgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABYWVogAAAAAAAAYpkAALeFAAAY2lhZWiAAAAAAAAAAAABQAAAAAAAAbWVhcwAAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACWFlaIAAAAAAAAAMWAAADMwAAAqRYWVogAAAAAAAAb6IAADj1AAADkHNpZyAAAAAAQ1JUIGRlc2MAAAAAAAAALVJlZmVyZW5jZSBWaWV3aW5nIENvbmRpdGlvbiBpbiBJRUMgNjE5NjYtMi0xAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABYWVogAAAAAAAA9tYAAQAAAADTLXRleHQAAAAAQ29weXJpZ2h0IEludGVybmF0aW9uYWwgQ29sb3IgQ29uc29ydGl1bSwgMjAwOQAAc2YzMgAAAAAAAQxEAAAF3///8yYAAAeUAAD9j///+6H///2iAAAD2wAAwHX/2wBDAAUDBAQEAwUEBAQFBQUGBwwIBwcHBw8LCwkMEQ8SEhEPERETFhwXExQaFRERGCEYGh0dHx8fExciJCIeJBweHx7/2wBDAQUFBQcGBw4ICA4eFBEUHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh7/wAARCACWAMgDASIAAhEBAxEB/8QAHQAAAQUBAQEBAAAAAAAAAAAABQAEBgcIAwIBCf/EAEcQAAIBAwIDBQQGBgYKAwEAAAECAwAEEQUhBhIxBxNBUWEicYHBFDJCkaGxCCMkUnLRFTNTYnPhFiU0VGOCkrLw8TZDosL/xAAZAQADAQEBAAAAAAAAAAAAAAABAwQCAAX/xAAqEQACAgICAgEDAgcAAAAAAAAAAQIRAyESMQRBEyJRYRSBIzJxkdHw8f/aAAwDAQACEQMRAD8AiVmskWGRip8wcUSF0ZUEd5bwXaAggSoDgjx99P5NFuol3hJA8V3rh9DZTgqQfdTxK+6OGpadpOsFnuJLu2lbGSJCybdNum3nQu74Nv3mmuLKW3vw6N7XMO8Y42yCAPeRv49aOi3I8K9ojoeZSQfMUKTOPXD1tdR6WkV3DNDJGxXklYswHhueoookOfCuNvqF3GOV2EqeUgzT2G/snP66F4G/eT2h91cce4IfSnLRDuXH901y0+2jd8rfpdZP8LfdRk2Uf0cNzpzMSpTfmHqfQ/Kus5ETePfYVGu0sNDwTfug39gfe4qa3tuI7pUQD2jjFRXtbi7rgmceLTRA46/Wz8qD2mFaaK34O1F7qa100W5Z8H2gfLJ6VPEsmwNiKrXhV3XibTpLb9UTexgcjEbFxkZ69DWiJdPt5SSU5T5rtS8dtMt8zHHH8bj7in++yBiwIORkHzrr9Bu2jLKhZVGSx2x8elTVbC3hUExKW8yc1zlHMcYHL5U3hfZFzroqzi3VF4f00Xd5bSPzSBAqkA753391NtE1XS9YhL2NyHkxl422dfh/Kl2/Rn+gogNv2lPyaqVglntpVljZ0dTlXQkEUhyplEVasvaWGvEMOZQMeNQPh3j25iCQ6uhuounfIMSD3jofzqwNGvrHU1WexuEmTO+Oq+hHUVqMkzMotHV4ceFcmiPlRJ0BNeDFTaMWDTEPKvDRelEjEKYavK9pbd4iBjzAb9KD0EbtCMdK4yRALv8AjQm81ecZ57lYh5AAUGu9WgJPPO8p+JpfyB4h68mtUB5pkz5A5/KlUQn1ZNxHCfiaVZ5sPE1lEMJk16MEUoxJGre8V5jxy10U71QTIbnR7SUZUFD6GuEnD79Y5Fb37UXhIA6V2jffFAJF5dHuo8kwkgeI3prJaMp3Uj31OYH38Otd3jhlAEkSNnzFcc2Vw9qwOVyDXeC+1G2wFmZlH2X9ofjU2m0fT5eiGM/3TTa54biETSRz7DwZa45Mj8N7HNIklzalXU5DRN8jUb7Xmt5eDgEugiG7i7zmBDKN98eNTyDS7WHeTMjD4Cof21RJJwYYo7Yle+DHu0+qAD7Rx0Az1O1FqkFO2VXw9p96L7R76OxuHsVvE5ZxFlT+sGckeVX20saD23VBnqTiqh4Lvb+20rNjcSWyGV8RofZG/kdqOvr93uL2zhuM7F1zG/3ilxXEpz5nmUU1XFUT6Zw24II8wa48uWqH6TfWYaV4Hvbd3G/eNzgH3j51KLTULaUKqyDO2/maapImcWVd2/LjSLcedyv/AGtVKlCDjGauvt8P+rrRT/vP/wDBqn+X2l2FST2yqLaSGXdqTt7LelGOBpZ4uLdOSORkLTqrFTjmU+Bpi6KS+3TFPuCATxppYH9svzrK7NXaZeKDIyaRXNek2Fes4qsmORQUK4jT9g6fbFGA++OU0M4jH7Af4xQl0zl2VjxMuLvI68maBE53JqQ8VDE7HyiqKtJUvbKUkkdWYD1pU3aQ+JpV1B5GuoOLbrA+l6dazjxIyp+dPYeJdGlP6+wuYD5owYCnUnD2nOoKvInxBplLwyhz3Vyh/iXFWWyFRiErfUdCmGItT7onwmQrT6KASjNtdW048OSQVF5uGbxRlBG/uamk2h6hCc/RpR5FR/KhYa/JNVguYjl4mHr1FATqd9JqU6d68USuVReXGw2zvQWOfWrM4juruLHgWOPuNOE4n1uPCzGG5XyliB/EVykgOLJNbzTFRmVz8acXc7jKCSQLgbE1F4+K484udHjB8WhkK/gacHXtInTLve2pP7yBwPurXJGOEharqc1qOdTzDP1WHWgPanHd32gQxWgJmLlgqvjYDOPX3U9vILfUHQW+vWRQkcyyAq2PTO1Cu05XuLOztLYhpy5dJIpfqYHXb0yKzJ6bNxi7ojFjxPZabwXbfSkhmvSzbyDmYKMBQBsTtgDwAFDV1ziPULFJ7Th6zIbJ5+8bcD+6eho32ZcK2Wo6y3Kn0q5jwJJCP1aH91R4n31orhns809EV5tOhd8D2nGalllosx4HLZk/WIOLbm2jntrGa2kZvZMLk+zy+Xnk1OOEOKAtpa2WtWaWd/8A1fetHyrNjxz4E+NaZuOB9JZGA062BYbnuxVQdqfZfLb2015pcLSIAS9sd1YePL5GhHPTNy8a1plM9vDhrOywcjvyf/xVTZBdanHaD/SI0y2sr0FlhctFKftxkYA94qAsG5gFz7jXN2zlDR1b7f8A54U+4F/+aaWf+MvzoS7sudtvSi/A2/GWm4/tgfwND2gcaTLvQ7CvYrip2G9eubeqyU+n61DOIz+wH+MUSJoXxIf2D/nFdLo5dlb8Wf1j/wCD/OocTipjxX9Z/wDC/nUNbrUa7ZVLpHhiaVI0qNmTbgncAb5r0tyd6a8wwN6Q6HfxqsjQSS7O21dBdrkbmh67qtMOI7uex0a7ubZQ1xHCzRKVzzNjbbx91BulYUrJHHdIeuD765SJYzH9ZbQN55QVRUfG3aA8n6u0BXO2bHH51IdM4h45eLvLnT4wPS3/AJGkPyYIevGm/aLNbSNIlODaqv8ACxFfLvhrSPohde9ByNsg1Vt3x9xPYyYk0iGQDzikX8qazdtF4kfc3fDwHmUnYfgVox8jHIL8XKv+liT6XpNupIthKR++xIqCzNBdX2oLAkcTDEKBRgZOSaZWva7ol4e5uLO9tnf2QTyuoJ28Dn8KZ8GXi3HGEILKySSPIATsfDNHJNNaOhCSezQPYTwxBpGkRKY0aUjmlfH1mO5P5Vd1lGO7AAGw2qCcCQWcOmNe6nMsFouyBn5QfUn5VL9M1HRbgyXWlXEUgjH6wRk4x/540hLdlTdKkF+6yNx76EavDbTQsjNGc7HJHXyooNQhkjQKwPedN/OgurcUaPpshsriCboWJFuSnKOrZA6etHimjEZSj2ZZ/SY4Wisrf6dawr3UkntAfYc+I99ZlvUaKVcjAbcHzr9Au1Ph7T9f4Su5IF76wvoO8ixvyNjIK+Xgawbqi9289nIodoZCC3iOozQ9GnqWgHLJ7RFGOBphHxZZTFWYRuWblGTgKaAP/W49asnsSsLWWTWL+6ClYVSIZ64YknH3CtLbR03UWHzrN1dXCRxRSxxvsOXAOffXQPrMZLJKeUfZc5yPjUzXStLiKGJAZFyzZOyjwxTfUbW3W3EoYA+pxQnkmmM8fDjnG5IG6fdfSIwfHofQ+INNeJD/AKv/AOcVxsy0WrZQERTKQ3lkdPnXviNv2D3uKojLlC2R5sfx5OJXXFZGX/wv51DmzgMNhUu4tbHe+fdfzqFRux26ip49sZLpHU9KVfCaVEFG0IGs1hRJL+WRlGC7wFS3rgDFc4Y1UNnXYmJbK81vjA8q8h8gbnpXQE8nxqpqyRDyH6OI1X6fbs2NznGaa67pz6hBEltfWilebJMmOo8K6QEdwmRnau0YXO6qfeKzKKaphi6dojl1wvczxFBHp7sVxzi5bOfPrjNJeGdTNjJA8hV2Qp3kMwyAdgR61JeSP+zTP8Ipd3Cf/qT/AKaVLDFjY5ZIrqXgLiWPe34l1gbfb5JPnTKbhDjeIEf0406+U1grfOrUighJwY1r1dW8AQcilTnflcj51n4EMXkzKB4u0LiLTNLlu76LSXRftfQCjfAjxplwjcCDtDsLMkLgJH16HkB+/OatPtMRJdOisiryLLKoKlzvvVO8K2N5N2jQCCN5JzMzRYJHt749+cYA8SRWOKhKhqm8kbN5afpFjq2macLpZClqVljVMY5wNiQdjj1otd6fBpmj3As4XXmDOSx8T1PvoL2XXq3ug2k5By8anB6ipfrbJNaLEQAvONsda5aQ5xXNAqKMwWNo7gqvs5Y9BtRSTT4ZYxLJaW0hG6vy52+FeYYLs2QSeVWiXdcdT5DFPLCQLCEjB9nYg+Iro6M5He0RviC0hTSJbeKCOFCpCqi4A+Ffn92m8NXej8TandDka0lvpYk5XyynAkAI8Mg7eeDX6HcWZ+hScq4PKfyrI/6RlnpI1fh2xsFc394izXQHQlgFTbz2bHoaPSdB4ppMzJIuLjH96pv2UXTQXd4ruTA0sZZPM71EdShMOqtE6lSrlWB8CDgj76sHsW4cXULi8vLxGjjICwN9UnxLDz8BRSbdIXyUaf5LHhkzkLgZHMCDnY9K+66hFiSsjKCBkrsRv867PoV5Zsz2579cDps33VwvZlnhELMI3U+0D1HpvSmpJ7PQxyxyX0gqX29VhlxyoY2CqMDcY8Pcaa8SHFiP4xXywRpNYubkuzKqhBnz/wDVLiT/AGJf8Qfkaqgqxnl+XXzOit+LOsv+HUTXvYlCNFyCUBwzLuRvgj0qWcVkBpSRsI+lRJtsMpx6VjHjck2jGSaVL8HrmBOPGlXlCMdBnxpVk62bA0m+tNStFubKYSxHbmAx+FEOU8tUzpmsXeiXifRx9FZD9HukxlefP1iDtv5/zq2eHNVh1ew71cLMm0seeh8x6Hwpnj51mjfsHleNLx5Ux/agmJPLFOo1PX0pW0B7hMD7Ip7DbswzjwpxNY3jQs2wr2kLhtxTpgkDKIypYfWyetdBzNymQKNsDBrmjrBkk0Fu4FxPHDzdOdsZr6txaTSFRdxkKux5gPa+NeNdhUSEsoII8Rmqp4qs5p+JJoUW5ghIBWWJQQDyjbz3O1Tzlki1xVj8UMc3UpcfySHjy7tDqdhEtxG5FyqsoYEj2gOlBjdaVw9dS3tnDi9AzHMTumPqkeWDVcWdtq2kaq7X8FzA8j4QyAhs+e9P769a/JljbmwvLj76nnkfyK1Rc8EYxcYyujYX6Pus2er8IWN1G4J9sMCMHPMcjHvzU+4nguO/t5oHkeFPrwI3KX8vaxmsocC9oumcD2nDJs7C6SxubRzqKqOcpIsjK0vm26knYYGPKtP8K8VaTxJaRTWN5BcxyIGjZHBDCmSVAhO2pfYMWqmS2HLp1yTj6stwcVy0q0ni1LvpmEQ5cd3ETyfEHqaMWjSNGQuBjzplqNwtrbvJIVU5wN6MujudtxGXGFwkdhO7EBQh/KsNcfa3dXvbFG2pQRwGxuoogo2UpGAFO/XIwc+taR7cOI9aueE7u04XBlvXUqHQczL58o8TWUO1ttRbju4u7shZTFbMExy8gMKNgL4dTQf8r+5naaXoHWuh/wCkPaBLMIVa2Sd5JQBhWbnOB8cAn/Ort03Sbe2UMEjDcuMKCAPhVIaLxVquiZFnHZuCxY95ESSScnJBq3OzHjm24mZ9Pu4lstRReYIr+zKPErnfI8jVOKNJWTTmpS0HkkaH2GGUXcjO4H8qF8TWVtdIjSYkTAbmX6y+nrUsu7VXi9ok48SMmgV5Z4QgYZMnYeH+XpTTCb9ETuEhiYi3IaNcDCjHLQfiQ/saesg/I1JLu1EV4bhQeRj7XpTDWtLW7BCOVz7QA86ElapArZUfFx3n/wAMVFbiSJ7dJMFJgeUhVATlAGD1zzHfNT3i/QNXzP3VlJMCmxj3ziq/lgmjlEEsLxykjaQFT+NSqNdjnNaX4PjMqAgEuxwVI2HrmlXyUckhTcEbYP49KVdoW21ovK6hW6svpYh7/uv1d2pHtyQnYN13ZcYPqo8676Bq0+h6v3LOxeNQVdvqTxHofiOvkRUq0ng3itbiad7aDnmYly/IobKBcEDboB91PE7LtZurmCe4urZTCMJuWK75wPStLEozk4rt3/v7f2NxzN4I457a1f4/yiZaPrekSadC5eUsVGQI+h8qdT8QabDaTPGkpYIcZAHzodpXAF1BAsL6iSF/dSii8Bwd2VuLi4ZGGGzhRinNsn0QLiHio6dIizappM5kjDMttIZWjJGeQnGObz/9VHr/ALQLpw0dnqAiXxbPJnbwyKsqTgTs407H0xNNUrt+uuQT92aSHsz07/ZbbT5GH+72RkP38vzpT5/c9SGbwIxX8Nt/1RDeGeJJNSZ7OXUzdRW/KRMEdicnPLk7miGp3um2bTXmoNJDY8oDSSREKp+PWpNJxdokC8tjod9KB0xEkS/iflVRduuv3esT6fFLYmxtI0dhGZufnbP1jgAbDamY5uJ53kcMs3KKpfYjfHXEtvrOrudMMUkK8wV0hKFs+YPXalw1Yd9pqsYzEZJXVSw2OCQfhkYoXBNpMHCDqXC6gZFmhUDJdicb+QC/jUy7OIu80try/wCd4LVQRzDbJIA/M1BnfOTkXYF8cFE98XRLpvA2lz4UMk01s5Az7ErlsH3HNaC4N4ZtW4dtW093gu7SNFS5gbkd15AVJxsTggb+VUnr8VvrENzowmia1SL6SDzb82CVx57nceWa0d2eadc6Np+nrc5aOfT4ObbowXH5EUFN2kb4UmwnpGtcQwRLDcSW95y7B2Uxv8QMg/hXjiBr+9hLXU+BjaNNgKN3NlCJO8C7HxFMtREYhx1JGMmnXoxdkMMItrnTERcc7NnHgMVRH6U+ifQ+JNI1kRgC7sjbu2PtwsVH3oU/GtIWtk13q9scZWBdvjUP/Su4ejuuyw3/ACjvtNuo5QcdFf2G/MfdRxP6zGfcTGz4yT51702+l0zVbW/tn5ZYJVkBHod/wyK+SLsRjpTK4OFPuqwgNc20nPGFlXDMMq3nnpTa5tYy/N3Tq5GDynrXrQZRJpdrHMPbEEYYHz5RRYIjpysAwx41tdDCE6nFEju5f2QPbUqQR61DNY1WzeeKxgjuhLIeWGVYWwcb7Y3NW/d2yEboGIGxIyQKiOpW09hqC6hpkUKXNsxaDnQlemGGxHUEj0rM1KtGotJ2Rc2epGEK7cyAbFW+sPU0C4m0az1aya1nhdZQPYY+0UbwZT1946GpnZXstxB3t+8BupWZphFtGhY5CjPgM/GoxxdfQ6ck1zI3dRow5WLA5PmK6lWwXbKH1KJoL+aAgqYpGT2lwdj5eFKuvEOpDUtbur5UKiWTmApUigO2zap4x1KTa20uwT+KV5D+AFdI9X4wutoDHCD/AGNj83Jpxas4ABuTGP8AhxqtPlezUAz3Ttnb2pjv8BTOL+4vkgU9pxbcD9q1i+jU9QbhIR9y4pv/AKLJcNm91ITt4hppJjUntzaq2YrLmPmY/m1PkuJQPZijjHq/yFdxByItb8H6ZFjEMzn+5bhPxaiUHDlkoHLZZ/xZ/koo5EWcMZSpO2OUYrgVy2C00mRnHeYH4V3FHcmMhpVvBv3dlCPSLJ+9jVKfpOxRqdHaKbvMwzqcAADdfIVezwqpBWOJD54yaoX9Km/iaTR9KSRmuVWWVtsAIeUY+8V1HJ2Ufpv0Z7mAXRlVFKg8u4A9R41P0vr/AE7QIdMSe3W2un72ZYn5zhOjnG6g9MHxqC2FuxkBPXqakWn3UlvGyqkcyPjnWRc5+PWlSwcuijHn49hjh3ia909e6jhjblm72KSRAxGOgwfDGdq252S8R6bx/wAC2uq2ixx3MX6m6tlP9RIBuv8ACRgj091YS1C9luWTmjhhReiRIFH+Z99TnsK7R5+zzjKO7cvJpV1iK/gXfmjzs4H7y9R5jI8aC8dKJp53Jm13sZY/YGSvkfCh11p2ZNgSTUlstQsdU0+C/sJ4rm1uIxJDNGcq6kZBBrnMi56UpxobGV7Bmn6cloGfHtud6i/bJpp1Xsz4ksguWfT5XUf3lHMP+2py7AjamOoWy3NpNbuoKzI0bA+TAj50I6Zz2nZ+aswyxPnvQ67XfHnRrWLd7PUrm0cYa3meI+9WI+VBbzPMAu5JwAOpq4i9mmOEpp7vhLSdTjzKstnGW/fUgYPv3Bo9Zagr4DHxplwZbtY8HaXZPF3bQ20SMnip5QTn1zmul/YhyJY3MbnqR6/+vxpi6NLboOK6ONqE6zZgQSSIcHlIpsjXtqcd8kieBbAND9W1PWZ4mt7e1t1UnHe97nb3YrXoHsjF+og72QqM3GERSPs5+saoXirW7zUr+W0ku+e1SdhGWGMDmIBOOuBV/wBxZ3PM0t1Jh8btncfyrOHFFk2m67eWJJPcylQT4jqD9xpGS0jfYxmh5AzKVdFcoHU7MfQdaVGOG+HrnWJxPymKzTZ5COvovnSpNmljb2aztblMHFuuOhLnP86JWjxg86pCrZzkJk/jVC8FcFahaarDqV5rU0AicOIreViz48GY7Y8xg1cNpeDGObf0pyk2tk7X2Jdbz5wWkY/GiFs6ZBwKi1teqAC2wHiTTyHVYfqrKHPlGCx/CjYKJJDcAs2/l868wTjnyT9j50Ftr0gMSrjJGAcZPX7qX0pkTmnvEhT0wv4mgFoPSTLjJ2XzJwKyp296rHqXaddpGQyWsSQAg5HTJ/OtEC/s3OYVmvG/ewSP+ptvurJnaFdvP2g65LIOVjeMMZzjGBQYUj5ZMoPdnAz409aRU6bketBEmDKN9x0r2bhnH94dfUedMTBQZeVXQFTnxFci5wGFC7a4Kkr67U8V8g11hL//AEYO2BeGL1OE+I7rGh3Un7NO52spSfHyjY9fI7+da8lYFAwYEEZBB8K/MLvORs/Z8a0d+jf22m0W24L4uu/2XaPTr6Vv6ryicn7P7reHQ7YwnLC9ofjn6ZqE3KhuUHeujNzIG8RvUcivQdSePm6DNGUuQY/hUqKmYD7aLNdO7UuJ7NRhU1KYqPIMeYf91NeySCO443haREfuInlAZc4IwMj1GaLfpIXMM3bTxKYCOUXKq2OnOI1DfiKD9jXeNxpI6fVjsLhnPkMAfnirJOokUVc6NCWjB3CocquST5nH+dOJXQTcjdO6z9xodazRwwmSN1dQASRuCvidvvqOdoPF1tw/pVxfKBPKcRQoGHU5wT6beFU9IXdkkuLyNgU9oDqW8fhQu61C2jJHexpgeLjP41mvUuJdY1K4ea8vpeZzljGoXJ+GKFO73EhBklkZjgAndjSnkfpDuEF3IvzXOMdAt1uIZbqO5dYmd4oWDHlA3quNK4LvuKtYm4g1OM2thcP3kcXOO8kXwHoMePjQK00mbSrpXv7URTgBhFLuOUjow9R4UZPE2tpMHGoEADZVVeX3Yxit/p8uSKekZ+XHCXsni6Zb29uIY41gt4lwABgADypVF7PjyVuWG/sl5QPrwHG/8J/nSqaXj5U6opWbE12GtE1yS6Yx20O46mRsflmpLZz3j457kqPKNAPxOTSpVyeyVha3MYHNIrSEeMjFj+NFLa8YKAi4HlSpVt6MD2G6kJyxz8K4ww2qN35gEkrb88hLke7PSlSoI4ex3js4RRv6msncaTd7xlrEuMc17Jt7jj5UqVB9nRGUcmR412WXLKD9bwYfOlSrYUIScsqsBsSRjyNPIZiSNutKlQRzPUj+FcRIQ/J1z0pUq0zl2Xz2F9q+pxyR8P6qJbxhDy2lwTllVd+R89RjoevhV9HjJLfRJtRlhmMcMZkZVwSQPLelSqeUVzKoSbgYc471c6zxbq+r8jILy8lmCsclQzEgGp72I6fHBwdxJxG3tTMhs4x+6oXnY/ElfupUqOZ/SYwL6yqrDVdRsZOayvrm2bGMxykU64gErwadcTXVxcy3Fr3sjTOWwS7DA9MAUqVOTZMwSB5VovsS7IrSbTYeINTuY5biQc0XKpYRDHgDjJ36n4UqVdV6YbcYuS7JTxB2A2ur3815Y8STQySnmKT2wdQfQhgcelVX2hdkmu8IqZ7vUdMurX/hc6ufgV+dKlVuLLK+Polm9tlaXsYjkxFtnwO4pUqVUZFUnQYu0j//2Q==</field>
-      </record>
-
-      <record id="base.user_apr" model="res.users">
-          <field name="name">Aline</field>
-          <field name="login">apr</field>
-          <field name="password">apr</field>
-          <field name="image">iVBORw0KGgoAAAANSUhEUgAAAFAAAABQCAYAAACOEfKtAAAgAElEQVR42u2ceZhcV3nmf+fcW/vS1fuilnqV3NpXa7csS8YbtoMxdiBjwr5kAYYhDJMwBDIMMyEJEJ4MYchjIAPENmDAC15kW7KQZVloaVl7q7vV+961dXXtde8580e1WpJtJeC2w2PHXz/VVXXurVv3vvWt73fOFbyCGAJaHSG3V/s/WELZnRW6ptGnA04TBxIjbWhzKC+yQwmihwsU9o+Koc4O0Z1OFPgPJ+KVBneYa1fUq8YvVun6G0p1hV8gUSgATEw8eHHjxsIiRSI5KgYPnZenHh2RA+1hMXrGoVzhLivxHw/ARlkqF4j5t9fpxq95daAqTdLvwkOFrsUtPPjx49IuHDgoaqOc/WyOrJoW8WyfODdy2PjVNwvk/+/pwqT1ZgfQANqAcJuswDTknUoU3jcuB35sCqN1OWsrV9VczYodq2hZ2YKcNmAKDAxsLCQWTjQGCokhPAQc9bqpzMLakQyGCwuDtUlvnrFJlX5Ta+D9wBdbKe10OcxtBuaqTer6L15duq2s9R0LqVhTweCuQYaeHsJK20wTJiI7COgc9dpPGV4AbAQJnPQGLBo2+NWGLevkgY4jY99+9P+tPJoennizAmh6ne5vX1VSf39zffPHRk/2lW0WN3xl2/Yb/LXX1GK4Dc5+/yz5SJ58JoclutmknRiqliQ5bBQFbDSacWMKc1kJH922k0BTjTzSd4qVtYuqtNC3A/e+aQFM27kD3oJ5wBqKf3eF4xrvLe96p184BNlolsx4hpoNNZx44kVscZJ3qhaiJJkiTbc5QcSXRvsMDIfJqiVLuX7h1aSrnNy76wGGxof5yPa7pRff59ocpU92FGJDb0oAsbV1Mtn3jc9X3PXOYzVDdWeOnGHFdSswTIN8Is/hR15A58/ySbWFHjHOvtB5yhbXsPOqG6iorMAjHKhkHo/DidLw832PcVfDFgaap6h0BanRDc0WfPYqh/2Zc4WE9eYDEGiiYs3T4wNlH2hbx9HaozSFmph6OM7zXU+hHf18wb6d3f4OrE1B3rf6vQSqQuBzFD1obwxtOhGAIQQuZZCmwMZlawl3DWEqh2y0F384a6SeaHXaT3bnU28uAEOGYdaqpju265vc+7uPcuuyDTzy+A+Z6kxS3pDn3T0b2VPdycob17Jk6RIo9SCkRCsbJpKQs2bjkUZz5+LtZEIGAPlcnoKyqFUN3lrR9NU+o6MdUm+qgGIslPNrFullX2qSraGFN62g58VDbNm0iinXpFU6gLQDgmvv3E5Zaz37h06z59h+9h07SHhkjIVmJeiXVjEStyVhOktvdJzdJ05SpesJ6NLqSTESCAixK6Iz6k2jgUHh31imKxeUL6vAGDOI9btwns5wfrzPbLVCbHjvdqIexe4X93Ddyi1cv3wDTOXIDIZBAQXQaQ1OEB6BEAJshVaSJ9v3UoNNgTwNNDOmFr2/wzj6dJtd8fMOwm8OAA2M20KUS53VRE5FSGvBcdnLzQs3s2DBAhYvaSNrW6xsaUMoXdS4EheedAkqlsaesjG1LKbkFmhTI4QgaeXwTMBGNZ+nZT+tqo0WtcQ9Lge/HHGO7CVP9E0BoFO713nxMtU1hUWBDsdhPrrjv9JSOx/TdCCExmMaoDVaCKZzWc4NdHHszAlGRoZZUdvGtrpVlGoXCIoaCETScdxJSaUOUCLCFMhTQx2N9uIlcTn5/pWO6q8fL4y/4QGUTjzNWXJoNBNimNVWKc+fPoLT6UTKC8WKIJnL8cCBx/mLn32Tc/U5xptNCmk/DreXUKgMUe4uauGM9IZHcOcM/Lhp1SXkyOLBS7Wup1LVfSRHruzNoIHSqZ3eNEkEkqgYZLVu4NT+dsamIsXIqjUaODPYzQhxrr36Vt519x9SUlGK0or6UC3GIj+iMYAwJVprLK0Z6B9kviqjkgALCJEhhURSQohau6nZIVzb2xxvfAylQBITkzOZSIIAbipjbuv+fY8oKJqkAFY2trF2yybyZpbBr3fyg7/7NqejZ4iL5EUS0WEgEIwloyS7oyykBi9ugtqFLfIAhAgR0pXOUlV9J0LJNzyABZEjSwbQOFF4cHLQ6Pn5U+37Xoylk0UN1Jp8KkPPUD+6Dtp7D7G2bj0t82tYtLB59mAaUAIeOryH5lQ5FfhxY2JgYGgTACcuvPgoVzWrTGX63/AApsX0iEUBhcLQipTIqW4x8d2BydHHz48PFj2gEPhcbm4WbdR32UxYZ3jb5rX8zw9+jnlllUVSUWmEpdg/eIrpM5M0OatxVgfwOt2YuHEZ3pl0W+DFh0f7a0zpDL3ho3CSqb0pkfgDSxeYEEkro/MSdN4pzUGnNGd1S7od1NZWU1NXw7XLN4JWCF3MorXWkCkQTiZ44rlnudFaRNOyFmS0gH9rA7E9A8xbvZB8ewEUOHBgYPqdyu19wwOYFZkfT8rhu6dUzIwj95+Uw/Wr1II/z9YZ2YaqumKhMfNPFNECbc+a7AUQ7ViWR47tZcVEFasal+JqKIEKCzWaIhE0CZaWMKkmEQgkEoEwldBveACl0vlnonL83m552gpRKR+V7W8/y8izWxauuanE4yOZzzI6FQEhQIiZJzH7QAhIF3jhdDtWe5SddesIfWwtYjIDJS5Gzg2SX1pFti87+6VZMiiUVMJyv+EBPGWF09j6s13yRLtTu1tjIp42nEbyhsWbnQAF22JiOlbUMq2LCkgxtdFotKU4feo0h585xDuCG6m6Zy0Mp9CNJUR2n+Mp1yjVTS1kxjIzzLVNkmlsCli88dt4EuC0HU7GReQr42K4okLXbssr60Q4FskLDWXeAKvmLwTgaMcJhmNFMyyas+DcuS4efOhR7jG2UrVzcVErUxaxXed4NnkeueUqHNMOfHU+AKZJUKBA3sgoh8Nwz8fzG51oCAiC6QMzAM5SMKsw5VVG6e+eDyz6M/34kDz/PQPzU5Zlv+f+g489s7i17ZbauhpsW3Hg+GEGwiMsW7SUeC5LwOHi+JlTfP++H/LZ4B1Ubl2MmC5gjyQZePAIRzODjDTWsXrREqxpi3wijxaaST2Bwqa1sUy2lWz+6n0vPvk2bOJXOsEGfP6QP9hcX12zbcm8q3bOK6+uyFt5byKVTIxFxkcGo6PHXFHX3mhq6swQmX/37tVlbc0lZrlfSPFhEJZl2/tW1i/61p3rb9zYOdRjNobqeNt1b1M/3v/okWO9p59cVbXwk91HOkKfXn0PTY1N8FAvMVeecxO9nNDjjIcqufa9t+EJuol3xImciNDTdZ5RhkkYYT78e+tpXt7GZ+7764eOdp34RJbC0DA5VrpqZDw35faYnraGqnnXb1689ve3LFm/ZGnDQndlIIQUkguxzLYtJobDdJw7lz06fObgwbET3zo+1PVkTyGW/J0AeEGWOSpAawpa+ZXW6xdXNa7btHTtpo7J/mOHu09+z1MwPnIn6//bH11zjzNQMEi80E+PNc6InKbbkWfU5eL2D95N6cJSMuMZhn81TM9zPfSq81gU8DRF+F/v/ijOhjJGpqL87PnHB473nXlmKp1ISmFUtVQ3rFi7cHnjpsXrvNUlZTNmoi87XV1Q6HAeETTBY2ALwVBswtpzfH/7Y0f3fPVo18nHS0xv9oQ1+e8P4EvFg8AFMuQI1C3RdV/7pH3ju7bRJuOOJIP5CINEmHRqxk0vgUA913x0O64yF8IQ9DzYQ+/+HvpVHxZ5op5B/uLud7BkzXJwz3gQIcgU8uStAqZh4nW6EBrQanb7RQCLlJoeziKqXeAokh1cyEmlQXvPmfwXfvA3ewYmRx7N6+xeh3Z2nrWj1u8MQIA2R3nrdXrJ/X9k7VznQjJMjPOM0+/KUXCFIBNgacsaFr9nMdmJLN46L30P99F7uIchPYCFRc6V4O6blrNj0xZEyIMQv93JzkJoafRkDjIKJIhaF7iM2QvSwK4TL/DET48q21bx05ljT40Vhv5WINvPFiKvLaX/b+3QYoaoN0pWvFtteOhu++rl5xjloGOQswEbSlsRRjmeRDn1jibKl5STmcjgDDk596NzdJ/tYphBbGxyrgS/f9MqdmzejCh1z/KG+hV+xZcY60y/5ZIxpSFeQBcUSAFJGxFygNYKUTxyY/V8BiZGxarMds8a3+ZlJWbpezM6tdyDdV7auYkkSr/uAK6U1QhDrNuhFj/YZte0HvcmKKlZz5ba9+AzK+gJ91A2XUOAErzzvHiqPEwPJel44gx9U73EiZEhTSEU4T03Xc3OrVsRQffFPsoFdXmpTegrmIiYMVUh0NM2QoFwGeAUMJpF92QEXgkeAwn4yty0H+lWlWaNWOBsdiz3rF0WMsrfVSCTLViR4wmU9boC6DIN7zI974EFRu3yBfU3c+e8T1DrbORnE/cxMj5GbaEBl8dN2bIyrLxF34lezo92EdaTxImSDoyyfUMDH77xJlasXoHwOoo55IVK5tLXVxi7WAGJWWJDCIHwmwiHALdE9WTQXSlIWOgpG9noQQhBqb+Eg91HRHlqPlpoXMJNvbPR2+Bs2TmlYpXaju+N6nzhdQNwnhG4bYlvzaf/tPmr4mr/No6n2vn+0HeoiM+jVFeCgGxFmqNDz3E0foBRNciUiOKsTrFjUxOfvPkO1q9dQ3B+JTiMl+iUfgVXfKWxlwcRMjY6ryGr0GeTaD2T3hcUstELpkAKQdye4tTJbpRQOKWbGkctbuk1mlyL1sZUxJmxxvfGdeFVdwnNK21okl7v1f7Nf/TFBd+UARHioehPODj6PC35pThwotF0cQpVMsw7b7yGkGMT2UKOg4On2NS0ko1L14LbQEhxhZglfsOYJmaf9QwdpsZzqEMxsGYirxAXdzMEGEUwNdBQU8Ph2JPElYtjrhwtoS3cGLoNU5hye+CWT/bnz/+qz+5//DUFsEWWynp33Z99pvZL2z34+NHkvfSPD3KVtQqBIE+eQfoYqz7J//nDv6SkvGT2Ujdu2lx0z+LfCg6QtQporfGYDi4Nyf9qEBGgOpNgaTQz5Mbsrhq8JphiFvJQoAS318P6RCOrMgV2FfaxT3q5tfSd2Np2r/Zu+uz57OC+GOpVJd+vTKkLa9G7yt776QZns3nf5D8zOjZBk3UVAsE005ynkwlGWbGgmWAwMENxFZlroTWGuPh+9sFLxoDnzx5lZCpaJCausN/MxuLYBSM3LzFvfckDEKXFH2PmHR6nG+URpMghEFxvLeJ0ZBcdmTOs8q3lat/WzW3u1ltazFdHDL0igM3uRbfeFHpH6InYo/RP9DPPbkSjiRNjgF4KWGTJUOELctHP/3bBQQCyoMla+cuDw4w+aa1fOYhokIv8M2Z6iZkLARpEyIS8Qh2OowYyGELQ6Z488gujvXOaLG4cbMnWsjv+EDmdZYN/i7PNs+wTDl4dufsyAMvAuSVw3Z3hQoT9E3tothYDECfGIP3kyNDvOEX5ogxOaYKlLlJbs8/6kvdXGoPWkjpi8Qh6RmMu7JHMphnsG3iF4xafRbkDub0cuSKAWOhD1LugxCxWJT6zqK2TeVRXikw2rxKu3P2/kh3X3m/++uduHKqJSqxEP13ZczS6mljl3bAxaJQte00ANIS5oNXVtmR37DEaMkWzTTLNCEMkiDFaepo/uflt/PftHyhqSqowQ2/NaMhlf/wrY1BueElMJy5q14U/w2RkcuySMWY1c1aTXRJR70GuCGKsL8XYXo5xXXmxNnZI5FU+jC2lJHLT1mhksrOrEBt7UQx8aK9xbp8DkxarhBOpw7ikm6WeVWa1o+6mVsM/dwCbnPMXCaR3Mh4mSCl5cgwxSExMkjDOMj9UwvbGNfgcLixto+MZtK1m/ZUGjvd1oLR+xVJs9rWlkFmLxHgUMtasDwNwmg4imQTanvV6lwUWbWvsX8dRPamLvk+CCDiKkV+AbPaC22AoMpbojg50AnQVYvGn5ak/j4tUokoHGcv2YWubcqOCec6GDbaw5ZwB9Jq+mmPJw7I+34JCMcQgETGGkH38gX01uXSW3b1HcJtOpAaVK6C7Iui+OFoVF0M88PRD2JGLwF403plgkbdgJEEilSKEC90TRZ0Lo7ojqO4IjvMxMtFp0qnsbIC5LLAYAmNjCNngvXhMBWokix7MoGIFLsSfF3tOdxe01Tc7Y0LGDnWJ8ccDeFCFJLa28Bo+qh11Kwx++0jyMgCn7al473S38hMkwRQxIuTlALfZK3Bh0mRWcnKih97pCQwpydlWsaTK26CLB1y9eCV7Du1D90/BWBImU8XH2DQMJ6AvDimLn53Zy+KqJhDF6C0KNqJgg6VwGAYTw8NXCEjFEk74zNntOpxHj2Qhp4opTk+afKHAsd7T++KQnwVQRdVxMfgLhVZOpRFC4jW8VJhVIaVV/ZwBTKnkgLANJRCEmWTM6OE61YgLB05MXOOKbQ1r+OmJp9FCMpVNzqYeWMVu3e0br+dkbojjQ13oeBYm0xBOo6MZSORQtubpvnZsNLXBSjK2TTiTpH86wvmpCSLZJE2l83ix8zQ6b18hSL0ksDglosoJXqP47DHoPHve6hrqe+KyCyzAEdF/qEuMJUylsbWNR3gJGiGnKc36OSfSWZ3pDlIykiPXOEWMtBxTi+zVMkeBZqooWDbtXSe5fdm1/OPBn7CkooE6f1mRIcnbCLcDt+ng429/L9/42T8xGB9nnr+MoNtPwOUjnc+y6/yvGZgaZ2lVc/5Tv/y77u7IUM9kOt6Ts/MRWynf0qrmj29ZsCI4nJjgtsgOzBr/bG4nXlLNXBjTIRMhAVMWR0JOdj32bDjkC7Yzdfk1Tsh49JweG6pStSEbC6d04hIes8Qoq6AwNTcA+wrZeN7InsmRbZySYWuKxJNRkrdUEpR5bKoIcqjrJFUbSrl98bWMp+OXlhYQLL70OV186O338MXvfZXr5q9ldGqMiVScU+PnLVurPo/TvffnZ579hSHkwVpfdfR4dgyAUkykwLx18bb/0j7Swb6Th9hRdi3aZV5ecYjLKS6hgaBjdmykEEM4VEWVP/TuCox7w9iz9a7bMtNjcqq7XFcss7SFV/owhETCbz3b6RXJhFojtLpetWzukx3xITH0Sacwb2nRVf4joodGKpgupOkviXPzwk10TvbRVrGgeOJSQNA1e5yA24PX5+f+5x890h8fe+ZsuO/BiVT8r8Lp+Jd7E6M/71fJzrDKZHqzk5f0jBV2OtOes/I3vG/NbTV7ug/R6K/BVx68eIJKo8dyMGWBR77cEQnB3pO/Zn2wWa6qWrizNzKyRmQL+RrpC1dLbz4k/ZYSenuVKF23seI2fIaf7myn3p/cvXfYir0wZwD9hkr5CN6ZIS1icvRvhsUUXpxbIyIlHjKOcl5O7scr5fWtG4K9sWFay+svXkPIjZByxtlrqkurONZ/5hlrKvOhR8Mn907YqYGozuaSF5iAV5CIzqYnoxO/iqRj2+5YurP60RPPsnreVZg+VzFgDGUhr4olXaSALHNeFmRsrfnl809xTe1yWkrrHDubr17sc3ruHp6efE/aym3K6vygA7mqTlSs21x+O34jQG/uvH4huffZASv8/JwB9BnWcFIkxgI6dGtCxs5aovDtc2I0HpHJXFikdo+J+J+FPMHGnS1Xr8xaOUJuH05pom2N8DvBKWd9lGkYJKaTnsHExA+OTnRnf9MTi6hMOBydeFxpe21Dad38Y92nxMoFbeA20bECwiHROYUwBYQcl9FdedvihRNH2Fa3HFMIvE4X6+ctFre2XVOyYf6yJS+OdrZl8zk5j4q29eW3EDJKOZ/t0s8ln9n92wL4ioljTyGrJpn4wbDR+ykT80NAvdL66xGRuiNN9hPZQqZvbDr8Qiw1xYKSaiKZRLFeBUhkL6kpiq9KhMurxJWpsyvJOSs6cKD/+G0Pnt79hf0Dxyfue/ohVCKHLHNCTiHLHWCKl1Ustm2hnRJZ7gVTInTRR5a5fGyet5S7lu7caKF2aK1n53QbwsAQcu6VyCyIVkJF7LHvZcl8BE1I2xan8hPqTCGiekgRTsc7RpORbKnbTywzXUwnhEBP54uz9C/4+7zF5ORkPucTr4q03BPrTBwaPvXXvx46vfMfnn/ggZ/t/mVWmwrZ6kNLgShxXAwsM3poGCbCkKhKLzSVQplnRjmLSc/bF202S1w+rxRCmdXF31WhUajsawYgQI9KcaYQ7pBCHDmtY5dtC2cSPcOJ8bjTMIllpkkWcsXTt1QxeS7Y6JxFdjDKwd4TJ/Yefu5VN7uHyKqc0qems6n3PX3q4GcefuyJtNU5XVxm4TNm6bELFYtpGIR8AZRSxbSm2g+NodlI3hMbReUwHRjSrDLRWmMUZ4yp1xTAC3Iy//LmdEIlo+fCA2NKa5pKa3mu/zggi2Y8lYXuKPnuCL9o3xPf23/sG0HDl59L76G7EOasHc1vXbTyH3/c+dTH7j/xy6hl52eC7uWViiEkLtNJIhqHC7SYx4GYF0AbksP956iwK6iQJZjlF/s0vIo+3aueo1wmg9mu6GBPzi7QEKwiZ+X41cAJCmjyWtE+3sOX9n7XerBz72dUobD/VO61WdLw/t1/z4qKlvseOLbrAz/Z88iYmkxdUm/PVCVAQ+0CHtu7i0TPJDqZL5qv28QOuRgai1NGKR5M8sE8WmoMTLTAfaVkufQK9L35ai+kubTJGpqe6EzkUni8IW5dtJndvUf50p57SeYzLK5qxuNwjcRSUw+csWOv6dKuz7ffp2rxPJI8+nB+aVXTT1fJFX7KLzTqiwn21sXrePLws/n3/vDznbe3bWt79/bbTF9NiGmvYippYSCRSpM3cgiHwCt90sAof+l3LZCmXO/fcUu1o+6aGkft5PH0r/eeSB9r77SK1/SqNXBX5BgTydi5yVRMaQ0OaXBT6wa+csPH+ebb/zMf3/H7OIKegch0/HWZUjFKho5Y/1PfOfzQk/nJ6aLvvSSZcQrBn972fjND4V/+9rkffu5/PPitZD6ZJZVPI3JOFAKXbZDOp8AJfiOAU7gbl8vKyzCpcs4L+aT3ryLW2LISo/QL91R8/Lkmd+tHN5lNczNhgJSd7R5ORq3i1BRdTGwXlEBTCOr8aFOMKa1ftzXCjd4a1R0bGopnU8Xq5CW0V8Djk0KIpT6H++8f69z/9V8e3K20Bqd2E9TVOLQgHZ9G+zWlZimVZtWitEhdxqqmrGT+UOq5xw9O/+qOX8Z/8uWcyjvvLvvDrwzqoRVzBlApNRZPTSVnGWOti3mX0wQBhpRZgXi98COWnZYBh2eR1+cFh7yM7tJS8sM9P08PTY5++1h2VClbfe1fDjx6YHJsEqkNSnUdttaEx8cRZYJys4JW95JFUpqbF4mLiwcSVj6JkN9HOfOdmVM/OZM5PtLmXhlqdS++dc4ASiWjsex08kIGphUz3bPiSMG2nFq/fitblbAXvX3Rlq3+ihKQ8iLFJQRnh3p46MCT39NKHQTosKOJvvjIpx97YVfUthRBXUYSxfBwL7pK4xROtgau8zf45n/L5/LsaJUlEmCYac7mJ3v6mKKgc+HJwuiI0koudF21qcXwe+cEYFwnk2mVi1/oiokZGvhCHWIajpBhmK/LaqQVgTrnDS0bP3fXquuDBF2X9V+U1jzz4nMDg7Gxr3WoiwHsjg03tu/pbf+rnJ2zXLjJU0JiaARVqcCA9f4tXBO4vvk/rbrp4eayef/QIkKznboNjhYc0rUgYJTUew0vcTu60S+DfzyniyuglJKEL+1bzDJOQuBwOits7NccQBdQ7Qre9IHVt94drC5DmPKySmQsHlbPnjjwnaQ9PXDp5/7y2X9WE4nJ9oxIWTaKgG5FhONMGXHEfEFgSYBbPfcwFE7471p2/T0et2vBhc9O6rG65d51f7vGt6mu0lGlwoXw/mq14HPmXC7EApAyri/h6LikIij3ldS7DIebSyj110KazYqqG1o2/e9V86/yEnIXv++Sc3j25MGRI/0n7xtDqVdobEUTIm7ZWBh48WfLOHfkJBvXXAvjsGLrKnbsfQ8/Pfk9t5/AV9e6XZ1O4Srb5Nu+9drATYs2B7bRmTuVjxeiNRvU9WVzAlCBMpSYXZR4kY4ToBUtdY0h03A0AideK/CWmtVyfqjiC3ct27nErPQhDHHZRKTpXJaHD+16UmjRdwXHOZQUsb4smWUOnNi6gSPPHGDNtRtxdbsx1hjcsu0dXHNyhzPcN3n7dHZamcqUoViIyppqzLTBk4cfcd9pfWhjQk8zJwD9wiGDpruqGIEV+kIEnOlvLpm/0KwprdzI9MBrBmDKSm++a9n1H1xQXQtB10zdcXHC4Yn+DnVmuPsXQ7wyL2ALKzmtpw6EmVgWpAQwUREP7f90hI1/sgUOgGyQlKwLUdISgjzF6OQBJW0e+tqPCcSqCFBCv+iZWxSu8ld46wNV9QJ9kc66pPkd9PplbXnlzQvFa7OWo1H4g1saln/5rmXXeSkvErdc2pAXgjMDXYlsNnfkigSo7VAZkXy0T3ZaaYqrIjz4OH2ig7PfOYtarSAA4pRApAXCKaAJCvMKPPijf6Grq4cgpUwxxZgYHJqTBgZNV2NTaV3VBfenXzKrzwSuqmtZt+vYvhpgbC7ftVCGZJkv+OGPrbtjqy8UAL/z8llcM7ck6B7tH7GVfUXmp0NFaDNK9w3J7hcHVMO6hSwu3kxN2Tx/9HkGewdp23wV/qt9OPxOCiLPxIvjPP7Th8mdsanQNWRI08d5InLsgTkBuLy8eVmFN+QFPRMEBSiF1nJ2zs/y5sVVCNajeWRO6idE1U2tmz67oX6JKSq9swsgL4386UKevtGBtM/0Kqwrr7npKMQSSxzyU8eN5+932M4FTbQikSit6Iv00fNoD/ZjBUzTIKdzqILGTwUBBFmy9NFDn3F2JCYmvjsnE67wliz3OVxytgLQGmx92UyrluoFzupgxYq5mm/A6dn6tpb1NY4SD7jMlzfbBUSnpxiLT05cSBD+1VRImwdGZUxspUYAAAIiSURBVP/v7TMfOXRMHFQpUrPuwMDAqdzIvANPwY+PABpNlCidnOWMcTg6KDs/L4XR+ao10AEy6PTWmbJIaM5OwrXUJXohKPOX0Fw3v7I8K3gi1/+qAfQ63IvmlVRDoHh3kJfPmBGc6DilYsnELi2MfxPAY9Y4C43yF6dk5OaD5lOfG1X9f9xkL/aXUokTF+Zsu0iTJUeYcYZkd3ZU9j01JaJfNDBPnMqPq1cNoBuchpALijNRZ2ZOaQ22uqz5bdk26VwGS8xtVUHeyg8MTY3TMFldxMxdvHeXbdskYnGOdZ3m+3t/vK9gFX7UYf9mt6TpsiNgE11klP/5eePU0yOy9ysVqm5Via5wOrQTgJzIEBXjySkZ3psRqW9opfdrIfKn8uNz4wMtsOLZ5KnJdGJbtTckZzUwbUFp0aFbWrPr2L74mb7uh7vV3O6pGs+lHvy753+0tDe+45YSt78sZ+Xdw1MTtI90WOejwyPRbOIXWvOP5+zob31Dn047opZT8UxWJA8Mys5lA6KzTXCBUdBx4IBA9J3Jh1+m2XOiSuZLX9mOhjVf2dqw+l0hT6Binr+CSl8pVHoZyIV59sQLE7tf3P95LHHvC8me1ySVEeD3gd8EpwcXZWbAkoaMn8xN/E7uMzonAO+qWcOvx8+ZXsO1wGGYK1yGY4nX4a5GCJKF7NlUNvWM1PScVbE3zc3G3pK35C15S96St+QteUvekrcE4P8DJVtUGUwHKt4AAAAASUVORK5CYII=</field>
-      </record>
-
-      <record id="base.user_phu" model="res.users">
-          <field name="name">Phuong</field>
-          <field name="login">phu</field>
-          <field name="password">phu</field>
-      </record>
-
     <!--Department-->
 
       <record id="dep_management" model="hr.department">
@@ -193,7 +92,7 @@
 
       <record id="employee_fp" model="hr.employee">
           <field name="name">Fabien Pinckaers</field>
-          <field name="user_id" ref="base.user_fp"/>
+          <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')])]"/>
@@ -205,7 +104,6 @@
 
       <record id="employee_al" model="hr.employee">
           <field name="name">Antony Lesuisse</field>
-          <field name="user_id" ref="base.user_al"/>
           <field name="department_id" ref="dep_rd"/>
           <field name="job_id" ref="hr.job_cto"/>
           <field name="category_ids" eval="[(6, 0, [ref('employee_category_3')])]"/>
@@ -217,7 +115,6 @@
 
       <record id="employee_mit" model="hr.employee">
           <field name="name">Minh Tran</field>
-          <field name="user_id" ref="base.user_mit"/>
           <field name="department_id" ref="dep_rd"/>
           <field name="parent_id" ref="employee_al"/>
           <field name="job_id" ref="hr.job_developer"/>
@@ -231,7 +128,6 @@
 
       <record id="employee_niv" model="hr.employee">
           <field name="name">Nicolas Vanhoren</field>
-          <field name="user_id" ref="base.user_niv"/>
           <field name="department_id" ref="dep_rd"/>
           <field name="parent_id" ref="employee_al"/>
           <field name="job_id" ref="hr.job_developer"/>
@@ -244,7 +140,6 @@
 
       <record id="employee_stw" model="hr.employee">
           <field name="name">Stéphane Wirtel</field>
-          <field name="user_id" ref="base.user_stw"/>
           <field name="department_id" ref="dep_rd"/>
           <field name="parent_id" ref="employee_al"/>
           <field name="job_id" ref="hr.job_developer"/>
@@ -257,7 +152,6 @@
 
       <record id="employee_chs" model="hr.employee">
           <field name="name">Christophe Simonis</field>
-          <field name="user_id" ref="base.user_chs"/>
           <field name="department_id" ref="dep_rd"/>
           <field name="parent_id" ref="employee_al"/>
           <field name="job_id" ref="hr.job_developer"/>
@@ -270,7 +164,7 @@
 
       <record id="employee_qdp" model="hr.employee">
           <field name="name">Quentin De Paoli</field>
-          <field name="user_id" ref="base.user_qdp"/>
+          <field name="user_id" ref="base.user_demo"/>
           <field name="department_id" ref="dep_rd"/>
           <field name="parent_id" ref="employee_al"/>
           <field name="job_id" ref="hr.job_developer"/>
@@ -283,7 +177,6 @@
 
       <record id="employee_fme" model="hr.employee">
           <field name="name">Fabien Meghazi</field>
-          <field name="user_id" ref="base.user_fme"/>
           <field name="department_id" ref="dep_rd"/>
           <field name="parent_id" ref="employee_al"/>
           <field name="job_id" ref="hr.job_developer"/>
@@ -295,7 +188,6 @@
 
       <record id="employee_fpi" model="hr.employee">
           <field name="name">Francois Pietquin</field>
-          <field name="user_id" ref="base.user_fpi"/>
           <field name="department_id" ref="dep_ps"/>
           <field name="parent_id" ref="employee_fp"/>
           <field name="job_id" ref="hr.job_consultant"/>
@@ -308,7 +200,6 @@
 
       <record id="employee_jth" model="hr.employee">
           <field name="name">Julien Thewys</field>
-          <field name="user_id" ref="base.user_jth"/>
           <field name="department_id" ref="dep_ps"/>
           <field name="parent_id" ref="employee_fp"/>
           <field name="job_id" ref="hr.job_consultant"/>
@@ -321,7 +212,6 @@
 
       <record id="employee_ngh" model="hr.employee">
           <field name="name">Nicoleta Gherlea</field>
-          <field name="user_id" ref="base.user_ngh"/>
           <field name="department_id" ref="dep_sales"/>
           <field name="parent_id" ref="employee_fp"/>
           <field name="job_id" ref="hr.job_marketing"/>
@@ -334,7 +224,6 @@
 
       <record id="employee_vad" model="hr.employee">
           <field name="name">Valérie Descamps</field>
-          <field name="user_id" ref="base.user_vad"/>
           <field name="department_id" ref="dep_administration"/>
           <field name="parent_id" ref="employee_fp"/>
           <field name="job_id" ref="hr.job_hrm"/>
diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index 0dcc675e665..00ed2afbef2 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -20,16 +20,12 @@
             <field name="arch" type="xml">
                 <form string="Employee" version="7.0">
                     <sheet>
-                        <field name="image_small" widget='image' class="oe_right oe_image_small"/>
+                        <field name="image_medium" widget='image' class="oe_left oe_avatar"/>
                         <div class="oe_title">
                             <label for="name" class="oe_edit_only"/>
                             <h1>
                                 <field name="name"/>
                             </h1>
-                            <label for="job_id" class="oe_edit_only"/>
-                            <h2>
-                                <field name="job_id" options='{"no_open": true}' domain="[('state','!=','old')]" context="{'form_view_ref': 'hr.view_hr_job_employee_form'}"/>
-                            </h2>
                             <label for="category_ids" class="oe_edit_only"/>
                             <field name="category_ids" widget="many2many_tags" placeholder="e.g. Part Time"/>
                         </div>
@@ -37,44 +33,55 @@
                             <!-- Put here related buttons -->
                         </div>
                         <notebook>
-                            <page string="Information">
+                            <page string="Public Information">
                                 <group>
-                                    <group>
+                                    <group string="Contact Information">
+                                        <field name="work_email" widget="email"/>
+                                        <field name="work_phone"/>
+                                        <field name="mobile_phone"/>
+                                    </group>
+                                    <group string="Position">
                                         <field name="department_id" on_change="onchange_department_id(department_id)"/>
-                                        <field name="company_id" groups="base.group_multi_company" on_change="onchange_company(company_id)"/>
-                                        <field name="user_id" on_change="onchange_user(user_id)"/>
+                                        <field name="job_id" options='{"no_open": true}' domain="[('state','!=','old')]" context="{'form_view_ref': 'hr.view_hr_job_employee_form'}"/>
                                         <field name="parent_id"/>
                                         <field name="coach_id"/>
                                     </group>
                                     <group>
-                                        <field name="work_email" widget="email"/>
-                                        <field name="work_phone"/>
-                                        <field name="address_id" on_change="onchange_address_id(address_id)"/>
-                                        <field name="mobile_phone"/>
-                                        <field name="identification_id" groups="base.group_hr_user"/>
-                                        <field name="passport_id" groups="base.group_hr_user"/>
-                                        <field name="otherid" groups="base.group_hr_user"/>
-                                    </group>
-                                    <group name="active_group">
-                                        <field name="active"/>
+                                        <field name="company_id" groups="base.group_multi_company" on_change="onchange_company(company_id)"/>
+                                        <field name="user_id" on_change="onchange_user(user_id)" string="Related User"/>
+                                        <field name="address_id" on_change="onchange_address_id(address_id)" context="{'show_address': 1}" options='{"always_reload": true, "highlight_first_line": true}'/>
                                     </group>
                                 </group>
                                 <field name="notes" placeholder="Other Information ..." colspan="4"/>
                             </page>
                             <page string="Personal Information" groups="base.group_hr_user">
-                                <group col="4">
-                                    <group>
+                                <group>
+                                    <group string="Citizenship &amp; Other Info">
                                         <field name="country_id" options='{"no_open": true}'/>
+                                        <field name="identification_id" groups="base.group_hr_user"/>
+                                        <field name="passport_id" groups="base.group_hr_user"/>
                                         <field name="bank_account_id"/>
-                                        <field name="address_home_id"/>
+                                        <field name="otherid" groups="base.group_hr_user"/>
                                     </group>
-                                    <group>
+                                    <group string="Contact Information">
+                                        <field name="address_home_id" context="{'show_address': 1}" options='{"always_reload": true, "highlight_first_line": true}'/>
+                                    </group>
+                                    <group string="Status">
                                         <field name="gender"/>
                                         <field name="marital"/>
+                                    </group>
+                                    <group string="Birth">
                                         <field name="birthday"/>
                                     </group>
                                 </group>
                             </page>
+                            <page string="HR Settings" groups="base.group_hr_user">
+                                <group>
+                                    <group string="Active" name="active_group">
+                                        <field name="active"/>
+                                    </group>
+                                </group>
+                            </page>
                         </notebook>
                     </sheet>
                 </form>
@@ -130,11 +137,11 @@
                     <t t-name="kanban-box">
                         <div class="oe_employee_vignette">
                             <div class="oe_employee_image">
-                                <a type="edit"><img t-att-src="kanban_image('hr.employee', 'image_medium', record.id.value)" class="oe_employee_picture"/></a>
+                                <a type="open"><img t-att-src="kanban_image('hr.employee', 'image_medium', record.id.value)" class="oe_employee_picture"/></a>
                             </div>
                             <div class="oe_employee_details">
                                 <h4>
-                                    <a type="edit"><field name="name"/><t t-if="record.login.raw_value"> (<field name="login"/>)</t></a>
+                                    <a type="open"><field name="name"/><t t-if="record.login.raw_value"> (<field name="login"/>)</t></a>
                                 </h4>
                                 <ul>
                                     <li id="last_login">
diff --git a/addons/hr/i18n/ar.po b/addons/hr/i18n/ar.po
index 31b087dc2da..8a5c8265baa 100644
--- a/addons/hr/i18n/ar.po
+++ b/addons/hr/i18n/ar.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:52+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:24+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
diff --git a/addons/hr/i18n/bg.po b/addons/hr/i18n/bg.po
index 0f9bbee4250..6ab5cf434b6 100644
--- a/addons/hr/i18n/bg.po
+++ b/addons/hr/i18n/bg.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:52+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:24+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
diff --git a/addons/hr/i18n/bn.po b/addons/hr/i18n/bn.po
index 03ae7a65d26..cb37be0b4c7 100644
--- a/addons/hr/i18n/bn.po
+++ b/addons/hr/i18n/bn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:52+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:24+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
diff --git a/addons/hr/i18n/bs.po b/addons/hr/i18n/bs.po
index 902d47c2819..fdfe22c4c30 100644
--- a/addons/hr/i18n/bs.po
+++ b/addons/hr/i18n/bs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:52+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:24+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
diff --git a/addons/hr/i18n/ca.po b/addons/hr/i18n/ca.po
index f95122de88f..4eff291abef 100644
--- a/addons/hr/i18n/ca.po
+++ b/addons/hr/i18n/ca.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:52+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:24+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
diff --git a/addons/hr/i18n/cs.po b/addons/hr/i18n/cs.po
index 91da0206f0a..6e603c0f59e 100644
--- a/addons/hr/i18n/cs.po
+++ b/addons/hr/i18n/cs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:52+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:24+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 "X-Poedit-Language: Czech\n"
 
 #. module: hr
diff --git a/addons/hr/i18n/da.po b/addons/hr/i18n/da.po
index ce535d07b30..cb87497a208 100644
--- a/addons/hr/i18n/da.po
+++ b/addons/hr/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:52+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:24+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
diff --git a/addons/hr/i18n/de.po b/addons/hr/i18n/de.po
index 63a91372f72..2b6f61aa26c 100644
--- a/addons/hr/i18n/de.po
+++ b/addons/hr/i18n/de.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:52+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:24+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
diff --git a/addons/hr/i18n/el.po b/addons/hr/i18n/el.po
index f045b0e4bea..607d9b4935b 100644
--- a/addons/hr/i18n/el.po
+++ b/addons/hr/i18n/el.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:52+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:24+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
 "X-Poedit-SourceCharset: utf-8\n"
diff --git a/addons/hr/i18n/en_AU.po b/addons/hr/i18n/en_AU.po
index c4a6de9014f..99a148af340 100644
--- a/addons/hr/i18n/en_AU.po
+++ b/addons/hr/i18n/en_AU.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:52+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:24+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
diff --git a/addons/hr/i18n/en_GB.po b/addons/hr/i18n/en_GB.po
index e4fc29762eb..5e405b3ad86 100644
--- a/addons/hr/i18n/en_GB.po
+++ b/addons/hr/i18n/en_GB.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:52+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:24+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
diff --git a/addons/hr/i18n/es.po b/addons/hr/i18n/es.po
index ae23c8c9b60..f619669f397 100644
--- a/addons/hr/i18n/es.po
+++ b/addons/hr/i18n/es.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:52+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:24+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
diff --git a/addons/hr/i18n/es_AR.po b/addons/hr/i18n/es_AR.po
index a3097c5536a..d2e822c9fe6 100644
--- a/addons/hr/i18n/es_AR.po
+++ b/addons/hr/i18n/es_AR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:52+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:24+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
diff --git a/addons/hr/i18n/es_CL.po b/addons/hr/i18n/es_CL.po
index 9142eba2a6e..09585407c15 100644
--- a/addons/hr/i18n/es_CL.po
+++ b/addons/hr/i18n/es_CL.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:52+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:24+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
diff --git a/addons/hr/i18n/es_CR.po b/addons/hr/i18n/es_CR.po
index 08bc8e163ce..95dcce77fa9 100644
--- a/addons/hr/i18n/es_CR.po
+++ b/addons/hr/i18n/es_CR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:52+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:24+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 "Language: \n"
 
 #. module: hr
diff --git a/addons/hr/i18n/es_EC.po b/addons/hr/i18n/es_EC.po
index 19f7caa1ee0..6eb03e22568 100644
--- a/addons/hr/i18n/es_EC.po
+++ b/addons/hr/i18n/es_EC.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:52+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:24+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
diff --git a/addons/hr/i18n/et.po b/addons/hr/i18n/et.po
index 50159b2f084..d096102bf6e 100644
--- a/addons/hr/i18n/et.po
+++ b/addons/hr/i18n/et.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:52+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:24+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
diff --git a/addons/hr/i18n/fi.po b/addons/hr/i18n/fi.po
index 7deeef50c62..beb161f6253 100644
--- a/addons/hr/i18n/fi.po
+++ b/addons/hr/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:52+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:24+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
diff --git a/addons/hr/i18n/fr.po b/addons/hr/i18n/fr.po
index e3b59c53ce6..fb26e106432 100644
--- a/addons/hr/i18n/fr.po
+++ b/addons/hr/i18n/fr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:52+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:24+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
diff --git a/addons/hr/i18n/fr_BE.po b/addons/hr/i18n/fr_BE.po
index eea65636ecd..5105a0b157e 100644
--- a/addons/hr/i18n/fr_BE.po
+++ b/addons/hr/i18n/fr_BE.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:52+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:24+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
diff --git a/addons/hr/i18n/gl.po b/addons/hr/i18n/gl.po
index 085152128d3..f99a70c55b2 100644
--- a/addons/hr/i18n/gl.po
+++ b/addons/hr/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:52+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:24+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
diff --git a/addons/hr/i18n/gu.po b/addons/hr/i18n/gu.po
index fc160e02ca9..0389fb71750 100644
--- a/addons/hr/i18n/gu.po
+++ b/addons/hr/i18n/gu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:52+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:24+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
diff --git a/addons/hr/i18n/hi.po b/addons/hr/i18n/hi.po
index f21375560cd..ddf48852cf3 100644
--- a/addons/hr/i18n/hi.po
+++ b/addons/hr/i18n/hi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:52+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:24+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
diff --git a/addons/hr/i18n/hr.po b/addons/hr/i18n/hr.po
index ed5e41a58a2..da8d5731a9e 100644
--- a/addons/hr/i18n/hr.po
+++ b/addons/hr/i18n/hr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:52+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:24+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 "Language: hr\n"
 
 #. module: hr
diff --git a/addons/hr/i18n/hu.po b/addons/hr/i18n/hu.po
index e00c26ddd38..2e458f179bb 100644
--- a/addons/hr/i18n/hu.po
+++ b/addons/hr/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:52+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:24+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
diff --git a/addons/hr/i18n/id.po b/addons/hr/i18n/id.po
index ea792ef6454..b4196dd15d1 100644
--- a/addons/hr/i18n/id.po
+++ b/addons/hr/i18n/id.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:52+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:24+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
diff --git a/addons/hr/i18n/it.po b/addons/hr/i18n/it.po
index 95dd8770979..26ce13a5174 100644
--- a/addons/hr/i18n/it.po
+++ b/addons/hr/i18n/it.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:52+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:24+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
diff --git a/addons/hr/i18n/ja.po b/addons/hr/i18n/ja.po
index eca07fe7b70..d5b21586147 100644
--- a/addons/hr/i18n/ja.po
+++ b/addons/hr/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:52+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:24+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
diff --git a/addons/hr/i18n/ko.po b/addons/hr/i18n/ko.po
index 1b01e75ffaf..24c64246bf0 100644
--- a/addons/hr/i18n/ko.po
+++ b/addons/hr/i18n/ko.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:52+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:24+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
diff --git a/addons/hr/i18n/lo.po b/addons/hr/i18n/lo.po
index 1d65d7e988b..26547eb24d9 100644
--- a/addons/hr/i18n/lo.po
+++ b/addons/hr/i18n/lo.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:52+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:24+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
diff --git a/addons/hr/i18n/lt.po b/addons/hr/i18n/lt.po
index 35adc34d76b..3d22a0fba87 100644
--- a/addons/hr/i18n/lt.po
+++ b/addons/hr/i18n/lt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:52+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:24+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
diff --git a/addons/hr/i18n/lv.po b/addons/hr/i18n/lv.po
index e1260f3a2e4..92f063495f8 100644
--- a/addons/hr/i18n/lv.po
+++ b/addons/hr/i18n/lv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:52+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:24+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
diff --git a/addons/hr/i18n/mk.po b/addons/hr/i18n/mk.po
index 47d4662dc9c..0461faa691c 100644
--- a/addons/hr/i18n/mk.po
+++ b/addons/hr/i18n/mk.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:52+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:24+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
diff --git a/addons/hr/i18n/mn.po b/addons/hr/i18n/mn.po
index b89b0307b2f..1e3ff85e8fd 100644
--- a/addons/hr/i18n/mn.po
+++ b/addons/hr/i18n/mn.po
@@ -20,8 +20,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:52+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:24+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
diff --git a/addons/hr/i18n/nb.po b/addons/hr/i18n/nb.po
index de0d6fe5b86..9a32cfb3a7b 100644
--- a/addons/hr/i18n/nb.po
+++ b/addons/hr/i18n/nb.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:52+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:24+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
diff --git a/addons/hr/i18n/nl.po b/addons/hr/i18n/nl.po
index e5981591688..e63c2c1f1cb 100644
--- a/addons/hr/i18n/nl.po
+++ b/addons/hr/i18n/nl.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 01:37+0100\n"
-"PO-Revision-Date: 2012-05-10 18:28+0000\n"
-"Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
+"PO-Revision-Date: 2012-09-03 17:10+0000\n"
+"Last-Translator: Erwin <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: 2012-08-09 04:52+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-09-04 04:52+0000\n"
+"X-Generator: Launchpad (build 15890)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -195,7 +195,7 @@ msgstr "Vrouw"
 #: help:hr.job,expected_employees:0
 msgid ""
 "Expected number of employees for this job position after new recruitment."
-msgstr ""
+msgstr "Verwachte aantal werknemers voor deze functie na de nieuwe werving."
 
 #. module: hr
 #: model:ir.ui.menu,name:hr.menu_open_view_attendance_reason_new_config
@@ -288,7 +288,7 @@ msgstr "Categorieën"
 #. module: hr
 #: field:hr.job,expected_employees:0
 msgid "Total Employees"
-msgstr ""
+msgstr "Totaal aantal werknemers"
 
 #. module: hr
 #: selection:hr.employee,marital:0
@@ -710,12 +710,12 @@ msgstr "Ondergeschikten"
 #. module: hr
 #: field:hr.job,no_of_employee:0
 msgid "Number of employees currently occupying this job position."
-msgstr ""
+msgstr "Huidige aantal werknemers welke deze functie bekleden ."
 
 #. module: hr
 #: field:hr.job,no_of_recruitment:0
 msgid "Number of new employees you expect to recruit."
-msgstr ""
+msgstr "Verwachte aantal te werven nieuwe werknemers."
 
 #~ msgid "Sunday"
 #~ msgstr "Zondag"
diff --git a/addons/hr/i18n/nl_BE.po b/addons/hr/i18n/nl_BE.po
index f52f4183f50..f8c30c7b9d3 100644
--- a/addons/hr/i18n/nl_BE.po
+++ b/addons/hr/i18n/nl_BE.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:52+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:24+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
diff --git a/addons/hr/i18n/pl.po b/addons/hr/i18n/pl.po
index 7224fffbe5f..9c2aaffb792 100644
--- a/addons/hr/i18n/pl.po
+++ b/addons/hr/i18n/pl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:52+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:24+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
diff --git a/addons/hr/i18n/pt.po b/addons/hr/i18n/pt.po
index 286c3b5d641..593c5a63c60 100644
--- a/addons/hr/i18n/pt.po
+++ b/addons/hr/i18n/pt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:52+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:24+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
diff --git a/addons/hr/i18n/pt_BR.po b/addons/hr/i18n/pt_BR.po
index f90681e39fa..e6412fb6821 100644
--- a/addons/hr/i18n/pt_BR.po
+++ b/addons/hr/i18n/pt_BR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:52+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:24+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
diff --git a/addons/hr/i18n/ro.po b/addons/hr/i18n/ro.po
index fd2d0275135..6614b1e043e 100644
--- a/addons/hr/i18n/ro.po
+++ b/addons/hr/i18n/ro.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:52+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:24+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
diff --git a/addons/hr/i18n/ru.po b/addons/hr/i18n/ru.po
index 9df351fa421..2a7a2680e70 100644
--- a/addons/hr/i18n/ru.po
+++ b/addons/hr/i18n/ru.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:52+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:24+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
diff --git a/addons/hr/i18n/sk.po b/addons/hr/i18n/sk.po
index 2b9a56714b1..04c91a1c3b5 100644
--- a/addons/hr/i18n/sk.po
+++ b/addons/hr/i18n/sk.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:52+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:24+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
diff --git a/addons/hr/i18n/sl.po b/addons/hr/i18n/sl.po
index ce500b20c90..44f132ab2c0 100644
--- a/addons/hr/i18n/sl.po
+++ b/addons/hr/i18n/sl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:52+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:24+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
diff --git a/addons/hr/i18n/sq.po b/addons/hr/i18n/sq.po
index 29bf6fb1bbd..88c27635f79 100644
--- a/addons/hr/i18n/sq.po
+++ b/addons/hr/i18n/sq.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:52+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:24+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
diff --git a/addons/hr/i18n/sr.po b/addons/hr/i18n/sr.po
index 7cce751f4a2..ec045f2ff8e 100644
--- a/addons/hr/i18n/sr.po
+++ b/addons/hr/i18n/sr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:52+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:24+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
diff --git a/addons/hr/i18n/sr@latin.po b/addons/hr/i18n/sr@latin.po
index dad9cb80d5a..7d35abeb754 100644
--- a/addons/hr/i18n/sr@latin.po
+++ b/addons/hr/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:52+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:24+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
diff --git a/addons/hr/i18n/sv.po b/addons/hr/i18n/sv.po
index 27d3abe54fd..ec658679118 100644
--- a/addons/hr/i18n/sv.po
+++ b/addons/hr/i18n/sv.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:52+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:24+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
diff --git a/addons/hr/i18n/th.po b/addons/hr/i18n/th.po
index 46b1bb35635..4777a8dd59e 100644
--- a/addons/hr/i18n/th.po
+++ b/addons/hr/i18n/th.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:52+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:24+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
diff --git a/addons/hr/i18n/tlh.po b/addons/hr/i18n/tlh.po
index 1a0eaa41b12..fad0d26a446 100644
--- a/addons/hr/i18n/tlh.po
+++ b/addons/hr/i18n/tlh.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:52+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:24+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
diff --git a/addons/hr/i18n/tr.po b/addons/hr/i18n/tr.po
index 4490bae8d7a..7792de45b06 100644
--- a/addons/hr/i18n/tr.po
+++ b/addons/hr/i18n/tr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:52+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:24+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
diff --git a/addons/hr/i18n/uk.po b/addons/hr/i18n/uk.po
index c23ec33612f..26dfe7f1e6e 100644
--- a/addons/hr/i18n/uk.po
+++ b/addons/hr/i18n/uk.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:52+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:24+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
diff --git a/addons/hr/i18n/vi.po b/addons/hr/i18n/vi.po
index 7d4614e3902..5745e88eedf 100644
--- a/addons/hr/i18n/vi.po
+++ b/addons/hr/i18n/vi.po
@@ -19,8 +19,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:52+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:24+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
diff --git a/addons/hr/i18n/zh_CN.po b/addons/hr/i18n/zh_CN.po
index 1bed37cdf83..8ef37390c75 100644
--- a/addons/hr/i18n/zh_CN.po
+++ b/addons/hr/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-02-08 01:37+0100\n"
-"PO-Revision-Date: 2012-05-10 17:25+0000\n"
-"Last-Translator: Wei \"oldrev\" Li <oldrev@gmail.com>\n"
+"PO-Revision-Date: 2012-08-18 17:32+0000\n"
+"Last-Translator: Heling Yao <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: 2012-08-09 04:52+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:24+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -274,7 +274,7 @@ msgstr "分类"
 #. module: hr
 #: field:hr.job,expected_employees:0
 msgid "Total Employees"
-msgstr ""
+msgstr "员工总数"
 
 #. module: hr
 #: selection:hr.employee,marital:0
@@ -690,7 +690,7 @@ msgstr ""
 #. module: hr
 #: field:hr.job,no_of_recruitment:0
 msgid "Number of new employees you expect to recruit."
-msgstr ""
+msgstr "您计划招聘的新员工数。"
 
 #~ msgid "Group name"
 #~ msgstr "组名"
diff --git a/addons/hr/i18n/zh_TW.po b/addons/hr/i18n/zh_TW.po
index 3a1acd58539..eb75b210176 100644
--- a/addons/hr/i18n/zh_TW.po
+++ b/addons/hr/i18n/zh_TW.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:52+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:24+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
diff --git a/addons/hr/res_config.py b/addons/hr/res_config.py
index 4973417ec88..411040f45b8 100644
--- a/addons/hr/res_config.py
+++ b/addons/hr/res_config.py
@@ -32,15 +32,15 @@ class hr_config_settings(osv.osv_memory):
             help ="""This installs the module hr_attendance."""),
         'module_hr_timesheet': fields.boolean('manage timesheets',
             help ="""This installs the module hr_timesheet."""),
-        'module_hr_holidays': fields.boolean('manage leaves and allocation requests',
+        'module_hr_holidays': fields.boolean('manage holidays, leaves and allocation requests',
             help ="""This installs the module hr_holidays."""),
         'module_hr_expense': fields.boolean('manage employees expenses',
             help ="""This installs the module hr_expense."""),
-        'module_hr_recruitment': fields.boolean('manage the recruitment pipe',
+        'module_hr_recruitment': fields.boolean('manage the recruitment process',
             help ="""This installs the module hr_recruitment."""),
-        'module_hr_contract': fields.boolean('manage contract per employee',
+        'module_hr_contract': fields.boolean('record contracts per employee',
             help ="""This installs the module hr_contract."""),
-        'module_hr_evaluation': fields.boolean('manage employees periodic evaluation',
+        'module_hr_evaluation': fields.boolean('organize employees periodic evaluation',
             help ="""This installs the module hr_evaluation."""),
         'module_hr_payroll': fields.boolean('manage payroll',
             help ="""This installs the module hr_payroll."""),
diff --git a/addons/hr/res_config_view.xml b/addons/hr/res_config_view.xml
index ad36818e525..32f96fb2abb 100644
--- a/addons/hr/res_config_view.xml
+++ b/addons/hr/res_config_view.xml
@@ -33,6 +33,19 @@
                         <button string="Cancel" type="object" name="cancel" class="oe_link"/>
                     </header>
                     <separator string="Human Resources Management"/>
+                    <group name="recruitment_grp">
+                        <label for="id" string="Talent Management"/>
+                        <div name="recruitment">
+                            <div>
+                                <field name="module_hr_recruitment" class="oe_inline"/>
+                                <label for="module_hr_recruitment"/>
+                            </div>
+                            <div>
+                                <field name="module_hr_evaluation" class="oe_inline"/>
+                                <label for="module_hr_evaluation"/>
+                            </div>
+                        </div>
+                    </group>
                     <group>
                         <label for="id" string="Additional Features"/>
                         <div>
@@ -44,21 +57,6 @@
                                 <field name="module_hr_expense" class="oe_inline"/>
                                 <label for="module_hr_expense"/>
                             </div>
-                            <div>
-                                <field name="module_hr_evaluation" class="oe_inline"/>
-                                <label for="module_hr_evaluation"/>
-                            </div>
-                            <div>
-                                <field name="module_hr_contract" class="oe_inline"/>
-                                <label for="module_hr_contract"/>
-                            </div>
-                            <div name="hr_payroll">
-                                <field name="module_hr_payroll" class="oe_inline"/>
-                                <label for="module_hr_payroll"/>
-                                <button name="%(open_payroll_modules)d" type="action"
-                                    string="Install your country's payroll" icon="gtk-go-forward"
-                                    attrs="{'invisible': [('module_hr_payroll','=',False)]}" class="oe_link"/>
-                            </div>
                         </div>
                     </group>
                     <group name="timesheet_grp">
@@ -78,12 +76,19 @@
                             </div>
                         </div>
                     </group>
-                    <group name="recruitment_grp">
-                        <label for="id" string="Recruitment"/>
-                        <div name="recruitment">
+                    <group name="contract_grp">
+                        <label for="id" string="Contracts"/>
+                        <div>
                             <div>
-                                <field name="module_hr_recruitment" class="oe_inline"/>
-                                <label for="module_hr_recruitment"/>
+                                <field name="module_hr_contract" class="oe_inline"/>
+                                <label for="module_hr_contract"/>
+                            </div>
+                            <div name="hr_payroll">
+                                <field name="module_hr_payroll" class="oe_inline"/>
+                                <label for="module_hr_payroll"/>
+                                <button name="%(open_payroll_modules)d" type="action"
+                                    string="Install your country's payroll" icon="gtk-go-forward"
+                                    attrs="{'invisible': [('module_hr_payroll','=',False)]}" class="oe_link"/>
                             </div>
                         </div>
                     </group>
diff --git a/addons/hr/static/src/css/hr.css b/addons/hr/static/src/css/hr.css
index 11e72fad31e..eb0728c6f1c 100644
--- a/addons/hr/static/src/css/hr.css
+++ b/addons/hr/static/src/css/hr.css
@@ -65,4 +65,5 @@
 
 .oe_employee_details li {
   margin: 2px 0;
+  padding: 0;
 }
diff --git a/addons/hr_attendance/__openerp__.py b/addons/hr_attendance/__openerp__.py
index a1ba099d012..cb2cd261773 100644
--- a/addons/hr_attendance/__openerp__.py
+++ b/addons/hr_attendance/__openerp__.py
@@ -34,7 +34,7 @@ actions(Sign in/Sign out) performed by them.
     'author': 'OpenERP SA',
     'images': ['images/hr_attendances.jpeg'],
     'depends': ['hr'],
-    'update_xml': [
+    'data': [
         'security/ir.model.access.csv',
         'hr_attendance_view.xml',
         'hr_attendance_report.xml',
@@ -43,9 +43,8 @@ actions(Sign in/Sign out) performed by them.
         'wizard/hr_attendance_bymonth_view.xml',
         'wizard/hr_attendance_byweek_view.xml',
         'wizard/hr_attendance_error_view.xml',
-        'wizard/hr_attendance_sign_in_out_view.xml',
     ],
-    'demo_xml': ['hr_attendance_demo.xml'],
+    'demo': ['hr_attendance_demo.xml'],
     'test': [
         'test/attendance_process.yml',
         'test/hr_attendance_report.yml',
@@ -53,5 +52,10 @@ actions(Sign in/Sign out) performed by them.
     'installable': True,
     'auto_install': False,
     'certificate': '0063495605613',
+    
+    #web
+    "js": ["static/src/js/attendance.js"],
+    'qweb' : ["static/src/xml/attendance.xml"],
+    'css' : ["static/src/css/slider.css"],
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr_attendance/hr_attendance.py b/addons/hr_attendance/hr_attendance.py
index 7a0cc7a8e51..d3bc79bda1a 100644
--- a/addons/hr_attendance/hr_attendance.py
+++ b/addons/hr_attendance/hr_attendance.py
@@ -112,9 +112,23 @@ class hr_employee(osv.osv):
         for res in cr.fetchall():
             result[res[1]] = res[0] == 'sign_in' and 'present' or 'absent'
         return result
+    
+    def _last_sign(self, cr, uid, ids, name, args, context=None):
+        result = {}
+        if not ids:
+            return result
+        for id in ids:
+            result[id] = False
+            cr.execute("""select max(name) as name
+                        from hr_attendance
+                        where action in ('sign_in', 'sign_out') and employee_id = %s""",(id,))
+            for res in cr.fetchall():
+                result[id] = res[0]
+        return result
 
     _columns = {
        'state': fields.function(_state, type='selection', selection=[('absent', 'Absent'), ('present', 'Present')], string='Attendance'),
+       'last_sign': fields.function(_last_sign, type='datetime', string='Last Sign'),
     }
 
     def _action_check(self, cr, uid, emp_id, dt=False, context=None):
@@ -122,30 +136,25 @@ class hr_employee(osv.osv):
         res = cr.fetchone()
         return not (res and (res[0]>=(dt or time.strftime('%Y-%m-%d %H:%M:%S'))))
 
-    def attendance_action_change(self, cr, uid, ids, type='action', context=None, dt=False, *args):
-        obj_attendance = self.pool.get('hr.attendance')
-        id = False
-        warning_sign = 'sign'
-        res = {}
+    def attendance_action_change(self, cr, uid, ids, context=None):
+        if context is None:
+            context = {}
+        action_date = context.get('action_date', False)
+        action = context.get('action', False)
+        hr_attendance = self.pool.get('hr.attendance')
+        warning_sign = {'sign_in': _('Sign In'), 'sign_out': _('Sign Out')}
+        for employee in self.browse(cr, uid, ids, context=context):
+            if not action:
+                if employee.state == 'present': action = 'sign_out'
+                if employee.state == 'absent': action = 'sign_in'
 
-        #Special case when button calls this method: type=context
-        if isinstance(type, dict):
-            type = type.get('type','action')
-        if type == 'sign_in':
-            warning_sign = "Sign In"
-        elif type == 'sign_out':
-            warning_sign = "Sign Out"
-        for emp in self.read(cr, uid, ids, ['id'], context=context):
-            if not self._action_check(cr, uid, emp['id'], dt, context):
-                raise osv.except_osv(_('Warning!'), _('You tried to %s with a date anterior to another event !\nTry to contact the administrator to correct attendances.')%(warning_sign,))
+            if not self._action_check(cr, uid, employee.id, action_date, context):
+                raise osv.except_osv(_('Warning'), _('You tried to %s with a date anterior to another event !\nTry to contact the HR Manager to correct attendances.')%(warning_sign[action],))
 
-            res = {'action': type, 'employee_id': emp['id']}
-            if dt:
-                res['name'] = dt
-        id = obj_attendance.create(cr, uid, res, context=context)
-
-        if type != 'action':
-            return id
+            vals = {'action': action, 'employee_id': employee.id}
+            if action_date:
+                vals['name'] = action_date
+            hr_attendance.create(cr, uid, vals, context=context)
         return True
 
 hr_employee()
diff --git a/addons/hr_attendance/hr_attendance_view.xml b/addons/hr_attendance/hr_attendance_view.xml
index bda89fd9d63..c686b4c1ff0 100644
--- a/addons/hr_attendance/hr_attendance_view.xml
+++ b/addons/hr_attendance/hr_attendance_view.xml
@@ -126,9 +126,9 @@
                 <field name="active" position="before">
                     <label for="state"/>
                     <div>
-                        <field name="state" class="oe_inline"/>
-                        <button class="oe_inline oe_right" name="attendance_action_change" states="present" string="Sign Out" type="object" icon="gtk-go-forward" context="{'type':'sign_out'}" groups="base.group_hr_user"/>
-                        <button class="oe_inline oe_right" name="attendance_action_change" states="absent" string="Sign In" type="object" icon="gtk-go-back" context="{'type':'sign_in'}" groups="base.group_hr_user"/>
+                        <field name="state" class="oe_inline"/> - 
+                        <button class="oe_link" name="attendance_action_change" states="present" string="Sign Out" type="object" context="{'type':'sign_out'}" groups="base.group_hr_user"/>
+                        <button class="oe_link" name="attendance_action_change" states="absent" string="Sign In" type="object" context="{'type':'sign_in'}" groups="base.group_hr_user"/>
                     </div>
                 </field>
             </field>
@@ -136,3 +136,5 @@
 
     </data>
 </openerp>
+
+
diff --git a/addons/hr_attendance/i18n/ar.po b/addons/hr_attendance/i18n/ar.po
index 248947e9c33..1c4e274d3dc 100644
--- a/addons/hr_attendance/i18n/ar.po
+++ b/addons/hr_attendance/i18n/ar.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:54+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:26+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_attendance
 #: model:ir.ui.menu,name:hr_attendance.menu_hr_time_tracking
diff --git a/addons/hr_attendance/i18n/bg.po b/addons/hr_attendance/i18n/bg.po
index 85237aa25da..3770cd52f5e 100644
--- a/addons/hr_attendance/i18n/bg.po
+++ b/addons/hr_attendance/i18n/bg.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:54+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:26+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_attendance
 #: model:ir.ui.menu,name:hr_attendance.menu_hr_time_tracking
diff --git a/addons/hr_attendance/i18n/bs.po b/addons/hr_attendance/i18n/bs.po
index 17393f57a09..d84e8043da0 100644
--- a/addons/hr_attendance/i18n/bs.po
+++ b/addons/hr_attendance/i18n/bs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:54+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:26+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_attendance
 #: model:ir.ui.menu,name:hr_attendance.menu_hr_time_tracking
diff --git a/addons/hr_attendance/i18n/ca.po b/addons/hr_attendance/i18n/ca.po
index 01e350e8039..1bc3405afe3 100644
--- a/addons/hr_attendance/i18n/ca.po
+++ b/addons/hr_attendance/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:54+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:26+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_attendance
 #: model:ir.ui.menu,name:hr_attendance.menu_hr_time_tracking
diff --git a/addons/hr_attendance/i18n/cs.po b/addons/hr_attendance/i18n/cs.po
index ff262d509f7..be79e95cb37 100644
--- a/addons/hr_attendance/i18n/cs.po
+++ b/addons/hr_attendance/i18n/cs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:54+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:26+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 "X-Poedit-Language: czech\n"
 
 #. module: hr_attendance
diff --git a/addons/hr_attendance/i18n/da.po b/addons/hr_attendance/i18n/da.po
index 66484807ab5..1158549db10 100644
--- a/addons/hr_attendance/i18n/da.po
+++ b/addons/hr_attendance/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:54+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:26+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_attendance
 #: model:ir.ui.menu,name:hr_attendance.menu_hr_time_tracking
diff --git a/addons/hr_attendance/i18n/de.po b/addons/hr_attendance/i18n/de.po
index cf22b269470..48715729690 100644
--- a/addons/hr_attendance/i18n/de.po
+++ b/addons/hr_attendance/i18n/de.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:54+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:26+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_attendance
 #: model:ir.ui.menu,name:hr_attendance.menu_hr_time_tracking
diff --git a/addons/hr_attendance/i18n/el.po b/addons/hr_attendance/i18n/el.po
index b2ee7c61a24..5ee77101304 100644
--- a/addons/hr_attendance/i18n/el.po
+++ b/addons/hr_attendance/i18n/el.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:54+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:26+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
 "X-Poedit-SourceCharset: utf-8\n"
diff --git a/addons/hr_attendance/i18n/es.po b/addons/hr_attendance/i18n/es.po
index 44803f88617..aac59121d5a 100644
--- a/addons/hr_attendance/i18n/es.po
+++ b/addons/hr_attendance/i18n/es.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:54+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_attendance
 #: model:ir.ui.menu,name:hr_attendance.menu_hr_time_tracking
diff --git a/addons/hr_attendance/i18n/es_AR.po b/addons/hr_attendance/i18n/es_AR.po
index a5b75617668..ed61f40c1e3 100644
--- a/addons/hr_attendance/i18n/es_AR.po
+++ b/addons/hr_attendance/i18n/es_AR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:54+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_attendance
 #: model:ir.ui.menu,name:hr_attendance.menu_hr_time_tracking
diff --git a/addons/hr_attendance/i18n/es_CL.po b/addons/hr_attendance/i18n/es_CL.po
index 874753f1c93..8140ba7a4af 100644
--- a/addons/hr_attendance/i18n/es_CL.po
+++ b/addons/hr_attendance/i18n/es_CL.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:54+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_attendance
 #: model:ir.ui.menu,name:hr_attendance.menu_hr_time_tracking
diff --git a/addons/hr_attendance/i18n/es_CR.po b/addons/hr_attendance/i18n/es_CR.po
index 45c0c363d42..3b7ea843d09 100644
--- a/addons/hr_attendance/i18n/es_CR.po
+++ b/addons/hr_attendance/i18n/es_CR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:54+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 "Language: \n"
 
 #. module: hr_attendance
diff --git a/addons/hr_attendance/i18n/es_EC.po b/addons/hr_attendance/i18n/es_EC.po
index 8464f24858d..ab6f6756435 100644
--- a/addons/hr_attendance/i18n/es_EC.po
+++ b/addons/hr_attendance/i18n/es_EC.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:54+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_attendance
 #: model:ir.ui.menu,name:hr_attendance.menu_hr_time_tracking
diff --git a/addons/hr_attendance/i18n/es_PY.po b/addons/hr_attendance/i18n/es_PY.po
index 8e42a27daae..d0a5dafb052 100644
--- a/addons/hr_attendance/i18n/es_PY.po
+++ b/addons/hr_attendance/i18n/es_PY.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:54+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_attendance
 #: model:ir.ui.menu,name:hr_attendance.menu_hr_time_tracking
diff --git a/addons/hr_attendance/i18n/et.po b/addons/hr_attendance/i18n/et.po
index c47fac329b2..bab70d03af5 100644
--- a/addons/hr_attendance/i18n/et.po
+++ b/addons/hr_attendance/i18n/et.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:54+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:26+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_attendance
 #: model:ir.ui.menu,name:hr_attendance.menu_hr_time_tracking
diff --git a/addons/hr_attendance/i18n/fi.po b/addons/hr_attendance/i18n/fi.po
index 9f588e3dca2..818fe02b23f 100644
--- a/addons/hr_attendance/i18n/fi.po
+++ b/addons/hr_attendance/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:54+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:26+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_attendance
 #: model:ir.ui.menu,name:hr_attendance.menu_hr_time_tracking
diff --git a/addons/hr_attendance/i18n/fr.po b/addons/hr_attendance/i18n/fr.po
index aafb1958f1b..8f281708e82 100644
--- a/addons/hr_attendance/i18n/fr.po
+++ b/addons/hr_attendance/i18n/fr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:54+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:26+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_attendance
 #: code:addons/hr_attendance/wizard/hr_attendance_sign_in_out.py:174
diff --git a/addons/hr_attendance/i18n/gl.po b/addons/hr_attendance/i18n/gl.po
index 46a1cd6e77e..d272d88e83f 100644
--- a/addons/hr_attendance/i18n/gl.po
+++ b/addons/hr_attendance/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:54+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:26+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_attendance
 #: model:ir.ui.menu,name:hr_attendance.menu_hr_time_tracking
diff --git a/addons/hr_attendance/i18n/he.po b/addons/hr_attendance/i18n/he.po
index 2ee71fe3f38..0868e54a3a3 100644
--- a/addons/hr_attendance/i18n/he.po
+++ b/addons/hr_attendance/i18n/he.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:54+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:26+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_attendance
 #: model:ir.ui.menu,name:hr_attendance.menu_hr_time_tracking
diff --git a/addons/hr_attendance/i18n/hr.po b/addons/hr_attendance/i18n/hr.po
index 06703e28bb7..a6b9dc25675 100644
--- a/addons/hr_attendance/i18n/hr.po
+++ b/addons/hr_attendance/i18n/hr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:54+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_attendance
 #: model:ir.ui.menu,name:hr_attendance.menu_hr_time_tracking
diff --git a/addons/hr_attendance/i18n/hu.po b/addons/hr_attendance/i18n/hu.po
index e7ae467aed6..cad2f2fa190 100644
--- a/addons/hr_attendance/i18n/hu.po
+++ b/addons/hr_attendance/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:54+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:26+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_attendance
 #: model:ir.ui.menu,name:hr_attendance.menu_hr_time_tracking
diff --git a/addons/hr_attendance/i18n/id.po b/addons/hr_attendance/i18n/id.po
index 448519e4323..63905fb322a 100644
--- a/addons/hr_attendance/i18n/id.po
+++ b/addons/hr_attendance/i18n/id.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:54+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:26+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_attendance
 #: model:ir.ui.menu,name:hr_attendance.menu_hr_time_tracking
diff --git a/addons/hr_attendance/i18n/it.po b/addons/hr_attendance/i18n/it.po
index fe3749cd3da..80ec6901c5f 100644
--- a/addons/hr_attendance/i18n/it.po
+++ b/addons/hr_attendance/i18n/it.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:54+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:26+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_attendance
 #: model:ir.ui.menu,name:hr_attendance.menu_hr_time_tracking
diff --git a/addons/hr_attendance/i18n/ja.po b/addons/hr_attendance/i18n/ja.po
index 37df3f11a27..4dd310b8319 100644
--- a/addons/hr_attendance/i18n/ja.po
+++ b/addons/hr_attendance/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:54+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_attendance
 #: model:ir.ui.menu,name:hr_attendance.menu_hr_time_tracking
diff --git a/addons/hr_attendance/i18n/ko.po b/addons/hr_attendance/i18n/ko.po
index 77630dfb35d..9b41a744cc8 100644
--- a/addons/hr_attendance/i18n/ko.po
+++ b/addons/hr_attendance/i18n/ko.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:54+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_attendance
 #: model:ir.ui.menu,name:hr_attendance.menu_hr_time_tracking
diff --git a/addons/hr_attendance/i18n/lt.po b/addons/hr_attendance/i18n/lt.po
index 17b6ae8af7f..07b0eb1e01e 100644
--- a/addons/hr_attendance/i18n/lt.po
+++ b/addons/hr_attendance/i18n/lt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:54+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_attendance
 #: model:ir.ui.menu,name:hr_attendance.menu_hr_time_tracking
diff --git a/addons/hr_attendance/i18n/lv.po b/addons/hr_attendance/i18n/lv.po
index 642a6ec230f..d6e2143df99 100644
--- a/addons/hr_attendance/i18n/lv.po
+++ b/addons/hr_attendance/i18n/lv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:54+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_attendance
 #: model:ir.ui.menu,name:hr_attendance.menu_hr_time_tracking
diff --git a/addons/hr_attendance/i18n/mk.po b/addons/hr_attendance/i18n/mk.po
index a26f82657b9..c7e0b711cb5 100644
--- a/addons/hr_attendance/i18n/mk.po
+++ b/addons/hr_attendance/i18n/mk.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:54+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_attendance
 #: model:ir.ui.menu,name:hr_attendance.menu_hr_time_tracking
diff --git a/addons/hr_attendance/i18n/mn.po b/addons/hr_attendance/i18n/mn.po
index 9ee48b966a7..b47e7d26504 100644
--- a/addons/hr_attendance/i18n/mn.po
+++ b/addons/hr_attendance/i18n/mn.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:54+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_attendance
 #: model:ir.ui.menu,name:hr_attendance.menu_hr_time_tracking
diff --git a/addons/hr_attendance/i18n/nl.po b/addons/hr_attendance/i18n/nl.po
index 70f87e4516b..da149c38e59 100644
--- a/addons/hr_attendance/i18n/nl.po
+++ b/addons/hr_attendance/i18n/nl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:54+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:26+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_attendance
 #: model:ir.ui.menu,name:hr_attendance.menu_hr_time_tracking
diff --git a/addons/hr_attendance/i18n/nl_BE.po b/addons/hr_attendance/i18n/nl_BE.po
index be11a5b77f7..1730bdc64e3 100644
--- a/addons/hr_attendance/i18n/nl_BE.po
+++ b/addons/hr_attendance/i18n/nl_BE.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:54+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_attendance
 #: model:ir.ui.menu,name:hr_attendance.menu_hr_time_tracking
diff --git a/addons/hr_attendance/i18n/pl.po b/addons/hr_attendance/i18n/pl.po
index 3548c7721fd..d06d2706be1 100644
--- a/addons/hr_attendance/i18n/pl.po
+++ b/addons/hr_attendance/i18n/pl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:54+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_attendance
 #: model:ir.ui.menu,name:hr_attendance.menu_hr_time_tracking
diff --git a/addons/hr_attendance/i18n/pt.po b/addons/hr_attendance/i18n/pt.po
index 3e74c509949..7f4e4fafdf2 100644
--- a/addons/hr_attendance/i18n/pt.po
+++ b/addons/hr_attendance/i18n/pt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:54+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_attendance
 #: model:ir.ui.menu,name:hr_attendance.menu_hr_time_tracking
diff --git a/addons/hr_attendance/i18n/pt_BR.po b/addons/hr_attendance/i18n/pt_BR.po
index c6b56383c6c..8a7a9b4f96b 100644
--- a/addons/hr_attendance/i18n/pt_BR.po
+++ b/addons/hr_attendance/i18n/pt_BR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:54+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_attendance
 #: model:ir.ui.menu,name:hr_attendance.menu_hr_time_tracking
diff --git a/addons/hr_attendance/i18n/ro.po b/addons/hr_attendance/i18n/ro.po
index 7917aebb7f2..cf17f3efb28 100644
--- a/addons/hr_attendance/i18n/ro.po
+++ b/addons/hr_attendance/i18n/ro.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:54+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_attendance
 #: model:ir.ui.menu,name:hr_attendance.menu_hr_time_tracking
diff --git a/addons/hr_attendance/i18n/ru.po b/addons/hr_attendance/i18n/ru.po
index edbc7e6034c..6e9b0209458 100644
--- a/addons/hr_attendance/i18n/ru.po
+++ b/addons/hr_attendance/i18n/ru.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:54+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_attendance
 #: model:ir.ui.menu,name:hr_attendance.menu_hr_time_tracking
diff --git a/addons/hr_attendance/i18n/sl.po b/addons/hr_attendance/i18n/sl.po
index ff18a0b8118..b53f879da61 100644
--- a/addons/hr_attendance/i18n/sl.po
+++ b/addons/hr_attendance/i18n/sl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:54+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_attendance
 #: model:ir.ui.menu,name:hr_attendance.menu_hr_time_tracking
diff --git a/addons/hr_attendance/i18n/sq.po b/addons/hr_attendance/i18n/sq.po
index b467b646afb..5d9b335307b 100644
--- a/addons/hr_attendance/i18n/sq.po
+++ b/addons/hr_attendance/i18n/sq.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:54+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:26+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_attendance
 #: model:ir.ui.menu,name:hr_attendance.menu_hr_time_tracking
diff --git a/addons/hr_attendance/i18n/sr.po b/addons/hr_attendance/i18n/sr.po
index 2110f779409..ca4b26b0ab3 100644
--- a/addons/hr_attendance/i18n/sr.po
+++ b/addons/hr_attendance/i18n/sr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:54+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_attendance
 #: model:ir.ui.menu,name:hr_attendance.menu_hr_time_tracking
diff --git a/addons/hr_attendance/i18n/sr@latin.po b/addons/hr_attendance/i18n/sr@latin.po
index a54469db34d..e417e994792 100644
--- a/addons/hr_attendance/i18n/sr@latin.po
+++ b/addons/hr_attendance/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:54+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_attendance
 #: model:ir.ui.menu,name:hr_attendance.menu_hr_time_tracking
diff --git a/addons/hr_attendance/i18n/sv.po b/addons/hr_attendance/i18n/sv.po
index f94afe6ef6a..fcd4fb6b2e1 100644
--- a/addons/hr_attendance/i18n/sv.po
+++ b/addons/hr_attendance/i18n/sv.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:54+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_attendance
 #: model:ir.ui.menu,name:hr_attendance.menu_hr_time_tracking
diff --git a/addons/hr_attendance/i18n/tlh.po b/addons/hr_attendance/i18n/tlh.po
index f2291249076..b6290a1cb5b 100644
--- a/addons/hr_attendance/i18n/tlh.po
+++ b/addons/hr_attendance/i18n/tlh.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:54+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_attendance
 #: model:ir.ui.menu,name:hr_attendance.menu_hr_time_tracking
diff --git a/addons/hr_attendance/i18n/tr.po b/addons/hr_attendance/i18n/tr.po
index ab86b511164..a0b994e2d66 100644
--- a/addons/hr_attendance/i18n/tr.po
+++ b/addons/hr_attendance/i18n/tr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:54+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_attendance
 #: model:ir.ui.menu,name:hr_attendance.menu_hr_time_tracking
diff --git a/addons/hr_attendance/i18n/uk.po b/addons/hr_attendance/i18n/uk.po
index c8ce7f04b5d..670fadb0f39 100644
--- a/addons/hr_attendance/i18n/uk.po
+++ b/addons/hr_attendance/i18n/uk.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:54+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_attendance
 #: model:ir.ui.menu,name:hr_attendance.menu_hr_time_tracking
diff --git a/addons/hr_attendance/i18n/vi.po b/addons/hr_attendance/i18n/vi.po
index 93023575958..a3bf103735c 100644
--- a/addons/hr_attendance/i18n/vi.po
+++ b/addons/hr_attendance/i18n/vi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:54+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_attendance
 #: model:ir.ui.menu,name:hr_attendance.menu_hr_time_tracking
diff --git a/addons/hr_attendance/i18n/zh_CN.po b/addons/hr_attendance/i18n/zh_CN.po
index 0689ae9bc50..f2dc767c7d5 100644
--- a/addons/hr_attendance/i18n/zh_CN.po
+++ b/addons/hr_attendance/i18n/zh_CN.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:54+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_attendance
 #: model:ir.ui.menu,name:hr_attendance.menu_hr_time_tracking
diff --git a/addons/hr_attendance/i18n/zh_TW.po b/addons/hr_attendance/i18n/zh_TW.po
index ae11ed814c1..52eaf574f16 100644
--- a/addons/hr_attendance/i18n/zh_TW.po
+++ b/addons/hr_attendance/i18n/zh_TW.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:54+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_attendance
 #: model:ir.ui.menu,name:hr_attendance.menu_hr_time_tracking
diff --git a/addons/hr_attendance/static/src/css/slider.css b/addons/hr_attendance/static/src/css/slider.css
new file mode 100644
index 00000000000..664d4f96e41
--- /dev/null
+++ b/addons/hr_attendance/static/src/css/slider.css
@@ -0,0 +1,33 @@
+
+.openerp .oe_attendance_status {
+    height: 32px;
+    width: 32px;
+    display: inline-block;
+}
+.openerp .oe_attendance_signin {
+    float:left;
+    height: 32px;
+    width: 32px;
+    background: url(/hr_attendance/static/src/img/emp-out32.png);
+    cursor: pointer;
+}
+.openerp .oe_attendance_signin:hover {
+    background: url(/hr_attendance/static/src/img/emp-out-disable32.png);
+}
+.openerp .oe_attendance_status.oe_attendance_signed .oe_attendance_signin {
+    display: none;
+}
+
+.openerp .oe_attendance_signout {
+    float:right;
+    height: 32px;
+    width: 32px;
+    background: url(/hr_attendance/static/src/img/emp-in32.png);
+    cursor: pointer;
+}
+.openerp .oe_attendance_signout:hover {
+    background: url(/hr_attendance/static/src/img/emp-in-disable32.png);
+}
+.openerp .oe_attendance_status.oe_attendance_nosigned .oe_attendance_signout {
+    display: none;
+}
diff --git a/addons/hr_attendance/static/src/img/emp-in-disable32.png b/addons/hr_attendance/static/src/img/emp-in-disable32.png
new file mode 100644
index 00000000000..1968e0de464
Binary files /dev/null and b/addons/hr_attendance/static/src/img/emp-in-disable32.png differ
diff --git a/addons/hr_attendance/static/src/img/emp-in32.png b/addons/hr_attendance/static/src/img/emp-in32.png
new file mode 100644
index 00000000000..26e3c01556b
Binary files /dev/null and b/addons/hr_attendance/static/src/img/emp-in32.png differ
diff --git a/addons/hr_attendance/static/src/img/emp-out-disable32.png b/addons/hr_attendance/static/src/img/emp-out-disable32.png
new file mode 100644
index 00000000000..b7099e44529
Binary files /dev/null and b/addons/hr_attendance/static/src/img/emp-out-disable32.png differ
diff --git a/addons/hr_attendance/static/src/img/emp-out32.png b/addons/hr_attendance/static/src/img/emp-out32.png
new file mode 100644
index 00000000000..d2a6cbb5013
Binary files /dev/null and b/addons/hr_attendance/static/src/img/emp-out32.png differ
diff --git a/addons/hr_attendance/static/src/js/attendance.js b/addons/hr_attendance/static/src/js/attendance.js
new file mode 100644
index 00000000000..0366fa47c6c
--- /dev/null
+++ b/addons/hr_attendance/static/src/js/attendance.js
@@ -0,0 +1,84 @@
+
+openerp.hr_attendance = function (instance) {
+    
+    var QWeb = instance.web.qweb;
+    var _t = instance.web._t;
+    var _lt = instance.web._lt;
+
+    instance.hr_attendance.AttendanceSlider = instance.web.Widget.extend({
+        template: 'AttendanceSlider',
+        init: function (parent) {
+            this._super(parent);
+            this.set({"signed_in": false});
+        },
+        start: function() {
+            var self = this;
+            var tmp = function() {
+                this.$el.toggleClass("oe_attendance_nosigned", ! this.get("signed_in"));
+                this.$el.toggleClass("oe_attendance_signed", this.get("signed_in"));
+            };
+            this.on("change:signed_in", this, tmp);
+            _.bind(tmp, this)();
+            this.$(".oe_attendance_signin").click(function() {
+                self.do_update_attendance();
+            });
+            this.$(".oe_attendance_signout").click(function() {
+                self.do_update_attendance();
+            });
+            this.$el.tipsy({
+                title: function() {
+                    var last_text = instance.web.format_value(self.last_sign, {type: "datetime"});
+                    var current_text = instance.web.format_value(new Date(), {type: "datetime"});
+                    var duration = $.timeago(self.last_sign);
+                    if (self.get("signed_in")) {
+                        return _.str.sprintf(_t("Last sign in: %s,<br />%s.<br />Click to sign out."), last_text, duration);
+                    } else {
+                        return _.str.sprintf(_t("Click to Sign In at %s."), current_text);
+                    }
+                },
+                html: true,
+            });
+            return this.check_attendance();
+        },
+        do_update_attendance: function () {
+            var self = this;
+            var hr_employee = new instance.web.DataSet(self, 'hr.employee');
+            hr_employee.call('attendance_action_change', [
+                [self.employee.id]
+            ]).done(function (result) {
+                self.last_sign = new Date();
+                self.set({"signed_in": ! self.get("signed_in")});
+            });
+        },
+        check_attendance: function () {
+            var self = this;
+            self.employee = false;
+            this.$el.hide();
+            var employee = new instance.web.DataSetSearch(self, 'hr.employee', self.session.user_context, [
+                ['user_id', '=', self.session.uid]
+            ]);
+            return employee.read_slice(['id', 'name', 'state', 'last_sign']).pipe(function (res) {
+                if (_.isEmpty(res))
+                    return;
+                self.$el.show();
+                self.employee = res[0];
+                self.last_sign = instance.web.str_to_datetime(self.employee.last_sign);
+                self.set({"signed_in": self.employee.state !== "absent"});
+            });
+        },
+    });
+
+    instance.web.UserMenu.include({
+        do_update: function () {
+            this._super();
+            var self = this;
+            this.update_promise = this.update_promise.then(function () {
+                if (self.attendanceslider)
+                    return;
+                self.attendanceslider = new instance.hr_attendance.AttendanceSlider(self);
+
+                self.attendanceslider.prependTo(instance.webclient.$('.oe_systray'));
+            });
+        },
+    });
+}
diff --git a/addons/hr_attendance/static/src/xml/attendance.xml b/addons/hr_attendance/static/src/xml/attendance.xml
new file mode 100644
index 00000000000..3fd9bcf2798
--- /dev/null
+++ b/addons/hr_attendance/static/src/xml/attendance.xml
@@ -0,0 +1,13 @@
+<template>
+    <t t-name="AttendanceSlider">
+        <div class="oe_attendance_status oe_attendance_nosigned" data-tipsy="true">
+             <div class="oe_attendance_signin"></div>
+             <div class="oe_attendance_signout"></div>
+        </div>
+    </t>
+</template>
+
+
+
+
+
diff --git a/addons/hr_attendance/test/attendance_process.yml b/addons/hr_attendance/test/attendance_process.yml
index 4ad765d65df..7902bf11d9d 100644
--- a/addons/hr_attendance/test/attendance_process.yml
+++ b/addons/hr_attendance/test/attendance_process.yml
@@ -1,16 +1,8 @@
 -
   In order to test attendance process in OpenERP, I entry of SignIn of employee.
 -
-  !python {model: hr.sign.in.out}: |
-    context.update({'emp_id': [ref('hr.employee_al')]}) #TOFIX: emp_ids instead of 'emp_id'
--
-  !record {model: hr.sign.in.out, id: employee_sign_in}:
-    {}
--
-  Employee Signs In.
--
-  !python {model: hr.sign.in.out}: |
-    self.si_check(cr, uid, [ref("employee_sign_in")], context=context)
+  !python {model: hr.employee}: |
+    self.attendance_action_change(cr, uid, [ref("hr.employee_al")], context=context)
 -
   I check that Employee is "Present".
 -
@@ -19,10 +11,10 @@
 -
   After few seconds, employee sign's out.
 -
-  !python {model: hr.sign.in.out}: |
+  !python {model: hr.employee}: |
     import time
     time.sleep(2)
-    self.so_check(cr, uid, [ref("employee_sign_in")], context=context)
+    self.attendance_action_change(cr, uid, [ref("hr.employee_al")], context=context)
 -
   I check that Employee is "Absent".
 -
diff --git a/addons/hr_attendance/wizard/__init__.py b/addons/hr_attendance/wizard/__init__.py
index a414c9a8798..6269c507d8c 100644
--- a/addons/hr_attendance/wizard/__init__.py
+++ b/addons/hr_attendance/wizard/__init__.py
@@ -19,9 +19,8 @@
 #
 ##############################################################################
 
-import hr_attendance_sign_in_out
 import hr_attendance_error
 import hr_attendance_byweek
 import hr_attendance_bymonth
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr_attendance/wizard/hr_attendance_sign_in_out.py b/addons/hr_attendance/wizard/hr_attendance_sign_in_out.py
deleted file mode 100644
index 0ad4323ad78..00000000000
--- a/addons/hr_attendance/wizard/hr_attendance_sign_in_out.py
+++ /dev/null
@@ -1,184 +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/>.
-#
-##############################################################################
-import time
-
-from osv import osv, fields
-from tools.translate import _
-
-class hr_si_so_ask(osv.osv_memory):
-    _name = 'hr.sign.in.out.ask'
-    _description = 'Ask for Sign In Out'
-    _columns = {
-        'name': fields.char('Employees name', size=32, required=True, readonly=True),
-        'last_time': fields.datetime('Your last sign out', required=True),
-        'emp_id': fields.many2one('hr.employee', 'Empoyee ID', readonly=True),
-        }
-
-    def _get_empname(self, cr, uid, context=None):
-        emp_id = context.get('emp_id', self.pool.get('hr.employee').search(cr, uid, [('user_id', '=', uid)], context=context))
-        if emp_id:
-            employee = self.pool.get('hr.employee').browse(cr, uid, emp_id, context=context)[0].name
-            return employee
-        return ''
-
-    def _get_empid(self, cr, uid, context=None):
-        emp_id = context.get('emp_id', self.pool.get('hr.employee').search(cr, uid, [('user_id', '=', uid)], context=context))
-        if emp_id:
-            return emp_id[0]
-        return False
-
-    _defaults = {
-         'name': _get_empname,
-         'emp_id': _get_empid,
-                 }
-
-    def sign_in(self, cr, uid, ids, context=None):
-        data = self.read(cr, uid, ids, [], context=context)[0]
-        data['emp_id'] = data['emp_id'] and data['emp_id'][0]
-        return self.pool.get('hr.sign.in.out').sign_in(cr, uid, data, context)
-
-    def sign_out(self, cr, uid, ids, context=None):
-        data = self.read(cr, uid, ids, [], context=context)[0]
-        data['emp_id'] = data['emp_id'] and data['emp_id'][0]
-        return self.pool.get('hr.sign.in.out').sign_out(cr, uid, data, context)
-
-hr_si_so_ask()
-
-class hr_sign_in_out(osv.osv_memory):
-    _name = 'hr.sign.in.out'
-    _description = 'Sign In Sign Out'
-
-    _columns = {
-        'name': fields.char('Employees name', size=32, required=True, readonly=True),
-        'state': fields.char('Current state', size=32, required=True, readonly=True),
-        'emp_id': fields.many2one('hr.employee', 'Empoyee ID', readonly=True),
-                }
-
-    def _get_empid(self, cr, uid, context=None):
-        emp_id = context.get('emp_id', self.pool.get('hr.employee').search(cr, uid, [('user_id', '=', uid)], context=context))
-        if emp_id:
-            employee = self.pool.get('hr.employee').browse(cr, uid, emp_id, context=context)[0]
-            return {'name': employee.name, 'state': employee.state, 'emp_id': emp_id[0]}
-        return {}
-
-    def default_get(self, cr, uid, fields_list, context=None):
-        res = super(hr_sign_in_out, self).default_get(cr, uid, fields_list, context=context)
-        res_emp = self._get_empid(cr, uid, context=context)
-        res.update(res_emp)
-        return res
-
-    def si_check(self, cr, uid, ids, context=None):
-        obj_model = self.pool.get('ir.model.data')
-        att_obj = self.pool.get('hr.attendance')
-        data = self.read(cr, uid, ids, [], context=context)[0]
-        data['emp_id'] = data['emp_id'] and data['emp_id'][0]
-        emp_id = data['emp_id']
-        att_id = att_obj.search(cr, uid, [('employee_id', '=', emp_id)], limit=1, order='name desc')
-        last_att = att_obj.browse(cr, uid, att_id, context=context)
-        if last_att:
-            last_att = last_att[0]
-        cond = not last_att or last_att.action == 'sign_out'
-        if cond:
-            return self.sign_in(cr, uid, data, context)
-        else:
-            model_data_ids = obj_model.search(cr,uid,[('model','=','ir.ui.view'),('name','=','view_hr_attendance_so_ask')], context=context)
-            resource_id = obj_model.read(cr, uid, model_data_ids, fields=['res_id'], context=context)[0]['res_id']
-            return {
-                'name': _('Sign in / Sign out'),
-                'view_type': 'form',
-                'view_mode': 'tree,form',
-                'res_model': 'hr.sign.in.out.ask',
-                'views': [(resource_id,'form')],
-                'type': 'ir.actions.act_window',
-                'context': context,
-                'target': 'new',
-            }
-
-    def so_check(self, cr, uid, ids, context=None):
-        obj_model = self.pool.get('ir.model.data')
-        att_obj = self.pool.get('hr.attendance')
-        data = self.read(cr, uid, ids, [], context=context)[0]
-        data['emp_id'] = data['emp_id'] and data['emp_id'][0]
-        emp_id = data['emp_id']
-        att_id = att_obj.search(cr, uid, [('employee_id', '=', emp_id),('action', '!=', 'action')], limit=1, order='name desc')
-        last_att = att_obj.browse(cr, uid, att_id, context=context)
-        if last_att:
-            last_att = last_att[0]
-        if not att_id and not last_att:
-            model_data_ids = obj_model.search(cr, uid, [('model','=','ir.ui.view'),('name','=','view_hr_attendance_message')], context=context)
-            resource_id = obj_model.read(cr, uid, model_data_ids, fields=['res_id'], context=context)[0]['res_id']
-            return {
-                'name': _('Sign in / Sign out'),
-                'view_type': 'form',
-                'view_mode': 'tree,form',
-                'res_model': 'hr.sign.in.out',
-                'views': [(resource_id,'form')],
-                'type': 'ir.actions.act_window',
-                'context': context,
-                'target': 'new',
-            }
-
-        cond = last_att and last_att['action'] == 'sign_in'
-        if cond:
-            return self.sign_out(cr, uid, data, context)
-        else:
-            model_data_ids = obj_model.search(cr, uid, [('model','=','ir.ui.view'),('name','=','view_hr_attendance_si_ask')], context=context)
-            resource_id = obj_model.read(cr, uid, model_data_ids, fields=['res_id'], context=context)[0]['res_id']
-            return {
-                'name': _('Sign in / Sign out'),
-                'view_type': 'form',
-                'view_mode': 'tree,form',
-                'res_model': 'hr.sign.in.out.ask',
-                'views': [(resource_id,'form')],
-                'type': 'ir.actions.act_window',
-                'target': 'new',
-            }
-
-    def sign_in(self, cr, uid, data, context=None):
-        if context is None:
-            context = {}
-        emp_id = data['emp_id']
-        if 'last_time' in data:
-            if data['last_time'] > time.strftime('%Y-%m-%d %H:%M:%S'):
-                raise osv.except_osv(_('User Error!'), _('The sign-out date must be in the past.'))
-            self.pool.get('hr.attendance').create(cr, uid, {'name': data['last_time'], 'action': 'sign_out',
-                'employee_id': emp_id}, context=context)
-        try:
-            self.pool.get('hr.employee').attendance_action_change(cr, uid, [emp_id], 'sign_in')
-        except:
-            raise osv.except_osv(_('User Error!'), _('A sign-in must be right after a sign-out!'))
-        return {'type': 'ir.actions.act_window_close'} # To do: Return Success message
-
-    def sign_out(self, cr, uid, data, context=None):
-        emp_id = data['emp_id']
-        if 'last_time' in data:
-            if data['last_time'] > time.strftime('%Y-%m-%d %H:%M:%S'):
-                raise osv.except_osv(_('User Error!'), _('The sign-in date must be in the past.'))
-            self.pool.get('hr.attendance').create(cr, uid, {'name':data['last_time'], 'action':'sign_in',  'employee_id':emp_id}, context=context)
-        try:
-            self.pool.get('hr.employee').attendance_action_change(cr, uid, [emp_id], 'sign_out')
-        except:
-            raise osv.except_osv(_('User Error!'), _('A sign-out must be right after a sign-in.'))
-        return {'type': 'ir.actions.act_window_close'} # To do: Return Success message
-
-hr_sign_in_out()
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr_attendance/wizard/hr_attendance_sign_in_out_view.xml b/addons/hr_attendance/wizard/hr_attendance_sign_in_out_view.xml
deleted file mode 100644
index 5c84be5107f..00000000000
--- a/addons/hr_attendance/wizard/hr_attendance_sign_in_out_view.xml
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-        <record id="view_hr_attendance_sigh_in_out" model="ir.ui.view">
-            <field name="name">hr.sign.in.out.form</field>
-            <field name="model">hr.sign.in.out</field>
-            <field name="arch" type="xml">
-                <form string="Sign in / Sign out" version="7.0">
-                    <group>
-                        <separator colspan="4" string="Sign in / Sign out"/>
-                        <label colspan="4" nolabel="1" string="If you need your staff to sign in when they arrive at work and sign out again at the end of the day, OpenERP allows you to manage this with this tool. If each employee has been linked to a system user, then they can encode their time with this action button."/>
-                        <newline/>
-                    </group>
-                    <group colspan="4" >
-                    <field name="name" />
-                    <field name="state" />
-                    </group>
-                    <footer>
-                        <button string="Sign in" name="si_check" type="object" class="oe_highlight"/>
-                        <button string="Sign out" name="so_check" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </footer>
-               </form>
-            </field>
-        </record>
-
-       <record id="view_hr_attendance_message" model="ir.ui.view">
-            <field name="name">hr.sign.in.out.form</field>
-            <field name="model">hr.sign.in.out</field>
-            <field name="arch" type="xml">
-                <form string="Sign in / Sign out" version="7.0">
-                    <separator string="Sign-out Entry Must Follow Sign-in." colspan="4" />
-               </form>
-            </field>
-        </record>
-
-        <record id="action_hr_attendance_sigh_in_out" model="ir.actions.act_window">
-            <field name="name">Sign in / Sign out</field>
-            <field name="res_model">hr.sign.in.out</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-           <field name="view_id" ref="view_hr_attendance_sigh_in_out"/>
-           <field name="target">new</field>
-           <field name="help">Sign in / Sign out. In some companies, staff have to sign in when they arrive at work and sign out again at the end of the day. If each employee has been linked to a system user, then they can encode their time with this action button.</field>
-        </record>
-
-        <menuitem action="action_hr_attendance_sigh_in_out" id="menu_hr_attendance_sigh_in_out"
-            parent="menu_hr_attendance" sequence="4"/>
-
-       <record id="view_hr_attendance_so_ask" model="ir.ui.view">
-            <field name="name">hr.sign.in.out.ask.form</field>
-            <field name="model">hr.sign.in.out.ask</field>
-            <field name="arch" type="xml">
-                <form string="hr.sign.out.ask" version="7.0">
-                    <header>
-                        <button string="Sign in" name="sign_in" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
-                    <group colspan="4" >
-                    <separator string="You did not sign out the last time. Please enter the date and time you signed out." colspan="4" />
-                    <field name="name" />
-                    <field name="last_time" string="Your last sign out" />
-                    </group>
-               </form>
-            </field>
-        </record>
-
-       <record id="view_hr_attendance_si_ask" model="ir.ui.view">
-            <field name="name">hr.sign.in.out.ask.form</field>
-            <field name="model">hr.sign.in.out.ask</field>
-            <field name="arch" type="xml">
-                <form string="hr.sign.in.out.ask" version="7.0">
-                    <header>
-                        <button string="Sign out" name="sign_out" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
-                    <group colspan="4" >
-                    <separator string="You did not sign in the last time. Please enter the date and time you signed in." colspan="4" />
-                    <field name="name" />
-                    <field name="last_time" string="Your last sign in" />
-                    </group>
-               </form>
-            </field>
-        </record>
-
-    </data>
-</openerp>
diff --git a/addons/hr_contract/__openerp__.py b/addons/hr_contract/__openerp__.py
index 766ec803b75..98f6162778a 100644
--- a/addons/hr_contract/__openerp__.py
+++ b/addons/hr_contract/__openerp__.py
@@ -21,7 +21,7 @@
 
 
 {
-    'name': "Employee Contracts",
+    'name': 'Employee Contracts',
     'version': '1.0',
     'category': 'Human Resources',
     'description': """
@@ -39,15 +39,13 @@ You can assign several contracts per employee.
     'website': 'http://www.openerp.com',
     'images': ['images/hr_contract.jpeg'],
     'depends': ['hr'],
-    'init_xml': ['hr_contract_data.xml'],
-    'update_xml': [
+    'data': [
         'security/ir.model.access.csv',
-        'hr_contract_view.xml'
-        ],
-    'demo_xml': [],
-    'test': [
-             'test/test_hr_contract.yml'
-             ],
+        'hr_contract_view.xml',
+        'hr_contract_data.xml'
+    ],
+    'demo': [],
+    'test': ['test/test_hr_contract.yml'],
     'installable': True,
     'auto_install': False,
     'certificate': '0046298028637',
diff --git a/addons/hr_contract/hr_contract_view.xml b/addons/hr_contract/hr_contract_view.xml
index 10620cb9a4b..92ae2524921 100644
--- a/addons/hr_contract/hr_contract_view.xml
+++ b/addons/hr_contract/hr_contract_view.xml
@@ -1,7 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
+        
+        
+<!-- Contracts Button on Employee Form -->
 
+        <act_window
+        context="{'search_default_employee_id': [active_id], 'default_employee_id': active_id}"
+        id="act_hr_employee_2_hr_contract"
+        name="Contracts"
+        res_model="hr.contract"
+        src_model="hr.employee"
+        groups="base.group_hr_manager"/>
+        
         <menuitem id="next_id_56" name="Contract" parent="hr.menu_hr_configuration" sequence="30" groups="base.group_no_one"/>
         <record id="hr_hr_employee_view_form2" model="ir.ui.view">
             <field name="name">hr.hr.employee.view.form2</field>
@@ -9,19 +20,20 @@
             <field name="inherit_id" ref="hr.view_employee_form"/>
             <field name="arch" type="xml">
                 <data>
-                    <xpath expr="//field[@name='parent_id']" position="before">
+                    <xpath expr="//div[@name='button_box']" position="inside">
+                        <button name="%(act_hr_employee_2_hr_contract)d" string="Contracts" type="action"/>
+                    </xpath>
+                    <xpath expr="//field[@name='coach_id']" position="after">
                         <field name="manager"/>
                     </xpath>
                     <xpath expr="//group[@name='active_group']" position="before">
-                        <group>
+                        <group string="Contract">
+                            <field name="medic_exam" string="Medical Exam"/>
                             <field name="vehicle"/>
                             <field name="vehicle_distance"/>
                         </group>
                     </xpath>
-                    <field name="active" position="before">
-                        <field name="medic_exam" string="Medical Exam"/>
-                    </field>
-                    <field name="birthday" position="before">
+                    <field name="marital" position="after">
                         <field name="children"/>
                     </field>
                     <field name="birthday" position="after">
@@ -177,15 +189,5 @@
         <menuitem action="action_hr_contract_type" id="hr_menu_contract_type" parent="next_id_56" sequence="6" groups="base.group_no_one"/>
         <menuitem action="action_hr_contract" id="hr_menu_contract" parent="hr.menu_hr_main" name="Contracts" sequence="4" groups="base.group_hr_manager"/>
 
-        <!-- Contracts Button on Employee Form -->
-
-        <act_window
-        context="{'search_default_employee_id': [active_id], 'default_employee_id': active_id}"
-        id="act_hr_employee_2_hr_contract"
-        name="Contracts"
-        res_model="hr.contract"
-        src_model="hr.employee"
-        groups="base.group_hr_manager"/>
-
     </data>
 </openerp>
diff --git a/addons/hr_contract/i18n/ar.po b/addons/hr_contract/i18n/ar.po
index 133e26f6525..79572703510 100644
--- a/addons/hr_contract/i18n/ar.po
+++ b/addons/hr_contract/i18n/ar.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:50+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:22+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_contract
 #: field:hr.contract,wage:0
diff --git a/addons/hr_contract/i18n/bg.po b/addons/hr_contract/i18n/bg.po
index be6d31fc273..5d192817783 100644
--- a/addons/hr_contract/i18n/bg.po
+++ b/addons/hr_contract/i18n/bg.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:50+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:22+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_contract
 #: field:hr.contract,wage:0
diff --git a/addons/hr_contract/i18n/bs.po b/addons/hr_contract/i18n/bs.po
index cd3d722fed3..def5f0c96ff 100644
--- a/addons/hr_contract/i18n/bs.po
+++ b/addons/hr_contract/i18n/bs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:50+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:22+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_contract
 #: field:hr.contract,wage:0
diff --git a/addons/hr_contract/i18n/ca.po b/addons/hr_contract/i18n/ca.po
index 84988845118..62dcbb46e12 100644
--- a/addons/hr_contract/i18n/ca.po
+++ b/addons/hr_contract/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:50+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:22+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_contract
 #: field:hr.contract,wage:0
diff --git a/addons/hr_contract/i18n/cs.po b/addons/hr_contract/i18n/cs.po
index cb2befabac9..e9a9d8e71c0 100644
--- a/addons/hr_contract/i18n/cs.po
+++ b/addons/hr_contract/i18n/cs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:50+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:22+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 "X-Poedit-Language: Czech\n"
 
 #. module: hr_contract
diff --git a/addons/hr_contract/i18n/da.po b/addons/hr_contract/i18n/da.po
index a78c81d95fa..b84e726c057 100644
--- a/addons/hr_contract/i18n/da.po
+++ b/addons/hr_contract/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:50+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:22+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_contract
 #: field:hr.contract,wage:0
diff --git a/addons/hr_contract/i18n/de.po b/addons/hr_contract/i18n/de.po
index 7b468b12f4e..a394ec6dabd 100644
--- a/addons/hr_contract/i18n/de.po
+++ b/addons/hr_contract/i18n/de.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:50+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:22+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_contract
 #: field:hr.contract,wage:0
diff --git a/addons/hr_contract/i18n/el.po b/addons/hr_contract/i18n/el.po
index 0d02e35078f..ad041022e55 100644
--- a/addons/hr_contract/i18n/el.po
+++ b/addons/hr_contract/i18n/el.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:50+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:22+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
 "X-Poedit-SourceCharset: utf-8\n"
diff --git a/addons/hr_contract/i18n/es.po b/addons/hr_contract/i18n/es.po
index 0258090f1d4..22d7599e612 100644
--- a/addons/hr_contract/i18n/es.po
+++ b/addons/hr_contract/i18n/es.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:50+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:22+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_contract
 #: field:hr.contract,wage:0
diff --git a/addons/hr_contract/i18n/es_AR.po b/addons/hr_contract/i18n/es_AR.po
index f20e81f4666..65c9a7621e6 100644
--- a/addons/hr_contract/i18n/es_AR.po
+++ b/addons/hr_contract/i18n/es_AR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:51+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:22+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_contract
 #: field:hr.contract,wage:0
diff --git a/addons/hr_contract/i18n/es_CR.po b/addons/hr_contract/i18n/es_CR.po
index 367e76ce334..0e3b27423c1 100644
--- a/addons/hr_contract/i18n/es_CR.po
+++ b/addons/hr_contract/i18n/es_CR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:51+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:22+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 "Language: \n"
 
 #. module: hr_contract
diff --git a/addons/hr_contract/i18n/es_EC.po b/addons/hr_contract/i18n/es_EC.po
index fc6a8e99cb6..41b076829e8 100644
--- a/addons/hr_contract/i18n/es_EC.po
+++ b/addons/hr_contract/i18n/es_EC.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:51+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:22+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_contract
 #: field:hr.contract,wage:0
diff --git a/addons/hr_contract/i18n/es_PY.po b/addons/hr_contract/i18n/es_PY.po
index 537bc8a6feb..70e290a92e8 100644
--- a/addons/hr_contract/i18n/es_PY.po
+++ b/addons/hr_contract/i18n/es_PY.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:51+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:22+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_contract
 #: field:hr.contract,wage:0
diff --git a/addons/hr_contract/i18n/et.po b/addons/hr_contract/i18n/et.po
index ee70410833b..3611e31a2fe 100644
--- a/addons/hr_contract/i18n/et.po
+++ b/addons/hr_contract/i18n/et.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:50+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:22+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_contract
 #: field:hr.contract,wage:0
diff --git a/addons/hr_contract/i18n/fi.po b/addons/hr_contract/i18n/fi.po
index 37f4bdd836e..f2f9eb1379c 100644
--- a/addons/hr_contract/i18n/fi.po
+++ b/addons/hr_contract/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:50+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:22+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_contract
 #: field:hr.contract,wage:0
diff --git a/addons/hr_contract/i18n/fr.po b/addons/hr_contract/i18n/fr.po
index 07cb6663104..4888c86cf8c 100644
--- a/addons/hr_contract/i18n/fr.po
+++ b/addons/hr_contract/i18n/fr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:50+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:22+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_contract
 #: field:hr.contract,wage:0
diff --git a/addons/hr_contract/i18n/gl.po b/addons/hr_contract/i18n/gl.po
index 3e13175bf0d..b5bf52009fb 100644
--- a/addons/hr_contract/i18n/gl.po
+++ b/addons/hr_contract/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:50+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:22+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_contract
 #: field:hr.contract,wage:0
diff --git a/addons/hr_contract/i18n/gu.po b/addons/hr_contract/i18n/gu.po
index dd66082ed23..79e6d111977 100644
--- a/addons/hr_contract/i18n/gu.po
+++ b/addons/hr_contract/i18n/gu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:50+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:22+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_contract
 #: field:hr.contract,wage:0
diff --git a/addons/hr_contract/i18n/hi.po b/addons/hr_contract/i18n/hi.po
index 40452b480cd..a61f3f6f49d 100644
--- a/addons/hr_contract/i18n/hi.po
+++ b/addons/hr_contract/i18n/hi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:50+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:22+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_contract
 #: field:hr.contract,wage:0
diff --git a/addons/hr_contract/i18n/hr.po b/addons/hr_contract/i18n/hr.po
index 8dfcec6be84..098d4128af4 100644
--- a/addons/hr_contract/i18n/hr.po
+++ b/addons/hr_contract/i18n/hr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:50+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:22+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_contract
 #: field:hr.contract,wage:0
diff --git a/addons/hr_contract/i18n/hu.po b/addons/hr_contract/i18n/hu.po
index 86a0a977ce1..ec7f222fbf7 100644
--- a/addons/hr_contract/i18n/hu.po
+++ b/addons/hr_contract/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:50+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:22+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_contract
 #: field:hr.contract,wage:0
diff --git a/addons/hr_contract/i18n/id.po b/addons/hr_contract/i18n/id.po
index 7dd17005f68..317fe622f70 100644
--- a/addons/hr_contract/i18n/id.po
+++ b/addons/hr_contract/i18n/id.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:50+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:22+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_contract
 #: field:hr.contract,wage:0
diff --git a/addons/hr_contract/i18n/it.po b/addons/hr_contract/i18n/it.po
index 8ac0d74ef84..8c31287322c 100644
--- a/addons/hr_contract/i18n/it.po
+++ b/addons/hr_contract/i18n/it.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:50+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:22+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_contract
 #: field:hr.contract,wage:0
diff --git a/addons/hr_contract/i18n/ja.po b/addons/hr_contract/i18n/ja.po
index 6e8451caeb7..fb30540bdde 100644
--- a/addons/hr_contract/i18n/ja.po
+++ b/addons/hr_contract/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:50+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:22+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_contract
 #: field:hr.contract,wage:0
diff --git a/addons/hr_contract/i18n/ko.po b/addons/hr_contract/i18n/ko.po
index 173901b3a2a..590c14b754a 100644
--- a/addons/hr_contract/i18n/ko.po
+++ b/addons/hr_contract/i18n/ko.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:50+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:22+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_contract
 #: field:hr.contract,wage:0
diff --git a/addons/hr_contract/i18n/lo.po b/addons/hr_contract/i18n/lo.po
index 719455e7330..27e4c51fc4b 100644
--- a/addons/hr_contract/i18n/lo.po
+++ b/addons/hr_contract/i18n/lo.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:50+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:22+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_contract
 #: field:hr.contract,wage:0
diff --git a/addons/hr_contract/i18n/lt.po b/addons/hr_contract/i18n/lt.po
index 413eb266b34..c790caeabd9 100644
--- a/addons/hr_contract/i18n/lt.po
+++ b/addons/hr_contract/i18n/lt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:50+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:22+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_contract
 #: field:hr.contract,wage:0
diff --git a/addons/hr_contract/i18n/lv.po b/addons/hr_contract/i18n/lv.po
index 89425ba1419..ee9c96c2970 100644
--- a/addons/hr_contract/i18n/lv.po
+++ b/addons/hr_contract/i18n/lv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:50+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:22+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_contract
 #: field:hr.contract,wage:0
diff --git a/addons/hr_contract/i18n/mn.po b/addons/hr_contract/i18n/mn.po
index b1dc0846c03..315a74b199d 100644
--- a/addons/hr_contract/i18n/mn.po
+++ b/addons/hr_contract/i18n/mn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:50+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:22+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_contract
 #: field:hr.contract,wage:0
diff --git a/addons/hr_contract/i18n/nb.po b/addons/hr_contract/i18n/nb.po
new file mode 100644
index 00000000000..9d1886e3ed4
--- /dev/null
+++ b/addons/hr_contract/i18n/nb.po
@@ -0,0 +1,270 @@
+# Norwegian Bokmal 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-02-08 00:36+0000\n"
+"PO-Revision-Date: 2012-09-08 18:49+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Norwegian Bokmal <nb@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-09-09 04:52+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
+
+#. module: hr_contract
+#: field:hr.contract,wage:0
+msgid "Wage"
+msgstr "Lønn"
+
+#. module: hr_contract
+#: view:hr.contract:0
+msgid "Information"
+msgstr "Informasjon"
+
+#. module: hr_contract
+#: view:hr.contract:0
+msgid "Trial Period"
+msgstr "Prøveperiode"
+
+#. module: hr_contract
+#: field:hr.contract,trial_date_start:0
+msgid "Trial Start Date"
+msgstr "Prøve Startdato"
+
+#. module: hr_contract
+#: view:hr.employee:0
+msgid "Medical Examination"
+msgstr "Legeundersøkelse"
+
+#. module: hr_contract
+#: field:hr.employee,vehicle:0
+msgid "Company Vehicle"
+msgstr "Selskapets Kjøretøy."
+
+#. module: hr_contract
+#: view:hr.employee:0
+msgid "Miscellaneous"
+msgstr "Diverse"
+
+#. module: hr_contract
+#: view:hr.contract:0
+msgid "Current"
+msgstr "Nåværende"
+
+#. module: hr_contract
+#: view:hr.contract:0
+msgid "Group By..."
+msgstr "Grupper etter ..."
+
+#. module: hr_contract
+#: field:hr.contract,department_id:0
+msgid "Department"
+msgstr "Avdeling"
+
+#. module: hr_contract
+#: view:hr.contract:0
+msgid "Overpassed"
+msgstr "Overpassert"
+
+#. 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 "Ansatt"
+
+#. module: hr_contract
+#: view:hr.contract:0
+msgid "Search Contract"
+msgstr "Søk Kontrakt"
+
+#. module: hr_contract
+#: view:hr.contract:0
+msgid "Contracts in progress"
+msgstr "Kontrakter i fremgang"
+
+#. module: hr_contract
+#: field:hr.employee,vehicle_distance:0
+msgid "Home-Work Distance"
+msgstr "Hjem-arbeid Avstand."
+
+#. module: hr_contract
+#: view:hr.contract: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 "Kontrakter"
+
+#. module: hr_contract
+#: view:hr.employee:0
+msgid "Personal Info"
+msgstr "Personlig Info"
+
+#. module: hr_contract
+#: view:hr.contract:0
+msgid "Contracts whose end date already passed"
+msgstr "Kontrakter som sluttdato har allerede passert."
+
+#. module: hr_contract
+#: help:hr.employee,contract_id:0
+msgid "Latest contract of the employee"
+msgstr "Siste kontrakten av den ansatte"
+
+#. module: hr_contract
+#: view:hr.contract:0
+msgid "Job"
+msgstr "Jobb"
+
+#. module: hr_contract
+#: view:hr.contract:0
+#: field:hr.contract,advantages:0
+msgid "Advantages"
+msgstr "Fordeler"
+
+#. module: hr_contract
+#: view:hr.contract:0
+msgid "Valid for"
+msgstr "Gyldig for."
+
+#. module: hr_contract
+#: view:hr.contract:0
+msgid "Work Permit"
+msgstr "Arbeidstillatelse"
+
+#. module: hr_contract
+#: field:hr.employee,children:0
+msgid "Number of Children"
+msgstr "Antall barn"
+
+#. 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 "Kontrakt typer."
+
+#. module: hr_contract
+#: constraint:hr.employee:0
+msgid "Error ! You cannot create recursive Hierarchy of Employees."
+msgstr "Feil! Du kan ikke opprette rekursiv Hierarki av ansatte."
+
+#. module: hr_contract
+#: field:hr.contract,date_end:0
+msgid "End Date"
+msgstr "Sluttdato"
+
+#. module: hr_contract
+#: help:hr.contract,wage:0
+msgid "Basic Salary of the employee"
+msgstr "Grunnlønn for den ansatte."
+
+#. module: hr_contract
+#: field:hr.contract,name:0
+msgid "Contract Reference"
+msgstr "Kontrakt referanse."
+
+#. module: hr_contract
+#: help:hr.employee,vehicle_distance:0
+msgid "In kilometers"
+msgstr "I kilometer."
+
+#. module: hr_contract
+#: view:hr.contract:0
+#: field:hr.contract,notes:0
+msgid "Notes"
+msgstr "Notater"
+
+#. module: hr_contract
+#: field:hr.contract,permit_no:0
+msgid "Work Permit No"
+msgstr "Arbeidstillatelse Ingen."
+
+#. module: hr_contract
+#: view:hr.contract: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 "Kontrakt"
+
+#. 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 "Kontrakt type."
+
+#. module: hr_contract
+#: view:hr.contract:0
+#: field:hr.contract,working_hours:0
+msgid "Working Schedule"
+msgstr "Arbeidsplan"
+
+#. module: hr_contract
+#: view:hr.employee:0
+msgid "Job Info"
+msgstr "Jobb informasjon."
+
+#. module: hr_contract
+#: field:hr.contract,visa_expire:0
+msgid "Visa Expire Date"
+msgstr "Visa utløpsdato."
+
+#. module: hr_contract
+#: field:hr.contract,job_id:0
+msgid "Job Title"
+msgstr "Jobb Tittel"
+
+#. module: hr_contract
+#: field:hr.employee,manager:0
+msgid "Is a Manager"
+msgstr "Er en leder."
+
+#. module: hr_contract
+#: field:hr.contract,date_start:0
+msgid "Start Date"
+msgstr "Startdato"
+
+#. module: hr_contract
+#: constraint:hr.contract:0
+msgid "Error! contract start-date must be lower then contract end-date."
+msgstr "Feil! Kontrakten startdato må være lavere enn kontrakt sluttdato."
+
+#. module: hr_contract
+#: field:hr.contract,visa_no:0
+msgid "Visa No"
+msgstr "Visa Nei."
+
+#. module: hr_contract
+#: field:hr.employee,place_of_birth:0
+msgid "Place of Birth"
+msgstr "Fødested"
+
+#. module: hr_contract
+#: view:hr.contract:0
+msgid "Duration"
+msgstr "Varighet"
+
+#. module: hr_contract
+#: field:hr.employee,medic_exam:0
+msgid "Medical Examination Date"
+msgstr "Legeundersøkelse Dato"
+
+#. module: hr_contract
+#: field:hr.contract,trial_date_end:0
+msgid "Trial End Date"
+msgstr "Prøve Sluttdato ."
+
+#. module: hr_contract
+#: view:hr.contract.type:0
+msgid "Search Contract Type"
+msgstr "Søk Kontraktstype"
diff --git a/addons/hr_contract/i18n/nl.po b/addons/hr_contract/i18n/nl.po
index 7cc2688ab79..a2b929472ae 100644
--- a/addons/hr_contract/i18n/nl.po
+++ b/addons/hr_contract/i18n/nl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:50+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:22+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_contract
 #: field:hr.contract,wage:0
diff --git a/addons/hr_contract/i18n/nl_BE.po b/addons/hr_contract/i18n/nl_BE.po
index 8b024691cff..4d93ed77d4a 100644
--- a/addons/hr_contract/i18n/nl_BE.po
+++ b/addons/hr_contract/i18n/nl_BE.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:51+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:22+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_contract
 #: field:hr.contract,wage:0
diff --git a/addons/hr_contract/i18n/pl.po b/addons/hr_contract/i18n/pl.po
index dacfbe7e1c4..25f883d102d 100644
--- a/addons/hr_contract/i18n/pl.po
+++ b/addons/hr_contract/i18n/pl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:50+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:22+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_contract
 #: field:hr.contract,wage:0
diff --git a/addons/hr_contract/i18n/pt.po b/addons/hr_contract/i18n/pt.po
index cd21cc86917..01490a4dcd1 100644
--- a/addons/hr_contract/i18n/pt.po
+++ b/addons/hr_contract/i18n/pt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:50+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:22+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_contract
 #: field:hr.contract,wage:0
diff --git a/addons/hr_contract/i18n/pt_BR.po b/addons/hr_contract/i18n/pt_BR.po
index a97d3021069..aa306ecf9c3 100644
--- a/addons/hr_contract/i18n/pt_BR.po
+++ b/addons/hr_contract/i18n/pt_BR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:50+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:22+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_contract
 #: field:hr.contract,wage:0
diff --git a/addons/hr_contract/i18n/ro.po b/addons/hr_contract/i18n/ro.po
index 0e3107175ed..3fc49531ebb 100644
--- a/addons/hr_contract/i18n/ro.po
+++ b/addons/hr_contract/i18n/ro.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:50+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:22+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_contract
 #: field:hr.contract,wage:0
diff --git a/addons/hr_contract/i18n/ru.po b/addons/hr_contract/i18n/ru.po
index bf5eb3324b4..6e695678e60 100644
--- a/addons/hr_contract/i18n/ru.po
+++ b/addons/hr_contract/i18n/ru.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:50+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:22+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_contract
 #: field:hr.contract,wage:0
diff --git a/addons/hr_contract/i18n/sl.po b/addons/hr_contract/i18n/sl.po
index b7930343cad..2df3d2f917f 100644
--- a/addons/hr_contract/i18n/sl.po
+++ b/addons/hr_contract/i18n/sl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:50+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:22+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_contract
 #: field:hr.contract,wage:0
diff --git a/addons/hr_contract/i18n/sq.po b/addons/hr_contract/i18n/sq.po
index 0410b887166..e0b937048dc 100644
--- a/addons/hr_contract/i18n/sq.po
+++ b/addons/hr_contract/i18n/sq.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:50+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:22+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_contract
 #: field:hr.contract,wage:0
diff --git a/addons/hr_contract/i18n/sr.po b/addons/hr_contract/i18n/sr.po
index 62d10ccd1cb..b9ddf227a53 100644
--- a/addons/hr_contract/i18n/sr.po
+++ b/addons/hr_contract/i18n/sr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:50+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:22+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_contract
 #: field:hr.contract,wage:0
diff --git a/addons/hr_contract/i18n/sr@latin.po b/addons/hr_contract/i18n/sr@latin.po
index 63fec6d0c21..fc12c496031 100644
--- a/addons/hr_contract/i18n/sr@latin.po
+++ b/addons/hr_contract/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:51+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:22+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_contract
 #: field:hr.contract,wage:0
diff --git a/addons/hr_contract/i18n/sv.po b/addons/hr_contract/i18n/sv.po
index 2817a19cc83..27fa2935558 100644
--- a/addons/hr_contract/i18n/sv.po
+++ b/addons/hr_contract/i18n/sv.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:50+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:22+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_contract
 #: field:hr.contract,wage:0
diff --git a/addons/hr_contract/i18n/tlh.po b/addons/hr_contract/i18n/tlh.po
index e14adf66883..afe7bd4c473 100644
--- a/addons/hr_contract/i18n/tlh.po
+++ b/addons/hr_contract/i18n/tlh.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:50+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:22+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_contract
 #: field:hr.contract,wage:0
diff --git a/addons/hr_contract/i18n/tr.po b/addons/hr_contract/i18n/tr.po
index 7f56484eeda..9dd32d4595f 100644
--- a/addons/hr_contract/i18n/tr.po
+++ b/addons/hr_contract/i18n/tr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:50+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:22+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_contract
 #: field:hr.contract,wage:0
diff --git a/addons/hr_contract/i18n/uk.po b/addons/hr_contract/i18n/uk.po
index 39f5d7039a9..d5493ea17f6 100644
--- a/addons/hr_contract/i18n/uk.po
+++ b/addons/hr_contract/i18n/uk.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:50+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:22+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_contract
 #: field:hr.contract,wage:0
diff --git a/addons/hr_contract/i18n/vi.po b/addons/hr_contract/i18n/vi.po
index 23caf5ff1e4..b781be76cf9 100644
--- a/addons/hr_contract/i18n/vi.po
+++ b/addons/hr_contract/i18n/vi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:50+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:22+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_contract
 #: field:hr.contract,wage:0
diff --git a/addons/hr_contract/i18n/zh_CN.po b/addons/hr_contract/i18n/zh_CN.po
index 519a87d0584..c84e85d1ac8 100644
--- a/addons/hr_contract/i18n/zh_CN.po
+++ b/addons/hr_contract/i18n/zh_CN.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:51+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:22+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_contract
 #: field:hr.contract,wage:0
diff --git a/addons/hr_contract/i18n/zh_TW.po b/addons/hr_contract/i18n/zh_TW.po
index c36fa6987a0..d8b088eab93 100644
--- a/addons/hr_contract/i18n/zh_TW.po
+++ b/addons/hr_contract/i18n/zh_TW.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:51+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:22+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_contract
 #: field:hr.contract,wage:0
diff --git a/addons/hr_evaluation/__openerp__.py b/addons/hr_evaluation/__openerp__.py
index bb1322bccf3..4be0f94947c 100644
--- a/addons/hr_evaluation/__openerp__.py
+++ b/addons/hr_evaluation/__openerp__.py
@@ -20,15 +20,15 @@
 ##############################################################################
 
 {
-    "name" : "Employee Appraisals",
-    "version": "0.1",
-    "author": "OpenERP SA",
-    "category": "Human Resources",
-    "website": "http://www.openerp.com",
-    "summary": "Periodical Evaluations, Surveys",
-    "images": ["images/hr_evaluation_analysis.jpeg","images/hr_evaluation.jpeg"],
-    "depends": ["hr","base_calendar","survey"],
-    "description": """
+    'name' : 'Employee Appraisals',
+    'version': '0.1',
+    'author': 'OpenERP SA',
+    'category': 'Human Resources',
+    'website': 'http://www.openerp.com',
+    'summary': 'Periodical Evaluations, Surveys',
+    'images': ['images/hr_evaluation_analysis.jpeg','images/hr_evaluation.jpeg'],
+    'depends': ['hr','base_calendar','survey'],
+    'description': """
 Ability to create employees evaluation.
 =======================================
 
@@ -40,22 +40,21 @@ the employees can be viewed in the form of pdf file.
          """,
     "demo": ["hr_evaluation_demo.xml"],
     "data": [
-        "security/ir.model.access.csv",
-        "security/hr_evaluation_security.xml",
-#        "wizard/hr_evaluation_mail_view.xml",
-        "hr_evaluation_view.xml",
-        "report/hr_evaluation_report_view.xml",
-        "board_hr_evaluation_view.xml",
+        'security/ir.model.access.csv',
+        'security/hr_evaluation_security.xml',
+        'hr_evaluation_view.xml',
+        'report/hr_evaluation_report_view.xml',
+        'board_hr_evaluation_view.xml',
         'hr_evaluation_data.xml',
         'hr_evaluation_installer.xml',
     ],
-    "test": [
-        "test/test_hr_evaluation.yml",
-        "test/hr_evalution_demo.yml",
+    'test': [
+        'test/test_hr_evaluation.yml',
+        'test/hr_evalution_demo.yml',
     ],
-    "auto_install": False,
-    "installable": True,
-    "certificate" : "00883207679172998429",
+    'auto_install': False,
+    'installable': True,
+    'certificate' : '00883207679172998429',
     'application': True,
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr_evaluation/hr_evaluation.py b/addons/hr_evaluation/hr_evaluation.py
index def21f2b169..3508dc36d49 100644
--- a/addons/hr_evaluation/hr_evaluation.py
+++ b/addons/hr_evaluation/hr_evaluation.py
@@ -228,9 +228,13 @@ class hr_evaluation(osv.osv):
                         body = phase.mail_body % {'employee_name': child.name, 'user_signature': child.user_id.signature,
                             'eval_name': phase.survey_id.title, 'date': time.strftime('%Y-%m-%d'), 'time': time }
                         sub = phase.email_subject
-                        dest = [child.work_email]
-                        if dest:
-                           mail_message.schedule_with_attach(cr, uid, evaluation.employee_id.work_email, dest, sub, body, context=context)
+                        if child.work_email:
+                            vals = {'state': 'outgoing',
+                                    'subject': sub,
+                                    'body_html': '<pre>%s</pre>' % body,
+                                    'email_to': child.work_email,
+                                    'email_from': evaluation.employee_id.work_email}
+                            self.pool.get('mail.mail').create(cr, uid, vals, context=context)
 
         self.write(cr, uid, ids, {'state':'wait'}, context=context)
         return True
diff --git a/addons/hr_evaluation/hr_evaluation_data.xml b/addons/hr_evaluation/hr_evaluation_data.xml
index cf632a795cc..2cf656a72bb 100644
--- a/addons/hr_evaluation/hr_evaluation_data.xml
+++ b/addons/hr_evaluation/hr_evaluation_data.xml
@@ -14,12 +14,14 @@
             <field name="sequence">100</field>
         </record>
         <!-- notify all employees of module installation -->
-        <function model="mail.group" name="message_append_note">
-            <!-- ids, subject, body, parent_id=False, type='notification', content_subtype='html' -->
-            <value eval="[ref('mail.group_all_employees')]"/>
-            <value>Module Employee Appraisals has been installed</value>
-            <value>Create evaluations for your subordinates or manager. You can define a plan with several surveys, where you organize evaluation surveys related to the hierarchy levels. Evaluations filled by employees can exported as pdf files.</value>
-        </function>
+        <record model="mail.message" id="module_install_notification">
+            <field name="model">mail.group</field>
+            <field name="res_id" ref="mail.group_all_employees"/>
+            <field name="type">notification</field>
+            <field name="subject">Employee Appraisals application installed!</field>
+            <field name="body">Manage employee reviews: you can define an appraisal campaign with several steps, with specific evaluation surveys according to hierarchy levels.
+Evaluations filled by employees may be exported as pdf files.</field>
+        </record>
 
         <record id="survey_2" model="survey">
             <field name="title">Self Appraisal</field>
diff --git a/addons/hr_evaluation/hr_evaluation_view.xml b/addons/hr_evaluation/hr_evaluation_view.xml
index 47b0c323622..8744567c597 100644
--- a/addons/hr_evaluation/hr_evaluation_view.xml
+++ b/addons/hr_evaluation/hr_evaluation_view.xml
@@ -128,14 +128,12 @@
             <field name="model">hr.employee</field>
             <field name="inherit_id" ref="hr.view_employee_form"/>
             <field name="arch" type="xml">
-                <page string="Personal Information" position="after">
-                    <page string="Appraisal" groups="base.group_hr_user">
-                        <group col="4">
-                            <field name="evaluation_plan_id" on_change="onchange_evaluation_plan_id(evaluation_plan_id, evaluation_date)"/>
-                            <field name="evaluation_date"/>
-                        </group>
-                    </page>
-                </page>
+            <xpath expr="//group[@name='active_group']" position="before">
+                <group string="Appraisals">
+                    <field name="evaluation_plan_id" on_change="onchange_evaluation_plan_id(evaluation_plan_id, evaluation_date)"/>
+                    <field name="evaluation_date"/>
+                </group>
+            </xpath>
             </field>
         </record>
 
@@ -267,16 +265,27 @@
             <field name="arch" type="xml">
                 <form string="Interview Appraisal" version="7.0">
                     <header>
-                        <button string="Send Request" name="survey_req_waiting_answer" states="draft" type="object" icon="gtk-yes" class="oe_highlight"/>
-                        <button string="Done" name="survey_req_done" states="waiting_answer" type="object" icon="gtk-jump-to"/>
-                        <button string="Cancel" name="survey_req_cancel" states="draft,waiting_answer" type="object" icon="gtk-cancel"/>
-                        <button name="%(survey.action_view_survey_question_message)d" string="Answer Survey" type="action" states="waiting_answer,cancel" 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)]}" class="oe_highlight"/>
-                        <button name="action_print_survey" string="Print Survey" type="object" states="draft" icon="gtk-print" context="{'survey_id': survey_id, 'response_id': [response], 'response_no':0}" attrs="{'readonly':[('survey_id','=',False)]}" class="oe_highlight"/>
+                        <button string="Cancel" name="survey_req_cancel" type="object"
+                            states="draft,waiting_answer"/>
+                        <button string="Print Survey" name="action_print_survey"  type="object"
+                            states="draft" context="{'survey_id': survey_id, 'response_id': [response], 'response_no':0}"
+                            attrs="{'readonly':[('survey_id','=',False)]}" class="oe_highlight"/>
+                        <button string="Send Request" name="survey_req_waiting_answer" type="object"
+                            states="draft" class="oe_highlight"/>
+                        <button string="Answer Survey" name="%(survey.action_view_survey_question_message)d" type="action"
+                            states="waiting_answer"
+                            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)]}"/>
+                        <button string="Done" name="survey_req_done" type="object"
+                            states="waiting_answer"/>
                         <field name="state" widget="statusbar" statusbar_visible="waiting_answer,done"/>
                     </header>
                     <sheet>
                         <div class="oe_right oe_button_box" name="button_box">
-                            <button string="Send Reminder Email" name="%(mail.action_email_compose_message_wizard)d" icon="terp-mail-message-new" type="action" states="waiting_answer" class="oe_link"/>
+                            <button string="Send Reminder Email" name="%(mail.action_email_compose_message_wizard)d" type="action"
+                                states="waiting_answer"
+                                context="{'default_body_text': 'Hello,\n\nKindly post your response for the survey interview.\n\nThanks',
+                                            'default_subject': 'Reminder to fill up Survey' }"/>
                         </div>
                         <group>
                             <group col="3" colspan="1">
@@ -389,21 +398,23 @@
 
       <!-- Email Compose message Action-->
       <act_window
-      id="evaluation_reminders" name="Appraisal Reminders"
-      res_model="mail.compose.message"
-      src_model="hr.evaluation.interview"
-      view_type="form" view_mode="form"
-      target="new" multi="True"
-      key2="client_action_multi"
-      context="{'mail.compose.message.mode':'mass_mail'}"/>
+        id="evaluation_reminders" name="Appraisal Reminders"
+        res_model="mail.compose.message"
+        src_model="hr.evaluation.interview"
+        view_type="form" view_mode="form"
+        target="new" multi="True"
+        key2="client_action_multi"
+        context="{'default_composition_mode': 'mass_mail',
+                    'default_body_text': 'Hello,\n\nKindly post your response for the survey interview.\n\nThanks',
+                    'default_subject': 'Reminder to fill up Survey'}"/>
 
       <!-- Appraisal Interviews Button on Employee Form -->
       <act_window
-      context="{'search_default_user_to_review_id': [active_id], 'default_user_to_review_id': active_id}"
-      id="act_hr_employee_2_hr__evaluation_interview"
-      name="Appraisal Interviews"
-      res_model="hr.evaluation.interview"
-      src_model="hr.employee"/>
+        context="{'search_default_user_to_review_id': [active_id], 'default_user_to_review_id': active_id}"
+        id="act_hr_employee_2_hr__evaluation_interview"
+        name="Appraisal Interviews"
+        res_model="hr.evaluation.interview"
+        src_model="hr.employee"/>
 
     </data>
 </openerp>
diff --git a/addons/hr_evaluation/i18n/ar.po b/addons/hr_evaluation/i18n/ar.po
index d97f18eae42..52e1b6442aa 100644
--- a/addons/hr_evaluation/i18n/ar.po
+++ b/addons/hr_evaluation/i18n/ar.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:56+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:30+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_evaluation
 #: help:hr_evaluation.plan.phase,send_anonymous_manager:0
diff --git a/addons/hr_evaluation/i18n/bg.po b/addons/hr_evaluation/i18n/bg.po
index f995810152a..72d7f6a3782 100644
--- a/addons/hr_evaluation/i18n/bg.po
+++ b/addons/hr_evaluation/i18n/bg.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:56+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:30+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_evaluation
 #: help:hr_evaluation.plan.phase,send_anonymous_manager:0
diff --git a/addons/hr_evaluation/i18n/ca.po b/addons/hr_evaluation/i18n/ca.po
index d48266005b9..8349c8de447 100644
--- a/addons/hr_evaluation/i18n/ca.po
+++ b/addons/hr_evaluation/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:56+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:30+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_evaluation
 #: help:hr_evaluation.plan.phase,send_anonymous_manager:0
diff --git a/addons/hr_evaluation/i18n/da.po b/addons/hr_evaluation/i18n/da.po
index 40ad3e32d78..5b3762d0def 100644
--- a/addons/hr_evaluation/i18n/da.po
+++ b/addons/hr_evaluation/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:56+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:30+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_evaluation
 #: help:hr_evaluation.plan.phase,send_anonymous_manager:0
diff --git a/addons/hr_evaluation/i18n/de.po b/addons/hr_evaluation/i18n/de.po
index 9330beb4aa8..98b3d76da6a 100644
--- a/addons/hr_evaluation/i18n/de.po
+++ b/addons/hr_evaluation/i18n/de.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:56+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:30+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_evaluation
 #: help:hr_evaluation.plan.phase,send_anonymous_manager:0
diff --git a/addons/hr_evaluation/i18n/es.po b/addons/hr_evaluation/i18n/es.po
index eba538a32cb..83ff5f78428 100644
--- a/addons/hr_evaluation/i18n/es.po
+++ b/addons/hr_evaluation/i18n/es.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:56+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:30+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_evaluation
 #: help:hr_evaluation.plan.phase,send_anonymous_manager:0
diff --git a/addons/hr_evaluation/i18n/es_CR.po b/addons/hr_evaluation/i18n/es_CR.po
index be3d1184afe..35497864f91 100644
--- a/addons/hr_evaluation/i18n/es_CR.po
+++ b/addons/hr_evaluation/i18n/es_CR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:56+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:30+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 "Language: es\n"
 
 #. module: hr_evaluation
diff --git a/addons/hr_evaluation/i18n/es_EC.po b/addons/hr_evaluation/i18n/es_EC.po
index ac5fb17bf13..274c7667552 100644
--- a/addons/hr_evaluation/i18n/es_EC.po
+++ b/addons/hr_evaluation/i18n/es_EC.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:56+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:30+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_evaluation
 #: help:hr_evaluation.plan.phase,send_anonymous_manager:0
diff --git a/addons/hr_evaluation/i18n/et.po b/addons/hr_evaluation/i18n/et.po
index f24a2f8ccd1..ec28cd82764 100644
--- a/addons/hr_evaluation/i18n/et.po
+++ b/addons/hr_evaluation/i18n/et.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:56+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:30+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_evaluation
 #: help:hr_evaluation.plan.phase,send_anonymous_manager:0
diff --git a/addons/hr_evaluation/i18n/fi.po b/addons/hr_evaluation/i18n/fi.po
index 597119e99f9..bb7481cdd9a 100644
--- a/addons/hr_evaluation/i18n/fi.po
+++ b/addons/hr_evaluation/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:56+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:30+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_evaluation
 #: help:hr_evaluation.plan.phase,send_anonymous_manager:0
diff --git a/addons/hr_evaluation/i18n/fr.po b/addons/hr_evaluation/i18n/fr.po
index 590aa799113..7124d185aab 100644
--- a/addons/hr_evaluation/i18n/fr.po
+++ b/addons/hr_evaluation/i18n/fr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:56+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:30+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_evaluation
 #: help:hr_evaluation.plan.phase,send_anonymous_manager:0
diff --git a/addons/hr_evaluation/i18n/gl.po b/addons/hr_evaluation/i18n/gl.po
index c7765a75fe1..06547bf4b2c 100644
--- a/addons/hr_evaluation/i18n/gl.po
+++ b/addons/hr_evaluation/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:56+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:30+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_evaluation
 #: help:hr_evaluation.plan.phase,send_anonymous_manager:0
diff --git a/addons/hr_evaluation/i18n/hr.po b/addons/hr_evaluation/i18n/hr.po
index 116a0c51fe0..73b8f608bbb 100644
--- a/addons/hr_evaluation/i18n/hr.po
+++ b/addons/hr_evaluation/i18n/hr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:56+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:30+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_evaluation
 #: help:hr_evaluation.plan.phase,send_anonymous_manager:0
diff --git a/addons/hr_evaluation/i18n/hu.po b/addons/hr_evaluation/i18n/hu.po
index 88d5b7061d7..b1ef7b6338d 100644
--- a/addons/hr_evaluation/i18n/hu.po
+++ b/addons/hr_evaluation/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:56+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:30+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_evaluation
 #: help:hr_evaluation.plan.phase,send_anonymous_manager:0
diff --git a/addons/hr_evaluation/i18n/id.po b/addons/hr_evaluation/i18n/id.po
index c01fc71c902..63023f19a29 100644
--- a/addons/hr_evaluation/i18n/id.po
+++ b/addons/hr_evaluation/i18n/id.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:56+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:30+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_evaluation
 #: help:hr_evaluation.plan.phase,send_anonymous_manager:0
diff --git a/addons/hr_evaluation/i18n/it.po b/addons/hr_evaluation/i18n/it.po
index 35befc9553c..51b48bde74f 100644
--- a/addons/hr_evaluation/i18n/it.po
+++ b/addons/hr_evaluation/i18n/it.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:56+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:30+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_evaluation
 #: help:hr_evaluation.plan.phase,send_anonymous_manager:0
diff --git a/addons/hr_evaluation/i18n/ja.po b/addons/hr_evaluation/i18n/ja.po
index 8e20337f962..bade58858f2 100644
--- a/addons/hr_evaluation/i18n/ja.po
+++ b/addons/hr_evaluation/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:56+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:30+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_evaluation
 #: help:hr_evaluation.plan.phase,send_anonymous_manager:0
diff --git a/addons/hr_evaluation/i18n/mn.po b/addons/hr_evaluation/i18n/mn.po
index 3ae8b24082b..c83d7e5f667 100644
--- a/addons/hr_evaluation/i18n/mn.po
+++ b/addons/hr_evaluation/i18n/mn.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:56+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:30+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_evaluation
 #: help:hr_evaluation.plan.phase,send_anonymous_manager:0
diff --git a/addons/hr_evaluation/i18n/nl.po b/addons/hr_evaluation/i18n/nl.po
index d1e76a48f92..c503b726242 100644
--- a/addons/hr_evaluation/i18n/nl.po
+++ b/addons/hr_evaluation/i18n/nl.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 01:37+0100\n"
-"PO-Revision-Date: 2012-05-10 17:31+0000\n"
-"Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
+"PO-Revision-Date: 2012-08-26 14:02+0000\n"
+"Last-Translator: Erwin <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: 2012-08-09 04:56+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:30+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_evaluation
 #: help:hr_evaluation.plan.phase,send_anonymous_manager:0
@@ -316,7 +316,7 @@ msgstr "Beoordelingen gedaan in aflelopen maand"
 #. module: hr_evaluation
 #: model:ir.model,name:hr_evaluation.model_mail_compose_message
 msgid "Email composition wizard"
-msgstr ""
+msgstr "E-mail samenstellen wizard"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.report:0
diff --git a/addons/hr_evaluation/i18n/pt.po b/addons/hr_evaluation/i18n/pt.po
index 77184eb4626..70906f9a87c 100644
--- a/addons/hr_evaluation/i18n/pt.po
+++ b/addons/hr_evaluation/i18n/pt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:56+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:30+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_evaluation
 #: help:hr_evaluation.plan.phase,send_anonymous_manager:0
diff --git a/addons/hr_evaluation/i18n/pt_BR.po b/addons/hr_evaluation/i18n/pt_BR.po
index ddc74bb051c..6470a98b01c 100644
--- a/addons/hr_evaluation/i18n/pt_BR.po
+++ b/addons/hr_evaluation/i18n/pt_BR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:56+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:30+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_evaluation
 #: help:hr_evaluation.plan.phase,send_anonymous_manager:0
diff --git a/addons/hr_evaluation/i18n/ro.po b/addons/hr_evaluation/i18n/ro.po
index a54cb26dd1f..fc16b5d3760 100644
--- a/addons/hr_evaluation/i18n/ro.po
+++ b/addons/hr_evaluation/i18n/ro.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:56+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:30+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_evaluation
 #: help:hr_evaluation.plan.phase,send_anonymous_manager:0
diff --git a/addons/hr_evaluation/i18n/ru.po b/addons/hr_evaluation/i18n/ru.po
index 3d3c2b468d8..acf2bd61067 100644
--- a/addons/hr_evaluation/i18n/ru.po
+++ b/addons/hr_evaluation/i18n/ru.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:56+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:30+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_evaluation
 #: help:hr_evaluation.plan.phase,send_anonymous_manager:0
diff --git a/addons/hr_evaluation/i18n/sr.po b/addons/hr_evaluation/i18n/sr.po
index 0fda93d6633..48ba5439832 100644
--- a/addons/hr_evaluation/i18n/sr.po
+++ b/addons/hr_evaluation/i18n/sr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:56+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:30+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_evaluation
 #: help:hr_evaluation.plan.phase,send_anonymous_manager:0
diff --git a/addons/hr_evaluation/i18n/sr@latin.po b/addons/hr_evaluation/i18n/sr@latin.po
index 1dd3ecb6765..b2cfb5fdc1b 100644
--- a/addons/hr_evaluation/i18n/sr@latin.po
+++ b/addons/hr_evaluation/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:56+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:30+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_evaluation
 #: help:hr_evaluation.plan.phase,send_anonymous_manager:0
diff --git a/addons/hr_evaluation/i18n/sv.po b/addons/hr_evaluation/i18n/sv.po
index e8278d6ce4c..dc10719d6a8 100644
--- a/addons/hr_evaluation/i18n/sv.po
+++ b/addons/hr_evaluation/i18n/sv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:56+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:30+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_evaluation
 #: help:hr_evaluation.plan.phase,send_anonymous_manager:0
diff --git a/addons/hr_evaluation/i18n/tr.po b/addons/hr_evaluation/i18n/tr.po
index 37c1605af05..5b5132105a7 100644
--- a/addons/hr_evaluation/i18n/tr.po
+++ b/addons/hr_evaluation/i18n/tr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:56+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:30+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_evaluation
 #: help:hr_evaluation.plan.phase,send_anonymous_manager:0
diff --git a/addons/hr_evaluation/i18n/zh_CN.po b/addons/hr_evaluation/i18n/zh_CN.po
index 1a4dc786095..f92ddb8eec1 100644
--- a/addons/hr_evaluation/i18n/zh_CN.po
+++ b/addons/hr_evaluation/i18n/zh_CN.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:56+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:30+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_evaluation
 #: help:hr_evaluation.plan.phase,send_anonymous_manager:0
diff --git a/addons/hr_evaluation/wizard/hr_evaluation_mail.py b/addons/hr_evaluation/wizard/hr_evaluation_mail.py
deleted file mode 100644
index 35c54a4cca3..00000000000
--- a/addons/hr_evaluation/wizard/hr_evaluation_mail.py
+++ /dev/null
@@ -1,42 +0,0 @@
-##############################################################################
-#
-#    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 osv import fields, osv
-import tools
-
-class hr_evaluation_reminder(osv.osv_memory):
-    _name = "hr.evaluation.reminder"
-    _description = "Sends Reminders to employees to fill the evaluations"
-    _columns = {
-        'evaluation_id': fields.many2one('hr.evaluation.interview', 'Interview', required=True)
-    }
-
-    def send_mail(self, cr, uid, ids, context=None):
-        mail_message = self.pool.get('mail.message')
-        hr_evaluation_interview_obj = self.pool.get('hr.evaluation.interview')
-        evaluation_data = self.read(cr, uid, ids, context=context)[0]
-        current_interview = hr_evaluation_interview_obj.browse(cr, uid, evaluation_data.get('evaluation_id'))
-        if current_interview.state == "waiting_answer" and current_interview.user_to_review_id.work_email :
-            msg = " Hello %s, \n\n Kindly post your response for '%s' survey interview. \n\n Thanks,"  %(current_interview.user_to_review_id.name, current_interview.survey_id.title)
-            mail_message.schedule_with_attach(cr, uid, tools.config['email_from'], [current_interview.user_to_review_id.work_email],\
-                                          'Reminder to fill up Survey', msg, context=context)
-        return {'type': 'ir.actions.act_window_close'}
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr_evaluation/wizard/hr_evaluation_mail_view.xml b/addons/hr_evaluation/wizard/hr_evaluation_mail_view.xml
deleted file mode 100644
index 89ae99bb6c3..00000000000
--- a/addons/hr_evaluation/wizard/hr_evaluation_mail_view.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-
-    <record id="view_hr_evaluation_send_mail" model="ir.ui.view">
-        <field name="name">hr.evaluation.send.mail</field>
-        <field name="model">hr.evaluation.reminder</field>
-        <field name="arch" type="xml">
-            <form string="Evaluation Reminders" version="7.0">
-                <group string="Send Evaluation Reminder">
-                    <field name="evaluation_id"/>
-                </group>
-                <footer>
-                    <button name="send_mail" string="Send Mail" type="object" class="oe_highlight"/>
-                    or
-                    <button string="Cancel" class="oe_link" special="cancel" />
-                </footer>
-             </form>
-        </field>
-    </record>
-
-    <record id="action_hr_evaluation_send_mail" model="ir.actions.act_window">
-        <field name="name">Evaluation Send Mail</field>
-        <field name="res_model">hr.evaluation.reminder</field>
-        <field name="type">ir.actions.act_window</field>
-        <field name="view_type">form</field>
-        <field name="view_mode">tree,form</field>
-        <field name="view_id" ref="view_hr_evaluation_send_mail"/>
-        <field name="context">{'record_id':active_id}</field>
-        <field name="target">new</field>
-    </record>
-
-     </data>
-</openerp>
diff --git a/addons/hr_evaluation/wizard/mail_compose_message.py b/addons/hr_evaluation/wizard/mail_compose_message.py
deleted file mode 100644
index 7e4ba326947..00000000000
--- a/addons/hr_evaluation/wizard/mail_compose_message.py
+++ /dev/null
@@ -1,54 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2010-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 General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU General Public License for more details.
-#
-#    You should have received a copy of the GNU General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>
-#
-##############################################################################
-
-from osv import osv
-from osv import fields
-import tools
-from tools.translate import _
-
-class mail_compose_message(osv.osv_memory):
-    _inherit = 'mail.compose.message'
-
-    def get_value(self, cr, uid, model, resource_id, context=None):
-        '''
-        To get values of the resource_id for the model
-        @param model: Object
-        @param resource_id: id of a record for which values to be read
-
-        @return: Returns a dictionary
-        '''
-        if context is None:
-            context = {}
-        result = super(mail_compose_message, self).get_value(cr, uid,  model, resource_id, context=context)
-        if model == 'hr.evaluation.interview' and resource_id:
-            model_pool = self.pool.get(model)
-            record_data = model_pool.browse(cr, uid, resource_id, context)
-            if record_data.state == "waiting_answer":
-                msg = _("Hello %s, \n\n Kindly post your response for '%s' survey interview. \n\n Thanks,")  %(record_data.user_to_review_id.name, record_data.survey_id.title)
-                result.update({
-                        'email_to': record_data.user_to_review_id.work_email or False,
-                        'subject': _("Reminder to fill up Survey"),
-                        'body_text': msg,
-                    })
-        return result
-
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr_expense/__openerp__.py b/addons/hr_expense/__openerp__.py
index c40670508f4..63fca88b148 100644
--- a/addons/hr_expense/__openerp__.py
+++ b/addons/hr_expense/__openerp__.py
@@ -21,21 +21,21 @@
 
 
 {
-    'name': 'Expenses Management',
+    'name': 'Expense Management',
     'version': '1.0',
     'category': 'Human Resources',
-    "sequence": 30,
-    "summary": "Expenses Validation, Invoicing",
+    'sequence': 30,
+    'summary': 'Expenses Validation, Invoicing',
     'description': """
-This module aims to manage employee's expenses.
-===============================================
+This module aims to manage employee expenses.
+=============================================
 
 The whole workflow is implemented:
+----------------------------------
     * Draft expense
     * Confirmation of the sheet by the employee
     * Validation by his manager
-    * Validation by the accountant and invoice creation
-    * Payment of the invoice to the employee
+    * Validation by the accountant and receipt creation
 
 This module also uses the analytic accounting and is compatible with
 the invoice on timesheet module so that you will be able to automatically
@@ -44,9 +44,8 @@ re-invoice your customer's expenses if your work by project.
     'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
     'images': ['images/hr_expenses_analysis.jpeg', 'images/hr_expenses.jpeg'],
-    'depends': ['hr', 'account'],
-    'init_xml': [],
-    'update_xml': [
+    'depends': ['hr', 'account_voucher'],
+    'data': [
         'security/ir.model.access.csv',
         'hr_expense_data.xml',
         'hr_expense_sequence.xml',
@@ -59,13 +58,11 @@ re-invoice your customer's expenses if your work by project.
         'board_hr_expense_view.xml',
         'hr_expense_installer_view.xml',
     ],
-    'demo_xml': [
-        'hr_expense_demo.xml',
-        ],
+    'demo': ['hr_expense_demo.xml'],
     'test': [
-             'test/expense_demo.yml',
-             'test/expense_process.yml',
-             ],
+        'test/expense_demo.yml',
+        'test/expense_process.yml',
+    ],
     'installable': True,
     'auto_install': False,
     'certificate': '0062479841789',
diff --git a/addons/hr_expense/hr_expense.py b/addons/hr_expense/hr_expense.py
index 991437f3600..83f986e59cc 100644
--- a/addons/hr_expense/hr_expense.py
+++ b/addons/hr_expense/hr_expense.py
@@ -40,12 +40,16 @@ class hr_expense_expense(osv.osv):
         if context is None:
             context = {}
         if not default: default = {}
-        default.update({'invoice_id': False, 'date_confirm': False, 'date_valid': False, 'user_valid': False})
+        default.update({'voucher_id': False, 'date_confirm': False, 'date_valid': False, 'user_valid': False})
         return super(hr_expense_expense, self).copy(cr, uid, id, default, context=context)
 
     def _amount(self, cr, uid, ids, field_name, arg, context=None):
-        cr.execute("SELECT s.id,COALESCE(SUM(l.unit_amount*l.unit_quantity),0) AS amount FROM hr_expense_expense s LEFT OUTER JOIN hr_expense_line l ON (s.id=l.expense_id) WHERE s.id IN %s GROUP BY s.id ", (tuple(ids),))
-        res = dict(cr.fetchall())
+        res= {}
+        for expense in self.browse(cr, uid, ids, context=context):
+            total = 0.0
+            for line in expense.line_ids:
+                total += line.unit_amount * line.unit_quantity
+            res[expense.id] = total
         return res
 
     def _get_currency(self, cr, uid, context=None):
@@ -63,7 +67,7 @@ class hr_expense_expense(osv.osv):
         'name': fields.char('Description', size=128, required=True),
         'id': fields.integer('Sheet ID', readonly=True),
         'date': fields.date('Date', select=True),
-        'journal_id': fields.many2one('account.journal', 'Force Journal', help = "The journal used when the expense is invoiced"),
+        'journal_id': fields.many2one('account.journal', 'Force Journal', help = "The journal used when the expense is done."),
         'employee_id': fields.many2one('hr.employee', "Employee", required=True),
         'user_id': fields.many2one('res.users', 'User', required=True),
         'date_confirm': fields.date('Confirmation Date', select=True, help = "Date of the confirmation of the sheet expense. It's filled when the button Confirm is pressed."),
@@ -73,7 +77,7 @@ class hr_expense_expense(osv.osv):
         'line_ids': fields.one2many('hr.expense.line', 'expense_id', 'Expense Lines', readonly=True, states={'draft':[('readonly',False)]} ),
         'note': fields.text('Note'),
         'amount': fields.function(_amount, string='Total Amount', digits_compute= dp.get_precision('Account')),
-        'invoice_id': fields.many2one('account.invoice', "Employee's Invoice"),
+        'voucher_id': fields.many2one('account.voucher', "Employee's Receipt"),
         'currency_id': fields.many2one('res.currency', 'Currency', required=True),
         'department_id':fields.many2one('hr.department','Department'),
         'company_id': fields.many2one('res.company', 'Company', required=True),
@@ -82,11 +86,10 @@ class hr_expense_expense(osv.osv):
             ('cancelled', 'Refused'),
             ('confirm', 'Waiting Approval'),
             ('accepted', 'Approved'),
-            ('invoiced', 'Invoiced'),
-            ('paid', 'Reimbursed')
+            ('done', 'Done'),
             ],
             'Status', readonly=True, help='When the expense request is created the status is \'Draft\'.\n It is confirmed by the user and request is sent to admin, the status is \'Waiting Confirmation\'.\
-            \nIf the admin accepts it, the status is \'Accepted\'.\n If an invoice is made for the expense request, the status is \'Invoiced\'.\n If the expense is paid to user, the status is \'Reimbursed\'.'),
+            \nIf the admin accepts it, the status is \'Accepted\'.\n If a receipt is made for the expense request, the status is \'Done\'.'),
     }
     _defaults = {
         'company_id': lambda s, cr, uid, c: s.pool.get('res.company')._company_default_get(cr, uid, 'hr.employee', context=c),
@@ -97,6 +100,13 @@ class hr_expense_expense(osv.osv):
         'currency_id': _get_currency,
     }
 
+    def onchange_currency_id(self, cr, uid, ids, currency_id=False, company_id=False, context=None):
+        res =  {'value': {'journal_id': False}}
+        journal_ids = self.pool.get('account.journal').search(cr, uid, [('type','=','purchase'), ('currency','=',currency_id), ('company_id', '=', company_id)], context=context)
+        if journal_ids:
+            res['value']['journal_id'] = journal_ids[0]
+        return res
+
     def onchange_employee_id(self, cr, uid, ids, employee_id, context=None):
         emp_obj = self.pool.get('hr.employee')
         department_id = False
@@ -126,101 +136,94 @@ class hr_expense_expense(osv.osv):
         self.write(cr, uid, ids, {'state':'cancelled'})
         return True
 
-    def expense_paid(self, cr, uid, ids, *args):
-        self.write(cr, uid, ids, {'state':'paid'})
-        return True
-
-    def invoice(self, cr, uid, ids, context=None):
-        wf_service = netsvc.LocalService("workflow")
-        mod_obj = self.pool.get('ir.model.data')
-        res = mod_obj.get_object_reference(cr, uid, 'account', 'invoice_supplier_form')
-        inv_ids = []
-        for id in ids:
-            wf_service.trg_validate(uid, 'hr.expense.expense', id, 'invoice', cr)
-            inv_ids.append(self.browse(cr, uid, id).invoice_id.id)
-        return {
-            'name': _('Supplier Invoices'),
-            'view_type': 'form',
-            'view_mode': 'form',
-            'view_id': [res and res[1] or False],
-            'res_model': 'account.invoice',
-            'context': "{'type':'out_invoice', 'journal_type': 'purchase'}",
-            'type': 'ir.actions.act_window',
-            'nodestroy': True,
-            'target': 'current',
-            'res_id': inv_ids and inv_ids[0] or False,
-        }
-
-    def action_invoice_create(self, cr, uid, ids):
-        res = False
-        invoice_obj = self.pool.get('account.invoice')
+    def action_receipt_create(self, cr, uid, ids, context=None):
         property_obj = self.pool.get('ir.property')
         sequence_obj = self.pool.get('ir.sequence')
         analytic_journal_obj = self.pool.get('account.analytic.journal')
         account_journal = self.pool.get('account.journal')
-        for exp in self.browse(cr, uid, ids):
+        voucher_obj = self.pool.get('account.voucher')
+        currency_obj = self.pool.get('res.currency')
+        wkf_service = netsvc.LocalService("workflow")
+        if context is None:
+            context = {}
+        for exp in self.browse(cr, uid, ids, context=context):
             company_id = exp.company_id.id
             lines = []
-            for l in exp.line_ids:
-                tax_id = []
-                if l.product_id:
-                    acc = l.product_id.product_tmpl_id.property_account_expense
+            total = 0.0
+            ctx = context.copy()
+            ctx.update({'date': exp.date})
+            journal = False
+            if exp.journal_id:
+                journal = exp.journal_id
+            else:
+                journal_id = voucher_obj._get_journal(cr, uid, context={'type': 'purchase', 'company_id': company_id})
+                if journal_id:
+                    journal = account_journal.browse(cr, uid, journal_id, context=context)
+            for line in exp.line_ids:
+                if line.product_id:
+                    acc = line.product_id.product_tmpl_id.property_account_expense
                     if not acc:
-                        acc = l.product_id.categ_id.property_account_expense_categ
-                    tax_id = [x.id for x in l.product_id.supplier_taxes_id]
+                        acc = line.product_id.categ_id.property_account_expense_categ
                 else:
                     acc = property_obj.get(cr, uid, 'property_account_expense_categ', 'product.category', context={'force_company': company_id})
                     if not acc:
                         raise osv.except_osv(_('Error!'), _('Please configure Default Expense account for Product purchase: `property_account_expense_categ`.'))
+                total_amount = line.total_amount
+                if journal.currency:
+                    if exp.currency_id != journal.currency:
+                        total_amount = currency_obj.compute(cr, uid, exp.currency_id.id, journal.currency.id, total_amount, context=ctx)
+                elif exp.currency_id != exp.company_id.currency_id:
+                    total_amount = currency_obj.compute(cr, uid, exp.currency_id.id, exp.company_id.currency_id.id, total_amount, context=ctx)
                 lines.append((0, False, {
-                    'name': l.name,
+                    'name': line.name,
                     'account_id': acc.id,
-                    'price_unit': l.unit_amount,
-                    'quantity': l.unit_quantity,
-                    'uos_id': l.uom_id.id,
-                    'product_id': l.product_id and l.product_id.id or False,
-                    'invoice_line_tax_id': tax_id and [(6, 0, tax_id)] or False,
-                    'account_analytic_id': l.analytic_account.id,
+                    'account_analytic_id': line.analytic_account.id,
+                    'amount': total_amount,
+                    'type': 'dr'
                 }))
+                total += total_amount
             if not exp.employee_id.address_home_id:
                 raise osv.except_osv(_('Error!'), _('The employee must have a home address.'))
             acc = exp.employee_id.address_home_id.property_account_payable.id
-            payment_term_id = exp.employee_id.address_home_id.property_payment_term.id
-            inv = {
+            voucher = {
                 'name': exp.name,
                 'reference': sequence_obj.get(cr, uid, 'hr.expense.invoice'),
                 'account_id': acc,
-                'type': 'in_invoice',
+                'type': 'purchase',
                 'partner_id': exp.employee_id.address_home_id.id,
                 'company_id': company_id,
-                'origin': exp.name,
-                'invoice_line': lines,
-                'currency_id': exp.currency_id.id,
-                'payment_term': payment_term_id,
-                'fiscal_position': exp.employee_id.address_home_id.property_account_position.id
+                'line_ids': lines,
+                'amount': total,
+                'journal_id': journal.id,
             }
-            if payment_term_id:
-                to_update = invoice_obj.onchange_payment_term_date_invoice(cr, uid, [], payment_term_id, None)
-                if to_update:
-                    inv.update(to_update['value'])
-            journal = False
-            if exp.journal_id:
-                inv['journal_id']=exp.journal_id.id
-                journal = exp.journal_id
-            else:
-                journal_id = invoice_obj._get_journal(cr, uid, context={'type': 'in_invoice', 'company_id': company_id})
-                if journal_id:
-                    inv['journal_id'] = journal_id
-                    journal = account_journal.browse(cr, uid, journal_id)
             if journal and not journal.analytic_journal_id:
-                analytic_journal_ids = analytic_journal_obj.search(cr, uid, [('type','=','purchase')])
+                analytic_journal_ids = analytic_journal_obj.search(cr, uid, [('type','=','purchase')], context=context)
                 if analytic_journal_ids:
-                    account_journal.write(cr, uid, [journal.id],{'analytic_journal_id':analytic_journal_ids[0]})
-            inv_id = invoice_obj.create(cr, uid, inv, {'type': 'in_invoice'})
-            invoice_obj.button_compute(cr, uid, [inv_id], {'type': 'in_invoice'}, set_total=True)
-            self.write(cr, uid, [exp.id], {'invoice_id': inv_id, 'state': 'invoiced'})
-            res = inv_id
-        return res
+                    account_journal.write(cr, uid, [journal.id], {'analytic_journal_id': analytic_journal_ids[0]}, context=context)
+            voucher_id = voucher_obj.create(cr, uid, voucher, context=context)
+            wkf_service.trg_validate(uid, 'account.voucher', voucher_id, 'proforma_voucher', cr)
+            self.write(cr, uid, [exp.id], {'voucher_id': voucher_id, 'state': 'done'}, context=context)
+        return True
+    
+    def action_view_receipt(self, cr, uid, ids, context=None):
+        '''
+        This function returns an action that display existing receipt of given expense ids.
+        '''
+        assert len(ids) == 1, 'This option should only be used for a single id at a time'
+        voucher_id = self.browse(cr, uid, ids[0], context=context).voucher_id.id
+        res = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'account_voucher', 'view_purchase_receipt_form')
+        result = {
+            'name': _('Expense Receipt'),
+            'view_type': 'form',
+            'view_mode': 'form',
+            'view_id': res and res[1] or False,
+            'res_model': 'account.voucher',
+            'type': 'ir.actions.act_window',
+            'nodestroy': True,
+            'target': 'current',
+            'res_id': voucher_id,
+        }
+        return result
 
 hr_expense_expense()
 
@@ -253,6 +256,10 @@ class hr_expense_line(osv.osv):
         res = dict(cr.fetchall())
         return res
 
+    def _get_uom_id(self, cr, uid, context=None):
+        result = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'product', 'product_uom_unit')
+        return result and result[1] or False
+
     _columns = {
         'name': fields.char('Expense Note', size=128, required=True),
         'date_value': fields.date('Date', required=True),
@@ -261,7 +268,7 @@ class hr_expense_line(osv.osv):
         'unit_amount': fields.float('Unit Price', digits_compute=dp.get_precision('Product Price')),
         'unit_quantity': fields.float('Quantities', digits_compute= dp.get_precision('Product Unit of Measure')),
         'product_id': fields.many2one('product.product', 'Product', domain=[('hr_expense_ok','=',True)]),
-        'uom_id': fields.many2one('product.uom', 'Unit of Measure'),
+        'uom_id': fields.many2one('product.uom', 'Unit of Measure', required=True),
         'description': fields.text('Description'),
         'analytic_account': fields.many2one('account.analytic.account','Analytic account'),
         'ref': fields.char('Reference', size=32),
@@ -270,20 +277,31 @@ class hr_expense_line(osv.osv):
     _defaults = {
         'unit_quantity': 1,
         'date_value': lambda *a: time.strftime('%Y-%m-%d'),
+        'uom_id': _get_uom_id,
     }
     _order = "sequence, date_value desc"
 
-    def onchange_product_id(self, cr, uid, ids, product_id, uom_id, employee_id, context=None):
+    def onchange_product_id(self, cr, uid, ids, product_id, context=None):
         res = {}
         if product_id:
             product = self.pool.get('product.product').browse(cr, uid, product_id, context=context)
             res['name'] = product.name
             amount_unit = product.price_get('standard_price')[product.id]
             res['unit_amount'] = amount_unit
-            if not uom_id:
-                res['uom_id'] = product.uom_id.id
+            res['uom_id'] = product.uom_id.id
         return {'value': res}
 
+    def onchange_uom(self, cr, uid, ids, product_id, uom_id, context=None):
+        res = {'value':{}}
+        if not uom_id or not product_id:
+            return res
+        product = self.pool.get('product.product').browse(cr, uid, product_id, context=context)
+        uom = self.pool.get('product.uom').browse(cr, uid, uom_id, context=context)
+        if uom.category_id.id != product.uom_id.category_id.id:
+            res['warning'] = {'title': _('Warning'), 'message': _('Selected Unit of Measure does not belong to the same category as the product Unit of Measure')}
+            res['value'].update({'uom_id': product.uom_id.id})
+        return res
+
 hr_expense_line()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr_expense/hr_expense_data.xml b/addons/hr_expense/hr_expense_data.xml
index 6e41f3d4e05..2a9f3ae0a56 100644
--- a/addons/hr_expense/hr_expense_data.xml
+++ b/addons/hr_expense/hr_expense_data.xml
@@ -2,20 +2,20 @@
 <openerp>
     <data noupdate="1">
         <!-- notify all employees of module installation -->
-        <function model="mail.group" name="message_append_note">
-            <!-- ids, subject, body, parent_id=False, type='notification', content_subtype='html' -->
-            <value eval="[ref('mail.group_all_employees')]"/>
-            <value>Module Expenses Management has been installed</value>
-            <value>Manage your employee's expenses, with validations by employee manager and accountant, creation and payment of invoices.
+        <record model="mail.message" id="module_install_notification">
+            <field name="model">mail.group</field>
+            <field name="res_id" ref="mail.group_all_employees"/>
+            <field name="type">notification</field>
+            <field name="subject">Expense Management application installed!</field>
+            <field name="body">Manage your employees' expenses, after due validation by their manager and the accountant, then generate and pay the corresponding invoices.
 
-This module also uses the analytic accounting and is compatible with the invoice on timesheet module so that you will be able to automatically re-invoice your customer's expenses if your work by project.</value>
-        </function>
+This feature is also linked to analytic accounting and compatible with timesheet invoices, so you will be able to automatically re-invoice project-related expenses to your customers.</field>
+        </record>
 
         <!-- Resource: product.uom.categ -->
         <record id="cat_expense" model="product.category">
             <field name="parent_id" ref="product.product_category_all"/>
             <field name="name">Expenses</field>
         </record>
-
     </data>
 </openerp>
diff --git a/addons/hr_expense/hr_expense_demo.xml b/addons/hr_expense/hr_expense_demo.xml
index e1d6b0a00b0..eddaf03ad38 100644
--- a/addons/hr_expense/hr_expense_demo.xml
+++ b/addons/hr_expense/hr_expense_demo.xml
@@ -11,6 +11,8 @@
             <field name="type">service</field>
             <field name="name">Car Travel Expenses</field>
             <field name="default_code">CarTRA</field>
+            <field name="uom_id" ref="product.product_uom_km"/>
+            <field name="uom_po_id" ref="product.product_uom_km"/>
             <field name="categ_id" ref="hr_expense.cat_expense"/>
             <field name="hr_expense_ok" eval="True" />
             <field name="image">/9j/4AAQSkZJRgABAQEASABIAAD/2wBDAAUDBAQEAwUEBAQFBQUGBwwIBwcHBw8LCwkMEQ8SEhEPERETFhwXExQaFRERGCEYGh0dHx8fExciJCIeJBweHx7/2wBDAQUFBQcGBw4ICA4eFBEUHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh7/wAARCACAAIADASIAAhEBAxEB/8QAHQABAAMBAQEBAQEAAAAAAAAAAAYHCAUEAgMBCf/EAD0QAAEDAwMCBAQDBgILAAAAAAECAwQABREGEiEHMRMiQVEUYXGBCDJCFVKRobHBJHIjJSYzU2JjkqLR8f/EABsBAQADAAMBAAAAAAAAAAAAAAABAgMEBQYH/8QAIREAAgICAgIDAQAAAAAAAAAAAAECEQMxBCESQQUTUWH/2gAMAwEAAhEDEQA/ANl0pSgFKUoBSlKAUpSgFKUoBSlKAUpSgFKUoBSlKAUpSgFKUoBSlKAUpSgFKUPHegFKqHUP4gtE2TXh07LcJgoy29dUry028P04A5SOxXnAPpgE1JI3UITZkQw7HcDbHnkNOTXE4QkrVtTgjKSMlOeQRkcHnFZSUdkWTqlKVYkUpSgFKUoBSlKAUpXE1xMulv0vMm2cxhLZSFgyM+GlORuUrHIATk/b1qG6Vg7ZIHc4qNaj11piwrLM25oXIGR8OwkuuZAzgpTnB5HfFQeTZdYX8PN3i7lCOApiNuc86TlaVHyNp4IAOF9s5znPI6j6ah6S6eXS5QGC1P8ACKWpD7xeU3htawNoASMLQPygE5I9TnD7rdIo5P0d299Urk7GcVYLO2yEpUS9O3KSkjuFBHlGMHPn4xzWf+tnVPUEh1Nni6tdnvutlD7cTLDCSrgM5GN54OSQQPRRAOIrctd3U6MtGjUY8KFtakORStXibfKlWVAFKNoSoggH37VCY6ZbL0gKt6UPqVtbfU4MqSfTk5Hb78e1bKPthJvtn2i2NiIVXNxK+fEVtPc+xz+ntx645x2q4/w89U2YUiboXVCXYtuuEdMeBdnFK2Q9qdjbSgo4DQz5VJxtOArjGyrm2y3aplxcX4zkRtDyuMgZdQjA/wC/Ga5Oqp4MVQTyokhORkE+386SUZ2i9H+lOnppuNliTFpCHHGgXUfuL/Un6g5H2r31lD8LPW+NAeh9ONWuhkKV4dsmqVkBZyrwnD8zkpUfmPQVq+pSpUBSlKkClKUArk3m+x4ClMto+IkpHKEqwEf5len05PyqLXnqA0qZc7ZEbVEXBeLDrzxCVgj9SUH0PO1R4I55qttQa8tMRCm/j20jJJ2qK1E+pOM8/WrKP6VcixpespgdKX32WEezIz/M819sXq1XJCmH5aJSHElDranMkpIwoY+hNZyvvVG3N7gw0+8r5kJH9/6VCrlr+5z3P8FFaZVnyqJKiPvxVvG+inmkaR6vWm6XnpmyI0xKH23izcAuYhlLrjYU3u3OnbgLSVbPXII5AqsurXUlFi6YR+nfhplagdUpElBUsphpLhUhlCjys7SEjBKQngFQwa7GutcX3S+grVKbiPLub7CPEuyHCExJPhJbdQoAYKlBsLAUcEqKiCUis7Wtplx5+7uOmXIySSs7ikkZOCe6vf6/XPEx4v30WUVdnmZdnW1pEaTIQ4XleYk8NH90+/19Tx7Z6d1c0/OsMdpMyQzNZWsy5ToIZCR2Awnyqzj1OMnPoK/F1SGoy33mytx9OFIUnkJI/JgjP1FerR9jTPv8Ry5SEORY2Hww5kkkKATvJJCtqlA49QOScVbO1GHm21XfRtjVvxS2Xj0W6VQbppC4S7/MhBmehCWhHdWVuNIdbd3KKkpKFZ8pwD3BPOQbP0/orRRjqdTpi2pZQNjS0FTgW2M4P1PJ9TznknnixrlEYuirN8SFtIS0ypWQUJI8MEj67Nx5PJ+RzNL3c0xVfDoTtbCMg+mc9v8A73z64OPG8jm5c7t9HY/QoKl7IDrXpR03vYU27p2PbFKjrdhzYp/0jqinJBbIyoJBSR6Z7j3sjor+1bfppWnL9fReJ1uecbjvqaKVripVtRuUSfFUkgpK+DwMjPKonp+beJ18iMSYMl21yWkre3tEtI3NhxCgVDGQrbyPXNdaM87a5chKch21J+JbISUpUjcpS0pGBnxEL291eYcklFb8H5HJgyJTdxK5cCa62WlXy4422MuLSn2ye9RzWGqWLNNh2popVPmJW4AeQ20j8yz9SQAPqedpFeG33tmUwVpWC8OHNx8wPzr2KVnWN0Sd2elP+7bUr5qO0f8Av+Vc6ZcXlJKfHDYP/DHP8T/bFcaVcfdVciZdAkHzVdRKuRR/XnpZrGfcF3vSVyRcvOVuQpjpS73Jw252wCcgHbgjOTk1nfVN41hZ2HWNQ2qZapiAUp+IjKShw+4VjaftxW35N1JJwquRcbhEU2USi0pK+CleDu+WPWrqBRyRgiFqyciSFzW0SW8+Ydj9vSrl6UR2dQartwaT/g20/GOkjshIyM/faPvVwXLRGjr86r/Yy0urPd1UVLSj9wN1fpaek1hscG4v22Iq3qkMbXfAeWAUpO4ABROBkDOO9Sk1tkOn2kVjrzTolWU3+VqJS1SyqZ8A40Qhkr525Ku4TgE49KgMaBPhRkKctc2JBffKg8Y60NLTgEjcocn2we38tb6f0XZLWlEhMZoyCkbn3AFOH5bjzj5V+2qLDpq+W/4G7wxJZGdqQ4pGCRjPBHPPHtUSSeiYWtmSEyDKkPyjhLcfhBUO6+c/w/vUs6KFiVqb4aU+USSUuJU3jKACf3sDuUd8f3rgdQNLS9DXUxVuqftYG6HJcwTIUT+VWOygAB7flxxXO0fqlNm1XCmr8kcqKLglxHKUHGSfXAUEHjuBxXXc/FLJx5wjujl8eajkjJ6NGavkSUaptbCg1CakR222kqUA22dxSSAkEpSVZ75JIUe2APXe71Mt8VyLMl+NsT5VDkAdsA4B9D3yf6V+V1tMC6WaN4KmfEfUBCkB3ISrnc1+YknKUY743n6VH9WW25sSVIvihHS3ILCnEhSmXlAE5BAynjBAI5BOOxFeGjO1o9B4J0Szpzd79b9YIgy5a3bdIaCg0V7ko3I3pUnP5T2BHYg+vBFlXV1hy5xfihva8Vt0jKU7Qg7iSc5UBtBx37/pJxWumbe/EQu6PEttMN+L4jx2hW4KwST8kng4+5xUvsEVV5vq2GtoRPyXE5CiljCUrcKh2Ckp2pHuoHnHDDDJlko122YZ1GLcl6R99f8ARNy1Xb5z2m7oLVqYRVxYshTqkBTZIJRweCRuAVg7d5I5ArHcbXPWHpC+mzamtklyMydjQuCFHA/6T6TyPllQHtW2uvGlnr7CgzoEow7hBcK47wUUgKIwQSOQDx5h2IFQS0ajuakpsmqWGlOq8gRLQkeL9P0ufVOa+jJnn/4Qbpp1jd1daYzsiO5BnSZSozEZRDod2hGVhWEYTlYHPr6nBxZ93tV9iqQiVJitleM4bPH/AJVz9R6Z0u6mOxL0/ZpIaR4jTbkVKvCCieyTwnJB7d8VFbhFsiY6X4dptewZCHERkEcexxitV5PTMnS2SCTAd+JQybiJfiAEFlwBI+RIA9vevjUlw0toiz/tW+T4kRCuEuPDcXFeyEDKln7Go7YrwtqRIkTJJ8Fsc+gSkDKjx8qg8bTEjqXqJOodRoubsOXIDEKPEJRllLqEOYcKVBKUJWpWwAFzw3DkYzUzk49CCUuz1x+vWm7jfGosCdJjulwJZcfihttRzwMjtn54q2pOoPjrGp9HAdjk49iU8isfdcOn8bSa7fcrYzPisyh4ciJLWFuRpCUpK0pWEp8RvJUlK9oyW19wATpK1ufCabjR5jqWlljCysgYURk/1qMb8tia8X0S9dzdU0nzY8orrQrLHmJbW7qizN+IAQ2mQFOD5FJxzVUy7zECdrkyRKOPyNDw0fx7/wAzXPN6fBKYENmPnuoJ3KP39amUor2EpP0XLqTpPbtQRBHmXNclkAkbYYVtVwUrSd/BBGQaqbSH4ZpMXWFwumqbquXDYdxbURI53PoyTveSrhJHHlBVznngZ8bMG93VwA/EO5OQOcD7VLrB071LL2nxJDST/wA5FYuTbNVGkTmLo1+2x3E2mTcQpWCpp9tXhukdtxCs/fn6HAxH9W6a1TcoyIqdLvObVBxXguJ8EqxjKUZTtPzxzx6ZBlen+lD6QlU2fIVj08U1OrToe0wkjLfiEeqjmuo5PxHH5E3k7Te69nMw8zJiVLtf0q3T2mtbzGmWZNvh2dKUhLj8p/x3iUgBJQE8oAx23f0AEz0fo692ic7KfujcpTy9ziwVFaz7qJFT+NAiRkgNMoTj2FeoADsK34vx+HjO4Lv9ZTLyJ5dnjulvZuEcsvDIIqA6g6cuvMuIgzlpbUMFlwBxsj22qzx9MVZVK5ybWjjtJ7M63LSeqrE24iHbLctkncRGa8Hce2cDIzUEuX7WhtLjrtT8ZtSysthRUgKPchPYfathuNoWMLSCPmK5Vx05apwIeitkn5VosrRm8SZhjXd7etdmSlTbjSpbyGB5VDgqG4k/5c1ZfS7Ulu05p6JeEwlyQLeqK4I7Sd6XGy45sVglSiUhaxwkDcANxXxd2pOkumb3BchzYTbrDndJ4wfcEcg/MVAJf4aLWp3/AFdqO7QG1DatKFgkj23DB/jmqzm5Oy0IKKozp1h+M1tq9y1W5LLU1UpyZMcS0geCQNjYUtCQpZxkjf5khSQexqeWPSmoLiwz4zTrz+xIccOTuVjk8/OtCaE6KaQ0lEDEGIXFE5cddIUtw+5P9gAKsCFaLfESEsx0JA+VULmdtP8ASC5yilUkbEn3qxLB0itcQJVJAWoVaaUpSMJAFf2gOHa9LWi3pAZit5Hriuw0y02MIQlI+Qr9KUApSlAKUpQClKUApSlAKUpQClKUApSlAKUpQClKUApSlAf/2Q==</field>
diff --git a/addons/hr_expense/hr_expense_view.xml b/addons/hr_expense/hr_expense_view.xml
index a810b87dad0..5389f88b885 100644
--- a/addons/hr_expense/hr_expense_view.xml
+++ b/addons/hr_expense/hr_expense_view.xml
@@ -31,7 +31,7 @@
                     <field name="date"/>
                     <field name="user_id" invisible="1"/>
                     <field name="name"/>
-                    <field name="currency_id"/>
+                    <field name="currency_id" groups="base.group_multi_currency"/>
                     <field name="amount"/>
                     <field name="state"/>
                 </tree>
@@ -42,7 +42,7 @@
             <field name="name">hr.expense.expense.tree</field>
             <field name="model">hr.expense.expense</field>
             <field name="arch" type="xml">
-                <tree colors="blue:state == 'draft';black:state in ('confirm','accepted','invoiced','paid');gray:state == 'cancelled'"  string="Expenses" editable="top">
+                <tree colors="blue:state == 'draft';black:state in ('confirm','accepted','done');gray:state == 'cancelled'"  string="Expenses" editable="top">
                     <field name="employee_id"/>
                     <field name="date"/>
                     <field name="department_id"/>
@@ -64,9 +64,10 @@
                     <button name="confirm" states="draft" string="Submit to Manager" type="workflow" class="oe_highlight"/>
                     <button name="validate" states="confirm" string="Approve" type="workflow" groups="base.group_hr_user" class="oe_highlight"/>
                     <button name="draft" states="confirm,cancelled" string="Set to Draft" type="workflow" groups="base.group_hr_user" />
-                    <button name="invoice" states="accepted" string="Invoice" type="object" groups="base.group_hr_user" class="oe_highlight"/>
+                    <button name="done" states="accepted" string="Generate Accounting Entries" type="workflow" groups="account.group_account_invoice" class="oe_highlight"/>
+                    <button name="action_view_receipt" states="done" string="Open Receipt" type="object"/>
                     <button name="refuse" states="confirm,accepted" string="Refuse" type="workflow" groups="base.group_hr_user" />
-                    <field name="state" widget="statusbar" statusbar_visible="draft,confirm,accepted" statusbar_colors='{"confirm":"blue","cancelled":"red"}'/>
+                    <field name="state" widget="statusbar" statusbar_visible="draft,confirm,accepted,done" statusbar_colors='{"confirm":"blue","cancelled":"red"}'/>
                 </header>
                 <sheet>
                     <group>
@@ -79,7 +80,7 @@
                         <group>
                             <field name="name"/>
                             <field name="user_valid"/>
-                            <field name="currency_id"/>
+                            <field name="currency_id" groups="base.group_multi_currency" on_change="onchange_currency_id(currency_id, company_id)"/>
                         </group>
                     </group>
                     <notebook>
@@ -88,7 +89,7 @@
                                 <form string="Expense Lines" version="7.0">
                                     <group>
                                         <group>
-                                            <field name="product_id" on_change="onchange_product_id(product_id, uom_id, parent.employee_id, context)" context="{'default_hr_expense_ok':1}"/>
+                                            <field name="product_id" on_change="onchange_product_id(product_id, context)" context="{'default_hr_expense_ok':1}"/>
                                             <field name="name"/>
                                             <field name="ref"/>
                                             <field domain="[('type','=','normal')]" name="analytic_account" groups="analytic.group_analytic_accounting"/>
@@ -98,21 +99,40 @@
                                             <label for="unit_quantity"/>
                                             <div>
                                                 <field name="unit_quantity" class="oe_inline"/> 
-                                                <field name="uom_id" on_change="onchange_product_id(product_id, uom_id, parent.employee_id, context)" class="oe_inline"/>
+                                                <field name="uom_id" on_change="onchange_uom(product_id, uom_id, context)" class="oe_inline"/>
                                             </div>
                                             <field name="date_value" />
                                         </group>
                                     </group>
                                 </form>
+                                <tree string="Expense Lines" editable="bottom">
+                                    <field name="sequence" invisible="1"/>
+                                    <field name="product_id" on_change="onchange_product_id(product_id, context)" context="{'default_hr_expense_ok':1}"/>
+                                    <field name="date_value" string="Expense Date"/>
+                                    <field name="name"/>
+                                    <field name="ref"/>
+                                    <field domain="[('type','in',['normal','contract']), ('parent_id','!=',False)]" name="analytic_account" groups="analytic.group_analytic_accounting"/>
+                                    <field name="uom_id" on_change="onchange_uom(product_id, uom_id, context)"/>
+                                    <field name="unit_amount"/>
+                                    <field name="unit_quantity"/>
+                                    <field name="total_amount" sum="Total"/>
+                                </tree>
                             </field>
-                            <separator string="Notes"/>
-                            <field name="note" placeholder="Free Notes"/>
+                            <group>
+                                <div>
+                                    <separator string="Notes"/>
+                                    <field name="note" placeholder="Free Notes"/>
+                                </div>
+                                <group class="oe_subtotal_footer">
+                                    <field name="amount"/>
+                                </group>
+                            </group>
                         </page>
                         <page string="Other Info">
                             <group>
                                 <group string="Accounting Data">
-                                    <field name="journal_id"/>
-                                    <field name="invoice_id" context="{'type':'in_invoice', 'journal_type': 'purchase'}"/>
+                                    <field name="journal_id" widget="selection" domain="[('type', '=', 'purchase')]"/>
+                                    <field name="voucher_id" context="{'form_view_ref': 'account_voucher.view_purchase_receipt_form'}"/>
                                 </group>
                             </group>
                         </page>
diff --git a/addons/hr_expense/hr_expense_workflow.xml b/addons/hr_expense/hr_expense_workflow.xml
index 328a07879a4..2e085071207 100644
--- a/addons/hr_expense/hr_expense_workflow.xml
+++ b/addons/hr_expense/hr_expense_workflow.xml
@@ -32,14 +32,6 @@
             <field name="action">expense_accept()</field>
         </record>
 
-        <record id="act_paid" model="workflow.activity">
-            <field name="wkf_id" ref="wkf_expenses"/>
-            <field name="name">paid</field>
-            <field name="kind">function</field>
-            <field name="action">expense_paid()</field>
-            <field name="flow_stop">True</field>
-        </record>
-
         <record id="act_refused" model="workflow.activity">
             <field name="wkf_id" ref="wkf_expenses"/>
             <field name="name">refused</field>
@@ -47,12 +39,11 @@
             <field name="action">expense_canceled()</field>
         </record>
 
-        <record id="act_invoice" model="workflow.activity">
+        <record id="act_done" model="workflow.activity">
             <field name="wkf_id" ref="wkf_expenses"/>
-            <field name="name">invoice</field>
-            <field name="kind">subflow</field>
-            <field name="subflow_id" ref="account.wkf"/>
-            <field name="action">action_invoice_create()</field>
+            <field name="name">done</field>
+            <field name="kind">function</field>
+            <field name="action">action_receipt_create()</field>
         </record>
 
         <record id="t1" model="workflow.transition">
@@ -91,15 +82,8 @@
 
         <record id="t8" model="workflow.transition">
             <field name="act_from" ref="act_accepted"/>
-            <field name="act_to" ref="act_invoice"/>
-            <field name="signal">invoice</field>
-            <field name="group_id" ref="base.group_hr_user"/>
-        </record>
-
-        <record id="t9" model="workflow.transition">
-            <field name="act_from" ref="act_invoice"/>
-            <field name="act_to" ref="act_paid"/>
-            <field name="signal">subflow.paid</field>
+            <field name="act_to" ref="act_done"/>
+            <field name="signal">done</field>
             <field name="group_id" ref="base.group_hr_user"/>
         </record>
 
diff --git a/addons/hr_expense/i18n/ar.po b/addons/hr_expense/i18n/ar.po
index 7c9882be661..ea016376e4b 100644
--- a/addons/hr_expense/i18n/ar.po
+++ b/addons/hr_expense/i18n/ar.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:51+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:23+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_expense
 #: model:process.node,name:hr_expense.process_node_confirmedexpenses0
diff --git a/addons/hr_expense/i18n/bg.po b/addons/hr_expense/i18n/bg.po
index dea8cd73ad7..13f14062320 100644
--- a/addons/hr_expense/i18n/bg.po
+++ b/addons/hr_expense/i18n/bg.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:51+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:23+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_expense
 #: model:process.node,name:hr_expense.process_node_confirmedexpenses0
diff --git a/addons/hr_expense/i18n/bs.po b/addons/hr_expense/i18n/bs.po
index ef680483b10..845717bf98e 100644
--- a/addons/hr_expense/i18n/bs.po
+++ b/addons/hr_expense/i18n/bs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:51+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:23+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_expense
 #: model:process.node,name:hr_expense.process_node_confirmedexpenses0
diff --git a/addons/hr_expense/i18n/ca.po b/addons/hr_expense/i18n/ca.po
index d075b1b7d06..469e7f3e142 100644
--- a/addons/hr_expense/i18n/ca.po
+++ b/addons/hr_expense/i18n/ca.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:51+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:23+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_expense
 #: model:process.node,name:hr_expense.process_node_confirmedexpenses0
diff --git a/addons/hr_expense/i18n/cs.po b/addons/hr_expense/i18n/cs.po
index 8c66f5f3737..5c8afa2be37 100644
--- a/addons/hr_expense/i18n/cs.po
+++ b/addons/hr_expense/i18n/cs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:51+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:23+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_expense
 #: model:process.node,name:hr_expense.process_node_confirmedexpenses0
diff --git a/addons/hr_expense/i18n/da.po b/addons/hr_expense/i18n/da.po
index 8d2a64bb83f..5980f6a2b35 100644
--- a/addons/hr_expense/i18n/da.po
+++ b/addons/hr_expense/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:51+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:23+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_expense
 #: model:process.node,name:hr_expense.process_node_confirmedexpenses0
diff --git a/addons/hr_expense/i18n/de.po b/addons/hr_expense/i18n/de.po
index d354571da8e..255e0c4492c 100644
--- a/addons/hr_expense/i18n/de.po
+++ b/addons/hr_expense/i18n/de.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:51+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:23+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_expense
 #: model:process.node,name:hr_expense.process_node_confirmedexpenses0
diff --git a/addons/hr_expense/i18n/el.po b/addons/hr_expense/i18n/el.po
index da5432deee2..fa60e298c22 100644
--- a/addons/hr_expense/i18n/el.po
+++ b/addons/hr_expense/i18n/el.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:51+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:23+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
 "X-Poedit-SourceCharset: utf-8\n"
diff --git a/addons/hr_expense/i18n/es.po b/addons/hr_expense/i18n/es.po
index f6578dd23e5..471129bbbfa 100644
--- a/addons/hr_expense/i18n/es.po
+++ b/addons/hr_expense/i18n/es.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:51+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:23+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_expense
 #: model:process.node,name:hr_expense.process_node_confirmedexpenses0
diff --git a/addons/hr_expense/i18n/es_AR.po b/addons/hr_expense/i18n/es_AR.po
index 62ea120604c..aa35571dd63 100644
--- a/addons/hr_expense/i18n/es_AR.po
+++ b/addons/hr_expense/i18n/es_AR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:51+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:23+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_expense
 #: model:process.node,name:hr_expense.process_node_confirmedexpenses0
diff --git a/addons/hr_expense/i18n/es_CR.po b/addons/hr_expense/i18n/es_CR.po
index 9a531a0df85..55a8b213cec 100644
--- a/addons/hr_expense/i18n/es_CR.po
+++ b/addons/hr_expense/i18n/es_CR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:51+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:23+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_expense
 #: model:process.node,name:hr_expense.process_node_confirmedexpenses0
diff --git a/addons/hr_expense/i18n/es_EC.po b/addons/hr_expense/i18n/es_EC.po
index 54ddf6481c2..ce6c3d4cce6 100644
--- a/addons/hr_expense/i18n/es_EC.po
+++ b/addons/hr_expense/i18n/es_EC.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:51+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:23+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_expense
 #: model:process.node,name:hr_expense.process_node_confirmedexpenses0
diff --git a/addons/hr_expense/i18n/et.po b/addons/hr_expense/i18n/et.po
index e460e300937..9ba0e00beab 100644
--- a/addons/hr_expense/i18n/et.po
+++ b/addons/hr_expense/i18n/et.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:51+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:23+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_expense
 #: model:process.node,name:hr_expense.process_node_confirmedexpenses0
diff --git a/addons/hr_expense/i18n/fi.po b/addons/hr_expense/i18n/fi.po
index f0e3e8bcfda..6276b2851e1 100644
--- a/addons/hr_expense/i18n/fi.po
+++ b/addons/hr_expense/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:51+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:23+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_expense
 #: model:process.node,name:hr_expense.process_node_confirmedexpenses0
diff --git a/addons/hr_expense/i18n/fr.po b/addons/hr_expense/i18n/fr.po
index 24fbed9c90f..ab1568e0d50 100644
--- a/addons/hr_expense/i18n/fr.po
+++ b/addons/hr_expense/i18n/fr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:51+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:23+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_expense
 #: model:process.node,name:hr_expense.process_node_confirmedexpenses0
diff --git a/addons/hr_expense/i18n/hr.po b/addons/hr_expense/i18n/hr.po
index e892196510a..bcf0f4b38a9 100644
--- a/addons/hr_expense/i18n/hr.po
+++ b/addons/hr_expense/i18n/hr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:51+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:23+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_expense
 #: model:process.node,name:hr_expense.process_node_confirmedexpenses0
diff --git a/addons/hr_expense/i18n/hu.po b/addons/hr_expense/i18n/hu.po
index 18a07e4f354..9ec3e2b86f4 100644
--- a/addons/hr_expense/i18n/hu.po
+++ b/addons/hr_expense/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:51+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:23+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_expense
 #: model:process.node,name:hr_expense.process_node_confirmedexpenses0
diff --git a/addons/hr_expense/i18n/id.po b/addons/hr_expense/i18n/id.po
index 7dc9e0ebcd4..a8d01668564 100644
--- a/addons/hr_expense/i18n/id.po
+++ b/addons/hr_expense/i18n/id.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:51+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:23+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_expense
 #: model:process.node,name:hr_expense.process_node_confirmedexpenses0
diff --git a/addons/hr_expense/i18n/it.po b/addons/hr_expense/i18n/it.po
index 07d3421a8af..d284a184581 100644
--- a/addons/hr_expense/i18n/it.po
+++ b/addons/hr_expense/i18n/it.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:51+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:23+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_expense
 #: model:process.node,name:hr_expense.process_node_confirmedexpenses0
diff --git a/addons/hr_expense/i18n/ja.po b/addons/hr_expense/i18n/ja.po
index 2e985a57521..35eb64144a0 100644
--- a/addons/hr_expense/i18n/ja.po
+++ b/addons/hr_expense/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:51+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:23+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_expense
 #: model:process.node,name:hr_expense.process_node_confirmedexpenses0
diff --git a/addons/hr_expense/i18n/ko.po b/addons/hr_expense/i18n/ko.po
index 0efe477be8f..d2de5d16b4d 100644
--- a/addons/hr_expense/i18n/ko.po
+++ b/addons/hr_expense/i18n/ko.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:51+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:23+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_expense
 #: model:process.node,name:hr_expense.process_node_confirmedexpenses0
diff --git a/addons/hr_expense/i18n/lt.po b/addons/hr_expense/i18n/lt.po
index 8c66f5f3737..5c8afa2be37 100644
--- a/addons/hr_expense/i18n/lt.po
+++ b/addons/hr_expense/i18n/lt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:51+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:23+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_expense
 #: model:process.node,name:hr_expense.process_node_confirmedexpenses0
diff --git a/addons/hr_expense/i18n/lv.po b/addons/hr_expense/i18n/lv.po
index ae8d59c5a36..2d1db213f0e 100644
--- a/addons/hr_expense/i18n/lv.po
+++ b/addons/hr_expense/i18n/lv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:51+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:23+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_expense
 #: model:process.node,name:hr_expense.process_node_confirmedexpenses0
diff --git a/addons/hr_expense/i18n/mn.po b/addons/hr_expense/i18n/mn.po
index 37807c888a8..9bda3bfb8ed 100644
--- a/addons/hr_expense/i18n/mn.po
+++ b/addons/hr_expense/i18n/mn.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:51+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:23+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_expense
 #: model:process.node,name:hr_expense.process_node_confirmedexpenses0
diff --git a/addons/hr_expense/i18n/nl.po b/addons/hr_expense/i18n/nl.po
index 4cfdcf12ce7..1121bd49fb9 100644
--- a/addons/hr_expense/i18n/nl.po
+++ b/addons/hr_expense/i18n/nl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:51+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:23+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_expense
 #: model:process.node,name:hr_expense.process_node_confirmedexpenses0
diff --git a/addons/hr_expense/i18n/nl_BE.po b/addons/hr_expense/i18n/nl_BE.po
index e1c8196a24a..19a0d729fdf 100644
--- a/addons/hr_expense/i18n/nl_BE.po
+++ b/addons/hr_expense/i18n/nl_BE.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:51+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:23+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_expense
 #: model:process.node,name:hr_expense.process_node_confirmedexpenses0
diff --git a/addons/hr_expense/i18n/pl.po b/addons/hr_expense/i18n/pl.po
index c2af5fca653..2681b204b6b 100644
--- a/addons/hr_expense/i18n/pl.po
+++ b/addons/hr_expense/i18n/pl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:51+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:23+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_expense
 #: model:process.node,name:hr_expense.process_node_confirmedexpenses0
diff --git a/addons/hr_expense/i18n/pt.po b/addons/hr_expense/i18n/pt.po
index 33be0c31d33..2edf6ba41a9 100644
--- a/addons/hr_expense/i18n/pt.po
+++ b/addons/hr_expense/i18n/pt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:51+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:23+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_expense
 #: model:process.node,name:hr_expense.process_node_confirmedexpenses0
diff --git a/addons/hr_expense/i18n/pt_BR.po b/addons/hr_expense/i18n/pt_BR.po
index d5f8e80b415..acc05f5ac0c 100644
--- a/addons/hr_expense/i18n/pt_BR.po
+++ b/addons/hr_expense/i18n/pt_BR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:51+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:23+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_expense
 #: model:process.node,name:hr_expense.process_node_confirmedexpenses0
diff --git a/addons/hr_expense/i18n/ro.po b/addons/hr_expense/i18n/ro.po
index b8b14054f73..c4e8aa20da0 100644
--- a/addons/hr_expense/i18n/ro.po
+++ b/addons/hr_expense/i18n/ro.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:51+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:23+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_expense
 #: model:process.node,name:hr_expense.process_node_confirmedexpenses0
diff --git a/addons/hr_expense/i18n/ru.po b/addons/hr_expense/i18n/ru.po
index 55e30b96841..d3cec2faec2 100644
--- a/addons/hr_expense/i18n/ru.po
+++ b/addons/hr_expense/i18n/ru.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:51+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:23+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_expense
 #: model:process.node,name:hr_expense.process_node_confirmedexpenses0
diff --git a/addons/hr_expense/i18n/sl.po b/addons/hr_expense/i18n/sl.po
index 20052d7bbb4..6372bf93892 100644
--- a/addons/hr_expense/i18n/sl.po
+++ b/addons/hr_expense/i18n/sl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:51+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:23+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_expense
 #: model:process.node,name:hr_expense.process_node_confirmedexpenses0
diff --git a/addons/hr_expense/i18n/sq.po b/addons/hr_expense/i18n/sq.po
index 992e59194f3..7ffdb34e93f 100644
--- a/addons/hr_expense/i18n/sq.po
+++ b/addons/hr_expense/i18n/sq.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:51+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:23+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_expense
 #: model:process.node,name:hr_expense.process_node_confirmedexpenses0
diff --git a/addons/hr_expense/i18n/sr.po b/addons/hr_expense/i18n/sr.po
index d8d22bc1a80..b6d7a5513e3 100644
--- a/addons/hr_expense/i18n/sr.po
+++ b/addons/hr_expense/i18n/sr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:51+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:23+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_expense
 #: model:process.node,name:hr_expense.process_node_confirmedexpenses0
diff --git a/addons/hr_expense/i18n/sr@latin.po b/addons/hr_expense/i18n/sr@latin.po
index 5dac268b40b..63c05e62644 100644
--- a/addons/hr_expense/i18n/sr@latin.po
+++ b/addons/hr_expense/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:51+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:23+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_expense
 #: model:process.node,name:hr_expense.process_node_confirmedexpenses0
diff --git a/addons/hr_expense/i18n/sv.po b/addons/hr_expense/i18n/sv.po
index dafa9c1d1b7..f45aa614059 100644
--- a/addons/hr_expense/i18n/sv.po
+++ b/addons/hr_expense/i18n/sv.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:51+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:23+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_expense
 #: model:process.node,name:hr_expense.process_node_confirmedexpenses0
diff --git a/addons/hr_expense/i18n/tlh.po b/addons/hr_expense/i18n/tlh.po
index a07fa61b338..4cc4635d919 100644
--- a/addons/hr_expense/i18n/tlh.po
+++ b/addons/hr_expense/i18n/tlh.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:51+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:23+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_expense
 #: model:process.node,name:hr_expense.process_node_confirmedexpenses0
diff --git a/addons/hr_expense/i18n/tr.po b/addons/hr_expense/i18n/tr.po
index 659d31f1322..185a0e007d3 100644
--- a/addons/hr_expense/i18n/tr.po
+++ b/addons/hr_expense/i18n/tr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:51+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:23+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_expense
 #: model:process.node,name:hr_expense.process_node_confirmedexpenses0
diff --git a/addons/hr_expense/i18n/uk.po b/addons/hr_expense/i18n/uk.po
index e0372c2e485..bf944e16e45 100644
--- a/addons/hr_expense/i18n/uk.po
+++ b/addons/hr_expense/i18n/uk.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:51+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:23+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_expense
 #: model:process.node,name:hr_expense.process_node_confirmedexpenses0
diff --git a/addons/hr_expense/i18n/vi.po b/addons/hr_expense/i18n/vi.po
index 828177d4e68..44b11e4bfd3 100644
--- a/addons/hr_expense/i18n/vi.po
+++ b/addons/hr_expense/i18n/vi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:51+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:23+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_expense
 #: model:process.node,name:hr_expense.process_node_confirmedexpenses0
diff --git a/addons/hr_expense/i18n/zh_CN.po b/addons/hr_expense/i18n/zh_CN.po
index 80f092ebbf6..96fce992590 100644
--- a/addons/hr_expense/i18n/zh_CN.po
+++ b/addons/hr_expense/i18n/zh_CN.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:51+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:23+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_expense
 #: model:process.node,name:hr_expense.process_node_confirmedexpenses0
diff --git a/addons/hr_expense/i18n/zh_TW.po b/addons/hr_expense/i18n/zh_TW.po
index d2eb967784a..3d3ea17fe7b 100644
--- a/addons/hr_expense/i18n/zh_TW.po
+++ b/addons/hr_expense/i18n/zh_TW.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:51+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:23+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_expense
 #: model:process.node,name:hr_expense.process_node_confirmedexpenses0
diff --git a/addons/hr_expense/report/hr_expense_report.py b/addons/hr_expense/report/hr_expense_report.py
index adef11f5269..72bf710ec4f 100644
--- a/addons/hr_expense/report/hr_expense_report.py
+++ b/addons/hr_expense/report/hr_expense_report.py
@@ -39,11 +39,10 @@ class hr_expense_report(osv.osv):
         'product_id':fields.many2one('product.product', 'Product', readonly=True),
         'journal_id': fields.many2one('account.journal', 'Force Journal', readonly=True),
         'product_qty':fields.float('Qty', readonly=True),
-        'invoiced':fields.integer('# of Invoiced Lines', readonly=True),
         'employee_id': fields.many2one('hr.employee', "Employee's Name", readonly=True),
         'date_confirm': fields.date('Confirmation Date', readonly=True),
         'date_valid': fields.date('Validation Date', readonly=True),
-        'invoice_id': fields.many2one('account.invoice', 'Invoice', readonly=True),
+        'voucher_id': fields.many2one('account.voucher', 'Receipt', readonly=True),
         'department_id':fields.many2one('hr.department','Department', readonly=True),
         'company_id':fields.many2one('res.company', 'Company', readonly=True),
         'user_id':fields.many2one('res.users', 'Validation User', readonly=True),
@@ -60,8 +59,7 @@ class hr_expense_report(osv.osv):
             ('draft', 'Draft'),
             ('confirm', 'Waiting confirmation'),
             ('accepted', 'Accepted'),
-            ('invoiced', 'Invoiced'),
-            ('paid', 'Reimbursed'),
+            ('done', 'Done'),
             ('cancelled', 'Cancelled')],
             'Status', readonly=True),
     }
@@ -78,8 +76,7 @@ class hr_expense_report(osv.osv):
                      s.currency_id,
                      to_date(to_char(s.date_confirm, 'dd-MM-YYYY'),'dd-MM-YYYY') as date_confirm,
                      to_date(to_char(s.date_valid, 'dd-MM-YYYY'),'dd-MM-YYYY') as date_valid,
-                     s.invoice_id,
-                     count(s.invoice_id) as invoiced,
+                     s.voucher_id,
                      s.user_valid as user_id,
                      s.department_id,
                      to_char(date_trunc('day',s.create_date), 'YYYY') as year,
@@ -109,7 +106,7 @@ class hr_expense_report(osv.osv):
                      to_date(to_char(s.date_valid, 'dd-MM-YYYY'),'dd-MM-YYYY'),
                      l.product_id,
                      l.analytic_account,
-                     s.invoice_id,
+                     s.voucher_id,
                      s.currency_id,
                      s.user_valid,
                      s.department_id,
diff --git a/addons/hr_expense/report/hr_expense_report_view.xml b/addons/hr_expense/report/hr_expense_report_view.xml
index 890568abc44..1cd1e10c5ed 100644
--- a/addons/hr_expense/report/hr_expense_report_view.xml
+++ b/addons/hr_expense/report/hr_expense_report_view.xml
@@ -6,13 +6,13 @@
         <field name="name">hr.expense.report.tree</field>
         <field name="model">hr.expense.report</field>
         <field name="arch" type="xml">
-            <tree colors="blue:state == 'draft';black:state in ('confirm','accepted','invoiced','paid');gray:state == 'cancelled'" string="Expenses Analysis">
+            <tree colors="blue:state == 'draft';black:state in ('confirm','accepted','done');gray:state == 'cancelled'" string="Expenses Analysis">
                 <field name="employee_id" invisible="1"/>
                 <field name="user_id" invisible="1"/>
                 <field name="year" invisible="1"/>
                 <field name="month" invisible="1"/>
                 <field name="day" invisible="1"/>
-                <field name="invoice_id" invisible="1"/>
+                <field name="voucher_id" invisible="1"/>
                 <field name="analytic_account" invisible="1" groups="analytic.group_analytic_accounting"/>
                 <field name="department_id" invisible="1"/>
                 <field name="company_id" invisible="1"/>
@@ -22,7 +22,6 @@
                 <field name="state" invisible="1"/>
                 <field name="nbr" sum="# of Lines"/>
                 <field name="no_of_products" sum="# of Products"/>
-                <field name="invoiced" sum="Total Invoiced Lines"/>
                 <field name="price_average" avg="Average Price"/>
                 <field name="price_total" sum="Total Price"/>
                 <field name="delay_confirm"/>
@@ -50,7 +49,7 @@
             <search string="Expenses Analysis">
                 <filter string="Waiting" icon="terp-gtk-media-pause" domain="[('state', '=' ,'confirm')]" help = "Confirm Expenses"/>
                 <filter string="Approved" icon="terp-check" domain="[('state','=','accepted')]" help = "Approved Expenses"/>
-                <filter string="Invoiced" icon="terp-dolar" domain="[('state','in', ('invoiced', 'paid'))]" help = "Invoiced Expenses"/>
+                <filter string="Done" icon="terp-dolar" domain="[('state','=', 'done')]" help = "Done Expenses"/>
                 <field name="employee_id"/>
                 <field name="department_id"/>
                 <group expand="0" string="Extended Filters...">
diff --git a/addons/hr_expense/test/expense_process.yml b/addons/hr_expense/test/expense_process.yml
index 5c8a9d53f7c..eae63c460fc 100644
--- a/addons/hr_expense/test/expense_process.yml
+++ b/addons/hr_expense/test/expense_process.yml
@@ -17,33 +17,20 @@
   !assert {model: hr.expense.expense, id: sep_expenses, severity: error, string: Expense should be in Approved state}:
     - state == 'accepted'
 -
-  I make Invoice for the expense.
+  I make Receipt for the expense.
 -
-  !python {model: hr.expense.expense}: |
-    self.invoice(cr, uid, [ref('sep_expenses')])
+  !workflow {model: hr.expense.expense, action: done, ref: sep_expenses}
 -
-  I check invoice details.
+  I check receipt details.
 -
   !python {model: hr.expense.expense}: |
     sep_expenses = self.browse(cr, uid, ref("sep_expenses"), context=context)
-    assert sep_expenses.state == 'invoiced', "Expense should be in 'Invoiced' state."
-    assert sep_expenses.invoice_id, "Expense should have link of Invoice."
-    assert sep_expenses.invoice_id.currency_id == sep_expenses.currency_id,"Invoice currency is not correspond with supplier invoice currency"
-    assert sep_expenses.invoice_id.origin == sep_expenses.name,"Invoice origin is not correspond with supplier invoice"
-    assert sep_expenses.invoice_id.type == 'in_invoice', "Invoice type is not supplier invoice"
-    assert sep_expenses.invoice_id.amount_total == sep_expenses.amount,"Invoice total amount is not correspond with supplier invoice total"
-    assert len(sep_expenses.invoice_id.invoice_line) == len(sep_expenses.line_ids),"Lines of Invoice and supplier invoice Line are not correspond"
-    #TODO: check invoice line details with Expenses lines
--
-  I pay the expenses.
--
-  !python {model: hr.expense.expense}: |
-    self.expense_paid(cr, uid, [ref('sep_expenses')])
--
-  I check that state of expenses is 'Paid'.
--
-  !assert {model: hr.expense.expense, id: sep_expenses, severity: error, string: Expense should be in Paid state}:
-    - state == 'paid'
+    assert sep_expenses.state == 'done', "Expense should be in 'Done' state."
+    assert sep_expenses.voucher_id, "Expense should have link of Purchase Receipt."
+    assert sep_expenses.voucher_id.type == 'purchase', "Receipt type is not purchase receipt."
+    assert sep_expenses.voucher_id.amount == sep_expenses.amount,"Receipt total amount is not correspond with expense total."
+    assert len(sep_expenses.voucher_id.line_dr_ids) == len(sep_expenses.line_ids),"Lines of Receipt and expense line are not correspond."
+
 -
   I duplicate the expenses and cancel duplicated.
 -
diff --git a/addons/hr_holidays/__openerp__.py b/addons/hr_holidays/__openerp__.py
index 45dd9ea39a5..070ae0344b0 100644
--- a/addons/hr_holidays/__openerp__.py
+++ b/addons/hr_holidays/__openerp__.py
@@ -21,43 +21,45 @@
 
 
 {
-    "name": "Leaves Management",
-    "version": "1.5",
-    "author": "OpenERP SA",
-    "category": "Human Resources",
-    "sequence": 28,
-    "summary": "Holidays, Allocation and Leave Requests",
-    "website": "http://www.openerp.com",
-    "description": """
-This module allows you to manage leaves and leave's requests.
-=============================================================
+    'name': 'Leave Management',
+    'version': '1.5',
+    'author': 'OpenERP SA',
+    'category': 'Human Resources',
+    'sequence': 28,
+    'summary': 'Holidays, Allocation and Leave Requests',
+    'website': 'http://www.openerp.com',
+    'description': """
+This module allows you to manage leaves and leave requests.
+===========================================================
 
 Implements a dashboard for human resource management that includes:
 -------------------------------------------------------------------
     * Leaves
 
 Note that:
+~~~~~~~~~~
     - A synchronisation with an internal agenda (use of the CRM module) is
       possible: in order to automatically create a case when an holiday request
       is accepted, you have to link the holidays status to a case section. You
       can setup this info and your colour preferences in
-                Human Resources/Configuration/Leave Type
+      
+          **Human Resources** / **Configuration** / **Leave Type**
     - An employee can make an ask for more off-days by making a new Allocation. It will increase his total of that leave type available (if the request is accepted).
     - There are two ways to print the employee's holidays:
         * The first will allow to choose employees by department and is used by clicking the menu item located in
-                Reporting/Human Resources/Leaves/Leaves by Department
+                **Reporting** / **Human Resources** / **Leaves** / **Leaves by Department**
         * The second will allow you to choose the holidays report for specific employees. Go on the list
-                Human Resources/Human Resources/Employees
+                **Human Resources** / **Human Resources** / **Employees**
                 then select the ones you want to choose, click on the print icon and select the option
                 'Leaves Summary'
     - The wizard allows you to choose if you want to print either the Approved & Confirmed holidays or both. These states must be set up by a user from the group 'HR'. You can define these features in the security tab from the user data in
-                Settings/Users/Users
+                **Settings** / **Users** / **Users**
+                
                 for example, you maybe will do it for the user 'admin'.
 """,
     'images': ['images/hr_allocation_requests.jpeg', 'images/hr_leave_requests.jpeg', 'images/leaves_analysis.jpeg'],
     'depends': ['hr', 'base_calendar', 'process', 'resource'],
-    'init_xml': [],
-    'update_xml': [
+    'data': [
         'security/ir.model.access.csv',
         'security/ir_rule.xml',
         'hr_holidays_workflow.xml',
@@ -70,10 +72,10 @@ Note that:
         'wizard/hr_holidays_summary_employees_view.xml',
         'board_hr_holidays_view.xml',
         ],
-    'demo_xml': ['hr_holidays_demo.xml',],
+    'demo': ['hr_holidays_demo.xml',],
     'test': ['test/test_hr_holiday.yml',
              'test/hr_holidays_report.yml',
-             ],
+    ],
     'installable': True,
     'application': True,
     'auto_install': False,
diff --git a/addons/hr_holidays/hr_holidays.py b/addons/hr_holidays/hr_holidays.py
index 45c65511a1a..759170224bd 100644
--- a/addons/hr_holidays/hr_holidays.py
+++ b/addons/hr_holidays/hr_holidays.py
@@ -25,6 +25,7 @@ import datetime, time
 from itertools import groupby
 from operator import itemgetter
 
+import math
 import netsvc
 from osv import fields, osv
 from tools.translate import _
@@ -94,7 +95,7 @@ class hr_holidays(osv.osv):
     _name = "hr.holidays"
     _description = "Leave"
     _order = "type desc, date_from asc"
-    _inherit = ['ir.needaction_mixin', 'mail.thread']
+    _inherit = [ 'mail.thread','ir.needaction_mixin']
 
     def _employee_get(self, cr, uid, context=None):
         ids = self.pool.get('hr.employee').search(cr, uid, [('user_id', '=', uid)], context=context)
@@ -112,7 +113,7 @@ class hr_holidays(osv.osv):
         return result
 
     _columns = {
-        'name': fields.char('Description', required=True, size=64),
+        'name': fields.char('Description', size=64),
         'state': fields.selection([('draft', 'To Submit'), ('cancel', 'Cancelled'),('confirm', 'To Approve'), ('refuse', 'Refused'), ('validate1', 'Second Approval'), ('validate', 'Approved')],
             'State', readonly=True, help='The state is set to \'To Submit\', when a holiday request is created.\
             \nThe state is \'To Approve\', when holiday request is confirmed by user.\
@@ -123,8 +124,6 @@ class hr_holidays(osv.osv):
         'date_to': fields.datetime('End Date', readonly=True, states={'draft':[('readonly',False)], 'confirm':[('readonly',False)]}),
         'holiday_status_id': fields.many2one("hr.holidays.status", "Leave Type", required=True,readonly=True, states={'draft':[('readonly',False)], 'confirm':[('readonly',False)]}),
         'employee_id': fields.many2one('hr.employee', "Employee", select=True, invisible=False, readonly=True, states={'draft':[('readonly',False)], 'confirm':[('readonly',False)]}, help='Leave Manager can let this field empty if this leave request/allocation is for every employee'),
-        #'manager_id': fields.many2one('hr.employee', 'Leave Manager', invisible=False, readonly=True, help='This area is automatically filled by the user who validate the leave'),
-        #'notes': fields.text('Notes',readonly=True, states={'draft':[('readonly',False)]}),
         'manager_id': fields.many2one('hr.employee', 'First Approval', invisible=False, readonly=True, help='This area is automatically filled by the user who validate the leave'),
         'notes': fields.text('Reasons',readonly=True, states={'draft':[('readonly',False)], 'confirm':[('readonly',False)]}),
         'number_of_days_temp': fields.float('Number of Days', readonly=True, states={'draft':[('readonly',False)], 'confirm':[('readonly',False)]}),
@@ -134,8 +133,8 @@ class hr_holidays(osv.osv):
         'parent_id': fields.many2one('hr.holidays', 'Parent'),
         'linked_request_ids': fields.one2many('hr.holidays', 'parent_id', 'Linked Requests',),
         'department_id':fields.related('employee_id', 'department_id', string='Department', type='many2one', relation='hr.department', readonly=True, store=True),
-        'category_id': fields.many2one('hr.employee.category', "Category", help='Category of Employee'),
-        'holiday_type': fields.selection([('employee','By Employee'),('category','By Employee Category')], 'Allocation Type', help='By Employee: Allocation/Request for individual Employee, By Employee Category: Allocation/Request for group of employees in category', required=True),
+        'category_id': fields.many2one('hr.employee.category', "Category", help='Category of Employee', readonly=True, states={'draft':[('readonly',False)], 'confirm':[('readonly',False)]}),
+        'holiday_type': fields.selection([('employee','By Employee'),('category','By Employee Category')], 'Allocation Mode', readonly=True, states={'draft':[('readonly',False)], 'confirm':[('readonly',False)]}, help='By Employee: Allocation/Request for individual Employee, By Employee Category: 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'),
     }
@@ -147,16 +146,11 @@ class hr_holidays(osv.osv):
         'holiday_type': 'employee'
     }
     _sql_constraints = [
-        ('type_value', "CHECK( (holiday_type='employee' AND employee_id IS NOT NULL) or (holiday_type='category' AND category_id IS NOT NULL))", "You have to select an employee or a category."),
+        ('type_value', "CHECK( (holiday_type='employee' AND employee_id IS NOT NULL) or (holiday_type='category' AND category_id IS NOT NULL))", "The employee or employee category of this request is missing."),
         ('date_check2', "CHECK ( (type='add') OR (date_from <= date_to))", "The start date must be before the end date !"),
         ('date_check', "CHECK ( number_of_days_temp >= 0 )", "The number of days must be greater than 0 !"),
     ]
     
-    def create(self, cr, uid, vals, context=None):
-        obj_id = super(hr_holidays, self).create(cr, uid, vals, context=context)
-        self.create_notificate(cr, uid, [obj_id], context=context)
-        return obj_id
-    
     def _create_resource_leave(self, cr, uid, leaves, context=None):
         '''This method will create entry in resource calendar leave object at the time of holidays validated '''
         obj_res_leave = self.pool.get('resource.calendar.leaves')
@@ -201,8 +195,8 @@ class hr_holidays(osv.osv):
 
     def unlink(self, cr, uid, ids, context=None):
         for rec in self.browse(cr, uid, ids, context=context):
-            if rec.state<>'draft':
-                raise osv.except_osv(_('Warning!'),_('You cannot delete a leave which is not in draft state !'))
+            if rec.state not in ['draft', 'cancel', 'confirm']:
+                raise osv.except_osv(_('Warning!'),_('You cannot delete a leave which is in %s state!')%(rec.state))
         return super(hr_holidays, self).unlink(cr, uid, ids, context)
 
     def onchange_date_from(self, cr, uid, ids, date_to, date_from):
@@ -210,7 +204,7 @@ class hr_holidays(osv.osv):
         if date_to and date_from:
             diff_day = self._get_number_of_days(date_from, date_to)
             result['value'] = {
-                'number_of_days_temp': round(diff_day)+1
+                'number_of_days_temp': round(math.floor(diff_day))+1
             }
             return result
         result['value'] = {
@@ -244,29 +238,30 @@ class hr_holidays(osv.osv):
             self.unlink(cr, uid, to_unlink, context=context)
         return True
 
-    def holidays_validate(self, cr, uid, ids, context=None):
+    def holidays_first_validate(self, cr, uid, ids, context=None):
         self.check_holidays(cr, uid, ids, context=context)
         obj_emp = self.pool.get('hr.employee')
         ids2 = obj_emp.search(cr, uid, [('user_id', '=', uid)])
         manager = ids2 and ids2[0] or False
-        self.holidays_validate_notificate(cr, uid, ids, context=context)
+        self.holidays_first_validate_notificate(cr, uid, ids, context=context)
         return self.write(cr, uid, ids, {'state':'validate1', 'manager_id': manager})
 
-    def holidays_validate2(self, cr, uid, ids, context=None):
+    def holidays_validate(self, cr, uid, ids, context=None):
         self.check_holidays(cr, uid, ids, context=context)
         obj_emp = self.pool.get('hr.employee')
         ids2 = obj_emp.search(cr, uid, [('user_id', '=', uid)])
         manager = ids2 and ids2[0] or False
         self.write(cr, uid, ids, {'state':'validate'})
         data_holiday = self.browse(cr, uid, ids)
-        holiday_ids = []
         for record in data_holiday:
-            if record.holiday_status_id.double_validation:
-                holiday_ids.append(record.id)
+            if record.double_validation:
+                self.write(cr, uid, [record.id], {'manager_id2': manager})
+            else:
+                self.write(cr, uid, [record.id], {'manager_id': manager})
             if record.holiday_type == 'employee' and record.type == 'remove':
                 meeting_obj = self.pool.get('crm.meeting')
                 meeting_vals = {
-                    'name': record.name,
+                    'name': record.name or _('Leave Request'),
                     'categ_ids': record.holiday_status_id.categ_id and [(6,0,[record.holiday_status_id.categ_id.id])] or [],
                     'duration': record.number_of_days_temp * 8,
                     'description': record.notes,
@@ -274,7 +269,7 @@ class hr_holidays(osv.osv):
                     'date': record.date_from,
                     'end_date': record.date_to,
                     'date_deadline': record.date_to,
-                    'state': 'done',            # to block that meeting date in the calendar
+                    'state': 'open',            # to block that meeting date in the calendar
                 }
                 meeting_id = meeting_obj.create(cr, uid, meeting_vals)
                 self._create_resource_leave(cr, uid, [record], context=context)
@@ -301,25 +296,27 @@ class hr_holidays(osv.osv):
                     wf_service.trg_validate(uid, 'hr.holidays', leave_id, 'confirm', cr)
                     wf_service.trg_validate(uid, 'hr.holidays', leave_id, 'validate', cr)
                     wf_service.trg_validate(uid, 'hr.holidays', leave_id, 'second_validate', cr)
-        if holiday_ids:
-            self.holidays_valid2_notificate(cr, uid, holiday_ids, context=context)
-            self.write(cr, uid, holiday_ids, {'manager_id2': manager})
+        self.holidays_validate_notificate(cr, uid, ids, context=context)
         return True
 
     def holidays_confirm(self, cr, uid, ids, context=None):
         self.check_holidays(cr, uid, ids, context=context)
+        for record in self.browse(cr, uid, ids, context=context):
+            if record.employee_id and record.employee_id.parent_id and record.employee_id.parent_id.user_id:
+                self.message_subscribe(cr, uid, [record.id], user_ids=[record.employee_id.parent_id.user_id.id], context=context)
         self.holidays_confirm_notificate(cr, uid, ids, context=context)
         return self.write(cr, uid, ids, {'state':'confirm'})
 
-    def holidays_refuse(self, cr, uid, ids, approval, context=None):
+    def holidays_refuse(self, cr, uid, ids, context=None):
         obj_emp = self.pool.get('hr.employee')
         ids2 = obj_emp.search(cr, uid, [('user_id', '=', uid)])
         manager = ids2 and ids2[0] or False
-        if approval == 'first_approval':
-            self.write(cr, uid, ids, {'state': 'refuse', 'manager_id': manager})
-        else:
-            self.write(cr, uid, ids, {'state': 'refuse', 'manager_id2': manager})
-        self.holidays_refuse_notificate(cr, uid, ids, approval, context=context)
+        for holiday in self.browse(cr, uid, ids, context=context):
+            if holiday.state == 'validate1':
+                self.write(cr, uid, [holiday.id], {'state': 'refuse', 'manager_id': manager})
+            else:
+                self.write(cr, uid, [holiday.id], {'state': 'refuse', 'manager_id2': manager})
+        self.holidays_refuse_notificate(cr, uid, ids, context=context)
         self.holidays_cancel(cr, uid, ids, context=context)
         return True
 
@@ -333,7 +330,7 @@ class hr_holidays(osv.osv):
             # If a category that created several holidays, cancel all related
             wf_service = netsvc.LocalService("workflow")
             for request in record.linked_request_ids or []:
-                wf_service.trg_validate(uid, 'hr.holidays', request.id, 'cancel', cr)
+                wf_service.trg_validate(uid, 'hr.holidays', request.id, 'refuse', cr)
 
         self._remove_resource_leave(cr, uid, ids, context=context)
         return True
@@ -347,68 +344,53 @@ class hr_holidays(osv.osv):
                     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))
         return True
-    
+
     # -----------------------------
     # OpenChatter and notifications
     # -----------------------------
-    
-    def get_needaction_user_ids(self, cr, uid, ids, context=None):
-        result = super(hr_holidays, self).get_needaction_user_ids(cr, uid, ids, context=context)
-        for obj in self.browse(cr, uid, ids, context=context):
-            if obj.state == 'confirm' and obj.employee_id.parent_id:
-                result[obj.id] = [obj.employee_id.parent_id.user_id.id]
-            elif obj.state == 'validate1':
-                # get group_hr_manager: everyone will be warned of second validation
-                res = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'base', 'group_hr_manager') or False
-                obj_id = res and res[1] or False
-                if obj_id:
-                    hr_manager_group = self.pool.get('res.groups').read(cr, uid, [obj_id], ['users'], context=context)[0]
-                    result[obj.id] = hr_manager_group['users']
-        return result
 
-    def message_get_monitored_follower_fields(self, cr, uid, ids, context=None):
-        """ Add 'user_id' and 'manager' to the monitored fields """
-        res = super(hr_holidays, self).message_get_monitored_follower_fields(cr, uid, ids, context=context)
-        # TODO: add manager
-        return res + ['user_id']
-        
+    def needaction_domain_get(self, cr, uid, ids, context=None):
+        # to be tested, otherwise convert into employee_id in ...
+        emp_obj = self.pool.get('hr.employee')
+        empids = emp_obj.search(cr, uid, [('parent_id.user_id','=',uid)], context=context)
+        dom = [
+            '&', ('state','=','confirm'),('employee_id', 'in', empids)
+        ]
+        # if this user is a hr.manager, he should do second validations
+        if self.pool.get('res.users').has_group(cr, uid, 'base.group_hr_manager'):
+            dom = ['|'] + dom + [ ('state','=','validate1') ]
+        return dom
+
     def create_notificate(self, cr, uid, ids, context=None):
         for obj in self.browse(cr, uid, ids, context=context):
-            self.message_append_note(cr, uid, ids, _('System notification'),
-                        _("The %s request has been <b>created</b> and is waiting confirmation.")
-                        % ('leave' if obj.type == 'remove' else 'allocation',), type='notification', context=context)
+            self.message_post(cr, uid, ids, 
+                _("The request has been <b>created</b> and is waiting confirmation."), context=context)
         return True
     
     def holidays_confirm_notificate(self, cr, uid, ids, context=None):
         for obj in self.browse(cr, uid, ids):
-            self.message_append_note(cr, uid, [obj.id], _('System notification'), 
-                    _("The %s request has been <b>confirmed</b> and is waiting for validation by the manager.")
-                    % ('leave' if obj.type == 'remove' else 'allocation',), type='notification')
+            self.message_post(cr, uid, [obj.id],
+                _("The request has been <b>submitted</b> and is waiting for validation by the manager."), context=context)
     
+    def holidays_first_validate_notificate(self, cr, uid, ids, context=None):
+        for obj in self.browse(cr, uid, ids, context=context):
+            self.message_post(cr, uid, [obj.id],
+                _("The request has been <b>approved</b>. A second validation is necessary and is now pending."), context=context)
+            
     def holidays_validate_notificate(self, cr, uid, ids, context=None):
         for obj in self.browse(cr, uid, ids):
-            if obj.holiday_status_id.double_validation:
-                self.message_append_note(cr, uid, [obj.id], _('System notification'),
-                    _("The %s request has been <b>approved</b>. A second validation is necessary and is now pending.")
-                    % ('leave' if obj.type == 'remove' else 'allocation',), type='notification', context=context)
+            if obj.double_validation:
+                self.message_post(cr, uid, [obj.id], 
+                    _("The request has been <b>double validated</b>. The validation process is now over."), context=context)
             else:
-                self.message_append_note(cr, uid, [obj.id], _('System notification'),
-                    _("The %s request has been <b>approved</b>. The validation process is now over.")
-                    % ('leave' if obj.type == 'remove' else 'allocation',), type='notification', context=context)
+                self.message_post(cr, uid, [obj.id],
+                    _("The request has been <b>approved</b>. The validation process is now over."), context=context)
     
-    def holidays_valid2_notificate(self, cr, uid, ids, context=None):
+    def holidays_refuse_notificate(self, cr, uid, ids, context=None):
         for obj in self.browse(cr, uid, ids):
-            self.message_append_note(cr, uid, [obj.id], _('System notification'),
-                    _("The %s request has been <b>double validated</b>. The validation process is now over.")
-                    % ('leave' if obj.type == 'remove' else 'allocation',), type='notification', context=context)
-    
-    def holidays_refuse_notificate(self, cr, uid, ids, approval, context=None):
-        for obj in self.browse(cr, uid, ids):
-            self.message_append_note(cr, uid, [obj.id], _('System notification'),
-                    _("The %s request has been <b>refused</b>. The validation process is now over.")
-                    % ('leave' if obj.type == 'remove' else 'allocation',), type='notification', context=context)
-    
-hr_holidays()
+            self.message_post(cr, uid, [obj.id],
+                _("The request has been <b>refused</b>. The validation process is now over."),  context=context)
+
 
 class resource_calendar_leaves(osv.osv):
     _inherit = "resource.calendar.leaves"
diff --git a/addons/hr_holidays/hr_holidays_data.xml b/addons/hr_holidays/hr_holidays_data.xml
index 9db0f2e987a..1e534093eb3 100644
--- a/addons/hr_holidays/hr_holidays_data.xml
+++ b/addons/hr_holidays/hr_holidays_data.xml
@@ -13,12 +13,15 @@
             <field name="sequence">100</field>
         </record>
         <!-- notify all employees of module installation -->
-        <function model="mail.group" name="message_append_note">
-            <!-- ids, subject, body, parent_id=False, type='notification', content_subtype='html' -->
-            <value eval="[ref('mail.group_all_employees')]"/>
-            <value>Module Leaves Management has been installed</value>
-            <value>Manage employee leaves from the top menu "Human Resources". Employees can create leave requests that are validated by their manager and/or HR people.  Once validated, they are visible in the employee's calendar.  HR people can define leave types and allocate off-days for employees.</value>
-        </function>
+        <record model="mail.message" id="module_install_notification">
+            <field name="model">mail.group</field>
+            <field name="res_id" ref="mail.group_all_employees"/>
+            <field name="type">notification</field>
+            <field name="subject">Leave Management application installed!</field>
+            <field name="body">Manage employee leaves from the top menu "Human Resources". Employees can create leave requests that are validated by their manager and/or HR officers.
+Once validated, they are visible in the employee's calendar. HR officers can define leave types and allocate leaves to employees and employee categories.</field>
+        </record>
+
 
         <!-- Casual leave -->
         <record model="hr.holidays.status" id="holiday_status_cl">
diff --git a/addons/hr_holidays/hr_holidays_demo.xml b/addons/hr_holidays/hr_holidays_demo.xml
index 6ad5a442a38..4c9d18683c7 100644
--- a/addons/hr_holidays/hr_holidays_demo.xml
+++ b/addons/hr_holidays/hr_holidays_demo.xml
@@ -12,7 +12,7 @@
 
     <record model="hr.holidays" id="hr_holidays_employee1_cl">
       <field name="name">Trip with Family</field>
-      <field name="holiday_status_id" ref="holiday_status_cl"/>
+      <field name="holiday_status_id" ref="holiday_status_comp"/>
       <field eval="time.strftime('%Y-%m-01')" name="date_from"/>
       <field eval="time.strftime('%Y-%m-03')" name="date_to"/>
       <field name="type">remove</field>
@@ -52,13 +52,10 @@
       <field name="employee_id" ref="hr.employee_fp"/>
     </record>
 
-    <workflow action="confirm" model="hr.holidays" ref="hr_holidays_employee1_allocation_cl"/>
     <workflow action="validate" model="hr.holidays" ref="hr_holidays_employee1_allocation_cl"/>
 
-    <workflow action="confirm" model="hr.holidays" ref="hr_holidays_employee1_sl"/>
     <workflow action="validate" model="hr.holidays" ref="hr_holidays_employee1_sl"/>
 
-    <workflow action="confirm" model="hr.holidays" ref="hr_holidays_employee1_int_tour"/>
     <workflow action="validate" model="hr.holidays" ref="hr_holidays_employee1_int_tour"/>
   </data>
 </openerp>
diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index 711d07bbfe8..5a2e0603b88 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -44,7 +44,6 @@
             <field name="arch" type="xml">
                 <search string="Search Leave">
                     <field name="date_from"/>
-                    <filter icon="terp-mail-message-new" string="Inbox" help="Unread messages" name="needaction_pending" domain="[('needaction_pending','=',True)]"/>
                     <separator/>
                     <filter icon="terp-check" domain="[('state','=','draft')]" string="To Confirm"/>
                     <filter icon="terp-camera_test" domain="[('state','=','confirm')]" string="To Approve" name="approve"/>
@@ -84,56 +83,42 @@
             </field>
         </record>
 
-        <record model="ir.ui.view" id="edit_holiday_new">
+         <record model="ir.ui.view" id="edit_holiday_new">
             <field name="name">Leave Request</field>
             <field name="model">hr.holidays</field>
             <field name="priority">1</field>
             <field name="arch" type="xml">
                 <form string="Leave Request" version="7.0">
                 <header>
-                    <button string="Submit to Manager" 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" type="workflow" groups="base.group_hr_user,base.group_hr_manager" class="oe_highlight"/>
-                    <button string="Reset to New" name="set_to_draft" states="refuse,validate" type="object" groups="base.group_hr_user" />
+                    <button string="Refuse" name="refuse" states="confirm,validate1,validate" type="workflow" groups="base.group_hr_user" class="oe_highlight"/>
+                    <button string="Reset to New" name="set_to_draft" states="refuse" type="object" groups="base.group_hr_user" />
                     <field name="state" widget="statusbar" statusbar_visible="draft,confirm,validate" statusbar_colors='{"confirm":"blue","validate1":"blue","refuse":"red"}'/>
                 </header>
                 <sheet string="Leave Request">
                     <group>
                         <group>
                             <field name="name" attrs="{'readonly':[('state','!=','draft'),('state','!=','confirm')]}"/>
-                            <field name="holiday_type" on_change="onchange_type(holiday_type)" attrs="{'readonly':[('state','!=','draft')]}" width="130" string="Mode" groups="base.group_hr_user"/>
-                            <field name="employee_id" attrs="{'required':[('holiday_type','=','employee')],'invisible':[('holiday_type','=','category')]}" groups="base.group_hr_user"/>
-                            <field name="category_id" attrs="{'required':[('holiday_type','=','category')], 'invisible':[('holiday_type','=','employee')], 'readonly':[('state','!=','draft'), ('state','!=','confirm')]}"/>
-                            <field name="department_id" attrs="{'readonly':[('holiday_type','=','category')]}" groups="base.group_hr_user"/>
-                        </group>
-                        <group>
                             <field name="holiday_status_id" on_change="onchange_status_id(holiday_status_id)" context="{'employee_id':employee_id}"/>
                             <label for="number_of_days_temp" string="Duration"/>
                             <div>
-                                <field name="date_from" on_change="onchange_date_from(date_to, date_from)" required="1" class="oe_inline"/> - 
-                                <field name="date_to" on_change="onchange_date_from(date_to, date_from)" required="1" class="oe_inline"/>
+                                <group col="3">
+                                    <field name="date_from" nolabel="1" on_change="onchange_date_from(date_to, date_from)" required="1" class="oe_inline"/><label string="-" class="oe_inline" /> 
+                                    <field name="date_to" nolabel="1" on_change="onchange_date_from(date_to, date_from)" required="1" class="oe_inline"/>
+                                </group>
                                 <div>
                                     <field name="number_of_days_temp" class="oe_inline"/> days
                                 </div>
                             </div>
+                            <field name="category_id" attrs="{'required':[('holiday_type','=','category')], 'invisible':[('holiday_type','=','employee')], 'readonly':[('state','!=','draft'), ('state','!=','confirm')]}"/>
+                        </group>
+                        <group>
+                            <field name="holiday_type" on_change="onchange_type(holiday_type)" attrs="{'readonly':[('state','!=','draft')]}" width="130" string="Mode" groups="base.group_hr_user"/>
+                            <field name="employee_id" attrs="{'required':[('holiday_type','=','employee')],'invisible':[('holiday_type','=','category')]}" groups="base.group_hr_user"/>
+                            <field name="department_id" attrs="{'readonly':[('holiday_type','=','category')]}" groups="base.group_hr_user"/>
                         </group>
                     </group>
-                    <notebook colspan="4">
-                        <page string="General">
-                            <group>
-                                <group>
-                                    <field name="manager_id" groups="base.group_no_one"/>
-                                    <field name="double_validation" invisible="1"/>
-                                </group>
-                                <group>
-                                    <field name="manager_id2" attrs="{'invisible':[('double_validation', '!=', True)]}" groups="base.group_no_one"/>
-                                </group>
-                            </group>
-                            <newline/>
-                            <field name="notes" nolabel="1" colspan="4" placeholder="Add a reason..."/>
-                        </page>
-                    </notebook>
                 </sheet>
                 <div class="oe_chatter">
                     <field name="message_ids" colspan="4" widget="mail_thread" nolabel="1"/>
@@ -150,37 +135,27 @@
             <field name="arch" type="xml">
                 <form string="Allocation Request" version="7.0">
                 <header>
-                    <button string="Submit to Manager" 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" type="workflow" groups="base.group_hr_user" class="oe_highlight"/>
-                    <button string="Reset to New" name="set_to_draft" states="cancel,validate,refuse" type="object" groups="base.group_hr_user" />
+                    <button string="Refuse" name="refuse" states="confirm,validate,validate1" type="workflow" groups="base.group_hr_user" class="oe_highlight"/>
+                    <button string="Reset to New" name="set_to_draft" states="cancel,refuse" type="object" groups="base.group_hr_user" />
                     <field name="state" widget="statusbar" statusbar_visible="draft,confirm,validate" statusbar_colors='{"confirm":"blue","validate1":"blue","refuse":"red"}'/>
                 </header>
                 <sheet>
                     <group>
                         <group>
-                            <field name="name"/>
-                            <field name="holiday_type" on_change="onchange_type(holiday_type)" attrs="{'readonly':[('state','!=','draft')]}" string="Allocation Mode" groups="base.group_hr_manager"/>
-                            <field name="employee_id" attrs="{'required':[('holiday_type','=','employee')], 'invisible':[('holiday_type','=','category')]}"/>
-                            <field name="category_id" attrs="{'required':[('holiday_type','=','category')], 'readonly':[('state','!=','draft')], 'invisible':[('holiday_type','=','employee')]}"/>
-                            <field name="department_id" attrs="{'readonly':['|', ('holiday_type','=','category'), ('state','not in' ,('draft', 'confirm'))]}"/>
-                        </group>
-                        <group>
+                            <field name="name" required="1" attrs="{'readonly':[('state','!=','draft'),('state','!=','confirm')]}"/>
                             <field name="holiday_status_id" on_change="onchange_status_id(holiday_status_id)" context="{'employee_id':employee_id}"/>
                             <field name="number_of_days_temp"/>
                         </group>
+                        <group>
+                            <field name="holiday_type" on_change="onchange_type(holiday_type)"/>
+                            <field name="employee_id" attrs="{'required':[('holiday_type','=','employee')], 'invisible':[('holiday_type','=','category')]}"/>
+                            <field name="category_id" attrs="{'required':[('holiday_type','=','category')], 'invisible':[('holiday_type','=','employee')]}"/>
+                            <field name="department_id" attrs="{'invisible':[('holiday_type','=','category')]}"/>
+                        </group>
                     </group>
-                    <notebook>
-                        <page string="General">
-                            <group col="4">
-                                <field name="double_validation" invisible="1"/>
-                                <field name="manager_id"/>
-                                <field name="manager_id2" attrs="{'invisible':[('double_validation', '!=', True)]}"/>
-                            </group>
-                            <field name="notes" placeholder="Add a reason..."/>
-                        </page>
-                    </notebook>
+                    <field name="notes" nolabel="1" colspan="4" placeholder="Add a reason..."/>
                 </sheet>
                 <div class="oe_chatter">
                     <field name="message_ids" colspan="4" widget="mail_thread" nolabel="1"/>
@@ -194,8 +169,7 @@
             <field name="name">hr.holidays.allocation.tree</field>
             <field name="model">hr.holidays</field>
             <field name="arch" type="xml">
-                <tree fonts="bold:needaction_pending==True" colors="red:state == 'refuse';blue:state == 'draft';black:state in ('confirm','validate','validate1')" string="Allocation Requests">
-                    <field name="needaction_pending" invisible="1"/>
+                <tree colors="red:state == 'refuse';blue:state == 'draft';black:state in ('confirm','validate','validate1')" string="Allocation Requests">
                     <field name="employee_id"/>
                     <field name="holiday_type"/>
                     <field name="category_id"/>
@@ -225,7 +199,6 @@
                         <field name="state"/>
                     </header>
                     <group col="4">
-                        <field name="name"/>
                         <field name="holiday_status_id"/>
                         <field name="type"/>
                         <field name="date_from" on_change="onchange_date_from(date_to, date_from)" attrs="{'readonly':[('type','=','add')], 'required':[('type','=','remove')]}"/>
@@ -233,7 +206,7 @@
                         <field name="number_of_days_temp"/>
                         <field name="manager_id"/>
                     </group>
-                    <field name="notes"/>
+                    <field name="name" placeholder="Add a reason..."/>
                 </form>
             </field>
         </record>
@@ -243,8 +216,7 @@
             <field name="model">hr.holidays</field>
             <field name="priority">20</field>
             <field name="arch" type="xml">
-                <tree fonts="bold:needaction_pending==True" colors="red:state == 'refuse';blue:state == ' draft';black:state in ('confirm','validate','validate1')" string="Leaves Summary">
-                    <field name="needaction_pending" invisible="1"/>
+                <tree colors="red:state == 'refuse';blue:state == ' draft';black:state in ('confirm','validate','validate1')" string="Leaves Summary">
                     <field name="employee_id"/>
                     <field name="category_id" invisible="1"/>
                     <field name="department_id" invisible="1"/>
@@ -266,8 +238,7 @@
             <field name="name">hr.holidays.tree</field>
             <field name="model">hr.holidays</field>
             <field name="arch" type="xml">
-                <tree fonts="bold:needaction_pending==True" colors="red:state == 'refuse';blue:state == ' draft';black:state in ('confirm','validate','validate1')" string="Leave Requests">
-                    <field name="needaction_pending" invisible="1"/>
+                <tree colors="red:state == 'refuse';blue:state == ' draft';black:state in ('confirm','validate','validate1')" string="Leave Requests">
                     <field name="employee_id"/>
                     <field name="holiday_type" string="Mode" groups="base.group_hr_user"/>
                     <field name="name"/>
@@ -288,12 +259,12 @@
         <menuitem name="Leaves" parent="hr.menu_hr_root" id="menu_open_ask_holidays" sequence="20"/>
 
         <record model="ir.actions.act_window" id="open_ask_holidays">
-            <field name="name">Leave Requests</field>
+            <field name="name">My Leave Requests</field>
             <field name="res_model">hr.holidays</field>
             <field name="view_type">form</field>
             <field name="view_id" ref="edit_holiday_new"/>
             <field name="context">{}</field>
-            <field name="domain">[('type','=','remove')]</field>
+            <field name="domain">[('type','=','remove'),('employee_id.user_id','=', uid)]</field>
             <field name="search_view_id" ref="view_hr_holidays_filter"/>
             <field name="help" type="html">
               <p class="oe_view_nocontent_create">
@@ -327,7 +298,7 @@
             <field name="view_id" ref="view_holiday_new_calendar"/>
             <field name="act_window_id" ref="open_ask_holidays"/>
         </record>
-
+        
         <menuitem name="My Leave Requests" parent="menu_open_ask_holidays" id="menu_open_ask_holidays_new" action="open_ask_holidays"/>
 
         <record model="ir.actions.act_window" id="request_approve_holidays">
@@ -357,11 +328,11 @@
         <menuitem name="Leave Requests to Approve" parent="menu_open_ask_holidays" id="menu_request_approve_holidays" action="request_approve_holidays" groups="base.group_hr_user"/>
 
         <record model="ir.actions.act_window" id="open_allocation_holidays">
-            <field name="name">Allocation Requests</field>
+            <field name="name">My Allocation Requests</field>
             <field name="res_model">hr.holidays</field>
             <field name="view_type">form</field>
             <field name="context">{'default_type':'add'}</field>
-            <field name="domain">[('type','=','add')]</field>
+            <field name="domain">[('type','=','add'),('employee_id.user_id','=', uid)]</field>
             <field name="view_id" ref="allocation_leave_new"/>
             <field name="search_view_id" ref="view_hr_holidays_filter"/>
         </record>
@@ -380,7 +351,7 @@
             <field name="act_window_id" ref="open_allocation_holidays"/>
         </record>
 
-        <menuitem name="Allocation Requests" parent="menu_open_ask_holidays" id="menu_open_allocation_holidays" action="open_allocation_holidays"/>
+        <menuitem name="My Allocation Requests" parent="menu_open_ask_holidays" id="menu_open_allocation_holidays" action="open_allocation_holidays"/>
 
         <record model="ir.actions.act_window" id="open_company_allocation">
             <field name="name">Leaves Summary</field>
@@ -542,13 +513,17 @@
             <field name="model">hr.employee</field>
             <field name="inherit_id" ref="hr.view_employee_form"/>
             <field name="arch" type="xml">
-                <field name="active" position="before">
-                    <label for="remaining_leaves"/>
-                    <div>
-                        <field name="remaining_leaves" class="oe_inline"/>
-                        <button name="%(act_hr_employee_holiday_request)d" string="Leaves" type="action" class="oe_inline oe_right"/>
-                    </div>
-                </field>
+                <xpath expr="//group[@name='active_group']" position="before">
+                    <group string="Leaves">
+                        <label for="remaining_leaves"/>
+                        <div>
+                            <field name="remaining_leaves" class="oe_inline"/>
+                        </div>
+                    </group>
+                </xpath>
+                <xpath expr="//div[@name='button_box']" position="inside">
+                    <button name="%(act_hr_employee_holiday_request)d" string="Leaves" type="action"/>
+                </xpath>
             </field>
         </record>
 
diff --git a/addons/hr_holidays/hr_holidays_workflow.xml b/addons/hr_holidays/hr_holidays_workflow.xml
index 7013d62a5ed..a2e1d54f96c 100644
--- a/addons/hr_holidays/hr_holidays_workflow.xml
+++ b/addons/hr_holidays/hr_holidays_workflow.xml
@@ -2,7 +2,16 @@
 <openerp>
 <data>
 
-    <!-- Workflow definition -->
+    <!-- Workflow definition 
+        1. draft->submitted (no signal)
+        2. submitted->accepted (validate signal) if not 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 -> refused (refuse signal)
+
+    -->
 
     <record model="workflow" id="wkf_holidays">
         <field name="name">hr.wkf.holidays</field>
@@ -10,13 +19,13 @@
         <field name="on_create">True</field>
     </record>
 
-    <record model="workflow.activity" id="act_draft">
+    <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>
     </record>
 
-    <record model="workflow.activity" id="act_confirm">
+    <record model="workflow.activity" id="act_confirm"> <!-- submitted -->
         <field name="wkf_id" ref="wkf_holidays" />
         <field name="name">confirm</field>
         <field name="kind">function</field>
@@ -24,74 +33,94 @@
         <field name="split_mode">OR</field>
     </record>
 
-    <record model="workflow.activity" id="act_validate">
+    <record model="workflow.activity" id="act_validate"> <!-- accepted -->
         <field name="wkf_id" ref="wkf_holidays" />
         <field name="name">validate</field>
         <field name="kind">function</field>
         <field name="action">holidays_validate()</field>
     </record>
 
-    <record model="workflow.activity" id="act_validate1">
+    <record model="workflow.activity" id="act_validate1"> <!-- first_accepted -->
         <field name="wkf_id" ref="wkf_holidays" />
-        <field name="name">second_validate</field>
+        <field name="name">first_validate</field>
         <field name="kind">function</field>
-        <field name="action">holidays_validate2()</field>
+        <field name="action">holidays_first_validate()</field>
+        <field name="split_mode">OR</field>
     </record>
 
 
-    <record model="workflow.activity" id="act_refuse">
+    <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">stopall</field>
+        <field name="kind">function</field>
+        <field name="action">holidays_refuse()</field>
     </record>
 
     <!--
         workflow transition
     -->
 
-    <record model="workflow.transition" id="t1">
+    <record model="workflow.transition" id="holiday_draft2confirm"> <!-- 1. draft->submitted (no signal) -->
         <field name="act_from" ref="act_draft" />
         <field name="act_to" ref="act_confirm" />
-        <field name="signal">confirm</field>
     </record>
 
-    <record model="workflow.transition" id="t2">
+    <record model="workflow.transition" id="holiday_confirm2validate"> <!-- 2. submitted->accepted (validate signal) if not double_validation-->
         <field name="act_from" ref="act_confirm" />
         <field name="act_to" ref="act_validate" />
         <field name="signal">validate</field>
+        <field name="condition">not double_validation</field>
+        <field name="group_id" ref="base.group_hr_user"/>
+    </record>
+
+    <record model="workflow.transition" id="holiday_confirm2validate1"> <!-- 2. submitted -> first_accepted (validate signal) if double_validation-->
+        <field name="act_from" ref="act_confirm" />
+        <field name="act_to" ref="act_validate1" />
+        <field name="condition">double_validation</field>
+        <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" />
+        <field name="signal">refuse</field>
         <field name="condition">True</field>
         <field name="group_id" ref="base.group_hr_user"/>
     </record>
 
-    <record model="workflow.transition" id="t3">
-        <field name="act_from" ref="act_confirm" />
-        <field name="act_to" ref="act_refuse" />
-        <field name="signal">refuse</field>
-        <field name="condition">holidays_refuse('first_approval')</field>
-        <field name="group_id" ref="base.group_hr_user"/>
-    </record>
-
-    <record model="workflow.transition" id="t4">
+    <record model="workflow.transition" id="holiday_validate2refuse"> <!-- 3. accepted->refused (refuse signal) -->
         <field name="act_from" ref="act_validate" />
         <field name="act_to" ref="act_refuse" />
         <field name="signal">refuse</field>
-        <field name="condition">holidays_refuse('second_approval')</field>
+        <field name="condition">True</field>
         <field name="group_id" ref="base.group_hr_user"/>
     </record>
 
-    <record model="workflow.transition" id="t8">
+    <record model="workflow.transition" id="holiday_validate2refuse"> <!-- 3. accepted->refused (refuse signal) -->
         <field name="act_from" ref="act_validate" />
-        <field name="act_to" ref="act_validate1" />
+        <field name="act_to" ref="act_refuse" />
+        <field name="signal">refuse</field>
+        <field name="condition">True</field>
+        <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" />
+        <field name="condition">True</field>
         <field name="signal">second_validate</field>
-        <field name="group_id" ref="base.group_hr_manager" />
+        <field name="group_id" ref="base.group_hr_user"/>
     </record>
 
-    <record model="workflow.transition" id="t11">
-        <field name="act_from" ref="act_validate" />
-        <field name="act_to" ref="act_validate1" />
-        <field name="condition">not holiday_status_id.double_validation</field>
-        <field name="signal" eval="False"/>
+    <record model="workflow.transition" id="holiday_validate1_refuse"> <!-- 4. first_accepted->refused (refuse signal) -->
+        <field name="act_from" ref="act_validate1" />
+        <field name="act_to" ref="act_refuse" />
+        <field name="signal">refuse</field>
+        <field name="condition">True</field>
+        <field name="group_id" ref="base.group_hr_user"/>
     </record>
 
 </data>
diff --git a/addons/hr_holidays/i18n/ar.po b/addons/hr_holidays/i18n/ar.po
index bba9e481509..f39af6dd8e1 100644
--- a/addons/hr_holidays/i18n/ar.po
+++ b/addons/hr_holidays/i18n/ar.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:51+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:23+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -74,7 +74,7 @@ msgstr "تصنيف الموظف"
 #. module: hr_holidays
 #: view:hr.holidays:0
 msgid " Month-1"
-msgstr ""
+msgstr " شهر - ١"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
diff --git a/addons/hr_holidays/i18n/bg.po b/addons/hr_holidays/i18n/bg.po
index 39e8d55e5a3..7c4329a77a3 100644
--- a/addons/hr_holidays/i18n/bg.po
+++ b/addons/hr_holidays/i18n/bg.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:51+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:23+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
diff --git a/addons/hr_holidays/i18n/bs.po b/addons/hr_holidays/i18n/bs.po
index b61a1596772..adf862745cf 100644
--- a/addons/hr_holidays/i18n/bs.po
+++ b/addons/hr_holidays/i18n/bs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:51+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:23+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
diff --git a/addons/hr_holidays/i18n/ca.po b/addons/hr_holidays/i18n/ca.po
index fb05ef9d7e3..c1c4cf880f4 100644
--- a/addons/hr_holidays/i18n/ca.po
+++ b/addons/hr_holidays/i18n/ca.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:51+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:23+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
diff --git a/addons/hr_holidays/i18n/cs.po b/addons/hr_holidays/i18n/cs.po
index 1a8f859dac9..344aa8438d0 100644
--- a/addons/hr_holidays/i18n/cs.po
+++ b/addons/hr_holidays/i18n/cs.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:51+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:23+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 "X-Poedit-Language: Czech\n"
 
 #. module: hr_holidays
diff --git a/addons/hr_holidays/i18n/da.po b/addons/hr_holidays/i18n/da.po
index 68aed1263ab..f9e6fe2204f 100644
--- a/addons/hr_holidays/i18n/da.po
+++ b/addons/hr_holidays/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:51+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:23+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
diff --git a/addons/hr_holidays/i18n/de.po b/addons/hr_holidays/i18n/de.po
index 39a3e53e210..fc6bc6e5a25 100644
--- a/addons/hr_holidays/i18n/de.po
+++ b/addons/hr_holidays/i18n/de.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:51+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:23+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
diff --git a/addons/hr_holidays/i18n/el.po b/addons/hr_holidays/i18n/el.po
index 03c7a556acd..3d3b44dc5fa 100644
--- a/addons/hr_holidays/i18n/el.po
+++ b/addons/hr_holidays/i18n/el.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:51+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:23+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
 "X-Poedit-SourceCharset: utf-8\n"
diff --git a/addons/hr_holidays/i18n/es.po b/addons/hr_holidays/i18n/es.po
index e3f1b1bdde6..e7944b4abc0 100644
--- a/addons/hr_holidays/i18n/es.po
+++ b/addons/hr_holidays/i18n/es.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:51+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:23+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
diff --git a/addons/hr_holidays/i18n/es_AR.po b/addons/hr_holidays/i18n/es_AR.po
index 8dca5bc8511..4ee1eec92e3 100644
--- a/addons/hr_holidays/i18n/es_AR.po
+++ b/addons/hr_holidays/i18n/es_AR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:51+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:23+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
diff --git a/addons/hr_holidays/i18n/es_CR.po b/addons/hr_holidays/i18n/es_CR.po
index 63cb01d3493..8eef342a3bd 100644
--- a/addons/hr_holidays/i18n/es_CR.po
+++ b/addons/hr_holidays/i18n/es_CR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:52+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:23+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 "Language: \n"
 
 #. module: hr_holidays
diff --git a/addons/hr_holidays/i18n/es_EC.po b/addons/hr_holidays/i18n/es_EC.po
index f997f8ddcb7..15a0b41bdf0 100644
--- a/addons/hr_holidays/i18n/es_EC.po
+++ b/addons/hr_holidays/i18n/es_EC.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:52+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:23+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
diff --git a/addons/hr_holidays/i18n/et.po b/addons/hr_holidays/i18n/et.po
index e8da4619e1a..59498b72383 100644
--- a/addons/hr_holidays/i18n/et.po
+++ b/addons/hr_holidays/i18n/et.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:51+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:23+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
diff --git a/addons/hr_holidays/i18n/fi.po b/addons/hr_holidays/i18n/fi.po
index 73260d163cf..c783014cf13 100644
--- a/addons/hr_holidays/i18n/fi.po
+++ b/addons/hr_holidays/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:51+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:23+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
diff --git a/addons/hr_holidays/i18n/fr.po b/addons/hr_holidays/i18n/fr.po
index 4fdc0f5dafd..fe8aa32b0c0 100644
--- a/addons/hr_holidays/i18n/fr.po
+++ b/addons/hr_holidays/i18n/fr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:51+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:23+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
diff --git a/addons/hr_holidays/i18n/gu.po b/addons/hr_holidays/i18n/gu.po
index 534f02b3d64..66ad393d8fb 100644
--- a/addons/hr_holidays/i18n/gu.po
+++ b/addons/hr_holidays/i18n/gu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:51+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:23+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
diff --git a/addons/hr_holidays/i18n/hi.po b/addons/hr_holidays/i18n/hi.po
index da654a794da..c2451c573e8 100644
--- a/addons/hr_holidays/i18n/hi.po
+++ b/addons/hr_holidays/i18n/hi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:51+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:23+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
diff --git a/addons/hr_holidays/i18n/hr.po b/addons/hr_holidays/i18n/hr.po
index b0cdbe9591d..57b1aff8f99 100644
--- a/addons/hr_holidays/i18n/hr.po
+++ b/addons/hr_holidays/i18n/hr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:51+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:23+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
diff --git a/addons/hr_holidays/i18n/hu.po b/addons/hr_holidays/i18n/hu.po
index da62836ca36..78ae9d711f7 100644
--- a/addons/hr_holidays/i18n/hu.po
+++ b/addons/hr_holidays/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:51+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:23+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
diff --git a/addons/hr_holidays/i18n/id.po b/addons/hr_holidays/i18n/id.po
index 20f44c95fdf..781f92f982f 100644
--- a/addons/hr_holidays/i18n/id.po
+++ b/addons/hr_holidays/i18n/id.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:51+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:23+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
diff --git a/addons/hr_holidays/i18n/it.po b/addons/hr_holidays/i18n/it.po
index bac05827ace..4489005eb29 100644
--- a/addons/hr_holidays/i18n/it.po
+++ b/addons/hr_holidays/i18n/it.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:51+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:23+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
diff --git a/addons/hr_holidays/i18n/ja.po b/addons/hr_holidays/i18n/ja.po
index 03b5a40cb48..8cf41cb09d6 100644
--- a/addons/hr_holidays/i18n/ja.po
+++ b/addons/hr_holidays/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:51+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:23+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
diff --git a/addons/hr_holidays/i18n/ko.po b/addons/hr_holidays/i18n/ko.po
index 0d559138f52..dda5e5a20cb 100644
--- a/addons/hr_holidays/i18n/ko.po
+++ b/addons/hr_holidays/i18n/ko.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:51+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:23+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
diff --git a/addons/hr_holidays/i18n/lt.po b/addons/hr_holidays/i18n/lt.po
index b7eb6fe7f60..a5d89acb73d 100644
--- a/addons/hr_holidays/i18n/lt.po
+++ b/addons/hr_holidays/i18n/lt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:51+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:23+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
diff --git a/addons/hr_holidays/i18n/lv.po b/addons/hr_holidays/i18n/lv.po
index 3b62f2ccc13..d9503b4b46c 100644
--- a/addons/hr_holidays/i18n/lv.po
+++ b/addons/hr_holidays/i18n/lv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:51+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:23+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
diff --git a/addons/hr_holidays/i18n/mn.po b/addons/hr_holidays/i18n/mn.po
index fc6ed871d50..e69efb2a2c9 100644
--- a/addons/hr_holidays/i18n/mn.po
+++ b/addons/hr_holidays/i18n/mn.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:51+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:23+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
diff --git a/addons/hr_holidays/i18n/nl.po b/addons/hr_holidays/i18n/nl.po
index 8c253d78b95..4c44ef380bb 100644
--- a/addons/hr_holidays/i18n/nl.po
+++ b/addons/hr_holidays/i18n/nl.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 01:37+0100\n"
-"PO-Revision-Date: 2012-02-19 13:05+0000\n"
+"PO-Revision-Date: 2012-09-03 17:12+0000\n"
 "Last-Translator: Erwin <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: 2012-08-09 04:51+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-09-04 04:52+0000\n"
+"X-Generator: Launchpad (build 15890)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -416,6 +416,8 @@ msgid ""
 "When selected, the Allocation/Leave Requests for this type require a second "
 "validation to be approved."
 msgstr ""
+"Wanneer aangevinkt heeft deze toewijzing of aanvraag een tweede controle "
+"nodig om te worden goedgekeurd."
 
 #. module: hr_holidays
 #: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
@@ -787,6 +789,8 @@ msgid ""
 "If you select this checkbox, the system allows the employees to take more "
 "leaves than the available ones for this type."
 msgstr ""
+"Indien u deze optie aanvinkt, dan staat u toe dat werknemers meer verlof "
+"aanvragen dan dat ze nog beschikbaar hebben."
 
 #. module: hr_holidays
 #: help:hr.holidays.status,leaves_taken:0
diff --git a/addons/hr_holidays/i18n/nl_BE.po b/addons/hr_holidays/i18n/nl_BE.po
index b22e60797ee..27267bcc56a 100644
--- a/addons/hr_holidays/i18n/nl_BE.po
+++ b/addons/hr_holidays/i18n/nl_BE.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:51+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:23+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
diff --git a/addons/hr_holidays/i18n/pl.po b/addons/hr_holidays/i18n/pl.po
index e33ebef7fe7..736f17337cd 100644
--- a/addons/hr_holidays/i18n/pl.po
+++ b/addons/hr_holidays/i18n/pl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:51+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:23+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
diff --git a/addons/hr_holidays/i18n/pt.po b/addons/hr_holidays/i18n/pt.po
index a5422a8b3d7..6598325fdeb 100644
--- a/addons/hr_holidays/i18n/pt.po
+++ b/addons/hr_holidays/i18n/pt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:51+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:23+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
diff --git a/addons/hr_holidays/i18n/pt_BR.po b/addons/hr_holidays/i18n/pt_BR.po
index dba532f0014..1121bb4f4a1 100644
--- a/addons/hr_holidays/i18n/pt_BR.po
+++ b/addons/hr_holidays/i18n/pt_BR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:51+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:23+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
diff --git a/addons/hr_holidays/i18n/ro.po b/addons/hr_holidays/i18n/ro.po
index 7fa6e26db8d..e972e5fa2cb 100644
--- a/addons/hr_holidays/i18n/ro.po
+++ b/addons/hr_holidays/i18n/ro.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:51+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:23+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
diff --git a/addons/hr_holidays/i18n/ru.po b/addons/hr_holidays/i18n/ru.po
index f606b8a4f86..19c4f035550 100644
--- a/addons/hr_holidays/i18n/ru.po
+++ b/addons/hr_holidays/i18n/ru.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:51+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:23+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
diff --git a/addons/hr_holidays/i18n/sl.po b/addons/hr_holidays/i18n/sl.po
index 41ef504215c..f1d08afa7ce 100644
--- a/addons/hr_holidays/i18n/sl.po
+++ b/addons/hr_holidays/i18n/sl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:51+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:23+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
diff --git a/addons/hr_holidays/i18n/sq.po b/addons/hr_holidays/i18n/sq.po
index 4afcc391a38..94ba2a7a46a 100644
--- a/addons/hr_holidays/i18n/sq.po
+++ b/addons/hr_holidays/i18n/sq.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:51+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:23+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
diff --git a/addons/hr_holidays/i18n/sr.po b/addons/hr_holidays/i18n/sr.po
index 920eaf10349..df0f98b9abc 100644
--- a/addons/hr_holidays/i18n/sr.po
+++ b/addons/hr_holidays/i18n/sr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:51+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:23+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
diff --git a/addons/hr_holidays/i18n/sr@latin.po b/addons/hr_holidays/i18n/sr@latin.po
index ab6924599b1..20de18d9ae8 100644
--- a/addons/hr_holidays/i18n/sr@latin.po
+++ b/addons/hr_holidays/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:52+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:23+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
diff --git a/addons/hr_holidays/i18n/sv.po b/addons/hr_holidays/i18n/sv.po
index 9f3e7818729..aa35a9d6f8b 100644
--- a/addons/hr_holidays/i18n/sv.po
+++ b/addons/hr_holidays/i18n/sv.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:51+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:23+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
diff --git a/addons/hr_holidays/i18n/th.po b/addons/hr_holidays/i18n/th.po
index 34e38c9c1c1..06e481827b1 100644
--- a/addons/hr_holidays/i18n/th.po
+++ b/addons/hr_holidays/i18n/th.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:51+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:23+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
diff --git a/addons/hr_holidays/i18n/tlh.po b/addons/hr_holidays/i18n/tlh.po
index 98b36a6f40c..806cfc84752 100644
--- a/addons/hr_holidays/i18n/tlh.po
+++ b/addons/hr_holidays/i18n/tlh.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:51+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:23+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
diff --git a/addons/hr_holidays/i18n/tr.po b/addons/hr_holidays/i18n/tr.po
index d6ff2aa5b4d..3459816a6e1 100644
--- a/addons/hr_holidays/i18n/tr.po
+++ b/addons/hr_holidays/i18n/tr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:51+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:23+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
diff --git a/addons/hr_holidays/i18n/uk.po b/addons/hr_holidays/i18n/uk.po
index 2889dc474d4..792f8d99176 100644
--- a/addons/hr_holidays/i18n/uk.po
+++ b/addons/hr_holidays/i18n/uk.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:51+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:23+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
diff --git a/addons/hr_holidays/i18n/vi.po b/addons/hr_holidays/i18n/vi.po
index c6fe222e4c4..3dd8bfde5e0 100644
--- a/addons/hr_holidays/i18n/vi.po
+++ b/addons/hr_holidays/i18n/vi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:51+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:23+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
diff --git a/addons/hr_holidays/i18n/zh_CN.po b/addons/hr_holidays/i18n/zh_CN.po
index cce07c2bc58..1f248f79492 100644
--- a/addons/hr_holidays/i18n/zh_CN.po
+++ b/addons/hr_holidays/i18n/zh_CN.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:52+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:23+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
diff --git a/addons/hr_holidays/i18n/zh_TW.po b/addons/hr_holidays/i18n/zh_TW.po
index 5e6eb969ab3..03a529d9681 100644
--- a/addons/hr_holidays/i18n/zh_TW.po
+++ b/addons/hr_holidays/i18n/zh_TW.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:52+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:23+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
diff --git a/addons/hr_holidays/security/ir.model.access.csv b/addons/hr_holidays/security/ir.model.access.csv
index b21b6ca64e4..0375a17ac53 100644
--- a/addons/hr_holidays/security/ir.model.access.csv
+++ b/addons/hr_holidays/security/ir.model.access.csv
@@ -4,5 +4,5 @@ access_hr_holidays_user,hr.holidays.user,model_hr_holidays,base.group_hr_user,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_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_manager,resource_calendar_leaves_manager,resource.model_resource_calendar_leaves,base.group_hr_manager,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_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/security/ir_rule.xml b/addons/hr_holidays/security/ir_rule.xml
index 8e8c97bf7ea..ff0270026a4 100644
--- a/addons/hr_holidays/security/ir_rule.xml
+++ b/addons/hr_holidays/security/ir_rule.xml
@@ -1,6 +1,19 @@
 <?xml version="1.0"?>
 <openerp>
   <data>
-
+    <record id="property_rule_holidays_employee" model="ir.rule">
+        <field name="name">Employee Holidays</field>
+        <field model="ir.model" name="model_id" ref="model_hr_holidays"/>
+        <field name="domain_force">[('employee_id.user_id','=',user.id)]</field>
+        <field name="groups" eval="[(4,ref('base.group_user'))]"/>
+    </record>
+    
+    <record id="property_rule_holidays_officer" model="ir.rule">
+        <field name="name">Holidays Officer</field>
+        <field model="ir.model" name="model_id" ref="model_hr_holidays"/>
+        <field name="domain_force">[(1,'=',1)]</field>
+        <field name="groups" eval="[(4,ref('base.group_hr_user'))]"/>
+    </record>
+    
   </data>
 </openerp>
diff --git a/addons/hr_holidays/test/test_hr_holiday.yml b/addons/hr_holidays/test/test_hr_holiday.yml
index 9228a7a381e..f0e85d552cb 100644
--- a/addons/hr_holidays/test/test_hr_holiday.yml
+++ b/addons/hr_holidays/test/test_hr_holiday.yml
@@ -10,10 +10,6 @@
     date_to: !eval time.strftime('%Y-%m-11 19:00:00')
     employee_id: hr.employee_fp
     type: remove
--
-  I confirmed the holiday request by clicking on "Confirm" button.
--
-  !workflow {model: hr.holidays, action: confirm, ref: hr_holidays_employee1_cl}
 -
   I find a small mistake on my leave request to I click on "Refuse" button to correct a mistake.
 -
diff --git a/addons/hr_payroll/__openerp__.py b/addons/hr_payroll/__openerp__.py
index 66e7fd8a8f1..62a0348940b 100644
--- a/addons/hr_payroll/__openerp__.py
+++ b/addons/hr_payroll/__openerp__.py
@@ -23,7 +23,7 @@
     'name': 'Payroll',
     'version': '1.0',
     'category': 'Human Resources',
-    "sequence": 38,
+    'sequence': 38,
     'description': """
 Generic Payroll system.
 =======================
@@ -46,9 +46,7 @@ Generic Payroll system.
         'hr_holidays',
         'decimal_precision',
     ],
-    'init_xml': [
-    ],
-    'update_xml': [
+    'data': [
         'security/hr_security.xml',
         'wizard/hr_payroll_payslips_by_employees.xml',
         'hr_payroll_view.xml',
@@ -61,14 +59,12 @@ Generic Payroll system.
         'res_config_view.xml',
     ],
     'test': [
-         'test/payslip.yml',
-#         'test/payment_advice.yml',
-#         'test/payroll_register.yml',
-        # 'test/hr_payroll_report.yml',
-    ],
-    'demo_xml': [
-        'hr_payroll_demo.xml'
+        'test/payslip.yml',
+#        'test/payment_advice.yml',
+#        'test/payroll_register.yml',
+       # 'test/hr_payroll_report.yml',
     ],
+    'demo': ['hr_payroll_demo.xml'],
     'installable': True,
     'auto_install': False,
     'certificate' : '001046261404562128861',
diff --git a/addons/hr_payroll/i18n/ar.po b/addons/hr_payroll/i18n/ar.po
index 07653838057..b2a88b733fc 100644
--- a/addons/hr_payroll/i18n/ar.po
+++ b/addons/hr_payroll/i18n/ar.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:56+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:33+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_payroll
 #: field:hr.payslip.line,condition_select:0
diff --git a/addons/hr_payroll/i18n/bg.po b/addons/hr_payroll/i18n/bg.po
index abc426ad31b..5bf174580c1 100644
--- a/addons/hr_payroll/i18n/bg.po
+++ b/addons/hr_payroll/i18n/bg.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:56+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:33+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_payroll
 #: field:hr.payslip.line,condition_select:0
diff --git a/addons/hr_payroll/i18n/ca.po b/addons/hr_payroll/i18n/ca.po
index 8978d26055c..15edc7670e6 100644
--- a/addons/hr_payroll/i18n/ca.po
+++ b/addons/hr_payroll/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:56+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:33+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_payroll
 #: field:hr.payslip.line,condition_select:0
diff --git a/addons/hr_payroll/i18n/cs.po b/addons/hr_payroll/i18n/cs.po
index 2dbd958298b..60e47aca4ef 100644
--- a/addons/hr_payroll/i18n/cs.po
+++ b/addons/hr_payroll/i18n/cs.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:56+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:33+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 "X-Poedit-Language: Czech\n"
 
 #. module: hr_payroll
diff --git a/addons/hr_payroll/i18n/da.po b/addons/hr_payroll/i18n/da.po
index 0958fc8abd9..21270372b89 100644
--- a/addons/hr_payroll/i18n/da.po
+++ b/addons/hr_payroll/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:56+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:33+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_payroll
 #: field:hr.payslip.line,condition_select:0
diff --git a/addons/hr_payroll/i18n/de.po b/addons/hr_payroll/i18n/de.po
index 94575ba76de..69bc3d7e587 100644
--- a/addons/hr_payroll/i18n/de.po
+++ b/addons/hr_payroll/i18n/de.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:56+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:33+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_payroll
 #: field:hr.payslip.line,condition_select:0
diff --git a/addons/hr_payroll/i18n/en_GB.po b/addons/hr_payroll/i18n/en_GB.po
index d61b9bbc2d1..58ec6604de1 100644
--- a/addons/hr_payroll/i18n/en_GB.po
+++ b/addons/hr_payroll/i18n/en_GB.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:57+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:33+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_payroll
 #: field:hr.payslip.line,condition_select:0
diff --git a/addons/hr_payroll/i18n/es.po b/addons/hr_payroll/i18n/es.po
index 3e1758b192f..bd07b19db6f 100644
--- a/addons/hr_payroll/i18n/es.po
+++ b/addons/hr_payroll/i18n/es.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:57+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:33+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_payroll
 #: field:hr.payslip.line,condition_select:0
diff --git a/addons/hr_payroll/i18n/es_CR.po b/addons/hr_payroll/i18n/es_CR.po
index a80db4287d0..5cb5121ecaf 100644
--- a/addons/hr_payroll/i18n/es_CR.po
+++ b/addons/hr_payroll/i18n/es_CR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:57+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:33+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 "Language: es\n"
 
 #. module: hr_payroll
diff --git a/addons/hr_payroll/i18n/es_EC.po b/addons/hr_payroll/i18n/es_EC.po
index b34932d1f37..0643534f7b0 100644
--- a/addons/hr_payroll/i18n/es_EC.po
+++ b/addons/hr_payroll/i18n/es_EC.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:57+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:33+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_payroll
 #: field:hr.payslip.line,condition_select:0
diff --git a/addons/hr_payroll/i18n/et.po b/addons/hr_payroll/i18n/et.po
index 6dcf69908ca..e2433bd1f51 100644
--- a/addons/hr_payroll/i18n/et.po
+++ b/addons/hr_payroll/i18n/et.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:56+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:33+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_payroll
 #: field:hr.payslip.line,condition_select:0
diff --git a/addons/hr_payroll/i18n/fi.po b/addons/hr_payroll/i18n/fi.po
index 9a9975e33ca..737fdbd76db 100644
--- a/addons/hr_payroll/i18n/fi.po
+++ b/addons/hr_payroll/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:56+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:33+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_payroll
 #: field:hr.payslip.line,condition_select:0
diff --git a/addons/hr_payroll/i18n/fr.po b/addons/hr_payroll/i18n/fr.po
index c2a29dc248c..8df827b308e 100644
--- a/addons/hr_payroll/i18n/fr.po
+++ b/addons/hr_payroll/i18n/fr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:56+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:33+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_payroll
 #: field:hr.payslip.line,condition_select:0
diff --git a/addons/hr_payroll/i18n/gl.po b/addons/hr_payroll/i18n/gl.po
index ee657304fa2..5511b9dbf94 100644
--- a/addons/hr_payroll/i18n/gl.po
+++ b/addons/hr_payroll/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:56+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:33+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_payroll
 #: field:hr.payslip.line,condition_select:0
diff --git a/addons/hr_payroll/i18n/gu.po b/addons/hr_payroll/i18n/gu.po
index 20ba6016337..6079a87cc8b 100644
--- a/addons/hr_payroll/i18n/gu.po
+++ b/addons/hr_payroll/i18n/gu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:56+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:33+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_payroll
 #: field:hr.payslip.line,condition_select:0
diff --git a/addons/hr_payroll/i18n/he.po b/addons/hr_payroll/i18n/he.po
index 4def38eef47..741990d2726 100644
--- a/addons/hr_payroll/i18n/he.po
+++ b/addons/hr_payroll/i18n/he.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:56+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:33+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_payroll
 #: field:hr.payslip.line,condition_select:0
diff --git a/addons/hr_payroll/i18n/hr.po b/addons/hr_payroll/i18n/hr.po
index c8f251faded..80b6c3272da 100644
--- a/addons/hr_payroll/i18n/hr.po
+++ b/addons/hr_payroll/i18n/hr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:57+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:33+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_payroll
 #: field:hr.payslip.line,condition_select:0
diff --git a/addons/hr_payroll/i18n/hu.po b/addons/hr_payroll/i18n/hu.po
index 810f73b27d0..cb8ab087555 100644
--- a/addons/hr_payroll/i18n/hu.po
+++ b/addons/hr_payroll/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:56+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:33+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_payroll
 #: field:hr.payslip.line,condition_select:0
diff --git a/addons/hr_payroll/i18n/id.po b/addons/hr_payroll/i18n/id.po
index bd4af32ca10..bc040cbdd94 100644
--- a/addons/hr_payroll/i18n/id.po
+++ b/addons/hr_payroll/i18n/id.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:56+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:33+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_payroll
 #: field:hr.payslip.line,condition_select:0
diff --git a/addons/hr_payroll/i18n/it.po b/addons/hr_payroll/i18n/it.po
index 562432afb24..c240b68804d 100644
--- a/addons/hr_payroll/i18n/it.po
+++ b/addons/hr_payroll/i18n/it.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:56+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:33+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_payroll
 #: field:hr.payslip.line,condition_select:0
diff --git a/addons/hr_payroll/i18n/ja.po b/addons/hr_payroll/i18n/ja.po
index 216934fbc7e..cf57d468d07 100644
--- a/addons/hr_payroll/i18n/ja.po
+++ b/addons/hr_payroll/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:56+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:33+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_payroll
 #: field:hr.payslip.line,condition_select:0
diff --git a/addons/hr_payroll/i18n/lo.po b/addons/hr_payroll/i18n/lo.po
index 2865166f869..3a76a30b852 100644
--- a/addons/hr_payroll/i18n/lo.po
+++ b/addons/hr_payroll/i18n/lo.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:56+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:33+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_payroll
 #: field:hr.payslip.line,condition_select:0
diff --git a/addons/hr_payroll/i18n/lt.po b/addons/hr_payroll/i18n/lt.po
index 28e13dc0ebe..90f543dd478 100644
--- a/addons/hr_payroll/i18n/lt.po
+++ b/addons/hr_payroll/i18n/lt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:56+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:33+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_payroll
 #: field:hr.payslip.line,condition_select:0
diff --git a/addons/hr_payroll/i18n/lv.po b/addons/hr_payroll/i18n/lv.po
index f54bf17ea07..0009339d987 100644
--- a/addons/hr_payroll/i18n/lv.po
+++ b/addons/hr_payroll/i18n/lv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:56+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:33+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_payroll
 #: field:hr.payslip.line,condition_select:0
diff --git a/addons/hr_payroll/i18n/mn.po b/addons/hr_payroll/i18n/mn.po
index 99addf251a2..da14557b5fc 100644
--- a/addons/hr_payroll/i18n/mn.po
+++ b/addons/hr_payroll/i18n/mn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:56+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:33+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_payroll
 #: field:hr.payslip.line,condition_select:0
diff --git a/addons/hr_payroll/i18n/nb.po b/addons/hr_payroll/i18n/nb.po
index 9c2b00c64d4..415876d355c 100644
--- a/addons/hr_payroll/i18n/nb.po
+++ b/addons/hr_payroll/i18n/nb.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:56+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:33+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_payroll
 #: field:hr.payslip.line,condition_select:0
diff --git a/addons/hr_payroll/i18n/nl.po b/addons/hr_payroll/i18n/nl.po
index a06cbc4db7d..2ad4fc5aa0b 100644
--- a/addons/hr_payroll/i18n/nl.po
+++ b/addons/hr_payroll/i18n/nl.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 01:37+0100\n"
-"PO-Revision-Date: 2012-01-22 19:09+0000\n"
+"PO-Revision-Date: 2012-09-03 17:17+0000\n"
 "Last-Translator: Erwin <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: 2012-08-09 04:56+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-09-04 04:52+0000\n"
+"X-Generator: Launchpad (build 15890)\n"
 
 #. module: hr_payroll
 #: field:hr.payslip.line,condition_select:0
@@ -130,6 +130,8 @@ msgid ""
 "This wizard will generate payslips for all selected employee(s) based on the "
 "dates and credit note specified on Payslips Run."
 msgstr ""
+"Deze wizzard zal salarisstroken genereren,  voor alle geselecteerde "
+"medewerkers, gebaseerd op ?"
 
 #. module: hr_payroll
 #: report:contribution.register.lines:0 report:paylip.details:0
@@ -303,7 +305,7 @@ msgstr "Loonstrook werkenemer"
 #: help:hr.payslip.line,condition_range_max:0
 #: help:hr.salary.rule,condition_range_max:0
 msgid "The maximum amount, applied for this rule."
-msgstr ""
+msgstr "Het maximum bedrag, van toepassing voor deze regel"
 
 #. module: hr_payroll
 #: help:hr.payslip.line,condition_python:0
@@ -355,7 +357,7 @@ msgstr "Half-jaarlijks"
 #. module: hr_payroll
 #: view:hr.salary.rule:0
 msgid "Children Definition"
-msgstr ""
+msgstr "Definitie onderliggende"
 
 #. module: hr_payroll
 #: report:paylip.details:0 report:payslip:0
@@ -457,11 +459,13 @@ msgid ""
 "If the active field is set to false, it will allow you to hide the salary "
 "rule without removing it."
 msgstr ""
+"Als u de actief optie uitvinkt, dan kan u de salaris regel verbergen zonder "
+"ze te verwijderen."
 
 #. module: hr_payroll
 #: view:hr.payslip:0
 msgid "Worked Days & Inputs"
-msgstr ""
+msgstr "Gewerkte dagen & ingaves"
 
 #. module: hr_payroll
 #: field:hr.payslip,details_by_salary_rule_category:0
@@ -518,7 +522,7 @@ msgstr "Bereik"
 #: model:ir.actions.act_window,name:hr_payroll.action_view_hr_payroll_structure_tree
 #: model:ir.ui.menu,name:hr_payroll.menu_hr_payroll_structure_tree
 msgid "Salary Structures Hierarchy"
-msgstr ""
+msgstr "Salaris structuur hiërarchie"
 
 #. module: hr_payroll
 #: view:hr.payslip:0
@@ -544,7 +548,7 @@ msgstr "Details salarisstrookberekening"
 #: code:addons/hr_payroll/hr_payroll.py:872
 #, python-format
 msgid "Wrong python code defined for salary rule %s (%s) "
-msgstr ""
+msgstr "Verkeerde python code gedefinieerd voor de salaris regel %s (%s) "
 
 #. module: hr_payroll
 #: model:ir.model,name:hr_payroll.model_hr_payslip_input
@@ -765,7 +769,7 @@ msgstr "Contributie"
 #: code:addons/hr_payroll/hr_payroll.py:347
 #, python-format
 msgid "Refund Payslip"
-msgstr ""
+msgstr "Credit salarisstrook"
 
 #. module: hr_payroll
 #: field:hr.rule.input,input_id:0
@@ -777,7 +781,7 @@ msgstr ""
 #: code:addons/hr_payroll/hr_payroll.py:895
 #, python-format
 msgid "Wrong python condition defined for salary rule %s (%s)"
-msgstr ""
+msgstr "Verkeerde python code gedefinieerd voor de salaris regel %s (%s)"
 
 #. module: hr_payroll
 #: field:hr.payslip.line,quantity:0 field:hr.salary.rule,quantity:0
@@ -848,7 +852,7 @@ msgstr "Salaris Structuur"
 #. module: hr_payroll
 #: field:hr.contribution.register,register_line_ids:0
 msgid "Register Line"
-msgstr ""
+msgstr "Register regel"
 
 #. module: hr_payroll
 #: view:hr.payslip:0 view:hr.payslip.employees:0
@@ -921,7 +925,7 @@ msgstr ""
 #: code:addons/hr_payroll/hr_payroll.py:889
 #, python-format
 msgid "Wrong range condition defined for salary rule %s (%s)"
-msgstr ""
+msgstr "Verkeerde voorwaardelijst gedefinieerd voor de salaris regel %s (%s)"
 
 #. module: hr_payroll
 #: view:hr.payslip.line:0
@@ -995,6 +999,8 @@ msgstr "Adres"
 #, python-format
 msgid "Wrong percentage base or quantity defined for salary rule %s (%s)"
 msgstr ""
+"Verkeerde basispercentage of hoeveelheid gedefinieerd voor de salaris regel "
+"%s (%s)"
 
 #. module: hr_payroll
 #: field:hr.payslip,worked_days_line_ids:0
@@ -1019,7 +1025,7 @@ msgstr "Naam"
 #. module: hr_payroll
 #: view:hr.payroll.structure:0
 msgid "Payroll Structures"
-msgstr ""
+msgstr "Payroll Structuren"
 
 #. module: hr_payroll
 #: view:hr.payslip:0 view:hr.payslip.employees:0
@@ -1077,7 +1083,7 @@ msgstr "Totaal"
 #: help:hr.payslip.line,appears_on_payslip:0
 #: help:hr.salary.rule,appears_on_payslip:0
 msgid "Used for the display of rule on payslip"
-msgstr ""
+msgstr "Wordt gebruikt om de regel van de salaristrook weer te geven"
 
 #. module: hr_payroll
 #: view:hr.payslip.line:0
@@ -1087,13 +1093,13 @@ msgstr "Zoek loonafschrift regels"
 #. module: hr_payroll
 #: view:hr.payslip:0
 msgid "Details By Salary Rule Category"
-msgstr ""
+msgstr "details per salarisregel categorie"
 
 #. module: hr_payroll
 #: help:hr.payslip.input,code:0 help:hr.payslip.worked_days,code:0
 #: help:hr.rule.input,code:0
 msgid "The code that can be used in the salary rules"
-msgstr ""
+msgstr "De code die gebruikt kan worden in de salaris regels"
 
 #. module: hr_payroll
 #: view:hr.payslip.run:0
diff --git a/addons/hr_payroll/i18n/pl.po b/addons/hr_payroll/i18n/pl.po
index 19d7ffc37f8..49444f39d2a 100644
--- a/addons/hr_payroll/i18n/pl.po
+++ b/addons/hr_payroll/i18n/pl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:56+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:33+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_payroll
 #: field:hr.payslip.line,condition_select:0
diff --git a/addons/hr_payroll/i18n/pt.po b/addons/hr_payroll/i18n/pt.po
index e27b5e154ee..f1a24684b63 100644
--- a/addons/hr_payroll/i18n/pt.po
+++ b/addons/hr_payroll/i18n/pt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:56+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:33+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_payroll
 #: field:hr.payslip.line,condition_select:0
diff --git a/addons/hr_payroll/i18n/pt_BR.po b/addons/hr_payroll/i18n/pt_BR.po
index dee54cb1542..758afb6e97d 100644
--- a/addons/hr_payroll/i18n/pt_BR.po
+++ b/addons/hr_payroll/i18n/pt_BR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:57+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:33+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_payroll
 #: field:hr.payslip.line,condition_select:0
diff --git a/addons/hr_payroll/i18n/ro.po b/addons/hr_payroll/i18n/ro.po
index 8422409569d..acb7d128983 100644
--- a/addons/hr_payroll/i18n/ro.po
+++ b/addons/hr_payroll/i18n/ro.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:56+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:33+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_payroll
 #: field:hr.payslip.line,condition_select:0
diff --git a/addons/hr_payroll/i18n/ru.po b/addons/hr_payroll/i18n/ru.po
index 12278e48c44..9dd9d66fdb0 100644
--- a/addons/hr_payroll/i18n/ru.po
+++ b/addons/hr_payroll/i18n/ru.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:56+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:33+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_payroll
 #: field:hr.payslip.line,condition_select:0
diff --git a/addons/hr_payroll/i18n/sr.po b/addons/hr_payroll/i18n/sr.po
index 94d1d1eba06..683eb143e70 100644
--- a/addons/hr_payroll/i18n/sr.po
+++ b/addons/hr_payroll/i18n/sr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:56+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:33+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_payroll
 #: field:hr.payslip.line,condition_select:0
diff --git a/addons/hr_payroll/i18n/sr@latin.po b/addons/hr_payroll/i18n/sr@latin.po
index 6a0a112dd69..1b879f4d966 100644
--- a/addons/hr_payroll/i18n/sr@latin.po
+++ b/addons/hr_payroll/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:57+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:33+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_payroll
 #: field:hr.payslip.line,condition_select:0
diff --git a/addons/hr_payroll/i18n/sv.po b/addons/hr_payroll/i18n/sv.po
index 2187a52310b..60f78f4502f 100644
--- a/addons/hr_payroll/i18n/sv.po
+++ b/addons/hr_payroll/i18n/sv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:57+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:33+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_payroll
 #: field:hr.payslip.line,condition_select:0
diff --git a/addons/hr_payroll/i18n/tr.po b/addons/hr_payroll/i18n/tr.po
index 67e820b6914..32a74af3604 100644
--- a/addons/hr_payroll/i18n/tr.po
+++ b/addons/hr_payroll/i18n/tr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:57+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:33+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_payroll
 #: field:hr.payslip.line,condition_select:0
diff --git a/addons/hr_payroll/i18n/vi.po b/addons/hr_payroll/i18n/vi.po
index 55bba840d49..f80a153eaad 100644
--- a/addons/hr_payroll/i18n/vi.po
+++ b/addons/hr_payroll/i18n/vi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:57+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:33+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_payroll
 #: field:hr.payslip.line,condition_select:0
diff --git a/addons/hr_payroll/i18n/zh_CN.po b/addons/hr_payroll/i18n/zh_CN.po
index 9104ad9d1eb..af243ea3507 100644
--- a/addons/hr_payroll/i18n/zh_CN.po
+++ b/addons/hr_payroll/i18n/zh_CN.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:57+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:33+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_payroll
 #: field:hr.payslip.line,condition_select:0
diff --git a/addons/hr_payroll_account/__openerp__.py b/addons/hr_payroll_account/__openerp__.py
index f869c93697b..3f960507a8d 100644
--- a/addons/hr_payroll_account/__openerp__.py
+++ b/addons/hr_payroll_account/__openerp__.py
@@ -25,7 +25,7 @@
     'category': 'Human Resources',
     'description': """
 Generic Payroll system Integrated with Accounting.
-===================================================
+==================================================
 
     * Expense Encoding
     * Payment Encoding
@@ -39,17 +39,9 @@ Generic Payroll system Integrated with Accounting.
         'account',
         'hr_expense'
     ],
-    'init_xml': [
-    ],
-    'update_xml': [
-        "hr_payroll_account_view.xml",
-    ],
-    'demo_xml': [
-        'hr_payroll_account_demo.xml'
-    ],
-    'test': [
-         'test/hr_payroll_account.yml',
-     ],
+    'data': ['hr_payroll_account_view.xml'],
+    'demo': ['hr_payroll_account_demo.xml'],
+    'test': ['test/hr_payroll_account.yml'],
     'installable': True,
     'auto_install': False,
     'certificate' : '00923971112835220957',
diff --git a/addons/hr_payroll_account/hr_payroll_account.py b/addons/hr_payroll_account/hr_payroll_account.py
index 71621874066..184f9a06867 100644
--- a/addons/hr_payroll_account/hr_payroll_account.py
+++ b/addons/hr_payroll_account/hr_payroll_account.py
@@ -108,7 +108,7 @@ class hr_payslip(osv.osv):
                 'journal_id': slip.journal_id.id,
                 'period_id': period_id,
             }
-            for line in slip.line_ids:
+            for line in slip.details_by_salary_rule_category:
                 amt = slip.credit_note and -line.total or line.total
                 partner_id = line.salary_rule_id.register_id.partner_id and line.salary_rule_id.register_id.partner_id.id or default_partner_id
                 debit_account_id = line.salary_rule_id.account_debit.id
@@ -218,6 +218,17 @@ class hr_payslip_run(osv.osv):
         'journal_id': fields.many2one('account.journal', 'Expense Journal', states={'draft': [('readonly', False)]}, readonly=True, required=True),
     }
 
+    def _get_default_journal(self, cr, uid, context=None):
+        model_data = self.pool.get('ir.model.data')
+        res = model_data.search(cr, uid, [('name', '=', 'expenses_journal')])
+        if res:
+            return model_data.browse(cr, uid, res[0]).res_id
+        return False
+
+    _defaults = {
+        'journal_id': _get_default_journal,
+    }
+
 hr_payslip_run()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr_payroll_account/i18n/ar.po b/addons/hr_payroll_account/i18n/ar.po
index 4bc2924a7c0..89df3efd3f1 100644
--- a/addons/hr_payroll_account/i18n/ar.po
+++ b/addons/hr_payroll_account/i18n/ar.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:35+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_payroll_account
 #: field:hr.payslip,move_id:0
diff --git a/addons/hr_payroll_account/i18n/bg.po b/addons/hr_payroll_account/i18n/bg.po
index 78c2c71e4d6..cc05907800e 100644
--- a/addons/hr_payroll_account/i18n/bg.po
+++ b/addons/hr_payroll_account/i18n/bg.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:35+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_payroll_account
 #: field:hr.payslip,move_id:0
diff --git a/addons/hr_payroll_account/i18n/ca.po b/addons/hr_payroll_account/i18n/ca.po
index fd68235992c..e64f90ebae6 100644
--- a/addons/hr_payroll_account/i18n/ca.po
+++ b/addons/hr_payroll_account/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:35+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_payroll_account
 #: field:hr.payslip,move_id:0
diff --git a/addons/hr_payroll_account/i18n/da.po b/addons/hr_payroll_account/i18n/da.po
index d4b837ded5f..11f7e3623c6 100644
--- a/addons/hr_payroll_account/i18n/da.po
+++ b/addons/hr_payroll_account/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:35+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_payroll_account
 #: field:hr.payslip,move_id:0
diff --git a/addons/hr_payroll_account/i18n/de.po b/addons/hr_payroll_account/i18n/de.po
index e799e162bf6..4d225325e3e 100644
--- a/addons/hr_payroll_account/i18n/de.po
+++ b/addons/hr_payroll_account/i18n/de.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:35+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_payroll_account
 #: field:hr.payslip,move_id:0
diff --git a/addons/hr_payroll_account/i18n/en_GB.po b/addons/hr_payroll_account/i18n/en_GB.po
index e7453f8d24e..777ee11d24f 100644
--- a/addons/hr_payroll_account/i18n/en_GB.po
+++ b/addons/hr_payroll_account/i18n/en_GB.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:35+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_payroll_account
 #: field:hr.payslip,move_id:0
diff --git a/addons/hr_payroll_account/i18n/es.po b/addons/hr_payroll_account/i18n/es.po
index 28388a04f8a..083136a3b53 100644
--- a/addons/hr_payroll_account/i18n/es.po
+++ b/addons/hr_payroll_account/i18n/es.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:35+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_payroll_account
 #: field:hr.payslip,move_id:0
diff --git a/addons/hr_payroll_account/i18n/es_CR.po b/addons/hr_payroll_account/i18n/es_CR.po
index f4c927ee102..f3f1bc98ec0 100644
--- a/addons/hr_payroll_account/i18n/es_CR.po
+++ b/addons/hr_payroll_account/i18n/es_CR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:35+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 "Language: es\n"
 
 #. module: hr_payroll_account
diff --git a/addons/hr_payroll_account/i18n/es_EC.po b/addons/hr_payroll_account/i18n/es_EC.po
index 9ac4f42c9d7..81946eb6a4b 100644
--- a/addons/hr_payroll_account/i18n/es_EC.po
+++ b/addons/hr_payroll_account/i18n/es_EC.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:36+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_payroll_account
 #: field:hr.payslip,move_id:0
diff --git a/addons/hr_payroll_account/i18n/es_PY.po b/addons/hr_payroll_account/i18n/es_PY.po
index 942272da242..e91befaa7b7 100644
--- a/addons/hr_payroll_account/i18n/es_PY.po
+++ b/addons/hr_payroll_account/i18n/es_PY.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:36+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_payroll_account
 #: field:hr.payslip,move_id:0
diff --git a/addons/hr_payroll_account/i18n/fr.po b/addons/hr_payroll_account/i18n/fr.po
index 557f81bd5c5..a3d32ae706e 100644
--- a/addons/hr_payroll_account/i18n/fr.po
+++ b/addons/hr_payroll_account/i18n/fr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:35+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_payroll_account
 #: field:hr.payslip,move_id:0
diff --git a/addons/hr_payroll_account/i18n/gl.po b/addons/hr_payroll_account/i18n/gl.po
index b058612b33f..188df56db52 100644
--- a/addons/hr_payroll_account/i18n/gl.po
+++ b/addons/hr_payroll_account/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:35+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_payroll_account
 #: field:hr.payslip,move_id:0
diff --git a/addons/hr_payroll_account/i18n/gu.po b/addons/hr_payroll_account/i18n/gu.po
index d48b8403efb..49bbf5fda6a 100644
--- a/addons/hr_payroll_account/i18n/gu.po
+++ b/addons/hr_payroll_account/i18n/gu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:35+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_payroll_account
 #: field:hr.payslip,move_id:0
diff --git a/addons/hr_payroll_account/i18n/hr.po b/addons/hr_payroll_account/i18n/hr.po
index 119f7691933..85653416173 100644
--- a/addons/hr_payroll_account/i18n/hr.po
+++ b/addons/hr_payroll_account/i18n/hr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:35+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_payroll_account
 #: field:hr.payslip,move_id:0
diff --git a/addons/hr_payroll_account/i18n/hu.po b/addons/hr_payroll_account/i18n/hu.po
index 8229379a20b..8e2029cd0d3 100644
--- a/addons/hr_payroll_account/i18n/hu.po
+++ b/addons/hr_payroll_account/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:35+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_payroll_account
 #: field:hr.payslip,move_id:0
diff --git a/addons/hr_payroll_account/i18n/id.po b/addons/hr_payroll_account/i18n/id.po
index c0bde7ed84e..f76ea3c9160 100644
--- a/addons/hr_payroll_account/i18n/id.po
+++ b/addons/hr_payroll_account/i18n/id.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:35+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_payroll_account
 #: field:hr.payslip,move_id:0
diff --git a/addons/hr_payroll_account/i18n/it.po b/addons/hr_payroll_account/i18n/it.po
index 05cddc5a7fa..b6e838f3845 100644
--- a/addons/hr_payroll_account/i18n/it.po
+++ b/addons/hr_payroll_account/i18n/it.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:35+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_payroll_account
 #: field:hr.payslip,move_id:0
diff --git a/addons/hr_payroll_account/i18n/ja.po b/addons/hr_payroll_account/i18n/ja.po
index beb0fad4230..466f33d1271 100644
--- a/addons/hr_payroll_account/i18n/ja.po
+++ b/addons/hr_payroll_account/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:35+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_payroll_account
 #: field:hr.payslip,move_id:0
diff --git a/addons/hr_payroll_account/i18n/lv.po b/addons/hr_payroll_account/i18n/lv.po
index fd6a97e6c16..dac73755c97 100644
--- a/addons/hr_payroll_account/i18n/lv.po
+++ b/addons/hr_payroll_account/i18n/lv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:35+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_payroll_account
 #: field:hr.payslip,move_id:0
diff --git a/addons/hr_payroll_account/i18n/mn.po b/addons/hr_payroll_account/i18n/mn.po
index f916f12ae9e..8d175bdb7af 100644
--- a/addons/hr_payroll_account/i18n/mn.po
+++ b/addons/hr_payroll_account/i18n/mn.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:35+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_payroll_account
 #: field:hr.payslip,move_id:0
diff --git a/addons/hr_payroll_account/i18n/nb.po b/addons/hr_payroll_account/i18n/nb.po
new file mode 100644
index 00000000000..d1c0bf47a00
--- /dev/null
+++ b/addons/hr_payroll_account/i18n/nb.po
@@ -0,0 +1,141 @@
+# Norwegian Bokmal 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-02-08 00:36+0000\n"
+"PO-Revision-Date: 2012-09-07 19:55+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Norwegian Bokmal <nb@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-09-08 04:54+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
+
+#. module: hr_payroll_account
+#: field:hr.payslip,move_id:0
+msgid "Accounting Entry"
+msgstr "Regnskapsmessig oppføring"
+
+#. module: hr_payroll_account
+#: field:hr.salary.rule,account_tax_id:0
+msgid "Tax Code"
+msgstr "Skattekode"
+
+#. module: hr_payroll_account
+#: field:hr.payslip,journal_id:0
+#: field:hr.payslip.run,journal_id:0
+msgid "Expense Journal"
+msgstr "Bekostning Journal"
+
+#. module: hr_payroll_account
+#: code:addons/hr_payroll_account/hr_payroll_account.py:157
+#: code:addons/hr_payroll_account/hr_payroll_account.py:173
+#, python-format
+msgid "Adjustment Entry"
+msgstr "Justering oppføring"
+
+#. module: hr_payroll_account
+#: field:hr.contract,analytic_account_id:0
+#: field:hr.salary.rule,analytic_account_id:0
+msgid "Analytic Account"
+msgstr "Analytisk konto"
+
+#. module: hr_payroll_account
+#: model:ir.model,name:hr_payroll_account.model_hr_salary_rule
+msgid "hr.salary.rule"
+msgstr "hr.salary.rule"
+
+#. module: hr_payroll_account
+#: model:ir.model,name:hr_payroll_account.model_hr_payslip_run
+msgid "Payslip Batches"
+msgstr "Lønnsslipp Batcher."
+
+#. module: hr_payroll_account
+#: field:hr.contract,journal_id:0
+msgid "Salary Journal"
+msgstr "lønn Journal"
+
+#. module: hr_payroll_account
+#: model:ir.model,name:hr_payroll_account.model_hr_payslip
+msgid "Pay Slip"
+msgstr "Lønnslipp"
+
+#. module: hr_payroll_account
+#: constraint:hr.payslip:0
+msgid "Payslip 'Date From' must be before 'Date To'."
+msgstr "Lønnslipp \" Dato fra \" må være før \" Dato Til \""
+
+#. module: hr_payroll_account
+#: help:hr.payslip,period_id:0
+msgid "Keep empty to use the period of the validation(Payslip) date."
+msgstr "Hold tom for å bruke tid på validering (lønnsslipp) dato."
+
+#. module: hr_payroll_account
+#: code:addons/hr_payroll_account/hr_payroll_account.py:171
+#, python-format
+msgid ""
+"The Expense Journal \"%s\" has not properly configured the Debit Account!"
+msgstr "Bekostning Journal \"% s\" har ikke riktig konfigurert Debet konto!"
+
+#. module: hr_payroll_account
+#: code:addons/hr_payroll_account/hr_payroll_account.py:155
+#, python-format
+msgid ""
+"The Expense Journal \"%s\" has not properly configured the Credit Account!"
+msgstr ""
+"Bekostning Journal \"% s\" har ikke riktig konfigurert kreditt-konto!"
+
+#. module: hr_payroll_account
+#: field:hr.salary.rule,account_debit:0
+msgid "Debit Account"
+msgstr "Debetkonto"
+
+#. module: hr_payroll_account
+#: code:addons/hr_payroll_account/hr_payroll_account.py:102
+#, python-format
+msgid "Payslip of %s"
+msgstr "Lønnslipp av %s."
+
+#. module: hr_payroll_account
+#: model:ir.model,name:hr_payroll_account.model_hr_contract
+msgid "Contract"
+msgstr "Kontrakt"
+
+#. module: hr_payroll_account
+#: constraint:hr.contract:0
+msgid "Error! contract start-date must be lower then contract end-date."
+msgstr "Feil! Kontrakten startdato må være lavere enn kontrakt sluttdato."
+
+#. module: hr_payroll_account
+#: field:hr.payslip,period_id:0
+msgid "Force Period"
+msgstr "Kraft Periode."
+
+#. module: hr_payroll_account
+#: field:hr.salary.rule,account_credit:0
+msgid "Credit Account"
+msgstr "Kredittkonto"
+
+#. module: hr_payroll_account
+#: model:ir.model,name:hr_payroll_account.model_hr_payslip_employees
+msgid "Generate payslips for all selected employees"
+msgstr "Generer lønnsslipper for alle utvalgte ansatte."
+
+#. module: hr_payroll_account
+#: code:addons/hr_payroll_account/hr_payroll_account.py:155
+#: code:addons/hr_payroll_account/hr_payroll_account.py:171
+#, python-format
+msgid "Configuration Error!"
+msgstr "Konfigurasjonsfeil!"
+
+#. module: hr_payroll_account
+#: view:hr.contract:0
+#: view:hr.salary.rule:0
+msgid "Accounting"
+msgstr "Regnskap"
diff --git a/addons/hr_payroll_account/i18n/nl.po b/addons/hr_payroll_account/i18n/nl.po
index 065fd58d1fd..f2a9bd80e99 100644
--- a/addons/hr_payroll_account/i18n/nl.po
+++ b/addons/hr_payroll_account/i18n/nl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:35+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_payroll_account
 #: field:hr.payslip,move_id:0
diff --git a/addons/hr_payroll_account/i18n/pl.po b/addons/hr_payroll_account/i18n/pl.po
index a10ce3c6b01..5b7e6a81ed0 100644
--- a/addons/hr_payroll_account/i18n/pl.po
+++ b/addons/hr_payroll_account/i18n/pl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:35+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_payroll_account
 #: field:hr.payslip,move_id:0
diff --git a/addons/hr_payroll_account/i18n/pt.po b/addons/hr_payroll_account/i18n/pt.po
index 5f3d852c4ca..cccb3fa5496 100644
--- a/addons/hr_payroll_account/i18n/pt.po
+++ b/addons/hr_payroll_account/i18n/pt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:35+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_payroll_account
 #: field:hr.payslip,move_id:0
diff --git a/addons/hr_payroll_account/i18n/pt_BR.po b/addons/hr_payroll_account/i18n/pt_BR.po
index 58488016a7a..39190b5abd7 100644
--- a/addons/hr_payroll_account/i18n/pt_BR.po
+++ b/addons/hr_payroll_account/i18n/pt_BR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:35+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_payroll_account
 #: field:hr.payslip,move_id:0
diff --git a/addons/hr_payroll_account/i18n/ro.po b/addons/hr_payroll_account/i18n/ro.po
index cfa618ff32b..979285a8121 100644
--- a/addons/hr_payroll_account/i18n/ro.po
+++ b/addons/hr_payroll_account/i18n/ro.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:35+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_payroll_account
 #: field:hr.payslip,move_id:0
diff --git a/addons/hr_payroll_account/i18n/ru.po b/addons/hr_payroll_account/i18n/ru.po
index 566bf5a5626..924e41f5bec 100644
--- a/addons/hr_payroll_account/i18n/ru.po
+++ b/addons/hr_payroll_account/i18n/ru.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:35+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_payroll_account
 #: field:hr.payslip,move_id:0
diff --git a/addons/hr_payroll_account/i18n/sr@latin.po b/addons/hr_payroll_account/i18n/sr@latin.po
index e7717d3fb71..782f03c1f80 100644
--- a/addons/hr_payroll_account/i18n/sr@latin.po
+++ b/addons/hr_payroll_account/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:36+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_payroll_account
 #: field:hr.payslip,move_id:0
diff --git a/addons/hr_payroll_account/i18n/sv.po b/addons/hr_payroll_account/i18n/sv.po
index 0b91689d0af..a4fe8042e36 100644
--- a/addons/hr_payroll_account/i18n/sv.po
+++ b/addons/hr_payroll_account/i18n/sv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:35+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_payroll_account
 #: field:hr.payslip,move_id:0
diff --git a/addons/hr_payroll_account/i18n/tr.po b/addons/hr_payroll_account/i18n/tr.po
index deab3fe62dc..1e1fb4f12a0 100644
--- a/addons/hr_payroll_account/i18n/tr.po
+++ b/addons/hr_payroll_account/i18n/tr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:35+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_payroll_account
 #: field:hr.payslip,move_id:0
diff --git a/addons/hr_payroll_account/i18n/zh_CN.po b/addons/hr_payroll_account/i18n/zh_CN.po
index 75cd40c08c5..8064a46108a 100644
--- a/addons/hr_payroll_account/i18n/zh_CN.po
+++ b/addons/hr_payroll_account/i18n/zh_CN.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:36+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_payroll_account
 #: field:hr.payslip,move_id:0
diff --git a/addons/hr_payroll_account/wizard/hr_payroll_payslips_by_employees.py b/addons/hr_payroll_account/wizard/hr_payroll_payslips_by_employees.py
index a00ff97ef6b..7e3f4bbbe2b 100644
--- a/addons/hr_payroll_account/wizard/hr_payroll_payslips_by_employees.py
+++ b/addons/hr_payroll_account/wizard/hr_payroll_payslips_by_employees.py
@@ -31,8 +31,9 @@ class hr_payslip_employees(osv.osv_memory):
             context = {}
         if context and context.get('active_id', False):
             run_data = run_pool.read(cr, uid, context['active_id'], ['journal_id'])
-        journal_id =  run_data.get('journal_id', False)[0]
-        context.update({'journal_id': journal_id})
+        journal_id =  run_data.get('journal_id', False)
+        journal_id = journal_id and journal_id[0] or False
+        if journal_id: context.update({'journal_id': journal_id})
         return super(hr_payslip_employees, self).compute_sheet(cr, uid, ids, context=context)
 
 hr_payslip_employees()
diff --git a/addons/hr_recruitment/__openerp__.py b/addons/hr_recruitment/__openerp__.py
index 0de2eb5c94e..ee000f3951e 100644
--- a/addons/hr_recruitment/__openerp__.py
+++ b/addons/hr_recruitment/__openerp__.py
@@ -19,12 +19,13 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
+
 {
     'name': 'Recruitment Process',
     'version': '1.0',
     'category': 'Human Resources',
-    "sequence": 24,
-    "summary": "Recruitment Process, Job Descriptions",
+    'sequence': 24,
+    'summary': 'Recruitment Process, Job Descriptions',
     'description': """
 Manages job positions and the recruitment process.
 ==================================================
@@ -46,7 +47,7 @@ system to store and search in your CV base.
         'base_calendar',
         'fetchmail',
     ],
-    'update_xml': [
+    'data': [
         'wizard/hr_recruitment_employee_hired.xml',
         'wizard/hr_recruitment_create_partner_job_view.xml',
         'hr_recruitment_view.xml',
@@ -57,19 +58,14 @@ system to store and search in your CV base.
         'board_hr_recruitment_statistical_view.xml',
         'hr_recruitment_installer_view.xml',
         'res_config_view.xml',
-     ],
-    'init_xml': [
         'hr_recruitment_data.xml'
     ],
-    'demo_xml': [
-        'hr_recruitment_demo.yml',
-    ],
-    'test':[
-            'test/recruitment_process.yml',
-            ],
+    'demo': ['hr_recruitment_demo.yml'],
+    'js': ['static/src/js/hr_recruitment.js'],
+    'test': ['test/recruitment_process.yml'],
     'installable': True,
     'auto_install': False,
-    'certificate' : '001073437025460275621',
+    'certificate': '001073437025460275621',
     'application': True,
 }
 
diff --git a/addons/hr_recruitment/hr_recruitment.py b/addons/hr_recruitment/hr_recruitment.py
index 0ace2574d65..2748834ae9a 100644
--- a/addons/hr_recruitment/hr_recruitment.py
+++ b/addons/hr_recruitment/hr_recruitment.py
@@ -19,18 +19,13 @@
 #
 ##############################################################################
 
-import logging
 import time
-from datetime import datetime
-
 import tools
-from osv import fields, osv
-from openerp.modules.registry import RegistryManager
-from openerp import SUPERUSER_ID
-from base_status.base_stage import base_stage
-from tools.translate import _
 
-_logger = logging.getLogger(__name__)
+from base_status.base_stage import base_stage
+from datetime import datetime
+from osv import fields, osv
+from tools.translate import _
 
 AVAILABLE_STATES = [
     ('draft', 'New'),
@@ -95,8 +90,7 @@ class hr_applicant(base_stage, osv.Model):
     _name = "hr.applicant"
     _description = "Applicant"
     _order = "id desc"
-    _inherit = ['ir.needaction_mixin', 'mail.thread']
-    _mail_compose_message = True
+    _inherit = ['mail.thread', 'ir.needaction_mixin']
 
     def _get_default_department_id(self, cr, uid, context=None):
         """ Gives default department by checking if present in the context """
@@ -137,13 +131,17 @@ class hr_applicant(base_stage, osv.Model):
         department_id = self._resolve_department_id_from_context(cr, uid, context=context)
         search_domain = []
         if department_id:
-            search_domain += ['|', '&', ('department_id', '=', department_id), ('fold', '=', False)]
-        search_domain += ['|', ('id', 'in', ids), '&', ('department_id', '=', False), ('fold', '=', False)]
+            search_domain += ['|', ('department_id', '=', department_id)]
+        search_domain += ['|', ('id', 'in', ids), ('department_id', '=', False)]
         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])))
-        return result
+
+        fold = {}
+        for stage in stage_obj.browse(cr, access_rights_uid, stage_ids, context=context):
+            fold[stage.id] = stage.fold or False
+        return result, fold
 
     def _compute_day(self, cr, uid, ids, fields, args, context=None):
         """
@@ -166,13 +164,11 @@ class hr_applicant(base_stage, osv.Model):
                         date_create = datetime.strptime(issue.create_date, "%Y-%m-%d %H:%M:%S")
                         date_open = datetime.strptime(issue.date_open, "%Y-%m-%d %H:%M:%S")
                         ans = date_open - date_create
-                        date_until = issue.date_open
 
                 elif field in ['day_close']:
                     if issue.date_closed:
                         date_create = datetime.strptime(issue.create_date, "%Y-%m-%d %H:%M:%S")
                         date_close = datetime.strptime(issue.date_closed, "%Y-%m-%d %H:%M:%S")
-                        date_until = issue.date_closed
                         ans = date_close - date_create
                 if ans:
                     duration = float(ans.days)
@@ -190,7 +186,7 @@ class hr_applicant(base_stage, osv.Model):
         'create_date': fields.datetime('Creation Date', readonly=True, select=True),
         'write_date': fields.datetime('Update Date', readonly=True),
         'stage_id': fields.many2one ('hr.recruitment.stage', 'Stage',
-                        domain="['|', ('department_id', '=', department_id), ('department_id', '=', False)]"),
+                        domain="['&', ('fold', '=', False), '|', ('department_id', '=', department_id), ('department_id', '=', False)]"),
         'state': fields.related('stage_id', 'state', type="selection", store=True,
                 selection=AVAILABLE_STATES, string="State", readonly=True,
                 help='The state is set to \'Draft\', when a case is created.\
@@ -198,6 +194,7 @@ class hr_applicant(base_stage, osv.Model):
                       When the case is over, the state is set to \'Done\'.\
                       If the case needs to be reviewed then the state is \
                       set to \'Pending\'.'),
+        'categ_ids': fields.many2many('hr.applicant_category', string='Categories'),
         'company_id': fields.many2one('res.company', 'Company'),
         'user_id': fields.many2one('res.users', 'Responsible'),
         # Applicant Columns
@@ -332,14 +329,13 @@ class hr_applicant(base_stage, osv.Model):
         if custom_values is None: custom_values = {}
         custom_values.update({
             'name':  msg.get('subject') or _("No Subject"),
-            'description': msg.get('body_text'),
+            'description': msg.get('body'),
             'email_from': msg.get('from'),
             'email_cc': msg.get('cc'),
             'user_id': False,
         })
         if msg.get('priority'):
             custom_values['priority'] = msg.get('priority')
-        custom_values.update(self.message_partner_by_email(cr, uid, msg.get('from', False), context=context))
         return super(hr_applicant,self).message_new(cr, uid, msg, custom_values=custom_values, context=context)
 
     def message_update(self, cr, uid, ids, msg, update_vals=None, context=None):
@@ -350,7 +346,7 @@ class hr_applicant(base_stage, osv.Model):
         if isinstance(ids, (str, int, long)):
             ids = [ids]
         if update_vals is None: vals = {}
-        
+
         update_vals.update({
             'description': msg.get('body'),
             'email_from': msg.get('from'),
@@ -364,7 +360,7 @@ class hr_applicant(base_stage, osv.Model):
             'revenue': 'planned_revenue',
             'probability': 'probability',
         }
-        for line in msg.get('body_text', '').split('\n'):
+        for line in msg.get('body', '').split('\n'):
             line = line.strip()
             res = tools.misc.command_re.match(line)
             if res and maps.get(res.group(1).lower(), False):
@@ -461,23 +457,18 @@ class hr_applicant(base_stage, osv.Model):
     # OpenChatter methods and notifications
     # -------------------------------------------------------
 
-    def message_get_monitored_follower_fields(self, cr, uid, ids, context=None):
-        """ Add 'user_id' to the monitored fields """
-        res = super(hr_applicant, self).message_get_monitored_follower_fields(cr, uid, ids, context=context)
-        return res + ['user_id']
-
     def stage_set_send_note(self, cr, uid, ids, stage_id, context=None):
         """ Override of the (void) default notification method. """
         if not stage_id: return True
         stage_name = self.pool.get('hr.recruitment.stage').name_get(cr, uid, [stage_id], context=context)[0][1]
-        return self.message_append_note(cr, uid, ids, body= _("Stage changed to <b>%s</b>.") % (stage_name), context=context)
+        return self.message_post(cr, uid, ids, body= _("Stage changed to <b>%s</b>.") % (stage_name), context=context)
 
     def case_get_note_msg_prefix(self, cr, uid, id, context=None):
 		return 'Applicant'
 
     def case_open_send_note(self, cr, uid, ids, context=None):
         message = _("Applicant has been set <b>in progress</b>.")
-        return self.message_append_note(cr, uid, ids, body=message, context=context)
+        return self.message_post(cr, uid, ids, body=message, context=context)
 
     def case_close_send_note(self, cr, uid, ids, context=None):
         if context is None:
@@ -485,23 +476,23 @@ class hr_applicant(base_stage, osv.Model):
         for applicant in self.browse(cr, uid, ids, context=context):
             if applicant.emp_id:
                 message = _("Applicant has been <b>hired</b> and created as an employee.")
-                self.message_append_note(cr, uid, [applicant.id], body=message, context=context)
+                self.message_post(cr, uid, [applicant.id], body=message, context=context)
             else:
                 message = _("Applicant has been <b>hired</b>.")
-                self.message_append_note(cr, uid, [applicant.id], body=message, context=context)
+                self.message_post(cr, uid, [applicant.id], body=message, context=context)
         return True
 
     def case_cancel_send_note(self, cr, uid, ids, context=None):
         msg = 'Applicant <b>refused</b>.'
-        return self.message_append_note(cr, uid, ids, body=msg, context=context)
+        return self.message_post(cr, uid, ids, body=msg, context=context)
 
     def case_reset_send_note(self,  cr, uid, ids, context=None):
         message =_("Applicant has been set as <b>new</b>.")
-        return self.message_append_note(cr, uid, ids, body=message, context=context)
+        return self.message_post(cr, uid, ids, body=message, context=context)
 
     def create_send_note(self, cr, uid, ids, context=None):
         message = _("Applicant has been <b>created</b>.")
-        return self.message_append_note(cr, uid, ids, body=message, context=context)
+        return self.message_post(cr, uid, ids, body=message, context=context)
 
 
 class hr_job(osv.osv):
@@ -510,7 +501,7 @@ class hr_job(osv.osv):
     _inherits = {'mail.alias': 'alias_id'}
     _columns = {
         'survey_id': fields.many2one('survey', 'Interview Form', help="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"),
-        'alias_id': fields.many2one('mail.alias', 'Alias', ondelete="cascade", required=True, 
+        'alias_id': fields.many2one('mail.alias', 'Alias', ondelete="cascade", required=True,
                                     help="Email alias for this job position. New emails will automatically "
                                          "create new applicants for this job position."),
     }
@@ -521,41 +512,14 @@ class hr_job(osv.osv):
 
     def _auto_init(self, cr, context=None):
         """Installation hook to create aliases for all jobs and avoid constraint errors."""
-        
-        # disable the unique alias_id not null constraint, to avoid spurious warning during 
-        # super.auto_init. We'll reinstall it afterwards.
-        self._columns['alias_id'].required = False
-
-        super(hr_job,self)._auto_init(cr, context=context)
-        
-        registry = RegistryManager.get(cr.dbname)
-        mail_alias = registry.get('mail.alias')
-        hr_jobs = registry.get('hr.job')
-        jobs_no_alias = hr_jobs.search(cr, SUPERUSER_ID, [('alias_id', '=', False)])
-        # Use read() not browse(), to avoid prefetching uninitialized inherited fields
-        for job_data in hr_jobs.read(cr, SUPERUSER_ID, jobs_no_alias, ['name']):
-            alias_id = mail_alias.create_unique_alias(cr, SUPERUSER_ID, {'alias_name': 'job+'+job_data['name'],
-                                                                         'alias_defaults': {'job_id': job_data['id']}},
-                                                      model_name='hr.applicant')
-            hr_jobs.write(cr, SUPERUSER_ID, job_data['id'], {'alias_id': alias_id})
-            _logger.info('Mail alias created for hr.job %s (uid %s)', job_data['name'], job_data['id'])
-
-        # Finally attempt to reinstate the missing constraint
-        try:
-            cr.execute('ALTER TABLE hr_job ALTER COLUMN alias_id SET NOT NULL')
-        except Exception:
-            _logger.warning("Table '%s': unable to set a NOT NULL constraint on column '%s' !\n"\
-                            "If you want to have it, you should update the records and execute manually:\n"\
-                            "ALTER TABLE %s ALTER COLUMN %s SET NOT NULL",
-                            self._table, 'alias_id', self._table, 'alias_id')
-
-        self._columns['alias_id'].required = True
+        self.pool.get('mail.alias').migrate_to_alias(cr, self._name, self._table, super(hr_job,self)._auto_init,
+            self._columns['alias_id'], 'name', alias_prefix='job+', alias_defaults={'job_id': 'id'}, context=context)
 
     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, 
+            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']},
@@ -573,7 +537,7 @@ class hr_job(osv.osv):
         res = super(hr_job, self).unlink(cr, uid, ids, context=context)
         mail_alias.unlink(cr, uid, alias_ids, context=context)
         return res
-    
+
     def action_print_survey(self, cr, uid, ids, context=None):
         if context is None:
             context = {}
@@ -591,4 +555,12 @@ class hr_job(osv.osv):
                 'nodestroy':True,
             }
 
+class applicant_category(osv.osv):
+    """ Category of applicant """
+    _name = "hr.applicant_category"
+    _description = "Category of applicant"
+    _columns = {
+        'name': fields.char('Name', size=64, required=True, translate=True),
+    }
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr_recruitment/hr_recruitment_data.xml b/addons/hr_recruitment/hr_recruitment_data.xml
index d90f5ab596a..84289da7bae 100644
--- a/addons/hr_recruitment/hr_recruitment_data.xml
+++ b/addons/hr_recruitment/hr_recruitment_data.xml
@@ -2,14 +2,15 @@
 <openerp>
 <data noupdate="1">
         <!-- notify all employees of module installation -->
-        <function model="mail.group" name="message_append_note">
-            <!-- ids, subject, body, parent_id=False, type='notification', content_subtype='html' -->
-            <value eval="[ref('mail.group_all_employees')]"/>
-            <value>Module Recruitment Process has been installed</value>
-            <value>Manage job positions and the recruitment process in your company.  This module is integrated with the module Survey to help you to define interviews for different jobs.
+        <record model="mail.message" id="module_install_notification">
+            <field name="model">mail.group</field>
+            <field name="res_id" ref="mail.group_all_employees"/>
+            <field name="type">notification</field>
+            <field name="subject">Recruitment Process application installed!</field>
+            <field name="body">Manage job positions and your company's recruitment process.  This application is integrated with the Survey application to help you define interviews for different jobs.
 
-You can automatically create application records from an email gateway, that you can configure in the Human Resources Settings.</value>
-        </function>
+You can automatically receive job application though an email gateway, see the Human Resources settings.</field>
+        </record>
 
     <!-- Meeting Types (for interview meetings) -->
     <record model="crm.meeting.type" id="categ_meet_interview">
diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index 0e74473f853..d00fbc632be 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -76,8 +76,8 @@
         <field name="name">Applicants</field>
         <field name="model">hr.applicant</field>
         <field name="arch" type="xml">
-            <tree string="Applicants" fonts="bold:needaction_pending==True" colors="grey:state in ('cancel','done');blue:state=='pending'">
-                <field name="needaction_pending" invisible="1"/>
+            <tree string="Applicants" fonts="bold:message_unread==True" colors="grey:state in ('cancel','done');blue:state=='pending'">
+                <field name="message_unread" invisible="1"/>
                 <field name="create_date" groups="base.group_no_one"/>
                 <field name="name" string="Subject"/>
                 <field name="partner_name"/>
@@ -95,7 +95,7 @@
                 <field name="availability" invisible="1"/>
                 <field name="department_id" invisible="context.get('invisible_department', True)"/>
                 <field name="user_id"/>
-                <field name="state" groups="base.group_no_one"/>
+                <field name="state" invisible="1"/>
             </tree>
         </field>
     </record>
@@ -107,7 +107,7 @@
           <form string="Jobs - Recruitment Form" version="7.0">
             <header>
                 <button name="case_close_with_emp" string="Hire" type="object"
-                        states="open,pending" class="oe_highlight"/>
+                        states="draft,open,pending" class="oe_highlight"/>
                 <button name="case_cancel" string="Refuse" type="object"
                         states="draft,open,pending" class="oe_highlight"/>
                 <field name="stage_id" widget="statusbar" clickable="True"/>
@@ -176,6 +176,9 @@
                         </div>
                     </group>
                 </group>
+                <group>
+                    <field name="categ_ids" widget="many2many_tags"/>
+                </group>
                 <separator string="Application Summary"/>
                 <field name="description" placeholder="Feedback of interviews..."/>
             </sheet>
@@ -205,7 +208,7 @@
         <field name="arch" type="xml">
             <search string="Search Jobs">
                 <field name="partner_name" filter_domain="['|','|',('name','ilike',self),('partner_name','ilike',self),('email_from','ilike',self)]" string="Subject / Applicant"/>
-                <filter icon="terp-mail-message-new" string="Inbox" help="Unread messages" name="needaction_pending" domain="[('needaction_pending','=',True)]"/>
+                <filter icon="terp-mail-message-new" string="Inbox" help="Unread messages" name="message_unread" domain="[('message_unread','=',True)]"/>
                 <separator/>
                 <filter icon="terp-document-new" string="New" domain="[('state','=','draft')]" help="All Initial Jobs"/>
                 <filter icon="terp-camera_test" string="In Progress" domain="[('state','=','open')]" help="Open Jobs"/>
@@ -225,7 +228,6 @@
                     <filter string="Availability" icon="terp-camera_test" domain="[]" context="{'group_by':'availability'}"/>
                     <filter string="Appreciation" icon="terp-face-plain" domain="[]" context="{'group_by':'priority'}"/>
                     <filter string="Stage" icon="terp-stage" domain="[]" context="{'group_by':'stage_id'}"/>
-                    <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
                     <filter string="Source" icon="terp-face-plain" domain="[]" context="{'group_by':'source_id'}"/>
                     <filter string="Creation Date" icon="terp-go-month" domain="[]" context="{'group_by':'create_date'}" groups="base.group_no_one"/>
                 </group>
@@ -254,6 +256,7 @@
         <field name="model">hr.applicant</field>
         <field name="arch" type="xml">
             <kanban default_group_by="stage_id">
+                <field name="stage_id"/>
                 <field name="color"/>
                 <field name="priority"/>
                 <field name="survey"/>
@@ -264,6 +267,7 @@
                 <field name="job_id"/>
                 <field name="title_action"/>
                 <field name="department_id"/>
+                <field name="categ_ids"/>
                 <templates>
                     <t t-name="kanban-tooltip">
                         <ul class="oe_kanban_tooltip">
@@ -273,12 +277,12 @@
                         </ul>
                     </t>
                     <t t-name="kanban-box">
-                        <div t-attf-class="oe_kanban_color_#{kanban_getcolor(record.color.raw_value)} oe_kanban_card oe_kanban_global_click">
+                        <div t-attf-class="oe_kanban_color_#{kanban_getcolor(record.color.raw_value)} oe_kanban_card oe_kanban_global_click oe_semantic_html_override">
                             <div class="oe_dropdown_toggle oe_dropdown_kanban">
                                 <span class="oe_e">i</span>
                                 <ul class="oe_dropdown_menu">
-                                    <li><a type="edit">Edit...</a></li>
-                                    <li><a type="delete">Delete</a></li>
+                                    <t t-if="widget.view.is_action_enabled('edit')"><li><a type="edit">Edit...</a></li></t>
+                                    <t t-if="widget.view.is_action_enabled('delete')"><li><a type="delete">Delete</a></li></t>
                                     <li><a name="action_makeMeeting" type="object">Schedule Interview</a></li>
                                     <li><ul class="oe_kanban_colorpicker" data-field="color"/></li>
                                 </ul>
@@ -308,6 +312,13 @@
                                     <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"/>
 
                                 </div>
+                                <div class="oe_kanban_footer_left" style="margin-top:5px;">
+                                    <div class="oe_left oe_tags">
+                                        <t t-foreach="record.categ_ids.raw_value" t-as="categ_id">
+                                            <span class="oe_tag" t-att-data-categ_id="categ_id"></span>
+                                        </t>
+                                    </div>
+                                </div>
                             </div>
                             <div class="oe_clear"></div>
                         </div>
@@ -364,10 +375,15 @@
         <field name="arch" type="xml">
             <form string="Stage" version="7.0">
                 <group string="Stage Definition">
-                    <field name="name"/>
-                    <field name="department_id"/>
-                    <field name="sequence"/>
-                    <field name="state"/>
+                    <group>
+                        <field name="name"/>
+                        <field name="department_id"/>
+                    </group>
+                    <group>
+                        <field name="state"/>
+                        <field name="sequence"/>
+                        <field name="fold"/>
+                    </group>
                 </group>
                 <separator string="Requirements"/>
                 <field name="requirements"/>
diff --git a/addons/hr_recruitment/i18n/ar.po b/addons/hr_recruitment/i18n/ar.po
index a4859fdcb84..794ef46b130 100644
--- a/addons/hr_recruitment/i18n/ar.po
+++ b/addons/hr_recruitment/i18n/ar.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:35+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_recruitment
 #: help:hr.applicant,active:0
@@ -35,7 +35,7 @@ msgstr "المتطلبات"
 #: 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 ""
+msgstr "مصادر مقدمين الطلبات"
 
 #. module: hr_recruitment
 #: field:hr.recruitment.report,delay_open:0
@@ -55,12 +55,12 @@ msgstr "تجميع حسب..."
 #. module: hr_recruitment
 #: field:hr.applicant,user_email:0
 msgid "User Email"
-msgstr ""
+msgstr "البريد الإلكتروني للمستخدم"
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
 msgid "Filter and view on next actions and date"
-msgstr ""
+msgstr "تصفية و عرض  للإجراءت المقبلة و التاريخ"
 
 #. module: hr_recruitment
 #: view:hr.applicant:0 field:hr.applicant,department_id:0
@@ -76,7 +76,7 @@ msgstr "موعد الاجراء التالي"
 #. module: hr_recruitment
 #: field:hr.applicant,salary_expected_extra:0
 msgid "Expected Salary Extra"
-msgstr ""
+msgstr "راتب إضافي متوقع"
 
 #. module: hr_recruitment
 #: view:hr.recruitment.report:0
@@ -86,7 +86,7 @@ msgstr "المهام"
 #. module: hr_recruitment
 #: view:hr.applicant:0
 msgid "Pending Jobs"
-msgstr ""
+msgstr "وظائف معلقة"
 
 #. module: hr_recruitment
 #: field:hr.applicant,company_id:0 view:hr.recruitment.report:0
@@ -103,7 +103,7 @@ msgstr "كلا"
 #: code:addons/hr_recruitment/hr_recruitment.py:436
 #, python-format
 msgid "You must define Applied Job for this applicant."
-msgstr ""
+msgstr "يجب أن تحدد الوظيفة المقدم لها هذا الطلب."
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
@@ -144,7 +144,7 @@ msgstr "يوم"
 #. module: hr_recruitment
 #: field:hr.applicant,reference:0
 msgid "Refered By"
-msgstr ""
+msgstr "المشار إليه بواسطة"
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
@@ -164,7 +164,7 @@ msgstr "رفض"
 #. module: hr_recruitment
 #: model:hr.recruitment.degree,name:hr_recruitment.degree_licenced
 msgid "Master Degree"
-msgstr ""
+msgstr "درجة ماجستير"
 
 #. module: hr_recruitment
 #: field:hr.applicant,partner_mobile:0
@@ -220,7 +220,7 @@ msgstr "تجنيدي"
 #. module: hr_recruitment
 #: field:hr.job,survey_id:0
 msgid "Interview Form"
-msgstr ""
+msgstr "نموذج مقابلة"
 
 #. module: hr_recruitment
 #: help:hr.job,survey_id:0
@@ -228,6 +228,8 @@ 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
@@ -266,6 +268,8 @@ msgid ""
 "Stages of the recruitment process may be different per department. If this "
 "stage is common to all departments, keep tempy this field."
 msgstr ""
+"مراحل عملية التوظيف قد تكون مختلفة من قسم لآخر. إذا كانت هذه المرحلة مشتركة "
+"بين جميع الأقسام، اترك الحقل فارغ."
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
@@ -275,7 +279,7 @@ msgstr "السابق"
 #. module: hr_recruitment
 #: model:ir.model,name:hr_recruitment.model_hr_recruitment_source
 msgid "Source of Applicants"
-msgstr ""
+msgstr "مصدر مقدمين الطلبات"
 
 #. module: hr_recruitment
 #: code:addons/hr_recruitment/wizard/hr_recruitment_phonecall.py:115
@@ -297,17 +301,17 @@ msgstr "احصائيات التعيينات"
 #: code:addons/hr_recruitment/hr_recruitment.py:476
 #, python-format
 msgid "Changed Stage to: %s"
-msgstr ""
+msgstr "تغيير المرحلة إلي :%s"
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
 msgid "Hire"
-msgstr ""
+msgstr "تعيين"
 
 #. module: hr_recruitment
 #: view:hr.recruitment.report:0
 msgid "Hired employees"
-msgstr ""
+msgstr "الموظفين المعينيين"
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
@@ -380,8 +384,8 @@ msgid ""
 "Define here your stages of the recruitment process, for example: "
 "qualification call, first interview, second interview, refused, hired."
 msgstr ""
-"حدد هنا مراحل عملية التوظيف, على سبيل المثال: دعوة التأهيل, المقابلة الاول, "
-"المقابلة الثانية, الرفض, المأجور."
+"حدد هنا مراحل عملية التوظيف، على سبيل المثال: المكالمة الهاتفية، المقابلة "
+"الاولي، المقابلة الثانية، الرفض أو التعيين."
 
 #. module: hr_recruitment
 #: view:hr.applicant:0 field:hr.applicant,create_date:0
@@ -393,7 +397,7 @@ msgstr "تاريخ الإنشاء"
 #: 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 ""
+msgstr "إنشاء حساب موظف"
 
 #. module: hr_recruitment
 #: field:hr.recruitment.job2phonecall,deadline:0
@@ -409,7 +413,7 @@ msgstr "التقدير"
 #. module: hr_recruitment
 #: model:hr.recruitment.stage,name:hr_recruitment.stage_job1
 msgid "Initial Qualification"
-msgstr ""
+msgstr "المؤهل الأولي"
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
@@ -478,6 +482,8 @@ msgid ""
 "forget to specify the department if your recruitment process is different "
 "according to the job position."
 msgstr ""
+" اخر ما إذا كانت المراحل التالية مطابقة لعملية التوظيف.  لا تنسي تحديد القسم "
+"إذا كانت عملية التوظيف الخاصة بك تختلف بحسب طبيعة الوظيفة."
 
 #. module: hr_recruitment
 #: view:hr.recruitment.report:0
@@ -507,7 +513,7 @@ msgstr "جهة الاتصال"
 #. module: hr_recruitment
 #: help:hr.applicant,salary_expected_extra:0
 msgid "Salary Expected by Applicant, extra advantages"
-msgstr ""
+msgstr "الراتب المتوقع من قبل المتقدم، مزايا إضافية"
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
@@ -540,7 +546,7 @@ msgstr "مراحل"
 #. module: hr_recruitment
 #: view:hr.recruitment.report:0
 msgid "Draft recruitment"
-msgstr ""
+msgstr "مشروع التوظيف"
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
@@ -555,7 +561,7 @@ msgstr "جاري التقدم"
 #. module: hr_recruitment
 #: model:ir.actions.act_window,name:hr_recruitment.hr_recruitment_stage_form_installer
 msgid "Review Recruitment Stages"
-msgstr ""
+msgstr "مراجعة مراحل التوظيف"
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
@@ -580,12 +586,12 @@ msgstr "ديسمبر"
 #. module: hr_recruitment
 #: view:hr.recruitment.report:0
 msgid "Recruitment performed in current year"
-msgstr ""
+msgstr "توظيف أجري في العام الحالي"
 
 #. module: hr_recruitment
 #: view:hr.recruitment.report:0
 msgid "Recruitment during last month"
-msgstr ""
+msgstr "توظيف خلال الشهر الماضي"
 
 #. module: hr_recruitment
 #: view:hr.recruitment.report:0 field:hr.recruitment.report,month:0
@@ -595,7 +601,7 @@ msgstr "شهر"
 #. module: hr_recruitment
 #: view:hr.applicant:0
 msgid "Unassigned Recruitments"
-msgstr ""
+msgstr "تعيينات غير محددة"
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
@@ -681,7 +687,7 @@ msgstr "الراتب المتوقع من المتقدم"
 #. module: hr_recruitment
 #: view:hr.applicant:0
 msgid "All Initial Jobs"
-msgstr ""
+msgstr "جميع الوظائف المبدئية"
 
 #. module: hr_recruitment
 #: help:hr.applicant,email_cc:0
@@ -812,7 +818,7 @@ msgstr "رد"
 #. module: hr_recruitment
 #: field:hr.recruitment.stage,department_id:0
 msgid "Specific to a Department"
-msgstr ""
+msgstr "خاص بالقسم"
 
 #. module: hr_recruitment
 #: field:hr.recruitment.report,salary_prop_avg:0
@@ -829,7 +835,7 @@ msgstr "جدول المكالمات التليفونية"
 #. module: hr_recruitment
 #: field:hr.applicant,salary_proposed_extra:0
 msgid "Proposed Salary Extra"
-msgstr ""
+msgstr "راتب إضافي مقترح"
 
 #. module: hr_recruitment
 #: selection:hr.recruitment.report,month:0
@@ -865,7 +871,7 @@ msgstr "هل انت متأكد من انشاء شريك بناءًا على طل
 #. module: hr_recruitment
 #: view:hired.employee:0
 msgid "Would you like to create an employee ?"
-msgstr ""
+msgstr "هل تريد إنشاء موظف ؟"
 
 #. module: hr_recruitment
 #: model:ir.actions.act_window,help:hr_recruitment.crm_case_categ0_act_job
@@ -893,7 +899,7 @@ msgstr "محفوظات"
 #. module: hr_recruitment
 #: view:hr.recruitment.report:0
 msgid "Recruitment performed in current month"
-msgstr ""
+msgstr "توظيف أجري في الشهر الحالي"
 
 #. module: hr_recruitment
 #: model:ir.actions.act_window,help:hr_recruitment.hr_recruitment_stage_form_installer
@@ -902,6 +908,8 @@ msgid ""
 "forget to specify the department if your recruitment process is different "
 "according to the job position."
 msgstr ""
+"تحقق إذا ما كانت المراحل التالية مطابقة لعملية التوظيف. لاتنسي تحديد القسم "
+"إذا كانت عملية التوظيف الخاصة بك تختلف بحسب طبيعة الوظيفة."
 
 #. module: hr_recruitment
 #: field:hr.applicant,partner_address_id:0
@@ -927,7 +935,7 @@ msgstr "الموقع الإلكتروني للشركة"
 #. module: hr_recruitment
 #: sql_constraint:hr.recruitment.degree:0
 msgid "The name of the Degree of Recruitment must be unique!"
-msgstr ""
+msgstr "أسم درجة الوظيفية يجب أن يكون فريد !"
 
 #. module: hr_recruitment
 #: view:hr.recruitment.report:0 field:hr.recruitment.report,year:0
@@ -959,7 +967,7 @@ msgstr "الشريك موجود بالفعل بنفس الاسم."
 #. module: hr_recruitment
 #: view:hr.applicant:0
 msgid "Subject / Applicant"
-msgstr ""
+msgstr "موضوع / مقدم الطلب"
 
 #. module: hr_recruitment
 #: help:hr.recruitment.degree,sequence:0
@@ -982,12 +990,12 @@ msgstr "تحليل التوظيف"
 #. module: hr_recruitment
 #: view:hired.employee:0
 msgid "Create New Employee"
-msgstr ""
+msgstr "إنشاء موظف جديد"
 
 #. module: hr_recruitment
 #: model:hr.recruitment.source,name:hr_recruitment.source_linkedin
 msgid "LinkedIn"
-msgstr ""
+msgstr "LinkedIn"
 
 #. module: hr_recruitment
 #: selection:hr.recruitment.report,month:0
@@ -1032,7 +1040,7 @@ msgstr "توقيع العقد"
 #. module: hr_recruitment
 #: model:hr.recruitment.source,name:hr_recruitment.source_word
 msgid "Word of Mouth"
-msgstr ""
+msgstr "علي لسان العامة"
 
 #. module: hr_recruitment
 #: selection:hr.applicant,state:0 selection:hr.recruitment.report,state:0
@@ -1050,7 +1058,7 @@ msgstr "ويجري التعاقد للطلب ‘%s‘"
 #: selection:hr.applicant,state:0 view:hr.recruitment.report:0
 #: selection:hr.recruitment.report,state:0
 msgid "Hired"
-msgstr "المؤجر"
+msgstr "متعاقد"
 
 #. module: hr_recruitment
 #: selection:hr.applicant,priority:0
@@ -1102,7 +1110,7 @@ msgstr "إبريل"
 #. module: hr_recruitment
 #: view:hr.recruitment.report:0
 msgid "Pending recruitment"
-msgstr ""
+msgstr "في إنتظار التعيين"
 
 #. module: hr_recruitment
 #: model:hr.recruitment.source,name:hr_recruitment.source_monster
@@ -1149,7 +1157,7 @@ msgstr "تم وضع طلب الوظيفة ‘%s‘ في ‘التقدم‘."
 #. module: hr_recruitment
 #: help:hr.applicant,salary_proposed_extra:0
 msgid "Salary Proposed by the Organisation, extra advantages"
-msgstr ""
+msgstr "راتب مقترح من قبل المنشأة، مزايا إضافية"
 
 #. module: hr_recruitment
 #: help:hr.recruitment.report,delay_close:0
diff --git a/addons/hr_recruitment/i18n/bg.po b/addons/hr_recruitment/i18n/bg.po
index 1b61f5fd55f..fda8262b71f 100644
--- a/addons/hr_recruitment/i18n/bg.po
+++ b/addons/hr_recruitment/i18n/bg.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:35+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_recruitment
 #: help:hr.applicant,active:0
diff --git a/addons/hr_recruitment/i18n/ca.po b/addons/hr_recruitment/i18n/ca.po
index 07478a239dc..96be74d0e3c 100644
--- a/addons/hr_recruitment/i18n/ca.po
+++ b/addons/hr_recruitment/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:35+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_recruitment
 #: help:hr.applicant,active:0
diff --git a/addons/hr_recruitment/i18n/da.po b/addons/hr_recruitment/i18n/da.po
index 895deea1910..495b15c1858 100644
--- a/addons/hr_recruitment/i18n/da.po
+++ b/addons/hr_recruitment/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:35+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_recruitment
 #: help:hr.applicant,active:0
diff --git a/addons/hr_recruitment/i18n/de.po b/addons/hr_recruitment/i18n/de.po
index dccee664960..a41fc0abb34 100644
--- a/addons/hr_recruitment/i18n/de.po
+++ b/addons/hr_recruitment/i18n/de.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:35+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_recruitment
 #: help:hr.applicant,active:0
diff --git a/addons/hr_recruitment/i18n/es.po b/addons/hr_recruitment/i18n/es.po
index 2116f71b047..58c0ca54d67 100644
--- a/addons/hr_recruitment/i18n/es.po
+++ b/addons/hr_recruitment/i18n/es.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:35+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_recruitment
 #: help:hr.applicant,active:0
diff --git a/addons/hr_recruitment/i18n/es_CR.po b/addons/hr_recruitment/i18n/es_CR.po
index 4a89146e4f5..067743327ea 100644
--- a/addons/hr_recruitment/i18n/es_CR.po
+++ b/addons/hr_recruitment/i18n/es_CR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:35+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_recruitment
 #: help:hr.applicant,active:0
diff --git a/addons/hr_recruitment/i18n/fr.po b/addons/hr_recruitment/i18n/fr.po
index 4de9711ee13..115b42fc026 100644
--- a/addons/hr_recruitment/i18n/fr.po
+++ b/addons/hr_recruitment/i18n/fr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:35+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_recruitment
 #: help:hr.applicant,active:0
diff --git a/addons/hr_recruitment/i18n/hi.po b/addons/hr_recruitment/i18n/hi.po
index 18685f61f4a..6ba133fcd9f 100644
--- a/addons/hr_recruitment/i18n/hi.po
+++ b/addons/hr_recruitment/i18n/hi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:35+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_recruitment
 #: help:hr.applicant,active:0
diff --git a/addons/hr_recruitment/i18n/hr.po b/addons/hr_recruitment/i18n/hr.po
index 3da91803768..71439a848b3 100644
--- a/addons/hr_recruitment/i18n/hr.po
+++ b/addons/hr_recruitment/i18n/hr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:35+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_recruitment
 #: help:hr.applicant,active:0
diff --git a/addons/hr_recruitment/i18n/hu.po b/addons/hr_recruitment/i18n/hu.po
index fb3b500e33f..8c84c400f95 100644
--- a/addons/hr_recruitment/i18n/hu.po
+++ b/addons/hr_recruitment/i18n/hu.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:35+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_recruitment
 #: help:hr.applicant,active:0
diff --git a/addons/hr_recruitment/i18n/id.po b/addons/hr_recruitment/i18n/id.po
index c9a333a8636..316469805a1 100644
--- a/addons/hr_recruitment/i18n/id.po
+++ b/addons/hr_recruitment/i18n/id.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:35+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_recruitment
 #: help:hr.applicant,active:0
diff --git a/addons/hr_recruitment/i18n/it.po b/addons/hr_recruitment/i18n/it.po
index 92b3c1179bc..6edd9531bc2 100644
--- a/addons/hr_recruitment/i18n/it.po
+++ b/addons/hr_recruitment/i18n/it.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:35+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_recruitment
 #: help:hr.applicant,active:0
diff --git a/addons/hr_recruitment/i18n/ja.po b/addons/hr_recruitment/i18n/ja.po
index 1dba38da574..5690816b55d 100644
--- a/addons/hr_recruitment/i18n/ja.po
+++ b/addons/hr_recruitment/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:35+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_recruitment
 #: help:hr.applicant,active:0
diff --git a/addons/hr_recruitment/i18n/mk.po b/addons/hr_recruitment/i18n/mk.po
index 01f4e331adf..b044d90adc1 100644
--- a/addons/hr_recruitment/i18n/mk.po
+++ b/addons/hr_recruitment/i18n/mk.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:35+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_recruitment
 #: help:hr.applicant,active:0
diff --git a/addons/hr_recruitment/i18n/mn.po b/addons/hr_recruitment/i18n/mn.po
index 3f256db60c9..a18069c0869 100644
--- a/addons/hr_recruitment/i18n/mn.po
+++ b/addons/hr_recruitment/i18n/mn.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:35+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_recruitment
 #: help:hr.applicant,active:0
diff --git a/addons/hr_recruitment/i18n/nl.po b/addons/hr_recruitment/i18n/nl.po
index 6cd46760699..c0f99d68892 100644
--- a/addons/hr_recruitment/i18n/nl.po
+++ b/addons/hr_recruitment/i18n/nl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:35+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_recruitment
 #: help:hr.applicant,active:0
diff --git a/addons/hr_recruitment/i18n/pl.po b/addons/hr_recruitment/i18n/pl.po
index 5b5eaee5dce..68028c1b2cb 100644
--- a/addons/hr_recruitment/i18n/pl.po
+++ b/addons/hr_recruitment/i18n/pl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:35+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_recruitment
 #: help:hr.applicant,active:0
diff --git a/addons/hr_recruitment/i18n/pt.po b/addons/hr_recruitment/i18n/pt.po
index 84c1ffacd05..9106cfb432a 100644
--- a/addons/hr_recruitment/i18n/pt.po
+++ b/addons/hr_recruitment/i18n/pt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:35+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_recruitment
 #: help:hr.applicant,active:0
diff --git a/addons/hr_recruitment/i18n/pt_BR.po b/addons/hr_recruitment/i18n/pt_BR.po
index 07920654ee7..045ccaa690d 100644
--- a/addons/hr_recruitment/i18n/pt_BR.po
+++ b/addons/hr_recruitment/i18n/pt_BR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:35+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_recruitment
 #: help:hr.applicant,active:0
diff --git a/addons/hr_recruitment/i18n/ro.po b/addons/hr_recruitment/i18n/ro.po
index 6d3b559185d..6f1a3019ed4 100644
--- a/addons/hr_recruitment/i18n/ro.po
+++ b/addons/hr_recruitment/i18n/ro.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:35+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_recruitment
 #: help:hr.applicant,active:0
diff --git a/addons/hr_recruitment/i18n/ru.po b/addons/hr_recruitment/i18n/ru.po
index bebe0a711c6..3800fa8ea4e 100644
--- a/addons/hr_recruitment/i18n/ru.po
+++ b/addons/hr_recruitment/i18n/ru.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:35+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_recruitment
 #: help:hr.applicant,active:0
diff --git a/addons/hr_recruitment/i18n/sr.po b/addons/hr_recruitment/i18n/sr.po
index d72186ed0df..6a4ad579326 100644
--- a/addons/hr_recruitment/i18n/sr.po
+++ b/addons/hr_recruitment/i18n/sr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:35+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_recruitment
 #: help:hr.applicant,active:0
diff --git a/addons/hr_recruitment/i18n/sr@latin.po b/addons/hr_recruitment/i18n/sr@latin.po
index 15f90745aae..3f29bbf114e 100644
--- a/addons/hr_recruitment/i18n/sr@latin.po
+++ b/addons/hr_recruitment/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:35+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_recruitment
 #: help:hr.applicant,active:0
diff --git a/addons/hr_recruitment/i18n/sv.po b/addons/hr_recruitment/i18n/sv.po
index 33d7b54abb4..d81f3e7af3c 100644
--- a/addons/hr_recruitment/i18n/sv.po
+++ b/addons/hr_recruitment/i18n/sv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:35+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_recruitment
 #: help:hr.applicant,active:0
diff --git a/addons/hr_recruitment/i18n/tr.po b/addons/hr_recruitment/i18n/tr.po
index b398ab63a21..cbe4fe02e0b 100644
--- a/addons/hr_recruitment/i18n/tr.po
+++ b/addons/hr_recruitment/i18n/tr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:35+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_recruitment
 #: help:hr.applicant,active:0
diff --git a/addons/hr_recruitment/i18n/vi.po b/addons/hr_recruitment/i18n/vi.po
index df15826afff..044a2334473 100644
--- a/addons/hr_recruitment/i18n/vi.po
+++ b/addons/hr_recruitment/i18n/vi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:35+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_recruitment
 #: help:hr.applicant,active:0
diff --git a/addons/hr_recruitment/i18n/zh_CN.po b/addons/hr_recruitment/i18n/zh_CN.po
index 0db77c7aeaf..30b83e5da93 100644
--- a/addons/hr_recruitment/i18n/zh_CN.po
+++ b/addons/hr_recruitment/i18n/zh_CN.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:35+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_recruitment
 #: help:hr.applicant,active:0
diff --git a/addons/hr_recruitment/report/hr_recruitment_report_view.xml b/addons/hr_recruitment/report/hr_recruitment_report_view.xml
index 30a20a25eb8..1b0b8bfa7c5 100644
--- a/addons/hr_recruitment/report/hr_recruitment_report_view.xml
+++ b/addons/hr_recruitment/report/hr_recruitment_report_view.xml
@@ -71,7 +71,6 @@
                    <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="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
                    <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"/>
diff --git a/addons/hr_recruitment/security/ir.model.access.csv b/addons/hr_recruitment/security/ir.model.access.csv
index 8b029c9324a..086e63e542b 100644
--- a/addons/hr_recruitment/security/ir.model.access.csv
+++ b/addons/hr_recruitment/security/ir.model.access.csv
@@ -8,3 +8,5 @@ access_survey_hr_user,survey.hr.user,survey.model_survey,base.group_hr_user,1,1,
 access_crm_meeting_hruser,crm.meeting.hruser,base_calendar.model_crm_meeting,base.group_hr_user,1,1,1,1
 access_hr_recruitment_source_hr_officer,hr.recruitment.source,model_hr_recruitment_source,base.group_hr_user,1,1,1,1
 access_hr_recruitment_source_all,hr.recruitment.source,model_hr_recruitment_source,,1,0,0,0
+access_hr_applicant_category,hr.applicant_category,model_hr_applicant_category,,1,0,0,0
+access_hr_applicant_category_manager,hr.applicant_category,model_hr_applicant_category,base.group_hr_manager,1,1,1,1
diff --git a/addons/hr_recruitment/static/src/js/hr_recruitment.js b/addons/hr_recruitment/static/src/js/hr_recruitment.js
new file mode 100644
index 00000000000..9a0a6e4c894
--- /dev/null
+++ b/addons/hr_recruitment/static/src/js/hr_recruitment.js
@@ -0,0 +1,35 @@
+openerp.hr_recruitment = function(openerp) {
+    openerp.web_kanban.KanbanView.include({
+        applicant_display_categ_names: function() {
+            /*
+             * Set proper names to applicant categories.
+             * In kanban views, many2many fields only return a list of ids.
+             * Therefore, we have to fetch the matching data by ourselves.
+             */
+            var self = this;
+            var categ_ids = [];
+
+            // Collect categories ids
+            self.$el.find('span[data-categ_id]').each(function() {
+                categ_ids.push($(this).data('categ_id'));
+            });
+
+            // Find their matching names
+            var dataset = new openerp.web.DataSetSearch(self, 'hr.applicant_category', self.session.context, [['id', 'in', _.uniq(categ_ids)]]);
+            dataset.read_slice(['id', 'name']).then(function(result) {
+                _.each(result, function(v, k) {
+                    // Set the proper value in the DOM and display the element
+                    self.$el.find('span[data-categ_id=' + v.id + ']').text(v.name);
+                });
+            });
+        },
+        on_groups_started: function() {
+            var self = this;
+            self._super.apply(self, arguments);
+
+            if (self.dataset.model === 'hr.applicant') {
+                self.applicant_display_categ_names();
+            }
+        }
+    });
+};
diff --git a/addons/hr_timesheet/__openerp__.py b/addons/hr_timesheet/__openerp__.py
index d6a6232d1a0..2162b6095e8 100644
--- a/addons/hr_timesheet/__openerp__.py
+++ b/addons/hr_timesheet/__openerp__.py
@@ -23,7 +23,7 @@
 {
     'name': 'Timesheets',
     'version': '1.0',
-    "category": "Human Resources",
+    'category': 'Human Resources',
     'description': """
 This module implements a timesheet system.
 ==========================================
@@ -41,8 +41,7 @@ up a management by affair.
     'website': 'http://www.openerp.com',
     'images': ['images/hr_timesheet_lines.jpeg'],
     'depends': ['account', 'hr', 'base', 'hr_attendance', 'process'],
-    'init_xml': ['hr_timesheet_data.xml'],
-    'update_xml': [
+    'data': [
         'security/ir.model.access.csv',
         'security/hr_timesheet_security.xml',
         'hr_timesheet_view.xml',
@@ -53,8 +52,9 @@ up a management by affair.
         'wizard/hr_timesheet_print_users_view.xml',
         'wizard/hr_timesheet_sign_in_out_view.xml',
         'hr_timesheet_installer.xml',
+        'hr_timesheet_data.xml'
     ],
-    'demo_xml': ['hr_timesheet_demo.xml'],
+    'demo': ['hr_timesheet_demo.xml'],
     'test': [
         'test/test_hr_timesheet.yml',
         'test/hr_timesheet_report.yml',
diff --git a/addons/hr_timesheet/hr_timesheet_view.xml b/addons/hr_timesheet/hr_timesheet_view.xml
index d364d605b5f..43b677d7978 100644
--- a/addons/hr_timesheet/hr_timesheet_view.xml
+++ b/addons/hr_timesheet/hr_timesheet_view.xml
@@ -77,17 +77,31 @@
                 </search>
             </field>
         </record>
-        
+
+        <record model="ir.actions.act_window" id="act_analytic_cost_revenue">
+            <field name="context">{'search_default_account_id': [active_id], 'default_account_id': active_id, 'search_default_group_date': 1, 'search_default_group_journal': 1}</field>
+            <field name="name">Costs &amp; Revenues</field>
+            <field name="res_model">account.analytic.line</field>
+            <field name="src_model">account.analytic.account</field>
+            <field name="view_mode">tree,form</field>
+            <field name="view_type">form</field>
+        </record>
+
+ 
         <record id="account_analytic_account_timesheet_form" model="ir.ui.view">
             <field name="name">account.analytic.account.invoice.form</field>
             <field name="model">account.analytic.account</field>
             <field name="inherit_id" ref="analytic.view_account_analytic_account_form"/>
             <field name="arch" type="xml">
-                <xpath expr='//separator[@name="project_sep"]' position='replace'>
-                    <separator name="project_sep" string="Project Management" colspan="4"/> <!-- removal of invisible attribute -->
-                </xpath>
-                <xpath expr='//separator[@name="project_sep"]' position='after'>
+                <xpath expr='//div[@name="project"]' position='inside'>
                     <field name="use_timesheets"/>
+                    <label for="use_timesheets"/>
+                </xpath>
+                <xpath expr='//div[@name="buttons"]' position='inside'>
+                    <button string="Costs and Revenues"
+                        name="%(act_analytic_cost_revenue)d"
+                        type="action"/>
+
                 </xpath>
             </field>
         </record>
@@ -117,16 +131,12 @@
             <field name="model">hr.employee</field>
             <field name="inherit_id" ref="hr.view_employee_form"/>
             <field name="arch" type="xml">
-                <page string="Personal Information" position="after">
-                    <page string="Timesheets" groups="base.group_hr_user">
-                        <group>
-                            <group col="2">
-                                <field name="product_id" domain="[('type','=','service')]"/>
-                                <field name="journal_id"/>
-                            </group>
-                        </group>
-                    </page>
-                </page>
+                <xpath expr="//group[@name='active_group']" position="before">
+                    <group string="Timesheets">
+                        <field name="product_id" domain="[('type','=','service')]"/>
+                        <field name="journal_id"/>
+                    </group>
+                </xpath>
             </field>
         </record>
 
diff --git a/addons/hr_timesheet/i18n/ar.po b/addons/hr_timesheet/i18n/ar.po
index f0a1d28363c..3a013f41628 100644
--- a/addons/hr_timesheet/i18n/ar.po
+++ b/addons/hr_timesheet/i18n/ar.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:47+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:19+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:43
diff --git a/addons/hr_timesheet/i18n/bg.po b/addons/hr_timesheet/i18n/bg.po
index 00260fac5ee..f5db23fc076 100644
--- a/addons/hr_timesheet/i18n/bg.po
+++ b/addons/hr_timesheet/i18n/bg.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:19+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:43
diff --git a/addons/hr_timesheet/i18n/bs.po b/addons/hr_timesheet/i18n/bs.po
index 9ae10625205..1975f0918f3 100644
--- a/addons/hr_timesheet/i18n/bs.po
+++ b/addons/hr_timesheet/i18n/bs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:19+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:43
diff --git a/addons/hr_timesheet/i18n/ca.po b/addons/hr_timesheet/i18n/ca.po
index a2f330d3108..a538e5dc338 100644
--- a/addons/hr_timesheet/i18n/ca.po
+++ b/addons/hr_timesheet/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:19+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:43
diff --git a/addons/hr_timesheet/i18n/cs.po b/addons/hr_timesheet/i18n/cs.po
index 3885fb6e9de..2f349db5570 100644
--- a/addons/hr_timesheet/i18n/cs.po
+++ b/addons/hr_timesheet/i18n/cs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:19+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 "X-Poedit-Language: Czech\n"
 
 #. module: hr_timesheet
diff --git a/addons/hr_timesheet/i18n/da.po b/addons/hr_timesheet/i18n/da.po
index be372d6db86..0787c78ef45 100644
--- a/addons/hr_timesheet/i18n/da.po
+++ b/addons/hr_timesheet/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:19+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:43
diff --git a/addons/hr_timesheet/i18n/de.po b/addons/hr_timesheet/i18n/de.po
index 1c272279949..8813e1625f5 100644
--- a/addons/hr_timesheet/i18n/de.po
+++ b/addons/hr_timesheet/i18n/de.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:19+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:43
diff --git a/addons/hr_timesheet/i18n/el.po b/addons/hr_timesheet/i18n/el.po
index 27fc1345fe8..dc04dc60e16 100644
--- a/addons/hr_timesheet/i18n/el.po
+++ b/addons/hr_timesheet/i18n/el.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:19+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
 "X-Poedit-SourceCharset: utf-8\n"
diff --git a/addons/hr_timesheet/i18n/es.po b/addons/hr_timesheet/i18n/es.po
index ce33cdb6b9c..f98690963fc 100644
--- a/addons/hr_timesheet/i18n/es.po
+++ b/addons/hr_timesheet/i18n/es.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:19+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:43
diff --git a/addons/hr_timesheet/i18n/es_AR.po b/addons/hr_timesheet/i18n/es_AR.po
index 8e995c29e29..a0806583ba5 100644
--- a/addons/hr_timesheet/i18n/es_AR.po
+++ b/addons/hr_timesheet/i18n/es_AR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:19+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:43
diff --git a/addons/hr_timesheet/i18n/es_CR.po b/addons/hr_timesheet/i18n/es_CR.po
index a6a2d9d5967..da11a1ffe31 100644
--- a/addons/hr_timesheet/i18n/es_CR.po
+++ b/addons/hr_timesheet/i18n/es_CR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:19+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:43
diff --git a/addons/hr_timesheet/i18n/es_EC.po b/addons/hr_timesheet/i18n/es_EC.po
index b61b2f907c1..f8698e7a0f8 100644
--- a/addons/hr_timesheet/i18n/es_EC.po
+++ b/addons/hr_timesheet/i18n/es_EC.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:19+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:43
diff --git a/addons/hr_timesheet/i18n/et.po b/addons/hr_timesheet/i18n/et.po
index 6d420be21cc..6c19b5bb421 100644
--- a/addons/hr_timesheet/i18n/et.po
+++ b/addons/hr_timesheet/i18n/et.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:19+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:43
diff --git a/addons/hr_timesheet/i18n/fi.po b/addons/hr_timesheet/i18n/fi.po
index 3ef9c73ecb0..b2c8523287e 100644
--- a/addons/hr_timesheet/i18n/fi.po
+++ b/addons/hr_timesheet/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:19+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:43
diff --git a/addons/hr_timesheet/i18n/fr.po b/addons/hr_timesheet/i18n/fr.po
index 76b85c34b1f..fea9393e05b 100644
--- a/addons/hr_timesheet/i18n/fr.po
+++ b/addons/hr_timesheet/i18n/fr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:19+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #~ msgid "Error: UOS must be in a different category than the UOM"
 #~ msgstr "Erreur : l'UdV doit appartenir à une autre catégorie que l'UdM"
diff --git a/addons/hr_timesheet/i18n/gl.po b/addons/hr_timesheet/i18n/gl.po
index deac873b5d7..2f92f3d7af8 100644
--- a/addons/hr_timesheet/i18n/gl.po
+++ b/addons/hr_timesheet/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:19+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:43
diff --git a/addons/hr_timesheet/i18n/hr.po b/addons/hr_timesheet/i18n/hr.po
index f035ff74b6f..da7bb4138b9 100644
--- a/addons/hr_timesheet/i18n/hr.po
+++ b/addons/hr_timesheet/i18n/hr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:19+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 "Language: hr\n"
 
 #. module: hr_timesheet
diff --git a/addons/hr_timesheet/i18n/hu.po b/addons/hr_timesheet/i18n/hu.po
index 4aa18c0abc6..f948677e4d9 100644
--- a/addons/hr_timesheet/i18n/hu.po
+++ b/addons/hr_timesheet/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:19+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:43
diff --git a/addons/hr_timesheet/i18n/id.po b/addons/hr_timesheet/i18n/id.po
index f00b06dab3b..6394515784f 100644
--- a/addons/hr_timesheet/i18n/id.po
+++ b/addons/hr_timesheet/i18n/id.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:19+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:43
diff --git a/addons/hr_timesheet/i18n/it.po b/addons/hr_timesheet/i18n/it.po
index d947fc0dee9..b518bd6921d 100644
--- a/addons/hr_timesheet/i18n/it.po
+++ b/addons/hr_timesheet/i18n/it.po
@@ -13,15 +13,15 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:19+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:43
 #: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Wed"
-msgstr "Mercoledi"
+msgstr "Mer"
 
 #. module: hr_timesheet
 #: view:hr.sign.out.project:0
@@ -106,7 +106,7 @@ msgstr "Ven"
 #. module: hr_timesheet
 #: field:hr.employee,uom_id:0
 msgid "UoM"
-msgstr ""
+msgstr "U.M."
 
 #. module: hr_timesheet
 #: view:hr.sign.in.project:0
@@ -151,7 +151,7 @@ msgstr "Nome Impiegato"
 #. module: hr_timesheet
 #: field:hr.sign.out.project,account_id:0
 msgid "Project / Analytic Account"
-msgstr ""
+msgstr "Progetto / Conto analitico"
 
 #. module: hr_timesheet
 #: model:ir.model,name:hr_timesheet.model_hr_analytical_timesheet_users
@@ -194,7 +194,7 @@ msgstr "Attenzione"
 #. module: hr_timesheet
 #: field:hr.analytic.timesheet,partner_id:0
 msgid "Partner"
-msgstr ""
+msgstr "Partner"
 
 #. module: hr_timesheet
 #: view:hr.sign.in.project:0
@@ -219,7 +219,7 @@ msgstr "Dom"
 #. module: hr_timesheet
 #: view:hr.analytic.timesheet:0
 msgid "Analytic account"
-msgstr ""
+msgstr "Conto analitico"
 
 #. module: hr_timesheet
 #: view:hr.analytical.timesheet.employee:0
@@ -262,7 +262,7 @@ msgstr "Categorie"
 #. module: hr_timesheet
 #: constraint:hr.analytic.timesheet:0
 msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
-msgstr ""
+msgstr "Non è possibile modificare un Timesheet Confermato/Completato"
 
 #. module: hr_timesheet
 #: help:hr.employee,product_id:0
@@ -325,7 +325,7 @@ msgstr "Timesheet dipendente"
 #: 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 "Entrate/Uscite per Progetto"
+msgstr "Entrata / Uscita per progetto"
 
 #. module: hr_timesheet
 #: model:ir.actions.act_window,name:hr_timesheet.action_define_analytic_structure
@@ -335,7 +335,7 @@ msgstr ""
 #. module: hr_timesheet
 #: view:hr.sign.in.project:0
 msgid "Sign in / Sign out"
-msgstr "Entrate/Uscite"
+msgstr "Entrata / Uscita"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/hr_timesheet.py:175
@@ -343,7 +343,10 @@ msgstr "Entrate/Uscite"
 msgid ""
 "Analytic journal is not defined for employee %s \n"
 "Define an employee for the selected user and assign an analytic journal!"
-msgstr "Il giornale analitico non è stato definito per l'impiegato %s"
+msgstr ""
+"Il Sezionale Analitico dell'impiegato %s non è specificato\n"
+"Definisci un impiegato per l'utente selezionato e assegna un Sezionale "
+"Analitico!"
 
 #. module: hr_timesheet
 #: view:hr.sign.in.project:0
@@ -353,7 +356,7 @@ msgstr "(lasciare vuoto per orario attuale)"
 #. module: hr_timesheet
 #: view:hr.employee:0
 msgid "Timesheets"
-msgstr "Timesheets"
+msgstr "Timesheet"
 
 #. module: hr_timesheet
 #: model:ir.actions.act_window,help:hr_timesheet.action_define_analytic_structure
@@ -362,11 +365,14 @@ msgid ""
 "analyse costs and revenues. In OpenERP, analytic accounts are also used to "
 "track customer contracts."
 msgstr ""
+"Crea una struttura dei conti analitici in base alle tue necessità di analisi "
+"dei costi e dei ricavi. In OpenERP, i conti analitici si usano anche per "
+"gestire i contratti con i clienti."
 
 #. module: hr_timesheet
 #: field:hr.analytic.timesheet,line_id:0
 msgid "Analytic Line"
-msgstr ""
+msgstr "Riga analitica"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:40
@@ -436,7 +442,7 @@ msgstr "Gennaio"
 #. module: hr_timesheet
 #: view:account.analytic.account:0
 msgid "Key dates"
-msgstr "Fate Chiave"
+msgstr "Date chiave"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:43
@@ -448,7 +454,7 @@ msgstr "Gio"
 #. module: hr_timesheet
 #: view:account.analytic.account:0
 msgid "Analysis stats"
-msgstr "Statistiche Analisi"
+msgstr "Statistiche"
 
 #. module: hr_timesheet
 #: model:ir.model,name:hr_timesheet.model_hr_analytical_timesheet_employee
@@ -553,7 +559,7 @@ msgstr "Tempo totale"
 #. module: hr_timesheet
 #: view:hr.sign.in.project:0
 msgid "(local time on the server side)"
-msgstr "(ora locale sul lato server)"
+msgstr "(ora locale lato server)"
 
 #. module: hr_timesheet
 #: model:ir.model,name:hr_timesheet.model_hr_sign_in_project
diff --git a/addons/hr_timesheet/i18n/ja.po b/addons/hr_timesheet/i18n/ja.po
index 4942e31dc9e..715df94e926 100644
--- a/addons/hr_timesheet/i18n/ja.po
+++ b/addons/hr_timesheet/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:19+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:43
diff --git a/addons/hr_timesheet/i18n/ko.po b/addons/hr_timesheet/i18n/ko.po
index 6ebe772ec59..ae3d726fc3f 100644
--- a/addons/hr_timesheet/i18n/ko.po
+++ b/addons/hr_timesheet/i18n/ko.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:19+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:43
diff --git a/addons/hr_timesheet/i18n/lt.po b/addons/hr_timesheet/i18n/lt.po
index 5968c5372e6..64c50f9c472 100644
--- a/addons/hr_timesheet/i18n/lt.po
+++ b/addons/hr_timesheet/i18n/lt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:19+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:43
diff --git a/addons/hr_timesheet/i18n/lv.po b/addons/hr_timesheet/i18n/lv.po
index a88e106bda8..b923526eb28 100644
--- a/addons/hr_timesheet/i18n/lv.po
+++ b/addons/hr_timesheet/i18n/lv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:19+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:43
diff --git a/addons/hr_timesheet/i18n/mn.po b/addons/hr_timesheet/i18n/mn.po
index fd54284e9e2..a334a468761 100644
--- a/addons/hr_timesheet/i18n/mn.po
+++ b/addons/hr_timesheet/i18n/mn.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:19+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:43
diff --git a/addons/hr_timesheet/i18n/nb.po b/addons/hr_timesheet/i18n/nb.po
index a7d97abe870..3ae8b4f40ce 100644
--- a/addons/hr_timesheet/i18n/nb.po
+++ b/addons/hr_timesheet/i18n/nb.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:19+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:43
diff --git a/addons/hr_timesheet/i18n/nl.po b/addons/hr_timesheet/i18n/nl.po
index dd270f09098..6b744915ca3 100644
--- a/addons/hr_timesheet/i18n/nl.po
+++ b/addons/hr_timesheet/i18n/nl.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-05-10 17:47+0000\n"
-"Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
+"PO-Revision-Date: 2012-08-26 13:58+0000\n"
+"Last-Translator: Erwin <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: 2012-08-09 04:48+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:19+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:43
@@ -118,13 +118,13 @@ msgid ""
 msgstr ""
 "Werknemer kunnen gewerkte tijd boeken op verschillende projecten waaraan ze "
 "zijn toegewezen. Een project is een kostenplaats en de gewerkte tijd op een "
-"project genereet kosten op de kostenplaats. Dit kenmerk laat tegelijkertijd "
-"de aanwezigheid en de urenverantwoording vastleggen."
+"project genereert kosten op de kostenplaats. Deze functionaliteit laat "
+"tegelijkertijd de aanwezigheid en de urenverantwoording vastleggen."
 
 #. module: hr_timesheet
 #: field:hr.sign.out.project,analytic_amount:0
 msgid "Minimum Analytic Amount"
-msgstr "Minimum analytisch bedrag"
+msgstr "Minimum bedrag kostenplaats"
 
 #. module: hr_timesheet
 #: view:hr.analytical.timesheet.employee:0
@@ -327,7 +327,7 @@ msgstr "Urenstaat werknemer"
 #: 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 "Klok in / Klok uit per project"
+msgstr "Inklokken/Uitklokken per project"
 
 #. module: hr_timesheet
 #: model:ir.actions.act_window,name:hr_timesheet.action_define_analytic_structure
@@ -477,7 +477,7 @@ msgstr "Algemene informatie"
 #. module: hr_timesheet
 #: model:ir.actions.act_window,name:hr_timesheet.action_hr_timesheet_my
 msgid "My Current Timesheet"
-msgstr ""
+msgstr "Mijn huidige urenstaat"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:40
diff --git a/addons/hr_timesheet/i18n/pl.po b/addons/hr_timesheet/i18n/pl.po
index 01f86d314bf..e7ce38c300e 100644
--- a/addons/hr_timesheet/i18n/pl.po
+++ b/addons/hr_timesheet/i18n/pl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:19+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:43
diff --git a/addons/hr_timesheet/i18n/pt.po b/addons/hr_timesheet/i18n/pt.po
index 949e354dbe8..8211ff65e18 100644
--- a/addons/hr_timesheet/i18n/pt.po
+++ b/addons/hr_timesheet/i18n/pt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:19+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:43
diff --git a/addons/hr_timesheet/i18n/pt_BR.po b/addons/hr_timesheet/i18n/pt_BR.po
index 38945934adb..7b917b4cae3 100644
--- a/addons/hr_timesheet/i18n/pt_BR.po
+++ b/addons/hr_timesheet/i18n/pt_BR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:19+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:43
diff --git a/addons/hr_timesheet/i18n/ro.po b/addons/hr_timesheet/i18n/ro.po
index ae447969829..b5ac73b0153 100644
--- a/addons/hr_timesheet/i18n/ro.po
+++ b/addons/hr_timesheet/i18n/ro.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:19+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:43
diff --git a/addons/hr_timesheet/i18n/ru.po b/addons/hr_timesheet/i18n/ru.po
index 4bb59325107..0f2e20ff231 100644
--- a/addons/hr_timesheet/i18n/ru.po
+++ b/addons/hr_timesheet/i18n/ru.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:19+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:43
diff --git a/addons/hr_timesheet/i18n/sl.po b/addons/hr_timesheet/i18n/sl.po
index 1a50a39546c..afc57564cbe 100644
--- a/addons/hr_timesheet/i18n/sl.po
+++ b/addons/hr_timesheet/i18n/sl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:19+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:43
diff --git a/addons/hr_timesheet/i18n/sq.po b/addons/hr_timesheet/i18n/sq.po
index 8253f29ec86..fb901d70533 100644
--- a/addons/hr_timesheet/i18n/sq.po
+++ b/addons/hr_timesheet/i18n/sq.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:47+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:19+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:43
diff --git a/addons/hr_timesheet/i18n/sr@latin.po b/addons/hr_timesheet/i18n/sr@latin.po
index 20ccd05cdf8..45cfbccddca 100644
--- a/addons/hr_timesheet/i18n/sr@latin.po
+++ b/addons/hr_timesheet/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:19+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:43
diff --git a/addons/hr_timesheet/i18n/sv.po b/addons/hr_timesheet/i18n/sv.po
index 2223c1b1cf9..d73bd578476 100644
--- a/addons/hr_timesheet/i18n/sv.po
+++ b/addons/hr_timesheet/i18n/sv.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:19+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:43
diff --git a/addons/hr_timesheet/i18n/tlh.po b/addons/hr_timesheet/i18n/tlh.po
index 97a4857b968..2d2a6d111ac 100644
--- a/addons/hr_timesheet/i18n/tlh.po
+++ b/addons/hr_timesheet/i18n/tlh.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:19+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:43
diff --git a/addons/hr_timesheet/i18n/tr.po b/addons/hr_timesheet/i18n/tr.po
index a4dba10bf50..b297b85954e 100644
--- a/addons/hr_timesheet/i18n/tr.po
+++ b/addons/hr_timesheet/i18n/tr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:19+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:43
diff --git a/addons/hr_timesheet/i18n/uk.po b/addons/hr_timesheet/i18n/uk.po
index 90e3d65b3b3..992b5569334 100644
--- a/addons/hr_timesheet/i18n/uk.po
+++ b/addons/hr_timesheet/i18n/uk.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:19+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:43
diff --git a/addons/hr_timesheet/i18n/vi.po b/addons/hr_timesheet/i18n/vi.po
index 933e5b3e34c..511ef34e5d1 100644
--- a/addons/hr_timesheet/i18n/vi.po
+++ b/addons/hr_timesheet/i18n/vi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:19+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:43
diff --git a/addons/hr_timesheet/i18n/zh_CN.po b/addons/hr_timesheet/i18n/zh_CN.po
index ba38faee42a..fe5cf854485 100644
--- a/addons/hr_timesheet/i18n/zh_CN.po
+++ b/addons/hr_timesheet/i18n/zh_CN.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:19+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:43
diff --git a/addons/hr_timesheet/i18n/zh_TW.po b/addons/hr_timesheet/i18n/zh_TW.po
index ae1bda78a9c..a6c62cfb8c4 100644
--- a/addons/hr_timesheet/i18n/zh_TW.po
+++ b/addons/hr_timesheet/i18n/zh_TW.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:19+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:43
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 34cfee40262..e92e88bdcbd 100644
--- a/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py
+++ b/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py
@@ -91,7 +91,7 @@ class hr_so_project(osv.osv_memory):
         emp_obj = self.pool.get('hr.employee')
         for data in self.browse(cr, uid, ids, context=context):
             emp_id = data.emp_id.id
-            emp_obj.attendance_action_change(cr, uid, [emp_id], type='sign_out', dt=data.date)
+            emp_obj.attendance_action_change(cr, uid, [emp_id], {'action':'sign_out', 'action_date':data.date})
             self._write(cr, uid, data, emp_id, context=context)
         return {'type': 'ir.actions.act_window_close'}
 
@@ -99,7 +99,7 @@ class hr_so_project(osv.osv_memory):
         emp_obj = self.pool.get('hr.employee')
         for data in self.browse(cr, uid, ids, context=context):
             emp_id = data.emp_id.id
-            emp_obj.attendance_action_change(cr, uid, [emp_id], type='action', dt=data.date)
+            emp_obj.attendance_action_change(cr, uid, [emp_id], {'action':'action', 'action_date':data.date})
             self._write(cr, uid, data, emp_id, context=context)
         return {'type': 'ir.actions.act_window_close'}
 
@@ -156,7 +156,7 @@ class hr_si_project(osv.osv_memory):
         emp_obj = self.pool.get('hr.employee')
         for data in self.browse(cr, uid, ids, context=context):
             emp_id = data.emp_id.id
-            emp_obj.attendance_action_change(cr, uid, [emp_id], type = 'sign_in' ,dt=data.date or False)
+            emp_obj.attendance_action_change(cr, uid, [emp_id], {'action':'sign_in', 'action_date':data.date})
         return {'type': 'ir.actions.act_window_close'}
 
     def default_get(self, cr, uid, fields_list, context=None):
diff --git a/addons/hr_timesheet_invoice/__openerp__.py b/addons/hr_timesheet_invoice/__openerp__.py
index e233158bda3..047f0b414dc 100644
--- a/addons/hr_timesheet_invoice/__openerp__.py
+++ b/addons/hr_timesheet_invoice/__openerp__.py
@@ -48,12 +48,10 @@ reports.""",
         'wizard/hr_timesheet_invoice_create_view.xml',
         'wizard/hr_timesheet_invoice_create_final_view.xml',
     ],
-    'demo': [
-        'hr_timesheet_invoice_demo.xml',
-    ],
+    'demo': ['hr_timesheet_invoice_demo.xml'],
     'test': ['test/test_hr_timesheet_invoice.yml',
              'test/hr_timesheet_invoice_report.yml',
-             ],
+    ],
     'installable': True,
     'auto_install': False,
     'certificate': '0056091842381',
diff --git a/addons/hr_timesheet_invoice/hr_timesheet_invoice.py b/addons/hr_timesheet_invoice/hr_timesheet_invoice.py
index 4cba4a18680..a1562d53a61 100644
--- a/addons/hr_timesheet_invoice/hr_timesheet_invoice.py
+++ b/addons/hr_timesheet_invoice/hr_timesheet_invoice.py
@@ -95,25 +95,25 @@ class account_analytic_account(osv.osv):
     def set_close(self, cr, uid, ids, context=None):
         self.write(cr, uid, ids, {'state':'close'}, context=context)
         message = _("Contract has been <b>closed</b>.")
-        self.message_append_note(cr, uid, ids, body=message, context=context)
+        self.message_post(cr, uid, ids, body=message, context=context)
         return True
 
     def set_cancel(self, cr, uid, ids, context=None):
         self.write(cr, uid, ids, {'state':'cancelled'}, context=context)
         message = _("Contract has been <b>cancelled</b>.")
-        self.message_append_note(cr, uid, ids, body=message, context=context)
+        self.message_post(cr, uid, ids, body=message, context=context)
         return True
 
     def set_open(self, cr, uid, ids, context=None):
         self.write(cr, uid, ids, {'state':'open'}, context=context)
         message = _("Contract has been <b>opened</b>.")
-        self.message_append_note(cr, uid, ids, body=message, context=context)
+        self.message_post(cr, uid, ids, body=message, context=context)
         return True
 
     def set_pending(self, cr, uid, ids, context=None):
         self.write(cr, uid, ids, {'state':'pending'}, context=context)
         message = _("Contract has been set as <b>pending</b>.")
-        self.message_append_note(cr, uid, ids, body=message, context=context)
+        self.message_post(cr, uid, ids, body=message, context=context)
         return True
 
 account_analytic_account()
diff --git a/addons/hr_timesheet_invoice/i18n/ar.po b/addons/hr_timesheet_invoice/i18n/ar.po
index 48d137a2fe7..e7593576058 100644
--- a/addons/hr_timesheet_invoice/i18n/ar.po
+++ b/addons/hr_timesheet_invoice/i18n/ar.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:49+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:20+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
diff --git a/addons/hr_timesheet_invoice/i18n/bg.po b/addons/hr_timesheet_invoice/i18n/bg.po
index 42839430555..0627a3498b6 100644
--- a/addons/hr_timesheet_invoice/i18n/bg.po
+++ b/addons/hr_timesheet_invoice/i18n/bg.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:49+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:20+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
diff --git a/addons/hr_timesheet_invoice/i18n/bs.po b/addons/hr_timesheet_invoice/i18n/bs.po
index 834d99c929e..ecf8f1eee9a 100644
--- a/addons/hr_timesheet_invoice/i18n/bs.po
+++ b/addons/hr_timesheet_invoice/i18n/bs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:49+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:20+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
diff --git a/addons/hr_timesheet_invoice/i18n/ca.po b/addons/hr_timesheet_invoice/i18n/ca.po
index 907ab15dadf..c5d05ecafa6 100644
--- a/addons/hr_timesheet_invoice/i18n/ca.po
+++ b/addons/hr_timesheet_invoice/i18n/ca.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:49+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:20+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
diff --git a/addons/hr_timesheet_invoice/i18n/cs.po b/addons/hr_timesheet_invoice/i18n/cs.po
index 10a65d7c233..1d0c77d8be3 100644
--- a/addons/hr_timesheet_invoice/i18n/cs.po
+++ b/addons/hr_timesheet_invoice/i18n/cs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:49+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:20+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
diff --git a/addons/hr_timesheet_invoice/i18n/da.po b/addons/hr_timesheet_invoice/i18n/da.po
index 1a540f768c7..f0bdb53d427 100644
--- a/addons/hr_timesheet_invoice/i18n/da.po
+++ b/addons/hr_timesheet_invoice/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:49+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:20+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
diff --git a/addons/hr_timesheet_invoice/i18n/de.po b/addons/hr_timesheet_invoice/i18n/de.po
index babcd57b88d..66e115f78ff 100644
--- a/addons/hr_timesheet_invoice/i18n/de.po
+++ b/addons/hr_timesheet_invoice/i18n/de.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:49+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:20+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
diff --git a/addons/hr_timesheet_invoice/i18n/el.po b/addons/hr_timesheet_invoice/i18n/el.po
index 0d9aacff4d7..38a67b5fe1e 100644
--- a/addons/hr_timesheet_invoice/i18n/el.po
+++ b/addons/hr_timesheet_invoice/i18n/el.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:49+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:20+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
 "X-Poedit-SourceCharset: utf-8\n"
diff --git a/addons/hr_timesheet_invoice/i18n/es.po b/addons/hr_timesheet_invoice/i18n/es.po
index f993c4d2375..5472d24b0ca 100644
--- a/addons/hr_timesheet_invoice/i18n/es.po
+++ b/addons/hr_timesheet_invoice/i18n/es.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:49+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:21+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
diff --git a/addons/hr_timesheet_invoice/i18n/es_AR.po b/addons/hr_timesheet_invoice/i18n/es_AR.po
index e870b303cd3..92552e809bf 100644
--- a/addons/hr_timesheet_invoice/i18n/es_AR.po
+++ b/addons/hr_timesheet_invoice/i18n/es_AR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:49+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:21+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
diff --git a/addons/hr_timesheet_invoice/i18n/es_CR.po b/addons/hr_timesheet_invoice/i18n/es_CR.po
index 962fdb2a693..61a7d0b2092 100644
--- a/addons/hr_timesheet_invoice/i18n/es_CR.po
+++ b/addons/hr_timesheet_invoice/i18n/es_CR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:49+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:21+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 "Language: \n"
 
 #. module: hr_timesheet_invoice
diff --git a/addons/hr_timesheet_invoice/i18n/es_EC.po b/addons/hr_timesheet_invoice/i18n/es_EC.po
index 1e2f74adc7f..43e2e3b73b8 100644
--- a/addons/hr_timesheet_invoice/i18n/es_EC.po
+++ b/addons/hr_timesheet_invoice/i18n/es_EC.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:49+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:21+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
diff --git a/addons/hr_timesheet_invoice/i18n/et.po b/addons/hr_timesheet_invoice/i18n/et.po
index e8421f9cbb1..bf1287c3afc 100644
--- a/addons/hr_timesheet_invoice/i18n/et.po
+++ b/addons/hr_timesheet_invoice/i18n/et.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:49+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:20+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
diff --git a/addons/hr_timesheet_invoice/i18n/fi.po b/addons/hr_timesheet_invoice/i18n/fi.po
index 701f0f57dfb..1c07023896e 100644
--- a/addons/hr_timesheet_invoice/i18n/fi.po
+++ b/addons/hr_timesheet_invoice/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:49+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:20+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
diff --git a/addons/hr_timesheet_invoice/i18n/fr.po b/addons/hr_timesheet_invoice/i18n/fr.po
index 99f2815d9aa..4ffc1f74907 100644
--- a/addons/hr_timesheet_invoice/i18n/fr.po
+++ b/addons/hr_timesheet_invoice/i18n/fr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:49+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:20+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
diff --git a/addons/hr_timesheet_invoice/i18n/hr.po b/addons/hr_timesheet_invoice/i18n/hr.po
index a948bb21f52..aaeb66d4705 100644
--- a/addons/hr_timesheet_invoice/i18n/hr.po
+++ b/addons/hr_timesheet_invoice/i18n/hr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:49+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:21+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
diff --git a/addons/hr_timesheet_invoice/i18n/hu.po b/addons/hr_timesheet_invoice/i18n/hu.po
index c6ce74ffc04..0aaabca8c85 100644
--- a/addons/hr_timesheet_invoice/i18n/hu.po
+++ b/addons/hr_timesheet_invoice/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:49+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:20+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
diff --git a/addons/hr_timesheet_invoice/i18n/id.po b/addons/hr_timesheet_invoice/i18n/id.po
index 06eb2bf781f..f47234bddf3 100644
--- a/addons/hr_timesheet_invoice/i18n/id.po
+++ b/addons/hr_timesheet_invoice/i18n/id.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:49+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:21+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
diff --git a/addons/hr_timesheet_invoice/i18n/it.po b/addons/hr_timesheet_invoice/i18n/it.po
index c0afafa49ea..f6301e22238 100644
--- a/addons/hr_timesheet_invoice/i18n/it.po
+++ b/addons/hr_timesheet_invoice/i18n/it.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:49+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:21+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
diff --git a/addons/hr_timesheet_invoice/i18n/ja.po b/addons/hr_timesheet_invoice/i18n/ja.po
index d8314e0ff6f..10e94e2452f 100644
--- a/addons/hr_timesheet_invoice/i18n/ja.po
+++ b/addons/hr_timesheet_invoice/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:49+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:21+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
diff --git a/addons/hr_timesheet_invoice/i18n/ko.po b/addons/hr_timesheet_invoice/i18n/ko.po
index d48ca901d4c..45680f97c4d 100644
--- a/addons/hr_timesheet_invoice/i18n/ko.po
+++ b/addons/hr_timesheet_invoice/i18n/ko.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:49+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:21+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
diff --git a/addons/hr_timesheet_invoice/i18n/lt.po b/addons/hr_timesheet_invoice/i18n/lt.po
index 5915530c598..da66175d2df 100644
--- a/addons/hr_timesheet_invoice/i18n/lt.po
+++ b/addons/hr_timesheet_invoice/i18n/lt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:49+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:21+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
diff --git a/addons/hr_timesheet_invoice/i18n/lv.po b/addons/hr_timesheet_invoice/i18n/lv.po
index 12a1aef2ff7..387f51c9fa6 100644
--- a/addons/hr_timesheet_invoice/i18n/lv.po
+++ b/addons/hr_timesheet_invoice/i18n/lv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:49+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:21+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
diff --git a/addons/hr_timesheet_invoice/i18n/mn.po b/addons/hr_timesheet_invoice/i18n/mn.po
index 2a3ea56fef2..067ea35ab21 100644
--- a/addons/hr_timesheet_invoice/i18n/mn.po
+++ b/addons/hr_timesheet_invoice/i18n/mn.po
@@ -23,8 +23,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:49+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:21+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
diff --git a/addons/hr_timesheet_invoice/i18n/nl.po b/addons/hr_timesheet_invoice/i18n/nl.po
index 6502a31bcfd..25cc37bd547 100644
--- a/addons/hr_timesheet_invoice/i18n/nl.po
+++ b/addons/hr_timesheet_invoice/i18n/nl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:49+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:20+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
@@ -417,7 +417,7 @@ msgstr "Werk doorberekenen"
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.action_hr_timesheet_invoice_factor_form
 #: model:ir.ui.menu,name:hr_timesheet_invoice.hr_timesheet_invoice_factor_view
 msgid "Types of Invoicing"
-msgstr "Declaratiesoorten"
+msgstr "Factureertarief"
 
 #. module: hr_timesheet_invoice
 #: report:account.analytic.profit:0
@@ -859,7 +859,7 @@ msgid ""
 "a customer. From this menu, you can create additional types of invoicing to "
 "speed up your invoicing."
 msgstr ""
-"Hier kunt u standaard declaratiesoorten maken. U moet wellicht regelmatig "
+"Hier kunt u standaard factureertarieven maken. U moet wellicht regelmatig "
 "kortingen toekennen vanwege specifieke contracten of overeenkomsten met "
 "klanten. Vanuit dit menu kunt u aanvullende declaratiesoorten maken om de "
 "facturatie te versnellen."
@@ -1089,7 +1089,7 @@ msgstr "Factuur is reeds gekoppeld aan enkele kostenplaatsenregel(s)!"
 #. module: hr_timesheet_invoice
 #: view:hr_timesheet_invoice.factor:0
 msgid "Types of invoicing"
-msgstr "Declaratiesoorten"
+msgstr "Factureertarieven"
 
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.act_res_users_2_report_timehsheet_account
diff --git a/addons/hr_timesheet_invoice/i18n/nl_BE.po b/addons/hr_timesheet_invoice/i18n/nl_BE.po
index 2a8697221c4..5c60b4043fc 100644
--- a/addons/hr_timesheet_invoice/i18n/nl_BE.po
+++ b/addons/hr_timesheet_invoice/i18n/nl_BE.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:49+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:21+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
diff --git a/addons/hr_timesheet_invoice/i18n/pl.po b/addons/hr_timesheet_invoice/i18n/pl.po
index 27a2e359782..df365d15988 100644
--- a/addons/hr_timesheet_invoice/i18n/pl.po
+++ b/addons/hr_timesheet_invoice/i18n/pl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:49+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:21+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
diff --git a/addons/hr_timesheet_invoice/i18n/pt.po b/addons/hr_timesheet_invoice/i18n/pt.po
index d76e4ef34ed..f5492e9dbeb 100644
--- a/addons/hr_timesheet_invoice/i18n/pt.po
+++ b/addons/hr_timesheet_invoice/i18n/pt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:49+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:21+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
diff --git a/addons/hr_timesheet_invoice/i18n/pt_BR.po b/addons/hr_timesheet_invoice/i18n/pt_BR.po
index 77ad7210cea..d7f6733ce8d 100644
--- a/addons/hr_timesheet_invoice/i18n/pt_BR.po
+++ b/addons/hr_timesheet_invoice/i18n/pt_BR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:49+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:21+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
diff --git a/addons/hr_timesheet_invoice/i18n/ro.po b/addons/hr_timesheet_invoice/i18n/ro.po
index fe17462c4c1..05eca21f387 100644
--- a/addons/hr_timesheet_invoice/i18n/ro.po
+++ b/addons/hr_timesheet_invoice/i18n/ro.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:49+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:21+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
diff --git a/addons/hr_timesheet_invoice/i18n/ru.po b/addons/hr_timesheet_invoice/i18n/ru.po
index bd3afdb5b2b..9419b494a1d 100644
--- a/addons/hr_timesheet_invoice/i18n/ru.po
+++ b/addons/hr_timesheet_invoice/i18n/ru.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:49+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:21+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
diff --git a/addons/hr_timesheet_invoice/i18n/sl.po b/addons/hr_timesheet_invoice/i18n/sl.po
index 15c2bd03851..f3824b8dbee 100644
--- a/addons/hr_timesheet_invoice/i18n/sl.po
+++ b/addons/hr_timesheet_invoice/i18n/sl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:49+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:21+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
diff --git a/addons/hr_timesheet_invoice/i18n/sq.po b/addons/hr_timesheet_invoice/i18n/sq.po
index bc153a70ae5..1c1cdb5c4e2 100644
--- a/addons/hr_timesheet_invoice/i18n/sq.po
+++ b/addons/hr_timesheet_invoice/i18n/sq.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:49+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:20+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
diff --git a/addons/hr_timesheet_invoice/i18n/sr@latin.po b/addons/hr_timesheet_invoice/i18n/sr@latin.po
index a63f160c05c..5f3916476ad 100644
--- a/addons/hr_timesheet_invoice/i18n/sr@latin.po
+++ b/addons/hr_timesheet_invoice/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:49+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:21+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
diff --git a/addons/hr_timesheet_invoice/i18n/sv.po b/addons/hr_timesheet_invoice/i18n/sv.po
index 8e827d5e54f..867617e6f03 100644
--- a/addons/hr_timesheet_invoice/i18n/sv.po
+++ b/addons/hr_timesheet_invoice/i18n/sv.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:49+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:21+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
diff --git a/addons/hr_timesheet_invoice/i18n/tlh.po b/addons/hr_timesheet_invoice/i18n/tlh.po
index aab1178a358..003a1cedd25 100644
--- a/addons/hr_timesheet_invoice/i18n/tlh.po
+++ b/addons/hr_timesheet_invoice/i18n/tlh.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:49+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:21+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
diff --git a/addons/hr_timesheet_invoice/i18n/tr.po b/addons/hr_timesheet_invoice/i18n/tr.po
index a719365548f..bd7dcea24ed 100644
--- a/addons/hr_timesheet_invoice/i18n/tr.po
+++ b/addons/hr_timesheet_invoice/i18n/tr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:49+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:21+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
diff --git a/addons/hr_timesheet_invoice/i18n/uk.po b/addons/hr_timesheet_invoice/i18n/uk.po
index f24fbf65bf2..7b960514d3b 100644
--- a/addons/hr_timesheet_invoice/i18n/uk.po
+++ b/addons/hr_timesheet_invoice/i18n/uk.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:49+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:21+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
diff --git a/addons/hr_timesheet_invoice/i18n/vi.po b/addons/hr_timesheet_invoice/i18n/vi.po
index 4f3da02e6f0..2cd0babea21 100644
--- a/addons/hr_timesheet_invoice/i18n/vi.po
+++ b/addons/hr_timesheet_invoice/i18n/vi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:49+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:21+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
diff --git a/addons/hr_timesheet_invoice/i18n/zh_CN.po b/addons/hr_timesheet_invoice/i18n/zh_CN.po
index e20484e6961..53698b72e84 100644
--- a/addons/hr_timesheet_invoice/i18n/zh_CN.po
+++ b/addons/hr_timesheet_invoice/i18n/zh_CN.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:49+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:21+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
diff --git a/addons/hr_timesheet_invoice/i18n/zh_TW.po b/addons/hr_timesheet_invoice/i18n/zh_TW.po
index 87479881108..6e5de1ddca8 100644
--- a/addons/hr_timesheet_invoice/i18n/zh_TW.po
+++ b/addons/hr_timesheet_invoice/i18n/zh_TW.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:49+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:21+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
diff --git a/addons/hr_timesheet_invoice/report/report_analytic_view.xml b/addons/hr_timesheet_invoice/report/report_analytic_view.xml
index 9e0b8dd59ee..a2566688799 100644
--- a/addons/hr_timesheet_invoice/report/report_analytic_view.xml
+++ b/addons/hr_timesheet_invoice/report/report_analytic_view.xml
@@ -122,13 +122,13 @@
             <field name="search_view_id" ref="account_analytic_line_to_invoice_view_filter"/>
         </record>
 
-        <act_window
-        domain="[('invoice_id','=',False),('to_invoice','&lt;&gt;',False), ('journal_id.type', '=', 'general')]"
-        context="{'search_default_account_id': [active_id], 'default_account_id': active_id,'search_default_to_invoice': 1}"
-        id="act_acc_analytic_acc_2_report_acc_analytic_line_to_invoice"
-        name="Timesheet Lines to Invoice"
-        res_model="account.analytic.line"
-        src_model="account.analytic.account"/>
+        <record id="act_acc_analytic_acc_2_report_acc_analytic_line_to_invoice" model="ir.actions.act_window">
+            <field name="domain">[]</field>
+            <field name="context">{'search_default_account_id': [active_id], 'default_account_id': active_id,'search_default_to_invoice': 1}</field>
+            <field name="name">To Invoice</field>
+            <field name="res_model">account.analytic.line</field>
+            <field name="src_model">account.analytic.account</field>
+        </record>
 
     </data>
 </openerp>
diff --git a/addons/hr_timesheet_sheet/__openerp__.py b/addons/hr_timesheet_sheet/__openerp__.py
index 1acaa5780b8..b1f03e7d6e0 100644
--- a/addons/hr_timesheet_sheet/__openerp__.py
+++ b/addons/hr_timesheet_sheet/__openerp__.py
@@ -24,26 +24,28 @@
     'name': 'Timesheets',
     'version': '1.0',
     'category': 'Human Resources',
-    "sequence": 16,
-    "summary": "Timesheets, Attendances, Activities",
+    'sequence': 16,
+    'summary': 'Timesheets, Attendances, Activities',
     'description': """
-This module helps you to easily encode and validate timesheet and attendances within the same view.
-===================================================================================================
+This module helps you to easily record and validate timesheets and attendances within the same view.
+====================================================================================================
 
     * It will maintain attendances and track (sign in/sign out) events.
     * Track the timesheet lines.
 
-Other tabs contains statistics views to help you analyse your
-time or the time of your team:
+Other tabs contains statistics views to help you analyse your time or the time of your team:
+--------------------------------------------------------------------------------------------
     * Time spent by day (with attendances)
     * Time spent by project
 
 This module also implements a complete timesheet validation process:
+--------------------------------------------------------------------
     * Draft sheet
     * Confirmation at the end of the period by the employee
     * Validation by the project manager
 
 The validation can be configured in the company:
+------------------------------------------------
     * Period size (day, week, month, year)
     * Maximal difference between timesheet and attendances
     """,
@@ -51,8 +53,7 @@ The validation can be configured in the company:
     'website': 'http://www.openerp.com',
     'images': ['images/hr_my_timesheet.jpeg','images/hr_timesheet_analysis.jpeg','images/hr_timesheet_sheet_analysis.jpeg','images/hr_timesheets.jpeg'],
     'depends': ['hr_timesheet', 'hr_timesheet_invoice', 'process'],
-    'init_xml': [],
-    'update_xml': [
+    'data': [
         'security/ir.model.access.csv',
         'security/hr_timesheet_sheet_security.xml',
         'hr_timesheet_sheet_view.xml',
@@ -65,9 +66,7 @@ The validation can be configured in the company:
         'hr_timesheet_sheet_data.xml',
         'res_config_view.xml',
     ],
-    'demo_xml': ['hr_timesheet_sheet_demo.xml',
-
-                 ],
+    'demo': ['hr_timesheet_sheet_demo.xml'],
     'test':['test/test_hr_timesheet_sheet.yml'],
     'installable': True,
     'auto_install': False,
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet.py b/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
index ca28b5bdb28..fcdbfda0667 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
@@ -312,31 +312,12 @@ class hr_timesheet_sheet(osv.osv):
                 self.write(cr, uid, [sheet.id], {'date_current': sheet.date_to,}, context=context)
         return True
 
-    def check_sign(self, cr, uid, ids, typ, context=None):
-        sheet = self.browse(cr, uid, ids, context=context)[0]
-        if not sheet.date_current == time.strftime('%Y-%m-%d'):
-            raise osv.except_osv(_('Error!'), _('You cannot sign in/sign out from other date than today.'))
-        return True
-
-    def sign(self, cr, uid, ids, typ, context=None):
-        self.check_sign(cr, uid, ids, typ, context=context)
-        sign_obj = self.pool.get('hr.sign.in.out')
-        sheet = self.browse(cr, uid, ids, context=context)[0]
-        context['emp_id'] = [sheet.employee_id.id]
-        sign_id = sign_obj.create(cr, uid, {}, context=context)
-        methods = {'sign_in': sign_obj.si_check,
-                   'sign_out': sign_obj.so_check}
-        wizard_result = methods[typ](cr, uid, [sign_id], context=context)
-        if wizard_result.get('type', False) == 'ir.actions.act_window_close':
-            return True  # ensure we do not close the main window !
-        wizard_result['nodestroy'] = True  # do not destroy the main window !
-        return wizard_result
-
-    def sign_in(self, cr, uid, ids, context=None):
-        return self.sign(cr, uid, ids, 'sign_in', context=context)
-
-    def sign_out(self, cr, uid, ids, context=None):
-        return self.sign(cr, uid, ids, 'sign_out', context=context)
+    def attendance_action_change(self, cr, uid, ids, context=None):
+        hr_employee = self.pool.get('hr.employee')
+        employee_ids = []
+        for sheet in self.browse(cr, uid, ids, context=context):
+            if sheet.employee_id.id not in employee_ids: employee_ids.append(sheet.employee_id.id)
+        return hr_employee.attendance_action_change(cr, uid, employee_ids, context=context)
 
     _columns = {
         'name': fields.char('Note', size=64, select=1,
@@ -442,8 +423,10 @@ class hr_timesheet_sheet(osv.osv):
         return True
 
     def name_get(self, cr, uid, ids, context=None):
-        if not len(ids):
+        if not ids:
             return []
+        if isinstance(ids, (long, int)):
+            ids = [ids]
         return [(r['id'], r['date_from'] + ' - ' + r['date_to']) \
                 for r in self.read(cr, uid, ids, ['date_from', 'date_to'],
                     context=context, load='_classic_write')]
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_data.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_data.xml
index f9c9070ddbf..87edf949972 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_data.xml
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_data.xml
@@ -2,31 +2,25 @@
 <openerp>
     <data noupdate="1">
         <!-- notify all employees of module installation -->
-        <function model="mail.group" name="message_append_note">
-            <!-- ids, subject, body, parent_id=False, type='notification', content_subtype='html' -->
-            <value eval="[ref('mail.group_all_employees')]"/>
-            <value>Module Timesheets Validation has been installed</value>
-            <value>From the top menu "Human Resources", encode and validate timesheets and attendances.</value>
-        </function>
+        <record model="mail.message" id="hr_timesheet_module_install_notification">
+            <field name="model">mail.group</field>
+            <field name="res_id" ref="mail.group_all_employees"/>
+            <field name="type">notification</field>
+            <field name="subject">Timesheet Validation application installed!</field>
+            <field name="body">From the top menu "Human Resources", enter and validate timesheets and attendances.</field>
+        </record>
 
         <record id="ir_actions_server_timsheet_sheet" model="ir.actions.server">
-            <field eval="5" name="sequence"/>
-            <field eval="&quot;&quot;&quot;code&quot;&quot;&quot;" name="state"/>
-            <field eval="&quot;&quot;&quot;ir.actions.server&quot;&quot;&quot;" name="type"/>
+            <field name="sequence" eval="5"/>
+            <field name="state">code</field>
+            <field name="type">ir.actions.server</field>
             <field name="model_id" ref="model_hr_timesheet_current_open"/>
-            <field eval="[(6,0,[])]" name="child_ids"/>
-            <field eval="&quot;&quot;&quot;action = pool.get('hr.timesheet.current.open').open_timesheet(cr, uid, None, context)&quot;&quot;&quot;" name="code"/>
-            <field eval="&quot;&quot;&quot;True&quot;&quot;&quot;" name="condition"/>
-            <field eval="&quot;&quot;&quot;My Timesheet&quot;&quot;&quot;" name="name"/>
+            <field name="code">action = pool.get('hr.timesheet.current.open').open_timesheet(cr, uid, None, context)</field>
+            <field name="condition">True</field>
+            <field name="name">My Timesheet</field>
         </record>
 
-        <record id="menu_act_hr_timesheet_sheet_form_my_current" model="ir.ui.menu">
-            <field name="name">My Current Timesheet</field>
-            <field eval="1" name="sequence"/>
-            <field name="parent_id" ref="hr_attendance.menu_hr_time_tracking"/>
-            <field name="icon">STOCK_JUSTIFY_FILL</field>
-            <field name="action" ref="ir_actions_server_timsheet_sheet"/>
-        </record>
+        <menuitem name="My Current Timesheet" id="menu_act_hr_timesheet_sheet_form_my_current" parent="hr_attendance.menu_hr_time_tracking" action="ir_actions_server_timsheet_sheet" sequence="1"/>
 
     </data>
 </openerp>
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_demo.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_demo.xml
index a73bbb3050e..42497eb537e 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_demo.xml
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_demo.xml
@@ -2,12 +2,12 @@
 <openerp>
     <data noupdate="1">
         
-        <record id="sheet1" model="hr_timesheet_sheet.sheet">
+<!--        <record id="sheet1" model="hr_timesheet_sheet.sheet">
             <field name="name">Sheet 1</field>
             <field name="user_id" ref="base.user_root"/>
             <field name="employee_id" ref="hr.employee_fp" />
             <field eval="time.strftime('%Y-%m-%d')" name="date_current"/>
         </record>
-
+-->
     </data>
 </openerp>
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
index 6c4ee63cbe6..5dd71eadd1b 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
@@ -92,9 +92,9 @@
                                     </tree>
                                 </field>
                                 <group>
-                                    <div align="right">
-                                        <button name="sign_in" string="Sign In" type="object" icon="terp-gtk-jump-to-ltr"/>
-                                        <button name="sign_out" string="Sign Out" type="object" icon="terp-gtk-jump-to-rtl"/>
+                                    <div align="right" groups="base.group_hr_manager">
+                                        <button name="attendance_action_change" attrs="{'invisible': [('state_attendance', '=', 'present')]}" type="object" string="Sign In"/>
+                                        <button name="attendance_action_change" attrs="{'invisible': ['|', ('state_attendance','=',False), ('state_attendance', '=', 'absent')]}" type="object" string="Sign Out"/>
                                     </div>
                                 </group>
                             </group>
diff --git a/addons/hr_timesheet_sheet/i18n/ar.po b/addons/hr_timesheet_sheet/i18n/ar.po
index 50b83002f15..2a052980de2 100644
--- a/addons/hr_timesheet_sheet/i18n/ar.po
+++ b/addons/hr_timesheet_sheet/i18n/ar.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:49+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:21+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0 field:hr.attendance,sheet_id:0
diff --git a/addons/hr_timesheet_sheet/i18n/bg.po b/addons/hr_timesheet_sheet/i18n/bg.po
index b5a40c7be4a..89abb06674c 100644
--- a/addons/hr_timesheet_sheet/i18n/bg.po
+++ b/addons/hr_timesheet_sheet/i18n/bg.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:49+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:21+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0 field:hr.attendance,sheet_id:0
diff --git a/addons/hr_timesheet_sheet/i18n/bs.po b/addons/hr_timesheet_sheet/i18n/bs.po
index 9ab1ea2e668..a2307c645e2 100644
--- a/addons/hr_timesheet_sheet/i18n/bs.po
+++ b/addons/hr_timesheet_sheet/i18n/bs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:49+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:21+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0 field:hr.attendance,sheet_id:0
diff --git a/addons/hr_timesheet_sheet/i18n/ca.po b/addons/hr_timesheet_sheet/i18n/ca.po
index 4a2ec9ecfc2..826eefdc70b 100644
--- a/addons/hr_timesheet_sheet/i18n/ca.po
+++ b/addons/hr_timesheet_sheet/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:49+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:21+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0 field:hr.attendance,sheet_id:0
diff --git a/addons/hr_timesheet_sheet/i18n/cs.po b/addons/hr_timesheet_sheet/i18n/cs.po
index 77e0e1d0918..ae6eb00bfef 100644
--- a/addons/hr_timesheet_sheet/i18n/cs.po
+++ b/addons/hr_timesheet_sheet/i18n/cs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:49+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:21+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0 field:hr.attendance,sheet_id:0
diff --git a/addons/hr_timesheet_sheet/i18n/da.po b/addons/hr_timesheet_sheet/i18n/da.po
index a9128aeb3bd..b5654be2e0b 100644
--- a/addons/hr_timesheet_sheet/i18n/da.po
+++ b/addons/hr_timesheet_sheet/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:49+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:21+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0 field:hr.attendance,sheet_id:0
diff --git a/addons/hr_timesheet_sheet/i18n/de.po b/addons/hr_timesheet_sheet/i18n/de.po
index ad380ee08a7..11b9bcae304 100644
--- a/addons/hr_timesheet_sheet/i18n/de.po
+++ b/addons/hr_timesheet_sheet/i18n/de.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:50+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:21+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0 field:hr.attendance,sheet_id:0
diff --git a/addons/hr_timesheet_sheet/i18n/el.po b/addons/hr_timesheet_sheet/i18n/el.po
index 855400091c4..905a8ae9cb3 100644
--- a/addons/hr_timesheet_sheet/i18n/el.po
+++ b/addons/hr_timesheet_sheet/i18n/el.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:50+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:21+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
 "X-Poedit-SourceCharset: utf-8\n"
diff --git a/addons/hr_timesheet_sheet/i18n/es.po b/addons/hr_timesheet_sheet/i18n/es.po
index dd6d393686b..429e38996b0 100644
--- a/addons/hr_timesheet_sheet/i18n/es.po
+++ b/addons/hr_timesheet_sheet/i18n/es.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:50+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:22+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0 field:hr.attendance,sheet_id:0
diff --git a/addons/hr_timesheet_sheet/i18n/es_AR.po b/addons/hr_timesheet_sheet/i18n/es_AR.po
index ea033d95c80..4266f7f8ef9 100644
--- a/addons/hr_timesheet_sheet/i18n/es_AR.po
+++ b/addons/hr_timesheet_sheet/i18n/es_AR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:50+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:22+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0 field:hr.attendance,sheet_id:0
diff --git a/addons/hr_timesheet_sheet/i18n/es_CR.po b/addons/hr_timesheet_sheet/i18n/es_CR.po
index 6e02e77d4f5..e2ef03fbd72 100644
--- a/addons/hr_timesheet_sheet/i18n/es_CR.po
+++ b/addons/hr_timesheet_sheet/i18n/es_CR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:50+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:22+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 "Language: \n"
 
 #. module: hr_timesheet_sheet
diff --git a/addons/hr_timesheet_sheet/i18n/es_EC.po b/addons/hr_timesheet_sheet/i18n/es_EC.po
index fd79b6a6633..33b008073c8 100644
--- a/addons/hr_timesheet_sheet/i18n/es_EC.po
+++ b/addons/hr_timesheet_sheet/i18n/es_EC.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:50+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:22+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0 field:hr.attendance,sheet_id:0
diff --git a/addons/hr_timesheet_sheet/i18n/et.po b/addons/hr_timesheet_sheet/i18n/et.po
index 639f7f5eb51..29c44c0bd5c 100644
--- a/addons/hr_timesheet_sheet/i18n/et.po
+++ b/addons/hr_timesheet_sheet/i18n/et.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:49+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:21+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0 field:hr.attendance,sheet_id:0
diff --git a/addons/hr_timesheet_sheet/i18n/fi.po b/addons/hr_timesheet_sheet/i18n/fi.po
index ee12df9b7bc..876b518eb56 100644
--- a/addons/hr_timesheet_sheet/i18n/fi.po
+++ b/addons/hr_timesheet_sheet/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:49+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:21+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0 field:hr.attendance,sheet_id:0
diff --git a/addons/hr_timesheet_sheet/i18n/fr.po b/addons/hr_timesheet_sheet/i18n/fr.po
index c27efc425a1..83cce2efe64 100644
--- a/addons/hr_timesheet_sheet/i18n/fr.po
+++ b/addons/hr_timesheet_sheet/i18n/fr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:50+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:21+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0 field:hr.attendance,sheet_id:0
diff --git a/addons/hr_timesheet_sheet/i18n/hr.po b/addons/hr_timesheet_sheet/i18n/hr.po
index 5912cb2fd90..75c2a1e1b07 100644
--- a/addons/hr_timesheet_sheet/i18n/hr.po
+++ b/addons/hr_timesheet_sheet/i18n/hr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:50+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:22+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0 field:hr.attendance,sheet_id:0
diff --git a/addons/hr_timesheet_sheet/i18n/hu.po b/addons/hr_timesheet_sheet/i18n/hu.po
index 9dbfa103757..44d5534bd7f 100644
--- a/addons/hr_timesheet_sheet/i18n/hu.po
+++ b/addons/hr_timesheet_sheet/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:50+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:21+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0 field:hr.attendance,sheet_id:0
diff --git a/addons/hr_timesheet_sheet/i18n/id.po b/addons/hr_timesheet_sheet/i18n/id.po
index 0f765996a13..2c7a4b49f7b 100644
--- a/addons/hr_timesheet_sheet/i18n/id.po
+++ b/addons/hr_timesheet_sheet/i18n/id.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:50+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:21+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0 field:hr.attendance,sheet_id:0
diff --git a/addons/hr_timesheet_sheet/i18n/it.po b/addons/hr_timesheet_sheet/i18n/it.po
index eef7d92772a..7a23a5408a1 100644
--- a/addons/hr_timesheet_sheet/i18n/it.po
+++ b/addons/hr_timesheet_sheet/i18n/it.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:50+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:21+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0 field:hr.attendance,sheet_id:0
diff --git a/addons/hr_timesheet_sheet/i18n/ja.po b/addons/hr_timesheet_sheet/i18n/ja.po
index dfaa50f637f..cc6fa798487 100644
--- a/addons/hr_timesheet_sheet/i18n/ja.po
+++ b/addons/hr_timesheet_sheet/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:50+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:21+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0 field:hr.attendance,sheet_id:0
diff --git a/addons/hr_timesheet_sheet/i18n/ko.po b/addons/hr_timesheet_sheet/i18n/ko.po
index e0d802af7e7..7b6e81618e7 100644
--- a/addons/hr_timesheet_sheet/i18n/ko.po
+++ b/addons/hr_timesheet_sheet/i18n/ko.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:50+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:21+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0 field:hr.attendance,sheet_id:0
diff --git a/addons/hr_timesheet_sheet/i18n/lt.po b/addons/hr_timesheet_sheet/i18n/lt.po
index c33b22207e1..ca671af16e1 100644
--- a/addons/hr_timesheet_sheet/i18n/lt.po
+++ b/addons/hr_timesheet_sheet/i18n/lt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:50+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:21+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0 field:hr.attendance,sheet_id:0
diff --git a/addons/hr_timesheet_sheet/i18n/lv.po b/addons/hr_timesheet_sheet/i18n/lv.po
index 64e62650f3f..5395251e4b2 100644
--- a/addons/hr_timesheet_sheet/i18n/lv.po
+++ b/addons/hr_timesheet_sheet/i18n/lv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:50+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:21+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0 field:hr.attendance,sheet_id:0
diff --git a/addons/hr_timesheet_sheet/i18n/mn.po b/addons/hr_timesheet_sheet/i18n/mn.po
index 72486013404..cf336e89bf9 100644
--- a/addons/hr_timesheet_sheet/i18n/mn.po
+++ b/addons/hr_timesheet_sheet/i18n/mn.po
@@ -27,8 +27,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:50+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:21+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0 field:hr.attendance,sheet_id:0
diff --git a/addons/hr_timesheet_sheet/i18n/nl.po b/addons/hr_timesheet_sheet/i18n/nl.po
index fc62efe88f0..c7dcedf5594 100644
--- a/addons/hr_timesheet_sheet/i18n/nl.po
+++ b/addons/hr_timesheet_sheet/i18n/nl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:49+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:21+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0 field:hr.attendance,sheet_id:0
diff --git a/addons/hr_timesheet_sheet/i18n/nl_BE.po b/addons/hr_timesheet_sheet/i18n/nl_BE.po
index 9b4964af93a..5230f91d32e 100644
--- a/addons/hr_timesheet_sheet/i18n/nl_BE.po
+++ b/addons/hr_timesheet_sheet/i18n/nl_BE.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:50+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:22+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0 field:hr.attendance,sheet_id:0
diff --git a/addons/hr_timesheet_sheet/i18n/pl.po b/addons/hr_timesheet_sheet/i18n/pl.po
index ba34750d3cc..3d77824b778 100644
--- a/addons/hr_timesheet_sheet/i18n/pl.po
+++ b/addons/hr_timesheet_sheet/i18n/pl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:50+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:21+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0 field:hr.attendance,sheet_id:0
diff --git a/addons/hr_timesheet_sheet/i18n/pt.po b/addons/hr_timesheet_sheet/i18n/pt.po
index 6fb87a90670..dbf68c2b1b6 100644
--- a/addons/hr_timesheet_sheet/i18n/pt.po
+++ b/addons/hr_timesheet_sheet/i18n/pt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:50+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:21+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0 field:hr.attendance,sheet_id:0
diff --git a/addons/hr_timesheet_sheet/i18n/pt_BR.po b/addons/hr_timesheet_sheet/i18n/pt_BR.po
index a95e675b8ed..8117e35f6fa 100644
--- a/addons/hr_timesheet_sheet/i18n/pt_BR.po
+++ b/addons/hr_timesheet_sheet/i18n/pt_BR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:50+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:22+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0 field:hr.attendance,sheet_id:0
@@ -192,6 +192,13 @@ msgid ""
 "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 ""
+"Minha folha de horas abre seu quadro de horários de modo que você pode "
+"reservar suas atividades no sistema. Da mesma forma, você pode registrar "
+"seus atendimentos (Registrar Entrada / Saída) e descrever as horas de "
+"trabalho feitas em diferentes projetos. No final do período de tempo "
+"definido na empresa, a folha de horas é confirmada pelo usuário e pode ser "
+"validado pelo seu gerente. Se necessário, conforme definido no projeto, você "
+"pode gerar as faturas com base na folha de horas."
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet.day:0
@@ -847,6 +854,11 @@ msgid ""
 "* The 'Done' state is used when users timesheet is accepted by his/her "
 "senior."
 msgstr ""
+" * 'Provisório' é usado quando um usuário está cadastrando uma folha de "
+"horas nova e sem confirmação\n"
+"* 'Confirmado' é usado para confirmar a folha de horas por usuário.\n"
+"* 'Concluído' é usado quando a folha de horas do usuário é aceita por seu "
+"superior."
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0
@@ -1017,11 +1029,13 @@ msgid ""
 "In order to create a timesheet for this employee, you must assign it to a "
 "user!"
 msgstr ""
+"Para criar uma folha de horas para este funcionário, você precisa associar a "
+"um usuário!"
 
 #. module: hr_timesheet_sheet
 #: view:timesheet.report:0 field:timesheet.report,total_attendance:0
 msgid "#Total Attendance"
-msgstr ""
+msgstr "#Presenças Totais"
 
 #. module: hr_timesheet_sheet
 #: field:hr.timesheet.report,cost:0
@@ -1037,7 +1051,7 @@ msgstr "Data atual"
 #. module: hr_timesheet_sheet
 #: model:process.process,name:hr_timesheet_sheet.process_process_hrtimesheetprocess0
 msgid "Hr Timesheet"
-msgstr ""
+msgstr "Folha de Horas de RH"
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0 field:hr.timesheet.report,year:0
@@ -1048,12 +1062,12 @@ msgstr "Ano"
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.current.open:0 selection:hr_timesheet_sheet.sheet,state:0
 msgid "Open"
-msgstr ""
+msgstr "Aberto"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 msgid "To Approve"
-msgstr ""
+msgstr "Para Aprovar"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet.account:0
@@ -1063,7 +1077,7 @@ msgstr "Total"
 #. module: hr_timesheet_sheet
 #: field:hr.timesheet.report,journal_id:0
 msgid "Journal"
-msgstr ""
+msgstr "Diário"
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Invalido XML para Arquitetura da View"
diff --git a/addons/hr_timesheet_sheet/i18n/ro.po b/addons/hr_timesheet_sheet/i18n/ro.po
index 4705e13b242..728f0498135 100644
--- a/addons/hr_timesheet_sheet/i18n/ro.po
+++ b/addons/hr_timesheet_sheet/i18n/ro.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:50+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:21+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0 field:hr.attendance,sheet_id:0
diff --git a/addons/hr_timesheet_sheet/i18n/ru.po b/addons/hr_timesheet_sheet/i18n/ru.po
index e9e42a2a018..6ab0139e2ff 100644
--- a/addons/hr_timesheet_sheet/i18n/ru.po
+++ b/addons/hr_timesheet_sheet/i18n/ru.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:50+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:21+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0 field:hr.attendance,sheet_id:0
diff --git a/addons/hr_timesheet_sheet/i18n/sl.po b/addons/hr_timesheet_sheet/i18n/sl.po
index c98b1afd25a..a397c5745e7 100644
--- a/addons/hr_timesheet_sheet/i18n/sl.po
+++ b/addons/hr_timesheet_sheet/i18n/sl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:50+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:22+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0 field:hr.attendance,sheet_id:0
diff --git a/addons/hr_timesheet_sheet/i18n/sq.po b/addons/hr_timesheet_sheet/i18n/sq.po
index 3a452cf0673..37b4c570707 100644
--- a/addons/hr_timesheet_sheet/i18n/sq.po
+++ b/addons/hr_timesheet_sheet/i18n/sq.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:49+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:21+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0 field:hr.attendance,sheet_id:0
diff --git a/addons/hr_timesheet_sheet/i18n/sv.po b/addons/hr_timesheet_sheet/i18n/sv.po
index 6fa17b7569b..837606e71de 100644
--- a/addons/hr_timesheet_sheet/i18n/sv.po
+++ b/addons/hr_timesheet_sheet/i18n/sv.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:50+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:22+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0 field:hr.attendance,sheet_id:0
diff --git a/addons/hr_timesheet_sheet/i18n/tlh.po b/addons/hr_timesheet_sheet/i18n/tlh.po
index 303d084740f..9593c5853a3 100644
--- a/addons/hr_timesheet_sheet/i18n/tlh.po
+++ b/addons/hr_timesheet_sheet/i18n/tlh.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:50+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:22+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0 field:hr.attendance,sheet_id:0
diff --git a/addons/hr_timesheet_sheet/i18n/tr.po b/addons/hr_timesheet_sheet/i18n/tr.po
index c75cc189c26..2c35482fa7c 100644
--- a/addons/hr_timesheet_sheet/i18n/tr.po
+++ b/addons/hr_timesheet_sheet/i18n/tr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:50+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:22+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0 field:hr.attendance,sheet_id:0
diff --git a/addons/hr_timesheet_sheet/i18n/uk.po b/addons/hr_timesheet_sheet/i18n/uk.po
index 440e9236f2e..d13830ab51c 100644
--- a/addons/hr_timesheet_sheet/i18n/uk.po
+++ b/addons/hr_timesheet_sheet/i18n/uk.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:50+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:22+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0 field:hr.attendance,sheet_id:0
diff --git a/addons/hr_timesheet_sheet/i18n/vi.po b/addons/hr_timesheet_sheet/i18n/vi.po
index dce2de88527..54bd912768d 100644
--- a/addons/hr_timesheet_sheet/i18n/vi.po
+++ b/addons/hr_timesheet_sheet/i18n/vi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:50+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:22+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0 field:hr.attendance,sheet_id:0
diff --git a/addons/hr_timesheet_sheet/i18n/zh_CN.po b/addons/hr_timesheet_sheet/i18n/zh_CN.po
index c0b4350bf7c..07cae2bc952 100644
--- a/addons/hr_timesheet_sheet/i18n/zh_CN.po
+++ b/addons/hr_timesheet_sheet/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-02-08 01:37+0100\n"
-"PO-Revision-Date: 2012-05-29 05:42+0000\n"
-"Last-Translator: ccdos <Unknown>\n"
+"PO-Revision-Date: 2012-08-18 17:34+0000\n"
+"Last-Translator: Heling Yao <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: 2012-08-09 04:50+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:22+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0 field:hr.attendance,sheet_id:0
@@ -78,7 +78,7 @@ msgstr "请核实这表的总差异少于  %.2f  ！"
 #. module: hr_timesheet_sheet
 #: selection:hr.timesheet.report,month:0 selection:timesheet.report,month:0
 msgid "March"
-msgstr ""
+msgstr "三月"
 
 #. module: hr_timesheet_sheet
 #: view:timesheet.report:0 field:timesheet.report,cost:0
@@ -186,7 +186,7 @@ msgid ""
 "project, you can generate the invoices based on the timesheet."
 msgstr ""
 "用\"我的计工单\"菜单开启您的计工单所以您能在系统预定你的活动。用相同方式，您能记录您的考勤（签入/签出）同时记录在不同项目的工作时间。在公司定义的期末"
-"，确认用户的记工单和经由经理使其生效。如果需要，可以定义为一个项目，你能给这计工单开发票。"
+"，确认用户的计工单和经由经理使其生效。如果需要，可以定义为一个项目，你能给这计工单开发票。"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet.day:0
@@ -733,7 +733,7 @@ msgstr "签入/签出和在一个计工单里的容许的差异小时。如果
 #: view:hr_timesheet_sheet.sheet:0 field:hr_timesheet_sheet.sheet,period_ids:0
 #: view:hr_timesheet_sheet.sheet.day:0
 msgid "Period"
-msgstr "周期"
+msgstr "考勤详情"
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0 field:hr.timesheet.report,day:0
@@ -977,7 +977,7 @@ msgstr "辅助核算项"
 #. module: hr_timesheet_sheet
 #: view:timesheet.report:0 field:timesheet.report,to_invoice:0
 msgid "Type of Invoicing"
-msgstr "开票类型"
+msgstr "发票类型"
 
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:246
diff --git a/addons/hr_timesheet_sheet/i18n/zh_TW.po b/addons/hr_timesheet_sheet/i18n/zh_TW.po
index 013f514e2c8..1db56103ed9 100644
--- a/addons/hr_timesheet_sheet/i18n/zh_TW.po
+++ b/addons/hr_timesheet_sheet/i18n/zh_TW.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:50+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:22+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0 field:hr.attendance,sheet_id:0
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 f4f9326890f..849c2fa7caa 100644
--- a/addons/hr_timesheet_sheet/test/test_hr_timesheet_sheet.yml
+++ b/addons/hr_timesheet_sheet/test/test_hr_timesheet_sheet.yml
@@ -26,7 +26,7 @@
   Now, at the time of login, I create Attendances and perform "Sign In" action.
 -
   !python {model: hr_timesheet_sheet.sheet}: |
-    self.sign_in(cr, uid, [ref('hr_timesheet_sheet_sheet_deddk0')], {})
+    self.attendance_action_change(cr, uid, [ref('hr_timesheet_sheet_sheet_deddk0')], {})
     task_work = self.search(cr, uid, [("name","=","Quentin Paolinon")],context)[0]
     task_ids = self.browse(cr, uid, task_work, context)
     assert task_ids.state == "draft", "I State In Timesheet"
@@ -69,7 +69,7 @@
       - account_id: account.analytic_agrolait
         date: !eval time.strftime('%Y-%m-%d')
         name: 'Develop yaml for hr module'
-        user_id: base.user_qdp
+        user_id: base.user_demo
         unit_amount: 6.00
         amount: -90.00
         product_id: product.product_product_consultant
@@ -97,7 +97,7 @@
         date: !eval time.strftime('%Y-%m-%d')
         name: 'Develop yaml for hr module'
         unit_amount: 2.00
-        user_id: base.user_qdp
+        user_id: base.user_demo
         amount: -90.00
         product_id: product.product_product_consultant
         general_account_id: account.a_expense
diff --git a/addons/idea/__openerp__.py b/addons/idea/__openerp__.py
index 7ee4a72de05..3c7a3fca1b0 100644
--- a/addons/idea/__openerp__.py
+++ b/addons/idea/__openerp__.py
@@ -36,18 +36,14 @@ Once installed, check the menu 'Ideas' in the 'Tools' main menu.""",
     'author': 'OpenERP SA',
     'website': 'http://openerp.com',
     'depends': ['base_tools','mail'],
-    'init_xml': [],
-    'update_xml': [
+    'data': [
         'security/idea_security.xml',
         'security/ir.model.access.csv',
         'idea_view.xml',
         'idea_workflow.xml',
     ],
-    'demo_xml': [
-        "idea_data.xml"
-    ],
-    'test':[
-    ],
+    'demo': ['idea_data.xml'],
+    'test':[],
     'installable': True,
     'images': [],
 }
diff --git a/addons/idea/idea.py b/addons/idea/idea.py
index 3be4dd2e28d..e2e5ec50ddf 100644
--- a/addons/idea/idea.py
+++ b/addons/idea/idea.py
@@ -67,21 +67,21 @@ class idea_idea(osv.osv):
 
     def idea_cancel(self, cr, uid, ids, context={}):
         self.write(cr, uid, ids, { 'state': 'cancel' })
-        self.message_append_note(cr, uid, ids, body=_('Idea canceled.'), context=context)
+        self.message_post(cr, uid, ids, body=_('Idea canceled.'), context=context)
         return True
 
     def idea_open(self, cr, uid, ids, context={}):
         self.write(cr, uid, ids, { 'state': 'open'})
-        self.message_append_note(cr, uid, ids, body=_('Idea accepted.'), context=context)
+        self.message_post(cr, uid, ids, body=_('Idea accepted.'), context=context)
         return True
 
     def idea_close(self, cr, uid, ids, context={}):
-        self.message_append_note(cr, uid, ids, body=_('Idea done.'), context=context)
+        self.message_post(cr, uid, ids, body=_('Idea done.'), context=context)
         self.write(cr, uid, ids, { 'state': 'close' })
         return True
 
     def idea_draft(self, cr, uid, ids, context={}):
-        self.message_append_note(cr, uid, ids, body=_('Idea reset to draft.'), context=context)
+        self.message_post(cr, uid, ids, body=_('Idea reset to draft.'), context=context)
         self.write(cr, uid, ids, { 'state': 'draft' })
         return True
 idea_idea()
diff --git a/addons/import_base/__openerp__.py b/addons/import_base/__openerp__.py
index 294f864a0e3..72c4759f735 100644
--- a/addons/import_base/__openerp__.py
+++ b/addons/import_base/__openerp__.py
@@ -24,15 +24,14 @@
     'version': '0.9',
     'category': 'Hidden/Dependency',
     'description': """
-This module provide a class import_framework to help importing complex data from
-other software.
+This module provide a class import_framework to help importing complex data from other software.
+================================================================================================
     """,
     'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
     'depends': ['base','mail'],
-    'init_xml': [],
-    'update_xml': ["import_base_view.xml"],
-    'demo_xml': [],
+    'data': ['import_base_view.xml'],
+    'demo': [],
     'test': [], #TODO provide test
     'installable': True,
     'auto_install': False,
diff --git a/addons/import_base/i18n/ar.po b/addons/import_base/i18n/ar.po
index f900f0fb189..fd1e7b117f7 100644
--- a/addons/import_base/i18n/ar.po
+++ b/addons/import_base/i18n/ar.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: import_base
 #: code:addons/import_base/import_framework.py:434
diff --git a/addons/import_base/i18n/de.po b/addons/import_base/i18n/de.po
index 927a06628a0..dc9beeb2104 100644
--- a/addons/import_base/i18n/de.po
+++ b/addons/import_base/i18n/de.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: import_base
 #: code:addons/import_base/import_framework.py:434
diff --git a/addons/import_base/i18n/es_CR.po b/addons/import_base/i18n/es_CR.po
index 4fdfd729a2d..5c8fd805801 100644
--- a/addons/import_base/i18n/es_CR.po
+++ b/addons/import_base/i18n/es_CR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: import_base
 #: code:addons/import_base/import_framework.py:434
diff --git a/addons/import_base/i18n/fi.po b/addons/import_base/i18n/fi.po
index 3b4db1223d9..e71bd392766 100644
--- a/addons/import_base/i18n/fi.po
+++ b/addons/import_base/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: import_base
 #: code:addons/import_base/import_framework.py:434
diff --git a/addons/import_base/i18n/fr.po b/addons/import_base/i18n/fr.po
index bf94c953323..ddead31a789 100644
--- a/addons/import_base/i18n/fr.po
+++ b/addons/import_base/i18n/fr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: import_base
 #: code:addons/import_base/import_framework.py:434
diff --git a/addons/import_base/i18n/ja.po b/addons/import_base/i18n/ja.po
index 0744b46ad06..6c1d5aef0c7 100644
--- a/addons/import_base/i18n/ja.po
+++ b/addons/import_base/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: import_base
 #: code:addons/import_base/import_framework.py:434
diff --git a/addons/import_base/i18n/nb.po b/addons/import_base/i18n/nb.po
new file mode 100644
index 00000000000..62b30d04da6
--- /dev/null
+++ b/addons/import_base/i18n/nb.po
@@ -0,0 +1,105 @@
+# Norwegian Bokmal 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-02-08 00:36+0000\n"
+"PO-Revision-Date: 2012-09-08 19:39+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Norwegian Bokmal <nb@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-09-09 04:52+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
+
+#. module: import_base
+#: code:addons/import_base/import_framework.py:434
+#, python-format
+msgid "Import failed due to an unexpected error"
+msgstr "Import mislyktes på grunn av en uventet feil."
+
+#. module: import_base
+#: code:addons/import_base/import_framework.py:461
+#, python-format
+msgid "started at %s and finished at %s \n"
+msgstr "Startet på% s og ferdig på% s \n"
+
+#. module: import_base
+#: code:addons/import_base/import_framework.py:448
+#, python-format
+msgid "Import of your data finished at %s"
+msgstr "Import av dine data ferdig på% s"
+
+#. module: import_base
+#: code:addons/import_base/import_framework.py:463
+#, python-format
+msgid ""
+"but failed, in consequence no data were imported to keep database "
+"consistency \n"
+" error : \n"
+msgstr ""
+"Men mislyktes, i følge ingen data ble importert for å holde databasen "
+"konsistens\n"
+"  feil: \n"
+
+#. module: import_base
+#: code:addons/import_base/import_framework.py:477
+#, python-format
+msgid ""
+"The import of data \n"
+" instance name : %s \n"
+msgstr ""
+"Import av data\n"
+" Eksempel navn:% s \n"
+
+#. module: import_base
+#: code:addons/import_base/import_framework.py:470
+#, python-format
+msgid "%s has been successfully imported from %s %s, %s \n"
+msgstr "% s har blitt importert fra% s% s,% s \n"
+
+#. module: import_base
+#: code:addons/import_base/import_framework.py:447
+#, python-format
+msgid "Data Import failed at %s due to an unexpected error"
+msgstr "Dataimport mislyktes ved% s på grunn av en uventet feil."
+
+#. module: import_base
+#: code:addons/import_base/import_framework.py:436
+#, python-format
+msgid "Import finished, notification email sended"
+msgstr "Import ferdig,  e-postmelding sendt."
+
+#. module: import_base
+#: code:addons/import_base/import_framework.py:190
+#, python-format
+msgid "%s is not a valid model name"
+msgstr "% s er ikke en gyldig modellnavn."
+
+#. module: import_base
+#: model:ir.ui.menu,name:import_base.menu_import_crm
+msgid "Import"
+msgstr "Import"
+
+#. module: import_base
+#: code:addons/import_base/import_framework.py:467
+#, python-format
+msgid "with no warning"
+msgstr "Uten advarsel."
+
+#. module: import_base
+#: code:addons/import_base/import_framework.py:469
+#, python-format
+msgid "with warning : %s"
+msgstr "Med advarsel :%s"
+
+#. module: import_base
+#: code:addons/import_base/import_framework.py:191
+#, python-format
+msgid " fields imported : "
+msgstr " Felt importert: "
diff --git a/addons/import_base/i18n/nl.po b/addons/import_base/i18n/nl.po
index 7ade4bf3173..d4f898f4f10 100644
--- a/addons/import_base/i18n/nl.po
+++ b/addons/import_base/i18n/nl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: import_base
 #: code:addons/import_base/import_framework.py:434
diff --git a/addons/import_base/i18n/pl.po b/addons/import_base/i18n/pl.po
index fa3e90dc555..41a324caa79 100644
--- a/addons/import_base/i18n/pl.po
+++ b/addons/import_base/i18n/pl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: import_base
 #: code:addons/import_base/import_framework.py:434
diff --git a/addons/import_base/i18n/pt.po b/addons/import_base/i18n/pt.po
index 8baa0309054..af93410892a 100644
--- a/addons/import_base/i18n/pt.po
+++ b/addons/import_base/i18n/pt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: import_base
 #: code:addons/import_base/import_framework.py:434
diff --git a/addons/import_base/i18n/pt_BR.po b/addons/import_base/i18n/pt_BR.po
index 2a6f49957be..476a54ec7bb 100644
--- a/addons/import_base/i18n/pt_BR.po
+++ b/addons/import_base/i18n/pt_BR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: import_base
 #: code:addons/import_base/import_framework.py:434
diff --git a/addons/import_base/i18n/ro.po b/addons/import_base/i18n/ro.po
index 2fb6ac74e65..3f873c90a09 100644
--- a/addons/import_base/i18n/ro.po
+++ b/addons/import_base/i18n/ro.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: import_base
 #: code:addons/import_base/import_framework.py:434
diff --git a/addons/import_base/i18n/sv.po b/addons/import_base/i18n/sv.po
index 058d87b1e68..885b055355a 100644
--- a/addons/import_base/i18n/sv.po
+++ b/addons/import_base/i18n/sv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: import_base
 #: code:addons/import_base/import_framework.py:434
diff --git a/addons/import_base/i18n/tr.po b/addons/import_base/i18n/tr.po
index b7b874132b9..f8d023f06fb 100644
--- a/addons/import_base/i18n/tr.po
+++ b/addons/import_base/i18n/tr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: import_base
 #: code:addons/import_base/import_framework.py:434
diff --git a/addons/import_base/i18n/zh_CN.po b/addons/import_base/i18n/zh_CN.po
index 1982d1476ce..2545919e0e9 100644
--- a/addons/import_base/i18n/zh_CN.po
+++ b/addons/import_base/i18n/zh_CN.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: import_base
 #: code:addons/import_base/import_framework.py:434
diff --git a/addons/import_base/import_framework.py b/addons/import_base/import_framework.py
index 74d2185b57e..7e0a055d95b 100644
--- a/addons/import_base/import_framework.py
+++ b/addons/import_base/import_framework.py
@@ -425,7 +425,7 @@ class import_framework(Thread):
         email_id = email_obj.create(self.cr, self.uid, {
             'email_from' : 'import@module.openerp',
             'email_to' : self.email,
-            'body_text' : self.get_email_body(result, error),
+            'body' : self.get_email_body(result, error),
             'subject' : self.get_email_subject(result, error),
             'auto_delete' : True})
         email_obj.send(self.cr, self.uid, [email_id])
diff --git a/addons/import_google/__openerp__.py b/addons/import_google/__openerp__.py
index 9e47a213072..b7e190325f1 100644
--- a/addons/import_google/__openerp__.py
+++ b/addons/import_google/__openerp__.py
@@ -23,21 +23,22 @@
     'name': 'Google Import',
     'version': '1.0',
     'category': 'Customer Relationship Management',
-    'description': """The module adds google contact in partner address and add google calendar events details in Meeting.""",
+    'description': """
+The module adds google contact in partner address and add google calendar events details in Meeting.
+====================================================================================================
+""",
     'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
     'depends': ['base', 'import_base', 'google_base_account', 'base_calendar'],
-    'init_xml': [],
-    'update_xml': ['security/ir.model.access.csv',
-                'sync_google_calendar_view.xml',
-                'wizard/import_google_data_view.xml',
-                'wizard/google_import_message_view.xml'
-
-               ],
-    'demo_xml': [],
+    'data': ['security/ir.model.access.csv',
+             'sync_google_calendar_view.xml',
+             'wizard/import_google_data_view.xml',
+             'wizard/google_import_message_view.xml'
+    ],
+    'demo': [],
     'test': [
-             #'test/test_sync_google_contact_import_partner.yml',
-             #'test/test_sync_google_calendar.yml',
+        #'test/test_sync_google_contact_import_partner.yml',
+        #'test/test_sync_google_calendar.yml',
     ],
     'installable': True,
     'auto_install': False,
diff --git a/addons/import_google/i18n/ar.po b/addons/import_google/i18n/ar.po
index a5e6d0f2dbb..3e3064b6ccb 100644
--- a/addons/import_google/i18n/ar.po
+++ b/addons/import_google/i18n/ar.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: import_google
 #: help:synchronize.google.import,group_name:0
diff --git a/addons/import_google/i18n/de.po b/addons/import_google/i18n/de.po
index fe2ed0c5b90..90dce948991 100644
--- a/addons/import_google/i18n/de.po
+++ b/addons/import_google/i18n/de.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: import_google
 #: help:synchronize.google.import,group_name:0
diff --git a/addons/import_google/i18n/es.po b/addons/import_google/i18n/es.po
index 3db7c708258..cf84796f165 100644
--- a/addons/import_google/i18n/es.po
+++ b/addons/import_google/i18n/es.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: import_google
 #: help:synchronize.google.import,group_name:0
diff --git a/addons/import_google/i18n/es_CR.po b/addons/import_google/i18n/es_CR.po
index 2d21a82ab5f..e44b45838ef 100644
--- a/addons/import_google/i18n/es_CR.po
+++ b/addons/import_google/i18n/es_CR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: import_google
 #: help:synchronize.google.import,group_name:0
diff --git a/addons/import_google/i18n/fr.po b/addons/import_google/i18n/fr.po
index 20fb4c3a617..cedda7fc46c 100644
--- a/addons/import_google/i18n/fr.po
+++ b/addons/import_google/i18n/fr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: import_google
 #: help:synchronize.google.import,group_name:0
diff --git a/addons/import_google/i18n/ja.po b/addons/import_google/i18n/ja.po
index 452a84f76b4..01e67b90c35 100644
--- a/addons/import_google/i18n/ja.po
+++ b/addons/import_google/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: import_google
 #: help:synchronize.google.import,group_name:0
diff --git a/addons/import_google/i18n/mn.po b/addons/import_google/i18n/mn.po
new file mode 100644
index 00000000000..9b0376c0d98
--- /dev/null
+++ b/addons/import_google/i18n/mn.po
@@ -0,0 +1,217 @@
+# 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-02-08 00:36+0000\n"
+"PO-Revision-Date: 2012-08-31 07:21+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: 2012-09-01 04:55+0000\n"
+"X-Generator: Launchpad (build 15890)\n"
+
+#. module: import_google
+#: help:synchronize.google.import,group_name:0
+msgid "Choose which group to import, By default it takes all."
+msgstr ""
+
+#. module: import_google
+#: view:synchronize.google.import:0
+msgid "Import Google Calendar Events"
+msgstr ""
+
+#. module: import_google
+#: view:synchronize.google.import:0
+msgid "_Import Events"
+msgstr ""
+
+#. module: import_google
+#: code:addons/import_google/wizard/import_google_data.py:71
+#, python-format
+msgid ""
+"No Google Username or password Defined for user.\n"
+"Please define in user view"
+msgstr ""
+
+#. module: import_google
+#: code:addons/import_google/wizard/import_google_data.py:127
+#, python-format
+msgid ""
+"Invalid login detail !\n"
+" Specify Username/Password."
+msgstr ""
+
+#. module: import_google
+#: field:synchronize.google.import,supplier:0
+msgid "Supplier"
+msgstr ""
+
+#. module: import_google
+#: view:synchronize.google.import:0
+msgid "Import Options"
+msgstr ""
+
+#. module: import_google
+#: field:synchronize.google.import,group_name:0
+msgid "Group Name"
+msgstr ""
+
+#. module: import_google
+#: model:ir.model,name:import_google.model_crm_case_categ
+msgid "Category of Case"
+msgstr ""
+
+#. module: import_google
+#: model:ir.actions.act_window,name:import_google.act_google_login_contact_form
+#: model:ir.ui.menu,name:import_google.menu_sync_contact
+msgid "Import Google Contacts"
+msgstr ""
+
+#. module: import_google
+#: view:google.import.message:0
+msgid "Import Google Data"
+msgstr ""
+
+#. module: import_google
+#: view:crm.meeting:0
+msgid "Meeting Type"
+msgstr ""
+
+#. module: import_google
+#: code:addons/import_google/wizard/import_google.py:38
+#: code:addons/import_google/wizard/import_google_data.py:28
+#, python-format
+msgid ""
+"Please install gdata-python-client from http://code.google.com/p/gdata-"
+"python-client/downloads/list"
+msgstr ""
+
+#. module: import_google
+#: model:ir.model,name:import_google.model_google_login
+msgid "Google Contact"
+msgstr ""
+
+#. module: import_google
+#: view:synchronize.google.import:0
+msgid "Import contacts from a google account"
+msgstr ""
+
+#. module: import_google
+#: code:addons/import_google/wizard/import_google_data.py:133
+#, python-format
+msgid "Please specify correct user and password !"
+msgstr ""
+
+#. module: import_google
+#: field:synchronize.google.import,customer:0
+msgid "Customer"
+msgstr ""
+
+#. module: import_google
+#: view:synchronize.google.import:0
+msgid "_Cancel"
+msgstr ""
+
+#. module: import_google
+#: model:ir.model,name:import_google.model_synchronize_google_import
+msgid "synchronize.google.import"
+msgstr ""
+
+#. module: import_google
+#: view:synchronize.google.import:0
+msgid "_Import Contacts"
+msgstr ""
+
+#. module: import_google
+#: model:ir.actions.act_window,name:import_google.act_google_login_form
+#: model:ir.ui.menu,name:import_google.menu_sync_calendar
+msgid "Import Google Calendar"
+msgstr ""
+
+#. module: import_google
+#: code:addons/import_google/wizard/import_google_data.py:50
+#, python-format
+msgid "Import google"
+msgstr ""
+
+#. module: import_google
+#: code:addons/import_google/wizard/import_google_data.py:127
+#: code:addons/import_google/wizard/import_google_data.py:133
+#, python-format
+msgid "Error"
+msgstr ""
+
+#. module: import_google
+#: code:addons/import_google/wizard/import_google_data.py:71
+#, python-format
+msgid "Warning !"
+msgstr ""
+
+#. module: import_google
+#: field:synchronize.google.import,create_partner:0
+msgid "Options"
+msgstr "Тохируулга"
+
+#. module: import_google
+#: view:google.import.message:0
+msgid "_Ok"
+msgstr ""
+
+#. module: import_google
+#: code:addons/import_google/wizard/import_google.py:38
+#: code:addons/import_google/wizard/import_google_data.py:28
+#, python-format
+msgid "Google Contacts Import Error!"
+msgstr ""
+
+#. module: import_google
+#: model:ir.model,name:import_google.model_google_import_message
+msgid "Import Message"
+msgstr ""
+
+#. module: import_google
+#: field:synchronize.google.import,calendar_name:0
+msgid "Calendar Name"
+msgstr ""
+
+#. module: import_google
+#: help:synchronize.google.import,supplier:0
+msgid "Check this box to set newly created partner as Supplier."
+msgstr ""
+
+#. module: import_google
+#: selection:synchronize.google.import,create_partner:0
+msgid "Import only address"
+msgstr "Зөвхөн хаяг оруулах"
+
+#. module: import_google
+#: field:crm.case.categ,user_id:0
+msgid "User"
+msgstr ""
+
+#. module: import_google
+#: view:synchronize.google.import:0
+msgid "Partner Status for this Group:"
+msgstr ""
+
+#. module: import_google
+#: field:google.import.message,name:0
+msgid "Message"
+msgstr ""
+
+#. module: import_google
+#: selection:synchronize.google.import,create_partner:0
+msgid "Create partner for each contact"
+msgstr ""
+
+#. module: import_google
+#: help:synchronize.google.import,customer:0
+msgid "Check this box to set newly created partner as Customer."
+msgstr ""
diff --git a/addons/import_google/i18n/nl.po b/addons/import_google/i18n/nl.po
index db2e8259556..cf8d6ed14a2 100644
--- a/addons/import_google/i18n/nl.po
+++ b/addons/import_google/i18n/nl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: import_google
 #: help:synchronize.google.import,group_name:0
diff --git a/addons/import_google/i18n/pt.po b/addons/import_google/i18n/pt.po
index e6513fd3227..68ea42d7f42 100644
--- a/addons/import_google/i18n/pt.po
+++ b/addons/import_google/i18n/pt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: import_google
 #: help:synchronize.google.import,group_name:0
diff --git a/addons/import_google/i18n/pt_BR.po b/addons/import_google/i18n/pt_BR.po
index d6992af426a..8a33a1eb47b 100644
--- a/addons/import_google/i18n/pt_BR.po
+++ b/addons/import_google/i18n/pt_BR.po
@@ -9,13 +9,14 @@ msgstr ""
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:36+0000\n"
 "PO-Revision-Date: 2012-07-28 21:30+0000\n"
-"Last-Translator: Fábio Martinelli <webmaster@guaru.net>\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: 2012-08-09 05:00+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: import_google
 #: help:synchronize.google.import,group_name:0
diff --git a/addons/import_google/i18n/ro.po b/addons/import_google/i18n/ro.po
index 887047c475a..382ed4dc2c7 100644
--- a/addons/import_google/i18n/ro.po
+++ b/addons/import_google/i18n/ro.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: import_google
 #: help:synchronize.google.import,group_name:0
diff --git a/addons/import_google/i18n/sr@latin.po b/addons/import_google/i18n/sr@latin.po
index ab1e17d3f99..40b29b2458a 100644
--- a/addons/import_google/i18n/sr@latin.po
+++ b/addons/import_google/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: import_google
 #: help:synchronize.google.import,group_name:0
diff --git a/addons/import_google/i18n/sv.po b/addons/import_google/i18n/sv.po
index 52d02141ae1..2e90bcf9ea7 100644
--- a/addons/import_google/i18n/sv.po
+++ b/addons/import_google/i18n/sv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: import_google
 #: help:synchronize.google.import,group_name:0
diff --git a/addons/import_google/i18n/zh_CN.po b/addons/import_google/i18n/zh_CN.po
index 6f34d41ce74..be02def559b 100644
--- a/addons/import_google/i18n/zh_CN.po
+++ b/addons/import_google/i18n/zh_CN.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: import_google
 #: help:synchronize.google.import,group_name:0
diff --git a/addons/import_sugarcrm/__openerp__.py b/addons/import_sugarcrm/__openerp__.py
index f84b096e28a..343d0c663e7 100644
--- a/addons/import_sugarcrm/__openerp__.py
+++ b/addons/import_sugarcrm/__openerp__.py
@@ -24,15 +24,16 @@
     'version': '1.0',
     'category': 'Customer Relationship Management',
     'description': """
-This Module Import SugarCRM Leads, Opportunities, Users, Accounts, Contacts, Employees,
-Meetings, Phonecalls, Emails, Project and Project Tasks Data into OpenERP Module.""",
+This Module Import SugarCRM Leads, Opportunities, Users, Accounts, Contacts, Employees, Meetings, Phonecalls, Emails, Project and Project Tasks Data into OpenERP Module.
+=========================================================================================================================================================================
+""",
     'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
     'depends': ['import_base','crm', 'document'],
     'data': [
-        "wizard/import_message_view.xml",
-        "import_sugarcrm_view.xml",
-        "security/ir.model.access.csv",
+        'wizard/import_message_view.xml',
+        'import_sugarcrm_view.xml',
+        'security/ir.model.access.csv',
     ],
     'demo': [],
     'test': [],
diff --git a/addons/import_sugarcrm/i18n/ar.po b/addons/import_sugarcrm/i18n/ar.po
index bcff97a4acf..fdb674fb25f 100644
--- a/addons/import_sugarcrm/i18n/ar.po
+++ b/addons/import_sugarcrm/i18n/ar.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: import_sugarcrm
 #: code:addons/import_sugarcrm/import_sugarcrm.py:1105
diff --git a/addons/import_sugarcrm/i18n/de.po b/addons/import_sugarcrm/i18n/de.po
new file mode 100644
index 00000000000..e47dc95b8dd
--- /dev/null
+++ b/addons/import_sugarcrm/i18n/de.po
@@ -0,0 +1,429 @@
+# 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-02-08 00:36+0000\n"
+"PO-Revision-Date: 2012-08-29 07:36+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\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: 2012-08-30 05:12+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
+
+#. module: import_sugarcrm
+#: code:addons/import_sugarcrm/import_sugarcrm.py:1105
+#: code:addons/import_sugarcrm/import_sugarcrm.py:1131
+#, python-format
+msgid "Error !!"
+msgstr "Fehler!"
+
+#. module: import_sugarcrm
+#: view:import.sugarcrm:0
+msgid ""
+"Use the SugarSoap API URL (read tooltip) and a full access SugarCRM login."
+msgstr ""
+"Nutzen Sie die SugarSoap API URL (siehe Tooltip) und eine SugarCRM-Anmeldung "
+"mit Vollzugriff."
+
+#. module: import_sugarcrm
+#: view:import.sugarcrm:0
+msgid "(Coming Soon)"
+msgstr "(Bald erwartet)"
+
+#. module: import_sugarcrm
+#: field:import.sugarcrm,document:0
+msgid "Documents"
+msgstr "Dokumente"
+
+#. module: import_sugarcrm
+#: view:import.sugarcrm:0
+msgid "Import your data from SugarCRM :"
+msgstr "Importieren Sie Ihre Daten aus SugarCRM:"
+
+#. module: import_sugarcrm
+#: view:import.sugarcrm:0
+msgid ""
+"Choose data you want to import. Click 'Import' to get data manually or "
+"'Schedule Reccurent Imports' to get recurrently and automatically data."
+msgstr ""
+"Wählen Sie die zu importierenden Daten aus. Drücken Sie \"Import\", um Daten "
+"manuell zu holen oder \"Wiederkehrende Importe Terminieren\", um Daten "
+"automatisch und wiederholt einzuholen."
+
+#. module: import_sugarcrm
+#: field:import.sugarcrm,contact:0
+msgid "Contacts"
+msgstr "Kontakte"
+
+#. module: import_sugarcrm
+#: view:import.sugarcrm:0
+msgid "HR"
+msgstr ""
+
+#. module: import_sugarcrm
+#: help:import.sugarcrm,bug:0
+msgid "Check this box to import sugarCRM Bugs into OpenERP project issues"
+msgstr ""
+
+#. module: import_sugarcrm
+#: field:import.sugarcrm,instance_name:0
+msgid "Instance's Name"
+msgstr "Name der Instanz"
+
+#. module: import_sugarcrm
+#: field:import.sugarcrm,project_task:0
+msgid "Project Tasks"
+msgstr "Projekt Aufgaben"
+
+#. module: import_sugarcrm
+#: field:import.sugarcrm,email_from:0
+msgid "Notify End Of Import To:"
+msgstr "Über Abschluss des Imports zu informieren:"
+
+#. module: import_sugarcrm
+#: help:import.sugarcrm,user:0
+msgid ""
+"Check this box to import sugarCRM Users into OpenERP users, warning if a "
+"user with the same login exist in OpenERP, user information will be erase by "
+"sugarCRM user information"
+msgstr ""
+"Haken Sie dieses Feld an, um SugarCRM-Benutzer als OpenERP-Benutzer zu "
+"importieren. Hinweis: In OpenERP bestehende Benutzer gleichen Namens werden "
+"gelöscht und durch die SugarCRM-Information ersetzt."
+
+#. module: import_sugarcrm
+#: code:addons/import_sugarcrm/sugarsoap_services.py:23
+#, python-format
+msgid "Please install SOAP for python - ZSI-2.0-rc3.tar.gz - python-zci"
+msgstr ""
+"Installieren Sie bitte SOAP für Python - ZSI-2.0-rc3.tar.gz - python-zci"
+
+#. module: import_sugarcrm
+#: view:import.sugarcrm:0
+msgid "_Schedule Recurrent Imports"
+msgstr "_Terminierung wiederkehrender Importe"
+
+#. module: import_sugarcrm
+#: view:import.sugarcrm:0
+msgid ""
+"Do not forget the email address to be notified of the success of the import."
+msgstr ""
+"Vergessen Sie nicht die über den Erfolg des Imports zu banachrichtende EMail-"
+"Adresse."
+
+#. module: import_sugarcrm
+#: help:import.sugarcrm,call:0
+msgid "Check this box to import sugarCRM Calls into OpenERP calls"
+msgstr ""
+"Haken Sie dieses Feld an, um SugarCRM-Anrufe in OpenERP-Anrufe zu "
+"importieren."
+
+#. module: import_sugarcrm
+#: view:import.sugarcrm:0
+msgid ""
+"If you make recurrent or ponctual import, data already  in OpenERP will be "
+"updated by SugarCRM data."
+msgstr ""
+"Wenn Sie wiederkehrende oder vereinzelte Importe durchführen, werden bereits "
+"in OpenERP vorliegende Daten aktualsiert."
+
+#. module: import_sugarcrm
+#: field:import.sugarcrm,employee:0
+msgid "Employee"
+msgstr "Angstellter"
+
+#. module: import_sugarcrm
+#: view:import.sugarcrm:0
+msgid "Document"
+msgstr "Dokument"
+
+#. module: import_sugarcrm
+#: help:import.sugarcrm,document:0
+msgid "Check this box to import sugarCRM Documents into OpenERP documents"
+msgstr ""
+"Haken Sie dieses Feld an, um Dokumente aus SugarCRM in OpenERP zu importieren"
+
+#. module: import_sugarcrm
+#: view:import.sugarcrm:0
+msgid "Import Data From SugarCRM"
+msgstr "Daten von SugarCRM importieren"
+
+#. module: import_sugarcrm
+#: view:import.sugarcrm:0
+msgid "CRM"
+msgstr "Kundenbeziehungsverwaltung"
+
+#. module: import_sugarcrm
+#: view:import.message:0
+msgid ""
+"Data are importing, the process is running in the background, an email will "
+"be sent to the given email address if it was defined."
+msgstr ""
+"Daten werden importiert; der Prozess läuft im Hintergrund. Bei Abschluss "
+"wird eine Benachrichtigung per EMail verschickt, sofern diese angegeben "
+"wurde."
+
+#. module: import_sugarcrm
+#: field:import.sugarcrm,call:0
+msgid "Calls"
+msgstr "Anrufe"
+
+#. module: import_sugarcrm
+#: view:import.sugarcrm:0
+msgid "Multi Instance Management"
+msgstr "Verwaltung von mehrfachen Instanzen"
+
+#. module: import_sugarcrm
+#: view:import.message:0
+msgid "_Ok"
+msgstr "_OK"
+
+#. module: import_sugarcrm
+#: help:import.sugarcrm,opportunity:0
+msgid ""
+"Check this box to import sugarCRM Leads and Opportunities into OpenERP Leads "
+"and Opportunities"
+msgstr ""
+"Haken Sie dieses Feld an, um Leads aus SugarCRM nach OpenERP zu importieren."
+
+#. module: import_sugarcrm
+#: field:import.sugarcrm,email_history:0
+msgid "Email and Note"
+msgstr "Nachrichten und Notizen"
+
+#. module: import_sugarcrm
+#: help:import.sugarcrm,url:0
+msgid ""
+"Webservice's url where to get the data.                      example : "
+"'http://example.com/sugarcrm/soap.php', or copy the address of your sugarcrm "
+"application "
+"http://trial.sugarcrm.com/qbquyj4802/index.php?module=Home&action=index"
+msgstr ""
+"URL des Web-Dienstes bei dem Daten geholt werden sollen. Beispiel: "
+"\"http://example.com/sugarcrm/soap.php\", oder kopieren Sie die Adresse "
+"Ihrer SugarCRM-Anwendung (z. B. "
+"http://trial.sugarcrm.com/qbquyj4802/index.php?module=Home&action=index)"
+
+#. module: import_sugarcrm
+#: model:ir.actions.act_window,name:import_sugarcrm.action_import_sugarcrm
+#: model:ir.ui.menu,name:import_sugarcrm.menu_sugarcrm_import
+msgid "Import SugarCRM"
+msgstr "Aus SugarCRM importieren"
+
+#. module: import_sugarcrm
+#: view:import.sugarcrm:0
+msgid "_Import"
+msgstr "_Import"
+
+#. module: import_sugarcrm
+#: field:import.sugarcrm,user:0
+msgid "User"
+msgstr "Benutzer"
+
+#. module: import_sugarcrm
+#: code:addons/import_sugarcrm/import_sugarcrm.py:1105
+#: code:addons/import_sugarcrm/import_sugarcrm.py:1131
+#, python-format
+msgid "%s data required %s Module to be installed, Please install %s module"
+msgstr ""
+
+#. module: import_sugarcrm
+#: field:import.sugarcrm,claim:0
+msgid "Cases"
+msgstr "Vorgänge"
+
+#. module: import_sugarcrm
+#: help:import.sugarcrm,meeting:0
+msgid ""
+"Check this box to import sugarCRM Meetings and Tasks into OpenERP meetings"
+msgstr ""
+"Haken Sie dieses Feld an, um Termine von SugarCRM nach OpenERP zu importieren"
+
+#. module: import_sugarcrm
+#: help:import.sugarcrm,email_history:0
+msgid ""
+"Check this box to import sugarCRM Emails, Notes and Attachments into OpenERP "
+"Messages and Attachments"
+msgstr ""
+
+#. module: import_sugarcrm
+#: field:import.sugarcrm,project:0
+msgid "Projects"
+msgstr ""
+
+#. module: import_sugarcrm
+#: code:addons/import_sugarcrm/sugarsoap_services_types.py:14
+#, python-format
+msgid ""
+"Please install SOAP for python - ZSI-2.0-rc3.tar.gz from "
+"http://pypi.python.org/pypi/ZSI/"
+msgstr ""
+
+#. module: import_sugarcrm
+#: help:import.sugarcrm,project:0
+msgid "Check this box to import sugarCRM Projects into OpenERP projects"
+msgstr ""
+
+#. module: import_sugarcrm
+#: code:addons/import_sugarcrm/import_sugarcrm.py:1098
+#: code:addons/import_sugarcrm/import_sugarcrm.py:1124
+#, python-format
+msgid "Select Module to Import."
+msgstr ""
+
+#. module: import_sugarcrm
+#: field:import.sugarcrm,meeting:0
+msgid "Meetings"
+msgstr ""
+
+#. module: import_sugarcrm
+#: help:import.sugarcrm,employee:0
+msgid "Check this box to import sugarCRM Employees into OpenERP employees"
+msgstr ""
+
+#. module: import_sugarcrm
+#: field:import.sugarcrm,url:0
+msgid "SugarSoap Api url:"
+msgstr ""
+
+#. module: import_sugarcrm
+#: view:import.sugarcrm:0
+msgid "Address Book"
+msgstr ""
+
+#. module: import_sugarcrm
+#: code:addons/import_sugarcrm/sugar.py:60
+#, python-format
+msgid ""
+"Authentication error !\n"
+"Bad Username or Password bad SugarSoap Api url !"
+msgstr ""
+
+#. module: import_sugarcrm
+#: field:import.sugarcrm,bug:0
+msgid "Bugs"
+msgstr ""
+
+#. module: import_sugarcrm
+#: view:import.sugarcrm:0
+msgid "Project"
+msgstr ""
+
+#. module: import_sugarcrm
+#: help:import.sugarcrm,project_task:0
+msgid "Check this box to import sugarCRM Project Tasks into OpenERP tasks"
+msgstr ""
+
+#. module: import_sugarcrm
+#: field:import.sugarcrm,opportunity:0
+msgid "Leads & Opp"
+msgstr ""
+
+#. module: import_sugarcrm
+#: code:addons/import_sugarcrm/import_sugarcrm.py:79
+#, python-format
+msgid ""
+"Authentication error !\n"
+"Bad Username or Password or bad SugarSoap Api url !"
+msgstr ""
+
+#. module: import_sugarcrm
+#: code:addons/import_sugarcrm/import_sugarcrm.py:79
+#: code:addons/import_sugarcrm/sugar.py:60
+#, python-format
+msgid "Error !"
+msgstr ""
+
+#. module: import_sugarcrm
+#: code:addons/import_sugarcrm/import_sugarcrm.py:1098
+#: code:addons/import_sugarcrm/import_sugarcrm.py:1124
+#, python-format
+msgid "Warning !"
+msgstr ""
+
+#. module: import_sugarcrm
+#: help:import.sugarcrm,instance_name:0
+msgid ""
+"Prefix of SugarCRM id to differentiate xml_id of SugarCRM models datas come "
+"from different server."
+msgstr ""
+
+#. module: import_sugarcrm
+#: help:import.sugarcrm,contact:0
+msgid "Check this box to import sugarCRM Contacts into OpenERP addresses"
+msgstr ""
+
+#. module: import_sugarcrm
+#: field:import.sugarcrm,password:0
+msgid "Password"
+msgstr ""
+
+#. module: import_sugarcrm
+#: view:import.sugarcrm:0
+msgid "Login Information"
+msgstr ""
+
+#. module: import_sugarcrm
+#: help:import.sugarcrm,claim:0
+msgid "Check this box to import sugarCRM Cases into OpenERP claims"
+msgstr ""
+
+#. module: import_sugarcrm
+#: view:import.sugarcrm:0
+msgid "Email Notification When Import is Finished"
+msgstr ""
+
+#. module: import_sugarcrm
+#: field:import.sugarcrm,username:0
+msgid "User Name"
+msgstr ""
+
+#. module: import_sugarcrm
+#: view:import.message:0
+#: model:ir.model,name:import_sugarcrm.model_import_message
+msgid "Import Message"
+msgstr ""
+
+#. module: import_sugarcrm
+#: help:import.sugarcrm,account:0
+msgid "Check this box to import sugarCRM Accounts into OpenERP partners"
+msgstr ""
+
+#. module: import_sugarcrm
+#: view:import.sugarcrm:0
+msgid "Online documentation:"
+msgstr ""
+
+#. module: import_sugarcrm
+#: field:import.sugarcrm,account:0
+msgid "Accounts"
+msgstr ""
+
+#. module: import_sugarcrm
+#: view:import.sugarcrm:0
+msgid "_Cancel"
+msgstr ""
+
+#. module: import_sugarcrm
+#: code:addons/import_sugarcrm/sugarsoap_services.py:23
+#: code:addons/import_sugarcrm/sugarsoap_services_types.py:14
+#, python-format
+msgid "ZSI Import Error!"
+msgstr ""
+
+#. module: import_sugarcrm
+#: model:ir.model,name:import_sugarcrm.model_import_sugarcrm
+msgid "Import SugarCRM DATA"
+msgstr ""
+
+#. module: import_sugarcrm
+#: view:import.sugarcrm:0
+msgid "Email Address to Notify"
+msgstr ""
diff --git a/addons/import_sugarcrm/i18n/es_CR.po b/addons/import_sugarcrm/i18n/es_CR.po
index 8874446fcf9..5a76faf0952 100644
--- a/addons/import_sugarcrm/i18n/es_CR.po
+++ b/addons/import_sugarcrm/i18n/es_CR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: import_sugarcrm
 #: code:addons/import_sugarcrm/import_sugarcrm.py:1105
diff --git a/addons/import_sugarcrm/i18n/fr.po b/addons/import_sugarcrm/i18n/fr.po
index c8f7f9daf21..64673de4bc6 100644
--- a/addons/import_sugarcrm/i18n/fr.po
+++ b/addons/import_sugarcrm/i18n/fr.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-05-24 17:37+0000\n"
-"Last-Translator: Numérigraphe <Unknown>\n"
+"PO-Revision-Date: 2012-09-03 22:20+0000\n"
+"Last-Translator: Nicolas JEUDY <njeudy@simplee.fr>\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: 2012-08-09 05:00+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-09-04 04:52+0000\n"
+"X-Generator: Launchpad (build 15890)\n"
 
 #. module: import_sugarcrm
 #: code:addons/import_sugarcrm/import_sugarcrm.py:1105
@@ -38,7 +38,7 @@ msgstr "(Prochainement)"
 #. module: import_sugarcrm
 #: field:import.sugarcrm,document:0
 msgid "Documents"
-msgstr ""
+msgstr "Documents"
 
 #. module: import_sugarcrm
 #: view:import.sugarcrm:0
@@ -58,7 +58,7 @@ msgstr ""
 #. module: import_sugarcrm
 #: field:import.sugarcrm,contact:0
 msgid "Contacts"
-msgstr ""
+msgstr "Contacts"
 
 #. module: import_sugarcrm
 #: view:import.sugarcrm:0
@@ -79,7 +79,7 @@ msgstr "Nom de l'instance"
 #. module: import_sugarcrm
 #: field:import.sugarcrm,project_task:0
 msgid "Project Tasks"
-msgstr ""
+msgstr "Tâches du projet"
 
 #. module: import_sugarcrm
 #: field:import.sugarcrm,email_from:0
@@ -134,27 +134,27 @@ msgstr ""
 #. module: import_sugarcrm
 #: field:import.sugarcrm,employee:0
 msgid "Employee"
-msgstr ""
+msgstr "Employé"
 
 #. module: import_sugarcrm
 #: view:import.sugarcrm:0
 msgid "Document"
-msgstr ""
+msgstr "Document"
 
 #. module: import_sugarcrm
 #: help:import.sugarcrm,document:0
 msgid "Check this box to import sugarCRM Documents into OpenERP documents"
-msgstr ""
+msgstr "Cochez cette case  pour importer les documents SugarCRM dans OpenERP"
 
 #. module: import_sugarcrm
 #: view:import.sugarcrm:0
 msgid "Import Data From SugarCRM"
-msgstr ""
+msgstr "Importee les données de SugarCRM"
 
 #. module: import_sugarcrm
 #: view:import.sugarcrm:0
 msgid "CRM"
-msgstr ""
+msgstr "CRM"
 
 #. module: import_sugarcrm
 #: view:import.message:0
@@ -166,7 +166,7 @@ msgstr ""
 #. module: import_sugarcrm
 #: field:import.sugarcrm,call:0
 msgid "Calls"
-msgstr ""
+msgstr "Appels"
 
 #. module: import_sugarcrm
 #: view:import.sugarcrm:0
@@ -176,7 +176,7 @@ msgstr ""
 #. module: import_sugarcrm
 #: view:import.message:0
 msgid "_Ok"
-msgstr ""
+msgstr "_Valider"
 
 #. module: import_sugarcrm
 #: help:import.sugarcrm,opportunity:0
@@ -184,11 +184,13 @@ msgid ""
 "Check this box to import sugarCRM Leads and Opportunities into OpenERP Leads "
 "and Opportunities"
 msgstr ""
+"Cochez cette case pour importer les Pistes et les Opportunités SugarCRM dans "
+"OpenERP."
 
 #. module: import_sugarcrm
 #: field:import.sugarcrm,email_history:0
 msgid "Email and Note"
-msgstr ""
+msgstr "Email et note"
 
 #. module: import_sugarcrm
 #: help:import.sugarcrm,url:0
@@ -208,12 +210,12 @@ msgstr ""
 #. module: import_sugarcrm
 #: view:import.sugarcrm:0
 msgid "_Import"
-msgstr ""
+msgstr "_Importer"
 
 #. module: import_sugarcrm
 #: field:import.sugarcrm,user:0
 msgid "User"
-msgstr ""
+msgstr "Utilisateur"
 
 #. module: import_sugarcrm
 #: code:addons/import_sugarcrm/import_sugarcrm.py:1105
diff --git a/addons/import_sugarcrm/i18n/ja.po b/addons/import_sugarcrm/i18n/ja.po
index c5327631b27..af59b6a1108 100644
--- a/addons/import_sugarcrm/i18n/ja.po
+++ b/addons/import_sugarcrm/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: import_sugarcrm
 #: code:addons/import_sugarcrm/import_sugarcrm.py:1105
diff --git a/addons/import_sugarcrm/i18n/nl.po b/addons/import_sugarcrm/i18n/nl.po
index 5a14a04fa8b..7b5fa7c288b 100644
--- a/addons/import_sugarcrm/i18n/nl.po
+++ b/addons/import_sugarcrm/i18n/nl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: import_sugarcrm
 #: code:addons/import_sugarcrm/import_sugarcrm.py:1105
diff --git a/addons/import_sugarcrm/i18n/pt.po b/addons/import_sugarcrm/i18n/pt.po
index d70749d0fdd..3c66d9fc1bc 100644
--- a/addons/import_sugarcrm/i18n/pt.po
+++ b/addons/import_sugarcrm/i18n/pt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: import_sugarcrm
 #: code:addons/import_sugarcrm/import_sugarcrm.py:1105
diff --git a/addons/import_sugarcrm/i18n/ro.po b/addons/import_sugarcrm/i18n/ro.po
index a10afa8670d..2a055137624 100644
--- a/addons/import_sugarcrm/i18n/ro.po
+++ b/addons/import_sugarcrm/i18n/ro.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: import_sugarcrm
 #: code:addons/import_sugarcrm/import_sugarcrm.py:1105
diff --git a/addons/import_sugarcrm/i18n/zh_CN.po b/addons/import_sugarcrm/i18n/zh_CN.po
new file mode 100644
index 00000000000..595ec438a8c
--- /dev/null
+++ b/addons/import_sugarcrm/i18n/zh_CN.po
@@ -0,0 +1,404 @@
+# 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-02-08 00:36+0000\n"
+"PO-Revision-Date: 2012-08-18 17:37+0000\n"
+"Last-Translator: Heling Yao <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: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
+
+#. module: import_sugarcrm
+#: code:addons/import_sugarcrm/import_sugarcrm.py:1105
+#: code:addons/import_sugarcrm/import_sugarcrm.py:1131
+#, python-format
+msgid "Error !!"
+msgstr ""
+
+#. module: import_sugarcrm
+#: view:import.sugarcrm:0
+msgid ""
+"Use the SugarSoap API URL (read tooltip) and a full access SugarCRM login."
+msgstr ""
+
+#. module: import_sugarcrm
+#: view:import.sugarcrm:0
+msgid "(Coming Soon)"
+msgstr ""
+
+#. module: import_sugarcrm
+#: field:import.sugarcrm,document:0
+msgid "Documents"
+msgstr ""
+
+#. module: import_sugarcrm
+#: view:import.sugarcrm:0
+msgid "Import your data from SugarCRM :"
+msgstr "从 SugarCRM 导入您的数据："
+
+#. module: import_sugarcrm
+#: view:import.sugarcrm:0
+msgid ""
+"Choose data you want to import. Click 'Import' to get data manually or "
+"'Schedule Reccurent Imports' to get recurrently and automatically data."
+msgstr ""
+
+#. module: import_sugarcrm
+#: field:import.sugarcrm,contact:0
+msgid "Contacts"
+msgstr ""
+
+#. module: import_sugarcrm
+#: view:import.sugarcrm:0
+msgid "HR"
+msgstr ""
+
+#. module: import_sugarcrm
+#: help:import.sugarcrm,bug:0
+msgid "Check this box to import sugarCRM Bugs into OpenERP project issues"
+msgstr ""
+
+#. module: import_sugarcrm
+#: field:import.sugarcrm,instance_name:0
+msgid "Instance's Name"
+msgstr ""
+
+#. module: import_sugarcrm
+#: field:import.sugarcrm,project_task:0
+msgid "Project Tasks"
+msgstr ""
+
+#. module: import_sugarcrm
+#: field:import.sugarcrm,email_from:0
+msgid "Notify End Of Import To:"
+msgstr ""
+
+#. module: import_sugarcrm
+#: help:import.sugarcrm,user:0
+msgid ""
+"Check this box to import sugarCRM Users into OpenERP users, warning if a "
+"user with the same login exist in OpenERP, user information will be erase by "
+"sugarCRM user information"
+msgstr ""
+
+#. module: import_sugarcrm
+#: code:addons/import_sugarcrm/sugarsoap_services.py:23
+#, python-format
+msgid "Please install SOAP for python - ZSI-2.0-rc3.tar.gz - python-zci"
+msgstr ""
+
+#. module: import_sugarcrm
+#: view:import.sugarcrm:0
+msgid "_Schedule Recurrent Imports"
+msgstr ""
+
+#. module: import_sugarcrm
+#: view:import.sugarcrm:0
+msgid ""
+"Do not forget the email address to be notified of the success of the import."
+msgstr ""
+
+#. module: import_sugarcrm
+#: help:import.sugarcrm,call:0
+msgid "Check this box to import sugarCRM Calls into OpenERP calls"
+msgstr ""
+
+#. module: import_sugarcrm
+#: view:import.sugarcrm:0
+msgid ""
+"If you make recurrent or ponctual import, data already  in OpenERP will be "
+"updated by SugarCRM data."
+msgstr ""
+
+#. module: import_sugarcrm
+#: field:import.sugarcrm,employee:0
+msgid "Employee"
+msgstr ""
+
+#. module: import_sugarcrm
+#: view:import.sugarcrm:0
+msgid "Document"
+msgstr ""
+
+#. module: import_sugarcrm
+#: help:import.sugarcrm,document:0
+msgid "Check this box to import sugarCRM Documents into OpenERP documents"
+msgstr ""
+
+#. module: import_sugarcrm
+#: view:import.sugarcrm:0
+msgid "Import Data From SugarCRM"
+msgstr ""
+
+#. module: import_sugarcrm
+#: view:import.sugarcrm:0
+msgid "CRM"
+msgstr ""
+
+#. module: import_sugarcrm
+#: view:import.message:0
+msgid ""
+"Data are importing, the process is running in the background, an email will "
+"be sent to the given email address if it was defined."
+msgstr ""
+
+#. module: import_sugarcrm
+#: field:import.sugarcrm,call:0
+msgid "Calls"
+msgstr ""
+
+#. module: import_sugarcrm
+#: view:import.sugarcrm:0
+msgid "Multi Instance Management"
+msgstr ""
+
+#. module: import_sugarcrm
+#: view:import.message:0
+msgid "_Ok"
+msgstr ""
+
+#. module: import_sugarcrm
+#: help:import.sugarcrm,opportunity:0
+msgid ""
+"Check this box to import sugarCRM Leads and Opportunities into OpenERP Leads "
+"and Opportunities"
+msgstr ""
+
+#. module: import_sugarcrm
+#: field:import.sugarcrm,email_history:0
+msgid "Email and Note"
+msgstr ""
+
+#. module: import_sugarcrm
+#: help:import.sugarcrm,url:0
+msgid ""
+"Webservice's url where to get the data.                      example : "
+"'http://example.com/sugarcrm/soap.php', or copy the address of your sugarcrm "
+"application "
+"http://trial.sugarcrm.com/qbquyj4802/index.php?module=Home&action=index"
+msgstr ""
+
+#. module: import_sugarcrm
+#: model:ir.actions.act_window,name:import_sugarcrm.action_import_sugarcrm
+#: model:ir.ui.menu,name:import_sugarcrm.menu_sugarcrm_import
+msgid "Import SugarCRM"
+msgstr ""
+
+#. module: import_sugarcrm
+#: view:import.sugarcrm:0
+msgid "_Import"
+msgstr ""
+
+#. module: import_sugarcrm
+#: field:import.sugarcrm,user:0
+msgid "User"
+msgstr ""
+
+#. module: import_sugarcrm
+#: code:addons/import_sugarcrm/import_sugarcrm.py:1105
+#: code:addons/import_sugarcrm/import_sugarcrm.py:1131
+#, python-format
+msgid "%s data required %s Module to be installed, Please install %s module"
+msgstr ""
+
+#. module: import_sugarcrm
+#: field:import.sugarcrm,claim:0
+msgid "Cases"
+msgstr ""
+
+#. module: import_sugarcrm
+#: help:import.sugarcrm,meeting:0
+msgid ""
+"Check this box to import sugarCRM Meetings and Tasks into OpenERP meetings"
+msgstr ""
+
+#. module: import_sugarcrm
+#: help:import.sugarcrm,email_history:0
+msgid ""
+"Check this box to import sugarCRM Emails, Notes and Attachments into OpenERP "
+"Messages and Attachments"
+msgstr ""
+
+#. module: import_sugarcrm
+#: field:import.sugarcrm,project:0
+msgid "Projects"
+msgstr ""
+
+#. module: import_sugarcrm
+#: code:addons/import_sugarcrm/sugarsoap_services_types.py:14
+#, python-format
+msgid ""
+"Please install SOAP for python - ZSI-2.0-rc3.tar.gz from "
+"http://pypi.python.org/pypi/ZSI/"
+msgstr ""
+
+#. module: import_sugarcrm
+#: help:import.sugarcrm,project:0
+msgid "Check this box to import sugarCRM Projects into OpenERP projects"
+msgstr ""
+
+#. module: import_sugarcrm
+#: code:addons/import_sugarcrm/import_sugarcrm.py:1098
+#: code:addons/import_sugarcrm/import_sugarcrm.py:1124
+#, python-format
+msgid "Select Module to Import."
+msgstr ""
+
+#. module: import_sugarcrm
+#: field:import.sugarcrm,meeting:0
+msgid "Meetings"
+msgstr ""
+
+#. module: import_sugarcrm
+#: help:import.sugarcrm,employee:0
+msgid "Check this box to import sugarCRM Employees into OpenERP employees"
+msgstr ""
+
+#. module: import_sugarcrm
+#: field:import.sugarcrm,url:0
+msgid "SugarSoap Api url:"
+msgstr ""
+
+#. module: import_sugarcrm
+#: view:import.sugarcrm:0
+msgid "Address Book"
+msgstr ""
+
+#. module: import_sugarcrm
+#: code:addons/import_sugarcrm/sugar.py:60
+#, python-format
+msgid ""
+"Authentication error !\n"
+"Bad Username or Password bad SugarSoap Api url !"
+msgstr ""
+
+#. module: import_sugarcrm
+#: field:import.sugarcrm,bug:0
+msgid "Bugs"
+msgstr ""
+
+#. module: import_sugarcrm
+#: view:import.sugarcrm:0
+msgid "Project"
+msgstr ""
+
+#. module: import_sugarcrm
+#: help:import.sugarcrm,project_task:0
+msgid "Check this box to import sugarCRM Project Tasks into OpenERP tasks"
+msgstr ""
+
+#. module: import_sugarcrm
+#: field:import.sugarcrm,opportunity:0
+msgid "Leads & Opp"
+msgstr ""
+
+#. module: import_sugarcrm
+#: code:addons/import_sugarcrm/import_sugarcrm.py:79
+#, python-format
+msgid ""
+"Authentication error !\n"
+"Bad Username or Password or bad SugarSoap Api url !"
+msgstr ""
+
+#. module: import_sugarcrm
+#: code:addons/import_sugarcrm/import_sugarcrm.py:79
+#: code:addons/import_sugarcrm/sugar.py:60
+#, python-format
+msgid "Error !"
+msgstr ""
+
+#. module: import_sugarcrm
+#: code:addons/import_sugarcrm/import_sugarcrm.py:1098
+#: code:addons/import_sugarcrm/import_sugarcrm.py:1124
+#, python-format
+msgid "Warning !"
+msgstr ""
+
+#. module: import_sugarcrm
+#: help:import.sugarcrm,instance_name:0
+msgid ""
+"Prefix of SugarCRM id to differentiate xml_id of SugarCRM models datas come "
+"from different server."
+msgstr ""
+
+#. module: import_sugarcrm
+#: help:import.sugarcrm,contact:0
+msgid "Check this box to import sugarCRM Contacts into OpenERP addresses"
+msgstr ""
+
+#. module: import_sugarcrm
+#: field:import.sugarcrm,password:0
+msgid "Password"
+msgstr ""
+
+#. module: import_sugarcrm
+#: view:import.sugarcrm:0
+msgid "Login Information"
+msgstr ""
+
+#. module: import_sugarcrm
+#: help:import.sugarcrm,claim:0
+msgid "Check this box to import sugarCRM Cases into OpenERP claims"
+msgstr ""
+
+#. module: import_sugarcrm
+#: view:import.sugarcrm:0
+msgid "Email Notification When Import is Finished"
+msgstr ""
+
+#. module: import_sugarcrm
+#: field:import.sugarcrm,username:0
+msgid "User Name"
+msgstr ""
+
+#. module: import_sugarcrm
+#: view:import.message:0
+#: model:ir.model,name:import_sugarcrm.model_import_message
+msgid "Import Message"
+msgstr ""
+
+#. module: import_sugarcrm
+#: help:import.sugarcrm,account:0
+msgid "Check this box to import sugarCRM Accounts into OpenERP partners"
+msgstr ""
+
+#. module: import_sugarcrm
+#: view:import.sugarcrm:0
+msgid "Online documentation:"
+msgstr ""
+
+#. module: import_sugarcrm
+#: field:import.sugarcrm,account:0
+msgid "Accounts"
+msgstr ""
+
+#. module: import_sugarcrm
+#: view:import.sugarcrm:0
+msgid "_Cancel"
+msgstr ""
+
+#. module: import_sugarcrm
+#: code:addons/import_sugarcrm/sugarsoap_services.py:23
+#: code:addons/import_sugarcrm/sugarsoap_services_types.py:14
+#, python-format
+msgid "ZSI Import Error!"
+msgstr ""
+
+#. module: import_sugarcrm
+#: model:ir.model,name:import_sugarcrm.model_import_sugarcrm
+msgid "Import SugarCRM DATA"
+msgstr ""
+
+#. module: import_sugarcrm
+#: view:import.sugarcrm:0
+msgid "Email Address to Notify"
+msgstr ""
diff --git a/addons/import_sugarcrm/import_sugarcrm.py b/addons/import_sugarcrm/import_sugarcrm.py
index 440a7b2b6f6..1646fb7ff2a 100644
--- a/addons/import_sugarcrm/import_sugarcrm.py
+++ b/addons/import_sugarcrm/import_sugarcrm.py
@@ -226,7 +226,7 @@ class sugar_import(import_framework):
                         'model': 'model',
                         'partner_id/.id': 'partner_id/.id',                         
                         'user_id/id': ref(self.TABLE_USER, 'assigned_user_id'),
-                        'body_text': 'description',
+                        'body': 'description',
                         'body_html' : 'description_html',
                         
                 }
diff --git a/addons/knowledge/__openerp__.py b/addons/knowledge/__openerp__.py
index f6b042f364b..14b2d045d6c 100644
--- a/addons/knowledge/__openerp__.py
+++ b/addons/knowledge/__openerp__.py
@@ -21,12 +21,12 @@
 
 
 {
-    "name" : "Knowledge Management System",
-    "version" : "1.0",
-    "depends" : ["base","base_setup"],
-    "author" : "OpenERP SA",
+    'name' : 'Knowledge Management System',
+    'version' : '1.0',
+    'depends' : ['base','base_setup'],
+    'author' : 'OpenERP SA',
     'category': 'Hidden/Dependency',
-    "description": """
+    'description': """
 Installer for knowledge-based Hidden.
 =====================================
 
@@ -34,14 +34,13 @@ Makes the Knowledge Application Configuration available from where you can insta
 document and Wiki based Hidden.
     """,
     'website': 'http://www.openerp.com',
-    'init_xml': [],
-    'update_xml': [
+    'data': [
         'security/knowledge_security.xml',
         'security/ir.model.access.csv',
         'knowledge_view.xml',
         'res_config_view.xml',
     ],
-    'demo_xml': ['knowledge_demo.xml'],
+    'demo': ['knowledge_demo.xml'],
     'installable': True,
     'auto_install': False,
     'certificate' : '001278773815843749581',
diff --git a/addons/knowledge/i18n/ar.po b/addons/knowledge/i18n/ar.po
index 98ca036c616..e60a405ceb7 100644
--- a/addons/knowledge/i18n/ar.po
+++ b/addons/knowledge/i18n/ar.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:36+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document2
diff --git a/addons/knowledge/i18n/bg.po b/addons/knowledge/i18n/bg.po
index 1baad7ea77e..9c069e4b4e3 100644
--- a/addons/knowledge/i18n/bg.po
+++ b/addons/knowledge/i18n/bg.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:36+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document2
diff --git a/addons/knowledge/i18n/ca.po b/addons/knowledge/i18n/ca.po
index f5a73abe934..a9d6f6bfd57 100644
--- a/addons/knowledge/i18n/ca.po
+++ b/addons/knowledge/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:36+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document2
diff --git a/addons/knowledge/i18n/cs.po b/addons/knowledge/i18n/cs.po
index 2918863fae3..31ddb21e419 100644
--- a/addons/knowledge/i18n/cs.po
+++ b/addons/knowledge/i18n/cs.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:36+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 "X-Poedit-Language: Czech\n"
 
 #. module: knowledge
diff --git a/addons/knowledge/i18n/da.po b/addons/knowledge/i18n/da.po
index eb1d7785457..577f7387ea5 100644
--- a/addons/knowledge/i18n/da.po
+++ b/addons/knowledge/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:36+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document2
diff --git a/addons/knowledge/i18n/de.po b/addons/knowledge/i18n/de.po
index 5883cdc7d8f..30330c952bf 100644
--- a/addons/knowledge/i18n/de.po
+++ b/addons/knowledge/i18n/de.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:36+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document2
diff --git a/addons/knowledge/i18n/en_GB.po b/addons/knowledge/i18n/en_GB.po
index 9f888c23345..3bc1e961783 100644
--- a/addons/knowledge/i18n/en_GB.po
+++ b/addons/knowledge/i18n/en_GB.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:36+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document2
diff --git a/addons/knowledge/i18n/es.po b/addons/knowledge/i18n/es.po
index a0f94867f64..ea1081d7948 100644
--- a/addons/knowledge/i18n/es.po
+++ b/addons/knowledge/i18n/es.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:36+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document2
diff --git a/addons/knowledge/i18n/es_AR.po b/addons/knowledge/i18n/es_AR.po
index 55c5df202c0..cbba70425ff 100644
--- a/addons/knowledge/i18n/es_AR.po
+++ b/addons/knowledge/i18n/es_AR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:36+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document2
diff --git a/addons/knowledge/i18n/es_CR.po b/addons/knowledge/i18n/es_CR.po
index 5f7c0927052..7d8b03ee297 100644
--- a/addons/knowledge/i18n/es_CR.po
+++ b/addons/knowledge/i18n/es_CR.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:36+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 "Language: es\n"
 
 #. module: knowledge
diff --git a/addons/knowledge/i18n/et.po b/addons/knowledge/i18n/et.po
index c3584f1a23c..eb6f1e7708c 100644
--- a/addons/knowledge/i18n/et.po
+++ b/addons/knowledge/i18n/et.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:36+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document2
diff --git a/addons/knowledge/i18n/fi.po b/addons/knowledge/i18n/fi.po
index f5e677461a1..6ea7f48a2c6 100644
--- a/addons/knowledge/i18n/fi.po
+++ b/addons/knowledge/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:36+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document2
diff --git a/addons/knowledge/i18n/fr.po b/addons/knowledge/i18n/fr.po
index b5189ba7117..57e5325a7a5 100644
--- a/addons/knowledge/i18n/fr.po
+++ b/addons/knowledge/i18n/fr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:36+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document2
diff --git a/addons/knowledge/i18n/gl.po b/addons/knowledge/i18n/gl.po
index dc24ea903f2..67c5eb2b6bc 100644
--- a/addons/knowledge/i18n/gl.po
+++ b/addons/knowledge/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:36+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document2
diff --git a/addons/knowledge/i18n/hi.po b/addons/knowledge/i18n/hi.po
index bbb6539b2df..3b797eba8a7 100644
--- a/addons/knowledge/i18n/hi.po
+++ b/addons/knowledge/i18n/hi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:36+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document2
diff --git a/addons/knowledge/i18n/hr.po b/addons/knowledge/i18n/hr.po
index 1d3474b1dc5..16f95ab5247 100644
--- a/addons/knowledge/i18n/hr.po
+++ b/addons/knowledge/i18n/hr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:36+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document2
diff --git a/addons/knowledge/i18n/hu.po b/addons/knowledge/i18n/hu.po
index 8330d694443..a9f97ede16c 100644
--- a/addons/knowledge/i18n/hu.po
+++ b/addons/knowledge/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:36+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document2
diff --git a/addons/knowledge/i18n/it.po b/addons/knowledge/i18n/it.po
index 534732a8335..58820b5f48c 100644
--- a/addons/knowledge/i18n/it.po
+++ b/addons/knowledge/i18n/it.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:36+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document2
diff --git a/addons/knowledge/i18n/ja.po b/addons/knowledge/i18n/ja.po
index 4621d95f718..ec148709fc8 100644
--- a/addons/knowledge/i18n/ja.po
+++ b/addons/knowledge/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:36+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document2
diff --git a/addons/knowledge/i18n/lo.po b/addons/knowledge/i18n/lo.po
index 5dabe96bfa5..2a7fdf5e514 100644
--- a/addons/knowledge/i18n/lo.po
+++ b/addons/knowledge/i18n/lo.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:36+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document2
diff --git a/addons/knowledge/i18n/lv.po b/addons/knowledge/i18n/lv.po
index 1f3f40378e6..e25a2f07d19 100644
--- a/addons/knowledge/i18n/lv.po
+++ b/addons/knowledge/i18n/lv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:36+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document2
diff --git a/addons/knowledge/i18n/mn.po b/addons/knowledge/i18n/mn.po
index 3c83287a7ea..fe87d858f0e 100644
--- a/addons/knowledge/i18n/mn.po
+++ b/addons/knowledge/i18n/mn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:36+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document2
diff --git a/addons/knowledge/i18n/nb.po b/addons/knowledge/i18n/nb.po
index 65487e82e1a..e58ade2873e 100644
--- a/addons/knowledge/i18n/nb.po
+++ b/addons/knowledge/i18n/nb.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:36+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document2
diff --git a/addons/knowledge/i18n/nl.po b/addons/knowledge/i18n/nl.po
index cc82bb59dba..ac0c464ef69 100644
--- a/addons/knowledge/i18n/nl.po
+++ b/addons/knowledge/i18n/nl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:36+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document2
diff --git a/addons/knowledge/i18n/pl.po b/addons/knowledge/i18n/pl.po
index de89dfffd15..65122eb9dd5 100644
--- a/addons/knowledge/i18n/pl.po
+++ b/addons/knowledge/i18n/pl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:36+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document2
diff --git a/addons/knowledge/i18n/pt.po b/addons/knowledge/i18n/pt.po
index 4eac22b22db..ca6fab43940 100644
--- a/addons/knowledge/i18n/pt.po
+++ b/addons/knowledge/i18n/pt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:36+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document2
diff --git a/addons/knowledge/i18n/pt_BR.po b/addons/knowledge/i18n/pt_BR.po
index 44aa7a9b8c5..a062cd24134 100644
--- a/addons/knowledge/i18n/pt_BR.po
+++ b/addons/knowledge/i18n/pt_BR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:36+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document2
diff --git a/addons/knowledge/i18n/ro.po b/addons/knowledge/i18n/ro.po
index b386102b4b2..6d468a85948 100644
--- a/addons/knowledge/i18n/ro.po
+++ b/addons/knowledge/i18n/ro.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:36+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document2
diff --git a/addons/knowledge/i18n/ru.po b/addons/knowledge/i18n/ru.po
index 41e3d0b49d0..a224a817026 100644
--- a/addons/knowledge/i18n/ru.po
+++ b/addons/knowledge/i18n/ru.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:36+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document2
diff --git a/addons/knowledge/i18n/sk.po b/addons/knowledge/i18n/sk.po
index 1e647b2c8a5..6657f00ddca 100644
--- a/addons/knowledge/i18n/sk.po
+++ b/addons/knowledge/i18n/sk.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:36+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document2
diff --git a/addons/knowledge/i18n/sr.po b/addons/knowledge/i18n/sr.po
index 5e02d1d0301..d0e5886ae67 100644
--- a/addons/knowledge/i18n/sr.po
+++ b/addons/knowledge/i18n/sr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:36+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document2
diff --git a/addons/knowledge/i18n/sr@latin.po b/addons/knowledge/i18n/sr@latin.po
index 78c0ae12f4d..f00358867d4 100644
--- a/addons/knowledge/i18n/sr@latin.po
+++ b/addons/knowledge/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:36+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document2
diff --git a/addons/knowledge/i18n/sv.po b/addons/knowledge/i18n/sv.po
index 4783eab3d85..25d1b588f1a 100644
--- a/addons/knowledge/i18n/sv.po
+++ b/addons/knowledge/i18n/sv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:36+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document2
diff --git a/addons/knowledge/i18n/tr.po b/addons/knowledge/i18n/tr.po
index f1e1c2c920f..ee4e9bb68ea 100644
--- a/addons/knowledge/i18n/tr.po
+++ b/addons/knowledge/i18n/tr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:36+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document2
diff --git a/addons/knowledge/i18n/zh_CN.po b/addons/knowledge/i18n/zh_CN.po
index d6703a38dbf..9db0d906349 100644
--- a/addons/knowledge/i18n/zh_CN.po
+++ b/addons/knowledge/i18n/zh_CN.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:36+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document2
diff --git a/addons/knowledge/i18n/zh_TW.po b/addons/knowledge/i18n/zh_TW.po
new file mode 100644
index 00000000000..564cd38f2f3
--- /dev/null
+++ b/addons/knowledge/i18n/zh_TW.po
@@ -0,0 +1,33 @@
+# Chinese (Traditional) 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-02-08 01:37+0100\n"
+"PO-Revision-Date: 2012-08-19 10:38+0000\n"
+"Last-Translator: Eric Huang <eh@cenoq.com>\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: 2012-08-28 06:36+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
+
+#. module: knowledge
+#: model:ir.ui.menu,name:knowledge.menu_document2
+msgid "Collaborative Content"
+msgstr "協作內容"
+
+#. module: knowledge
+#: model:ir.ui.menu,name:knowledge.menu_document_configuration
+msgid "Configuration"
+msgstr "設置"
+
+#. module: knowledge
+#: model:ir.ui.menu,name:knowledge.menu_document
+msgid "Knowledge"
+msgstr "知識"
diff --git a/addons/l10n_ar/__openerp__.py b/addons/l10n_ar/__openerp__.py
index ef04805d1b0..2546e1f6bb4 100644
--- a/addons/l10n_ar/__openerp__.py
+++ b/addons/l10n_ar/__openerp__.py
@@ -17,34 +17,30 @@
 #    You should have received a copy of the GNU Affero General Public License
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
-##############################################################################
+##############################################################################
 {
-    "name": "Argentina Localization Chart Account",
-    "version": "1.0",
-    "description": """
+    'name': 'Argentina Localization Chart Account',
+    'version': '1.0',
+    'description': """
 Argentinian accounting chart and tax localization.
+==================================================
 
 Plan contable argentino e impuestos de acuerdo a disposiciones vigentes
 
     """,
-    "author": ["Cubic ERP"],
-    "website": "http://cubicERP.com",
-    "category": "Localization/Account Charts",
-    "depends": [
-			"account_chart",
-			],
-	"data":[
-        "account_tax_code.xml",
-        "l10n_ar_chart.xml",
-        "account_tax.xml",
-        "l10n_ar_wizard.xml",			
-			],
-    "demo_xml": [
-			],
-    "update_xml": [
-			],
-    "active": False,
-    "installable": True,
+    'author': ['Cubic ERP'],
+    'website': 'http://cubicERP.com',
+    'category': 'Localization/Account Charts',
+    'depends': ['account_chart'],
+    'data':[
+        'account_tax_code.xml',
+        'l10n_ar_chart.xml',
+        'account_tax.xml',
+        'l10n_ar_wizard.xml',
+    ],
+    'demo': [],
+    'active': False,
+    'installable': True,
     'images': ['images/config_chart_l10n_ar.jpeg','images/l10n_ar_chart.jpeg'],
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/l10n_at/__openerp__.py b/addons/l10n_at/__openerp__.py
index fc266e40d51..e9fdd4bf8fd 100644
--- a/addons/l10n_at/__openerp__.py
+++ b/addons/l10n_at/__openerp__.py
@@ -20,20 +20,21 @@
 ##############################################################################
 
 {
-    "name" : "Austria - Accounting",
-    "version" : "1.0",
-    "author" : "conexus.at",
-    "website" : "http://www.conexus.at",
-    "category" : "Localization/Account Charts",
-    "depends" : ["account_chart", 'base_vat'],
-    "description": """
-This module provides the standard Accounting Chart for Austria which is based on
-the Template from BMF.gv.at. Please keep in mind that you should review and adapt
-it with your Accountant, before using it in a live Environment.""",
-    "demo_xml" : [],
-    "update_xml" : ['account_tax_code.xml',"account_chart.xml",'account_tax.xml',"l10n_chart_at_wizard.xml"],
-    "auto_install": False,
-    "installable": True
+    'name': 'Austria - Accounting',
+    'version': '1.0',
+    'author': 'conexus.at',
+    'website': 'http://www.conexus.at',
+    'category': 'Localization/Account Charts',
+    'depends': ['account_chart', 'base_vat'],
+    'description': """
+This module provides the standard Accounting Chart for Austria which is based on the Template from BMF.gv.at.
+============================================================================================================= 
+Please keep in mind that you should review and adapt it with your Accountant, before using it in a live Environment.
+""",
+    'demo': [],
+    'data': ['account_tax_code.xml','account_chart.xml','account_tax.xml','l10n_chart_at_wizard.xml'],
+    'auto_install': False,
+    'installable': True
 }
 
 
diff --git a/addons/l10n_be/__openerp__.py b/addons/l10n_be/__openerp__.py
index 1f4bcfe6284..4d301bfafe4 100644
--- a/addons/l10n_be/__openerp__.py
+++ b/addons/l10n_be/__openerp__.py
@@ -18,7 +18,8 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
-{   'name': 'Belgium - Accounting',
+{   
+    'name': 'Belgium - Accounting',
     'version': '1.1',
     'category': 'Localization/Account Charts',
     'description': """
@@ -34,16 +35,20 @@ After installing this module, the Configuration wizard for accounting is launche
 Thus, the pure copy of Chart Template is generated.
 
 Wizards provided by this module:
+--------------------------------
     * Partner VAT Intra: Enlist the partners with their related VAT and invoiced
       amounts. Prepares an XML file format.
-            Path to access : Invoicing/Reporting/Legal Reports/Belgium Statements/Partner VAT Intra
+      
+        **Path to access :** Invoicing/Reporting/Legal Reports/Belgium Statements/Partner VAT Intra
     * Periodical VAT Declaration: Prepares an XML file for Vat Declaration of
       the Main company of the User currently Logged in.
-            Path to access : Invoicing/Reporting/Legal Reports/Belgium Statements/Periodical VAT Declaration
+      
+        **Path to access :** Invoicing/Reporting/Legal Reports/Belgium Statements/Periodical VAT Declaration
     * Annual Listing Of VAT-Subjected Customers: Prepares an XML file for Vat
       Declaration of the Main company of the User currently Logged in Based on
       Fiscal year.
-            Path to access : Invoicing/Reporting/Legal Reports/Belgium Statements/Annual Listing Of VAT-Subjected Customers
+      
+        **Path to access :** Invoicing/Reporting/Legal Reports/Belgium Statements/Annual Listing Of VAT-Subjected Customers
 
     """,
     'author': 'Noviat & OpenERP SA',
@@ -54,8 +59,7 @@ Wizards provided by this module:
         'account_chart',
         'account_coda',
     ],
-    'init_xml': [],
-    'update_xml': [
+    'data': [
         'account_financial_report.xml',
         'account_pcmn_belgium.xml',
         'account_tax_code_template.xml',
@@ -70,7 +74,7 @@ Wizards provided by this module:
         'security/ir.model.access.csv',
         'l10n_be_wizard.yml'
     ],
-    'demo_xml': [],
+    'demo': [],
     'installable': True,
     'certificate': '0031977724637',
     'images': ['images/1_config_chart_l10n_be.jpeg','images/2_l10n_be_chart.jpeg'],
diff --git a/addons/l10n_be/i18n/ar.po b/addons/l10n_be/i18n/ar.po
index 834e29950fd..a7de806f141 100644
--- a/addons/l10n_be/i18n/ar.po
+++ b/addons/l10n_be/i18n/ar.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:50+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:22+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_be
 #: field:partner.vat.intra,test_xml:0
diff --git a/addons/l10n_be/i18n/bg.po b/addons/l10n_be/i18n/bg.po
index 8e2933c2121..7ce92333c64 100644
--- a/addons/l10n_be/i18n/bg.po
+++ b/addons/l10n_be/i18n/bg.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:50+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:22+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_be
 #: field:partner.vat.intra,test_xml:0
diff --git a/addons/l10n_be/i18n/bs.po b/addons/l10n_be/i18n/bs.po
index 15190075a8b..3a7c1a9b847 100644
--- a/addons/l10n_be/i18n/bs.po
+++ b/addons/l10n_be/i18n/bs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:50+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:22+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_be
 #: field:partner.vat.intra,test_xml:0
diff --git a/addons/l10n_be/i18n/ca.po b/addons/l10n_be/i18n/ca.po
index 7a3c201adf1..9a196c85e70 100644
--- a/addons/l10n_be/i18n/ca.po
+++ b/addons/l10n_be/i18n/ca.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:50+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:22+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_be
 #: field:partner.vat.intra,test_xml:0
diff --git a/addons/l10n_be/i18n/cs.po b/addons/l10n_be/i18n/cs.po
index 4dbb6ac93c2..32ca1d38c98 100644
--- a/addons/l10n_be/i18n/cs.po
+++ b/addons/l10n_be/i18n/cs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:50+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:22+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_be
 #: field:partner.vat.intra,test_xml:0
diff --git a/addons/l10n_be/i18n/da.po b/addons/l10n_be/i18n/da.po
index fd58b6a3fd3..f6ec3d6c0b8 100644
--- a/addons/l10n_be/i18n/da.po
+++ b/addons/l10n_be/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:50+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:22+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_be
 #: field:partner.vat.intra,test_xml:0
diff --git a/addons/l10n_be/i18n/de.po b/addons/l10n_be/i18n/de.po
index 352a54f12d6..f8223a3e6c5 100644
--- a/addons/l10n_be/i18n/de.po
+++ b/addons/l10n_be/i18n/de.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:50+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:22+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_be
 #: field:partner.vat.intra,test_xml:0
diff --git a/addons/l10n_be/i18n/en_GB.po b/addons/l10n_be/i18n/en_GB.po
index 47cf8f73f02..b70bbb92d4f 100644
--- a/addons/l10n_be/i18n/en_GB.po
+++ b/addons/l10n_be/i18n/en_GB.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:50+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:22+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_be
 #: field:partner.vat.intra,test_xml:0
diff --git a/addons/l10n_be/i18n/es.po b/addons/l10n_be/i18n/es.po
index e614022347d..c6105dbf3e8 100644
--- a/addons/l10n_be/i18n/es.po
+++ b/addons/l10n_be/i18n/es.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:50+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:22+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_be
 #: field:partner.vat.intra,test_xml:0
diff --git a/addons/l10n_be/i18n/es_AR.po b/addons/l10n_be/i18n/es_AR.po
index 66147ee3330..3c19e956d17 100644
--- a/addons/l10n_be/i18n/es_AR.po
+++ b/addons/l10n_be/i18n/es_AR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:50+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:22+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_be
 #: field:partner.vat.intra,test_xml:0
diff --git a/addons/l10n_be/i18n/es_CR.po b/addons/l10n_be/i18n/es_CR.po
index 19d82f0d0d5..4931b0c4628 100644
--- a/addons/l10n_be/i18n/es_CR.po
+++ b/addons/l10n_be/i18n/es_CR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:50+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:22+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 "Language: \n"
 
 #. module: l10n_be
diff --git a/addons/l10n_be/i18n/et.po b/addons/l10n_be/i18n/et.po
index 6bc8a1ec234..1a281c956c4 100644
--- a/addons/l10n_be/i18n/et.po
+++ b/addons/l10n_be/i18n/et.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:50+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:22+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_be
 #: field:partner.vat.intra,test_xml:0
diff --git a/addons/l10n_be/i18n/fi.po b/addons/l10n_be/i18n/fi.po
index 7cfb8f01402..7c291e0cf8f 100644
--- a/addons/l10n_be/i18n/fi.po
+++ b/addons/l10n_be/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:50+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:22+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_be
 #: field:partner.vat.intra,test_xml:0
diff --git a/addons/l10n_be/i18n/fr.po b/addons/l10n_be/i18n/fr.po
index 223cbcd2bbb..9f7433ebc06 100644
--- a/addons/l10n_be/i18n/fr.po
+++ b/addons/l10n_be/i18n/fr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:50+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:22+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_be
 #: field:partner.vat.intra,test_xml:0
diff --git a/addons/l10n_be/i18n/gl.po b/addons/l10n_be/i18n/gl.po
index 344510b42ee..158f102ed6c 100644
--- a/addons/l10n_be/i18n/gl.po
+++ b/addons/l10n_be/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:50+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:22+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_be
 #: field:partner.vat.intra,test_xml:0
diff --git a/addons/l10n_be/i18n/hr.po b/addons/l10n_be/i18n/hr.po
index 817dbcea70b..aff68fdfda0 100644
--- a/addons/l10n_be/i18n/hr.po
+++ b/addons/l10n_be/i18n/hr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:50+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:22+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_be
 #: field:partner.vat.intra,test_xml:0
diff --git a/addons/l10n_be/i18n/hu.po b/addons/l10n_be/i18n/hu.po
index 2a7c3da3577..55abe751238 100644
--- a/addons/l10n_be/i18n/hu.po
+++ b/addons/l10n_be/i18n/hu.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:50+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:22+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_be
 #: field:partner.vat.intra,test_xml:0
diff --git a/addons/l10n_be/i18n/id.po b/addons/l10n_be/i18n/id.po
index 2a1660b6b35..da8f65d0410 100644
--- a/addons/l10n_be/i18n/id.po
+++ b/addons/l10n_be/i18n/id.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:50+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:22+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_be
 #: field:partner.vat.intra,test_xml:0
diff --git a/addons/l10n_be/i18n/it.po b/addons/l10n_be/i18n/it.po
index 36ff406dc5e..c43d4fa9926 100644
--- a/addons/l10n_be/i18n/it.po
+++ b/addons/l10n_be/i18n/it.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:50+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:22+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_be
 #: field:partner.vat.intra,test_xml:0
diff --git a/addons/l10n_be/i18n/ja.po b/addons/l10n_be/i18n/ja.po
index ad08349f15b..a4a4a5edc68 100644
--- a/addons/l10n_be/i18n/ja.po
+++ b/addons/l10n_be/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:50+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:22+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_be
 #: field:partner.vat.intra,test_xml:0
diff --git a/addons/l10n_be/i18n/ko.po b/addons/l10n_be/i18n/ko.po
index 4574dde5090..7407969e669 100644
--- a/addons/l10n_be/i18n/ko.po
+++ b/addons/l10n_be/i18n/ko.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:50+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:22+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_be
 #: field:partner.vat.intra,test_xml:0
diff --git a/addons/l10n_be/i18n/lt.po b/addons/l10n_be/i18n/lt.po
index 2a7c3da3577..55abe751238 100644
--- a/addons/l10n_be/i18n/lt.po
+++ b/addons/l10n_be/i18n/lt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:50+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:22+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_be
 #: field:partner.vat.intra,test_xml:0
diff --git a/addons/l10n_be/i18n/nl.po b/addons/l10n_be/i18n/nl.po
index e0696afea4f..648fdbfbd46 100644
--- a/addons/l10n_be/i18n/nl.po
+++ b/addons/l10n_be/i18n/nl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:50+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:22+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_be
 #: field:partner.vat.intra,test_xml:0
diff --git a/addons/l10n_be/i18n/nl_BE.po b/addons/l10n_be/i18n/nl_BE.po
index 32ee7826130..f8ca47590cc 100644
--- a/addons/l10n_be/i18n/nl_BE.po
+++ b/addons/l10n_be/i18n/nl_BE.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:50+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:22+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_be
 #: field:partner.vat.intra,test_xml:0
diff --git a/addons/l10n_be/i18n/pl.po b/addons/l10n_be/i18n/pl.po
index 2a7c3da3577..55abe751238 100644
--- a/addons/l10n_be/i18n/pl.po
+++ b/addons/l10n_be/i18n/pl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:50+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:22+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_be
 #: field:partner.vat.intra,test_xml:0
diff --git a/addons/l10n_be/i18n/pt.po b/addons/l10n_be/i18n/pt.po
index 1497e955ff9..06d686834ac 100644
--- a/addons/l10n_be/i18n/pt.po
+++ b/addons/l10n_be/i18n/pt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:50+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:22+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_be
 #: field:partner.vat.intra,test_xml:0
diff --git a/addons/l10n_be/i18n/pt_BR.po b/addons/l10n_be/i18n/pt_BR.po
index 43b40e5a0f0..4cbad5176ad 100644
--- a/addons/l10n_be/i18n/pt_BR.po
+++ b/addons/l10n_be/i18n/pt_BR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:50+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:22+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_be
 #: field:partner.vat.intra,test_xml:0
diff --git a/addons/l10n_be/i18n/ro.po b/addons/l10n_be/i18n/ro.po
index 2a7c3da3577..55abe751238 100644
--- a/addons/l10n_be/i18n/ro.po
+++ b/addons/l10n_be/i18n/ro.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:50+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:22+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_be
 #: field:partner.vat.intra,test_xml:0
diff --git a/addons/l10n_be/i18n/ru.po b/addons/l10n_be/i18n/ru.po
index 0dd2a315a96..0822598f11a 100644
--- a/addons/l10n_be/i18n/ru.po
+++ b/addons/l10n_be/i18n/ru.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:50+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:22+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_be
 #: field:partner.vat.intra,test_xml:0
diff --git a/addons/l10n_be/i18n/sl.po b/addons/l10n_be/i18n/sl.po
index 4bd8c8b1fa2..67e1e01d75f 100644
--- a/addons/l10n_be/i18n/sl.po
+++ b/addons/l10n_be/i18n/sl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:50+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:22+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_be
 #: field:partner.vat.intra,test_xml:0
diff --git a/addons/l10n_be/i18n/sq.po b/addons/l10n_be/i18n/sq.po
index faad45a89aa..4b547e071d5 100644
--- a/addons/l10n_be/i18n/sq.po
+++ b/addons/l10n_be/i18n/sq.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:50+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:22+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_be
 #: field:partner.vat.intra,test_xml:0
diff --git a/addons/l10n_be/i18n/sr@latin.po b/addons/l10n_be/i18n/sr@latin.po
index 1c35be9bb78..4940f2d5249 100644
--- a/addons/l10n_be/i18n/sr@latin.po
+++ b/addons/l10n_be/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:50+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:22+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_be
 #: field:partner.vat.intra,test_xml:0
diff --git a/addons/l10n_be/i18n/sv.po b/addons/l10n_be/i18n/sv.po
index 2fb7a1c6a11..0f0d2a9f78a 100644
--- a/addons/l10n_be/i18n/sv.po
+++ b/addons/l10n_be/i18n/sv.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:50+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:22+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_be
 #: field:partner.vat.intra,test_xml:0
diff --git a/addons/l10n_be/i18n/tlh.po b/addons/l10n_be/i18n/tlh.po
index e378a757c32..4a4f5cad7a3 100644
--- a/addons/l10n_be/i18n/tlh.po
+++ b/addons/l10n_be/i18n/tlh.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:50+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:22+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_be
 #: field:partner.vat.intra,test_xml:0
diff --git a/addons/l10n_be/i18n/tr.po b/addons/l10n_be/i18n/tr.po
index 88a7d471d80..9121b1869a5 100644
--- a/addons/l10n_be/i18n/tr.po
+++ b/addons/l10n_be/i18n/tr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:50+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:22+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_be
 #: field:partner.vat.intra,test_xml:0
diff --git a/addons/l10n_be/i18n/uk.po b/addons/l10n_be/i18n/uk.po
index 87a399a0fe6..bf086611938 100644
--- a/addons/l10n_be/i18n/uk.po
+++ b/addons/l10n_be/i18n/uk.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:50+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:22+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_be
 #: field:partner.vat.intra,test_xml:0
diff --git a/addons/l10n_be/i18n/vi.po b/addons/l10n_be/i18n/vi.po
index 04d61c81f87..e57619a1cd7 100644
--- a/addons/l10n_be/i18n/vi.po
+++ b/addons/l10n_be/i18n/vi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:50+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:22+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_be
 #: field:partner.vat.intra,test_xml:0
diff --git a/addons/l10n_be/i18n/zh_CN.po b/addons/l10n_be/i18n/zh_CN.po
index 7ce2124f8d7..d9a4e741dae 100644
--- a/addons/l10n_be/i18n/zh_CN.po
+++ b/addons/l10n_be/i18n/zh_CN.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:50+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:22+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_be
 #: field:partner.vat.intra,test_xml:0
diff --git a/addons/l10n_be/i18n/zh_TW.po b/addons/l10n_be/i18n/zh_TW.po
index 539a001d6e8..cbdd12e4da4 100644
--- a/addons/l10n_be/i18n/zh_TW.po
+++ b/addons/l10n_be/i18n/zh_TW.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:50+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:22+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_be
 #: field:partner.vat.intra,test_xml:0
diff --git a/addons/l10n_be_hr_payroll/__openerp__.py b/addons/l10n_be_hr_payroll/__openerp__.py
index e0d7ada059b..9d6fa87dfca 100644
--- a/addons/l10n_be_hr_payroll/__openerp__.py
+++ b/addons/l10n_be_hr_payroll/__openerp__.py
@@ -40,13 +40,11 @@ Belgian Payroll Rules.
     """,
 
     'auto_install': False,
-    'demo': [
-     'l10n_be_hr_payroll_demo.xml',
-    ],
+    'demo': ['l10n_be_hr_payroll_demo.xml'],
     'data':[
-     'l10n_be_hr_payroll_view.xml',
-     'l10n_be_hr_payroll_data.xml',
-     'data/hr.salary.rule.csv',
+        'l10n_be_hr_payroll_view.xml',
+        'l10n_be_hr_payroll_data.xml',
+        'data/hr.salary.rule.csv',
     ],
     'installable': True
 }
diff --git a/addons/l10n_be_hr_payroll/i18n/es_CR.po b/addons/l10n_be_hr_payroll/i18n/es_CR.po
index b42480033f0..6faead9f60c 100644
--- a/addons/l10n_be_hr_payroll/i18n/es_CR.po
+++ b/addons/l10n_be_hr_payroll/i18n/es_CR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:39+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:43+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_be_hr_payroll
 #: help:hr.employee,disabled_spouse_bool:0
diff --git a/addons/l10n_be_hr_payroll/i18n/sr@latin.po b/addons/l10n_be_hr_payroll/i18n/sr@latin.po
index 14f912d9f9a..c63f19fee2c 100644
--- a/addons/l10n_be_hr_payroll/i18n/sr@latin.po
+++ b/addons/l10n_be_hr_payroll/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:39+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:43+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_be_hr_payroll
 #: help:hr.employee,disabled_spouse_bool:0
diff --git a/addons/l10n_be_hr_payroll/l10n_be_hr_payroll_view.xml b/addons/l10n_be_hr_payroll/l10n_be_hr_payroll_view.xml
index 893a977e62c..b1951a2a032 100644
--- a/addons/l10n_be_hr_payroll/l10n_be_hr_payroll_view.xml
+++ b/addons/l10n_be_hr_payroll/l10n_be_hr_payroll_view.xml
@@ -38,11 +38,11 @@
         <record id="hr_employee_form__l10n_be_view_for" model="ir.ui.view">
             <field name="name">hr.employee.inherit.form</field>
             <field name="model">hr.employee</field>
-            <field name="inherit_id" ref="hr.view_employee_form"/>
+            <field name="inherit_id" ref="hr_contract.hr_hr_employee_view_form2"/>
             <field name="priority">30</field>
             <field name="arch" type="xml">
             <data>
-                <xpath expr="//field[@name='gender']" position="before">
+                <xpath expr="//field[@name='vehicle_distance']" position="after">
                     <field name="resident_bool" eval="False"/> 
                 </xpath>
                 <xpath expr="//field[@name='marital']" position="after">
diff --git a/addons/l10n_be_hr_payroll_account/__openerp__.py b/addons/l10n_be_hr_payroll_account/__openerp__.py
index 4ad70f9687c..7ba7caaa3e0 100644
--- a/addons/l10n_be_hr_payroll_account/__openerp__.py
+++ b/addons/l10n_be_hr_payroll_account/__openerp__.py
@@ -26,14 +26,14 @@
     'version': '1.0',
     'description': """
 Accounting Data for Belgian Payroll Rules.
+==========================================
     """,
 
     'auto_install': True,
-    'demo': [
-    ],
+    'demo': [],
     'data':[
-     'l10n_be_hr_payroll_account_data.xml',
-     'data/hr.salary.rule.csv',
+        'l10n_be_hr_payroll_account_data.xml',
+        'data/hr.salary.rule.csv',
     ],
     'installable': True
 }
diff --git a/addons/l10n_be_invoice_bba/__openerp__.py b/addons/l10n_be_invoice_bba/__openerp__.py
index 9f4efe1b31e..2c787d6c30f 100644
--- a/addons/l10n_be_invoice_bba/__openerp__.py
+++ b/addons/l10n_be_invoice_bba/__openerp__.py
@@ -28,19 +28,19 @@
     'category' : 'Localization',
     'description': """
     
-Belgian localisation for in- and outgoing invoices (prereq to account_coda):
+Belgian localization for in- and outgoing invoices (prereq to account_coda):
+============================================================================
     - Rename 'reference' field labels to 'Communication'
     - Add support for Belgian Structured Communication
 
-A Structured Communication can be generated automatically on outgoing invoices
-according to the following algorithms:
-
+A Structured Communication can be generated automatically on outgoing invoices according to the following algorithms:
+---------------------------------------------------------------------------------------------------------------------
     1) Random : +++RRR/RRRR/RRRDD+++
-        R..R = Random Digits, DD = Check Digits
+        **R..R =** Random Digits, **DD =** Check Digits
     2) Date : +++DOY/YEAR/SSSDD+++
-        DOY = Day of the Year, SSS = Sequence Number, DD = Check Digits)
+        **DOY =** Day of the Year, **SSS =** Sequence Number, **DD =** Check Digits
     3) Customer Reference +++RRR/RRRR/SSSDDD+++
-        R..R = Customer Reference without non-numeric characters, SSS = Sequence Number, DD = Check Digits)  
+        **R..R =** Customer Reference without non-numeric characters, **SSS =** Sequence Number, **DD =** Check Digits  
         
 The preferred type of Structured Communication and associated Algorithm can be
 specified on the Partner records. A 'random' Structured Communication will
@@ -48,9 +48,8 @@ generated if no algorithm is specified on the Partner record.
 
     """,
     'depends': ['account'],
-    'demo_xml': [],
-    'init_xml': [],
-    'update_xml' : [
+    'demo': [],
+    'data' : [
         'partner_view.xml',
         'account_invoice_view.xml',        
     ],
diff --git a/addons/l10n_be_invoice_bba/i18n/ar.po b/addons/l10n_be_invoice_bba/i18n/ar.po
index fc39b17d975..2d2c058cf94 100644
--- a/addons/l10n_be_invoice_bba/i18n/ar.po
+++ b/addons/l10n_be_invoice_bba/i18n/ar.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:39+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:43+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_be_invoice_bba
 #: sql_constraint:account.invoice:0
diff --git a/addons/l10n_be_invoice_bba/i18n/es_CR.po b/addons/l10n_be_invoice_bba/i18n/es_CR.po
index 88fa3108e1c..f65ee3385d5 100644
--- a/addons/l10n_be_invoice_bba/i18n/es_CR.po
+++ b/addons/l10n_be_invoice_bba/i18n/es_CR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:39+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:43+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_be_invoice_bba
 #: sql_constraint:account.invoice:0
diff --git a/addons/l10n_be_invoice_bba/i18n/fr.po b/addons/l10n_be_invoice_bba/i18n/fr.po
index 72f70e65a72..1853e4251a6 100644
--- a/addons/l10n_be_invoice_bba/i18n/fr.po
+++ b/addons/l10n_be_invoice_bba/i18n/fr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:39+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:43+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_be_invoice_bba
 #: sql_constraint:account.invoice:0
diff --git a/addons/l10n_be_invoice_bba/i18n/nl.po b/addons/l10n_be_invoice_bba/i18n/nl.po
index d653bed00d6..4d94f38eb68 100644
--- a/addons/l10n_be_invoice_bba/i18n/nl.po
+++ b/addons/l10n_be_invoice_bba/i18n/nl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:39+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:43+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_be_invoice_bba
 #: sql_constraint:account.invoice:0
diff --git a/addons/l10n_be_invoice_bba/i18n/sr@latin.po b/addons/l10n_be_invoice_bba/i18n/sr@latin.po
index 14ae3508738..89d17e2eaba 100644
--- a/addons/l10n_be_invoice_bba/i18n/sr@latin.po
+++ b/addons/l10n_be_invoice_bba/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:39+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:43+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_be_invoice_bba
 #: sql_constraint:account.invoice:0
diff --git a/addons/l10n_br/__openerp__.py b/addons/l10n_br/__openerp__.py
index 022fa1b6a4d..99923f1a5e5 100644
--- a/addons/l10n_br/__openerp__.py
+++ b/addons/l10n_br/__openerp__.py
@@ -26,7 +26,7 @@ Base module for the Brazilian localization.
 ===========================================
 
 This module consists in:
-
+------------------------
  - Generic Brazilian chart of accounts
  - Brazilian taxes such as:
 
@@ -63,7 +63,7 @@ for online use of 'private modules'.""",
     'website': 'http://openerpbrasil.org',
     'version': '0.6',
     'depends': ['account','account_chart'],
-    'init_xml': [        
+    'data': [        
         'data/account.account.type.csv',
         'data/account.tax.code.template.csv',
         'data/account.account.template.csv',
@@ -71,11 +71,9 @@ for online use of 'private modules'.""",
         'data/account_tax_template.xml',
         'data/l10n_br_data.xml',
         'security/ir.model.access.csv',
-                ],
-    'update_xml': [
         'account_view.xml',
         'l10n_br_view.xml',
-    ],
+                ],
     'installable': True,
     'certificate' : '001280994939126801405',
 }
diff --git a/addons/l10n_br/account.py b/addons/l10n_br/account.py
index 6e38aaa690f..64d3c2cda79 100644
--- a/addons/l10n_br/account.py
+++ b/addons/l10n_br/account.py
@@ -29,6 +29,7 @@ import decimal_precision as dp
 from tools.misc import currency
 from tools.translate import _
 from tools import config
+from openerp import SUPERUSER_ID
 
 class account_tax_code_template(osv.osv):
 
@@ -53,7 +54,7 @@ class account_tax_template(osv.osv):
     
     def get_precision_tax():
         def change_digit_tax(cr):
-            res = pooler.get_pool(cr.dbname).get('decimal.precision').precision_get(cr, 1, 'Account')
+            res = pooler.get_pool(cr.dbname).get('decimal.precision').precision_get(cr, SUPERUSER_ID, 'Account')
             return (16, res+2)
         return change_digit_tax
     
@@ -91,7 +92,7 @@ class account_tax(osv.osv):
     
     def get_precision_tax():
         def change_digit_tax(cr):
-            res = pooler.get_pool(cr.dbname).get('decimal.precision').precision_get(cr, 1, 'Account')
+            res = pooler.get_pool(cr.dbname).get('decimal.precision').precision_get(cr, SUPERUSER_ID, 'Account')
             return (16, res+2)
         return change_digit_tax
     
diff --git a/addons/l10n_br/data/account_tax_template.xml b/addons/l10n_br/data/account_tax_template.xml
index 9719b211228..0d3ece9d129 100644
--- a/addons/l10n_br/data/account_tax_template.xml
+++ b/addons/l10n_br/data/account_tax_template.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-    <data noupdate="True">
+    <data noupdate="1">
 
         <record id="tax_template_1" model="account.tax.template">
             <field name="description">IPI</field>
diff --git a/addons/l10n_br/data/l10n_br_account_chart_template.xml b/addons/l10n_br/data/l10n_br_account_chart_template.xml
index 8f45e94b625..60e1a1c4f02 100644
--- a/addons/l10n_br/data/l10n_br_account_chart_template.xml
+++ b/addons/l10n_br/data/l10n_br_account_chart_template.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <openerp>
-    <data>
+    <data noupdate="1">
 
         <record id="l10n_br_account_chart_template" model="account.chart.template">
             <field name="name">Planilha de Contas Brasileira</field>
diff --git a/addons/l10n_br/i18n/ar.po b/addons/l10n_br/i18n/ar.po
index 2f43237d91f..75a2b699f62 100644
--- a/addons/l10n_br/i18n/ar.po
+++ b/addons/l10n_br/i18n/ar.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_br
 #: field:account.tax,tax_discount:0
diff --git a/addons/l10n_br/i18n/bg.po b/addons/l10n_br/i18n/bg.po
index b1f76b90b2b..ffb8556009e 100644
--- a/addons/l10n_br/i18n/bg.po
+++ b/addons/l10n_br/i18n/bg.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_br
 #: field:account.tax,tax_discount:0
diff --git a/addons/l10n_br/i18n/ca.po b/addons/l10n_br/i18n/ca.po
index 6ff5d25fcb7..0e38f0206c4 100644
--- a/addons/l10n_br/i18n/ca.po
+++ b/addons/l10n_br/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_br
 #: field:account.tax,tax_discount:0
diff --git a/addons/l10n_br/i18n/da.po b/addons/l10n_br/i18n/da.po
index 874be24c44e..ed7e2d6ea6f 100644
--- a/addons/l10n_br/i18n/da.po
+++ b/addons/l10n_br/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_br
 #: field:account.tax,tax_discount:0
diff --git a/addons/l10n_br/i18n/en_GB.po b/addons/l10n_br/i18n/en_GB.po
index df23c097bba..2c7bf0dd855 100644
--- a/addons/l10n_br/i18n/en_GB.po
+++ b/addons/l10n_br/i18n/en_GB.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_br
 #: field:account.tax,tax_discount:0
diff --git a/addons/l10n_br/i18n/es.po b/addons/l10n_br/i18n/es.po
index 17f85f29b7f..e51989beba0 100644
--- a/addons/l10n_br/i18n/es.po
+++ b/addons/l10n_br/i18n/es.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_br
 #: field:account.tax,tax_discount:0
diff --git a/addons/l10n_br/i18n/es_CR.po b/addons/l10n_br/i18n/es_CR.po
index 6d11059976c..b08c6992a26 100644
--- a/addons/l10n_br/i18n/es_CR.po
+++ b/addons/l10n_br/i18n/es_CR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 "Language: es\n"
 
 #. module: l10n_br
diff --git a/addons/l10n_br/i18n/es_PY.po b/addons/l10n_br/i18n/es_PY.po
index b603a7a6eec..734037953aa 100644
--- a/addons/l10n_br/i18n/es_PY.po
+++ b/addons/l10n_br/i18n/es_PY.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_br
 #: field:account.tax,tax_discount:0
diff --git a/addons/l10n_br/i18n/fr.po b/addons/l10n_br/i18n/fr.po
index 09c86e59316..92887b61d8f 100644
--- a/addons/l10n_br/i18n/fr.po
+++ b/addons/l10n_br/i18n/fr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_br
 #: field:account.tax,tax_discount:0
diff --git a/addons/l10n_br/i18n/gl.po b/addons/l10n_br/i18n/gl.po
index 1788e6ca6c1..86990e71dd2 100644
--- a/addons/l10n_br/i18n/gl.po
+++ b/addons/l10n_br/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_br
 #: field:account.tax,tax_discount:0
diff --git a/addons/l10n_br/i18n/hi.po b/addons/l10n_br/i18n/hi.po
index d5ea9e9310d..f068f53ce9f 100644
--- a/addons/l10n_br/i18n/hi.po
+++ b/addons/l10n_br/i18n/hi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_br
 #: field:account.tax,tax_discount:0
diff --git a/addons/l10n_br/i18n/it.po b/addons/l10n_br/i18n/it.po
index f0a0944ebc2..2e052df4db3 100644
--- a/addons/l10n_br/i18n/it.po
+++ b/addons/l10n_br/i18n/it.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_br
 #: field:account.tax,tax_discount:0
diff --git a/addons/l10n_br/i18n/nb.po b/addons/l10n_br/i18n/nb.po
index 3a95a10e2a3..ea8cb373257 100644
--- a/addons/l10n_br/i18n/nb.po
+++ b/addons/l10n_br/i18n/nb.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_br
 #: field:account.tax,tax_discount:0
diff --git a/addons/l10n_br/i18n/oc.po b/addons/l10n_br/i18n/oc.po
index 7204f279198..055c0c6107b 100644
--- a/addons/l10n_br/i18n/oc.po
+++ b/addons/l10n_br/i18n/oc.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_br
 #: field:account.tax,tax_discount:0
diff --git a/addons/l10n_br/i18n/pt_BR.po b/addons/l10n_br/i18n/pt_BR.po
index 116764736f0..b2e95fe8494 100644
--- a/addons/l10n_br/i18n/pt_BR.po
+++ b/addons/l10n_br/i18n/pt_BR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_br
 #: field:account.tax,tax_discount:0
diff --git a/addons/l10n_br/i18n/ru.po b/addons/l10n_br/i18n/ru.po
index 1ba828d09af..2c8636494c8 100644
--- a/addons/l10n_br/i18n/ru.po
+++ b/addons/l10n_br/i18n/ru.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_br
 #: field:account.tax,tax_discount:0
diff --git a/addons/l10n_br/i18n/sl.po b/addons/l10n_br/i18n/sl.po
index 5a1e75b6b0d..f95d3e0a471 100644
--- a/addons/l10n_br/i18n/sl.po
+++ b/addons/l10n_br/i18n/sl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_br
 #: field:account.tax,tax_discount:0
diff --git a/addons/l10n_br/i18n/sq.po b/addons/l10n_br/i18n/sq.po
index 9f4596f8a05..e62b31aae10 100644
--- a/addons/l10n_br/i18n/sq.po
+++ b/addons/l10n_br/i18n/sq.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_br
 #: field:account.tax,tax_discount:0
diff --git a/addons/l10n_br/i18n/sr@latin.po b/addons/l10n_br/i18n/sr@latin.po
index aa242925626..7a54174ee46 100644
--- a/addons/l10n_br/i18n/sr@latin.po
+++ b/addons/l10n_br/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_br
 #: field:account.tax,tax_discount:0
diff --git a/addons/l10n_br/i18n/tr.po b/addons/l10n_br/i18n/tr.po
index 4a4defad6a6..7c8e87db346 100644
--- a/addons/l10n_br/i18n/tr.po
+++ b/addons/l10n_br/i18n/tr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_br
 #: field:account.tax,tax_discount:0
diff --git a/addons/l10n_ca/__openerp__.py b/addons/l10n_ca/__openerp__.py
index bd5fe4e6ea0..5f12d7331b6 100644
--- a/addons/l10n_ca/__openerp__.py
+++ b/addons/l10n_ca/__openerp__.py
@@ -19,20 +19,19 @@
 #
 ##############################################################################
 {
-    "name" : "Canada - Accounting",
-    "version" : "1.0",
-    "author" : "Savoir-faire Linux",
-    "website" : "http://www.savoirfairelinux.com",
-    "category" : "Localization/Account Charts",
-    "description": """
+    'name': 'Canada - Accounting',
+    'version': '1.0',
+    'author': 'Savoir-faire Linux',
+    'website': 'http://www.savoirfairelinux.com',
+    'category': 'Localization/Account Charts',
+    'description': """
 This is the module to manage the English and French - Canadian accounting chart in OpenERP.
 ===========================================================================================
 
 Canadian accounting charts and localizations.
     """,
-    "depends" : ['base', 'account', 'base_iban', 'base_vat', 'account_chart'],
-    "init_xml" : [],
-    "update_xml" : [
+    'depends': ['base', 'account', 'base_iban', 'base_vat', 'account_chart'],
+    'data': [
         'account_chart_en.xml',
         'account_tax_code_en.xml',
         'account_chart_template_en.xml',
@@ -45,9 +44,9 @@ Canadian accounting charts and localizations.
         'fiscal_templates_fr.xml',
         'l10n_ca_wizard.xml',
     ],
-    "demo_xml" : [],
-    "installable" : True,
-    "certificate" : '00941680933773696173',
+    'demo': [],
+    'installable': True,
+    'certificate': '00941680933773696173',
     'images': ['images/config_chart_l10n_ca.jpeg','images/l10n_ca_chart.jpeg'],
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/l10n_ca/i18n/ar.po b/addons/l10n_ca/i18n/ar.po
index 2c1888d54ef..ae32abdcc94 100644
--- a/addons/l10n_ca/i18n/ar.po
+++ b/addons/l10n_ca/i18n/ar.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_ca
 #: model:account.account.type,name:l10n_ca.account_type_receivable
diff --git a/addons/l10n_ca/i18n/ca.po b/addons/l10n_ca/i18n/ca.po
index 43def9ba9e7..aa9d401ad31 100644
--- a/addons/l10n_ca/i18n/ca.po
+++ b/addons/l10n_ca/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_ca
 #: model:account.account.type,name:l10n_ca.account_type_receivable
diff --git a/addons/l10n_ca/i18n/da.po b/addons/l10n_ca/i18n/da.po
index 771e02ca55f..fadca02ab69 100644
--- a/addons/l10n_ca/i18n/da.po
+++ b/addons/l10n_ca/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_ca
 #: model:account.account.type,name:l10n_ca.account_type_receivable
diff --git a/addons/l10n_ca/i18n/de.po b/addons/l10n_ca/i18n/de.po
index 849a1742637..402869fa252 100644
--- a/addons/l10n_ca/i18n/de.po
+++ b/addons/l10n_ca/i18n/de.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_ca
 #: model:account.account.type,name:l10n_ca.account_type_receivable
diff --git a/addons/l10n_ca/i18n/en_GB.po b/addons/l10n_ca/i18n/en_GB.po
index 6a58f79da01..22519f59ded 100644
--- a/addons/l10n_ca/i18n/en_GB.po
+++ b/addons/l10n_ca/i18n/en_GB.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_ca
 #: model:account.account.type,name:l10n_ca.account_type_receivable
diff --git a/addons/l10n_ca/i18n/es.po b/addons/l10n_ca/i18n/es.po
index 4d094424045..988a1cf8c8f 100644
--- a/addons/l10n_ca/i18n/es.po
+++ b/addons/l10n_ca/i18n/es.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_ca
 #: model:account.account.type,name:l10n_ca.account_type_receivable
diff --git a/addons/l10n_ca/i18n/es_CR.po b/addons/l10n_ca/i18n/es_CR.po
index bd26a422f4c..558fa7219f8 100644
--- a/addons/l10n_ca/i18n/es_CR.po
+++ b/addons/l10n_ca/i18n/es_CR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_ca
 #: model:account.account.type,name:l10n_ca.account_type_receivable
diff --git a/addons/l10n_ca/i18n/es_PY.po b/addons/l10n_ca/i18n/es_PY.po
index 5325c7560c2..317b3efb88d 100644
--- a/addons/l10n_ca/i18n/es_PY.po
+++ b/addons/l10n_ca/i18n/es_PY.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_ca
 #: model:account.account.type,name:l10n_ca.account_type_receivable
diff --git a/addons/l10n_ca/i18n/fr.po b/addons/l10n_ca/i18n/fr.po
index cf09926ae48..1ac38e9a83e 100644
--- a/addons/l10n_ca/i18n/fr.po
+++ b/addons/l10n_ca/i18n/fr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_ca
 #: model:account.account.type,name:l10n_ca.account_type_receivable
diff --git a/addons/l10n_ca/i18n/gl.po b/addons/l10n_ca/i18n/gl.po
index df881313eb4..62e7f650b9a 100644
--- a/addons/l10n_ca/i18n/gl.po
+++ b/addons/l10n_ca/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_ca
 #: model:account.account.type,name:l10n_ca.account_type_receivable
diff --git a/addons/l10n_ca/i18n/hu.po b/addons/l10n_ca/i18n/hu.po
index 813a88a6c29..7c811ce48f6 100644
--- a/addons/l10n_ca/i18n/hu.po
+++ b/addons/l10n_ca/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_ca
 #: model:account.account.type,name:l10n_ca.account_type_receivable
diff --git a/addons/l10n_ca/i18n/it.po b/addons/l10n_ca/i18n/it.po
index 64f898babc2..7eeefa39115 100644
--- a/addons/l10n_ca/i18n/it.po
+++ b/addons/l10n_ca/i18n/it.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_ca
 #: model:account.account.type,name:l10n_ca.account_type_receivable
diff --git a/addons/l10n_ca/i18n/pt.po b/addons/l10n_ca/i18n/pt.po
index 00e11f1e750..9daca8921bb 100644
--- a/addons/l10n_ca/i18n/pt.po
+++ b/addons/l10n_ca/i18n/pt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_ca
 #: model:account.account.type,name:l10n_ca.account_type_receivable
diff --git a/addons/l10n_ca/i18n/pt_BR.po b/addons/l10n_ca/i18n/pt_BR.po
index f7671489a85..d69dc67fc6e 100644
--- a/addons/l10n_ca/i18n/pt_BR.po
+++ b/addons/l10n_ca/i18n/pt_BR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_ca
 #: model:account.account.type,name:l10n_ca.account_type_receivable
diff --git a/addons/l10n_ca/i18n/sr@latin.po b/addons/l10n_ca/i18n/sr@latin.po
index 893f6068373..2484beea06e 100644
--- a/addons/l10n_ca/i18n/sr@latin.po
+++ b/addons/l10n_ca/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_ca
 #: model:account.account.type,name:l10n_ca.account_type_receivable
diff --git a/addons/l10n_ca/i18n/tr.po b/addons/l10n_ca/i18n/tr.po
index 5ea63687d94..021ddca8bc4 100644
--- a/addons/l10n_ca/i18n/tr.po
+++ b/addons/l10n_ca/i18n/tr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_ca
 #: model:account.account.type,name:l10n_ca.account_type_receivable
diff --git a/addons/l10n_ca/i18n/zh_CN.po b/addons/l10n_ca/i18n/zh_CN.po
new file mode 100644
index 00000000000..6f5dfc85761
--- /dev/null
+++ b/addons/l10n_ca/i18n/zh_CN.po
@@ -0,0 +1,121 @@
+# 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: 2010-08-02 21:08+0000\n"
+"PO-Revision-Date: 2012-08-19 21:20+0000\n"
+"Last-Translator: Heling Yao <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: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
+
+#. module: l10n_ca
+#: model:account.account.type,name:l10n_ca.account_type_receivable
+msgid "Receivable"
+msgstr ""
+
+#. module: l10n_ca
+#: model:account.account.type,name:l10n_ca.acct_type_asset_view
+msgid "Asset View"
+msgstr "资产视图"
+
+#. module: l10n_ca
+#: model:ir.module.module,description:l10n_ca.module_meta_information
+msgid ""
+"This is the module to manage the canadian accounting chart in OpenERP."
+msgstr ""
+
+#. module: l10n_ca
+#: model:account.account.type,name:l10n_ca.acct_type_expense_view
+msgid "Expense View"
+msgstr ""
+
+#. module: l10n_ca
+#: constraint:account.account.template:0
+msgid "Error ! You can not create recursive account templates."
+msgstr ""
+
+#. module: l10n_ca
+#: model:account.account.type,name:l10n_ca.acct_type_income_view
+msgid "Income View"
+msgstr ""
+
+#. module: l10n_ca
+#: model:ir.module.module,shortdesc:l10n_ca.module_meta_information
+msgid "Canada - Chart of Accounts"
+msgstr ""
+
+#. module: l10n_ca
+#: constraint:account.account.type:0
+msgid "Error ! You can not create recursive types."
+msgstr ""
+
+#. module: l10n_ca
+#: model:account.account.type,name:l10n_ca.account_type_tax
+msgid "Tax"
+msgstr ""
+
+#. module: l10n_ca
+#: model:account.account.type,name:l10n_ca.account_type_cash
+msgid "Cash"
+msgstr ""
+
+#. module: l10n_ca
+#: model:ir.actions.todo,note:l10n_ca.config_call_account_template_ca
+msgid ""
+"Generate Chart of Accounts from a Chart Template. You will be asked to pass "
+"the name of the company, the chart template to follow, the no. of digits to "
+"generate the code for your accounts and Bank account, currency to create "
+"Journals. Thus,the pure copy of chart Template is generated.\n"
+"\tThis is the same wizard that runs from Financial "
+"Management/Configuration/Financial Accounting/Financial Accounts/Generate "
+"Chart of Accounts from a Chart Template."
+msgstr ""
+
+#. module: l10n_ca
+#: model:account.account.type,name:l10n_ca.account_type_payable
+msgid "Payable"
+msgstr ""
+
+#. module: l10n_ca
+#: model:account.account.type,name:l10n_ca.account_type_asset
+msgid "Asset"
+msgstr "资产"
+
+#. module: l10n_ca
+#: model:account.account.type,name:l10n_ca.account_type_equity
+msgid "Equity"
+msgstr ""
+
+#. module: l10n_ca
+#: constraint:account.tax.code.template:0
+msgid "Error ! You can not create recursive Tax Codes."
+msgstr ""
+
+#. module: l10n_ca
+#: model:account.account.type,name:l10n_ca.acct_type_liability_view
+msgid "Liability View"
+msgstr "负债视图"
+
+#. module: l10n_ca
+#: model:account.account.type,name:l10n_ca.account_type_expense
+msgid "Expense"
+msgstr ""
+
+#. module: l10n_ca
+#: model:account.account.type,name:l10n_ca.account_type_income
+msgid "Income"
+msgstr ""
+
+#. module: l10n_ca
+#: model:account.account.type,name:l10n_ca.account_type_view
+msgid "View"
+msgstr "视图"
diff --git a/addons/l10n_ch/__openerp__.py b/addons/l10n_ch/__openerp__.py
index 6de20acf98a..4e8f13fda7a 100644
--- a/addons/l10n_ch/__openerp__.py
+++ b/addons/l10n_ch/__openerp__.py
@@ -19,22 +19,24 @@
 #
 ##############################################################################
 
-{"name" : "Switzerland - Accounting",
- "description" :  """
-Swiss localisation :
- - DTA generation for a lot of payment types
- - BVR management (number generation, report.)
- - Import account move from the bank file (like v11)
- - Simplify the way you handle the bank statement for reconciliation
+{
+    'name': 'Switzerland - Accounting',
+    'description':  """
+Swiss localization :
+====================
+    - DTA generation for a lot of payment types
+    - BVR management (number generation, report.)
+    - Import account move from the bank file (like v11)
+    - Simplify the way you handle the bank statement for reconciliation
 
 You can also add ZIP and bank completion with:
- - l10n_ch_zip
- - l10n_ch_bank
+----------------------------------------------
+    - l10n_ch_zip
+    - l10n_ch_bank
  
- Author: Camptocamp SA
- Donors: Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique SA
-
-------------------------------------------------------------------------
+ **Author:** Camptocamp SA
+ 
+ **Donors:** Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique SA
 
 Module incluant la localisation Suisse de OpenERP revu et corrigé par Camptocamp.
 Cette nouvelle version comprend la gestion et l'émissionde BVR, le paiement
@@ -43,16 +45,18 @@ et l'import du relevé de compte depuis la banque de manière automatisée. De p
 nous avons intégré la définition de toutes les banques Suisses(adresse, swift et clearing).
 
 Par ailleurs, conjointement à ce module, nous proposons la complétion NPA:
-
-Vous pouvez ajouter la completion des banques et des NPA avec with:
- - l10n_ch_zip
- - l10n_ch_bank
- 
- Auteur: Camptocamp SA
- Donateurs: Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique SA
-
 --------------------------------------------------------------------------
+Vous pouvez ajouter la completion des banques et des NPA avec with:
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    - l10n_ch_zip
+    - l10n_ch_bank
+ 
+ **Auteur:** Camptocamp SA
+ 
+ **Donateurs:** Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique SA
+
 TODO :
+------
     - Implement bvr import partial reconciliation
     - Replace wizard by osv_memory when possible
     - Add mising HELP
@@ -60,47 +64,45 @@ TODO :
     - Improve demo data
 
 """,
- "version": "6.1",
- "author": "Camptocamp",
- 'category': 'Localization/Account Charts',
- "website": "http://www.camptocamp.com",
-
- "depends" : [ "account_cancel",
-               "base_iban",
-               "account_payment",
-               "account_voucher",
-               "report_webkit",
-               "l10n_multilang"],
-
- "init_xml": ["dta_data.xml",
-              "journal_data.xml",
-              #FR sterchi chart data
-              'sterchi_chart/account.xml',
-              'sterchi_chart/vat.xml',
-              'sterchi_chart/vat2011.xml',
-              'sterchi_chart/fiscal_position.xml'],
-
- "demo_xml": ["demo/demo.xml",
-              "demo/dta_demo.xml"],
-
- "update_xml": ["wizard.xml",
-                "wizard/bvr_import_view.xml",
-                "wizard/create_dta_view.xml",
-                "company_view.xml",
-                "account_invoice.xml",
-                "bank_view.xml",
-                "security/ir.model.access.csv",
-                "report/report_webkit_html_view.xml"],
- 
- "test": ['test/l10n_ch_report.yml',
-          'test/l10n_ch_dta.yml',
+    'version': '6.1',
+    'author': 'Camptocamp',
+    'category': 'Localization/Account Charts',
+    'website': 'http://www.camptocamp.com',
+    'depends': ['account_cancel',
+                 'base_iban',
+                 'account_payment',
+                 'account_voucher',
+                 'report_webkit',
+                 'l10n_multilang'
+    ],
+    'data': ['dta_data.xml',
+             'journal_data.xml',
+             #FR sterchi chart data
+             'sterchi_chart/account.xml',
+             'sterchi_chart/vat.xml',
+             'sterchi_chart/vat2011.xml',
+             'sterchi_chart/fiscal_position.xml',
+             'wizard.xml',
+             'wizard/bvr_import_view.xml',
+             'wizard/create_dta_view.xml',
+             'company_view.xml',
+             'account_invoice.xml',
+             'bank_view.xml',
+             'security/ir.model.access.csv',
+             'report/report_webkit_html_view.xml'
+    ],
+    'demo': ['demo/demo.xml',
+             'demo/dta_demo.xml'
+    ],
+    'test': ['test/l10n_ch_report.yml',
+             'test/l10n_ch_dta.yml',
           #TODO: uncomment the 2 following tests once they are fixed
           #'test/l10n_ch_v11.yml',
           #'test/l10n_ch_v11_part.yml'
-         ],
-
- "auto_install": False,
- "installable": True,
- "certificate": "001103836064567088989",
- 'images': ['images/config_chart_l10n_ch.jpeg','images/l10n_ch_chart.jpeg']}
+    ],
+    'auto_install': False,
+    'installable': True,
+    'certificate': '001103836064567088989',
+    'images': ['images/config_chart_l10n_ch.jpeg','images/l10n_ch_chart.jpeg']
+}
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/l10n_ch/i18n/ar.po b/addons/l10n_ch/i18n/ar.po
index 2aed1b52fac..92f8d030716 100644
--- a/addons/l10n_ch/i18n/ar.po
+++ b/addons/l10n_ch/i18n/ar.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:55+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:29+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_ch
 #: model:ir.model,name:l10n_ch.model_account_tax_code
diff --git a/addons/l10n_ch/i18n/bg.po b/addons/l10n_ch/i18n/bg.po
index 160898b0835..a0114417bd9 100644
--- a/addons/l10n_ch/i18n/bg.po
+++ b/addons/l10n_ch/i18n/bg.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:55+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:29+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_ch
 #: model:ir.model,name:l10n_ch.model_account_tax_code
diff --git a/addons/l10n_ch/i18n/bs.po b/addons/l10n_ch/i18n/bs.po
index 8b1d5ae1aa4..f699897547d 100644
--- a/addons/l10n_ch/i18n/bs.po
+++ b/addons/l10n_ch/i18n/bs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:55+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:29+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_ch
 #: model:ir.model,name:l10n_ch.model_account_tax_code
diff --git a/addons/l10n_ch/i18n/ca.po b/addons/l10n_ch/i18n/ca.po
index 5d58cc67073..a26e6d4136e 100644
--- a/addons/l10n_ch/i18n/ca.po
+++ b/addons/l10n_ch/i18n/ca.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:55+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:29+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_ch
 #: model:ir.model,name:l10n_ch.model_account_tax_code
diff --git a/addons/l10n_ch/i18n/cs.po b/addons/l10n_ch/i18n/cs.po
index 19f1fc71c9b..8e6dd4660de 100644
--- a/addons/l10n_ch/i18n/cs.po
+++ b/addons/l10n_ch/i18n/cs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:55+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:29+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_ch
 #: model:ir.model,name:l10n_ch.model_account_tax_code
diff --git a/addons/l10n_ch/i18n/da.po b/addons/l10n_ch/i18n/da.po
index 94681288d47..35df9bed149 100644
--- a/addons/l10n_ch/i18n/da.po
+++ b/addons/l10n_ch/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:55+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:29+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_ch
 #: model:ir.model,name:l10n_ch.model_account_tax_code
diff --git a/addons/l10n_ch/i18n/de.po b/addons/l10n_ch/i18n/de.po
index db0fa15667e..ffefeb8c577 100644
--- a/addons/l10n_ch/i18n/de.po
+++ b/addons/l10n_ch/i18n/de.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:55+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:29+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_ch
 #: model:ir.model,name:l10n_ch.model_account_tax_code
diff --git a/addons/l10n_ch/i18n/es.po b/addons/l10n_ch/i18n/es.po
index ec826214893..16fe81de2ab 100644
--- a/addons/l10n_ch/i18n/es.po
+++ b/addons/l10n_ch/i18n/es.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:55+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:29+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_ch
 #: model:ir.model,name:l10n_ch.model_account_tax_code
diff --git a/addons/l10n_ch/i18n/es_AR.po b/addons/l10n_ch/i18n/es_AR.po
index 3e5f0c89d57..23161c7709d 100644
--- a/addons/l10n_ch/i18n/es_AR.po
+++ b/addons/l10n_ch/i18n/es_AR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:56+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:29+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_ch
 #: model:ir.model,name:l10n_ch.model_account_tax_code
diff --git a/addons/l10n_ch/i18n/es_CR.po b/addons/l10n_ch/i18n/es_CR.po
index 0772980d9d1..a1e5f157f25 100644
--- a/addons/l10n_ch/i18n/es_CR.po
+++ b/addons/l10n_ch/i18n/es_CR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:56+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:29+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 "Language: \n"
 
 #. module: l10n_ch
diff --git a/addons/l10n_ch/i18n/et.po b/addons/l10n_ch/i18n/et.po
index 27217e9330f..6980b6cebde 100644
--- a/addons/l10n_ch/i18n/et.po
+++ b/addons/l10n_ch/i18n/et.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:55+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:29+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_ch
 #: model:ir.model,name:l10n_ch.model_account_tax_code
diff --git a/addons/l10n_ch/i18n/fr.po b/addons/l10n_ch/i18n/fr.po
index ba71ad98635..bd56f4d904c 100644
--- a/addons/l10n_ch/i18n/fr.po
+++ b/addons/l10n_ch/i18n/fr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:55+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:29+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_ch
 #: model:ir.model,name:l10n_ch.model_account_tax_code
diff --git a/addons/l10n_ch/i18n/hr.po b/addons/l10n_ch/i18n/hr.po
index 6f7d7d8f553..58efcffe3a1 100644
--- a/addons/l10n_ch/i18n/hr.po
+++ b/addons/l10n_ch/i18n/hr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:55+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:29+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_ch
 #: model:ir.model,name:l10n_ch.model_account_tax_code
diff --git a/addons/l10n_ch/i18n/hu.po b/addons/l10n_ch/i18n/hu.po
index 6f7d7d8f553..58efcffe3a1 100644
--- a/addons/l10n_ch/i18n/hu.po
+++ b/addons/l10n_ch/i18n/hu.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:55+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:29+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_ch
 #: model:ir.model,name:l10n_ch.model_account_tax_code
diff --git a/addons/l10n_ch/i18n/id.po b/addons/l10n_ch/i18n/id.po
index a0b8ed1e7f7..fca5701f026 100644
--- a/addons/l10n_ch/i18n/id.po
+++ b/addons/l10n_ch/i18n/id.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:55+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:29+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_ch
 #: model:ir.model,name:l10n_ch.model_account_tax_code
diff --git a/addons/l10n_ch/i18n/it.po b/addons/l10n_ch/i18n/it.po
index 1f0c15507b1..e3644ced6d1 100644
--- a/addons/l10n_ch/i18n/it.po
+++ b/addons/l10n_ch/i18n/it.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:55+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:29+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_ch
 #: model:ir.model,name:l10n_ch.model_account_tax_code
diff --git a/addons/l10n_ch/i18n/ko.po b/addons/l10n_ch/i18n/ko.po
index efee4c1d1af..11b57b82807 100644
--- a/addons/l10n_ch/i18n/ko.po
+++ b/addons/l10n_ch/i18n/ko.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:55+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:29+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_ch
 #: model:ir.model,name:l10n_ch.model_account_tax_code
diff --git a/addons/l10n_ch/i18n/lt.po b/addons/l10n_ch/i18n/lt.po
index 6f7d7d8f553..58efcffe3a1 100644
--- a/addons/l10n_ch/i18n/lt.po
+++ b/addons/l10n_ch/i18n/lt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:55+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:29+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_ch
 #: model:ir.model,name:l10n_ch.model_account_tax_code
diff --git a/addons/l10n_ch/i18n/nl.po b/addons/l10n_ch/i18n/nl.po
index 3079550e3e9..fada084fc0b 100644
--- a/addons/l10n_ch/i18n/nl.po
+++ b/addons/l10n_ch/i18n/nl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:55+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:29+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_ch
 #: model:ir.model,name:l10n_ch.model_account_tax_code
diff --git a/addons/l10n_ch/i18n/nl_BE.po b/addons/l10n_ch/i18n/nl_BE.po
index 59a464beb12..5703a5a20f5 100644
--- a/addons/l10n_ch/i18n/nl_BE.po
+++ b/addons/l10n_ch/i18n/nl_BE.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:56+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:29+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_ch
 #: model:ir.model,name:l10n_ch.model_account_tax_code
diff --git a/addons/l10n_ch/i18n/pl.po b/addons/l10n_ch/i18n/pl.po
index 200a69fd55f..d2c14fcda3b 100644
--- a/addons/l10n_ch/i18n/pl.po
+++ b/addons/l10n_ch/i18n/pl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:55+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:29+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_ch
 #: model:ir.model,name:l10n_ch.model_account_tax_code
diff --git a/addons/l10n_ch/i18n/pt.po b/addons/l10n_ch/i18n/pt.po
index 36d5e19938c..2656db6a9c5 100644
--- a/addons/l10n_ch/i18n/pt.po
+++ b/addons/l10n_ch/i18n/pt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:55+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:29+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_ch
 #: model:ir.model,name:l10n_ch.model_account_tax_code
diff --git a/addons/l10n_ch/i18n/pt_BR.po b/addons/l10n_ch/i18n/pt_BR.po
index f5712df877f..fbe811a41ce 100644
--- a/addons/l10n_ch/i18n/pt_BR.po
+++ b/addons/l10n_ch/i18n/pt_BR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:56+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:29+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_ch
 #: model:ir.model,name:l10n_ch.model_account_tax_code
diff --git a/addons/l10n_ch/i18n/ro.po b/addons/l10n_ch/i18n/ro.po
index 6f7d7d8f553..58efcffe3a1 100644
--- a/addons/l10n_ch/i18n/ro.po
+++ b/addons/l10n_ch/i18n/ro.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:55+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:29+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_ch
 #: model:ir.model,name:l10n_ch.model_account_tax_code
diff --git a/addons/l10n_ch/i18n/ru.po b/addons/l10n_ch/i18n/ru.po
index b2fdcad3ac2..de785b205c8 100644
--- a/addons/l10n_ch/i18n/ru.po
+++ b/addons/l10n_ch/i18n/ru.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:55+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:29+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_ch
 #: model:ir.model,name:l10n_ch.model_account_tax_code
diff --git a/addons/l10n_ch/i18n/sl.po b/addons/l10n_ch/i18n/sl.po
index d1b11ac5f6d..6a847cadeb2 100644
--- a/addons/l10n_ch/i18n/sl.po
+++ b/addons/l10n_ch/i18n/sl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:55+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:29+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_ch
 #: model:ir.model,name:l10n_ch.model_account_tax_code
diff --git a/addons/l10n_ch/i18n/sq.po b/addons/l10n_ch/i18n/sq.po
index 1c0075c18d8..43552e1cbbd 100644
--- a/addons/l10n_ch/i18n/sq.po
+++ b/addons/l10n_ch/i18n/sq.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:55+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:29+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_ch
 #: model:ir.model,name:l10n_ch.model_account_tax_code
diff --git a/addons/l10n_ch/i18n/sr@latin.po b/addons/l10n_ch/i18n/sr@latin.po
index 848975aad84..a272bfdf70c 100644
--- a/addons/l10n_ch/i18n/sr@latin.po
+++ b/addons/l10n_ch/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:56+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:29+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_ch
 #: model:ir.model,name:l10n_ch.model_account_tax_code
diff --git a/addons/l10n_ch/i18n/sv.po b/addons/l10n_ch/i18n/sv.po
index 7ac19fbacbf..9e8cb5345aa 100644
--- a/addons/l10n_ch/i18n/sv.po
+++ b/addons/l10n_ch/i18n/sv.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:55+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:29+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_ch
 #: model:ir.model,name:l10n_ch.model_account_tax_code
diff --git a/addons/l10n_ch/i18n/tr.po b/addons/l10n_ch/i18n/tr.po
index 31d372216b5..877b60e2eb7 100644
--- a/addons/l10n_ch/i18n/tr.po
+++ b/addons/l10n_ch/i18n/tr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:55+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:29+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_ch
 #: model:ir.model,name:l10n_ch.model_account_tax_code
diff --git a/addons/l10n_ch/i18n/uk.po b/addons/l10n_ch/i18n/uk.po
index 4c5c6fad5c9..e48bf696dc0 100644
--- a/addons/l10n_ch/i18n/uk.po
+++ b/addons/l10n_ch/i18n/uk.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:55+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:29+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_ch
 #: model:ir.model,name:l10n_ch.model_account_tax_code
diff --git a/addons/l10n_ch/i18n/vi.po b/addons/l10n_ch/i18n/vi.po
index 4521e148607..78bbe73d358 100644
--- a/addons/l10n_ch/i18n/vi.po
+++ b/addons/l10n_ch/i18n/vi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:55+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:29+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_ch
 #: model:ir.model,name:l10n_ch.model_account_tax_code
diff --git a/addons/l10n_ch/i18n/zh_CN.po b/addons/l10n_ch/i18n/zh_CN.po
index 1f8fc8af60f..69483135351 100644
--- a/addons/l10n_ch/i18n/zh_CN.po
+++ b/addons/l10n_ch/i18n/zh_CN.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:56+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:29+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_ch
 #: model:ir.model,name:l10n_ch.model_account_tax_code
diff --git a/addons/l10n_ch/i18n/zh_TW.po b/addons/l10n_ch/i18n/zh_TW.po
index 78c7b2474fa..58efcffe3a1 100644
--- a/addons/l10n_ch/i18n/zh_TW.po
+++ b/addons/l10n_ch/i18n/zh_TW.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:56+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:29+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_ch
 #: model:ir.model,name:l10n_ch.model_account_tax_code
diff --git a/addons/l10n_ch/sterchi_chart/account.xml b/addons/l10n_ch/sterchi_chart/account.xml
index 588fa5fed61..b04031d42ce 100644
--- a/addons/l10n_ch/sterchi_chart/account.xml
+++ b/addons/l10n_ch/sterchi_chart/account.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <openerp>
-    <data noupdate="True">
+    <data noupdate="1">
        <record id="account_type_view" model="account.account.type">
            <field name="name">Autre : Vue</field>
            <field name="code">view</field>
diff --git a/addons/l10n_ch/sterchi_chart/account_journal_rel.xml b/addons/l10n_ch/sterchi_chart/account_journal_rel.xml
index 43dbbe5e8fa..bb2e4c255ff 100644
--- a/addons/l10n_ch/sterchi_chart/account_journal_rel.xml
+++ b/addons/l10n_ch/sterchi_chart/account_journal_rel.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <openerp>
-    <data noupdate="True">
+    <data noupdate="1">
         <!-- journal configuration of account -->
         
         <record id="expenses_journal" model="account.journal">
diff --git a/addons/l10n_ch/test/l10n_ch_dta.yml b/addons/l10n_ch/test/l10n_ch_dta.yml
index 06c15d524b2..8867c46df75 100644
--- a/addons/l10n_ch/test/l10n_ch_dta.yml
+++ b/addons/l10n_ch/test/l10n_ch_dta.yml
@@ -25,7 +25,7 @@
 -
   !record {model: account.invoice.line, id: dta_invoice_line, view: False}:
     account_id: account.a_expense
-    name: '[PC1] Basic PC'
+    name: '[PCSC234] PC Assemble SC234'
     price_unit: 700.0
     quantity: 10.0
     product_id: product.product_product_3
diff --git a/addons/l10n_ch/test/l10n_ch_v11.yml b/addons/l10n_ch/test/l10n_ch_v11.yml
index 4bacbf730f8..975e3569eb4 100644
--- a/addons/l10n_ch/test/l10n_ch_v11.yml
+++ b/addons/l10n_ch/test/l10n_ch_v11.yml
@@ -26,7 +26,7 @@
 -
   !record {model: account.invoice.line, id: v11_test_invoice_line, view: False}:
     account_id: account.a_expense
-    name: '[PC1] Basic PC'
+    name: '[PCSC234] PC Assemble SC234'
     price_unit: 888.00
     quantity: 1.0
     product_id: product.product_product_3
diff --git a/addons/l10n_ch/test/l10n_ch_v11_part.yml b/addons/l10n_ch/test/l10n_ch_v11_part.yml
index 811ee77bc4a..01e3a9624ea 100644
--- a/addons/l10n_ch/test/l10n_ch_v11_part.yml
+++ b/addons/l10n_ch/test/l10n_ch_v11_part.yml
@@ -27,7 +27,7 @@
 -
   !record {model: account.invoice.line, id: v11_part_test_invoice_line, view: False}:
     account_id: account.a_expense
-    name: '[PC1] Basic PC'
+    name: '[PCSC234] PC Assemble SC234'
     price_unit: 250.00
     quantity: 1.0
     product_id: product.product_product_3
diff --git a/addons/l10n_cl/__openerp__.py b/addons/l10n_cl/__openerp__.py
index d10acdae575..5417faed3f4 100644
--- a/addons/l10n_cl/__openerp__.py
+++ b/addons/l10n_cl/__openerp__.py
@@ -17,34 +17,29 @@
 #    You should have received a copy of the GNU Affero General Public License
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
-##############################################################################
+##############################################################################
 {
-    "name": "Chile Localization Chart Account",
-    "version": "1.0",
-    "description": """
+    'name': 'Chile Localization Chart Account',
+    'version': '1.0',
+    'description': """
 Chilean accounting chart and tax localization.
-
+==============================================
 Plan contable chileno e impuestos de acuerdo a disposiciones vigentes
 
     """,
-    "author": "Cubic ERP",
-    "website": "http://cubicERP.com",
-    "category": "Localization/Account Charts",
-    "depends": [
-			"account_chart",
-			],
-	"data":[
-        "account_tax_code.xml",
-        "l10n_cl_chart.xml",
-        "account_tax.xml",
-        "l10n_cl_wizard.xml",
-			],
-    "demo_xml": [
-			],
-    "update_xml": [
-			],
-    "active": False,
-    "installable": True,
+    'author': 'Cubic ERP',
+    'website': 'http://cubicERP.com',
+    'category': 'Localization/Account Charts',
+    'depends': ['account_chart'],
+    'data': [
+        'account_tax_code.xml',
+        'l10n_cl_chart.xml',
+        'account_tax.xml',
+        'l10n_cl_wizard.xml',
+    ],
+    'demo': [],
+    'active': False,
+    'installable': True,
     'images': ['images/config_chart_l10n_cl.jpeg','images/l10n_cl_chart.jpeg'],
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/l10n_cn/__openerp__.py b/addons/l10n_cn/__openerp__.py
index e173c5ebba2..0cc26a5052e 100644
--- a/addons/l10n_cn/__openerp__.py
+++ b/addons/l10n_cn/__openerp__.py
@@ -18,31 +18,29 @@
 #
 ##############################################################################
 {
-    "name" : "中国会计科目表 - Accounting",
-    "version" : "1.0",
-    "category": "Localization/Account Charts",
-    "author" : "openerp-china.org",
-    "maintainer":"openerp-china.org",
-    "website":"http://openerp-china.org",
-    "url":"http://code.google.com/p/openerp-china/source/browse/#svn/trunk/l10n_cn",
-    "description": """
+    'name': '中国会计科目表 - Accounting',
+    'version': '1.0',
+    'category': 'Localization/Account Charts',
+    'author': 'openerp-china.org',
+    'maintainer':'openerp-china.org',
+    'website':'http://openerp-china.org',
+    'url': 'http://code.google.com/p/openerp-china/source/browse/#svn/trunk/l10n_cn',
+    'description': """
 添加中文省份数据
 科目类型\会计科目表模板\增值税\辅助核算类别\管理会计凭证簿\财务会计凭证簿
 ============================================================
     """,
-    "depends" : ["base","account"],
-    'init_xml': [
+    'depends': ['base','account'],
+    'demo': [],
+    'data': [
+        'account_chart.xml',
+        'l10n_chart_cn_wizard.xml',
         'base_data.xml',
     ],
-    "demo_xml" : [],
-    "update_xml" : [
-        'account_chart.xml',
-        "l10n_chart_cn_wizard.xml",
-    ],
-    "license": "GPL-3",
-    "auto_install": False,
-    "installable": True,
-    "certificate": '00925445983542952285',
+    'license': 'GPL-3',
+    'auto_install': False,
+    'installable': True,
+    'certificate': '00925445983542952285',
     'images': ['images/config_chart_l10n_cn.jpeg','images/l10n_cn_chart.jpeg'],
 }
 
diff --git a/addons/l10n_cn/base_data.xml b/addons/l10n_cn/base_data.xml
index 18242ba38b9..c65978b6560 100644
--- a/addons/l10n_cn/base_data.xml
+++ b/addons/l10n_cn/base_data.xml
@@ -1,162 +1,162 @@
-<?xml version="1.0"?>
-<openerp>
-    <data>
-
-        <!-- 添加省份数据 -->
-        <record id="state_BJ" model="res.country.state">
-            <field name="name">北京市</field>
-            <field name="code">京</field>
-            <field name="country_id" ref="base.cn"/>
-        </record>
-        <record id="state_SH" model="res.country.state">
-            <field name="name">上海市</field>
-            <field name="code">沪</field>
-            <field name="country_id" ref="base.cn"/>
-        </record>
-        <record id="state_ZJ" model="res.country.state">
-            <field name="name">浙江省</field>
-            <field name="code">浙</field>
-            <field name="country_id" ref="base.cn"/>
-        </record>
-        <record id="state_TJ" model="res.country.state">
-            <field name="name">天津市</field>
-            <field name="code">津</field>
-            <field name="country_id" ref="base.cn"/>
-        </record>
-        <record id="state_AH" model="res.country.state">
-            <field name="name">安徽省</field>
-            <field name="code">皖</field>
-            <field name="country_id" ref="base.cn"/>
-        </record>
-        <record id="state_FJ" model="res.country.state">
-            <field name="name">福建省</field>
-            <field name="code">闽</field>
-            <field name="country_id" ref="base.cn"/>
-        </record>
-        <record id="state_CQ" model="res.country.state">
-            <field name="name">重庆市</field>
-            <field name="code">渝 </field>
-            <field name="country_id" ref="base.cn"/>
-        </record>
-        <record id="state_JX" model="res.country.state">
-            <field name="name">江西省</field>
-            <field name="code">赣</field>
-            <field name="country_id" ref="base.cn"/>
-        </record>
-        <record id="state_SD" model="res.country.state">
-            <field name="name">山东省</field>
-            <field name="code">鲁</field>
-            <field name="country_id" ref="base.cn"/>
-        </record>
-        <record id="state_HeN" model="res.country.state">
-            <field name="name">河南省</field>
-            <field name="code">豫</field>
-            <field name="country_id" ref="base.cn"/>
-        </record>
-        <record id="state_NM" model="res.country.state">
-            <field name="name">内蒙古自治区</field>
-            <field name="code">蒙</field>
-            <field name="country_id" ref="base.cn"/>
-        </record>
-        <record id="state_HuB" model="res.country.state">
-            <field name="name">湖北省</field>
-            <field name="code">鄂</field>
-            <field name="country_id" ref="base.cn"/>
-        </record>
-        <record id="state_XJ" model="res.country.state">
-            <field name="name">新疆维吾尔自治区</field>
-            <field name="code">新</field>
-            <field name="country_id" ref="base.cn"/>
-        </record>
-        <record id="state_HuN" model="res.country.state">
-            <field name="name">湖南省</field>
-            <field name="code">湘</field>
-            <field name="country_id" ref="base.cn"/>
-        </record>
-        <record id="state_NX" model="res.country.state">
-            <field name="name">宁夏回族自治区</field>
-            <field name="code">宁</field>
-            <field name="country_id" ref="base.cn"/>
-        </record>
-        <record id="state_GD" model="res.country.state">
-            <field name="name">广东省</field>
-            <field name="code">粤</field>
-            <field name="country_id" ref="base.cn"/>
-        </record>
-        <record id="state_XZ" model="res.country.state">
-            <field name="name">西藏自治区</field>
-            <field name="code">藏</field>
-            <field name="country_id" ref="base.cn"/>
-        </record>
-        <record id="state_HaN" model="res.country.state">
-            <field name="name">海南省</field>
-            <field name="code">琼</field>
-            <field name="country_id" ref="base.cn"/>
-        </record>
-        <record id="state_GX" model="res.country.state">
-            <field name="name">广西壮族自治区</field>
-            <field name="code">桂</field>
-            <field name="country_id" ref="base.cn"/>
-        </record>
-        <record id="state_SC" model="res.country.state">
-            <field name="name">四川省</field>
-            <field name="code">蜀</field>
-            <field name="country_id" ref="base.cn"/>
-        </record>
-        <record id="state_HeB" model="res.country.state">
-            <field name="name">河北省</field>
-            <field name="code">冀</field>
-            <field name="country_id" ref="base.cn"/>
-        </record>
-        <record id="state_GZ" model="res.country.state">
-            <field name="name">贵州省</field>
-            <field name="code">黔</field>
-            <field name="country_id" ref="base.cn"/>
-        </record>
-        <record id="state_SX" model="res.country.state">
-            <field name="name">山西省</field>
-            <field name="code">晋</field>
-            <field name="country_id" ref="base.cn"/>
-        </record>
-        <record id="state_YN" model="res.country.state">
-            <field name="name">云南省</field>
-            <field name="code">滇</field>
-            <field name="country_id" ref="base.cn"/>
-        </record>
-        <record id="state_LN" model="res.country.state">
-            <field name="name">辽宁省</field>
-            <field name="code">辽</field>
-            <field name="country_id" ref="base.cn"/>
-        </record>
-        <record id="state_SX" model="res.country.state">
-            <field name="name">陕西省</field>
-            <field name="code">陕</field>
-            <field name="country_id" ref="base.cn"/>
-        </record>
-        <record id="state_JL" model="res.country.state">
-            <field name="name">吉林省</field>
-            <field name="code">吉</field>
-            <field name="country_id" ref="base.cn"/>
-        </record>
-        <record id="state_GS" model="res.country.state">
-            <field name="name">甘肃省</field>
-            <field name="code">甘</field>
-            <field name="country_id" ref="base.cn"/>
-        </record>
-        <record id="state_HL" model="res.country.state">
-            <field name="name">黑龙江省</field>
-            <field name="code">黑</field>
-            <field name="country_id" ref="base.cn"/>
-        </record>
-        <record id="state_QH" model="res.country.state">
-            <field name="name">青海省</field>
-            <field name="code">青</field>
-            <field name="country_id" ref="base.cn"/>
-        </record>
-        <record id="state_JS" model="res.country.state">
-            <field name="name">江苏省</field>
-            <field name="code">苏</field>
-            <field name="country_id" ref="base.cn"/>
-        </record>
-    </data>
-</openerp>
+<?xml version="1.0"?>
+<openerp>
+    <data noupdate="1">
+
+        <!-- 添加省份数据 -->
+        <record id="state_BJ" model="res.country.state">
+            <field name="name">北京市</field>
+            <field name="code">京</field>
+            <field name="country_id" ref="base.cn"/>
+        </record>
+        <record id="state_SH" model="res.country.state">
+            <field name="name">上海市</field>
+            <field name="code">沪</field>
+            <field name="country_id" ref="base.cn"/>
+        </record>
+        <record id="state_ZJ" model="res.country.state">
+            <field name="name">浙江省</field>
+            <field name="code">浙</field>
+            <field name="country_id" ref="base.cn"/>
+        </record>
+        <record id="state_TJ" model="res.country.state">
+            <field name="name">天津市</field>
+            <field name="code">津</field>
+            <field name="country_id" ref="base.cn"/>
+        </record>
+        <record id="state_AH" model="res.country.state">
+            <field name="name">安徽省</field>
+            <field name="code">皖</field>
+            <field name="country_id" ref="base.cn"/>
+        </record>
+        <record id="state_FJ" model="res.country.state">
+            <field name="name">福建省</field>
+            <field name="code">闽</field>
+            <field name="country_id" ref="base.cn"/>
+        </record>
+        <record id="state_CQ" model="res.country.state">
+            <field name="name">重庆市</field>
+            <field name="code">渝 </field>
+            <field name="country_id" ref="base.cn"/>
+        </record>
+        <record id="state_JX" model="res.country.state">
+            <field name="name">江西省</field>
+            <field name="code">赣</field>
+            <field name="country_id" ref="base.cn"/>
+        </record>
+        <record id="state_SD" model="res.country.state">
+            <field name="name">山东省</field>
+            <field name="code">鲁</field>
+            <field name="country_id" ref="base.cn"/>
+        </record>
+        <record id="state_HeN" model="res.country.state">
+            <field name="name">河南省</field>
+            <field name="code">豫</field>
+            <field name="country_id" ref="base.cn"/>
+        </record>
+        <record id="state_NM" model="res.country.state">
+            <field name="name">内蒙古自治区</field>
+            <field name="code">蒙</field>
+            <field name="country_id" ref="base.cn"/>
+        </record>
+        <record id="state_HuB" model="res.country.state">
+            <field name="name">湖北省</field>
+            <field name="code">鄂</field>
+            <field name="country_id" ref="base.cn"/>
+        </record>
+        <record id="state_XJ" model="res.country.state">
+            <field name="name">新疆维吾尔自治区</field>
+            <field name="code">新</field>
+            <field name="country_id" ref="base.cn"/>
+        </record>
+        <record id="state_HuN" model="res.country.state">
+            <field name="name">湖南省</field>
+            <field name="code">湘</field>
+            <field name="country_id" ref="base.cn"/>
+        </record>
+        <record id="state_NX" model="res.country.state">
+            <field name="name">宁夏回族自治区</field>
+            <field name="code">宁</field>
+            <field name="country_id" ref="base.cn"/>
+        </record>
+        <record id="state_GD" model="res.country.state">
+            <field name="name">广东省</field>
+            <field name="code">粤</field>
+            <field name="country_id" ref="base.cn"/>
+        </record>
+        <record id="state_XZ" model="res.country.state">
+            <field name="name">西藏自治区</field>
+            <field name="code">藏</field>
+            <field name="country_id" ref="base.cn"/>
+        </record>
+        <record id="state_HaN" model="res.country.state">
+            <field name="name">海南省</field>
+            <field name="code">琼</field>
+            <field name="country_id" ref="base.cn"/>
+        </record>
+        <record id="state_GX" model="res.country.state">
+            <field name="name">广西壮族自治区</field>
+            <field name="code">桂</field>
+            <field name="country_id" ref="base.cn"/>
+        </record>
+        <record id="state_SC" model="res.country.state">
+            <field name="name">四川省</field>
+            <field name="code">蜀</field>
+            <field name="country_id" ref="base.cn"/>
+        </record>
+        <record id="state_HeB" model="res.country.state">
+            <field name="name">河北省</field>
+            <field name="code">冀</field>
+            <field name="country_id" ref="base.cn"/>
+        </record>
+        <record id="state_GZ" model="res.country.state">
+            <field name="name">贵州省</field>
+            <field name="code">黔</field>
+            <field name="country_id" ref="base.cn"/>
+        </record>
+        <record id="state_SX" model="res.country.state">
+            <field name="name">山西省</field>
+            <field name="code">晋</field>
+            <field name="country_id" ref="base.cn"/>
+        </record>
+        <record id="state_YN" model="res.country.state">
+            <field name="name">云南省</field>
+            <field name="code">滇</field>
+            <field name="country_id" ref="base.cn"/>
+        </record>
+        <record id="state_LN" model="res.country.state">
+            <field name="name">辽宁省</field>
+            <field name="code">辽</field>
+            <field name="country_id" ref="base.cn"/>
+        </record>
+        <record id="state_SX" model="res.country.state">
+            <field name="name">陕西省</field>
+            <field name="code">陕</field>
+            <field name="country_id" ref="base.cn"/>
+        </record>
+        <record id="state_JL" model="res.country.state">
+            <field name="name">吉林省</field>
+            <field name="code">吉</field>
+            <field name="country_id" ref="base.cn"/>
+        </record>
+        <record id="state_GS" model="res.country.state">
+            <field name="name">甘肃省</field>
+            <field name="code">甘</field>
+            <field name="country_id" ref="base.cn"/>
+        </record>
+        <record id="state_HL" model="res.country.state">
+            <field name="name">黑龙江省</field>
+            <field name="code">黑</field>
+            <field name="country_id" ref="base.cn"/>
+        </record>
+        <record id="state_QH" model="res.country.state">
+            <field name="name">青海省</field>
+            <field name="code">青</field>
+            <field name="country_id" ref="base.cn"/>
+        </record>
+        <record id="state_JS" model="res.country.state">
+            <field name="name">江苏省</field>
+            <field name="code">苏</field>
+            <field name="country_id" ref="base.cn"/>
+        </record>
+    </data>
+</openerp>
diff --git a/addons/l10n_cn/i18n/ar.po b/addons/l10n_cn/i18n/ar.po
index 7db57c46cb1..83e2d4895b3 100644
--- a/addons/l10n_cn/i18n/ar.po
+++ b/addons/l10n_cn/i18n/ar.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_cn
 #: model:account.account.type,name:l10n_cn.user_type_profit_and_loss
diff --git a/addons/l10n_cn/i18n/ca.po b/addons/l10n_cn/i18n/ca.po
index 0cacc48c0e7..555fff8e1c9 100644
--- a/addons/l10n_cn/i18n/ca.po
+++ b/addons/l10n_cn/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_cn
 #: model:account.account.type,name:l10n_cn.user_type_profit_and_loss
diff --git a/addons/l10n_cn/i18n/da.po b/addons/l10n_cn/i18n/da.po
index ab683c020bb..46a6bd0e5af 100644
--- a/addons/l10n_cn/i18n/da.po
+++ b/addons/l10n_cn/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_cn
 #: model:account.account.type,name:l10n_cn.user_type_profit_and_loss
diff --git a/addons/l10n_cn/i18n/es.po b/addons/l10n_cn/i18n/es.po
index 7efd7dbe9e0..dc187242353 100644
--- a/addons/l10n_cn/i18n/es.po
+++ b/addons/l10n_cn/i18n/es.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_cn
 #: model:account.account.type,name:l10n_cn.user_type_profit_and_loss
diff --git a/addons/l10n_cn/i18n/es_CR.po b/addons/l10n_cn/i18n/es_CR.po
index 19277ac9a0a..29204a1dbe0 100644
--- a/addons/l10n_cn/i18n/es_CR.po
+++ b/addons/l10n_cn/i18n/es_CR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 "Language: es\n"
 
 #. module: l10n_cn
diff --git a/addons/l10n_cn/i18n/es_PY.po b/addons/l10n_cn/i18n/es_PY.po
index fd7ddd604db..5c8880a0869 100644
--- a/addons/l10n_cn/i18n/es_PY.po
+++ b/addons/l10n_cn/i18n/es_PY.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_cn
 #: model:account.account.type,name:l10n_cn.user_type_profit_and_loss
diff --git a/addons/l10n_cn/i18n/gl.po b/addons/l10n_cn/i18n/gl.po
index dd675db0848..6fabe0534dc 100644
--- a/addons/l10n_cn/i18n/gl.po
+++ b/addons/l10n_cn/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_cn
 #: model:account.account.type,name:l10n_cn.user_type_profit_and_loss
diff --git a/addons/l10n_cn/i18n/it.po b/addons/l10n_cn/i18n/it.po
index 6a813ace97f..4b53ce56a4f 100644
--- a/addons/l10n_cn/i18n/it.po
+++ b/addons/l10n_cn/i18n/it.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_cn
 #: model:account.account.type,name:l10n_cn.user_type_profit_and_loss
diff --git a/addons/l10n_cn/i18n/nb.po b/addons/l10n_cn/i18n/nb.po
new file mode 100644
index 00000000000..cafcf30d8e8
--- /dev/null
+++ b/addons/l10n_cn/i18n/nb.po
@@ -0,0 +1,66 @@
+# Norwegian Bokmal 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: 2011-12-23 09:56+0000\n"
+"PO-Revision-Date: 2012-09-08 19:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Norwegian Bokmal <nb@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-09-09 04:52+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
+
+#. module: l10n_cn
+#: model:account.account.type,name:l10n_cn.user_type_profit_and_loss
+msgid "损益类"
+msgstr "Gevinst eller tap kategori."
+
+#. module: l10n_cn
+#: model:account.account.type,name:l10n_cn.user_type_all
+msgid "所有科目"
+msgstr "Alle fag."
+
+#. module: l10n_cn
+#: model:account.account.type,name:l10n_cn.user_type_equity
+msgid "所有者权益类"
+msgstr "Eiernes egenkapital."
+
+#. module: l10n_cn
+#: model:ir.actions.todo,note:l10n_cn.config_call_account_template_cn_chart
+msgid ""
+"Generate Chart of Accounts from a Chart Template. You will be asked to pass "
+"the name of the company, the chart template to follow, the no. of digits to "
+"generate the code for your accounts and Bank account, currency to create "
+"Journals. Thus,the pure copy of chart Template is generated.\n"
+"\tThis is the same wizard that runs from Financial "
+"Management/Configuration/Financial Accounting/Financial Accounts/Generate "
+"Chart of Accounts from a Chart Template."
+msgstr ""
+"Generere Kontoplan fra en diagrammal. Du vil bli bedt om å passere navnet på "
+"selskapet, diagrammal til følge, nei. sifre som skal generere koden for "
+"kontoene og bankkonto, valuta å skape Journals. Dermed er den rene kopi av "
+"diagrammal generert.\n"
+"\t Dette er den samme veiviser som går fra økonomistyring / konfigurasjon / "
+"finansiell Regnskap / finansregnskapet / Generer Kontoplan fra en diagrammal."
+
+#. module: l10n_cn
+#: model:account.account.type,name:l10n_cn.user_type_debt
+msgid "负债类"
+msgstr "Gjeld klasse."
+
+#. module: l10n_cn
+#: model:account.account.type,name:l10n_cn.user_type_cost
+msgid "成本类"
+msgstr "Kostnaden for klassen"
+
+#. module: l10n_cn
+#: model:account.account.type,name:l10n_cn.user_type_capital
+msgid "资产类"
+msgstr "Aktivaklasser"
diff --git a/addons/l10n_cn/i18n/pt_BR.po b/addons/l10n_cn/i18n/pt_BR.po
index 65ab9eff28a..68670229801 100644
--- a/addons/l10n_cn/i18n/pt_BR.po
+++ b/addons/l10n_cn/i18n/pt_BR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_cn
 #: model:account.account.type,name:l10n_cn.user_type_profit_and_loss
diff --git a/addons/l10n_cn/i18n/sr@latin.po b/addons/l10n_cn/i18n/sr@latin.po
index f560f3ba928..08e1817a742 100644
--- a/addons/l10n_cn/i18n/sr@latin.po
+++ b/addons/l10n_cn/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_cn
 #: model:account.account.type,name:l10n_cn.user_type_profit_and_loss
diff --git a/addons/l10n_cn/i18n/tr.po b/addons/l10n_cn/i18n/tr.po
index 3b61d5dfe33..a8e9c45921d 100644
--- a/addons/l10n_cn/i18n/tr.po
+++ b/addons/l10n_cn/i18n/tr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_cn
 #: model:account.account.type,name:l10n_cn.user_type_profit_and_loss
diff --git a/addons/l10n_cn/i18n/zh_CN.po b/addons/l10n_cn/i18n/zh_CN.po
index bc1663caf12..aec05ebed3c 100644
--- a/addons/l10n_cn/i18n/zh_CN.po
+++ b/addons/l10n_cn/i18n/zh_CN.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_cn
 #: model:account.account.type,name:l10n_cn.user_type_profit_and_loss
diff --git a/addons/l10n_cr/__openerp__.py b/addons/l10n_cr/__openerp__.py
index 562af835398..cc90ed3be9e 100644
--- a/addons/l10n_cr/__openerp__.py
+++ b/addons/l10n_cr/__openerp__.py
@@ -44,6 +44,7 @@ Chart of accounts for Costa Rica.
 =================================
 
 Includes:
+---------
     * account.type
     * account.account.template
     * account.tax.template
@@ -54,9 +55,8 @@ Everything is in English with Spanish translation. Further translations are welc
 please go to http://translations.launchpad.net/openerp-costa-rica.
     """,
     'depends': ['account', 'account_chart', 'base'],
-    'init_xml': [],
-    'demo_xml': [],
-    'update_xml': [
+    'demo': [],
+    'data': [
         'l10n_cr_base_data.xml',
         'data/account_account_type.xml',
         'data/account_account_template.xml',
diff --git a/addons/l10n_cr/i18n/ar.po b/addons/l10n_cr/i18n/ar.po
index c24f5ee4aa7..144f857ac36 100644
--- a/addons/l10n_cr/i18n/ar.po
+++ b/addons/l10n_cr/i18n/ar.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_cr
 #: model:res.partner.title,name:l10n_cr.res_partner_title_ing
diff --git a/addons/l10n_cr/i18n/ca.po b/addons/l10n_cr/i18n/ca.po
index 81b02dbc9e3..db3631c12c9 100644
--- a/addons/l10n_cr/i18n/ca.po
+++ b/addons/l10n_cr/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_cr
 #: model:res.partner.title,name:l10n_cr.res_partner_title_ing
diff --git a/addons/l10n_cr/i18n/da.po b/addons/l10n_cr/i18n/da.po
index d3a5a993558..1d366ff18df 100644
--- a/addons/l10n_cr/i18n/da.po
+++ b/addons/l10n_cr/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_cr
 #: model:res.partner.title,name:l10n_cr.res_partner_title_ing
diff --git a/addons/l10n_cr/i18n/es.po b/addons/l10n_cr/i18n/es.po
index 842bc3e9b92..1c2e798e9a2 100644
--- a/addons/l10n_cr/i18n/es.po
+++ b/addons/l10n_cr/i18n/es.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_cr
 #: model:res.partner.title,name:l10n_cr.res_partner_title_ing
diff --git a/addons/l10n_cr/i18n/es_CR.po b/addons/l10n_cr/i18n/es_CR.po
index c21962416db..77b550cf18e 100644
--- a/addons/l10n_cr/i18n/es_CR.po
+++ b/addons/l10n_cr/i18n/es_CR.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 "Language: es\n"
 
 #. module: l10n_cr
diff --git a/addons/l10n_cr/i18n/es_PY.po b/addons/l10n_cr/i18n/es_PY.po
index 1ced31086f5..a5bd7651ceb 100644
--- a/addons/l10n_cr/i18n/es_PY.po
+++ b/addons/l10n_cr/i18n/es_PY.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_cr
 #: model:res.partner.title,name:l10n_cr.res_partner_title_ing
diff --git a/addons/l10n_cr/i18n/fr.po b/addons/l10n_cr/i18n/fr.po
index 28233c121f4..8678f4fcff9 100644
--- a/addons/l10n_cr/i18n/fr.po
+++ b/addons/l10n_cr/i18n/fr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_cr
 #: model:res.partner.title,name:l10n_cr.res_partner_title_ing
diff --git a/addons/l10n_cr/i18n/gl.po b/addons/l10n_cr/i18n/gl.po
index c49a3a1aa5d..8aff5b90dff 100644
--- a/addons/l10n_cr/i18n/gl.po
+++ b/addons/l10n_cr/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_cr
 #: model:res.partner.title,name:l10n_cr.res_partner_title_ing
diff --git a/addons/l10n_cr/i18n/it.po b/addons/l10n_cr/i18n/it.po
index 38ef1138b42..d20142a190b 100644
--- a/addons/l10n_cr/i18n/it.po
+++ b/addons/l10n_cr/i18n/it.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_cr
 #: model:res.partner.title,name:l10n_cr.res_partner_title_ing
diff --git a/addons/l10n_cr/i18n/pt_BR.po b/addons/l10n_cr/i18n/pt_BR.po
index 9c333c1752a..c4297be9341 100644
--- a/addons/l10n_cr/i18n/pt_BR.po
+++ b/addons/l10n_cr/i18n/pt_BR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_cr
 #: model:res.partner.title,name:l10n_cr.res_partner_title_ing
diff --git a/addons/l10n_cr/i18n/tr.po b/addons/l10n_cr/i18n/tr.po
index 2c623deef1d..c7141b594af 100644
--- a/addons/l10n_cr/i18n/tr.po
+++ b/addons/l10n_cr/i18n/tr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_cr
 #: model:res.partner.title,name:l10n_cr.res_partner_title_ing
diff --git a/addons/l10n_de/__openerp__.py b/addons/l10n_de/__openerp__.py
index 232a1abb3ad..299174da592 100644
--- a/addons/l10n_de/__openerp__.py
+++ b/addons/l10n_de/__openerp__.py
@@ -38,19 +38,19 @@
 # Die Zuordnung der Steuern für Ein- und Ausfuhren aus EU Ländern, sowie auch
 # für den Ein- und Verkauf aus und in Drittländer sollten beim Partner
 # (Lieferant/Kunde)hinterlegt werden (in Anhängigkeit vom Herkunftsland
-# des Lieferanten/Kunden). Die Zuordnung beim Kunden ist "höherwertig" als
+# des Lieferanten/Kunden). Die Zuordnung beim Kunden ist 'höherwertig' als
 # die Zuordnung bei Produkten und überschreibt diese im Einzelfall.
 #
 # Zur Vereinfachung der Steuerausweise und Buchung bei Auslandsgeschäften
 # erlaubt OpenERP ein generelles Mapping von Steuerausweis und Steuerkonten
-# (z.B. Zuordnung "Umsatzsteuer 19%" zu "steuerfreie Einfuhren aus der EU")
+# (z.B. Zuordnung 'Umsatzsteuer 19%' zu 'steuerfreie Einfuhren aus der EU')
 # zwecks Zuordnung dieses Mappings zum ausländischen Partner (Kunde/Lieferant).
 
 # Die Rechnungsbuchung beim Einkauf bewirkt folgendes:
 # Die Steuerbemessungsgrundlage (exklusive Steuer) wird ausgewiesen bei den
 # jeweiligen Kategorien für den Vorsteuer Steuermessbetrag (z.B. Vorsteuer
 # Steuermessbetrag Voller Steuersatz 19%).
-# Der Steuerbetrag erscheint unter der Kategorie "Vorsteuern" (z.B. Vorsteuer
+# Der Steuerbetrag erscheint unter der Kategorie 'Vorsteuern' (z.B. Vorsteuer
 # 19%). Durch multidimensionale Hierachien können verschiedene Positionen
 # zusammengefasst werden und dann in Form eines Reports ausgegeben werden.
 #
@@ -58,7 +58,7 @@
 # Die Steuerbemessungsgrundlage (exklusive Steuer) wird ausgewiesen bei den
 # jeweiligen Kategorien für den Umsatzsteuer Steuermessbetrag
 # (z.B. Umsatzsteuer Steuermessbetrag Voller Steuersatz 19%).
-# Der Steuerbetrag erscheint unter der Kategorie "Umsatzsteuer"
+# Der Steuerbetrag erscheint unter der Kategorie 'Umsatzsteuer'
 # (z.B. Umsatzsteuer 19%). Durch multidimensionale Hierachien können
 # verschiedene Positionen zusammengefasst werden.
 # Die zugewiesenen Steuerausweise können auf Ebene der einzelnen
@@ -89,19 +89,19 @@
 # Die Zuordnung der Steuern für Ein- und Ausfuhren aus EU Ländern, sowie auch
 # für den Ein- und Verkauf aus und in Drittländer sollten beim Partner
 # (Lieferant/Kunde) hinterlegt werden (in Anhängigkeit vom Herkunftsland
-# des Lieferanten/Kunden). Die Zuordnung beim Kunden ist "höherwertig" als
+# des Lieferanten/Kunden). Die Zuordnung beim Kunden ist 'höherwertig' als
 # die Zuordnung bei Produkten und überschreibt diese im Einzelfall.
 #
 # Zur Vereinfachung der Steuerausweise und Buchung bei Auslandsgeschäften
 # erlaubt OpenERP ein generelles Mapping von Steuerausweis und Steuerkonten
-# (z.B. Zuordnung "Umsatzsteuer 19%" zu "steuerfreie Einfuhren aus der EU")
+# (z.B. Zuordnung 'Umsatzsteuer 19%' zu 'steuerfreie Einfuhren aus der EU')
 # zwecks Zuordnung dieses Mappings zum ausländischen Partner (Kunde/Lieferant).
 
 # Die Rechnungsbuchung beim Einkauf bewirkt folgendes:
 # Die Steuerbemessungsgrundlage (exklusive Steuer) wird ausgewiesen bei den
 # jeweiligen Kategorien für den Vorsteuer Steuermessbetrag (z.B. Vorsteuer
 # Steuermessbetrag Voller Steuersatz 19%).
-# Der Steuerbetrag erscheint unter der Kategorie "Vorsteuern" (z.B. Vorsteuer
+# Der Steuerbetrag erscheint unter der Kategorie 'Vorsteuern' (z.B. Vorsteuer
 # 19%). Durch multidimensionale Hierachien können verschiedene Positionen
 # zusammengefasst werden und dann in Form eines Reports ausgegeben werden.
 #
@@ -109,7 +109,7 @@
 # Die Steuerbemessungsgrundlage (exklusive Steuer) wird ausgewiesen bei den
 # jeweiligen Kategorien für den Umsatzsteuer Steuermessbetrag
 # (z.B. Umsatzsteuer Steuermessbetrag Voller Steuersatz 19%).
-# Der Steuerbetrag erscheint unter der Kategorie "Umsatzsteuer"
+# Der Steuerbetrag erscheint unter der Kategorie 'Umsatzsteuer'
 # (z.B. Umsatzsteuer 19%). Durch multidimensionale Hierachien können
 # verschiedene Positionen zusammengefasst werden.
 # Die zugewiesenen Steuerausweise können auf Ebene der einzelnen
@@ -121,35 +121,34 @@
 
 
 {
-    "name" : "Deutschland - Accounting",
-    "version" : "1.0",
-    "author" : "openbig.org",
-    "website" : "http://www.openbig.org",
-    "category" : "Localization/Account Charts",
-    "description": """
+    'name': 'Deutschland - Accounting',
+    'version': '1.0',
+    'author': 'openbig.org',
+    'website': 'http://www.openbig.org',
+    'category': 'Localization/Account Charts',
+    'description': """
 Dieses  Modul beinhaltet einen deutschen Kontenrahmen basierend auf dem SKR03.
 ==============================================================================
 
 German accounting chart and localization.
     """,
-    "depends" : ['base', 'account', 'base_iban', 'base_vat', 'account_chart'],
-    "init_xml" : [ ],
-    "demo_xml" : [ ],
-    "update_xml" : [
-        "account_tax_skr03.xml",
-        "account_types_skr03.xml",
-        "account_chart_skr03.xml",
-        "account_chart_template_skr03.xml",
-        "account_tax_fiscal_position_skr03.xml",
-        "account_tax_skr04.xml",
-        "account_types_skr04.xml",
-        "account_chart_skr04.xml",
-        "account_chart_template_skr04.xml",
-        "account_tax_fiscal_position_skr04.xml",
-        "l10n_de_wizard.xml",
+    'depends': ['base', 'account', 'base_iban', 'base_vat', 'account_chart'],
+    'demo': [ ],
+    'data': [
+        'account_tax_skr03.xml',
+        'account_types_skr03.xml',
+        'account_chart_skr03.xml',
+        'account_chart_template_skr03.xml',
+        'account_tax_fiscal_position_skr03.xml',
+        'account_tax_skr04.xml',
+        'account_types_skr04.xml',
+        'account_chart_skr04.xml',
+        'account_chart_template_skr04.xml',
+        'account_tax_fiscal_position_skr04.xml',
+        'l10n_de_wizard.xml',
     ],
-    "installable": True,
-    "certificate": "00517849017945584893",
+    'installable': True,
+    'certificate': '00517849017945584893',
     'images': ['images/config_chart_l10n_de.jpeg','images/l10n_de_chart.jpeg'],
 }
 
diff --git a/addons/l10n_de/i18n/ar.po b/addons/l10n_de/i18n/ar.po
index a158ea93cb1..7b1f985959d 100644
--- a/addons/l10n_de/i18n/ar.po
+++ b/addons/l10n_de/i18n/ar.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_de
 #: model:account.fiscal.position.template,name:l10n_de.fiscal_position_non_eu_sale_skr03
diff --git a/addons/l10n_de/i18n/bg.po b/addons/l10n_de/i18n/bg.po
index 1687dcd8e2a..743ea11eb66 100644
--- a/addons/l10n_de/i18n/bg.po
+++ b/addons/l10n_de/i18n/bg.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_de
 #: model:account.fiscal.position.template,name:l10n_de.fiscal_position_non_eu_sale_skr03
diff --git a/addons/l10n_de/i18n/bs.po b/addons/l10n_de/i18n/bs.po
index 1687dcd8e2a..743ea11eb66 100644
--- a/addons/l10n_de/i18n/bs.po
+++ b/addons/l10n_de/i18n/bs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_de
 #: model:account.fiscal.position.template,name:l10n_de.fiscal_position_non_eu_sale_skr03
diff --git a/addons/l10n_de/i18n/ca.po b/addons/l10n_de/i18n/ca.po
index d4639985b25..ec7fb6c69e7 100644
--- a/addons/l10n_de/i18n/ca.po
+++ b/addons/l10n_de/i18n/ca.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_de
 #: model:account.fiscal.position.template,name:l10n_de.fiscal_position_non_eu_sale_skr03
diff --git a/addons/l10n_de/i18n/cs.po b/addons/l10n_de/i18n/cs.po
index 1687dcd8e2a..743ea11eb66 100644
--- a/addons/l10n_de/i18n/cs.po
+++ b/addons/l10n_de/i18n/cs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_de
 #: model:account.fiscal.position.template,name:l10n_de.fiscal_position_non_eu_sale_skr03
diff --git a/addons/l10n_de/i18n/da.po b/addons/l10n_de/i18n/da.po
index 78bc635fe91..89ae57409fd 100644
--- a/addons/l10n_de/i18n/da.po
+++ b/addons/l10n_de/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_de
 #: model:account.fiscal.position.template,name:l10n_de.fiscal_position_non_eu_sale_skr03
diff --git a/addons/l10n_de/i18n/de.po b/addons/l10n_de/i18n/de.po
index dd1037444a2..cb0bd6e0751 100644
--- a/addons/l10n_de/i18n/de.po
+++ b/addons/l10n_de/i18n/de.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_de
 #: model:account.fiscal.position.template,name:l10n_de.fiscal_position_non_eu_sale_skr03
diff --git a/addons/l10n_de/i18n/es.po b/addons/l10n_de/i18n/es.po
index d979176fd4b..93e867fcead 100644
--- a/addons/l10n_de/i18n/es.po
+++ b/addons/l10n_de/i18n/es.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_de
 #: model:account.fiscal.position.template,name:l10n_de.fiscal_position_non_eu_sale_skr03
diff --git a/addons/l10n_de/i18n/es_CR.po b/addons/l10n_de/i18n/es_CR.po
index a95fedebfef..16bacee2ba9 100644
--- a/addons/l10n_de/i18n/es_CR.po
+++ b/addons/l10n_de/i18n/es_CR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 "Language: \n"
 
 #. module: l10n_de
diff --git a/addons/l10n_de/i18n/es_PY.po b/addons/l10n_de/i18n/es_PY.po
index 7989393c6e3..655aef05cb8 100644
--- a/addons/l10n_de/i18n/es_PY.po
+++ b/addons/l10n_de/i18n/es_PY.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_de
 #: model:account.fiscal.position.template,name:l10n_de.fiscal_position_non_eu_sale_skr03
diff --git a/addons/l10n_de/i18n/et.po b/addons/l10n_de/i18n/et.po
index 1687dcd8e2a..743ea11eb66 100644
--- a/addons/l10n_de/i18n/et.po
+++ b/addons/l10n_de/i18n/et.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_de
 #: model:account.fiscal.position.template,name:l10n_de.fiscal_position_non_eu_sale_skr03
diff --git a/addons/l10n_de/i18n/fr.po b/addons/l10n_de/i18n/fr.po
index e393d248ffe..6e348eb265b 100644
--- a/addons/l10n_de/i18n/fr.po
+++ b/addons/l10n_de/i18n/fr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_de
 #: model:account.fiscal.position.template,name:l10n_de.fiscal_position_non_eu_sale_skr03
diff --git a/addons/l10n_de/i18n/gl.po b/addons/l10n_de/i18n/gl.po
index 4fccb5061eb..41d3e354159 100644
--- a/addons/l10n_de/i18n/gl.po
+++ b/addons/l10n_de/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_de
 #: model:account.fiscal.position.template,name:l10n_de.fiscal_position_non_eu_sale_skr03
diff --git a/addons/l10n_de/i18n/hr.po b/addons/l10n_de/i18n/hr.po
index a158ea93cb1..7b1f985959d 100644
--- a/addons/l10n_de/i18n/hr.po
+++ b/addons/l10n_de/i18n/hr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_de
 #: model:account.fiscal.position.template,name:l10n_de.fiscal_position_non_eu_sale_skr03
diff --git a/addons/l10n_de/i18n/hu.po b/addons/l10n_de/i18n/hu.po
index 1687dcd8e2a..743ea11eb66 100644
--- a/addons/l10n_de/i18n/hu.po
+++ b/addons/l10n_de/i18n/hu.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_de
 #: model:account.fiscal.position.template,name:l10n_de.fiscal_position_non_eu_sale_skr03
diff --git a/addons/l10n_de/i18n/id.po b/addons/l10n_de/i18n/id.po
index 676a2f78982..745c7854852 100644
--- a/addons/l10n_de/i18n/id.po
+++ b/addons/l10n_de/i18n/id.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_de
 #: model:account.fiscal.position.template,name:l10n_de.fiscal_position_non_eu_sale_skr03
diff --git a/addons/l10n_de/i18n/it.po b/addons/l10n_de/i18n/it.po
index 4a43583b80b..c429af52667 100644
--- a/addons/l10n_de/i18n/it.po
+++ b/addons/l10n_de/i18n/it.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_de
 #: model:account.fiscal.position.template,name:l10n_de.fiscal_position_non_eu_sale_skr03
diff --git a/addons/l10n_de/i18n/ko.po b/addons/l10n_de/i18n/ko.po
index 1687dcd8e2a..743ea11eb66 100644
--- a/addons/l10n_de/i18n/ko.po
+++ b/addons/l10n_de/i18n/ko.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_de
 #: model:account.fiscal.position.template,name:l10n_de.fiscal_position_non_eu_sale_skr03
diff --git a/addons/l10n_de/i18n/lt.po b/addons/l10n_de/i18n/lt.po
index 676a2f78982..745c7854852 100644
--- a/addons/l10n_de/i18n/lt.po
+++ b/addons/l10n_de/i18n/lt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_de
 #: model:account.fiscal.position.template,name:l10n_de.fiscal_position_non_eu_sale_skr03
diff --git a/addons/l10n_de/i18n/nb.po b/addons/l10n_de/i18n/nb.po
new file mode 100644
index 00000000000..b8ba51a6810
--- /dev/null
+++ b/addons/l10n_de/i18n/nb.po
@@ -0,0 +1,66 @@
+# Norwegian Bokmal 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: 2010-12-15 15:05+0000\n"
+"PO-Revision-Date: 2012-09-08 19:47+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Norwegian Bokmal <nb@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-09-09 04:52+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
+
+#. module: l10n_de
+#: model:account.fiscal.position.template,name:l10n_de.fiscal_position_non_eu_sale_skr03
+#: model:account.fiscal.position.template,name:l10n_de.fiscal_position_non_eu_sale_skr04
+msgid "Kunde Ausland"
+msgstr "Kunde Ausland"
+
+#. module: l10n_de
+#: model:account.fiscal.position.template,name:l10n_de.fiscal_position_eu_no_id_sale_skr03
+#: model:account.fiscal.position.template,name:l10n_de.fiscal_position_eu_no_id_sale_skr04
+msgid "Kunde EU (ohne USt-ID)"
+msgstr "Kunde EU (ohne USt-ID)"
+
+#. module: l10n_de
+#: model:account.fiscal.position.template,name:l10n_de.fiscal_position_non_eu_purchase_skr03
+#: model:account.fiscal.position.template,name:l10n_de.fiscal_position_non_eu_purchase_skr04
+msgid "Lieferant Ausland"
+msgstr ""
+
+#. module: l10n_de
+#: model:ir.module.module,shortdesc:l10n_de.module_meta_information
+msgid "Deutschland - SKR03 and SKR04"
+msgstr ""
+
+#. module: l10n_de
+#: model:ir.module.module,description:l10n_de.module_meta_information
+msgid ""
+"Dieses  Modul beinhaltet einen deutschen Kontenrahmen basierend auf dem "
+"SKR03."
+msgstr ""
+
+#. module: l10n_de
+#: model:account.fiscal.position.template,name:l10n_de.fiscal_position_eu_vat_id_purchase_skr03
+#: model:account.fiscal.position.template,name:l10n_de.fiscal_position_eu_vat_id_purchase_skr04
+msgid "Lieferant EU Unternehmen (mit USt-ID)"
+msgstr ""
+
+#. module: l10n_de
+#: model:account.fiscal.position.template,name:l10n_de.fiscal_position_eu_no_id_purchase_skr03
+#: model:account.fiscal.position.template,name:l10n_de.fiscal_position_eu_no_id_purchase_skr04
+msgid "Lieferant EU (ohne Ust-ID)"
+msgstr ""
+
+#. module: l10n_de
+#: model:account.fiscal.position.template,name:l10n_de.fiscal_position_eu_vat_id_sale_skr03
+#: model:account.fiscal.position.template,name:l10n_de.fiscal_position_eu_vat_id_sale_skr04
+msgid "Kunde EU Unternehmen (mit USt-ID)"
+msgstr ""
diff --git a/addons/l10n_de/i18n/nl.po b/addons/l10n_de/i18n/nl.po
index 9574d341f8d..b999d7b0e80 100644
--- a/addons/l10n_de/i18n/nl.po
+++ b/addons/l10n_de/i18n/nl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_de
 #: model:account.fiscal.position.template,name:l10n_de.fiscal_position_non_eu_sale_skr03
diff --git a/addons/l10n_de/i18n/pl.po b/addons/l10n_de/i18n/pl.po
index 1687dcd8e2a..743ea11eb66 100644
--- a/addons/l10n_de/i18n/pl.po
+++ b/addons/l10n_de/i18n/pl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_de
 #: model:account.fiscal.position.template,name:l10n_de.fiscal_position_non_eu_sale_skr03
diff --git a/addons/l10n_de/i18n/pt.po b/addons/l10n_de/i18n/pt.po
index a158ea93cb1..7b1f985959d 100644
--- a/addons/l10n_de/i18n/pt.po
+++ b/addons/l10n_de/i18n/pt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_de
 #: model:account.fiscal.position.template,name:l10n_de.fiscal_position_non_eu_sale_skr03
diff --git a/addons/l10n_de/i18n/pt_BR.po b/addons/l10n_de/i18n/pt_BR.po
index bf2a9c54aa0..c4076f15677 100644
--- a/addons/l10n_de/i18n/pt_BR.po
+++ b/addons/l10n_de/i18n/pt_BR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_de
 #: model:account.fiscal.position.template,name:l10n_de.fiscal_position_non_eu_sale_skr03
diff --git a/addons/l10n_de/i18n/ro.po b/addons/l10n_de/i18n/ro.po
index 1687dcd8e2a..743ea11eb66 100644
--- a/addons/l10n_de/i18n/ro.po
+++ b/addons/l10n_de/i18n/ro.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_de
 #: model:account.fiscal.position.template,name:l10n_de.fiscal_position_non_eu_sale_skr03
diff --git a/addons/l10n_de/i18n/ru.po b/addons/l10n_de/i18n/ru.po
index 1687dcd8e2a..743ea11eb66 100644
--- a/addons/l10n_de/i18n/ru.po
+++ b/addons/l10n_de/i18n/ru.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_de
 #: model:account.fiscal.position.template,name:l10n_de.fiscal_position_non_eu_sale_skr03
diff --git a/addons/l10n_de/i18n/sl.po b/addons/l10n_de/i18n/sl.po
index a158ea93cb1..7b1f985959d 100644
--- a/addons/l10n_de/i18n/sl.po
+++ b/addons/l10n_de/i18n/sl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_de
 #: model:account.fiscal.position.template,name:l10n_de.fiscal_position_non_eu_sale_skr03
diff --git a/addons/l10n_de/i18n/sr@latin.po b/addons/l10n_de/i18n/sr@latin.po
index 847d1982a6e..2c2dc84ac9c 100644
--- a/addons/l10n_de/i18n/sr@latin.po
+++ b/addons/l10n_de/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_de
 #: model:account.fiscal.position.template,name:l10n_de.fiscal_position_non_eu_sale_skr03
diff --git a/addons/l10n_de/i18n/sv.po b/addons/l10n_de/i18n/sv.po
index 676a2f78982..745c7854852 100644
--- a/addons/l10n_de/i18n/sv.po
+++ b/addons/l10n_de/i18n/sv.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_de
 #: model:account.fiscal.position.template,name:l10n_de.fiscal_position_non_eu_sale_skr03
diff --git a/addons/l10n_de/i18n/tr.po b/addons/l10n_de/i18n/tr.po
index a158ea93cb1..7b1f985959d 100644
--- a/addons/l10n_de/i18n/tr.po
+++ b/addons/l10n_de/i18n/tr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_de
 #: model:account.fiscal.position.template,name:l10n_de.fiscal_position_non_eu_sale_skr03
diff --git a/addons/l10n_de/i18n/vi.po b/addons/l10n_de/i18n/vi.po
index fed70a284b2..fb9f44c75be 100644
--- a/addons/l10n_de/i18n/vi.po
+++ b/addons/l10n_de/i18n/vi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_de
 #: model:account.fiscal.position.template,name:l10n_de.fiscal_position_non_eu_sale_skr03
diff --git a/addons/l10n_de/i18n/zh_CN.po b/addons/l10n_de/i18n/zh_CN.po
index a158ea93cb1..7b1f985959d 100644
--- a/addons/l10n_de/i18n/zh_CN.po
+++ b/addons/l10n_de/i18n/zh_CN.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_de
 #: model:account.fiscal.position.template,name:l10n_de.fiscal_position_non_eu_sale_skr03
diff --git a/addons/l10n_de/i18n/zh_TW.po b/addons/l10n_de/i18n/zh_TW.po
index a158ea93cb1..7b1f985959d 100644
--- a/addons/l10n_de/i18n/zh_TW.po
+++ b/addons/l10n_de/i18n/zh_TW.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_de
 #: model:account.fiscal.position.template,name:l10n_de.fiscal_position_non_eu_sale_skr03
diff --git a/addons/l10n_ec/__openerp__.py b/addons/l10n_ec/__openerp__.py
index 9dd81606036..bd1448b802c 100644
--- a/addons/l10n_ec/__openerp__.py
+++ b/addons/l10n_ec/__openerp__.py
@@ -29,20 +29,19 @@ Accounting chart and localization for Ecuador.
     """,
     'author': 'OpenERP SA',
     'depends': [
-                'account',
-                'base_vat',
-                'base_iban',
-                'account_chart',
-                'account_coda',
-                ],
-    'init_xml': [],
-    'update_xml': [
-                'account_tax_code.xml',
-                'account_chart.xml',
-                'account_tax.xml',
-                'l10n_chart_ec_wizard.xml',
-                   ],
-    'demo_xml': [],
+        'account',
+        'base_vat',
+        'base_iban',
+        'account_chart',
+        'account_coda',
+    ],
+    'data': [
+        'account_tax_code.xml',
+        'account_chart.xml',
+        'account_tax.xml',
+        'l10n_chart_ec_wizard.xml',
+    ],
+    'demo': [],
     'installable': True,
     'certificate' : '001226484516187330589',
     'images': ['images/config_chart_l10n_ec.jpeg','images/l10n_ec_chart.jpeg'],
diff --git a/addons/l10n_ec/i18n/ar.po b/addons/l10n_ec/i18n/ar.po
index 200792ae861..81351acffca 100644
--- a/addons/l10n_ec/i18n/ar.po
+++ b/addons/l10n_ec/i18n/ar.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_ec
 #: model:account.account.type,name:l10n_ec.account_type_expense
diff --git a/addons/l10n_ec/i18n/ca.po b/addons/l10n_ec/i18n/ca.po
index 7116127ec51..7ce68311ab0 100644
--- a/addons/l10n_ec/i18n/ca.po
+++ b/addons/l10n_ec/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_ec
 #: model:account.account.type,name:l10n_ec.account_type_expense
diff --git a/addons/l10n_ec/i18n/da.po b/addons/l10n_ec/i18n/da.po
index 2bf3aeeee90..294fac5202f 100644
--- a/addons/l10n_ec/i18n/da.po
+++ b/addons/l10n_ec/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_ec
 #: model:account.account.type,name:l10n_ec.account_type_expense
diff --git a/addons/l10n_ec/i18n/es.po b/addons/l10n_ec/i18n/es.po
index 0816a3f2c5c..0325199655e 100644
--- a/addons/l10n_ec/i18n/es.po
+++ b/addons/l10n_ec/i18n/es.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_ec
 #: model:account.account.type,name:l10n_ec.account_type_expense
diff --git a/addons/l10n_ec/i18n/es_CR.po b/addons/l10n_ec/i18n/es_CR.po
index 223ed99790a..bae96f065a0 100644
--- a/addons/l10n_ec/i18n/es_CR.po
+++ b/addons/l10n_ec/i18n/es_CR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 "Language: es\n"
 
 #. module: l10n_ec
diff --git a/addons/l10n_ec/i18n/es_EC.po b/addons/l10n_ec/i18n/es_EC.po
index 8df05cef8ae..c631eb40b2b 100644
--- a/addons/l10n_ec/i18n/es_EC.po
+++ b/addons/l10n_ec/i18n/es_EC.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_ec
 #: model:account.account.type,name:l10n_ec.account_type_expense
diff --git a/addons/l10n_ec/i18n/es_PY.po b/addons/l10n_ec/i18n/es_PY.po
index 29cdc482be9..2789f5fda32 100644
--- a/addons/l10n_ec/i18n/es_PY.po
+++ b/addons/l10n_ec/i18n/es_PY.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_ec
 #: model:account.account.type,name:l10n_ec.account_type_expense
diff --git a/addons/l10n_ec/i18n/fr.po b/addons/l10n_ec/i18n/fr.po
index e8933bfee3c..3e030b8b1fc 100644
--- a/addons/l10n_ec/i18n/fr.po
+++ b/addons/l10n_ec/i18n/fr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_ec
 #: model:account.account.type,name:l10n_ec.account_type_expense
diff --git a/addons/l10n_ec/i18n/gl.po b/addons/l10n_ec/i18n/gl.po
index 3b0cbdb1653..9759d2338bc 100644
--- a/addons/l10n_ec/i18n/gl.po
+++ b/addons/l10n_ec/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_ec
 #: model:account.account.type,name:l10n_ec.account_type_expense
diff --git a/addons/l10n_ec/i18n/it.po b/addons/l10n_ec/i18n/it.po
index e201ff59f0f..00d4aeace4c 100644
--- a/addons/l10n_ec/i18n/it.po
+++ b/addons/l10n_ec/i18n/it.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_ec
 #: model:account.account.type,name:l10n_ec.account_type_expense
diff --git a/addons/l10n_ec/i18n/pt.po b/addons/l10n_ec/i18n/pt.po
index ab15ee715e9..0465d14f438 100644
--- a/addons/l10n_ec/i18n/pt.po
+++ b/addons/l10n_ec/i18n/pt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_ec
 #: model:account.account.type,name:l10n_ec.account_type_expense
diff --git a/addons/l10n_ec/i18n/pt_BR.po b/addons/l10n_ec/i18n/pt_BR.po
index 38590c9449e..9d8e06a41b5 100644
--- a/addons/l10n_ec/i18n/pt_BR.po
+++ b/addons/l10n_ec/i18n/pt_BR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_ec
 #: model:account.account.type,name:l10n_ec.account_type_expense
diff --git a/addons/l10n_ec/i18n/tr.po b/addons/l10n_ec/i18n/tr.po
index e772a3f06fe..b85bac922ee 100644
--- a/addons/l10n_ec/i18n/tr.po
+++ b/addons/l10n_ec/i18n/tr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_ec
 #: model:account.account.type,name:l10n_ec.account_type_expense
diff --git a/addons/l10n_es/__openerp__.py b/addons/l10n_es/__openerp__.py
index b2897e07748..9b7a7517974 100644
--- a/addons/l10n_es/__openerp__.py
+++ b/addons/l10n_es/__openerp__.py
@@ -22,12 +22,12 @@
 ##############################################################################
 
 {
-    "name" : "Spanish - Accounting (PGCE 2008)",
-    "version" : "3.0",
-    "author" : "Spanish Localization Team",
-    'website' : 'https://launchpad.net/openerp-spain',
-    "category" : "Localization/Account Charts",
-    "description": """
+    'name': 'Spanish - Accounting (PGCE 2008)',
+    'version': '3.0',
+    'author': 'Spanish Localization Team',
+    'website': 'https://launchpad.net/openerp-spain',
+    'category': 'Localization/Account Charts',
+    'description': """
 Spanish Charts of Accounts (PGCE 2008).
 =======================================
 
@@ -37,26 +37,24 @@ Spanish Charts of Accounts (PGCE 2008).
     * Defines templates for sale and purchase VAT
     * Defines tax code templates
 
-Note: You should install the l10n_ES_account_balance_report module for yearly
+**Note:** You should install the l10n_ES_account_balance_report module for yearly
       account reporting (balance, profit & losses).
 """,
-    "license" : "GPL-3",
-    "depends" : ["account", "base_vat", "base_iban"],
-    "init_xml" : [
-        "account_chart.xml",
-        "taxes_data.xml",
-        "fiscal_templates.xml",
-        "account_chart_pymes.xml",
-        "taxes_data_pymes.xml",
-        "fiscal_templates_pymes.xml",
-        "l10n_es_wizard.xml"
+    'license': 'GPL-3',
+    'depends': ['account', 'base_vat', 'base_iban'],
+    'data': [
+        'account_chart.xml',
+        'taxes_data.xml',
+        'fiscal_templates.xml',
+        'account_chart_pymes.xml',
+        'taxes_data_pymes.xml',
+        'fiscal_templates_pymes.xml',
+        'l10n_es_wizard.xml'
     ],
-    "demo_xml" : [],
-    "update_xml" : [
-    ],
-    "auto_install": False,
-    "installable": True,
-    "certificate" : "00408828172062583229",
+    'demo': [],
+    'auto_install': False,
+    'installable': True,
+    'certificate': '00408828172062583229',
     'images': ['images/config_chart_l10n_es.jpeg','images/l10n_es_chart.jpeg'],
 }
 
diff --git a/addons/l10n_es/account_chart.xml b/addons/l10n_es/account_chart.xml
index 5147024deae..8ffabd17fe7 100644
--- a/addons/l10n_es/account_chart.xml
+++ b/addons/l10n_es/account_chart.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-    <data noupdate="0">
+    <data noupdate="1">
 
     <!-- Tipos de cuenta para PGCE y PGCE PYMES -->
 
diff --git a/addons/l10n_es/account_chart_pymes.xml b/addons/l10n_es/account_chart_pymes.xml
index 76cd713fe94..ed2e4f18e7c 100644
--- a/addons/l10n_es/account_chart_pymes.xml
+++ b/addons/l10n_es/account_chart_pymes.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-    <data noupdate="0">
+    <data noupdate="1">
   
       <!-- 
       Plantilla del árbol de cuentas del Plan General Contable PYMES 2008.
diff --git a/addons/l10n_es/fiscal_templates.xml b/addons/l10n_es/fiscal_templates.xml
index 5f126d448cf..5c6d056d2f6 100644
--- a/addons/l10n_es/fiscal_templates.xml
+++ b/addons/l10n_es/fiscal_templates.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-    <data noupdate="0">
+    <data noupdate="1">
 
     <!-- Definición de posiciones fiscales Régimen Nacional, Recargo de Equivalencia,
          Extracomunitario, Intracomunitario y Retención de IRPF 18%, 15%, 7%, 1%
diff --git a/addons/l10n_es/fiscal_templates_pymes.xml b/addons/l10n_es/fiscal_templates_pymes.xml
index f44bfc949c6..05871fad842 100644
--- a/addons/l10n_es/fiscal_templates_pymes.xml
+++ b/addons/l10n_es/fiscal_templates_pymes.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-    <data noupdate="0">
+    <data noupdate="1">
 
       <!--
       Definición de posiciones fiscales Régimen Nacional, Recargo de Equivalencia,
diff --git a/addons/l10n_es/i18n/ar.po b/addons/l10n_es/i18n/ar.po
index 6dc97157320..8e4ada02ecc 100644
--- a/addons/l10n_es/i18n/ar.po
+++ b/addons/l10n_es/i18n/ar.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_es
 #: model:account.account.type,name:l10n_es.inmo
diff --git a/addons/l10n_es/i18n/ca.po b/addons/l10n_es/i18n/ca.po
index 3599d4a8869..bf03b17d1b0 100644
--- a/addons/l10n_es/i18n/ca.po
+++ b/addons/l10n_es/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_es
 #: model:account.account.type,name:l10n_es.inmo
diff --git a/addons/l10n_es/i18n/da.po b/addons/l10n_es/i18n/da.po
index f3883747a73..21466c9d48e 100644
--- a/addons/l10n_es/i18n/da.po
+++ b/addons/l10n_es/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_es
 #: model:account.account.type,name:l10n_es.inmo
diff --git a/addons/l10n_es/i18n/de.po b/addons/l10n_es/i18n/de.po
index 86ee81eb0f3..88dbc5bf325 100644
--- a/addons/l10n_es/i18n/de.po
+++ b/addons/l10n_es/i18n/de.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_es
 #: model:account.account.type,name:l10n_es.inmo
diff --git a/addons/l10n_es/i18n/es.po b/addons/l10n_es/i18n/es.po
index afab7ea37e0..a72f4cb4d78 100644
--- a/addons/l10n_es/i18n/es.po
+++ b/addons/l10n_es/i18n/es.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_es
 #: model:account.account.type,name:l10n_es.inmo
diff --git a/addons/l10n_es/i18n/es_CR.po b/addons/l10n_es/i18n/es_CR.po
index 1d0ecbd6edd..55083f0ab5d 100644
--- a/addons/l10n_es/i18n/es_CR.po
+++ b/addons/l10n_es/i18n/es_CR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 "Language: \n"
 
 #. module: l10n_es
diff --git a/addons/l10n_es/i18n/es_PY.po b/addons/l10n_es/i18n/es_PY.po
index 8abd450b323..128513d7335 100644
--- a/addons/l10n_es/i18n/es_PY.po
+++ b/addons/l10n_es/i18n/es_PY.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_es
 #: model:account.account.type,name:l10n_es.inmo
diff --git a/addons/l10n_es/i18n/fr.po b/addons/l10n_es/i18n/fr.po
index c17ae6c88d6..6bdb4ddf894 100644
--- a/addons/l10n_es/i18n/fr.po
+++ b/addons/l10n_es/i18n/fr.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_es
 #: model:account.account.type,name:l10n_es.inmo
diff --git a/addons/l10n_es/i18n/gl.po b/addons/l10n_es/i18n/gl.po
index 9cd1d288adb..dcb5fce764e 100644
--- a/addons/l10n_es/i18n/gl.po
+++ b/addons/l10n_es/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_es
 #: model:account.account.type,name:l10n_es.inmo
diff --git a/addons/l10n_es/i18n/hu.po b/addons/l10n_es/i18n/hu.po
index a65bd23cc4e..80777d43ea1 100644
--- a/addons/l10n_es/i18n/hu.po
+++ b/addons/l10n_es/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_es
 #: model:account.account.type,name:l10n_es.inmo
diff --git a/addons/l10n_es/i18n/it.po b/addons/l10n_es/i18n/it.po
index e7890980a60..bb235791ebb 100644
--- a/addons/l10n_es/i18n/it.po
+++ b/addons/l10n_es/i18n/it.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_es
 #: model:account.account.type,name:l10n_es.inmo
diff --git a/addons/l10n_es/i18n/oc.po b/addons/l10n_es/i18n/oc.po
index 714557d5ea3..d3d86874de2 100644
--- a/addons/l10n_es/i18n/oc.po
+++ b/addons/l10n_es/i18n/oc.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_es
 #: model:account.account.type,name:l10n_es.inmo
diff --git a/addons/l10n_es/i18n/pt.po b/addons/l10n_es/i18n/pt.po
index d2181ab3e12..fbfc9c9340e 100644
--- a/addons/l10n_es/i18n/pt.po
+++ b/addons/l10n_es/i18n/pt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_es
 #: model:account.account.type,name:l10n_es.inmo
diff --git a/addons/l10n_es/i18n/pt_BR.po b/addons/l10n_es/i18n/pt_BR.po
index 77a44bbbdc8..b03a1d6eba1 100644
--- a/addons/l10n_es/i18n/pt_BR.po
+++ b/addons/l10n_es/i18n/pt_BR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_es
 #: model:account.account.type,name:l10n_es.inmo
diff --git a/addons/l10n_es/i18n/sr@latin.po b/addons/l10n_es/i18n/sr@latin.po
index 039256bb182..a116424d655 100644
--- a/addons/l10n_es/i18n/sr@latin.po
+++ b/addons/l10n_es/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_es
 #: model:account.account.type,name:l10n_es.inmo
diff --git a/addons/l10n_es/i18n/tr.po b/addons/l10n_es/i18n/tr.po
index aa4c9c41548..cbafacc5b8f 100644
--- a/addons/l10n_es/i18n/tr.po
+++ b/addons/l10n_es/i18n/tr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_es
 #: model:account.account.type,name:l10n_es.inmo
diff --git a/addons/l10n_es/l10n_es_wizard.xml b/addons/l10n_es/l10n_es_wizard.xml
index cd6d89726b6..ec30f9e9e25 100644
--- a/addons/l10n_es/l10n_es_wizard.xml
+++ b/addons/l10n_es/l10n_es_wizard.xml
@@ -1,5 +1,5 @@
 <openerp>
-    <data>
+    <data noupdate="1">
 
         <record id="config_call_account_template" model="ir.actions.todo">
             <field name="action_id" ref="account.action_wizard_multi_chart"/>
diff --git a/addons/l10n_es/taxes_data.xml b/addons/l10n_es/taxes_data.xml
index 8935f1d1ad8..41b52ee077d 100644
--- a/addons/l10n_es/taxes_data.xml
+++ b/addons/l10n_es/taxes_data.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-    <data>
+    <data noupdate="1">
         
      <!--
      Definición de IVA y retenciones, códigos de impuestos y cuentas contables adicionales
diff --git a/addons/l10n_es/taxes_data_pymes.xml b/addons/l10n_es/taxes_data_pymes.xml
index e62fcac0db6..7467dbb9596 100644
--- a/addons/l10n_es/taxes_data_pymes.xml
+++ b/addons/l10n_es/taxes_data_pymes.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-    <data noupdate="0">
+    <data noupdate="1">
 
       <!--
       Plantillas de impuestos para el Plan General Contable PYMES 2008.
diff --git a/addons/l10n_fr/__openerp__.py b/addons/l10n_fr/__openerp__.py
index ec31f71513a..65a2621f03a 100644
--- a/addons/l10n_fr/__openerp__.py
+++ b/addons/l10n_fr/__openerp__.py
@@ -26,53 +26,51 @@
 #
 ##############################################################################
 {
-    "name" : "France - Accounting",
-    "version" : "1.1",
-    "author" : "OpenERP SA",
-    "website": "http://www.openerp.com",
-    "category" : "Localization/Account Charts",
-    "description": """
+    'name': 'France - Accounting',
+    'version': '1.1',
+    'author': 'OpenERP SA',
+    'website': 'http://www.openerp.com',
+    'category': 'Localization/Account Charts',
+    'description': """
 This is the module to manage the accounting chart for France in OpenERP.
 ========================================================================
 
 This module applies to companies based in France mainland. It doesn't apply to
 companies based in the DOM-TOMs (Guadeloupe, Martinique, Guyane, Réunion, Mayotte).
 
-This localisation module creates the VAT taxes of type "tax included" for purchases
-(it is notably required when you use the module "hr_expense"). Beware that these
-"tax included" VAT taxes are not managed by the fiscal positions provided by this
-module (because it is complex to manage both "tax excluded" and "tax included"
+This localisation module creates the VAT taxes of type 'tax included' for purchases
+(it is notably required when you use the module 'hr_expense'). Beware that these
+'tax included' VAT taxes are not managed by the fiscal positions provided by this
+module (because it is complex to manage both 'tax excluded' and 'tax included'
 scenarios in fiscal positions).
 
 This localisation module doesn't properly handle the scenario when a France-mainland
 company sells services to a company based in the DOMs. We could manage it in the
-fiscal positions, but it would require to differentiate between "product" VAT taxes
-and "service" VAT taxes. We consider that it is too "heavy" to have this by default
+fiscal positions, but it would require to differentiate between 'product' VAT taxes
+and 'service' VAT taxes. We consider that it is too 'heavy' to have this by default
 in l10n_fr; companies that sell services to DOM-based companies should update the
 configuration of their taxes and fiscal positions manually.
 
-Credits: Sistheo, Zeekom, CrysaLEAD, Akretion and Camptocamp.
+**Credits:** Sistheo, Zeekom, CrysaLEAD, Akretion and Camptocamp.
 """,
-    "depends" : ['base_iban', 'account', 'account_chart', 'base_vat', 'l10n_fr_rib'],
-    "init_xml" : [],
-    "update_xml" : [
-        "fr_report.xml",
-        "plan_comptable_general.xml",
-        "l10n_fr_view.xml",
-        "l10n_fr_wizard.xml",
-        "fr_pcg_taxes.xml",
-        "fr_tax.xml",
-        "fr_fiscal_templates.xml",
-        "security/ir.model.access.csv",
-        "wizard/fr_report_bilan_view.xml",
-        "wizard/fr_report_compute_resultant_view.xml",
-
+    'depends': ['base_iban', 'account', 'account_chart', 'base_vat', 'l10n_fr_rib'],
+    'data': [
+        'fr_report.xml',
+        'plan_comptable_general.xml',
+        'l10n_fr_view.xml',
+        'l10n_fr_wizard.xml',
+        'fr_pcg_taxes.xml',
+        'fr_tax.xml',
+        'fr_fiscal_templates.xml',
+        'security/ir.model.access.csv',
+        'wizard/fr_report_bilan_view.xml',
+        'wizard/fr_report_compute_resultant_view.xml',
     ],
-    "test": ['test/l10n_fr_report.yml'],
-    "demo_xml" : [],
-    "certificate" : "00435321693876313629",
-    "auto_install": False,
-    "installable": True,
+    'test': ['test/l10n_fr_report.yml'],
+    'demo': [],
+    'certificate': '00435321693876313629',
+    'auto_install': False,
+    'installable': True,
     'images': ['images/config_chart_l10n_fr.jpeg','images/l10n_fr_chart.jpeg'],
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/l10n_fr/i18n/ar.po b/addons/l10n_fr/i18n/ar.po
index ee7bbb15953..d759f23aa8b 100644
--- a/addons/l10n_fr/i18n/ar.po
+++ b/addons/l10n_fr/i18n/ar.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_fr
 #: model:account.account.type,name:l10n_fr.account_type_receivable
diff --git a/addons/l10n_fr/i18n/bg.po b/addons/l10n_fr/i18n/bg.po
index be40039f9e8..e3a7a5bc548 100644
--- a/addons/l10n_fr/i18n/bg.po
+++ b/addons/l10n_fr/i18n/bg.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_fr
 #: model:account.account.type,name:l10n_fr.account_type_receivable
diff --git a/addons/l10n_fr/i18n/bs.po b/addons/l10n_fr/i18n/bs.po
index 24f575ea1f6..1a71c507424 100644
--- a/addons/l10n_fr/i18n/bs.po
+++ b/addons/l10n_fr/i18n/bs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_fr
 #: model:account.account.type,name:l10n_fr.account_type_receivable
diff --git a/addons/l10n_fr/i18n/ca.po b/addons/l10n_fr/i18n/ca.po
index 70ccbb2b7fc..47916ef27e8 100644
--- a/addons/l10n_fr/i18n/ca.po
+++ b/addons/l10n_fr/i18n/ca.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_fr
 #: model:account.account.type,name:l10n_fr.account_type_receivable
diff --git a/addons/l10n_fr/i18n/cs.po b/addons/l10n_fr/i18n/cs.po
index 24f575ea1f6..1a71c507424 100644
--- a/addons/l10n_fr/i18n/cs.po
+++ b/addons/l10n_fr/i18n/cs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_fr
 #: model:account.account.type,name:l10n_fr.account_type_receivable
diff --git a/addons/l10n_fr/i18n/da.po b/addons/l10n_fr/i18n/da.po
index f57cd228607..5a302ba4b81 100644
--- a/addons/l10n_fr/i18n/da.po
+++ b/addons/l10n_fr/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_fr
 #: model:account.account.type,name:l10n_fr.account_type_receivable
diff --git a/addons/l10n_fr/i18n/de.po b/addons/l10n_fr/i18n/de.po
index 5bcd70f3cb6..5f865d9b5f0 100644
--- a/addons/l10n_fr/i18n/de.po
+++ b/addons/l10n_fr/i18n/de.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_fr
 #: model:account.account.type,name:l10n_fr.account_type_receivable
diff --git a/addons/l10n_fr/i18n/es.po b/addons/l10n_fr/i18n/es.po
index 8d4987f43ba..e703b1c6490 100644
--- a/addons/l10n_fr/i18n/es.po
+++ b/addons/l10n_fr/i18n/es.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_fr
 #: model:account.account.type,name:l10n_fr.account_type_receivable
diff --git a/addons/l10n_fr/i18n/es_AR.po b/addons/l10n_fr/i18n/es_AR.po
index 0d4ad78fa2b..a0b1bdcd4f7 100644
--- a/addons/l10n_fr/i18n/es_AR.po
+++ b/addons/l10n_fr/i18n/es_AR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_fr
 #: model:account.account.type,name:l10n_fr.account_type_receivable
diff --git a/addons/l10n_fr/i18n/es_CR.po b/addons/l10n_fr/i18n/es_CR.po
index 458f57992fe..74f98242047 100644
--- a/addons/l10n_fr/i18n/es_CR.po
+++ b/addons/l10n_fr/i18n/es_CR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 "Language: \n"
 
 #. module: l10n_fr
diff --git a/addons/l10n_fr/i18n/es_PY.po b/addons/l10n_fr/i18n/es_PY.po
index d19f5561f34..fe9b2755732 100644
--- a/addons/l10n_fr/i18n/es_PY.po
+++ b/addons/l10n_fr/i18n/es_PY.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_fr
 #: model:account.account.type,name:l10n_fr.account_type_receivable
diff --git a/addons/l10n_fr/i18n/et.po b/addons/l10n_fr/i18n/et.po
index 2a8db1dc1e1..8abfed8b8bd 100644
--- a/addons/l10n_fr/i18n/et.po
+++ b/addons/l10n_fr/i18n/et.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_fr
 #: model:account.account.type,name:l10n_fr.account_type_receivable
diff --git a/addons/l10n_fr/i18n/fr.po b/addons/l10n_fr/i18n/fr.po
index 7ac0392a158..5423d1b07c9 100644
--- a/addons/l10n_fr/i18n/fr.po
+++ b/addons/l10n_fr/i18n/fr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_fr
 #: model:account.account.type,name:l10n_fr.account_type_receivable
diff --git a/addons/l10n_fr/i18n/gl.po b/addons/l10n_fr/i18n/gl.po
index 58eaacbc259..032681498fc 100644
--- a/addons/l10n_fr/i18n/gl.po
+++ b/addons/l10n_fr/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_fr
 #: model:account.account.type,name:l10n_fr.account_type_receivable
diff --git a/addons/l10n_fr/i18n/hr.po b/addons/l10n_fr/i18n/hr.po
index 24f575ea1f6..1a71c507424 100644
--- a/addons/l10n_fr/i18n/hr.po
+++ b/addons/l10n_fr/i18n/hr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_fr
 #: model:account.account.type,name:l10n_fr.account_type_receivable
diff --git a/addons/l10n_fr/i18n/hu.po b/addons/l10n_fr/i18n/hu.po
index 24f575ea1f6..1a71c507424 100644
--- a/addons/l10n_fr/i18n/hu.po
+++ b/addons/l10n_fr/i18n/hu.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_fr
 #: model:account.account.type,name:l10n_fr.account_type_receivable
diff --git a/addons/l10n_fr/i18n/id.po b/addons/l10n_fr/i18n/id.po
index 31168616ce1..529e5d880da 100644
--- a/addons/l10n_fr/i18n/id.po
+++ b/addons/l10n_fr/i18n/id.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_fr
 #: model:account.account.type,name:l10n_fr.account_type_receivable
diff --git a/addons/l10n_fr/i18n/it.po b/addons/l10n_fr/i18n/it.po
index 85cb7f75ce8..18d448ebbd6 100644
--- a/addons/l10n_fr/i18n/it.po
+++ b/addons/l10n_fr/i18n/it.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_fr
 #: model:account.account.type,name:l10n_fr.account_type_receivable
diff --git a/addons/l10n_fr/i18n/ko.po b/addons/l10n_fr/i18n/ko.po
index 148ac38ea36..62c28f15d44 100644
--- a/addons/l10n_fr/i18n/ko.po
+++ b/addons/l10n_fr/i18n/ko.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_fr
 #: model:account.account.type,name:l10n_fr.account_type_receivable
diff --git a/addons/l10n_fr/i18n/lt.po b/addons/l10n_fr/i18n/lt.po
index 3575a6f1e26..3d4f09d8adb 100644
--- a/addons/l10n_fr/i18n/lt.po
+++ b/addons/l10n_fr/i18n/lt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_fr
 #: model:account.account.type,name:l10n_fr.account_type_receivable
diff --git a/addons/l10n_fr/i18n/nl.po b/addons/l10n_fr/i18n/nl.po
index 66dd4f79950..f98caa208b7 100644
--- a/addons/l10n_fr/i18n/nl.po
+++ b/addons/l10n_fr/i18n/nl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_fr
 #: model:account.account.type,name:l10n_fr.account_type_receivable
diff --git a/addons/l10n_fr/i18n/nl_BE.po b/addons/l10n_fr/i18n/nl_BE.po
index ba46de88df3..cbac1e27bba 100644
--- a/addons/l10n_fr/i18n/nl_BE.po
+++ b/addons/l10n_fr/i18n/nl_BE.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_fr
 #: model:account.account.type,name:l10n_fr.account_type_receivable
diff --git a/addons/l10n_fr/i18n/oc.po b/addons/l10n_fr/i18n/oc.po
index 063052ad42e..c5dfee071de 100644
--- a/addons/l10n_fr/i18n/oc.po
+++ b/addons/l10n_fr/i18n/oc.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_fr
 #: model:account.account.type,name:l10n_fr.account_type_receivable
diff --git a/addons/l10n_fr/i18n/pl.po b/addons/l10n_fr/i18n/pl.po
index 057fc5c227c..8d52f95eeba 100644
--- a/addons/l10n_fr/i18n/pl.po
+++ b/addons/l10n_fr/i18n/pl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_fr
 #: model:account.account.type,name:l10n_fr.account_type_receivable
diff --git a/addons/l10n_fr/i18n/pt.po b/addons/l10n_fr/i18n/pt.po
index efeec847f6d..3893fd6bdda 100644
--- a/addons/l10n_fr/i18n/pt.po
+++ b/addons/l10n_fr/i18n/pt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_fr
 #: model:account.account.type,name:l10n_fr.account_type_receivable
diff --git a/addons/l10n_fr/i18n/pt_BR.po b/addons/l10n_fr/i18n/pt_BR.po
index f2825c2499b..e3bd2a0f8bc 100644
--- a/addons/l10n_fr/i18n/pt_BR.po
+++ b/addons/l10n_fr/i18n/pt_BR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_fr
 #: model:account.account.type,name:l10n_fr.account_type_receivable
diff --git a/addons/l10n_fr/i18n/ro.po b/addons/l10n_fr/i18n/ro.po
index 24f575ea1f6..1a71c507424 100644
--- a/addons/l10n_fr/i18n/ro.po
+++ b/addons/l10n_fr/i18n/ro.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_fr
 #: model:account.account.type,name:l10n_fr.account_type_receivable
diff --git a/addons/l10n_fr/i18n/ru.po b/addons/l10n_fr/i18n/ru.po
index 01d6c8491dc..80232c29d4f 100644
--- a/addons/l10n_fr/i18n/ru.po
+++ b/addons/l10n_fr/i18n/ru.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_fr
 #: model:account.account.type,name:l10n_fr.account_type_receivable
diff --git a/addons/l10n_fr/i18n/sl.po b/addons/l10n_fr/i18n/sl.po
index 66f4fd56740..4b978186b1c 100644
--- a/addons/l10n_fr/i18n/sl.po
+++ b/addons/l10n_fr/i18n/sl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_fr
 #: model:account.account.type,name:l10n_fr.account_type_receivable
diff --git a/addons/l10n_fr/i18n/sq.po b/addons/l10n_fr/i18n/sq.po
index e82c8d58f71..9ce21328618 100644
--- a/addons/l10n_fr/i18n/sq.po
+++ b/addons/l10n_fr/i18n/sq.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_fr
 #: model:account.account.type,name:l10n_fr.account_type_receivable
diff --git a/addons/l10n_fr/i18n/sr@latin.po b/addons/l10n_fr/i18n/sr@latin.po
index da9ca30146e..03da89eb18f 100644
--- a/addons/l10n_fr/i18n/sr@latin.po
+++ b/addons/l10n_fr/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_fr
 #: model:account.account.type,name:l10n_fr.account_type_receivable
diff --git a/addons/l10n_fr/i18n/sv.po b/addons/l10n_fr/i18n/sv.po
index 20818f27438..147235dc261 100644
--- a/addons/l10n_fr/i18n/sv.po
+++ b/addons/l10n_fr/i18n/sv.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_fr
 #: model:account.account.type,name:l10n_fr.account_type_receivable
diff --git a/addons/l10n_fr/i18n/tlh.po b/addons/l10n_fr/i18n/tlh.po
index 19f5817f2a6..73077bbf983 100644
--- a/addons/l10n_fr/i18n/tlh.po
+++ b/addons/l10n_fr/i18n/tlh.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_fr
 #: model:account.account.type,name:l10n_fr.account_type_receivable
diff --git a/addons/l10n_fr/i18n/tr.po b/addons/l10n_fr/i18n/tr.po
index c1228c5aa16..359e7b155ae 100644
--- a/addons/l10n_fr/i18n/tr.po
+++ b/addons/l10n_fr/i18n/tr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_fr
 #: model:account.account.type,name:l10n_fr.account_type_receivable
diff --git a/addons/l10n_fr/i18n/uk.po b/addons/l10n_fr/i18n/uk.po
index 41575e35b51..e44ec194134 100644
--- a/addons/l10n_fr/i18n/uk.po
+++ b/addons/l10n_fr/i18n/uk.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_fr
 #: model:account.account.type,name:l10n_fr.account_type_receivable
diff --git a/addons/l10n_fr/i18n/vi.po b/addons/l10n_fr/i18n/vi.po
index 850656d3875..38f1591ae28 100644
--- a/addons/l10n_fr/i18n/vi.po
+++ b/addons/l10n_fr/i18n/vi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_fr
 #: model:account.account.type,name:l10n_fr.account_type_receivable
diff --git a/addons/l10n_fr/i18n/zh_CN.po b/addons/l10n_fr/i18n/zh_CN.po
index b3ed3e6924a..775dfafb4c8 100644
--- a/addons/l10n_fr/i18n/zh_CN.po
+++ b/addons/l10n_fr/i18n/zh_CN.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_fr
 #: model:account.account.type,name:l10n_fr.account_type_receivable
diff --git a/addons/l10n_fr/i18n/zh_TW.po b/addons/l10n_fr/i18n/zh_TW.po
index e997afc77e1..0afb535bc57 100644
--- a/addons/l10n_fr/i18n/zh_TW.po
+++ b/addons/l10n_fr/i18n/zh_TW.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_fr
 #: model:account.account.type,name:l10n_fr.account_type_receivable
diff --git a/addons/l10n_fr_hr_payroll/__openerp__.py b/addons/l10n_fr_hr_payroll/__openerp__.py
index c3b2c332a46..62d364a5277 100755
--- a/addons/l10n_fr_hr_payroll/__openerp__.py
+++ b/addons/l10n_fr_hr_payroll/__openerp__.py
@@ -33,6 +33,7 @@ French Payroll Rules.
     - New payslip report
 
 TODO :
+------
     - Integration with holidays module for deduction and allowance
     - Integration with hr_payroll_account for the automatic account_move_line
       creation from the payslip
@@ -44,9 +45,9 @@ TODO :
     """,
 
     'active': False,
-    'update_xml':[
-     'l10n_fr_hr_payroll_view.xml',
-     'l10n_fr_hr_payroll_data.xml',
+    'data': [
+        'l10n_fr_hr_payroll_view.xml',
+        'l10n_fr_hr_payroll_data.xml',
     ],
     'installable': True
 }
diff --git a/addons/l10n_fr_rib/__openerp__.py b/addons/l10n_fr_rib/__openerp__.py
index fedac46381d..327ab35d5c0 100644
--- a/addons/l10n_fr_rib/__openerp__.py
+++ b/addons/l10n_fr_rib/__openerp__.py
@@ -22,20 +22,23 @@
 {
     'name': 'French RIB Bank Details',
     'version': '1.0',
-    "category": 'Hidden/Dependency',
-    'description': '''
+    'category': 'Hidden/Dependency',
+    'description': """
 This module lets users enter the banking details of Partners in the RIB format (French standard for bank accounts details).
 ===========================================================================================================================
 
-RIB Bank Accounts can be entered in the "Accounting" tab of the Partner form by specifying
-the account type "RIB". The four standard RIB fields will then become mandatory:
+RIB Bank Accounts can be entered in the "Accounting" tab of the Partner form by specifying the account type "RIB". 
+
+The four standard RIB fields will then become mandatory:
+--------------------------------------------------------    
     - Bank Code
     - Office Code
     - Account number
     - RIB key
+    
 As a safety measure, OpenERP will check the RIB key whenever a RIB is saved, and
 will refuse to record the data if the key is incorrect. Please bear in mind that
-this can only happen when the user presses the "save" button, for example on the
+this can only happen when the user presses the 'save' button, for example on the
 Partner Form. Since each bank account may relate to a Bank, users may enter the
 RIB Bank Code in the Bank form - it will the pre-fill the Bank Code on the RIB
 when they select the Bank. To make this easier, this module will also let users
@@ -44,12 +47,11 @@ find Banks using their RIB code.
 The module base_iban can be a useful addition to this module, because French banks
 are now progressively adopting the international IBAN format instead of the RIB format.
 The RIB and IBAN codes for a single account can be entered by recording two Bank
-Accounts in OpenERP: the first with the type "RIB", the second with the type "IBAN". 
-''',
+Accounts in OpenERP: the first with the type 'RIB', the second with the type 'IBAN'. 
+""",
     'author' : u'Numérigraphe SARL',
     'depends': ['account', 'base_iban'],
-    'init_xml': ['bank_data.xml', ],
-    'update_xml': ['bank_view.xml', ],
+    'data': ['bank_data.xml', 'bank_view.xml'],
     'installable': True,
     'certificate': '003407950790',
     'auto_install': False,
diff --git a/addons/l10n_fr_rib/bank_data.xml b/addons/l10n_fr_rib/bank_data.xml
index 030bccb6ef0..ac085cc1667 100644
--- a/addons/l10n_fr_rib/bank_data.xml
+++ b/addons/l10n_fr_rib/bank_data.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-    <data>
+    <data noupdate="1">
 
         <!--
         RIB bank details
diff --git a/addons/l10n_fr_rib/i18n/ar.po b/addons/l10n_fr_rib/i18n/ar.po
index 14d16624329..2f7b47bbd5c 100644
--- a/addons/l10n_fr_rib/i18n/ar.po
+++ b/addons/l10n_fr_rib/i18n/ar.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_fr_rib
 #: constraint:res.partner.bank:0
diff --git a/addons/l10n_fr_rib/i18n/es_CR.po b/addons/l10n_fr_rib/i18n/es_CR.po
index 02d09fade95..3cb85afc5a7 100644
--- a/addons/l10n_fr_rib/i18n/es_CR.po
+++ b/addons/l10n_fr_rib/i18n/es_CR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_fr_rib
 #: constraint:res.partner.bank:0
diff --git a/addons/l10n_fr_rib/i18n/fr.po b/addons/l10n_fr_rib/i18n/fr.po
index a219f926c40..a7e5dcdc6f3 100644
--- a/addons/l10n_fr_rib/i18n/fr.po
+++ b/addons/l10n_fr_rib/i18n/fr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_fr_rib
 #: constraint:res.partner.bank:0
diff --git a/addons/l10n_fr_rib/i18n/pt.po b/addons/l10n_fr_rib/i18n/pt.po
index fbe1f64191c..61e9c7c2e6b 100644
--- a/addons/l10n_fr_rib/i18n/pt.po
+++ b/addons/l10n_fr_rib/i18n/pt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_fr_rib
 #: constraint:res.partner.bank:0
diff --git a/addons/l10n_gr/__openerp__.py b/addons/l10n_gr/__openerp__.py
index 0ad042b3b28..62d82b544d8 100644
--- a/addons/l10n_gr/__openerp__.py
+++ b/addons/l10n_gr/__openerp__.py
@@ -20,27 +20,27 @@
 #
 ##############################################################################
 {
-    "name" : "Greece - Accounting",
-    "version" : "0.2",
-    "author" : "P. Christeas, OpenERP SA.",
-    "website": "http://openerp.hellug.gr/",
-    "category" : "Localization/Account Charts",
-    "description": """
+    'name': 'Greece - Accounting',
+    'version': '0.2',
+    'author': 'P. Christeas, OpenERP SA.',
+    'website': 'http://openerp.hellug.gr/',
+    'category': 'Localization/Account Charts',
+    'description': """
 This is the base module to manage the accounting chart for Greece.
 ==================================================================
 
 Greek accounting chart and localization.
     """,
-    "depends" : ["base", "account", "base_iban", "base_vat", "account_chart"],
-    "init_xml" : [],
-    "demo_xml" : [],
-    "update_xml" : [ "account_types.xml",
-                    "account_chart.xml",
-                    "account_full_chart.xml",
-                    "account_tax.xml",
-                    "account_tax_vat.xml",
-                    "l10n_gr_wizard.xml"],
-    "installable": True,
+    'depends': ['base', 'account', 'base_iban', 'base_vat', 'account_chart'],
+    'demo': [],
+    'data': [ 'account_types.xml',
+               'account_chart.xml',
+               'account_full_chart.xml',
+               'account_tax.xml',
+               'account_tax_vat.xml',
+               'l10n_gr_wizard.xml'
+    ],
+    'installable': True,
     'certificate': '001146244418929008029',
     'images': ['images/config_chart_l10n_gr.jpeg','images/l10n_gr_chart.jpeg'],
 }
diff --git a/addons/l10n_gr/i18n/ar.po b/addons/l10n_gr/i18n/ar.po
index 113f97c6ab8..0058c18e2c8 100644
--- a/addons/l10n_gr/i18n/ar.po
+++ b/addons/l10n_gr/i18n/ar.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_gr
 #: model:account.account.type,name:l10n_gr.account_type_cash
diff --git a/addons/l10n_gr/i18n/ca.po b/addons/l10n_gr/i18n/ca.po
index b5b74f7379d..df2be808b53 100644
--- a/addons/l10n_gr/i18n/ca.po
+++ b/addons/l10n_gr/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_gr
 #: model:account.account.type,name:l10n_gr.account_type_cash
diff --git a/addons/l10n_gr/i18n/da.po b/addons/l10n_gr/i18n/da.po
index 88cebc307bd..8931384e783 100644
--- a/addons/l10n_gr/i18n/da.po
+++ b/addons/l10n_gr/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_gr
 #: model:account.account.type,name:l10n_gr.account_type_cash
diff --git a/addons/l10n_gr/i18n/de.po b/addons/l10n_gr/i18n/de.po
index 3b183190482..4d622e5f312 100644
--- a/addons/l10n_gr/i18n/de.po
+++ b/addons/l10n_gr/i18n/de.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_gr
 #: model:account.account.type,name:l10n_gr.account_type_cash
diff --git a/addons/l10n_gr/i18n/el.po b/addons/l10n_gr/i18n/el.po
index bf60461c3d5..4a3f9f8f022 100644
--- a/addons/l10n_gr/i18n/el.po
+++ b/addons/l10n_gr/i18n/el.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_gr
 #: model:account.account.type,name:l10n_gr.account_type_cash
diff --git a/addons/l10n_gr/i18n/es.po b/addons/l10n_gr/i18n/es.po
index a427b7e811e..455aae4fac4 100644
--- a/addons/l10n_gr/i18n/es.po
+++ b/addons/l10n_gr/i18n/es.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_gr
 #: model:account.account.type,name:l10n_gr.account_type_cash
diff --git a/addons/l10n_gr/i18n/es_CR.po b/addons/l10n_gr/i18n/es_CR.po
index 0385e1c72ec..419c3e578af 100644
--- a/addons/l10n_gr/i18n/es_CR.po
+++ b/addons/l10n_gr/i18n/es_CR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 "Language: es\n"
 
 #. module: l10n_gr
diff --git a/addons/l10n_gr/i18n/es_PY.po b/addons/l10n_gr/i18n/es_PY.po
index 66f93904c8e..00e06d22450 100644
--- a/addons/l10n_gr/i18n/es_PY.po
+++ b/addons/l10n_gr/i18n/es_PY.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_gr
 #: model:account.account.type,name:l10n_gr.account_type_cash
diff --git a/addons/l10n_gr/i18n/fr.po b/addons/l10n_gr/i18n/fr.po
index 21fae604cfc..b60a36805cb 100644
--- a/addons/l10n_gr/i18n/fr.po
+++ b/addons/l10n_gr/i18n/fr.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_gr
 #: model:account.account.type,name:l10n_gr.account_type_cash
diff --git a/addons/l10n_gr/i18n/gl.po b/addons/l10n_gr/i18n/gl.po
index 9c2ee3125ae..14ee2e2a1ff 100644
--- a/addons/l10n_gr/i18n/gl.po
+++ b/addons/l10n_gr/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_gr
 #: model:account.account.type,name:l10n_gr.account_type_cash
diff --git a/addons/l10n_gr/i18n/hu.po b/addons/l10n_gr/i18n/hu.po
index cc91ee6788b..1fb5220f49a 100644
--- a/addons/l10n_gr/i18n/hu.po
+++ b/addons/l10n_gr/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_gr
 #: model:account.account.type,name:l10n_gr.account_type_cash
diff --git a/addons/l10n_gr/i18n/it.po b/addons/l10n_gr/i18n/it.po
index d0d56a99f71..47e752f49f9 100644
--- a/addons/l10n_gr/i18n/it.po
+++ b/addons/l10n_gr/i18n/it.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_gr
 #: model:account.account.type,name:l10n_gr.account_type_cash
diff --git a/addons/l10n_gr/i18n/nl.po b/addons/l10n_gr/i18n/nl.po
index bcf3942a58e..4bdac734750 100644
--- a/addons/l10n_gr/i18n/nl.po
+++ b/addons/l10n_gr/i18n/nl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_gr
 #: model:account.account.type,name:l10n_gr.account_type_cash
diff --git a/addons/l10n_gr/i18n/pt.po b/addons/l10n_gr/i18n/pt.po
index b15849d367f..0c6e72c3813 100644
--- a/addons/l10n_gr/i18n/pt.po
+++ b/addons/l10n_gr/i18n/pt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_gr
 #: model:account.account.type,name:l10n_gr.account_type_cash
diff --git a/addons/l10n_gr/i18n/pt_BR.po b/addons/l10n_gr/i18n/pt_BR.po
index 521810a2ceb..7e2a173d79d 100644
--- a/addons/l10n_gr/i18n/pt_BR.po
+++ b/addons/l10n_gr/i18n/pt_BR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_gr
 #: model:account.account.type,name:l10n_gr.account_type_cash
diff --git a/addons/l10n_gr/i18n/sr@latin.po b/addons/l10n_gr/i18n/sr@latin.po
index 082da32ebba..c220d63bef9 100644
--- a/addons/l10n_gr/i18n/sr@latin.po
+++ b/addons/l10n_gr/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_gr
 #: model:account.account.type,name:l10n_gr.account_type_cash
diff --git a/addons/l10n_gr/i18n/tr.po b/addons/l10n_gr/i18n/tr.po
index f8bed2c2d22..3f5bc15408d 100644
--- a/addons/l10n_gr/i18n/tr.po
+++ b/addons/l10n_gr/i18n/tr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_gr
 #: model:account.account.type,name:l10n_gr.account_type_cash
diff --git a/addons/l10n_gt/__openerp__.py b/addons/l10n_gt/__openerp__.py
index 44389e68439..e36e418ee21 100644
--- a/addons/l10n_gt/__openerp__.py
+++ b/addons/l10n_gt/__openerp__.py
@@ -46,14 +46,13 @@ taxes and the Quetzal currency.""",
     'author': 'José Rodrigo Fernández Menegazzo',
     'website': 'http://solucionesprisma.com/',
     'depends': ['base', 'account', 'account_chart'],
-    'init_xml': [],
-    'update_xml': [
+    'data': [
         'account_types.xml',
         'account_chart.xml',
         'account_tax.xml',
         'l10n_gt_base.xml',
     ],
-    'demo_xml': [],
+    'demo': [],
     'installable': True,
     'certificate': '00815146661827601309',
     'images': ['images/config_chart_l10n_gt.jpeg','images/l10n_gt_chart.jpeg'],
diff --git a/addons/l10n_gt/i18n/ar.po b/addons/l10n_gt/i18n/ar.po
index a9e26cbeee1..2cea312c246 100644
--- a/addons/l10n_gt/i18n/ar.po
+++ b/addons/l10n_gt/i18n/ar.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_gt
 #: model:account.account.type,name:l10n_gt.cuenta_vista
diff --git a/addons/l10n_gt/i18n/ca.po b/addons/l10n_gt/i18n/ca.po
index e90ef2d8426..8502c6db217 100644
--- a/addons/l10n_gt/i18n/ca.po
+++ b/addons/l10n_gt/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_gt
 #: model:account.account.type,name:l10n_gt.cuenta_vista
diff --git a/addons/l10n_gt/i18n/da.po b/addons/l10n_gt/i18n/da.po
index 4f768ada059..b6080a4b402 100644
--- a/addons/l10n_gt/i18n/da.po
+++ b/addons/l10n_gt/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_gt
 #: model:account.account.type,name:l10n_gt.cuenta_vista
diff --git a/addons/l10n_gt/i18n/es.po b/addons/l10n_gt/i18n/es.po
index 2bb2ac18fc7..5b414eb2800 100644
--- a/addons/l10n_gt/i18n/es.po
+++ b/addons/l10n_gt/i18n/es.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_gt
 #: model:account.account.type,name:l10n_gt.cuenta_vista
diff --git a/addons/l10n_gt/i18n/es_CR.po b/addons/l10n_gt/i18n/es_CR.po
index 70160ea54b3..c7dd1e7cf37 100644
--- a/addons/l10n_gt/i18n/es_CR.po
+++ b/addons/l10n_gt/i18n/es_CR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 "Language: \n"
 
 #. module: l10n_gt
diff --git a/addons/l10n_gt/i18n/es_PY.po b/addons/l10n_gt/i18n/es_PY.po
index 38e1466c8db..60ba375ceb8 100644
--- a/addons/l10n_gt/i18n/es_PY.po
+++ b/addons/l10n_gt/i18n/es_PY.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_gt
 #: model:account.account.type,name:l10n_gt.cuenta_vista
diff --git a/addons/l10n_gt/i18n/fr.po b/addons/l10n_gt/i18n/fr.po
index cbbfd959a1a..33f7f65153c 100644
--- a/addons/l10n_gt/i18n/fr.po
+++ b/addons/l10n_gt/i18n/fr.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_gt
 #: model:account.account.type,name:l10n_gt.cuenta_vista
diff --git a/addons/l10n_gt/i18n/gl.po b/addons/l10n_gt/i18n/gl.po
index 4423caff842..5b875fda1d0 100644
--- a/addons/l10n_gt/i18n/gl.po
+++ b/addons/l10n_gt/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_gt
 #: model:account.account.type,name:l10n_gt.cuenta_vista
diff --git a/addons/l10n_gt/i18n/hu.po b/addons/l10n_gt/i18n/hu.po
index c154661e3a6..93490a83c95 100644
--- a/addons/l10n_gt/i18n/hu.po
+++ b/addons/l10n_gt/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_gt
 #: model:account.account.type,name:l10n_gt.cuenta_vista
diff --git a/addons/l10n_gt/i18n/it.po b/addons/l10n_gt/i18n/it.po
index 579ab6fd9ea..5cc19dd91b3 100644
--- a/addons/l10n_gt/i18n/it.po
+++ b/addons/l10n_gt/i18n/it.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_gt
 #: model:account.account.type,name:l10n_gt.cuenta_vista
diff --git a/addons/l10n_gt/i18n/oc.po b/addons/l10n_gt/i18n/oc.po
index 8e1ce76b614..e1c53969ea0 100644
--- a/addons/l10n_gt/i18n/oc.po
+++ b/addons/l10n_gt/i18n/oc.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_gt
 #: model:account.account.type,name:l10n_gt.cuenta_vista
diff --git a/addons/l10n_gt/i18n/pt.po b/addons/l10n_gt/i18n/pt.po
index a745bffd8db..23a7782d49c 100644
--- a/addons/l10n_gt/i18n/pt.po
+++ b/addons/l10n_gt/i18n/pt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_gt
 #: model:account.account.type,name:l10n_gt.cuenta_vista
diff --git a/addons/l10n_gt/i18n/pt_BR.po b/addons/l10n_gt/i18n/pt_BR.po
index b4c813d4596..4fda48ce3b1 100644
--- a/addons/l10n_gt/i18n/pt_BR.po
+++ b/addons/l10n_gt/i18n/pt_BR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_gt
 #: model:account.account.type,name:l10n_gt.cuenta_vista
diff --git a/addons/l10n_gt/i18n/sr@latin.po b/addons/l10n_gt/i18n/sr@latin.po
index 2221f05ac8c..bd36ebbceda 100644
--- a/addons/l10n_gt/i18n/sr@latin.po
+++ b/addons/l10n_gt/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_gt
 #: model:account.account.type,name:l10n_gt.cuenta_vista
diff --git a/addons/l10n_gt/i18n/tr.po b/addons/l10n_gt/i18n/tr.po
index 5ca0dfe444a..d0c09550487 100644
--- a/addons/l10n_gt/i18n/tr.po
+++ b/addons/l10n_gt/i18n/tr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_gt
 #: model:account.account.type,name:l10n_gt.cuenta_vista
diff --git a/addons/l10n_hn/__openerp__.py b/addons/l10n_hn/__openerp__.py
index 25655e52e70..0f72b3e446c 100644
--- a/addons/l10n_hn/__openerp__.py
+++ b/addons/l10n_hn/__openerp__.py
@@ -37,20 +37,22 @@
     'version': '0.1',
     'category': 'Localization/Account Charts',
     'description': """
+This is the base module to manage the accounting chart for Honduras.
+====================================================================
+    
 Agrega una nomenclatura contable para Honduras. También incluye impuestos y la
 moneda Lempira. -- Adds accounting chart for Honduras. It also includes taxes
 and the Lempira currency.""",
     'author': 'Salvatore Josue Trimarchi Pinto',
     'website': 'http://trimarchi.co.cc',
     'depends': ['base', 'account', 'account_chart'],
-    'init_xml': [],
-    'update_xml': [
+    'data': [
         'account_types.xml',
         'account_chart.xml',
         'account_tax.xml',
         'l10n_hn_base.xml',
     ],
-    'demo_xml': [],
+    'demo': [],
     'installable': True,
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/l10n_hn/i18n/ca.po b/addons/l10n_hn/i18n/ca.po
index b83f5180889..2aa21ac2a25 100644
--- a/addons/l10n_hn/i18n/ca.po
+++ b/addons/l10n_hn/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_hn
 #: model:account.account.type,name:l10n_hn.cuenta_vista
diff --git a/addons/l10n_hn/i18n/es.po b/addons/l10n_hn/i18n/es.po
index 577c591fd49..0a0e99f5ba7 100644
--- a/addons/l10n_hn/i18n/es.po
+++ b/addons/l10n_hn/i18n/es.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_hn
 #: model:account.account.type,name:l10n_hn.cuenta_vista
diff --git a/addons/l10n_hn/i18n/es_CR.po b/addons/l10n_hn/i18n/es_CR.po
index 3920e3e65a3..b4010dc0065 100644
--- a/addons/l10n_hn/i18n/es_CR.po
+++ b/addons/l10n_hn/i18n/es_CR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 "Language: \n"
 
 #. module: l10n_hn
diff --git a/addons/l10n_hn/i18n/fr.po b/addons/l10n_hn/i18n/fr.po
index d743875a119..7f6a02442dd 100644
--- a/addons/l10n_hn/i18n/fr.po
+++ b/addons/l10n_hn/i18n/fr.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_hn
 #: model:account.account.type,name:l10n_hn.cuenta_vista
diff --git a/addons/l10n_hn/i18n/gl.po b/addons/l10n_hn/i18n/gl.po
index 7e9a65b82a4..c5eeb2df2a4 100644
--- a/addons/l10n_hn/i18n/gl.po
+++ b/addons/l10n_hn/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_hn
 #: model:account.account.type,name:l10n_hn.cuenta_vista
diff --git a/addons/l10n_hn/i18n/hu.po b/addons/l10n_hn/i18n/hu.po
index 7d903ca9b3f..a1c6669533f 100644
--- a/addons/l10n_hn/i18n/hu.po
+++ b/addons/l10n_hn/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_hn
 #: model:account.account.type,name:l10n_hn.cuenta_vista
diff --git a/addons/l10n_hn/i18n/it.po b/addons/l10n_hn/i18n/it.po
index c059ed1af27..a4a75eb1830 100644
--- a/addons/l10n_hn/i18n/it.po
+++ b/addons/l10n_hn/i18n/it.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_hn
 #: model:account.account.type,name:l10n_hn.cuenta_vista
diff --git a/addons/l10n_hn/i18n/pt.po b/addons/l10n_hn/i18n/pt.po
index f645c368328..a01af3f2b27 100644
--- a/addons/l10n_hn/i18n/pt.po
+++ b/addons/l10n_hn/i18n/pt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_hn
 #: model:account.account.type,name:l10n_hn.cuenta_vista
diff --git a/addons/l10n_hn/i18n/pt_BR.po b/addons/l10n_hn/i18n/pt_BR.po
index 0f17e698421..da38d9decfa 100644
--- a/addons/l10n_hn/i18n/pt_BR.po
+++ b/addons/l10n_hn/i18n/pt_BR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_hn
 #: model:account.account.type,name:l10n_hn.cuenta_vista
diff --git a/addons/l10n_hn/i18n/sr@latin.po b/addons/l10n_hn/i18n/sr@latin.po
index e5351f030db..bd3c275d4f2 100644
--- a/addons/l10n_hn/i18n/sr@latin.po
+++ b/addons/l10n_hn/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_hn
 #: model:account.account.type,name:l10n_hn.cuenta_vista
diff --git a/addons/l10n_hn/i18n/tr.po b/addons/l10n_hn/i18n/tr.po
index 1224e7f4c67..356ad6d55f6 100644
--- a/addons/l10n_hn/i18n/tr.po
+++ b/addons/l10n_hn/i18n/tr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_hn
 #: model:account.account.type,name:l10n_hn.cuenta_vista
diff --git a/addons/l10n_in/__openerp__.py b/addons/l10n_in/__openerp__.py
index 1e49509c627..b1cab835f96 100644
--- a/addons/l10n_in/__openerp__.py
+++ b/addons/l10n_in/__openerp__.py
@@ -20,32 +20,32 @@
 ##############################################################################
 
 {
-    "name": "Indian - Accounting",
-    "version": "1.0",
-    "description": """
+    'name': 'Indian - Accounting',
+    'version': '1.0',
+    'description': """
 Indian Accounting: Chart of Account.
 ====================================
 
 Indian accounting chart and localization.
     """,
-    "author": ['OpenERP SA', 'Axelor'],
-    "category": "Localization/Account Charts",
-    "depends": [
-        "account",
-        "account_chart"
+    'author': ['OpenERP SA', 'Axelor'],
+    'category': 'Localization/Account Charts',
+    'depends': [
+        'account',
+        'account_chart'
     ],
-    "demo_xml": [],
-    "update_xml": [
-        "l10n_in_tax_code_template.xml",
-        "l10n_in_public_chart.xml",
-        "l10n_in_public_tax_template.xml",
-        "l10n_in_private_chart.xml",
-        "l10n_in_private_tax_template.xml",
-        "l10n_in_wizard.xml",
+    'demo': [],
+    'data': [
+        'l10n_in_tax_code_template.xml',
+        'l10n_in_public_chart.xml',
+        'l10n_in_public_tax_template.xml',
+        'l10n_in_private_chart.xml',
+        'l10n_in_private_tax_template.xml',
+        'l10n_in_wizard.xml',
     ],
-    "auto_install": False,
-    "installable": True,
-    "certificate" : "001308250150600713245",
+    'auto_install': False,
+    'installable': True,
+    'certificate' : '001308250150600713245',
     'images': ['images/config_chart_l10n_in.jpeg','images/l10n_in_chart.jpeg'],
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/l10n_in/i18n/ar.po b/addons/l10n_in/i18n/ar.po
index 848b5ad20c7..127f2a994de 100644
--- a/addons/l10n_in/i18n/ar.po
+++ b/addons/l10n_in/i18n/ar.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:34+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_in
 #: model:account.account.type,name:l10n_in.account_type_asset_view
diff --git a/addons/l10n_in/i18n/br.po b/addons/l10n_in/i18n/br.po
index 6c096a8cc46..abb2c4293e9 100644
--- a/addons/l10n_in/i18n/br.po
+++ b/addons/l10n_in/i18n/br.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:27+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:32+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_chart_in
 #: model:ir.module.module,description:l10n_chart_in.module_meta_information
diff --git a/addons/l10n_in/i18n/ca.po b/addons/l10n_in/i18n/ca.po
index 6a318578f7e..f2ba1efcdac 100644
--- a/addons/l10n_in/i18n/ca.po
+++ b/addons/l10n_in/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:27+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:32+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_chart_in
 #: model:ir.module.module,description:l10n_chart_in.module_meta_information
diff --git a/addons/l10n_in/i18n/da.po b/addons/l10n_in/i18n/da.po
index 9052653a257..2395061e818 100644
--- a/addons/l10n_in/i18n/da.po
+++ b/addons/l10n_in/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:34+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_in
 #: model:account.account.type,name:l10n_in.account_type_asset_view
diff --git a/addons/l10n_in/i18n/de.po b/addons/l10n_in/i18n/de.po
index ba06b84307a..63c4f87ed50 100644
--- a/addons/l10n_in/i18n/de.po
+++ b/addons/l10n_in/i18n/de.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:28+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:32+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_chart_in
 #: model:ir.module.module,description:l10n_chart_in.module_meta_information
diff --git a/addons/l10n_in/i18n/es.po b/addons/l10n_in/i18n/es.po
index 7ecd582f42b..daa9acda0d9 100644
--- a/addons/l10n_in/i18n/es.po
+++ b/addons/l10n_in/i18n/es.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:28+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:32+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_chart_in
 #: model:ir.module.module,description:l10n_chart_in.module_meta_information
diff --git a/addons/l10n_in/i18n/es_CR.po b/addons/l10n_in/i18n/es_CR.po
index b6f78093082..d5d6ce7755d 100644
--- a/addons/l10n_in/i18n/es_CR.po
+++ b/addons/l10n_in/i18n/es_CR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:28+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:32+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_chart_in
 #: model:ir.module.module,description:l10n_chart_in.module_meta_information
diff --git a/addons/l10n_in/i18n/es_PY.po b/addons/l10n_in/i18n/es_PY.po
index 4c2ea9833b5..66c2abba623 100644
--- a/addons/l10n_in/i18n/es_PY.po
+++ b/addons/l10n_in/i18n/es_PY.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:34+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_in
 #: model:account.account.type,name:l10n_in.account_type_asset_view
diff --git a/addons/l10n_in/i18n/et.po b/addons/l10n_in/i18n/et.po
index e02f6e7a2d2..39675393d5d 100644
--- a/addons/l10n_in/i18n/et.po
+++ b/addons/l10n_in/i18n/et.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:28+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:32+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_chart_in
 #: model:ir.module.module,description:l10n_chart_in.module_meta_information
diff --git a/addons/l10n_in/i18n/fr.po b/addons/l10n_in/i18n/fr.po
index 76d333df6d4..eb57eb7965e 100644
--- a/addons/l10n_in/i18n/fr.po
+++ b/addons/l10n_in/i18n/fr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:28+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:32+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_chart_in
 #: model:ir.module.module,description:l10n_chart_in.module_meta_information
diff --git a/addons/l10n_in/i18n/gl.po b/addons/l10n_in/i18n/gl.po
index 6439e73fef0..8aef80214a5 100644
--- a/addons/l10n_in/i18n/gl.po
+++ b/addons/l10n_in/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:34+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_in
 #: model:account.account.type,name:l10n_in.account_type_asset_view
diff --git a/addons/l10n_in/i18n/hu.po b/addons/l10n_in/i18n/hu.po
index 6a38f815e30..596be3d39b4 100644
--- a/addons/l10n_in/i18n/hu.po
+++ b/addons/l10n_in/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:28+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:32+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_chart_in
 #: model:ir.module.module,description:l10n_chart_in.module_meta_information
diff --git a/addons/l10n_in/i18n/it.po b/addons/l10n_in/i18n/it.po
index 7341e98edf7..10e2565318a 100644
--- a/addons/l10n_in/i18n/it.po
+++ b/addons/l10n_in/i18n/it.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:28+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:32+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_chart_in
 #: model:ir.module.module,description:l10n_chart_in.module_meta_information
diff --git a/addons/l10n_in/i18n/oc.po b/addons/l10n_in/i18n/oc.po
index a2c17c999b8..7ee18c9dd66 100644
--- a/addons/l10n_in/i18n/oc.po
+++ b/addons/l10n_in/i18n/oc.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:34+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_in
 #: model:account.account.type,name:l10n_in.account_type_asset_view
diff --git a/addons/l10n_in/i18n/pt.po b/addons/l10n_in/i18n/pt.po
index eb3b3f232aa..cb384f31f7c 100644
--- a/addons/l10n_in/i18n/pt.po
+++ b/addons/l10n_in/i18n/pt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:28+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:32+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_chart_in
 #: model:ir.module.module,description:l10n_chart_in.module_meta_information
diff --git a/addons/l10n_in/i18n/pt_BR.po b/addons/l10n_in/i18n/pt_BR.po
index 808a62d7db5..32076fa1775 100644
--- a/addons/l10n_in/i18n/pt_BR.po
+++ b/addons/l10n_in/i18n/pt_BR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:28+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:32+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_chart_in
 #: model:ir.module.module,description:l10n_chart_in.module_meta_information
diff --git a/addons/l10n_in/i18n/ru.po b/addons/l10n_in/i18n/ru.po
index 112fe091196..1d35f3031c2 100644
--- a/addons/l10n_in/i18n/ru.po
+++ b/addons/l10n_in/i18n/ru.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:28+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:32+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_chart_in
 #: model:ir.module.module,description:l10n_chart_in.module_meta_information
diff --git a/addons/l10n_in/i18n/sr@latin.po b/addons/l10n_in/i18n/sr@latin.po
index e2dd751b76c..63c764f6fdc 100644
--- a/addons/l10n_in/i18n/sr@latin.po
+++ b/addons/l10n_in/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:28+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:32+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_chart_in
 #: model:ir.module.module,description:l10n_chart_in.module_meta_information
diff --git a/addons/l10n_in/i18n/sv.po b/addons/l10n_in/i18n/sv.po
index 62a5ea82149..c2003e6d118 100644
--- a/addons/l10n_in/i18n/sv.po
+++ b/addons/l10n_in/i18n/sv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:28+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:32+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_chart_in
 #: model:ir.module.module,description:l10n_chart_in.module_meta_information
diff --git a/addons/l10n_in/i18n/tr.po b/addons/l10n_in/i18n/tr.po
index a8d1f5037ad..0c66f82d9e6 100644
--- a/addons/l10n_in/i18n/tr.po
+++ b/addons/l10n_in/i18n/tr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:28+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:32+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_chart_in
 #: model:ir.module.module,description:l10n_chart_in.module_meta_information
diff --git a/addons/l10n_in_hr_payroll/__init__.py b/addons/l10n_in_hr_payroll/__init__.py
new file mode 100644
index 00000000000..9631ccf0317
--- /dev/null
+++ b/addons/l10n_in_hr_payroll/__init__.py
@@ -0,0 +1,26 @@
+#-*- coding:utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2011 OpenERP SA (<http://openerp.com>). All Rights Reserved
+#
+#    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 l10n_in_hr_payroll
+import report
+import wizard
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/l10n_in_hr_payroll/__openerp__.py b/addons/l10n_in_hr_payroll/__openerp__.py
new file mode 100644
index 00000000000..6d891c7a08e
--- /dev/null
+++ b/addons/l10n_in_hr_payroll/__openerp__.py
@@ -0,0 +1,68 @@
+# -*- encoding: 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/>.
+#
+##############################################################################
+{
+    'name': 'Indian Payroll',
+    'category': 'Localization',
+    'init_xml': [],
+    'author': 'OpenERP SA',
+    'website':'http://www.openerp.com',
+    'depends': ['hr_payroll'],
+    'version': '1.0',
+    'description': """
+Indian Payroll Salary Rules.
+============================
+
+    -Configuration of hr_payroll for India localization
+    -All main contributions rules for India payslip.
+    * New payslip report
+    * Employee Contracts
+    * Allow to configure Basic / Gross / Net Salary
+    * Employee PaySlip
+    * Allowance / Deduction
+    * Integrated with Holiday Management
+    * Medical Allowance, Travel Allowance, Child Allowance, ...
+    - Payroll Advice and Report
+    - Yearly Salary by Head and Yearly Salary by Employee Report
+    """,
+    'active': False,
+    'update_xml': [
+         'l10n_in_hr_payroll_view.xml',
+         'data/l10n_in_hr_payroll_data.xml',
+         'data/hr.salary.rule.csv',
+         'security/ir.model.access.csv',
+         'l10n_in_hr_payroll_report.xml',
+         'l10n_in_hr_payroll_sequence.xml',
+         'wizard/hr_salary_employee_bymonth_view.xml',
+         'wizard/hr_yearly_salary_detail_view.xml',
+         'report/payment_advice_report_view.xml',
+         'report/payslip_report_view.xml',
+
+     ],
+    'test': [
+        'test/payment_advice.yml',
+        'test/payment_advice_batch.yml'
+    ],
+
+    'demo_xml': ['l10n_in_hr_payroll_demo.xml'],
+    'installable': True
+}
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/l10n_in_hr_payroll/data/hr.salary.rule.csv b/addons/l10n_in_hr_payroll/data/hr.salary.rule.csv
new file mode 100644
index 00000000000..2fe1ba739f4
--- /dev/null
+++ b/addons/l10n_in_hr_payroll/data/hr.salary.rule.csv
@@ -0,0 +1,5 @@
+"id","amount_select","condition_range_min","condition_range_max","amount_percentage","amount_fix","name","category_id","sequence","code","parent_rule_id/id","condition_select","condition_range","amount_percentage_base"
+1,"fix",1,1,,100,"Education Allowance For One Child","Allowance",23,"CHEAONE","hr_payroll_rule_child1","range","employee.children",
+2,"fix",2,10,,200,"Education Allowance For Two Child","Allowance",24,"CHEATWO","hr_payroll_rule_child1","range","employee.children",
+3,"fix",1,1,,300,"Child Hostel Allowance For One Child","Allowance",26,"CHOONE","hr_payroll_rule_child2","range","employee.children",
+4,"fix",2,10,,600,"Child Hostel Allowance For Two Child","Allowance",27,"CHOTWO","hr_payroll_rule_child2","range","employee.children",
diff --git a/addons/l10n_in_hr_payroll/data/l10n_in_hr_payroll_data.xml b/addons/l10n_in_hr_payroll/data/l10n_in_hr_payroll_data.xml
new file mode 100644
index 00000000000..8c6449e6336
--- /dev/null
+++ b/addons/l10n_in_hr_payroll/data/l10n_in_hr_payroll_data.xml
@@ -0,0 +1,584 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        <!-- Contribution Register -->
+
+        <record id="hr_houserent_allowance_register" model="hr.contribution.register">
+            <field name="name">Register for House Rent Allowance</field>
+        </record>
+
+        <record id="hr_register_provident_fund" model="hr.contribution.register">
+            <field name="name">Register for Provident Fund</field>
+        </record>
+
+        <record id="hr_professional_tax_deduction_register" model="hr.contribution.register">
+            <field name="name">Register for Professional Tax</field>
+        </record>
+
+        <record id="hr_food_coupen_register" model="hr.contribution.register">
+            <field name="name">Register for Food Coupen</field>
+        </record>
+
+        <record id="hr_tds_register" model="hr.contribution.register">
+            <field name="name">Register for TDS</field>
+        </record>
+
+        <record id="hr_nps_contribution_register" model="hr.contribution.register">
+            <field name="name">Register for NPS Contribution</field>
+        </record>
+
+        <record id="hr_vpf_contribution_register" model="hr.contribution.register">
+            <field name="name">Register for Voluntarily Provident Fund</field>
+        </record>
+
+        <record id="hr_company_transport_register" model="hr.contribution.register">
+            <field name="name">Register for Company Provided Transport Deduction</field>
+        </record>
+
+        <record id="hr_labour_Welfare_fund_register" model="hr.contribution.register">
+            <field name="name">Register for State Labour Welfare Fund Deduction</field>
+        </record>
+
+        <record id="hr_group_term_insurance_register" model="hr.contribution.register">
+            <field name="name">Register for Company Provided Group Term Insurance Deduction</field>
+        </record>
+
+        <record id="hr_leave_availed_register" model="hr.contribution.register">
+            <field name="name">Register for Leave Availed Deduction</field>
+        </record>
+
+        <record id="hr_medical_insurance_register" model="hr.contribution.register">
+            <field name="name">Register for Company Provided Medical Insurance Deduction</field>
+        </record>
+
+        <record id="hr_other_deduction_register" model="hr.contribution.register">
+            <field name="name">Register for Other Deduction from Employer</field>
+        </record>
+        <!-- Hr Salary Rules for allowance-->
+
+        <record id="hr_salary_rule_da" model="hr.salary.rule">
+            <field name="code">DA</field>
+            <field name="name">Dearness Allowance</field>
+            <field name="category_id" ref="hr_payroll.ALW"/>
+            <field name="amount_select">percentage</field>
+            <field name="amount_percentage_base">contract.wage</field>
+            <field name="amount_percentage" eval="50"/>
+            <field name="sequence" eval="13"/>
+            <field name="note">Dearness allowance (D.A.) is part of a person's salary. It is calculated as a percent of the basic salary. This amount is then added to the basic salary along with house rent allowance to get the total salary. Or you can say that The Dearness Allowance is a part of the total compensation a person receives for having performed his or her job.</field>
+        </record>
+
+        <record id="hr_salary_rule_houserentallowancemetro_nonmetro" model="hr.salary.rule">
+            <field name="code">HRAMN</field>
+            <field name="amount_select">code</field>
+            <field name="amount_python_compute">result = (payslip.company_id.dearness_allowance and 
+((contract.wage + DA) * contract.house_rent_allowance_metro_nonmetro / 100)
+or (contract.wage * contract.house_rent_allowance_metro_nonmetro / 100))</field>
+            <field name="category_id" ref="hr_payroll.ALW"/>
+            <field name="name">House Rent Allowance</field>
+            <field name="register_id" ref="hr_houserent_allowance_register"/>
+            <field name="sequence" eval="51"/>
+            <field name="note">HRA is an allowance given by the employer to the employee for taking care of his rental or accommodation expenses.</field>
+        </record>
+
+        <record id="hr_salary_trans_allownce" model="hr.salary.rule">
+            <field name="code">TCA</field>
+            <field name="name">Transport/Conveyance Allownace</field>
+            <field name="category_id" ref="hr_payroll.ALW"/>
+            <field name="amount_select">fix</field>
+            <field eval="800.0" name="amount_fix"/>
+            <field name="sequence" eval="14"/>
+            <field name="note">A conveyance allowance refers to an amount of money reimbursed to someone for the operation of a vehicle or the riding of a vehicle. The allowance is typically a designated amount or percentage of total transportation expenses that is referenced in a country's tax laws or code. Organizations and private or public businesses may also offer a conveyance allowance in addition to reimbursing employees or members for transportation expenses. In this instance, the conveyance allowance may identify an unusual transport occurrence that may not be covered by a designated travel expense report such as travel to a specific job site that requires a daily bus or taxi ride.</field>
+        </record>
+
+        <record id="hr_salary_rule_special" model="hr.salary.rule">
+            <field name="code">SA</field>
+            <field name="name">Grade/Special/Management/Supplementary Allowance</field>
+            <field name="category_id" ref="hr_payroll.ALW"/>
+            <field name="condition_select">python</field>
+            <field name="condition_python">result = bool(contract.supplementary_allowance)</field>
+            <field name="amount_select">code</field>
+            <field name="amount_python_compute">result = contract.supplementary_allowance</field>
+            <field name="sequence" eval="20"/>
+            <field name="note">This allowance is normally given as an additional benefit to employees and is fully taxable.</field>
+        </record>
+
+        <record id="hr_payroll_rule_child1" model="hr.salary.rule">
+            <field name="code">CHEA</field>
+            <field name="name">Child Education Allowance</field>
+            <field name="category_id" ref="hr_payroll.ALW"/>
+            <field name="condition_select">python</field>
+            <field name="condition_python">result = bool(employee.children)</field>
+            <field name="amount_select">fix</field>
+            <field name="sequence" eval="18"/>
+            <field name="note">Per school going child 1200 per annum is non-taxable.Maximum for 2 children, so max 2400 per annum becomes non-taxable.</field>
+        </record>
+
+        <record id="hr_payroll_rule_child2" model="hr.salary.rule">
+             <field name="code">CHEAH</field>
+             <field name="name">Child Hostel Allowance</field>
+             <field name="category_id" ref="hr_payroll.ALW"/>
+             <field name="condition_select">python</field>
+             <field name="condition_python">result = bool(employee.children)</field>
+             <field name="amount_select">fix</field>
+             <field name="note">In case the children are in hostel, the exemption available for child.</field>
+             <field name="sequence" eval="19"/>
+         </record>
+
+        <record id="hr_payroll_rule_city1" model="hr.salary.rule">
+            <field name="code">CBDA</field>
+            <field name="name">City Compensatory Allowance</field>
+            <field name="category_id" ref="hr_payroll.ALW"/>
+            <field name="condition_select">none</field>
+            <field name="sequence" eval="21"/>
+            <field name="amount_select">code</field>
+            <field name="amount_python_compute">result = (payslip.company_id.dearness_allowance and ((contract.wage + DA) * 0.10) 
+or (contract.wage * 0.10))</field>
+            <field name="note">This allowance is paid to Employees who are posted in big cities. The purpose is to compensate the high cost of living in cities like Mumbai, Delhi, etc. However it is Fully Taxable.</field>
+        </record>
+
+        <record id="hr_payroll_rule_metrocity" model="hr.salary.rule">
+            <field name="code">CMETRO</field>
+            <field name="name">City Allowance for Metro city</field>
+            <field name="category_id" ref="hr_payroll.ALW"/>
+            <field name="condition_select">none</field>
+            <field name="sequence" eval="22"/>
+            <field name="amount_select">fix</field>
+            <field name="amount_fix">850.0</field>
+        </record>
+
+        <record id="hr_payroll_rule_nonmetrocity" model="hr.salary.rule">
+            <field name="code">CNMETRO</field>
+            <field name="name">City Allowance for Non Metro city</field>
+            <field name="category_id" ref="hr_payroll.ALW"/>
+            <field name="condition_select">none</field>
+            <field name="sequence" eval="25"/>
+            <field name="amount_select">fix</field>
+            <field name="amount_fix">800.0</field>
+        </record>
+
+        <record id="hr_salary_rule_arrears" model="hr.salary.rule">
+            <field name="code">ARRE</field>
+            <field name="name">Arrears</field>
+            <field name="category_id" ref="hr_payroll.ALW"/>
+            <field name="amount_select">code</field>
+            <field name="amount_python_compute">result = inputs.ARS.amount</field>
+            <field eval="0.0" name="amount_fix"/>
+            <field name="sequence" eval="28"/>
+            <field name="note">Generally arrears are fully taxable, but employee may claim exemption u/s 89(1).
+One would need to compute income tax on the arrears if it would have been received in actual year.
+Now difference of income tax between payment year and actual year would be allowed for deduction.</field>
+        </record>
+
+        <record id="hr_salary_rule_lta" model="hr.salary.rule">
+            <field name="code">LTA</field>
+            <field name="name">Leave Travel Allowance</field>
+            <field name="category_id" ref="hr_payroll.ALW"/>
+            <field name="amount_select">percentage</field>
+            <field name="amount_percentage_base">contract.wage</field>
+            <field name="amount_percentage" eval="8.33"/>
+            <field name="sequence" eval="29"/>
+            <field name="note">As per Income tax rules of India, if transport bills for LTA are not provided,the amount will be taxed. E.g. If an employee has LTA allowance as Rs 50,000 in his CTC(cost to company),and he provides proofs of Rs 40,000 (boarding pass,air tickets, taxi vouchers) then income tax will be deducted for rest of the Rs 10,000. Does not matter whats the amount of LTA in an employee’s package, income tax laws only permits domestic air tickets only for LTA claim.</field>
+        </record>
+
+        <record id="hr_salary_rule_le" model="hr.salary.rule">
+            <field name="code">LE</field>
+            <field name="name">Leave Encashment</field>
+            <field name="category_id" ref="hr_payroll.ALW"/>
+            <field name="condition_select">none</field>
+            <field name="amount_select">code</field>
+            <field name="amount_python_compute">result = inputs.LE.amount</field>
+            <field name="sequence" eval="30"/>
+            <field name="note">Payment by way of leave encashment received by Central and State Govt.employees at the time of retirement in respect of the period of earned leave at credit is fully exempt. In case of other employees, the exemption is to be limited to minimum of all below:
+    1.The actual amount received
+    2.The cash equivalent of leave balance (max 30 days per year of service)
+    3.Maximum of 10 months of leave encashment, based on last 10 months average salary
+    4.Rs. 3 Lakh</field>
+        </record>
+
+        <record id="hr_salary_rule_performance" model="hr.salary.rule">
+            <field name="code">PI</field>
+            <field name="name">Performance Incentive</field>
+            <field name="category_id" ref="hr_payroll.ALW"/>
+            <field name="amount_select">code</field>
+            <field name="amount_python_compute">result = inputs.PERF.amount</field>
+            <field name="sequence" eval="31"/>
+            <field name="note">This would be fully taxable based on incentive.</field>
+        </record>
+
+        <record id="hr_salary_rule_bonus" model="hr.salary.rule">
+            <field name="code">BONUS</field>
+            <field name="name">Bonus</field>
+            <field name="category_id" ref="hr_payroll.ALW"/>
+            <field name="amount_select">code</field>
+            <field name="amount_python_compute">result = inputs.BNS.amount</field>
+            <field name="sequence" eval="41"/>
+            <field name="note">This would be fully taxable based on Bonus.</field>
+        </record>
+
+        <record id="hr_salary_rule_medical_allow" model="hr.salary.rule">
+            <field name="code">MEDA</field>
+            <field name="name">Medical Allowance</field>
+            <field name="category_id" ref="hr_payroll.ALW"/>
+            <field name="amount_select">fix</field>
+            <field eval="1250.0" name="amount_fix"/>
+            <field name="sequence" eval="43"/>
+            <field name="note">This component is on-taxable up to 15000 per year (or Rs 1250 per month) on producing medical bills.</field>
+        </record>
+
+        <record id="hr_salary_rule_medical" model="hr.salary.rule">
+            <field name="code">MEDA</field>
+            <field name="name">Medical Reimbursement</field>
+            <field name="category_id" ref="hr_payroll.ALW"/>
+            <field name="amount_select">code</field>
+            <field name="amount_python_compute">result = inputs.MR.amount</field>
+            <field name="sequence" eval="32"/>
+            <field name="note">This component is on-taxable up to 15000 per year (or Rs 1250 per month) on producing medical bills.</field>
+        </record>
+
+         <record id="hr_salary_rule_food_coupon" model="hr.salary.rule">
+            <field name="amount_select">fix</field>
+            <field eval="50" name="amount_fix"/>
+            <field name="quantity">worked_days.WORK100.number_of_days</field>
+            <field name="code">FC</field>
+            <field name="category_id" ref="hr_payroll.ALW"/>
+            <field name="name">Food Allowance</field>
+            <field name="register_id" ref="hr_food_coupen_register"/>
+            <field name="sequence" eval="33"/>
+         </record>
+
+        <record id="hr_salary_rule_journals" model="hr.salary.rule">
+            <field name="code">PERJ</field>
+            <field name="name">Periodical Journals</field>
+            <field name="category_id" ref="hr_payroll.ALW"/>
+            <field name="amount_select">code</field>
+            <field name="amount_python_compute">result = inputs.PJ.amount</field>
+            <field name="sequence" eval="34"/>
+            <field name="note">Some employers may provide component for buying magazines, journals and books as a part of knowledge enhancement for business growth.This part would become non taxable on providing original bills.</field>
+        </record>
+
+        <record id="hr_salary_rule_uniform_senior" model="hr.salary.rule">
+            <field name="code">UNIFS</field>
+            <field name="name">Uniform/Dress Allowance for Senior Executive</field>
+            <field name="category_id" ref="hr_payroll.ALW"/>
+            <field name="amount_select">fix</field>
+            <field eval="1000" name="amount_fix"/>
+            <field name="sequence" eval="35"/>
+            <field name="note">Some sections of employees mat get allowance for purchase of office dress/uniform.In such case, the component would become non-taxable.</field>
+        </record>
+
+        <record id="hr_salary_rule_uniform_junior" model="hr.salary.rule">
+            <field name="code">UNIFJ</field>
+            <field name="name">Uniform/Dress Allowance for Junior Executive</field>
+            <field name="category_id" ref="hr_payroll.ALW"/>
+            <field name="amount_select">fix</field>
+            <field eval="600" name="amount_fix"/>
+            <field name="sequence" eval="42"/>
+            <field name="note">Some sections of employees mat get allowance for purchase of office dress/uniform.In such case, the component would become non-taxable.</field>
+        </record>
+
+        <record id="hr_salary_rule_telephone" model="hr.salary.rule">
+            <field name="code">TELR</field>
+            <field name="name">Telephone Reimbursement</field>
+            <field name="category_id" ref="hr_payroll.ALW"/>
+            <field name="amount_select">code</field>
+            <field name="amount_python_compute">result = inputs.TR.amount</field>
+            <field name="sequence" eval="36"/>
+            <field name="note">In some of the cases, companies may provide a component for telephone bills.Employees may provide actual phone usage bills to reimburse this component and make it non-taxable.
+            </field>
+        </record>
+
+        <record id="hr_salary_rule_prof_develope" model="hr.salary.rule">
+            <field name="code">PDA</field>
+            <field name="name">Professional Development Allowance</field>
+            <field name="category_id" ref="hr_payroll.ALW"/>
+            <field name="amount_select">fix</field>
+            <field eval="0.0" name="amount_fix"/>
+            <field name="sequence" eval="37"/>
+        </record>
+
+        <record id="hr_payroll_rule_car" model="hr.salary.rule">
+            <field name="code">CAR</field>
+            <field name="name">Car Expenses Reimbursement</field>
+            <field name="category_id" ref="hr_payroll.ALW"/>
+            <field name="amount_select">code</field>
+            <field name="amount_python_compute">result = inputs.CEI.amount</field>
+            <field name="sequence" eval="38"/>
+            <field name="note">In case company provides component for this and employee use self owned car for official and personal purposes, Rs 1800 per month would be non-taxable on showing bills for fuel or can maintenance. This amount would be Rs 2400 in case car is more capacity than 1600cc.</field>
+        </record>
+
+        <record id="hr_salary_rule_internet" model="hr.salary.rule">
+            <field name="code">INT</field>
+            <field name="name">Internet Expense</field>
+            <field name="category_id" ref="hr_payroll.ALW"/>
+            <field name="amount_select">code</field>
+            <field name="amount_python_compute">result = inputs.IE.amount</field>
+            <field name="sequence" eval="39"/>
+            <field name="note">Employer may also provide reimbursement of internet expenses and thus this would become non taxable.</field>
+        </record>
+
+        <record id="hr_salary_rule_driver" model="hr.salary.rule">
+            <field name="code">DRI</field>
+            <field name="name">Driver Salary</field>
+            <field name="category_id" ref="hr_payroll.ALW"/>
+            <field name="condition_select">python</field>
+            <field name="condition_python">result = bool(contract.driver_salay)</field>
+            <field name="amount_select">fix</field>
+            <field eval="900.0" name="amount_fix"/>
+            <field name="sequence" eval="40"/>
+             <field name="note">Rs. 900 per month (non taxable)</field>
+        </record>
+
+
+        <!--hr salary rules for Deductions -->
+
+        <record id="hr_payslip_rule_tds" model="hr.salary.rule">
+            <field name="code">TDS</field>
+            <field name="name">Tax Deducted at Source</field>
+            <field name="category_id" ref="hr_payroll.DED"/>
+            <field name="condition_select">python</field>
+            <field name="condition_python">result = bool(contract.tds)</field>
+            <field name="amount_select">code</field>
+            <field name="amount_python_compute">result = -(contract.tds)</field>
+            <field name="register_id" ref="hr_tds_register"/>
+            <field name="sequence" eval="140"/>
+            <field name="note">As per income tax rules, all payment which are taxable in nature should be done after deduction of taxes at the source itself. Hence employer compute income tax on salary payment and deduct it every month. This TDS is based on employee’s saving/investment declaration at the start of year. If investments for tax saving is not done, large amount may be deducted in last few months.</field>
+        </record>
+
+        <record id="hr_payslip_line_professional_tax" model="hr.salary.rule">
+            <field name="code">PTD</field>
+            <field name="name">Professional Tax</field>
+            <field name="category_id" ref="hr_payroll.DED"/>
+            <field name="condition_select">python</field>
+            <field name="condition_python">result = contract.wage &gt;= 3000 </field>
+            <field name="amount_select">code</field>
+            <field name="amount_python_compute">result = (-200 if contract.wage &gt;= 12000 
+else -150 if ((contract.wage &gt;= 9000) and (contract.wage &lt;= 11999)) 
+else -80 if ((contract.wage &gt;= 6000) and (contract.wage &lt;= 8999)) 
+else -20 if  ((contract.wage &gt;= 3000) and (contract.wage &lt;= 5999))  
+else -0)</field>
+            <field name="register_id" ref="hr_professional_tax_deduction_register"/>
+            <field eval="145" name="sequence"/>
+            <field name="note">Workers living in states that impose the professional tax must submit a payment each half-year for the right to practice a profession or trade. It applies equally to employees who work for the national or state government, and those employed by private corporations. The professional tax uses a six-month accounting system, which divides the year into two periods, beginning on April 1 and October 1.</field>
+        </record>
+
+        <record id="hr_payslip_rule_epf" model="hr.salary.rule">
+            <field name="code">EPMF</field>
+            <field name="name">Employee's PF Contribution</field>
+            <field name="category_id" ref="hr_payroll.DED"/>
+            <field name="amount_select">code</field>
+            <field name="amount_python_compute">result = (payslip.company_id.dearness_allowance and - ((contract.wage + DA) * 0.12) 
+or - (contract.wage * 0.12))</field>
+            <field name= "note">Employer contribution does not become part of employee’s income and hence income tax is not payable on this part.</field>
+            <field name="register_id" ref="hr_register_provident_fund"/>
+            <field name="sequence" eval="150"/>
+        </record>
+
+        <record id="hr_payslip_rule_enps" model="hr.salary.rule">
+            <field name="code">ENPFC</field>
+            <field name="name">Employee's NPS Contribution</field>
+            <field name="category_id" ref="hr_payroll.DED"/>
+            <field name="amount_select">code</field>
+            <field name="amount_python_compute">result = (payslip.company_id.dearness_allowance and - ((contract.wage + DA) * 0.10) 
+or - (contract.wage * 0.10))</field>
+            <field name="sequence" eval="155"/>
+            <field name="register_id" ref="hr_nps_contribution_register"/>
+            <field name="note">Employee can claim deduction even of employer's contribution to NPS.</field>
+        </record>
+
+        <record id="hr_payslip_rule_vpf" model="hr.salary.rule">
+            <field name="code">VPF</field>
+            <field name="name">Voluntarily Provident Fund Contribution</field>
+            <field name="category_id" ref="hr_payroll.DED"/>
+            <field name="condition_select">python</field>
+            <field name="condition_python">result = bool(contract.voluntary_provident_fund)</field>
+            <field name="amount_select">code</field>
+            <field name="amount_python_compute">result = (payslip.company_id.dearness_allowance and 
+- ((contract.wage + DA) * contract.voluntary_provident_fund / 100) 
+or - (contract.wage * contract.voluntary_provident_fund / 100))</field>
+            <field name="sequence" eval="160"/>
+            <field name="register_id" ref="hr_vpf_contribution_register"/>
+            <field name="note">VPF is a safe option wherein you can contribute more than the PF ceiling of 12% that has been mandated by the government.This additional amount enjoys all the benefits of PF except that the employer is not liable to contribute any extra amount apart from 12%.An added advantage is that the interest rate is equal to the interest rate of PF and he withdrawal is tax free. Please note that the maximum contribution towards VPF is 100% of your Basic.The highest rate of interest (close to 9%) makes it a very attractive saving scheme. Because of these advantages many employees chose not to close their PF account even after getting employment else where other than India.Employees also get a major tax break on their entire contribution to the fund up to a ceiling of Rs. 70,000/-</field>
+        </record>
+
+        <record id="hr_payslip_rule_cpt" model="hr.salary.rule">
+            <field name="code">CPT</field>
+            <field name="name">Deduction for Company Provided Transport</field>
+            <field name="category_id" ref="hr_payroll.DED"/>
+            <field name="condition_select">none</field>
+            <field name="amount_select">fix</field>
+            <field eval="-1500.0" name="amount_fix"/>
+            <field name="register_id" ref="hr_company_transport_register"/>
+            <field name="sequence" eval="165"/>
+            <field name="appears_on_payslip" eval="False"/>
+            <field name="note">Company provided transport amount is based on company.</field>
+        </record>
+
+         <record id="hr_salary_rule_food_coupon_ded" model="hr.salary.rule">
+            <field name="amount_select">fix</field>
+            <field eval="-50" name="amount_fix"/>
+            <field name="quantity">worked_days.WORK100.number_of_days</field>
+            <field name="code">FD</field>
+            <field name="category_id" ref="hr_payroll.DED"/>
+            <field name="name">Deduction Towards Food Coupons</field>
+            <field name="register_id" ref="hr_food_coupen_register"/>
+            <field name="sequence" eval="166"/>
+         </record>
+
+        <record id="hr_payslip_rule_lwf_employee" model="hr.salary.rule">
+            <field name="code">LWFE</field>
+            <field name="name">Employee's Deduction Towards State Labour Welfare Fund</field>
+            <field name="category_id" ref="hr_payroll.DED"/>
+            <field name="amount_select">fix</field>
+            <field eval="-3.0" name="amount_fix"/>
+            <field name="sequence" eval="170"/>
+            <field name="register_id" ref="hr_labour_Welfare_fund_register"/>
+            <field name="note">The LWF is applicable to all the members of the organisation except the Management staff (Staffs having authority to sign on the cheque/official documents on behalf of the organisation). for e.x. Employee Contribution is Rs. 3.00 and Employer contribution Rs. 6.00 Total Rs 9.00 and deposited to the LWF office.It is half yearly contribution (June and December).</field>
+        </record>
+
+        <record id="hr_payslip_rule_lwf_employer" model="hr.salary.rule">
+            <field name="code">LWF</field>
+            <field name="name">Employer's Deduction Towards State Labour Welfare Fund </field>
+            <field name="category_id" ref="hr_payroll.DED"/>
+            <field name="amount_select">fix</field>
+            <field eval="-6.0" name="amount_fix"/>
+            <field name="sequence" eval="171"/>
+            <field name="register_id" ref="hr_labour_Welfare_fund_register"/>
+            <field name="appears_on_payslip" eval="False"/>
+            <field name="note">The LWF is applicable to all the members of the organisation except the Management staff (Staffs having authority to sign on the cheque/official documents on behalf of the organisation). for e.x. Employee Contribution is Rs. 3.00 and Employer contribution Rs. 6.00 Total Rs 9.00 and deposited to the LWF office.It is half yearly contribution (June and December).</field>
+        </record>
+
+        <record id="hr_payslip_rule_cgti" model="hr.salary.rule">
+            <field name="code">CGTI</field>
+            <field name="name">Deduction Towards Company Provided Group Term Insurance</field>
+            <field name="category_id" ref="hr_payroll.DED"/>
+            <field name="amount_select">fix</field>
+            <field eval="-1000.0" name="amount_fix"/>
+            <field name="register_id" ref="hr_group_term_insurance_register"/>
+            <field name="sequence" eval="175"/>
+            <field name="note">Group term insurance provides a solid foundation to a comprehensive employee benifit program,backed up by government asistance in the form of valuable tax incentives to both employees and employers.</field>
+        </record>
+
+        <record id="hr_payslip_rule_dla" model="hr.salary.rule">
+            <field name="code">DLA</field>
+            <field name="name">Deduction Towards Leave Availed</field>
+            <field name="category_id" ref="hr_payroll.DED"/>
+            <field name="condition_select">none</field>
+            <field name="amount_select">code</field>
+            <field name="amount_python_compute">result = - (inputs.LAI.amount)</field>
+            <field name="register_id" ref="hr_leave_availed_register"/>
+            <field name="sequence" eval="180"/>
+        </record>
+
+        <record id="hr_payslip_rule_cmt" model="hr.salary.rule">
+            <field name="code">CMT</field>
+            <field name="name">Deduction Towards Company Provided Medical Insurance</field>
+            <field name="category_id" ref="hr_payroll.DED"/>
+            <field name="condition_select">python</field>
+            <field name="condition_python">result = bool(contract.medical_insurance)</field>
+            <field name="amount_select">code</field>
+            <field name="amount_python_compute">result = - (contract.medical_insurance)</field>
+            <field eval="-50.0" name="amount_fix"/>
+            <field name="appears_on_payslip" eval="False"/>
+            <field name="register_id" ref="hr_medical_insurance_register"/>
+            <field name="sequence" eval="185"/>
+        </record>
+
+        <record id="hr_payslip_rule_ode" model="hr.salary.rule">
+            <field name="code">ODE</field>
+            <field name="name">Other Deduction from Employer</field>
+            <field name="category_id" ref="hr_payroll.DED"/>
+            <field name="amount_select">fix</field>
+            <field eval="-200.0" name="amount_fix"/>
+            <field name="appears_on_payslip" eval="False"/>
+            <field name="register_id" ref="hr_other_deduction_register"/>
+            <field name="sequence" eval="187"/>
+        </record>
+
+        <record id="hr_payslip_rule_ernps" model="hr.salary.rule">
+            <field name="code">ENPC</field>
+            <field name="name">Employer's NPS Contribution</field>
+            <field name="category_id" ref="hr_payroll.DED"/>
+            <field name="amount_select">code</field>
+            <field name="amount_python_compute">result = (payslip.company_id.dearness_allowance and - ((contract.wage + DA) * 0.10) 
+or - (contract.wage * 0.10))</field>
+            <field name="sequence" eval="190"/>
+            <field name="register_id" ref="hr_nps_contribution_register"/>
+            <field name="appears_on_payslip" eval="False"/>
+            <field name= "note">Any amount contributed by your employer to your NPS account is treated as part of your salary and is included in your income but you can claim deduction under Section 80C for this too.thus, effectively making it exempt from tax within the limit of 10% of your basic salary. This is very useful and tax efficient for you particularly if you fall in the maximum tax.</field>
+        </record>
+
+        <record id="hr_payslip_rule_erpf" model="hr.salary.rule">
+            <field name="code">EPF</field>
+            <field name="name">Employer's PF Contribution</field>
+            <field name="category_id" ref="hr_payroll.DED"/>
+            <field name="amount_select">code</field>
+            <field name="amount_python_compute">result = (payslip.company_id.dearness_allowance and - ((contract.wage + DA) * 0.12) 
+or - (contract.wage * 0.12))</field>
+            <field name="sequence" eval="195"/>
+            <field name="register_id" ref="hr_register_provident_fund"/>
+            <field name="appears_on_payslip" eval="False"/>
+            <field name="note">Both the employees and employer contribute to the fund at the rate of 12% of the basic wages, dearness allowance and retaining allowance, if any, payable to employees per month.</field>
+        </record>
+
+        <!-- Rule Inputs -->
+
+        <record id="hr_rule_input_performance" model="hr.rule.input">
+            <field name="code">PERF</field>
+            <field name="name">Performance of Employee</field>
+            <field name="input_id" ref="hr_salary_rule_performance"/>
+        </record>
+
+        <record id="hr_rule_input_bonus" model="hr.rule.input">
+            <field name="code">BNS</field>
+            <field name="name">Bonus of Employee</field>
+            <field name="input_id" ref="hr_salary_rule_bonus"/>
+        </record>
+
+        <record id="hr_rule_input_arrears" model="hr.rule.input">
+            <field name="code">ARS</field>
+            <field name="name">Arrears</field>
+            <field name="input_id" ref="hr_salary_rule_arrears"/>
+        </record>
+
+        <record id="hr_rule_input_le" model="hr.rule.input">
+            <field name="code">LE</field>
+            <field name="name">Leave Encashment</field>
+            <field name="input_id" ref="hr_salary_rule_le"/>
+        </record>
+
+        <record id="hr_rule_input_journals" model="hr.rule.input">
+            <field name="code">PJ</field>
+            <field name="name">Periodical Journals</field>
+            <field name="input_id" ref="hr_salary_rule_journals"/>
+        </record>
+
+        <record id="hr_rule_input_telephone" model="hr.rule.input">
+            <field name="code">TR</field>
+            <field name="name">Telephone Reimbursement</field>
+            <field name="input_id" ref="hr_salary_rule_telephone"/>
+        </record>
+
+        <record id="hr_rule_input_car" model="hr.rule.input">
+            <field name="code">CEI</field>
+            <field name="name">Car Expenses</field>
+            <field name="input_id" ref="hr_payroll_rule_car"/>
+        </record>
+
+        <record id="hr_rule_input_internet" model="hr.rule.input">
+            <field name="code">IE</field>
+            <field name="name">Internet Expence</field>
+            <field name="input_id" ref="hr_salary_rule_internet"/>
+        </record>
+
+        <record id="hr_rule_input_leave_avail" model="hr.rule.input">
+            <field name="code">LAI</field>
+            <field name="name">Leave Availed</field>
+            <field name="input_id" ref="hr_payslip_rule_dla"/>
+        </record>
+        <record id="hr_rule_input_medical" model="hr.rule.input">
+            <field name="code">MR</field>
+            <field name="name">Medical Reimbursement</field>
+            <field name="input_id" ref="hr_salary_rule_medical"/>
+        </record>
+    </data>
+</openerp>
diff --git a/addons/l10n_in_hr_payroll/i18n/bn.po b/addons/l10n_in_hr_payroll/i18n/bn.po
new file mode 100644
index 00000000000..ea9fcfd7bb3
--- /dev/null
+++ b/addons/l10n_in_hr_payroll/i18n/bn.po
@@ -0,0 +1,933 @@
+# Bengali Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#   * l10n_in_hr_payroll
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 7.0alpha\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-08-17 06:46+0000\n"
+"PO-Revision-Date: 2012-08-17 06:46+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: Bengali <bn@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: l10n_in_hr_payroll
+#: report:salary.detail.byyear:0
+msgid "E-mail Address"
+msgstr ""
+
+#. 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
+#: report:salary.detail.byyear:0
+msgid "Employees Salary Details"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:salary.detail.byyear:0
+msgid "Allowances with Basic:"
+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
+msgid "March"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid "("
+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
+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
+#: report:paylip.details.in:0
+msgid ","
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+msgid "Set to Draft"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: help:hr.employee,number_of_year:0
+msgid "Total years of work experience"
+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
+#: 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
+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
+#: 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
+#: help:hr.contract,voluntary_provident_fund:0
+msgid "VPF computed as percentage(%)"
+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
+#: view:hr.payroll.advice:0
+#: view:payment.advice.report:0
+msgid "Group By..."
+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
+#: 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:184
+#, python-format
+msgid "You can not confirm Payment advice without advice lines."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.payroll.advice,state:0
+#: field:payment.advice.report,state:0
+msgid "State"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:payroll.advice:0
+msgid "Yours Sincerely"
+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
+#: 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:158
+#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:184
+#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:240
+#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:257
+#, python-format
+msgid "Error !"
+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
+#: 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
+msgid "July"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:res.company:0
+msgid "Configuration"
+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
+msgid "Date To"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.contract,tds:0
+msgid "TDS"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.employee,join_date:0
+msgid "Join Date"
+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
+msgid "August"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.contract:0
+msgid "Deduction"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+msgid "Search Payment advice"
+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
+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
+msgid "Month"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:salary.detail.byyear:0
+msgid "Employee Code"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: selection:hr.contract,city_type:0
+msgid "Non Metro"
+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
+msgid "Category"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:240
+#, 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
+#: field:hr.employee,number_of_year:0
+msgid "No. of Years of Service"
+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
+msgid "Draft"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid "Date From"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.contract,voluntary_provident_fund:0
+msgid "Voluntary Provident Fund"
+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
+#: view:payment.advice.report:0
+msgid "Status"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.contract,city_type:0
+msgid "Type of City"
+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
+msgid "June"
+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
+msgid "November"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:payment.advice.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
+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
+#: selection:payment.advice.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
+#: 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: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
+#: report:salary.detail.byyear:0
+msgid "To"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:payment.advice.report,number:0
+msgid "Number"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: selection:payment.advice.report,month:0
+msgid "September"
+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
+#: constraint:hr.employee:0
+msgid "Error! You cannot create recursive hierarchy of Employee(s)."
+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
+#: view:hr.payslip.run:0
+msgid "Payslip Batches ready to be Adviced"
+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
+#: model:ir.model,name:l10n_in_hr_payroll.model_hr_employee
+#: view:payment.advice.report:0
+#: field:payment.advice.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
+#: help:hr.employee,join_date:0
+msgid "Joining date of employee"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:payroll.advice:0
+msgid "Dear Sir/Madam,"
+msgstr "Dear Sir/Madam,"
+
+#. module: l10n_in_hr_payroll
+#: field:hr.payroll.advice,note:0
+msgid "Description"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid ")"
+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
+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
+#: report:salary.employee.bymonth:0
+msgid "Name"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: selection:hr.contract,city_type:0
+msgid "Metro"
+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
+#: selection:payment.advice.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:158
+#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:257
+#, 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
+#: 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
+#: selection:payment.advice.report,month:0
+msgid "May"
+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
+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
+#: report:salary.detail.byyear:0
+#: report:salary.employee.bymonth:0
+msgid "Total"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:payroll.advice:0
+msgid "form period"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:payment.advice.report:0
+msgid "Year of Payment Advices"
+msgstr ""
\ No newline at end of file
diff --git a/addons/l10n_in_hr_payroll/i18n/gu.po b/addons/l10n_in_hr_payroll/i18n/gu.po
new file mode 100644
index 00000000000..2c321b13191
--- /dev/null
+++ b/addons/l10n_in_hr_payroll/i18n/gu.po
@@ -0,0 +1,933 @@
+# Gujarati Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#   * l10n_in_hr_payroll
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 7.0alpha\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-08-17 06:46+0000\n"
+"PO-Revision-Date: 2012-08-17 06:46+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: Gujarati <gu@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: l10n_in_hr_payroll
+#: report:salary.detail.byyear:0
+msgid "E-mail Address"
+msgstr ""
+
+#. 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
+#: report:salary.detail.byyear:0
+msgid "Employees Salary Details"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:salary.detail.byyear:0
+msgid "Allowances with Basic:"
+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
+msgid "March"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid "("
+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
+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
+#: report:paylip.details.in:0
+msgid ","
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+msgid "Set to Draft"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: help:hr.employee,number_of_year:0
+msgid "Total years of work experience"
+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
+#: 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
+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
+#: 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
+#: help:hr.contract,voluntary_provident_fund:0
+msgid "VPF computed as percentage(%)"
+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
+#: view:hr.payroll.advice:0
+#: view:payment.advice.report:0
+msgid "Group By..."
+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
+#: 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:184
+#, python-format
+msgid "You can not confirm Payment advice without advice lines."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.payroll.advice,state:0
+#: field:payment.advice.report,state:0
+msgid "State"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:payroll.advice:0
+msgid "Yours Sincerely"
+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
+#: 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:158
+#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:184
+#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:240
+#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:257
+#, python-format
+msgid "Error !"
+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
+#: 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
+msgid "July"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:res.company:0
+msgid "Configuration"
+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
+msgid "Date To"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.contract,tds:0
+msgid "TDS"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.employee,join_date:0
+msgid "Join Date"
+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
+msgid "August"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.contract:0
+msgid "Deduction"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+msgid "Search Payment advice"
+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
+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
+msgid "Month"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:salary.detail.byyear:0
+msgid "Employee Code"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: selection:hr.contract,city_type:0
+msgid "Non Metro"
+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
+msgid "Category"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:240
+#, 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
+#: field:hr.employee,number_of_year:0
+msgid "No. of Years of Service"
+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
+msgid "Draft"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid "Date From"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.contract,voluntary_provident_fund:0
+msgid "Voluntary Provident Fund"
+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
+#: view:payment.advice.report:0
+msgid "Status"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.contract,city_type:0
+msgid "Type of City"
+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
+msgid "June"
+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
+msgid "November"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:payment.advice.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
+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
+#: selection:payment.advice.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
+#: 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: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
+#: report:salary.detail.byyear:0
+msgid "To"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:payment.advice.report,number:0
+msgid "Number"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: selection:payment.advice.report,month:0
+msgid "September"
+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
+#: constraint:hr.employee:0
+msgid "Error! You cannot create recursive hierarchy of Employee(s)."
+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
+#: view:hr.payslip.run:0
+msgid "Payslip Batches ready to be Adviced"
+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
+#: model:ir.model,name:l10n_in_hr_payroll.model_hr_employee
+#: view:payment.advice.report:0
+#: field:payment.advice.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
+#: help:hr.employee,join_date:0
+msgid "Joining date of employee"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:payroll.advice:0
+msgid "Dear Sir/Madam,"
+msgstr "Dear Sir/Madam,"
+
+#. module: l10n_in_hr_payroll
+#: field:hr.payroll.advice,note:0
+msgid "Description"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid ")"
+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
+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
+#: report:salary.employee.bymonth:0
+msgid "Name"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: selection:hr.contract,city_type:0
+msgid "Metro"
+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
+#: selection:payment.advice.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:158
+#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:257
+#, 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
+#: 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
+#: selection:payment.advice.report,month:0
+msgid "May"
+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
+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
+#: report:salary.detail.byyear:0
+#: report:salary.employee.bymonth:0
+msgid "Total"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:payroll.advice:0
+msgid "form period"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:payment.advice.report:0
+msgid "Year of Payment Advices"
+msgstr ""
\ No newline at end of file
diff --git a/addons/l10n_in_hr_payroll/i18n/hi.po b/addons/l10n_in_hr_payroll/i18n/hi.po
new file mode 100644
index 00000000000..d7cc9dc1519
--- /dev/null
+++ b/addons/l10n_in_hr_payroll/i18n/hi.po
@@ -0,0 +1,933 @@
+# Hindi Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#   * l10n_in_hr_payroll
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 7.0alpha\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-08-17 06:46+0000\n"
+"PO-Revision-Date: 2012-08-17 06:46+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: Hindi <hi@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: l10n_in_hr_payroll
+#: report:salary.detail.byyear:0
+msgid "E-mail Address"
+msgstr ""
+
+#. 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
+#: report:salary.detail.byyear:0
+msgid "Employees Salary Details"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:salary.detail.byyear:0
+msgid "Allowances with Basic:"
+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
+msgid "March"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid "("
+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
+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
+#: report:paylip.details.in:0
+msgid ","
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+msgid "Set to Draft"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: help:hr.employee,number_of_year:0
+msgid "Total years of work experience"
+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
+#: 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
+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
+#: 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
+#: help:hr.contract,voluntary_provident_fund:0
+msgid "VPF computed as percentage(%)"
+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
+#: view:hr.payroll.advice:0
+#: view:payment.advice.report:0
+msgid "Group By..."
+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
+#: 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:184
+#, python-format
+msgid "You can not confirm Payment advice without advice lines."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.payroll.advice,state:0
+#: field:payment.advice.report,state:0
+msgid "State"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:payroll.advice:0
+msgid "Yours Sincerely"
+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
+#: 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:158
+#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:184
+#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:240
+#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:257
+#, python-format
+msgid "Error !"
+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
+#: 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
+msgid "July"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:res.company:0
+msgid "Configuration"
+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
+msgid "Date To"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.contract,tds:0
+msgid "TDS"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.employee,join_date:0
+msgid "Join Date"
+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
+msgid "August"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.contract:0
+msgid "Deduction"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+msgid "Search Payment advice"
+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
+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
+msgid "Month"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:salary.detail.byyear:0
+msgid "Employee Code"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: selection:hr.contract,city_type:0
+msgid "Non Metro"
+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
+msgid "Category"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:240
+#, 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
+#: field:hr.employee,number_of_year:0
+msgid "No. of Years of Service"
+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
+msgid "Draft"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid "Date From"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.contract,voluntary_provident_fund:0
+msgid "Voluntary Provident Fund"
+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
+#: view:payment.advice.report:0
+msgid "Status"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.contract,city_type:0
+msgid "Type of City"
+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
+msgid "June"
+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
+msgid "November"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:payment.advice.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
+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
+#: selection:payment.advice.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
+#: 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: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
+#: report:salary.detail.byyear:0
+msgid "To"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:payment.advice.report,number:0
+msgid "Number"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: selection:payment.advice.report,month:0
+msgid "September"
+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
+#: constraint:hr.employee:0
+msgid "Error! You cannot create recursive hierarchy of Employee(s)."
+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
+#: view:hr.payslip.run:0
+msgid "Payslip Batches ready to be Adviced"
+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
+#: model:ir.model,name:l10n_in_hr_payroll.model_hr_employee
+#: view:payment.advice.report:0
+#: field:payment.advice.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
+#: help:hr.employee,join_date:0
+msgid "Joining date of employee"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:payroll.advice:0
+msgid "Dear Sir/Madam,"
+msgstr "Dear Sir/Madam,"
+
+#. module: l10n_in_hr_payroll
+#: field:hr.payroll.advice,note:0
+msgid "Description"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid ")"
+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
+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
+#: report:salary.employee.bymonth:0
+msgid "Name"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: selection:hr.contract,city_type:0
+msgid "Metro"
+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
+#: selection:payment.advice.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:158
+#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:257
+#, 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
+#: 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
+#: selection:payment.advice.report,month:0
+msgid "May"
+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
+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
+#: report:salary.detail.byyear:0
+#: report:salary.employee.bymonth:0
+msgid "Total"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:payroll.advice:0
+msgid "form period"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:payment.advice.report:0
+msgid "Year of Payment Advices"
+msgstr ""
\ No newline at end of file
diff --git a/addons/l10n_in_hr_payroll/i18n/l10n_in_hr_payroll.pot b/addons/l10n_in_hr_payroll/i18n/l10n_in_hr_payroll.pot
new file mode 100644
index 00000000000..552f85b5997
--- /dev/null
+++ b/addons/l10n_in_hr_payroll/i18n/l10n_in_hr_payroll.pot
@@ -0,0 +1,933 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#   * l10n_in_hr_payroll
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 7.0alpha\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-08-17 06:46+0000\n"
+"PO-Revision-Date: 2012-08-17 06:46+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: l10n_in_hr_payroll
+#: report:salary.detail.byyear:0
+msgid "E-mail Address"
+msgstr ""
+
+#. 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
+#: report:salary.detail.byyear:0
+msgid "Employees Salary Details"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:salary.detail.byyear:0
+msgid "Allowances with Basic:"
+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
+msgid "March"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid "("
+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
+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
+#: report:paylip.details.in:0
+msgid ","
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+msgid "Set to Draft"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: help:hr.employee,number_of_year:0
+msgid "Total years of work experience"
+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
+#: 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
+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
+#: 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
+#: help:hr.contract,voluntary_provident_fund:0
+msgid "VPF computed as percentage(%)"
+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
+#: view:hr.payroll.advice:0
+#: view:payment.advice.report:0
+msgid "Group By..."
+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
+#: 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:184
+#, python-format
+msgid "You can not confirm Payment advice without advice lines."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.payroll.advice,state:0
+#: field:payment.advice.report,state:0
+msgid "State"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:payroll.advice:0
+msgid "Yours Sincerely"
+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
+#: 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:158
+#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:184
+#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:240
+#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:257
+#, python-format
+msgid "Error !"
+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
+#: 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
+msgid "July"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:res.company:0
+msgid "Configuration"
+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
+msgid "Date To"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.contract,tds:0
+msgid "TDS"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.employee,join_date:0
+msgid "Join Date"
+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
+msgid "August"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.contract:0
+msgid "Deduction"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+msgid "Search Payment advice"
+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
+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
+msgid "Month"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:salary.detail.byyear:0
+msgid "Employee Code"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: selection:hr.contract,city_type:0
+msgid "Non Metro"
+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
+msgid "Category"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:240
+#, 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
+#: field:hr.employee,number_of_year:0
+msgid "No. of Years of Service"
+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
+msgid "Draft"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid "Date From"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.contract,voluntary_provident_fund:0
+msgid "Voluntary Provident Fund"
+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
+#: view:payment.advice.report:0
+msgid "Status"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.contract,city_type:0
+msgid "Type of City"
+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
+msgid "June"
+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
+msgid "November"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:payment.advice.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
+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
+#: selection:payment.advice.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
+#: 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: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
+#: report:salary.detail.byyear:0
+msgid "To"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:payment.advice.report,number:0
+msgid "Number"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: selection:payment.advice.report,month:0
+msgid "September"
+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
+#: constraint:hr.employee:0
+msgid "Error! You cannot create recursive hierarchy of Employee(s)."
+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
+#: view:hr.payslip.run:0
+msgid "Payslip Batches ready to be Adviced"
+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
+#: model:ir.model,name:l10n_in_hr_payroll.model_hr_employee
+#: view:payment.advice.report:0
+#: field:payment.advice.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
+#: help:hr.employee,join_date:0
+msgid "Joining date of employee"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:payroll.advice:0
+msgid "Dear Sir/Madam,"
+msgstr "Dear Sir/Madam,"
+
+#. module: l10n_in_hr_payroll
+#: field:hr.payroll.advice,note:0
+msgid "Description"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid ")"
+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
+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
+#: report:salary.employee.bymonth:0
+msgid "Name"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: selection:hr.contract,city_type:0
+msgid "Metro"
+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
+#: selection:payment.advice.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:158
+#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:257
+#, 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
+#: 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
+#: selection:payment.advice.report,month:0
+msgid "May"
+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
+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
+#: report:salary.detail.byyear:0
+#: report:salary.employee.bymonth:0
+msgid "Total"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:payroll.advice:0
+msgid "form period"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:payment.advice.report:0
+msgid "Year of Payment Advices"
+msgstr ""
\ No newline at end of file
diff --git a/addons/l10n_in_hr_payroll/i18n/ta.po b/addons/l10n_in_hr_payroll/i18n/ta.po
new file mode 100644
index 00000000000..98d00c76a33
--- /dev/null
+++ b/addons/l10n_in_hr_payroll/i18n/ta.po
@@ -0,0 +1,933 @@
+# Tamil Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#   * l10n_in_hr_payroll
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 7.0alpha\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-08-17 06:46+0000\n"
+"PO-Revision-Date: 2012-08-17 06:46+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: Tamil <ta@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: l10n_in_hr_payroll
+#: report:salary.detail.byyear:0
+msgid "E-mail Address"
+msgstr ""
+
+#. 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
+#: report:salary.detail.byyear:0
+msgid "Employees Salary Details"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:salary.detail.byyear:0
+msgid "Allowances with Basic:"
+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
+msgid "March"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid "("
+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
+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
+#: report:paylip.details.in:0
+msgid ","
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+msgid "Set to Draft"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: help:hr.employee,number_of_year:0
+msgid "Total years of work experience"
+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
+#: 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
+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
+#: 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
+#: help:hr.contract,voluntary_provident_fund:0
+msgid "VPF computed as percentage(%)"
+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
+#: view:hr.payroll.advice:0
+#: view:payment.advice.report:0
+msgid "Group By..."
+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
+#: 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:184
+#, python-format
+msgid "You can not confirm Payment advice without advice lines."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.payroll.advice,state:0
+#: field:payment.advice.report,state:0
+msgid "State"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:payroll.advice:0
+msgid "Yours Sincerely"
+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
+#: 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:158
+#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:184
+#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:240
+#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:257
+#, python-format
+msgid "Error !"
+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
+#: 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
+msgid "July"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:res.company:0
+msgid "Configuration"
+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
+msgid "Date To"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.contract,tds:0
+msgid "TDS"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.employee,join_date:0
+msgid "Join Date"
+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
+msgid "August"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.contract:0
+msgid "Deduction"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+msgid "Search Payment advice"
+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
+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
+msgid "Month"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:salary.detail.byyear:0
+msgid "Employee Code"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: selection:hr.contract,city_type:0
+msgid "Non Metro"
+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
+msgid "Category"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:240
+#, 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
+#: field:hr.employee,number_of_year:0
+msgid "No. of Years of Service"
+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
+msgid "Draft"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid "Date From"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.contract,voluntary_provident_fund:0
+msgid "Voluntary Provident Fund"
+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
+#: view:payment.advice.report:0
+msgid "Status"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.contract,city_type:0
+msgid "Type of City"
+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
+msgid "June"
+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
+msgid "November"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:payment.advice.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
+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
+#: selection:payment.advice.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
+#: 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: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
+#: report:salary.detail.byyear:0
+msgid "To"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:payment.advice.report,number:0
+msgid "Number"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: selection:payment.advice.report,month:0
+msgid "September"
+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
+#: constraint:hr.employee:0
+msgid "Error! You cannot create recursive hierarchy of Employee(s)."
+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
+#: view:hr.payslip.run:0
+msgid "Payslip Batches ready to be Adviced"
+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
+#: model:ir.model,name:l10n_in_hr_payroll.model_hr_employee
+#: view:payment.advice.report:0
+#: field:payment.advice.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
+#: help:hr.employee,join_date:0
+msgid "Joining date of employee"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:payroll.advice:0
+msgid "Dear Sir/Madam,"
+msgstr "Dear Sir/Madam,"
+
+#. module: l10n_in_hr_payroll
+#: field:hr.payroll.advice,note:0
+msgid "Description"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid ")"
+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
+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
+#: report:salary.employee.bymonth:0
+msgid "Name"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: selection:hr.contract,city_type:0
+msgid "Metro"
+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
+#: selection:payment.advice.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:158
+#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:257
+#, 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
+#: 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
+#: selection:payment.advice.report,month:0
+msgid "May"
+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
+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
+#: report:salary.detail.byyear:0
+#: report:salary.employee.bymonth:0
+msgid "Total"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:payroll.advice:0
+msgid "form period"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:payment.advice.report:0
+msgid "Year of Payment Advices"
+msgstr ""
\ No newline at end of file
diff --git a/addons/l10n_in_hr_payroll/i18n/te.po b/addons/l10n_in_hr_payroll/i18n/te.po
new file mode 100644
index 00000000000..0c6f6127c4d
--- /dev/null
+++ b/addons/l10n_in_hr_payroll/i18n/te.po
@@ -0,0 +1,933 @@
+# Telugu Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#   * l10n_in_hr_payroll
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 7.0alpha\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-08-17 06:46+0000\n"
+"PO-Revision-Date: 2012-08-17 06:46+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: Telugu <te@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: l10n_in_hr_payroll
+#: report:salary.detail.byyear:0
+msgid "E-mail Address"
+msgstr ""
+
+#. 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
+#: report:salary.detail.byyear:0
+msgid "Employees Salary Details"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:salary.detail.byyear:0
+msgid "Allowances with Basic:"
+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
+msgid "March"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid "("
+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
+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
+#: report:paylip.details.in:0
+msgid ","
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+msgid "Set to Draft"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: help:hr.employee,number_of_year:0
+msgid "Total years of work experience"
+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
+#: 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
+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
+#: 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
+#: help:hr.contract,voluntary_provident_fund:0
+msgid "VPF computed as percentage(%)"
+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
+#: view:hr.payroll.advice:0
+#: view:payment.advice.report:0
+msgid "Group By..."
+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
+#: 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:184
+#, python-format
+msgid "You can not confirm Payment advice without advice lines."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.payroll.advice,state:0
+#: field:payment.advice.report,state:0
+msgid "State"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:payroll.advice:0
+msgid "Yours Sincerely"
+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
+#: 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:158
+#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:184
+#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:240
+#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:257
+#, python-format
+msgid "Error !"
+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
+#: 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
+msgid "July"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:res.company:0
+msgid "Configuration"
+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
+msgid "Date To"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.contract,tds:0
+msgid "TDS"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.employee,join_date:0
+msgid "Join Date"
+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
+msgid "August"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.contract:0
+msgid "Deduction"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+msgid "Search Payment advice"
+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
+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
+msgid "Month"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:salary.detail.byyear:0
+msgid "Employee Code"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: selection:hr.contract,city_type:0
+msgid "Non Metro"
+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
+msgid "Category"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:240
+#, 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
+#: field:hr.employee,number_of_year:0
+msgid "No. of Years of Service"
+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
+msgid "Draft"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid "Date From"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.contract,voluntary_provident_fund:0
+msgid "Voluntary Provident Fund"
+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
+#: view:payment.advice.report:0
+msgid "Status"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.contract,city_type:0
+msgid "Type of City"
+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
+msgid "June"
+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
+msgid "November"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:payment.advice.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
+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
+#: selection:payment.advice.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
+#: 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: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
+#: report:salary.detail.byyear:0
+msgid "To"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:payment.advice.report,number:0
+msgid "Number"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: selection:payment.advice.report,month:0
+msgid "September"
+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
+#: constraint:hr.employee:0
+msgid "Error! You cannot create recursive hierarchy of Employee(s)."
+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
+#: view:hr.payslip.run:0
+msgid "Payslip Batches ready to be Adviced"
+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
+#: model:ir.model,name:l10n_in_hr_payroll.model_hr_employee
+#: view:payment.advice.report:0
+#: field:payment.advice.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
+#: help:hr.employee,join_date:0
+msgid "Joining date of employee"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:payroll.advice:0
+msgid "Dear Sir/Madam,"
+msgstr "Dear Sir/Madam,"
+
+#. module: l10n_in_hr_payroll
+#: field:hr.payroll.advice,note:0
+msgid "Description"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid ")"
+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
+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
+#: report:salary.employee.bymonth:0
+msgid "Name"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: selection:hr.contract,city_type:0
+msgid "Metro"
+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
+#: selection:payment.advice.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:158
+#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:257
+#, 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
+#: 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
+#: selection:payment.advice.report,month:0
+msgid "May"
+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
+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
+#: report:salary.detail.byyear:0
+#: report:salary.employee.bymonth:0
+msgid "Total"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:payroll.advice:0
+msgid "form period"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:payment.advice.report:0
+msgid "Year of Payment Advices"
+msgstr ""
\ No newline at end of file
diff --git a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
new file mode 100644
index 00000000000..085a2679db2
--- /dev/null
+++ b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
@@ -0,0 +1,283 @@
+#-*- coding:utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2011 OpenERP SA (<http://openerp.com>). All Rights Reserved
+#
+#    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 time
+from datetime import datetime
+from dateutil.relativedelta import relativedelta
+from calendar import isleap
+
+from tools.translate import _
+from osv import fields, osv
+import netsvc
+import decimal_precision as dp
+
+DATETIME_FORMAT = "%Y-%m-%d"
+
+class hr_contract(osv.osv):
+    """
+    Employee contract allows to add different values in fields.
+    Fields are used in salary rule computation.
+    """
+
+    _inherit = 'hr.contract'
+    _description = 'HR Contract'
+
+    _columns = {
+        'tds': fields.float('TDS', digits_compute=dp.get_precision('Payroll'), help="Amount for Tax Deduction at Source"),
+        '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(%)"),
+        'supplementary_allowance': fields.float('Supplementary Allowance', digits_compute=dp.get_precision('Payroll')),
+    }
+
+hr_contract()
+
+class payroll_advice(osv.osv):
+    '''
+    Bank Advice
+    '''
+    _name = 'hr.payroll.advice'
+    _description = 'Bank Advice'
+    _columns = {
+        'name':fields.char('Name', size=32, readonly=True, required=True, states={'draft': [('readonly', False)]},),
+        'note': fields.text('Description'),
+        'date': fields.date('Date', readonly=True, required=True, states={'draft': [('readonly', False)]}, help="Advice Date is used to search Payslips"),
+        'state':fields.selection([
+            ('draft', 'Draft'),
+            ('confirm', 'Confirmed'),
+            ('cancel', 'Cancelled'),
+        ], 'State', select=True, readonly=True),
+        'number':fields.char('Reference', size=16, readonly=True),
+        'line_ids':fields.one2many('hr.payroll.advice.line', 'advice_id', 'Employee Salary', states={'draft': [('readonly', False)]}, readonly=True),
+        'chaque_nos':fields.char('Cheque Numbers', size=256),
+        'neft': fields.boolean('NEFT Transaction', help="Check this box if your company use online transfer for salary"),
+        'company_id':fields.many2one('res.company', 'Company', required=True, readonly=True, states={'draft': [('readonly', False)]}),
+        'bank_id':fields.many2one('res.bank', 'Bank', readonly=True, states={'draft': [('readonly', False)]}, help="Select the Bank from which the salary is going to be paid"),
+        'batch_id': fields.many2one('hr.payslip.run', 'Batch', readonly=True)
+    }
+
+    _defaults = {
+        'date': lambda * a: time.strftime('%Y-%m-%d'),
+        'state': lambda * a: 'draft',
+        'company_id': lambda self, cr, uid, context: \
+                self.pool.get('res.users').browse(cr, uid, uid,
+                    context=context).company_id.id,
+        'note': "Please make the payroll transfer from above account number to the below mentioned account numbers towards employee salaries:"
+    }
+
+    def compute_advice(self, cr, uid, ids, context=None):
+        """
+        Advice - Create Advice lines in Payment Advice and
+        compute Advice lines.
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of Advice’s IDs
+        @return: Advice lines
+        @param context: A standard dictionary for contextual values
+        """
+        payslip_pool = self.pool.get('hr.payslip')
+        advice_line_pool = self.pool.get('hr.payroll.advice.line')
+        payslip_line_pool = self.pool.get('hr.payslip.line')
+
+        for advice in self.browse(cr, uid, ids, context=context):
+            old_line_ids = advice_line_pool.search(cr, uid, [('advice_id', '=', advice.id)], context=context)
+            if old_line_ids:
+                advice_line_pool.unlink(cr, uid, old_line_ids, context=context)
+            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))
+                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]
+                    advice_line = {
+                            'advice_id': advice.id,
+                            'name': slip.employee_id.bank_account_id.acc_number,
+                            'employee_id': slip.employee_id.id,
+                            'bysal': line.total
+                            }
+                    advice_line_pool.create(cr, uid, advice_line, context=context)
+                payslip_pool.write(cr, uid, slip_ids, {'advice_id': advice.id}, context=context)
+        return True
+
+    def confirm_sheet(self, cr, uid, ids, context=None):
+        """
+        confirm Advice - confirmed Advice after computing Advice Lines..
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of confirm Advice’s IDs
+        @return: confirmed Advice lines and set sequence of Advice.
+        @param context: A standard dictionary for contextual values
+        """
+        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.'))
+            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')
+            sequence_num = 'PAY' + '/' + advice_year + '/' + number
+            self.write(cr, uid, [advice.id], {'number': sequence_num, 'state': 'confirm'}, context=context)
+        return True
+
+    def set_to_draft(self, cr, uid, ids, context=None):
+        """Resets Advice as draft.
+        """
+        return self.write(cr, uid, ids, {'state':'draft'}, context=context)
+
+    def cancel_sheet(self, cr, uid, ids, context=None):
+        """Marks Advice as cancelled.
+        """
+        return self.write(cr, uid, ids, {'state':'cancel'}, context=context)
+
+    def onchange_company_id(self, cr, uid, ids, company_id=False, context=None):
+        res = {}
+        if company_id:
+            company = self.pool.get('res.company').browse(cr, uid, [company_id], context=context)[0]
+            if company.partner_id.bank_ids:
+                res.update({'bank_id': company.partner_id.bank_ids[0].bank.id})
+        return {
+            'value':res
+        }
+payroll_advice()
+
+class hr_payslip_run(osv.osv):
+
+    _inherit = 'hr.payslip.run'
+    _description = 'Payslip Batches'
+    _columns = {
+        'available_advice': fields.boolean('Made Payment Advice?', help="If this box is checked which means that Payment Advice exists for current batch", readonly=False),
+    }
+    def copy(self, cr, uid, id, default={}, context=None):
+        if not default:
+            default = {}
+        default.update({'available_advice': False})
+        return super(hr_payslip_run, self).copy(cr, uid, id, default, context=context)    
+
+    def draft_payslip_run(self, cr, uid, ids, context=None):
+        res = super(hr_payslip_run, self).draft_payslip_run(cr, uid, ids, context=context)
+        self.write(cr, uid, ids, {'available_advice': False}, context=context)
+        return res
+    
+    def create_advice(self, cr, uid, ids, context=None):
+        wf_service = netsvc.LocalService("workflow")
+        payslip_pool = self.pool.get('hr.payslip')
+        payslip_line_pool = self.pool.get('hr.payslip.line')
+        advice_pool = self.pool.get('hr.payroll.advice')
+        advice_line_pool = self.pool.get('hr.payroll.advice.line')
+        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))
+            advice_data = {
+                        'batch_id': run.id,
+                        'company_id': users[0].company_id.id,
+                        'name': run.name,
+                        'date': run.date_end,
+                        'bank_id': users[0].company_id.bank_ids and users[0].company_id.bank_ids[0].id or False
+                    }
+            advice_id = advice_pool.create(cr, uid, advice_data, context=context)
+            slip_ids = []
+            for slip_id in run.slip_ids:
+                wf_service.trg_validate(uid, 'hr.payslip', slip_id.id, 'hr_verify_sheet', cr)
+                wf_service.trg_validate(uid, 'hr.payslip', slip_id.id, 'process_sheet', cr)
+                slip_ids.append(slip_id.id)
+
+            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))
+                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]
+                    advice_line = {
+                            'advice_id': advice_id,
+                            'name': slip.employee_id.bank_account_id.acc_number,
+                            'employee_id': slip.employee_id.id,
+                            'bysal': line.total
+                    }
+                    advice_line_pool.create(cr, uid, advice_line, context=context)
+        return self.write(cr, uid, ids, {'available_advice' : True})
+
+hr_payslip_run()
+
+class payroll_advice_line(osv.osv):
+    '''
+    Bank Advice Lines
+    '''
+    def onchange_employee_id(self, cr, uid, ids, employee_id=False, context=None):
+        res = {}
+        hr_obj = self.pool.get('hr.employee')
+        if not employee_id:
+            return {'value': res}
+        employee = hr_obj.browse(cr, uid, [employee_id], context=context)[0]
+        res.update({'name': employee.bank_account_id.acc_number , 'ifsc_code': employee.bank_account_id.bank_bic or ''})
+        return {'value': res}
+
+    _name = 'hr.payroll.advice.line'
+    _description = 'Bank Advice Lines'
+    _columns = {
+        'advice_id': fields.many2one('hr.payroll.advice', 'Bank Advice'),
+        'name': fields.char('Bank Account No.', size=25, required=True),
+        'ifsc_code': fields.char('IFSC Code', size=16),
+        'employee_id': fields.many2one('hr.employee', 'Employee', required=True),
+        'bysal': fields.float('By Salary', digits_compute=dp.get_precision('Payroll')),
+        'debit_credit': fields.char('C/D', size=3, required=False),
+        'company_id': fields.related('advice_id', 'company_id', type='many2one', required=False, relation='res.company', string='Company', store=True),
+        'ifsc': fields.related('advice_id', 'neft', type='boolean', string='IFSC'),
+    }
+    _defaults = {
+        'debit_credit': 'C',
+    }
+
+payroll_advice_line()
+
+class hr_payslip(osv.osv):
+    '''
+    Employee Pay Slip
+    '''
+    _inherit = 'hr.payslip'
+    _description = 'Pay Slips'
+    _columns = {
+        'advice_id': fields.many2one('hr.payroll.advice', 'Bank Advice')
+    }
+
+    def copy(self, cr, uid, id, default={}, context=None):
+        if not default:
+            default = {}
+        default.update({'advice_id' : False})
+        return super(hr_payslip, self).copy(cr, uid, id, default, context=context)
+
+hr_payslip()
+
+class res_company(osv.osv):
+
+    _inherit = 'res.company'
+    _columns = {
+        'dearness_allowance': fields.boolean('Dearness Allowance', help="Check this box if your company provide Dearness Allowance to employee")
+    }
+    _defaults = {
+        'dearness_allowance': True,
+    }
+
+res_company()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_demo.xml b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_demo.xml
new file mode 100644
index 00000000000..bcb168467a9
--- /dev/null
+++ b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_demo.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+        <!-- Salary Structure -->
+
+        <record id="hr_payroll_salary_structure_ind_emp" model="hr.payroll.structure">
+            <field name="code">NE</field>
+            <field name="name">Non-Executive Employee</field>
+            <field eval="[(6, 0, [ref('hr_salary_rule_medical'), ref('hr_salary_rule_da'), ref('hr_salary_rule_lta'), ref('hr_salary_rule_telephone'), ref('hr_salary_rule_internet'), ref('hr_payroll_rule_child1')])]" name="rule_ids"/>
+            <field name="company_id" ref="base.main_company"/>
+            <field name="parent_id" ref="hr_payroll.structure_base"/>
+        </record>
+
+    </data>
+</openerp>
diff --git a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_report.xml b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_report.xml
new file mode 100644
index 00000000000..7f27291051f
--- /dev/null
+++ b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_report.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0"?>
+<openerp>
+    <data>
+
+        <report
+            auto="False"
+            id="payslip_details_report"
+            model="hr.payslip"
+            name="paylip.details.in"
+            rml="l10n_in_hr_payroll/report/report_payslip_details.rml"
+            string="PaySlip Details" />
+
+        <report
+            auto="False" 
+            id="payroll_advice" 
+            model="hr.payroll.advice" 
+            name="payroll.advice" 
+            rml="l10n_in_hr_payroll/report/report_payroll_advice.rml"
+            string="Print Advice" />
+
+        <report
+            auto="False" 
+            id="hr_salary_employee_bymonth" 
+            model="hr.salary.employee.month" 
+            name="salary.employee.bymonth" 
+            rml="l10n_in_hr_payroll/report/report_hr_salary_employee_bymonth.rml"
+            string="Yearly Salary by Head" /> 
+
+        <report
+            auto="False" 
+            id="yearly_salary" 
+            model="yearly.salary.detail" 
+            name="salary.detail.byyear" 
+            rml="l10n_in_hr_payroll/report/report_hr_yearly_salary_detail.rml"
+            string="Yearly Salary by Employee" /> 
+
+    </data>
+</openerp>
diff --git a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_sequence.xml b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_sequence.xml
new file mode 100644
index 00000000000..3941d6461c9
--- /dev/null
+++ b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_sequence.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data noupdate="1">
+    
+        <record id="seq_type_payment_advice" model="ir.sequence.type">
+            <field name="name">Payment Advice</field>
+            <field name="code">payment.advice</field>
+        </record>
+        
+        <record id="seq_payment_advice" model="ir.sequence">
+            <field name="name">Payment Advice</field>
+            <field name="code">payment.advice</field>
+            <field name="padding">3</field>
+        </record>
+        
+    </data>
+</openerp>
\ No newline at end of file
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
new file mode 100644
index 00000000000..37d2f865770
--- /dev/null
+++ b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml
@@ -0,0 +1,220 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+        <record id="hr_contract_form_in_inherit" model="ir.ui.view">
+            <field name="name">hr.contract.form.in.inherit</field>
+            <field name="model">hr.contract</field>
+            <field name="inherit_id" ref="hr_payroll.hr_contract_form_inherit"/>
+            <field name="arch" type="xml">
+            <data>
+                 <xpath expr="//field[@name='struct_id']" position="after">
+                 <group col="2" colspan="2" name="right_column">
+                    <separator colspan="2" string="Allowance"/>
+                        <field name="driver_salay"/>
+                        <field name="house_rent_allowance_metro_nonmetro"/>
+                        <field name="supplementary_allowance"/>
+                 </group>
+                 <group col="2" colspan="2" name="left_column">
+                    <separator colspan="2" string="Deduction"/>
+                        <field name="tds"/>
+                        <field name="voluntary_provident_fund"/>
+                        <field name="medical_insurance"/>
+                 </group>
+                 </xpath>
+            </data>
+            </field>
+        </record>
+
+        <record id="hr_payslip_run_form_inherit" model="ir.ui.view">
+            <field name="name">hr.payslip.run.form.inherit</field>
+            <field name="model">hr.payslip.run</field>
+            <field name="inherit_id" ref="hr_payroll.hr_payslip_run_form"/>
+            <field name="arch" type="xml">
+            <data>
+                <xpath expr="//field[@name='credit_note']" position="after">
+                    <newline/>
+                    <field name="available_advice"/>
+                </xpath>
+                 <xpath expr="//button[@string='Set to Draft']" position="after">
+                    <button name="create_advice" string="Create Advice" type="object" states="close" />
+                 </xpath>
+            </data>
+            </field>
+        </record>
+
+        <record id="hr_payslip_run_search_inherit" model="ir.ui.view">
+            <field name="name">hr.payslip.run.search.inherit</field>
+            <field name="model">hr.payslip.run</field>
+            <field name="inherit_id" ref="hr_payroll.hr_payslip_run_filter"/>
+            <field name="arch" type="xml">
+            <data>
+                <xpath expr="//field[@name='date_end']" position="after">
+                    <separator orientation="vertical"/>
+                    <filter icon="terp-gtk-go-back-rtl" string="To Advice" domain="[('available_advice','=', False)]" help="Payslip Batches ready to be Adviced"/>
+                </xpath>
+            </data>
+            </field>
+        </record>
+
+        <record id="view_hr_bank_advice_tree" model="ir.ui.view">
+            <field name="name">hr.payroll.advice.tree</field>
+            <field name="model">hr.payroll.advice</field>
+            <field name="arch" type="xml">
+                <tree string="Bank Advice">
+                    <field name="date"/>
+                    <field name="number"/>
+                    <field name="name"/>
+                    <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                    <field name="bank_id"/>
+                    <field name="state"/>
+                </tree>
+            </field>
+        </record>
+
+        <record id="view_hr_bank_advice_form" model="ir.ui.view">
+            <field name="name">hr.payroll.advice.form</field>
+            <field name="model">hr.payroll.advice</field>
+            <field name="arch" type="xml">
+                <form string="Bank Advice" version="7.0">
+                    <header>
+                        <button name="confirm_sheet"  string="Confirm Sheet" states="draft" type="object" class="oe_highlight"/>
+                        <button name="compute_advice" string="Compute Advice" states="draft" type="object" class="oe_highlight"/>
+                        <button name="cancel_sheet" string="Cancel" states="draft"  type="object"/>
+                        <button name="set_to_draft" string="Set to Draft" states="cancel,confirm" type="object"/>
+                        <div class="oe_right">
+                            <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft"/>
+                        </div>
+                        <div class="oe_clear"/>
+                    </header>
+                    <sheet>
+                        <group>
+                            <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>
+                            <group colspan="3" col="6">
+                                <field name="bank_id"/>
+                                <field name="number"/>
+                            </group>
+                        </group>
+                        <notebook colspan="4">
+                            <page string="Payment Lines">
+                                <field name="line_ids" colspan="4" nolabel="1">
+                                    <tree string="Payment Lines" editable="bottom">
+                                        <field name="employee_id" on_change="onchange_employee_id(employee_id)"/>
+                                        <field name="name"/>
+                                        <field name="ifsc" invisible="1"/>
+                                        <field name="ifsc_code" attrs="{'invisible':[('ifsc','=', False)]}" />
+                                        <field name="bysal"/>
+                                        <field name="debit_credit"/>
+                                    </tree>
+                                </field>
+                            </page>
+                            <page string="Other Information">
+                                <group colspan="4" col="6">
+                                <field name="company_id" on_change="onchange_company_id(company_id)" groups="base.group_multi_company" widget="selection"/>
+                                <field name="chaque_nos"/>
+                                <newline/>
+                                <field name="neft"/>
+                                <field name="batch_id"/>
+                                </group>
+                                <separator colspan="4" string="Letter Details"/>
+                                <field name="note" colspan="4" nolabel="1"/>
+                            </page>
+                        </notebook>
+                    </sheet>
+                </form>
+            </field>
+        </record>
+
+        <record id="view_hr_payroll_advice_filter" model="ir.ui.view">
+            <field name="name">hr.payroll.advice.select</field>
+            <field name="model">hr.payroll.advice</field>
+            <field name="arch" type="xml">
+                <search string="Search Payment advice">
+                    <group>
+                        <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Advices"/>
+                        <filter icon="terp-camera_test" string="Confirm" domain="[('state','=','confirm')]" help="Confirm Advices"/>
+                        <separator orientation="vertical"/>
+                        <field name="date"/>
+                        <field name="number"/>
+                        <field name="name"/>
+                        <field name="bank_id"/>
+                        <field name="batch_id"/>
+                    </group>
+                    <newline/>
+                    <group expand="0" string="Group By...">
+                        <filter string="Bank" name="bank_id" icon="terp-go-home" context="{'group_by':'bank_id'}"/>
+                        <separator orientation="vertical"/>
+                        <filter string="Status" name="state" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
+                        <separator orientation="vertical" />
+                        <filter string="Company" name="company_id" groups="base.group_multi_company" icon="terp-go-home" context="{'group_by':'company_id'}"/>
+                    </group>
+                </search>
+            </field>
+        </record>
+
+        <record id="action_view_hr_bank_advice_tree" model="ir.actions.act_window">
+            <field name="name">Payment Advices</field>
+            <field name="res_model">hr.payroll.advice</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="view_id" ref="view_hr_bank_advice_tree"/>
+            <field name="search_view_id" ref="view_hr_payroll_advice_filter"/>
+        </record>
+
+        <menuitem
+            action="action_view_hr_bank_advice_tree"
+            id="hr_menu_payment_advice"
+            parent="hr_payroll.menu_hr_root_payroll"
+        />
+
+        <record id="view_advice_line_form" model="ir.ui.view">
+            <field name="name">advice.line.form</field>
+            <field name="model">hr.payroll.advice.line</field>
+            <field name="arch" type="xml">
+                <form string="Advice Lines" version="7.0">
+                    <sheet>
+                    <label for="advice_id" class="oe_edit_only"/>
+                    <h1><field name="advice_id"/></h1>
+                        <group>
+                            <field name="employee_id" on_change="onchange_employee_id(employee_id)" />
+                            <field name="name" />
+                            <field name="ifsc" invisible="1"/>
+                            <field name="ifsc_code" attrs="{'invisible':[('ifsc','=', False)]}" />
+                            <field name="bysal" />
+                            <field name="debit_credit" />
+                        </group>
+                    </sheet>
+                </form>
+            </field>
+        </record>
+
+        <record id="view_res_company_da" model="ir.ui.view">
+            <field name="name">res.company.inherit</field>
+            <field name="model">res.company</field>
+            <field name="inherit_id" ref="base.view_company_form"/>
+            <field name="arch" type="xml">
+            <data>
+                 <page string="Configuration" position="inside">
+                    <group name="rule" string="Payroll">
+                        <field name="dearness_allowance"/>
+                    </group>
+                 </page>
+            </data>
+            </field>
+        </record>
+
+        <!--  Shortcuts -->
+
+        <act_window name="Payslips"
+            domain="[('advice_id', '=', active_id)]"
+            res_model="hr.payslip"
+            src_model="hr.payroll.advice"
+            view_id ="hr_payroll.view_hr_payslip_tree"
+            id="act_hr_emp_payslip_list"
+         />
+
+    </data>
+</openerp>
diff --git a/addons/l10n_in_hr_payroll/report/__init__.py b/addons/l10n_in_hr_payroll/report/__init__.py
new file mode 100644
index 00000000000..8a20170c384
--- /dev/null
+++ b/addons/l10n_in_hr_payroll/report/__init__.py
@@ -0,0 +1,32 @@
+#!/usr/bin/env python
+#-*- coding:utf-8 -*-
+
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    d$
+#
+#    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 report_payslip_details
+import report_payroll_advice
+import report_hr_salary_employee_bymonth
+import payment_advice_report
+import report_hr_yearly_salary_detail
+import payslip_report
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/l10n_in_hr_payroll/report/payment_advice_report.py b/addons/l10n_in_hr_payroll/report/payment_advice_report.py
new file mode 100644
index 00000000000..838334913a5
--- /dev/null
+++ b/addons/l10n_in_hr_payroll/report/payment_advice_report.py
@@ -0,0 +1,87 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2012-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/>.
+#
+##############################################################################
+
+import tools
+from osv import fields, osv
+
+class payment_advice_report(osv.osv):
+    _name = "payment.advice.report"
+    _description = "Payment Advice Analysis"
+    _auto = False
+    _columns = {
+        'name':fields.char('Name', size=32, readonly=True),
+        'date': fields.date('Date', readonly=True,),
+        'year': fields.char('Year', size=4, 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),
+        'day': fields.char('Day', size=128, readonly=True),
+        'state':fields.selection([
+            ('draft', 'Draft'),
+            ('confirm', 'Confirmed'),
+            ('cancel', 'Cancelled'),
+        ], 'State', select=True, readonly=True),
+        'employee_id': fields.many2one('hr.employee', 'Employee', readonly=True),
+        'nbr': fields.integer('# Payment Lines', readonly=True),
+        'number':fields.char('Number', size=16, readonly=True),
+        'bysal': fields.float('By Salary', readonly=True),
+        'bank_id':fields.many2one('res.bank', 'Bank', readonly=True),
+        'company_id':fields.many2one('res.company', 'Company', readonly=True),
+        'cheque_nos':fields.char('Cheque Numbers', size=256, readonly=True),
+        'neft': fields.boolean('NEFT Transaction', readonly=True),
+        'ifsc_code': fields.char('IFSC Code', size=32, readonly=True),
+        'employee_bank_no': fields.char('Employee Bank Account', size=32, required=True),
+    }
+    def init(self, cr):
+        tools.drop_view_if_exists(cr, 'payment_advice_report')
+        cr.execute("""
+            create or replace view payment_advice_report as (
+                select
+                    min(l.id) as id,
+                    sum(l.bysal) as bysal,
+                    p.name,
+                    p.state,
+                    p.date,
+                    p.number,
+                    p.company_id,
+                    p.bank_id,
+                    p.chaque_nos as cheque_nos,
+                    p.neft,
+                    l.employee_id,
+                    l.ifsc_code,
+                    l.name as employee_bank_no,
+                    to_char(p.date, 'YYYY') as year,
+                    to_char(p.date, 'MM') as month,
+                    to_char(p.date, 'YYYY-MM-DD') as day,
+                    1 as nbr
+                from
+                    hr_payroll_advice as p
+                    left join hr_payroll_advice_line as l on (p.id=l.advice_id)
+                where 
+                    l.employee_id IS NOT NULL
+                group by
+                    p.number,p.name,p.date,p.state,p.company_id,p.bank_id,p.chaque_nos,p.neft,
+                    l.employee_id,l.advice_id,l.bysal,l.ifsc_code, l.name
+            )
+        """)
+payment_advice_report()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/l10n_in_hr_payroll/report/payment_advice_report_view.xml b/addons/l10n_in_hr_payroll/report/payment_advice_report_view.xml
new file mode 100644
index 00000000000..7a023f09608
--- /dev/null
+++ b/addons/l10n_in_hr_payroll/report/payment_advice_report_view.xml
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+<data>
+
+    <record id="view_payment_advice_tree" model="ir.ui.view">
+        <field name="name">payment.advice.report.tree</field>
+        <field name="model">payment.advice.report</field>
+        <field name="type">tree</field>
+        <field name="arch" type="xml">
+            <tree colors="blue:state == 'draft';black:state == 'confirm';gray:state == 'cancel' " string="Advices Analysis">
+                <field name="nbr" sum="# Payment Lines"/>
+                <field name="name" invisible="1"/>
+                <field name="employee_id" invisible="1"/>
+                <field name="date" invisible="1"/>
+                <field name="bank_id" invisible="1"/>
+                <field name="state" invisible="1"/>
+                <field name="number" invisible="1"/>
+                <field name="bysal" sum="Total Salary"/>
+                <field name="year" invisible="1"/>
+                <field name="day" invisible="1"/>
+                <field name="month" invisible="1"/>
+                <field name="company_id" invisible="1"/>
+                <field name="cheque_nos" invisible="1"/>
+                <field name="neft" invisible="1"/>
+                <field name="ifsc_code" invisible="1"/>
+            </tree>
+        </field>
+    </record>
+
+
+    <record id="view_payment_advice_search" model="ir.ui.view">
+        <field name="name">payment.advice.report.search</field>
+        <field name="model">payment.advice.report</field>
+        <field name="type">search</field>
+        <field name="arch" type="xml">
+            <search string="Advices Analysis">
+                 <group>
+                    <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Payment Advices which are in draft state"/>
+                    <filter icon="terp-check" string="Confirm" name="confirm" domain="[('state','=','confirm')]" help="Payment Advices which are in confirm state"/>
+                    <separator orientation="vertical"/>
+                    <filter icon="terp-camera_test" string="NEFT" domain="[('neft','=',True)]" help="Advices which are paid using NEFT transfer"/>
+                    <separator orientation="vertical"/>
+                    <field name="date"/>
+                    <separator orientation="vertical"/>
+                    <field name="number"/>
+                    <field name="name"/>
+                    <field name="employee_id"/>
+                    <field name="cheque_nos"/>
+                </group>
+                <newline/>
+                 <group expand="0" string="Extended Filters...">
+                    <field name="ifsc_code"/>
+                    <field name="bank_id" widget="selection"/>
+                    <field name="employee_bank_no"/>
+                    <separator orientation="vertical"/>
+                    <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                </group>
+                <newline/>
+                <group expand="1" string="Group By...">
+                    <filter string="Employee" icon="terp-personal" context="{'group_by':'employee_id'}" />
+                    <filter string="Bank" icon="terp-go-home" context="{'group_by':'bank_id'}"/>
+                    <separator orientation="vertical"/>
+                    <filter string="Status" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
+                    <separator orientation="vertical"/>
+                    <filter string="Company" icon="terp-go-home" groups="base.group_multi_company" context="{'group_by':'company_id'}"/>
+                    <separator orientation="vertical"/>
+                    <filter string="Day" icon="terp-go-today" context="{'group_by':'day'}" help="Day of Payment Advices"/>
+                    <filter string="Month" name="order_month" icon="terp-go-month" context="{'group_by':'month'}" help="Month of Payment Advices"/>
+                    <filter string="Year" icon="terp-go-year" context="{'group_by':'year'}" help="Year of Payment Advices"/>
+                </group>
+            </search>
+        </field>
+    </record>
+
+    <record id="action_payment_advice_report_all" model="ir.actions.act_window">
+        <field name="name">Advices Analysis</field>
+        <field name="res_model">payment.advice.report</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">tree</field>
+        <field name="view_id" ref="view_payment_advice_tree"/>
+        <field name="context">{'search_default_confirm':1,'group_by_no_leaf':1,'group_by':[]}</field>
+        <field name="help">This report performs analysis on Payment Advices</field>
+    </record>
+
+    <menuitem action="action_payment_advice_report_all" id="menu_reporting_payment_advice" parent="hr.menu_hr_reporting" sequence="5" groups="base.group_hr_manager"/>
+
+</data>
+</openerp>
diff --git a/addons/l10n_in_hr_payroll/report/payslip_report.py b/addons/l10n_in_hr_payroll/report/payslip_report.py
new file mode 100644
index 00000000000..b688af4329b
--- /dev/null
+++ b/addons/l10n_in_hr_payroll/report/payslip_report.py
@@ -0,0 +1,88 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2012-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/>.
+#
+##############################################################################
+
+import tools
+from osv import fields, osv
+
+class payslip_report(osv.osv):
+    _name = "payslip.report"
+    _description = "Payslip Analysis"
+    _auto = False
+    _columns = {
+        'name':fields.char('Name', size=32, readonly=True),
+        'date_from': fields.date('Date From', readonly=True,),
+        'date_to': fields.date('Date To', readonly=True,),
+        'year': fields.char('Year', size=4, 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),
+        'day': fields.char('Day', size=128, readonly=True),
+        'state': fields.selection([
+            ('draft', 'Draft'),
+            ('done', 'Done'),
+            ('cancel', 'Rejected'),
+        ], 'State', readonly=True),
+        'employee_id': fields.many2one('hr.employee', 'Employee', readonly=True),
+        'nbr': fields.integer('# Payslip lines', readonly=True),
+        'number': fields.char('Number', size=16, readonly=True),
+        'struct_id': fields.many2one('hr.payroll.structure', 'Structure', readonly=True),
+        'company_id':fields.many2one('res.company', 'Company', readonly=True),
+        'paid': fields.boolean('Made Payment Order ? ', readonly=True),
+        'total': fields.float('Total', readonly=True),
+        'category_id':fields.many2one('hr.salary.rule.category', 'Category', readonly=True),
+    }
+    def init(self, cr):
+        tools.drop_view_if_exists(cr, 'payslip_report')
+        cr.execute("""
+            create or replace view payslip_report as (
+                select
+                    min(l.id) as id,
+                    l.name,
+                    p.struct_id,
+                    p.state,
+                    p.date_from,
+                    p.date_to,
+                    p.number,
+                    p.company_id,
+                    p.paid,
+                    l.category_id,
+                    l.employee_id,
+                    sum(l.total) as total,
+                    to_char(p.date_from, 'YYYY') as year,
+                    to_char(p.date_from, 'MM') as month,
+                    to_char(p.date_from, 'YYYY-MM-DD') as day,
+                    to_char(p.date_to, 'YYYY') as to_year,
+                    to_char(p.date_to, 'MM') as to_month,
+                    to_char(p.date_to, 'YYYY-MM-DD') as to_day,
+                    1 AS nbr
+                from
+                    hr_payslip as p
+                    left join hr_payslip_line as l on (p.id=l.slip_id)
+                where 
+                    l.employee_id IS NOT NULL
+                group by
+                    p.number,l.name,p.date_from,p.date_to,p.state,p.company_id,p.paid,
+                    l.employee_id,p.struct_id,l.category_id
+            )
+        """)
+payslip_report()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/l10n_in_hr_payroll/report/payslip_report_view.xml b/addons/l10n_in_hr_payroll/report/payslip_report_view.xml
new file mode 100644
index 00000000000..5588fc6edca
--- /dev/null
+++ b/addons/l10n_in_hr_payroll/report/payslip_report_view.xml
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+<data>
+
+    <record id="view_payslip_tree" model="ir.ui.view">
+        <field name="name">payslip.report.tree</field>
+        <field name="model">payslip.report</field>
+        <field name="type">tree</field>
+        <field name="arch" type="xml">
+            <tree colors="blue:state == 'draft';black:state == 'done';gray:state == 'cancel' " string="Payslip Analysis">
+                <field name="nbr" sum="# Payslip Lines"/>
+                <field name="name"/>
+                <field name="employee_id" invisible="1"/>
+                <field name="date_to" invisible="1"/>
+                <field name="date_from" invisible="1"/>
+                <field name="state" invisible="1"/>
+                <field name="number" invisible="1"/>
+                <field name="struct_id" invisible="1"/>
+                <field name="year" invisible="1"/>
+                <field name="day" invisible="1"/>
+                <field name="month" invisible="1"/>
+                <field name="company_id" invisible="1"/>
+                <field name="paid" invisible="1"/>
+                <field name="total" />
+                <field name="category_id" invisible="1"/>
+            </tree>
+        </field>
+    </record>
+
+    <record id="view_payslip_search" model="ir.ui.view">
+        <field name="name">payslip.report.search</field>
+        <field name="model">payslip.report</field>
+        <field name="type">search</field>
+        <field name="arch" type="xml">
+            <search string="Payslip Analysis">
+                 <group>
+                    <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Payslips which are in draft state"/>
+                    <filter icon="terp-check" string="Done" name="done" domain="[('state','=','done')]" help="Payslips which are in done state"/>
+                    <separator orientation="vertical"/>
+                    <filter icon="terp-camera_test" string="Paid" domain="[('paid','=',True)]" help="Payslips which are paid"/>
+                    <separator orientation="vertical"/>
+                    <field name="date_from"/>
+                    <field name="date_to"/>
+                    <separator orientation="vertical"/>
+                    <field name="number"/>
+                    <field name="name"/>
+                    <field name="employee_id"/>
+                </group>
+                <newline/>
+                 <group expand="1" string="Extended Filters...">
+                    <separator orientation="vertical"/>
+                    <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                </group>
+                <newline/>
+                <group expand="1" string="Group By...">
+                    <filter string="Employee" name="employee" icon="terp-personal" context="{'group_by':'employee_id'}" />
+                    <filter string="Structure" context="{'group_by':'struct_id'}" />
+                    <filter string="Category" name="category" context="{'group_by':'category_id'}" />
+                    <filter string="Payslip Line" context="{'group_by':'name'}" />
+                    <separator orientation="vertical"/>
+                    <filter string="Status" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
+                    <separator orientation="vertical"/>
+                    <filter string="Company" icon="terp-go-home" groups="base.group_multi_company" context="{'group_by':'company_id'}"/>
+                    <separator orientation="vertical"/>
+                    <filter string="Day" icon="terp-go-today" context="{'group_by':'day'}" help="Day of Payslip"/>
+                    <filter string="Month" name="order_month" icon="terp-go-month" context="{'group_by':'month'}" help="Month of Payslip"/>
+                    <filter string="Year" icon="terp-go-year" context="{'group_by':'year'}" help="Year of Payslip"/>
+
+                </group>
+            </search>
+        </field>
+    </record>
+
+    <record id="action_payslip_report_all" model="ir.actions.act_window">
+        <field name="name">Payslip Analysis</field>
+        <field name="res_model">payslip.report</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">tree</field>
+        <field name="view_id" ref="view_payslip_tree"/>
+        <field name="context">{'search_default_employee':1,'search_default_category':1,'group_by_no_leaf':uid,'group_by':[]}</field>
+        <field name="help">This report performs analysis on Payslip</field>
+    </record>
+
+    <menuitem action="action_payslip_report_all" id="menu_reporting_payslip" parent="hr.menu_hr_reporting" sequence="5" groups="base.group_hr_manager"/>
+
+</data>
+</openerp>
diff --git a/addons/l10n_in_hr_payroll/report/report_hr_salary_employee_bymonth.py b/addons/l10n_in_hr_payroll/report/report_hr_salary_employee_bymonth.py
new file mode 100644
index 00000000000..54b0daa7749
--- /dev/null
+++ b/addons/l10n_in_hr_payroll/report/report_hr_salary_employee_bymonth.py
@@ -0,0 +1,133 @@
+#-*- coding:utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2011 OpenERP SA (<http://openerp.com>). All Rights Reserved
+#
+#    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 datetime
+import time
+
+from report import report_sxw
+
+class report_hr_salary_employee_bymonth(report_sxw.rml_parse):
+
+    def __init__(self, cr, uid, name, context):
+        super(report_hr_salary_employee_bymonth, self).__init__(cr, uid, name, context=context)
+
+        self.localcontext.update({
+            'time': time,
+            'get_employee': self.get_employee,
+            'get_periods': self.get_periods,
+            'get_months_tol': self.get_months_tol,
+            'get_total': self.get_total,
+        })
+
+        self.context = context
+        self.mnths = []
+        self.mnths_total = []
+        self.total = 0.0
+
+    def get_periods(self, form):
+#       Get start year-month-date and end year-month-date
+        first_year = int(form['start_date'][0:4])
+        last_year = int(form['end_date'][0:4])
+
+        first_month = int(form['start_date'][5:7])
+        last_month = int(form['end_date'][5:7])
+        no_months = (last_year-first_year) * 12 + last_month - first_month + 1
+        current_month = first_month
+        current_year = first_year
+
+#       Get name of the months from integer
+        mnth_name = []
+        for count in range(0, no_months):
+            m = datetime.date(current_year, current_month, 1).strftime('%b')
+            mnth_name.append(m)
+            self.mnths.append(str(current_month) + '-' + str(current_year))
+            if current_month == 12:
+                current_month = 0
+                current_year = last_year
+            current_month = current_month + 1
+        for c in range(0, (12-no_months)):
+            mnth_name.append('None')
+            self.mnths.append('None')
+        return [mnth_name]
+
+    def get_salary(self, form, emp_id, emp_salary, total_mnths):
+        category_id = form.get('category_id', [])
+        category_id = category_id and category_id[0] or False
+        self.cr.execute("select to_char(date_to,'mm-yyyy') as to_date ,sum(pl.total) \
+                             from hr_payslip_line as pl \
+                             left join hr_payslip as p on pl.slip_id = p.id \
+                             left join hr_employee as emp on emp.id = p.employee_id \
+                             left join resource_resource as r on r.id = emp.resource_id  \
+                            where p.state = 'done' and p.employee_id = %s and pl.category_id = %s \
+                            group by r.name, p.date_to,emp.id",(emp_id, category_id,))
+        sal = self.cr.fetchall()
+        salary = dict(sal)
+        total = 0.0
+        cnt = 1
+
+        for month in self.mnths:
+            if month <> 'None':
+                if len(month) != 7:
+                    month = '0' + str(month)
+                if month in salary and salary[month]:
+                    emp_salary.append(salary[month])
+                    total += salary[month]
+                    total_mnths[cnt] = total_mnths[cnt] + salary[month]
+                else:
+                    emp_salary.append(0.00)
+            else:
+                emp_salary.append('')
+                total_mnths[cnt] = ''
+            cnt = cnt + 1
+        return emp_salary, total, total_mnths
+
+    def get_employee(self, form):
+        emp_salary = []
+        salary_list = []
+        total_mnths=['Total', 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]
+        emp_obj = self.pool.get('hr.employee')
+        emp_ids = form.get('employee_ids', [])
+        employees  = emp_obj.browse(self.cr, self.uid, emp_ids, context=self.context)
+
+        for emp_id in employees:
+            emp_salary.append(emp_id.name)
+            total = 0.0
+            emp_salary, total, total_mnths = self.get_salary(form, emp_id.id, emp_salary, total_mnths)
+            emp_salary.append(total)
+            salary_list.append(emp_salary)
+            emp_salary = []
+        self.mnths_total.append(total_mnths)
+        return salary_list
+
+    def get_months_tol(self):
+        return self.mnths_total
+
+    def get_total(self):
+        for item in self.mnths_total:
+            for count in range(1, len(item)):
+              if item[count] == '':
+                  continue
+              self.total += item[count]
+        return self.total
+
+report_sxw.report_sxw('report.salary.employee.bymonth', 'hr.salary.employee.month', 'l10n_in_hr_payroll/report/report_hr_salary_employee_bymonth.rml', parser=report_hr_salary_employee_bymonth, header='internal')
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/l10n_in_hr_payroll/report/report_hr_salary_employee_bymonth.rml b/addons/l10n_in_hr_payroll/report/report_hr_salary_employee_bymonth.rml
new file mode 100644
index 00000000000..8f2a57d2018
--- /dev/null
+++ b/addons/l10n_in_hr_payroll/report/report_hr_salary_employee_bymonth.rml
@@ -0,0 +1,293 @@
+<?xml version="1.0"?>
+<document filename="yearly salary report.pdf">
+  <template pageSize="(620.0,842.0)" title="Yearly Salary Report" author="OpenERP" allowSplitting="50">
+    <pageTemplate id="first">
+      <frame id="first" x1="28.0" y1="28.0"  width="539" height="772"/>
+    </pageTemplate>
+  </template>
+  <stylesheet>
+    <blockTableStyle id="Standard_Outline">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table1">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="2,0" stop="2,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="3,0" stop="3,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="4,0" stop="4,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="4,-1" stop="4,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="5,0" stop="5,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="5,-1" stop="5,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="6,0" stop="6,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="6,-1" stop="6,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="7,0" stop="7,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="7,-1" stop="7,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="8,0" stop="8,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="8,-1" stop="8,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="9,0" stop="9,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="9,-1" stop="9,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="10,0" stop="10,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="10,-1" stop="10,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="11,0" stop="11,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="11,-1" stop="11,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="12,0" stop="12,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="12,-1" stop="12,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="13,0" stop="13,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="13,-1" stop="13,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table2">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="4,-1" stop="4,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="5,-1" stop="5,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="6,-1" stop="6,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="7,-1" stop="7,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="8,-1" stop="8,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="9,-1" stop="9,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="10,-1" stop="10,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="11,-1" stop="11,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="12,-1" stop="12,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="13,-1" stop="13,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table6">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="2,0" stop="2,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="3,0" stop="3,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="4,0" stop="4,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="5,0" stop="5,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="6,0" stop="6,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="7,0" stop="7,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="8,0" stop="8,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="9,0" stop="9,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="10,0" stop="10,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="11,0" stop="11,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="12,0" stop="12,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="13,0" stop="13,0"/>
+    </blockTableStyle>
+    <initialize>
+      <paraStyle name="all" alignment="justify"/>
+    </initialize>
+    <paraStyle name="P1" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P2" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P3" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P4" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P5" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P6" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="Standard" fontName="Helvetica"/>
+    <paraStyle name="Heading" fontName="Helvetica" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="Text body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="List" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Caption" fontName="Helvetica" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="Index" fontName="Helvetica"/>
+    <paraStyle name="terp_header" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_default_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Centre_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Centre_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_header_Centre" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_tblheader_Details" fontName="Helvetica-Bold" fontSize="7.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_tblheader_Details_Right" fontName="Helvetica-Bold" fontSize="7.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_1" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="Table Contents" fontName="Helvetica"/>
+    <paraStyle name="Table Heading" fontName="Helvetica" alignment="CENTER"/>
+    <paraStyle name="terp_default_9" fontName="Helvetica" fontSize="5.0" leading="5" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Right_8" fontName="Helvetica" fontSize="5.0" leading="2" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Right_9" fontName="Helvetica" fontSize="7.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Right_9_Bold" fontName="Helvetica-Bold" fontSize="5.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_tblheader_General" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_tblheader_General_Centre" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_tblheader_General_Right" fontName="Helvetica-Bold" fontSize="5.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <images/>
+  </stylesheet>
+  <story>
+    <para style="P1">Yearly Salary Details </para>
+    <para style="P5">From <u>[[ formatLang(data['form']['start_date'], date=True) ]]</u> To <u>[[ formatLang(data['form']['end_date'], date=True) ]]</u> of <u>[[ (data['form']['category_id'][1]) ]]</u> Category</para>
+    <para style="P6">
+      <font color="white"> </font>
+    </para>
+    <section>
+      <para style="terp_default_1">[[ repeatIn(get_periods(data['form']),'m') ]]</para>
+      <blockTable colWidths="55.0,40.0,40.0,40.0,40.0,40.0,40.0,40.0,40.0,40.0,40.0,40.0,40.0,57.0" style="Table1">
+        <tr>
+          <td>
+            <para style="terp_tblheader_Details">Name</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_Details_Right">[[ m[0] != 'None' and m[0] or '' ]]</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_Details_Right">[[ m[1] != 'None' and m[1] or '' ]]</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_Details_Right">[[ m[2] != 'None' and m[2] or '' ]]</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_Details_Right">[[ m[3] != 'None' and m[3] or '' ]]</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_Details_Right">[[ m[4] != 'None' and m[4] or '' ]]</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_Details_Right">[[ m[5] != 'None' and m[5] or '' ]]</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_Details_Right">[[ m[6] != 'None' and m[6] or '' ]]</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_Details_Right">[[ m[7] != 'None' and m[7] or '' ]]</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_Details_Right">[[ m[8] != 'None' and m[8] or '' ]]</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_Details_Right">[[ m[9] != 'None' and m[9] or '' ]]</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_Details_Right">[[ m[10] != 'None' and m[10] or '' ]]</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_Details_Right">[[ m[11] != 'None' and m[11] or '' ]]</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_Details_Right">Total</para>
+          </td>
+        </tr>
+      </blockTable>
+      <section>
+        <para style="terp_default_1">[[ repeatIn(get_employee(data['form']),'e') ]]</para>
+        <blockTable colWidths="55.0,40.0,40.0,40.0,40.0,40.0,40.0,40.0,40.0,40.0,40.0,40.0,40.0,57.0" style="Table2">
+          <tr>
+            <td>
+              <para style="terp_default_9">[[ e[0] ]]</para>
+            </td>
+            <td>
+              <para style="terp_default_Right_8">
+                <font face="Helvetica" size="5.0">[[ (e[1]!='' and formatLang(e[1])) or removeParentNode('font') ]]</font>
+              </para>
+            </td>
+            <td>
+              <para style="terp_default_Right_8">
+                <font face="Helvetica" size="5.0">[[ (e[2]!='' and formatLang(e[2])) or removeParentNode('font') ]]</font>
+              </para>
+            </td>
+            <td>
+              <para style="terp_default_Right_8">
+                <font face="Helvetica" size="5.0">[[ (e[3]!='' and formatLang(e[3])) or removeParentNode('font') ]]</font>
+              </para>
+            </td>
+            <td>
+              <para style="terp_default_Right_8">
+                <font face="Helvetica" size="5.0">[[ (e[4]!='' and formatLang(e[4])) or removeParentNode('font') ]]</font>
+              </para>
+            </td>
+            <td>
+              <para style="terp_default_Right_8">
+                <font face="Helvetica" size="5.0">[[ (e[5]!='' and formatLang(e[5])) or removeParentNode('font') ]]</font>
+              </para>
+            </td>
+            <td>
+              <para style="terp_default_Right_8">
+                <font face="Helvetica" size="5.0">[[ (e[6]!='' and formatLang(e[6])) or removeParentNode('font') ]]</font>
+              </para>
+            </td>
+            <td>
+              <para style="terp_default_Right_8">
+                <font face="Helvetica" size="5.0">[[ (e[7]!='' and formatLang(e[7])) or removeParentNode('font') ]]</font>
+              </para>
+            </td>
+            <td>
+              <para style="terp_default_Right_8">
+                <font face="Helvetica" size="5.0">[[ (e[8]!='' and formatLang(e[8])) or removeParentNode('font') ]]</font>
+              </para>
+            </td>
+            <td>
+              <para style="terp_default_Right_8">
+                <font face="Helvetica" size="5.0">[[ (e[9]!='' and formatLang(e[9])) or removeParentNode('font') ]]</font>
+              </para>
+            </td>
+            <td>
+              <para style="terp_default_Right_8">
+                <font face="Helvetica" size="5.0">[[ (e[10]!='' and formatLang(e[10])) or removeParentNode('font') ]]</font>
+              </para>
+            </td>
+            <td>
+              <para style="terp_default_Right_8">
+                <font face="Helvetica" size="5.0">[[ (e[11]!='' and formatLang(e[11])) or removeParentNode('font') ]]</font>
+              </para>
+            </td>
+            <td>
+              <para style="terp_default_Right_8">
+                <font face="Helvetica" size="5.0">[[ (e[12]!='' and formatLang(e[12])) or removeParentNode('font') ]]</font>
+              </para>
+            </td>
+            <td>
+              <para style="terp_default_Right_9_Bold">[[ formatLang(e[13]) ]] [[company.currency_id.symbol]]</para>
+            </td>
+          </tr>
+        </blockTable>
+      </section>
+    </section>
+    <section>
+      <para style="terp_default_1">[[ repeatIn(get_months_tol(),'t') ]]</para>
+      <blockTable colWidths="55.0,40.0,40.0,40.0,40.0,40.0,40.0,40.0,40.0,40.0,40.0,40.0,40.0,57.0" style="Table6">
+        <tr>
+          <td>
+            <para style="terp_tblheader_Details">Total</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_General_Right">[[ formatLang(t[1]) or removeParentNode('para') ]] [[company.currency_id.symbol]]</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_General_Right">[[ formatLang(t[2]) or removeParentNode('para')]] [[company.currency_id.symbol]]</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_General_Right">[[ formatLang(t[3]) or removeParentNode('para')]] [[company.currency_id.symbol]]</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_General_Right">[[ formatLang(t[4]) or removeParentNode('para')]] [[company.currency_id.symbol]]</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_General_Right">[[ formatLang(t[5]) or removeParentNode('para')]] [[company.currency_id.symbol]]</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_General_Right">[[ formatLang(t[6]) or removeParentNode('para')]] [[company.currency_id.symbol]]</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_General_Right">[[ formatLang(t[7]) or removeParentNode('para')]] [[company.currency_id.symbol]]</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_General_Right">[[ formatLang(t[8]) or removeParentNode('para')]] [[company.currency_id.symbol]]</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_General_Right">[[ formatLang(t[9]) or removeParentNode('para')]] [[company.currency_id.symbol]]</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_General_Right">[[ formatLang(t[10]) or removeParentNode('para')]] [[company.currency_id.symbol]]</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_General_Right">[[ formatLang(t[11]) or removeParentNode('para')]] [[company.currency_id.symbol]]</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_General_Right">[[ formatLang(t[12]) or removeParentNode('para')]] [[company.currency_id.symbol]]</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_General_Right">[[ formatLang(get_total()) ]] [[company.currency_id.symbol]]</para>
+          </td>
+        </tr>
+      </blockTable>
+    </section>
+  </story>
+</document>
diff --git a/addons/l10n_in_hr_payroll/report/report_hr_yearly_salary_detail.py b/addons/l10n_in_hr_payroll/report/report_hr_yearly_salary_detail.py
new file mode 100644
index 00000000000..576fd302f6f
--- /dev/null
+++ b/addons/l10n_in_hr_payroll/report/report_hr_yearly_salary_detail.py
@@ -0,0 +1,164 @@
+#-*- coding:utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2011 OpenERP SA (<http://openerp.com>). All Rights Reserved
+#
+#    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 time
+import datetime
+from report import report_sxw
+
+class employees_yearly_salary_report(report_sxw.rml_parse):
+
+    def __init__(self, cr, uid, name, context):
+        super(employees_yearly_salary_report, self).__init__(cr, uid, name, context)
+
+        self.localcontext.update({
+            'time': time,
+            'get_employee': self.get_employee,
+            'get_employee_detail': self.get_employee_detail,
+            'cal_monthly_amt': self.cal_monthly_amt,
+            'get_periods': self.get_periods,
+            'get_total': self.get_total,
+            'get_allow': self.get_allow,
+            'get_deduct': self.get_deduct,
+        })
+
+        self.context = context
+
+    def get_periods(self, form):
+        self.mnths = []
+#       Get start year-month-date and end year-month-date
+        first_year = int(form['date_from'][0:4])
+        last_year = int(form['date_to'][0:4])
+
+        first_month = int(form['date_from'][5:7])
+        last_month = int(form['date_to'][5:7])
+        no_months = (last_year-first_year) * 12 + last_month - first_month + 1
+        current_month = first_month
+        current_year = first_year
+
+#       Get name of the months from integer
+        mnth_name = []
+        for count in range(0, no_months):
+            m = datetime.date(current_year, current_month, 1).strftime('%b')
+            mnth_name.append(m)
+            self.mnths.append(str(current_month) + '-' + str(current_year))
+            if current_month == 12:
+                current_month = 0
+                current_year = last_year
+            current_month = current_month + 1
+        for c in range(0, (12-no_months)):
+            mnth_name.append('None')
+            self.mnths.append('None')
+        return [mnth_name]
+
+    def get_employee(self, form):
+        return self.pool.get('hr.employee').browse(self.cr,self.uid, form.get('employee_ids', []), context=self.context)
+
+    def get_employee_detail(self, form, obj):
+        self.allow_list = []
+        self.deduct_list = []
+        self.total = 0.00
+        gross = False
+        net = False
+
+        payslip_lines = self.cal_monthly_amt(form, obj.id)
+        for line in payslip_lines:
+            for line[0] in line:
+                if line[0][0]  == "Gross":
+                    gross = line[0]
+                elif line[0][0]  == "Net":
+                    net = line[0]
+                elif line[0][13] > 0.0 and line[0][0] != "Net":
+                    self.total += line[0][len(line[0])-1]
+                    self.allow_list.append(line[0])
+                elif line[0][13] < 0.0:
+                    self.total += line[0][len(line[0])-1]
+                    self.deduct_list.append(line[0])
+        if gross:
+            self.allow_list.append(gross)
+        if net:
+            self.deduct_list.append(net)
+        return None
+
+    def cal_monthly_amt(self, form, emp_id):
+        category_obj = self.pool.get('hr.salary.rule.category')
+        result = []
+        res = []
+        salaries = {}
+        self.cr.execute('''SELECT rc.code, pl.name, sum(pl.total), \
+                to_char(date_to,'mm-yyyy') as to_date  FROM hr_payslip_line as pl \
+                LEFT JOIN hr_salary_rule_category AS rc on (pl.category_id = rc.id) \
+                LEFT JOIN hr_payslip as p on pl.slip_id = p.id \
+                LEFT JOIN hr_employee as emp on emp.id = p.employee_id \
+                WHERE p.employee_id = %s \
+                GROUP BY rc.parent_id, pl.sequence, pl.id, pl.category_id,pl.name,p.date_to,rc.code \
+                ORDER BY pl.sequence, rc.parent_id''',(emp_id,))
+        salary = self.cr.fetchall()
+        for category in salary:
+            if category[0] not in salaries:
+                salaries.setdefault(category[0], {})
+                salaries[category[0]].update({category[1]: {category[3]: category[2]}})
+            elif category[1] not in salaries[category[0]]:
+                salaries[category[0]].setdefault(category[1], {})
+                salaries[category[0]][category[1]].update({category[3]: category[2]})
+            else:
+                salaries[category[0]][category[1]].update({category[3]: category[2]})
+        
+        category_ids = category_obj.search(self.cr,self.uid, [], context=self.context)
+        categories = category_obj.read(self.cr, self.uid, category_ids, ['code'], context=self.context)
+        for code in map(lambda x: x['code'], categories):
+            if code in salaries:
+                res = self.salary_list(salaries[code])
+            result.append(res)
+        return result
+
+    def salary_list(self, salaries):
+        cat_salary_all = []
+        for category_name,amount in salaries.items():
+            cat_salary = []
+            total = 0.0
+            cat_salary.append(category_name)
+            for mnth in self.mnths:
+                if mnth <> 'None':
+                    if len(mnth) != 7:
+                        mnth = '0' + str(mnth)
+                    if mnth in amount and amount[mnth]:
+                        cat_salary.append(amount[mnth])
+                        total += amount[mnth]
+                    else:
+                        cat_salary.append(0.00)
+                else:
+                    cat_salary.append('')
+            cat_salary.append(total)
+            cat_salary_all.append(cat_salary)
+        return cat_salary_all
+
+    def get_allow(self):
+        return self.allow_list
+
+    def get_deduct(self):
+        return self.deduct_list
+
+    def get_total(self):
+        return self.total
+
+report_sxw.report_sxw('report.salary.detail.byyear', 'yearly.salary.detail', 'hr_payroll/report/report_hr_yearly_salary_detail.rml', parser=employees_yearly_salary_report, header='internal landscape')
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/l10n_in_hr_payroll/report/report_hr_yearly_salary_detail.rml b/addons/l10n_in_hr_payroll/report/report_hr_yearly_salary_detail.rml
new file mode 100644
index 00000000000..7fa127b0bd3
--- /dev/null
+++ b/addons/l10n_in_hr_payroll/report/report_hr_yearly_salary_detail.rml
@@ -0,0 +1,588 @@
+<?xml version="1.0"?>
+<document filename="hr_yearly_salary_detail_report.pdf">
+  <template pageSize="(842.0,595.0)" title="hr_yearly_salary_detail_report" author="Openerp S.A." allowSplitting="20">
+    <pageTemplate id="first">
+      <frame id="first" x1="28.0" y1="57.0" width="786" height="481"/>
+    </pageTemplate>
+  </template>
+  <stylesheet>
+    <blockTableStyle id="Standard_Outline">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table12">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table2">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="0,0" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="1,0" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="2,0" stop="2,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="2,0" stop="2,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="3,0" stop="3,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="3,0" stop="3,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="4,0" stop="4,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="4,0" stop="4,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="4,-1" stop="4,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="5,0" stop="5,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#cccccc" start="5,0" stop="5,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="5,0" stop="5,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="5,-1" stop="5,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table3">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="0,0" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="1,0" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="2,0" stop="2,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="2,0" stop="2,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="3,0" stop="3,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="3,0" stop="3,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="4,0" stop="4,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="4,0" stop="4,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="4,-1" stop="4,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="5,0" stop="5,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#cccccc" start="5,0" stop="5,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="5,0" stop="5,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="5,-1" stop="5,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table5">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="0,0" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="1,0" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="2,0" stop="2,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="2,0" stop="2,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="3,0" stop="3,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="3,0" stop="3,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="4,0" stop="4,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="4,0" stop="4,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="4,-1" stop="4,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="5,0" stop="5,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#cccccc" start="5,0" stop="5,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="5,0" stop="5,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="5,-1" stop="5,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table4">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="2,0" stop="2,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="3,0" stop="3,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="4,0" stop="4,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="4,-1" stop="4,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="5,0" stop="5,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="5,-1" stop="5,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="6,0" stop="6,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="6,-1" stop="6,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="7,0" stop="7,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="7,-1" stop="7,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="8,0" stop="8,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="8,-1" stop="8,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="9,0" stop="9,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="9,-1" stop="9,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="10,0" stop="10,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="10,-1" stop="10,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="11,0" stop="11,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="11,-1" stop="11,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="12,0" stop="12,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="12,-1" stop="12,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="13,0" stop="13,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="13,-1" stop="13,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table7">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table6">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="4,-1" stop="4,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="5,-1" stop="5,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="6,-1" stop="6,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="7,-1" stop="7,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="8,-1" stop="8,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="9,-1" stop="9,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="10,-1" stop="10,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="11,-1" stop="11,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="12,-1" stop="12,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="13,-1" stop="13,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table10">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table8">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="4,-1" stop="4,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="5,-1" stop="5,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="6,-1" stop="6,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="7,-1" stop="7,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="8,-1" stop="8,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="9,-1" stop="9,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="10,-1" stop="10,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="11,-1" stop="11,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="12,-1" stop="12,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="13,-1" stop="13,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table11">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table9">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="4,-1" stop="4,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="5,-1" stop="5,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="6,-1" stop="6,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="7,-1" stop="7,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="8,-1" stop="8,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="9,-1" stop="9,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="10,-1" stop="10,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="11,-1" stop="11,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="12,-1" stop="12,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="13,-1" stop="13,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table1">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="2,0" stop="2,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="3,0" stop="3,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="4,0" stop="4,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="5,0" stop="5,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="6,0" stop="6,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="7,0" stop="7,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="8,0" stop="8,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="9,0" stop="9,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="10,0" stop="10,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="11,0" stop="11,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="12,0" stop="12,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="13,0" stop="13,0"/>
+    </blockTableStyle>
+    <initialize>
+      <paraStyle name="all" alignment="justify"/>
+    </initialize>
+    <paraStyle name="Standard" fontName="Helvetica"/>
+    <paraStyle name="Heading" fontName="Helvetica" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="Text body" fontName="Helvetica" fontSize="10.0" leading="13" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="List" fontName="Helvetica" fontSize="10.0" leading="13" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Caption" fontName="Helvetica" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="Index" fontName="Helvetica"/>
+    <paraStyle name="Table Contents" fontName="Helvetica"/>
+    <paraStyle name="Table Heading" fontName="Helvetica" alignment="CENTER"/>
+    <paraStyle name="Drawing" fontName="Helvetica" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="Header" fontName="Helvetica"/>
+    <paraStyle name="Endnote" rightIndent="0.0" leftIndent="14.0" fontName="Helvetica" fontSize="10.0" leading="13"/>
+    <paraStyle name="Addressee" fontName="Helvetica" spaceBefore="0.0" spaceAfter="3.0"/>
+    <paraStyle name="Signature" fontName="Helvetica"/>
+    <paraStyle name="Heading 9" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="Heading 8" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="Heading 7" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="Heading 6" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="Heading 5" fontName="Helvetica-Bold" fontSize="85%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="Heading 4" fontName="Helvetica-BoldOblique" fontSize="85%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="Heading 1" fontName="Helvetica-Bold" fontSize="115%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="Heading 10" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="Heading 2" fontName="Helvetica-BoldOblique" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="First line indent" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="10.0" leading="13" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Hanging indent" rightIndent="0.0" leftIndent="28.0" fontName="Helvetica" fontSize="10.0" leading="13" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Salutation" fontName="Helvetica"/>
+    <paraStyle name="Text body indent" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="10.0" leading="13" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Heading 3" fontName="Helvetica-Bold" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="List Indent" rightIndent="0.0" leftIndent="142.0" fontName="Helvetica" fontSize="10.0" leading="13" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Marginalia" rightIndent="0.0" leftIndent="113.0" fontName="Helvetica" fontSize="10.0" leading="13" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_header" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_default_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Bold_8" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Bold_9" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_tblheader_General" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_tblheader_General_Centre" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_default_Centre_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_tblheader_Details" rightIndent="0.0" leftIndent="-3.0" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="Footer" fontName="Helvetica"/>
+    <paraStyle name="Horizontal Line" fontName="Helvetica" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="14.0"/>
+    <paraStyle name="terp_tblheader_General_Right" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_tblheader_Details_Centre" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_tblheader_Details_Right" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Right_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_header_Right" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_default_address" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Centre_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Right_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_1" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Right_9_Bold" fontName="Helvetica-Bold" fontSize="7.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_8_Italic" fontName="Helvetica-Oblique" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_space" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="9.0" spaceAfter="0.0"/>
+    <images/>
+  </stylesheet>
+  <story>
+    <para style="terp_default_8">[[ repeatIn(get_employee(data['form']), 'o') ]] </para>
+    <blockTable colWidths="785.0" style="Table12">
+      <tr>
+        <td>
+          <para style="terp_default_Centre_9">From <u>[[ formatLang(data['form']['date_from'], date=True) ]]</u> To <u>[[ formatLang(data['form']['date_to'], date=True) ]]</u></para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="terp_default_Centre_9">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="100.0,162.0,92.0,161.0,103.0,167.0" style="Table2">
+      <tr>
+        <td>
+          <para style="terp_tblheader_Details">Employee Code</para>
+        </td>
+        <td>
+          <para style="terp_default_9">[[ o.identification_id ]]</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details">Department</para>
+        </td>
+        <td>
+          <para style="terp_default_9">[[ o.department_id and o.department_id.name or '' ]]</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details">Bank</para>
+        </td>
+        <td>
+          <para style="terp_default_9">[[ o.bank_account_id and o.bank_account_id.bank.name or '' ]]</para>
+        </td>
+      </tr>
+    </blockTable>
+    <blockTable colWidths="100.0,162.0,92.0,161.0,103.0,167.0" style="Table3">
+      <tr>
+        <td>
+          <para style="terp_tblheader_Details">Employee Name</para>
+        </td>
+        <td>
+          <para style="terp_default_9">[[ o.name ]]</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details">Other No.</para>
+        </td>
+        <td>
+          <para style="terp_default_9">[[ o.otherid or '' ]]</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details">Address</para>
+        </td>
+        <td>
+          <para style="terp_default_9">[[o.address_home_id and o.address_home_id.name or '' ]]</para>
+        </td>
+      </tr>
+    </blockTable>
+    <blockTable colWidths="100.0,162.0,92.0,161.0,103.0,167.0" style="Table5">
+      <tr>
+        <td>
+          <para style="terp_tblheader_Details">Designation</para>
+        </td>
+        <td>
+          <para style="terp_default_9">[[ o.job_id and o.job_id.name or '' ]]</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details">Phone No.</para>
+        </td>
+        <td>
+          <para style="terp_default_9">[[ o.work_phone or '' ]]</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details">E-mail Address</para>
+        </td>
+        <td>
+          <para style="terp_default_9">[[o.work_email or '' ]]</para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="terp_default_space">
+      <font color="white"> </font>
+    </para>
+    <section>
+    <para style="terp_default_1">[[ repeatIn(get_periods(data['form']),'m') ]]</para>
+      <para style="terp_default_1">[[ get_employee_detail((data['form']),o) ]]</para>
+      <blockTable colWidths="195.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,56.0" style="Table4">
+        <tr>
+          <td>
+            <para style="terp_tblheader_Details">Title</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_Details_Right">[[ m[0] != 'None' and m[0] or '' ]]</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_Details_Right">[[ m[1] != 'None' and m[1] or '' ]]</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_Details_Right">[[ m[2] != 'None' and m[2] or '' ]]</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_Details_Right">[[ m[3] != 'None' and m[3] or '' ]]</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_Details_Right">[[ m[4] != 'None' and m[4] or '' ]]</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_Details_Right">[[ m[5] != 'None' and m[5] or '' ]]</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_Details_Right">[[ m[6] != 'None' and m[6] or '' ]]</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_Details_Right">[[ m[7] != 'None' and m[7] or '' ]]</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_Details_Right">[[ m[8] != 'None' and m[8] or '' ]]</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_Details_Right">[[ m[9] != 'None' and m[9] or '' ]]</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_Details_Right">[[ m[10] != 'None' and m[10] or '' ]]</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_Details_Right">[[ m[11] != 'None' and m[11] or '' ]]</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_Details_Right">Total</para>
+          </td>
+        </tr>
+      </blockTable>
+      <para style="terp_default_1">
+        <font color="white"> </font>
+      </para>
+      <section>
+        <blockTable colWidths="803.0" style="Table7">
+          <tr>
+            <td>
+              <para style="terp_tblheader_Details">Allowances with Basic: </para>
+            </td>
+          </tr>
+        </blockTable>
+        <section>
+          <para style="terp_default_1">[[ repeatIn(get_allow(),'e1') ]]</para>
+          <blockTable colWidths="195.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,56.0" style="Table6">
+            <tr>
+              <td>
+                <para style="terp_default_9"><b>[[ e1[0] in ["Basic","Gross"] and e1[0] ]]</b> </para>
+                <para style="terp_default_9">[[ e1[0] not in ["Basic","Gross"] and e1[0] ]]</para>
+              </td>
+              <td>
+                <para style="terp_default_Right_8">
+                  <font face="Helvetica-Bold" size="7.0">[[ (e1[0] in ["Basic","Gross"] and e1[1]!='' and formatLang(e1[1])) or removeParentNode('font') ]]</font>
+                  <font face="Helvetica" size="7.0">[[ (e1[0] not in ["Basic","Gross"] and e1[1]!='' and formatLang(e1[1])) or removeParentNode('font') ]]</font>
+                </para>
+              </td>
+              <td>
+                <para style="terp_default_Right_8">
+                  <font face="Helvetica-Bold" size="7.0">[[ (e1[0] in ["Basic","Gross"] and e1[2]!='' and formatLang(e1[2])) or removeParentNode('font') ]]</font>
+                  <font face="Helvetica" size="7.0">[[ (e1[0] not in ["Basic","Gross"] and e1[2]!='' and formatLang(e1[2])) or removeParentNode('font') ]]</font>
+                </para>
+              </td>
+              <td>
+                <para style="terp_default_Right_8">
+                  <font face="Helvetica-Bold" size="7.0">[[ (e1[0] in ["Basic","Gross"] and e1[3]!='' and formatLang(e1[3])) or removeParentNode('font') ]]</font>
+                  <font face="Helvetica" size="7.0">[[ (e1[0] not in ["Basic","Gross"] and e1[3]!='' and formatLang(e1[3])) or removeParentNode('font') ]]</font>
+                </para>
+              </td>
+              <td>
+                <para style="terp_default_Right_8">
+                  <font face="Helvetica-Bold" size="7.0">[[ (e1[0] in ["Basic","Gross"] and e1[4]!='' and formatLang(e1[4])) or removeParentNode('font') ]]</font>
+                  <font face="Helvetica" size="7.0">[[ (e1[0] not in ["Basic","Gross"] and e1[4]!='' and formatLang(e1[4])) or removeParentNode('font') ]]</font>
+                </para>
+              </td>
+              <td>
+                <para style="terp_default_Right_8">
+                  <font face="Helvetica-Bold" size="7.0">[[ (e1[0] in ["Basic","Gross"] and e1[5]!='' and formatLang(e1[5])) or removeParentNode('font') ]]</font>
+                  <font face="Helvetica" size="7.0">[[ (e1[0] not in ["Basic","Gross"] and e1[5]!='' and formatLang(e1[5])) or removeParentNode('font') ]]</font>
+                </para>
+              </td>
+              <td>
+                <para style="terp_default_Right_8">
+                  <font face="Helvetica-Bold" size="7.0">[[ (e1[0] in ["Basic","Gross"] and e1[6]!='' and formatLang(e1[6])) or removeParentNode('font') ]]</font>
+                  <font face="Helvetica" size="7.0">[[ (e1[0] not in ["Basic","Gross"] and e1[6]!='' and formatLang(e1[6])) or removeParentNode('font') ]]</font>
+                </para>
+              </td>
+              <td>
+                <para style="terp_default_Right_8">
+                  <font face="Helvetica-Bold" size="7.0">[[ (e1[0] in ["Basic","Gross"] and e1[7]!='' and formatLang(e1[7])) or removeParentNode('font') ]]</font>
+                  <font face="Helvetica" size="7.0">[[ (e1[0] not in ["Basic","Gross"] and e1[7]!='' and formatLang(e1[7])) or removeParentNode('font') ]]</font>
+                </para>
+              </td>
+              <td>
+                <para style="terp_default_Right_8">
+                  <font face="Helvetica-Bold" size="7.0">[[ (e1[0] in ["Basic","Gross"] and e1[8]!='' and formatLang(e1[8])) or removeParentNode('font') ]]</font>
+                  <font face="Helvetica" size="7.0">[[ (e1[0] not in ["Basic","Gross"] and e1[8]!='' and formatLang(e1[8])) or removeParentNode('font') ]]</font>
+                </para>
+              </td>
+              <td>
+                <para style="terp_default_Right_8">
+                  <font face="Helvetica-Bold" size="7.0">[[ (e1[0] in ["Basic","Gross"] and e1[9]!='' and formatLang(e1[9])) or removeParentNode('font') ]]</font>
+                  <font face="Helvetica" size="7.0">[[ (e1[0] not in ["Basic","Gross"] and e1[9]!='' and formatLang(e1[9])) or removeParentNode('font') ]]</font>
+                </para>
+              </td>
+              <td>
+                <para style="terp_default_Right_8">
+                  <font face="Helvetica-Bold" size="7.0">[[ (e1[0] in ["Basic","Gross"] and e1[10]!='' and formatLang(e1[10])) or removeParentNode('font') ]]</font>
+                  <font face="Helvetica" size="7.0">[[ (e1[0] not in ["Basic","Gross"] and e1[10]!='' and formatLang(e1[10])) or removeParentNode('font') ]]</font>
+                </para>
+              </td>
+              <td>
+                <para style="terp_default_Right_8">
+                  <font face="Helvetica-Bold" size="7.0">[[ (e1[0] in ["Basic","Gross"] and e1[11]!='' and formatLang(e1[11])) or removeParentNode('font') ]]</font>
+                  <font face="Helvetica" size="7.0">[[ (e1[0] not in ["Basic","Gross"] and e1[11]!='' and formatLang(e1[11])) or removeParentNode('font') ]]</font>
+                </para>
+              </td>
+              <td>
+                <para style="terp_default_Right_8">
+                  <font face="Helvetica-Bold" size="7.0">[[ (e1[0] in ["Basic","Gross"] and e1[12]!='' and formatLang(e1[12])) or removeParentNode('font') ]]</font>
+                  <font face="Helvetica" size="7.0">[[ (e1[0] not in ["Basic","Gross"] and e1[12]!='' and formatLang(e1[12])) or removeParentNode('font') ]]</font>
+                </para>
+              </td>
+              <td>
+                <para style="terp_default_Right_9_Bold">[[ formatLang(e1[13]) ]] [[ company.currency_id.symbol ]]</para>
+              </td>
+            </tr>
+          </blockTable>
+        </section>
+        <blockTable colWidths="803.0" style="Table10">
+          <tr>
+            <td>
+              <para style="terp_tblheader_Details">Deductions: </para>
+            </td>
+          </tr>
+        </blockTable>
+        <section>
+          <para style="terp_default_1">[[ repeatIn(get_deduct(),'e2') ]]</para>
+          <blockTable colWidths="195.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,56.0" style="Table8">
+            <tr>
+              <td>
+                <para style="terp_default_9"><b>[[ e2[0] in ["Net"] and e2[0] ]]</b> </para>
+                <para style="terp_default_9">[[ e2[0] not in ["Net"] and e2[0] ]]</para>
+              </td>
+              <td>
+                <para style="terp_default_Right_8">
+                  <font face="Helvetica-Bold" size="7.0">[[ (e2[0] in ["Net"] and e2[1]!='' and formatLang(e2[1])) or removeParentNode('font') ]]</font>
+                  <font face="Helvetica" size="7.0">[[ (e2[0] not in ["Net"] and e2[1]!='' and formatLang(e2[1])) or removeParentNode('font') ]]</font>
+                </para>
+              </td>
+              <td>
+                <para style="terp_default_Right_8">
+                  <font face="Helvetica-Bold" size="7.0">[[ (e2[0] in ["Net"] and e2[2]!='' and formatLang(e2[2])) or removeParentNode('font') ]]</font>
+                  <font face="Helvetica" size="7.0">[[ (e2[0] not in ["Net"] and e2[2]!='' and formatLang(e2[2])) or removeParentNode('font') ]]</font>
+                </para>
+              </td>
+              <td>
+                <para style="terp_default_Right_8">
+                  <font face="Helvetica-Bold" size="7.0">[[ (e2[0] in ["Net"] and e2[3]!='' and formatLang(e2[3])) or removeParentNode('font') ]]</font>
+                  <font face="Helvetica" size="7.0">[[ (e2[0] not in ["Net"] and e2[3]!='' and formatLang(e2[3])) or removeParentNode('font') ]]</font>
+                </para>
+              </td>
+              <td>
+                <para style="terp_default_Right_8">
+                  <font face="Helvetica-Bold" size="7.0">[[ (e2[0] in ["Net"] and e2[4]!='' and formatLang(e2[4])) or removeParentNode('font') ]]</font>
+                  <font face="Helvetica" size="7.0">[[ (e2[0] not in ["Net"] and e2[4]!='' and formatLang(e2[4])) or removeParentNode('font') ]]</font>
+                </para>
+              </td>
+              <td>
+                <para style="terp_default_Right_8">
+                  <font face="Helvetica-Bold" size="7.0">[[ (e2[0] in ["Net"] and e2[5]!='' and formatLang(e2[5])) or removeParentNode('font') ]]</font>
+                  <font face="Helvetica" size="7.0">[[ (e2[0] not in ["Net"] and e2[5]!='' and formatLang(e2[5])) or removeParentNode('font') ]]</font>
+                </para>
+              </td>
+              <td>
+                <para style="terp_default_Right_8">
+                  <font face="Helvetica-Bold" size="7.0">[[ (e2[0] in ["Net"] and e2[6]!='' and formatLang(e2[6])) or removeParentNode('font') ]]</font>
+                  <font face="Helvetica" size="7.0">[[ (e2[0] not in ["Net"] and e2[6]!='' and formatLang(e2[6])) or removeParentNode('font') ]]</font>
+                </para>
+              </td>
+              <td>
+                <para style="terp_default_Right_8">
+                  <font face="Helvetica-Bold" size="7.0">[[ (e2[0] in ["Net"] and e2[7]!='' and formatLang(e2[7])) or removeParentNode('font') ]]</font>
+                  <font face="Helvetica" size="7.0">[[ (e2[0] not in ["Net"] and e2[7]!='' and formatLang(e2[7])) or removeParentNode('font') ]]</font>
+                </para>
+              </td>
+              <td>
+                <para style="terp_default_Right_8">
+                  <font face="Helvetica-Bold" size="7.0">[[ (e2[0] in ["Net"] and e2[8]!='' and formatLang(e2[8])) or removeParentNode('font') ]]</font>
+                  <font face="Helvetica" size="7.0">[[ (e2[0] not in ["Net"] and e2[8]!='' and formatLang(e2[8])) or removeParentNode('font') ]]</font>
+                </para>
+              </td>
+              <td>
+                <para style="terp_default_Right_8">
+                  <font face="Helvetica-Bold" size="7.0">[[ (e2[0] in ["Net"] and e2[9]!='' and formatLang(e2[9])) or removeParentNode('font') ]]</font>
+                  <font face="Helvetica" size="7.0">[[ (e2[0] not in ["Net"] and e2[9]!='' and formatLang(e2[9])) or removeParentNode('font') ]]</font>
+                </para>
+              </td>
+              <td>
+                <para style="terp_default_Right_8">
+                  <font face="Helvetica-Bold" size="7.0">[[ (e2[0] in ["Net"] and e2[10]!='' and formatLang(e2[10])) or removeParentNode('font') ]]</font>
+                  <font face="Helvetica" size="7.0">[[ (e2[0] not in ["Net"] and e2[10]!='' and formatLang(e2[10])) or removeParentNode('font') ]]</font>
+                </para>
+              </td>
+              <td>
+                <para style="terp_default_Right_8">
+                  <font face="Helvetica-Bold" size="7.0">[[ (e2[0] in ["Net"] and e2[11]!='' and formatLang(e2[11])) or removeParentNode('font') ]]</font>
+                  <font face="Helvetica" size="7.0">[[ (e2[0] not in ["Net"] and e2[11]!='' and formatLang(e2[11])) or removeParentNode('font') ]]</font>
+                </para>
+              </td>
+              <td>
+                <para style="terp_default_Right_8">
+                  <font face="Helvetica-Bold" size="7.0">[[ (e2[0] in ["Net"] and e2[12]!='' and formatLang(e2[12])) or removeParentNode('font') ]]</font>
+                  <font face="Helvetica" size="7.0">[[ (e2[0] not in ["Net"] and e2[12]!='' and formatLang(e2[12])) or removeParentNode('font') ]]</font>
+                </para>
+              </td>
+              <td>
+                <para style="terp_default_Right_9_Bold">[[ formatLang(e2[13]) ]] [[ company.currency_id.symbol ]]</para>
+              </td>
+            </tr>
+          </blockTable>
+        </section>
+      </section>
+      <para style="terp_default_1">
+        <font color="white"> </font>
+      </para>
+    </section>
+    <para style="terp_default_9">
+      <font color="white"> </font>
+    </para>
+  </story>
+</document>
diff --git a/addons/l10n_in_hr_payroll/report/report_payroll_advice.py b/addons/l10n_in_hr_payroll/report/report_payroll_advice.py
new file mode 100644
index 00000000000..d4eeaf3d218
--- /dev/null
+++ b/addons/l10n_in_hr_payroll/report/report_payroll_advice.py
@@ -0,0 +1,82 @@
+#-*- coding:utf-8 -*-
+
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2011 OpenERP SA (<http://openerp.com>). All Rights Reserved
+#    d$
+#
+#    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 time
+from datetime import datetime
+
+from report import report_sxw
+from tools import amount_to_text_en
+
+class payroll_advice_report(report_sxw.rml_parse):
+    
+    def __init__(self, cr, uid, name, context):
+        super(payroll_advice_report, self).__init__(cr, uid, name, context=context)
+
+        self.localcontext.update({
+            'time': time,
+            'get_month': self.get_month,
+            'convert': self.convert,
+            'get_detail': self.get_detail,
+            'get_bysal_total': self.get_bysal_total,
+        })
+        self.context = context
+        
+    def get_month(self, input_date):
+        payslip_pool = self.pool.get('hr.payslip')
+        res = {
+               'from_name': '', 'to_name': ''
+               }
+        slip_ids = payslip_pool.search(self.cr, self.uid, [('date_from','<=',input_date), ('date_to','>=',input_date)], context=self.context)
+        if slip_ids:
+            slip = payslip_pool.browse(self.cr, self.uid, slip_ids, context=self.context)[0]
+            from_date = datetime.strptime(slip.date_from, '%Y-%m-%d')
+            to_date =  datetime.strptime(slip.date_to, '%Y-%m-%d')
+            res['from_name']= from_date.strftime('%d')+'-'+from_date.strftime('%B')+'-'+from_date.strftime('%Y')
+            res['to_name']= to_date.strftime('%d')+'-'+to_date.strftime('%B')+'-'+to_date.strftime('%Y')
+        return res
+
+    def convert(self, amount, cur):
+        return amount_to_text_en.amount_to_text(amount, 'en', cur);
+
+    def get_bysal_total(self):
+        return self.total_bysal
+        
+    def get_detail(self, line_ids):
+        result = []
+        self.total_bysal = 0.00
+        for l in line_ids:
+            res = {}
+            res.update({
+                    'name': l.employee_id.name,
+                    'acc_no': l.name,
+                    'ifsc_code': l.ifsc_code,
+                    'bysal': l.bysal,
+                    'debit_credit': l.debit_credit,
+                    })
+            self.total_bysal += l.bysal
+            result.append(res) 
+        return result
+
+report_sxw.report_sxw('report.payroll.advice', 'hr.payroll.advice', 'l10n_in_hr_payroll/report/report_payroll_advice.rml', parser=payroll_advice_report, header="external")
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/l10n_in_hr_payroll/report/report_payroll_advice.rml b/addons/l10n_in_hr_payroll/report/report_payroll_advice.rml
new file mode 100644
index 00000000000..8ca1bae5ba5
--- /dev/null
+++ b/addons/l10n_in_hr_payroll/report/report_payroll_advice.rml
@@ -0,0 +1,425 @@
+<?xml version="1.0"?>
+<document filename="test.pdf">
+  <template pageSize="(595.0,842.0)" title="Test" author="Martin Simon" allowSplitting="20">
+    <pageTemplate id="first">
+      <frame id="first" x1="28.0" y1="28.0" width="539" height="786"/>
+    </pageTemplate>
+  </template>
+  <stylesheet>
+    <blockTableStyle id="Standard_Outline">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table1">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table2">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table3">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table4">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="2,0" stop="2,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="3,0" stop="3,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="4,0" stop="4,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="4,-1" stop="4,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="5,0" stop="5,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="5,-1" stop="5,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table5">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="2,0" stop="2,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="3,0" stop="3,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="4,0" stop="4,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="4,-1" stop="4,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="5,0" stop="5,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="5,-1" stop="5,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table6">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="2,0" stop="2,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="3,0" stop="3,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="4,0" stop="4,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="4,-1" stop="4,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table7">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <initialize>
+      <paraStyle name="all" alignment="justify"/>
+    </initialize>
+    <paraStyle name="P1" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="JUSTIFY" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P2" fontName="Helvetica-Bold" fontSize="6.0" leading="8" alignment="JUSTIFY" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P3" rightIndent="-0.0" leftIndent="0.0" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="JUSTIFY" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P4" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="JUSTIFY" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P5" fontName="Helvetica" fontSize="8.0" leading="10" alignment="JUSTIFY" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P6" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P7" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="JUSTIFY" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P9" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P10" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P11" fontName="Helvetica" alignment="LEFT"/>
+    <paraStyle name="P12" fontName="Helvetica" fontSize="8.0" leading="10" alignment="JUSTIFY" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P13" rightIndent="-0.0" leftIndent="0.0" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="JUSTIFY" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="Standard" fontName="Helvetica"/>
+    <paraStyle name="Heading" fontName="Helvetica" fontSize="12.0" leading="15" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="Text body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="List" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Caption" fontName="Helvetica-Oblique" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="Index" fontName="Helvetica"/>
+    <paraStyle name="Table Contents" fontName="Helvetica"/>
+    <paraStyle name="Table Heading" fontName="Helvetica" alignment="CENTER"/>
+    <paraStyle name="terp_header" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_default_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Bold_8" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Bold_9" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_9" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_tblheader_General" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_tblheader_General_Centre" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Centre_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_tblheader_Details" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="Footer" fontName="Helvetica"/>
+    <paraStyle name="Horizontal Line" fontName="Helvetica" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="14.0"/>
+    <paraStyle name="Heading 9" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_tblheader_General_Right" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_tblheader_Details_Centre" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_tblheader_Details_Right" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Right_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_header_Right" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_header_Centre" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="CENTER" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_default_0.30cmspace" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="9.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Centre_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Right_9" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_1" fontName="Helvetica" fontSize="4.0" leading="5" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Right_9_Bold" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_8_space" fontName="Helvetica-Oblique" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="1.0"/>
+    <paraStyle name="Drawing" fontName="Helvetica-Oblique" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="Header" fontName="Helvetica"/>
+    <paraStyle name="Endnote" rightIndent="0.0" leftIndent="14.0" fontName="Helvetica" fontSize="10.0" leading="13" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="Addressee" fontName="Helvetica" spaceBefore="0.0" spaceAfter="3.0"/>
+    <paraStyle name="Signature" fontName="Helvetica"/>
+    <paraStyle name="Heading 8" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="Heading 7" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="Heading 6" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="Heading 5" fontName="Helvetica-Bold" fontSize="85%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="Heading 4" fontName="Helvetica-BoldOblique" fontSize="85%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="Heading 1" fontName="Helvetica-Bold" fontSize="115%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="Heading 10" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="Heading 2" fontName="Helvetica-BoldOblique" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="First line indent" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="Hanging indent" rightIndent="0.0" leftIndent="28.0" fontName="Helvetica" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="Salutation" fontName="Helvetica"/>
+    <paraStyle name="Text body indent" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="Heading 3" fontName="Helvetica-Bold" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="List Indent" rightIndent="0.0" leftIndent="142.0" fontName="Helvetica" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="Marginalia" rightIndent="0.0" leftIndent="113.0" fontName="Helvetica" spaceBefore="0.0" spaceAfter="0.0"/>
+    <images/>
+  </stylesheet>
+  <story>
+    <para style="terp_default_8">[[repeatIn(objects,'o')]]</para>
+    <blockTable colWidths="234.0,305.0" style="Table1">
+      <tr>
+        <td>
+          <para style="P7">[[ formatLang(time.strftime('%Y-%m-%d'),date=True) ]]</para>
+          <para style="P9"/>
+          <para style="terp_default_9">
+            <font color="white"> </font>
+          </para>
+        </td>
+        <td>
+          <para style="P6">
+            <font color="white"> </font>
+          </para>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <para style="terp_default_Bold_9">To, </para>
+          <para style="terp_default_Bold_9">The Manager</para>
+        </td>
+        <td>
+          <para style="terp_default_Bold_9">
+            <font color="white"> </font>
+          </para>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <para style="terp_default_Bold_9">[[ o.bank_id.name ]] Bank</para>
+        </td>
+        <td>
+          <para style="terp_default_Bold_9">
+            <font color="white"> </font>
+          </para>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <para style="terp_default_1">
+            <font color="white"> </font>
+          </para>
+          <para style="terp_default_9">Dear Sir/Madam,</para>
+        </td>
+        <td>
+          <para style="terp_default_9">
+            <font color="white"> </font>
+          </para>
+        </td>
+      </tr>
+    </blockTable>
+    <blockTable colWidths="539.0" style="Table2">
+      <tr>
+        <td>
+          <para style="P10">Payment Advice from [[ o.name ]] A/C no. [[ o.company_id.bank_ids and o.company_id.bank_ids[0].acc_number ]] form period [[ get_month(o.date)['from_name'] ]] to [[ get_month(o.date)['to_name'] ]]</para>
+        </td>
+      </tr>
+    </blockTable>
+    <blockTable colWidths="539.0" style="Table3">
+      <tr>
+        <td>
+          <para style="terp_default_9">[[ o.note ]] </para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="terp_default_8_space">
+      <font color="white"> </font>
+    </para>
+   <blockTable colWidths="47.0,146.0,158.0,105.0,83.0" style="Table4">[[ o.neft == True and removeParentNode('blockTable') ]]
+      <tr>
+        <td>
+          <para style="P1">SI. No.</para>
+        </td>
+        <td>
+          <para style="P1">Name of the Employe</para>
+        </td>
+        <td>
+          <para style="P3">Bank Account No.</para>
+        </td>
+        <td>
+          <para style="P3">By Salary</para>
+        </td>
+        <td>
+          <para style="P3">C/D</para>
+        </td>
+      </tr>
+    </blockTable>
+    <section>
+      <para style="terp_default_8">[[ repeatIn(get_detail(o.line_ids),'line') ]]</para>
+    <blockTable colWidths="47.0,146.0,158.0,105.0,83.0" style="Table5">[[ o.neft == True and removeParentNode('blockTable') ]]
+        <tr>
+          <td>
+            <para style="P11" leftIndent="15" bulletIndent="0">
+              <bullet><seq id="L1"/>.</bullet>
+              <font color="white"> </font>
+            </para>
+          </td>
+          <td>
+            <para style="P8">[[ line['name'] ]]</para>
+          </td>
+          <td>
+            <para style="P5">[[ line['acc_no'] ]]</para>
+          </td>
+          <td>
+            <para style="P8">[[formatLang(line['bysal'])]] [[ (company.currency_id and company.currency_id.symbol) or '' ]]</para>
+          </td>
+          <td>
+            <para style="P5">[[ line['debit_credit'] ]]</para>
+          </td>
+        </tr>
+      </blockTable>
+    </section>
+      <blockTable colWidths="40.0,129.0,141.0,104.0,77.0,49.0" style="Table4">[[ o.neft != True and removeParentNode('blockTable') ]]
+      <tr>
+        <td>
+          <para style="P1">SI. No.</para>
+        </td>
+        <td>
+          <para style="P1">Name of the Employe</para>
+        </td>
+        <td>
+          <para style="P3">Bank Account No.</para>
+        </td>
+        <td>
+          <para style="P3">IFSC Code</para>
+        </td>
+        <td>
+          <para style="P3">By Salary</para>
+        </td>
+        <td>
+          <para style="P3">C/D</para>
+        </td>
+      </tr>
+    </blockTable>
+    <section>
+      <para style="terp_default_8">[[ repeatIn(get_detail(o.line_ids),'line') ]]</para>
+    <blockTable colWidths="39.0,129.0,140.0,104.0,78.0,49.0" style="Table5">[[ o.neft !=True and removeParentNode('blockTable') ]]
+        <tr>
+          <td>
+            <para style="P11" leftIndent="15" bulletIndent="0">
+              <bullet><seq id="L1"/>.</bullet>
+            </para>
+          </td>
+          <td>
+            <para style="P8">[[ line['name'] ]]</para>
+          </td>
+          <td>
+            <para style="P5">[[ line['acc_no'] ]]</para>
+          </td>
+          <td>
+            <para style="P5">[[ line['ifsc_code'] ]]</para>
+          </td>
+          <td>
+            <para style="P8">[[formatLang(line['bysal'])]] [[ (company.currency_id and company.currency_id.symbol) or '' ]]</para>
+          </td>
+          <td>
+            <para style="P5">[[ line['debit_credit'] ]]</para>
+          </td>
+        </tr>
+      </blockTable>
+    </section>
+       <blockTable colWidths="50.0,144.0,158.0,107.0,80.0" style="Table6">[[ o.neft == True and removeParentNode('blockTable') ]]
+      <tr>
+        <td>
+          <para style="terp_tblheader_Details">
+            <font color="white"> </font>
+          </para>
+        </td>
+        <td>
+          <para style="P2">
+            <font color="white"> </font>
+          </para>
+        </td>
+        <td>
+          <para style="P1">Total : <font face="Helvetica" size="6.0">[[ o.line_ids==[] and removeParentNode('para') ]]</font></para>
+          <para style="P4"/>
+        </td>
+        <td>
+          <para style="P4"><font face="Helvetica" size="6.0">[[ o.line_ids==[] and removeParentNode('para') ]]</font>[[ formatLang(get_bysal_total()) ]] [[ (company.currency_id and company.currency_id.symbol) or '' ]]</para>
+        </td>
+        <td>
+          <para style="P4">
+            <font color="white"> </font>
+          </para>
+        </td>
+      </tr>
+    </blockTable>
+     <blockTable colWidths="50.0,119.0,244.0,99.0,27.0" style="Table6">[[ o.neft !=True and removeParentNode('blockTable') ]]
+      <tr>
+        <td>
+          <para style="terp_tblheader_Details">
+            <font color="white"> </font>
+          </para>
+        </td>
+        <td>
+          <para style="P2">
+            <font color="white"> </font>
+          </para>
+        </td>
+        <td>
+          <para style="P1">Total : <font face="Helvetica" size="6.0">[[ o.line_ids==[] and removeParentNode('para') ]]</font></para>
+          <para style="P4"/>
+        </td>
+        <td>
+          <para style="P4"><font face="Helvetica" size="6.0">[[ o.line_ids==[] and removeParentNode('para') ]]</font>[[ formatLang(get_bysal_total()) ]] [[ (company.currency_id and company.currency_id.symbol) or '' ]]</para>
+        </td>
+        <td>
+          <para style="P4">
+            <font color="white"> </font>
+          </para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="terp_default_0.30cmspace">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="269.0,269.0" style="Table7">
+      <tr>
+        <td>
+          <para style="terp_default_9">Yours Sincerely</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details">
+            <font color="white"> </font>
+          </para>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <para style="terp_default_9">For [[ company.name ]]</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details">
+            <font color="white"> </font>
+          </para>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <para style="terp_default_9">
+            <font color="white"> </font>
+          </para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details">
+            <font color="white"> </font>
+          </para>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <para style="terp_default_9">
+            <font color="white"> </font>
+          </para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details">
+            <font color="white"> </font>
+          </para>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <para style="terp_default_9">Authorized Signature</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details">
+            <font color="white"> </font>
+          </para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="terp_default_9">
+      <font color="white"> </font>
+    </para>
+    <para>
+      <seqReset id="L1"/>
+    </para>
+  </story>
+</document>
diff --git a/addons/l10n_in_hr_payroll/report/report_payslip_details.py b/addons/l10n_in_hr_payroll/report/report_payslip_details.py
new file mode 100644
index 00000000000..2732d5d09ae
--- /dev/null
+++ b/addons/l10n_in_hr_payroll/report/report_payslip_details.py
@@ -0,0 +1,35 @@
+#-*- coding:utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2011 OpenERP SA (<http://openerp.com>). All Rights Reserved
+#
+#    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 report import report_sxw
+from hr_payroll import report
+
+class payslip_details_report_in(report.report_payslip_details.payslip_details_report):
+
+    def __init__(self, cr, uid, name, context):
+        super(payslip_details_report_in, self).__init__(cr, uid, name, context)
+        self.localcontext.update({
+            'get_details_by_rule_category': self.get_details_by_rule_category,
+        })
+
+report_sxw.report_sxw('report.paylip.details.in', 'hr.payslip', 'l10n_in_hr_payroll/report/report_payslip_details.rml', parser=payslip_details_report_in)
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/l10n_in_hr_payroll/report/report_payslip_details.rml b/addons/l10n_in_hr_payroll/report/report_payslip_details.rml
new file mode 100644
index 00000000000..a7ab3db3185
--- /dev/null
+++ b/addons/l10n_in_hr_payroll/report/report_payslip_details.rml
@@ -0,0 +1,372 @@
+<?xml version="1.0"?>
+<document filename="test.pdf">
+  <template pageSize="(595.0,842.0)" title="Test" author="Martin Simon" allowSplitting="20">
+    <pageTemplate id="first">
+      <frame id="first" x1="28.0" y1="28.0" width="539" height="786"/>
+    </pageTemplate>
+  </template>
+  <stylesheet>
+    <blockTableStyle id="Standard_Outline">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table1">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table2">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="0,0" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="1,0" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="2,0" stop="2,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="2,0" stop="2,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="3,0" stop="3,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#cccccc" start="3,0" stop="3,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="3,0" stop="3,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="3,-1" stop="3,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table3">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="0,0" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="1,0" stop="1,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#cccccc" start="1,0" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table4">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="0,0" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="1,0" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="2,0" stop="2,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="2,0" stop="2,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="3,0" stop="3,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#cccccc" start="3,0" stop="3,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="3,0" stop="3,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="3,-1" stop="3,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table5">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="0,0" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="1,0" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="2,0" stop="2,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="2,0" stop="2,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="3,0" stop="3,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#cccccc" start="3,0" stop="3,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="3,0" stop="3,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="3,-1" stop="3,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table6">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="0,0" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="1,0" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="2,0" stop="2,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="2,0" stop="2,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="3,0" stop="3,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#cccccc" start="3,0" stop="3,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="3,0" stop="3,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="3,-1" stop="3,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table10">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table11">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table12">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table8">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table7">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="4,-1" stop="4,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="5,-1" stop="5,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table16">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="4,-1" stop="4,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="5,-1" stop="5,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table13">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <initialize>
+      <paraStyle name="all" alignment="justify"/>
+    </initialize>
+    <paraStyle name="P1" fontName="Helvetica" fontSize="2.0" leading="3"/>
+    <paraStyle name="P2" fontName="Helvetica" fontSize="2.0" leading="3"/>
+    <paraStyle name="P3" rightIndent="-56.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P4" rightIndent="-56.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P5" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P6" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P7" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P8" fontName="Helvetica-Bold" fontSize="14.0" leading="17" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P9" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P10" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P11" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica-Bold" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P12" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P13" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT"/>
+    <paraStyle name="P14" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT"/>
+    <paraStyle name="P15" fontName="Helvetica-Bold" fontSize="8.0" leading="10"/>
+    <paraStyle name="P16" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P17" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P18" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P19" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT"/>
+    <paraStyle name="P20" fontName="Helvetica" fontSize="2.0" leading="3"/>
+    <paraStyle name="P21" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P22" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT"/>
+    <paraStyle name="P23" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT"/>
+    <paraStyle name="P24" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P25" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P26" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="Standard" fontName="Helvetica"/>
+    <paraStyle name="Heading" fontName="Helvetica" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="Text body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="List" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Caption" fontName="Helvetica" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="Index" fontName="Helvetica"/>
+    <paraStyle name="terp_header" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_8" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_space" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_header_Centre" fontName="Helvetica-Bold" fontSize="14.0" leading="17" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Centre_8" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Centre_9" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_9" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Bold_8" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Bold_9" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_10" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="Table Contents" fontName="Helvetica"/>
+    <paraStyle name="terp_tblheader_Details" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_tblheader_Details_Right" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_tblheader_General" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="Table Heading" fontName="Helvetica" alignment="CENTER"/>
+    <paraStyle name="payslip_adj" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <images/>
+  </stylesheet>
+  <story>
+    <para style="P3">[[repeatIn(objects,'o')]]</para>
+    <blockTable colWidths="539.0" style="Table1">
+      <tr>
+        <td>
+          <para style="P8">Pay Slip Details</para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="terp_header_Centre">
+      <font face="Helvetica" size="6.0">[[o.credit_note==False and removeParentNode('para')]]</font>
+      <font face="Helvetica-Bold" size="14.0">Credit</font>
+      <font face="Helvetica" size="14.0"/>
+      <font face="Helvetica-Bold" size="14.0">Note</font>
+    </para>
+    <para style="P9">([[o.name or removeParentNode('para')]])</para>
+    <blockTable colWidths="63.0,206.0,89.0,181.0" style="Table2">
+      <tr>
+        <td>
+          <para style="P16">Name</para>
+        </td>
+        <td>
+          <para style="P16">[[o.employee_id.name]]</para>
+        </td>
+        <td>
+          <para style="P16">Designation </para>
+        </td>
+        <td>
+          <para style="P5">[[ o.employee_id.job_id.name or '' ]]</para>
+        </td>
+      </tr>
+    </blockTable>
+    <blockTable colWidths="63.0,476.0" style="Table3">
+      <tr>
+        <td>
+          <para style="terp_default_Bold_8">
+            <font face="Helvetica">Address </font>
+          </para>
+        </td>
+        <td>
+          <para style="P5">[[o.employee_id.address_home_id and o.employee_id.address_home_id.name or '' ]],[[o.employee_id.address_home_id and o.employee_id.address_home_id.street or '' ]],[[o.employee_id.address_home_id and o.employee_id.address_home_id.street2 or '' ]],[[o.employee_id.address_home_id and o.employee_id.address_home_id.zip or '' ]],[[o.employee_id.address_home_id and o.employee_id.address_home_id.city or '' ]],[[o.employee_id.address_home_id and o.employee_id.address_home_id.state_id and o.employee_id.address_home_id.state_id.name or '' ]] [[o.employee_id.address_home_id and o.employee_id.address_home_id.country_id and o.employee_id.address_home_id.country_id.name or '' ]]</para>
+        </td>
+      </tr>
+    </blockTable>
+    <blockTable colWidths="63.0,206.0,89.0,181.0" style="Table4">
+      <tr>
+        <td>
+          <para style="P16">Email</para>
+        </td>
+        <td>
+          <para style="P5">[[ o.employee_id.work_email or '' ]]</para>
+        </td>
+        <td>
+          <para style="terp_default_Bold_8">
+            <font face="Helvetica">Identification No</font>
+          </para>
+        </td>
+        <td>
+          <para style="P5">[[ o.employee_id.identification_id or '' ]]</para>
+        </td>
+      </tr>
+    </blockTable>
+    <blockTable colWidths="63.0,206.0,89.0,181.0" style="Table5">
+      <tr>
+        <td>
+          <para style="P16">Reference</para>
+        </td>
+        <td>
+          <para style="P5">[[ o.number or '' ]]</para>
+        </td>
+        <td>
+          <para style="P16">Bank Account</para>
+        </td>
+        <td>
+          <para style="P5">[[ o.employee_id.otherid or '' ]]</para>
+        </td>
+      </tr>
+    </blockTable>
+    <blockTable colWidths="63.0,206.0,89.0,181.0" style="Table6">
+      <tr>
+        <td>
+          <para style="P16">Date From</para>
+        </td>
+        <td>
+          <para style="P5">[[ o.date_from or '']]</para>
+        </td>
+        <td>
+          <para style="terp_default_Bold_8">
+            <font face="Helvetica" size="8.0">Date To</font>
+          </para>
+        </td>
+        <td>
+          <para style="P5">[[ o.date_to or '' ]]</para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="P7"/>
+    <para style="P11">
+      <font color="white"> </font>
+    </para>
+    <para style="P5">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="539.0" style="Table10">
+      <tr>
+        <td>
+          <para style="P10">Details by Salary Rule Category: </para>
+        </td>
+      </tr>
+    </blockTable>
+    <blockTable colWidths="54.0,388.0,97.0" style="Table11">
+      <tr>
+        <td>
+          <para style="P15">Code</para>
+        </td>
+        <td>
+          <para style="P15">Salary Rule Category</para>
+        </td>
+        <td>
+          <para style="P14">Total</para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="P1">
+      <font color="white"> </font>
+    </para>
+    <section>
+      <para style="P16">[[repeatIn(get_details_by_rule_category(o.details_by_salary_rule_category),'h') ]]</para>
+      <blockTable colWidths="54.0,388.0,97.0" style="Table12">
+        <tr>
+          <td>
+            <para style="P16">
+              <font face="Helvetica">[[ h['code'] ]]</font>
+              <font face="Helvetica">[[ h['level']!=0 and ( setTag('para','para',{'style':'terp_default_8'})) or removeParentNode('font')]]</font>
+            </para>
+          </td>
+          <td>
+            <para style="P17"><font face="Helvetica" color="white">[[ '..'*h['level'] ]]</font>[[ h['rule_category'] ]]<font face="Helvetica">[[ h['level']!=0 and ( setTag('para','para',{'style':'terp_default_8'})) or removeParentNode('font') ]]</font></para>
+          </td>
+          <td>
+            <para style="P6">[[ formatLang(h['total']) ]] [[o.company_id and o.company_id.currency_id.symbol or '']] <font face="Helvetica" size="8.0">[[ h['level']==0 and ( setTag('para','para',{'style':'terp_default_10'})) or removeParentNode('font') ]]</font></para>
+          </td>
+        </tr>
+      </blockTable>
+    </section>
+    <para style="P7">
+      <font color="white"> </font>
+    </para>
+
+    <blockTable colWidths="269.0,269.0" style="Table13">
+      <tr>
+        <td>
+          <para style="P5">
+            <font color="white"> </font>
+          </para>
+        </td>
+        <td>
+          <para style="P12">
+            <font color="white"> </font>
+          </para>
+          <para style="P12">
+            <font color="white"> </font>
+          </para>
+          <para style="P12">
+            <font color="white"> </font>
+          </para>
+          <para style="P12">Authorized Signature </para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="P4">
+      <font color="white"> </font>
+    </para>
+  </story>
+</document>
+
diff --git a/addons/l10n_in_hr_payroll/security/ir.model.access.csv b/addons/l10n_in_hr_payroll/security/ir.model.access.csv
new file mode 100644
index 00000000000..7ca0834449b
--- /dev/null
+++ b/addons/l10n_in_hr_payroll/security/ir.model.access.csv
@@ -0,0 +1,5 @@
+"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
+"access_hr_payroll_advice_user","hr.payroll.advice","model_hr_payroll_advice","base.group_hr_user",1,1,1,1
+"access_hr_payroll_advice_line_user","hr.payroll.advice.line","model_hr_payroll_advice_line","base.group_hr_user",1,1,1,1
+"access_hr_payroll_advice_report_user","payment.advice.report","model_payment_advice_report","base.group_hr_manager",1,1,1,1
+"access_hr_payroll_payslip_report_user","payslip.report","model_payslip_report","base.group_hr_manager",1,1,1,1
diff --git a/addons/l10n_in_hr_payroll/static/src/img/icon.png b/addons/l10n_in_hr_payroll/static/src/img/icon.png
new file mode 100644
index 00000000000..ddaf38f8b6d
Binary files /dev/null and b/addons/l10n_in_hr_payroll/static/src/img/icon.png differ
diff --git a/addons/l10n_in_hr_payroll/test/payment_advice.yml b/addons/l10n_in_hr_payroll/test/payment_advice.yml
new file mode 100644
index 00000000000..20b45830c5e
--- /dev/null
+++ b/addons/l10n_in_hr_payroll/test/payment_advice.yml
@@ -0,0 +1,41 @@
+-
+  In order to test Payment Advice I create a new Payment Advice 
+-
+  I create a new Payment Advice with NEFT Transaction Enable
+-
+  !record {model: hr.payroll.advice, id: payment_advice_1}: 
+    name: 'NEFT Advice'
+    bank_id: base.res_bank_1
+    line_ids:
+      - employee_id: hr.employee_fp
+        name: '90125452552'
+        ifsc_code: 'abn45215145'
+        bysal: 25000.00
+      - employee_id: hr.employee_al
+        name: '00014521111232'
+        ifsc_code: 'sbi45452145'
+        bysal: 20000.00 
+-
+  I check that the Payment Advice is in "Draft"
+-
+  !assert {model: hr.payroll.advice, id: payment_advice_1}:
+    - state == 'draft'
+-
+  Now I confirm Payment Advice
+-    
+  !python {model: hr.payroll.advice}: |
+    self.confirm_sheet(cr, uid, [ref('payment_advice_1')])
+-
+  I check that the Payment Advice state is "Confirmed"
+-
+  !python {model: hr.payroll.advice}: |
+    advice = self.browse(cr, uid, ref("payment_advice_1"))
+    assert (advice.state == 'confirm')
+-
+  In order to test the PDF report defined on a Payment Advice, we will print a Print Advice Report when NEFT is checked
+-
+  !python {model: hr.payroll.advice}: |
+    import netsvc, tools, os
+    (data, format) = netsvc.LocalService('report.payroll.advice').create(cr, uid, [ref('l10n_in_hr_payroll.payment_advice_1')], {})
+    if tools.config['test_report_directory']:
+        file(os.path.join(tools.config['test_report_directory'], 'l10n_in_hr_payroll_summary report'+format), 'wb+').write(data)
\ No newline at end of file
diff --git a/addons/l10n_in_hr_payroll/test/payment_advice_batch.yml b/addons/l10n_in_hr_payroll/test/payment_advice_batch.yml
new file mode 100644
index 00000000000..d1a1436b50b
--- /dev/null
+++ b/addons/l10n_in_hr_payroll/test/payment_advice_batch.yml
@@ -0,0 +1,61 @@
+-
+  In order to test Payment Advice Creation from Payslip Bacth I create New Payslip Batch
+-
+  I Create a bank record
+-
+  !record {model: res.partner.bank, id: res_partner_bank_0}:
+    acc_number: '3025632343043'
+    partner_id: base.res_partner_21
+    state: bank
+    bank: base.res_bank_1
+-
+  I create a new employee “Rahul”
+-
+  !record {model: hr.employee, id: hr_employee_rahul0}:
+    country_id: base.in
+    department_id: hr.dep_rd
+    name: Rahul
+    bank_account_id: res_partner_bank_0
+-
+  I want to generate a payslip from Payslip Batch.
+-
+  !record {model: hr.payslip.run, id: hr_payslip_run_forAdvice}:
+    name: Payslip Batch
+-
+  I create record for generating the Payslip for Payslip Batch.
+-
+  !record {model: hr.payslip.employees, id: hr_payslip_employees}:
+    employee_ids:
+      - hr_employee_rahul0
+-
+  I generate the payslip by clicking on Generate button wizard.
+-
+  !python {model: hr.payslip.employees}: |
+     self.compute_sheet(cr, uid, [ref('hr_payslip_employees')], context={'active_id': ref('hr_payslip_run_forAdvice')})
+-
+  I check that the Payslip Batch is in "Draft"
+-
+  !assert {model: hr.payslip.run, id: hr_payslip_run_forAdvice}:
+    - state == 'draft'
+-
+  Now I close Payslip Batch
+-    
+  !python {model: hr.payslip.run}: |
+    self.close_payslip_run(cr, uid, [ref('hr_payslip_run_forAdvice')])
+-
+  I check that the Payslip Batch is "Close"
+-
+  !python {model: hr.payslip.run}: |
+    batch = self.browse(cr, uid, ref("hr_payslip_run_forAdvice"))
+    assert (batch.state == 'close')
+- 
+  I create Advice from Payslip Batch using Create Advice button
+-
+    !python {model: hr.payslip.run}: |
+     self.create_advice(cr, uid, [ref('hr_payslip_run_forAdvice')])
+-
+  I check for Advice is created from Payslip Batch
+-
+  !python {model: hr.payroll.advice}: |
+    advice_ids = self.search(cr, uid, [('batch_id','=',ref('hr_payslip_run_forAdvice'))])
+    assert advice_ids,"Advice is not created from Payslip Batch."
\ No newline at end of file
diff --git a/addons/analytic_contract_expense_project/__init__.py b/addons/l10n_in_hr_payroll/wizard/__init__.py
similarity index 92%
rename from addons/analytic_contract_expense_project/__init__.py
rename to addons/l10n_in_hr_payroll/wizard/__init__.py
index 05c84916922..36635aec3c2 100644
--- a/addons/analytic_contract_expense_project/__init__.py
+++ b/addons/l10n_in_hr_payroll/wizard/__init__.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,10 +15,11 @@
 #    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 analytic_contract_expense_project
+import hr_salary_employee_bymonth
+import hr_yearly_salary_detail
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/l10n_in_hr_payroll/wizard/hr_salary_employee_bymonth.py b/addons/l10n_in_hr_payroll/wizard/hr_salary_employee_bymonth.py
new file mode 100644
index 00000000000..25cc615a1df
--- /dev/null
+++ b/addons/l10n_in_hr_payroll/wizard/hr_salary_employee_bymonth.py
@@ -0,0 +1,71 @@
+#-*- coding:utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2011 OpenERP SA (<http://openerp.com>). All Rights Reserved
+#
+#    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 time
+
+from osv import osv, fields
+
+class hr_salary_employee_bymonth(osv.osv_memory):
+
+    _name = 'hr.salary.employee.month'
+    _description = 'Hr Salary Employee By Month Report'
+    _columns = {
+        'start_date': fields.date('Start Date', required=True),
+        'end_date': fields.date('End Date', required=True),
+        'employee_ids': fields.many2many('hr.employee', 'payroll_year_rel', 'payroll_year_id', 'employee_id', 'Employees', required=True),
+        'category_id': fields.many2one('hr.salary.rule.category', 'Category', required=True),
+    }
+
+    def _get_default_category(self, cr, uid, context=None):
+        category_ids = self.pool.get('hr.salary.rule.category').search(cr, uid, [('code', '=', 'NET')], context=context)
+        return category_ids and category_ids[0] or False
+
+    _defaults = {
+         'start_date': lambda *a: time.strftime('%Y-01-01'),
+         'end_date': lambda *a: time.strftime('%Y-%m-%d'),
+         'category_id': _get_default_category
+    }
+
+    def print_report(self, cr, uid, ids, context=None):
+        """
+         To get the date and print the report
+         @param self: The object pointer.
+         @param cr: A database cursor
+         @param uid: ID of the user currently logged in
+         @param context: A standard dictionary
+         @return: return report
+        """
+        if context is None:
+            context = {}
+        datas = {'ids': context.get('active_ids', [])}
+
+        res = self.read(cr, uid, ids, context=context)
+        res = res and res[0] or {}
+        datas.update({'form': res})
+        return {
+            'type': 'ir.actions.report.xml',
+            'report_name': 'salary.employee.bymonth',
+            'datas': datas,
+       }
+
+hr_salary_employee_bymonth()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/l10n_in_hr_payroll/wizard/hr_salary_employee_bymonth_view.xml b/addons/l10n_in_hr_payroll/wizard/hr_salary_employee_bymonth_view.xml
new file mode 100644
index 00000000000..e05519b08db
--- /dev/null
+++ b/addons/l10n_in_hr_payroll/wizard/hr_salary_employee_bymonth_view.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        <record id="view_salary_employee_month" model="ir.ui.view">
+            <field name="name">Hr monthly Employee Salary</field>
+            <field name="model">hr.salary.employee.month</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+            <form string="Employee Pay Head Breakup" version="7.0">
+                <label string="This wizard will print report which displays employees break-up of Net Head for a specified dates."/>
+                <footer>
+                    <button name="print_report" string="Print" type="object" class="oe_highlight"/>
+                        or
+                    <button string="Cancel" class="oe_link" special="cancel" />
+                </footer>
+                <group>
+                    <field name="start_date"/>
+                    <field name="end_date"/>
+                    <field name="category_id"/>
+                    <separator string="Employees" />
+                    <field name="employee_ids"  nolabel="1" colspan="4"/>
+                </group>
+            </form>
+            </field>
+        </record>
+
+        <record id="action_salary_employee_month" model="ir.actions.act_window">
+            <field name="name">Yearly Salary by Head</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">hr.salary.employee.month</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+        </record>
+
+        <menuitem
+            name="Yearly Salary by Head"
+            parent="hr.menu_hr_reporting_timesheet"
+            sequence="200" icon="STOCK_PRINT"
+            action="action_salary_employee_month"
+            id="menu_salary_employee_month"
+           />
+
+    </data>
+</openerp>
diff --git a/addons/l10n_in_hr_payroll/wizard/hr_yearly_salary_detail.py b/addons/l10n_in_hr_payroll/wizard/hr_yearly_salary_detail.py
new file mode 100644
index 00000000000..16bfd63bdc9
--- /dev/null
+++ b/addons/l10n_in_hr_payroll/wizard/hr_yearly_salary_detail.py
@@ -0,0 +1,66 @@
+#-*- coding:utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2011 OpenERP SA (<http://openerp.com>). All Rights Reserved
+#
+#    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 time
+
+from osv import fields, osv
+
+class yearly_salary_detail(osv.osv_memory):
+
+   _name ='yearly.salary.detail'
+   _description = 'Hr Salary Employee By Category Report'
+   _columns = {
+        'employee_ids': fields.many2many('hr.employee', 'payroll_emp_rel', 'payroll_id', 'employee_id', 'Employees', required=True),
+        'date_from': fields.date('Start Date', required=True),
+        'date_to': fields.date('End Date', required=True),
+    }
+
+   _defaults = {
+        'date_from': lambda *a: time.strftime('%Y-01-01'),
+        'date_to': lambda *a: time.strftime('%Y-%m-%d'),
+
+    }
+
+   def print_report(self, cr, uid, ids, context=None):
+        """
+         To get the date and print the report
+         @param self: The object pointer.
+         @param cr: A database cursor
+         @param uid: ID of the user currently logged in
+         @param context: A standard dictionary
+         @return: return report
+        """
+        if context is None:
+            context = {}
+        datas = {'ids': context.get('active_ids', [])}
+
+        res = self.read(cr, uid, ids, context=context)
+        res = res and res[0] or {}
+        datas.update({'form': res})
+        return {
+            'type': 'ir.actions.report.xml',
+            'report_name': 'salary.detail.byyear',
+            'datas': datas,
+       }
+
+yearly_salary_detail()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/l10n_in_hr_payroll/wizard/hr_yearly_salary_detail_view.xml b/addons/l10n_in_hr_payroll/wizard/hr_yearly_salary_detail_view.xml
new file mode 100644
index 00000000000..ec70e8b41e0
--- /dev/null
+++ b/addons/l10n_in_hr_payroll/wizard/hr_yearly_salary_detail_view.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        <record id="view_yearly_salary_detail" model="ir.ui.view">
+            <field name="name">Employee Yearly Salary</field>
+            <field name="model">yearly.salary.detail</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+            <form string="Pay Head Employee Breakup" version="7.0">
+                <label string="This wizard will print report which display a pay head employee breakup for a specified dates."/>
+                <footer>
+                    <button name="print_report" string="Print" type="object" class="oe_highlight"/>
+                    or
+                    <button string="Cancel" class="oe_link" special="cancel" />
+                </footer>
+                <group>
+                    <field name="date_from"/>
+                    <field name="date_to"/>
+                    <separator string="Employees" />
+                    <field name="employee_ids"  nolabel="1" colspan="4"/>
+                </group>
+            </form>
+            </field>
+        </record>
+
+        <record id="action_yearly_salary_detail" model="ir.actions.act_window">
+            <field name="name">Yearly Salary by Employee</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">yearly.salary.detail</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+        </record>
+
+        <menuitem
+            name="Yearly Salary by Employee"
+            parent="hr.menu_hr_reporting_timesheet"
+            action="action_yearly_salary_detail"
+            sequence="250" icon="STOCK_PRINT"
+            id="menu_yearly_salary_detail"
+           />
+
+</data>
+</openerp>
diff --git a/addons/l10n_it/__openerp__.py b/addons/l10n_it/__openerp__.py
index 96f3b3510ff..a9177fee033 100644
--- a/addons/l10n_it/__openerp__.py
+++ b/addons/l10n_it/__openerp__.py
@@ -28,22 +28,20 @@
 ##############################################################################
 
 {
-    "name" : "Italy - Accounting",
-    "version" : "0.1",
-    "depends" : ['base_vat','account_chart','base_iban'],
-    "author" : "OpenERP Italian Community",
-    "description": """
+    'name': 'Italy - Accounting',
+    'version': '0.1',
+    'depends': ['base_vat','account_chart','base_iban'],
+    'author': 'OpenERP Italian Community',
+    'description': """
 Piano dei conti italiano di un'impresa generica.
 ================================================
 
 Italian accounting chart and localization.
     """,
-    "license": "AGPL-3",
-    "category" : "Localization/Account Charts",
+    'license': 'AGPL-3',
+    'category': 'Localization/Account Charts',
     'website': 'http://www.openerp-italia.org/',
-    'init_xml': [
-        ],
-    'update_xml': [
+    'data': [
         'data/account.account.template.csv',
         'data/account.tax.code.template.csv',
         'account_chart.xml',
@@ -51,8 +49,7 @@ Italian accounting chart and localization.
         'data/account.fiscal.position.template.csv',
         'l10n_chart_it_generic.xml',
         ],
-    'demo_xml': [
-        ],
+    'demo': [],
     'installable': True,
     'auto_install': False,
     'certificate' : '00926677190009155165',
diff --git a/addons/l10n_it/i18n/ar.po b/addons/l10n_it/i18n/ar.po
index 5f31b7d9d5c..129d84de573 100644
--- a/addons/l10n_it/i18n/ar.po
+++ b/addons/l10n_it/i18n/ar.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_it
 #: model:account.account.type,name:l10n_it.account_type_cash
diff --git a/addons/l10n_it/i18n/ca.po b/addons/l10n_it/i18n/ca.po
index 73272b70396..35aa53345b8 100644
--- a/addons/l10n_it/i18n/ca.po
+++ b/addons/l10n_it/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_it
 #: model:account.account.type,name:l10n_it.account_type_cash
diff --git a/addons/l10n_it/i18n/da.po b/addons/l10n_it/i18n/da.po
index c2005ef8bce..a72db0371d2 100644
--- a/addons/l10n_it/i18n/da.po
+++ b/addons/l10n_it/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_it
 #: model:account.account.type,name:l10n_it.account_type_cash
diff --git a/addons/l10n_it/i18n/es.po b/addons/l10n_it/i18n/es.po
index fb98d152955..cd2703786e8 100644
--- a/addons/l10n_it/i18n/es.po
+++ b/addons/l10n_it/i18n/es.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_it
 #: model:account.account.type,name:l10n_it.account_type_cash
diff --git a/addons/l10n_it/i18n/es_CR.po b/addons/l10n_it/i18n/es_CR.po
index 549b8a4189e..0e0ae2431a8 100644
--- a/addons/l10n_it/i18n/es_CR.po
+++ b/addons/l10n_it/i18n/es_CR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 "Language: es\n"
 
 #. module: l10n_it
diff --git a/addons/l10n_it/i18n/es_PY.po b/addons/l10n_it/i18n/es_PY.po
index 13f4675a08b..d42f421c0d2 100644
--- a/addons/l10n_it/i18n/es_PY.po
+++ b/addons/l10n_it/i18n/es_PY.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_it
 #: model:account.account.type,name:l10n_it.account_type_cash
diff --git a/addons/l10n_it/i18n/fr.po b/addons/l10n_it/i18n/fr.po
index 1f43673a206..ce020cbbf86 100644
--- a/addons/l10n_it/i18n/fr.po
+++ b/addons/l10n_it/i18n/fr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_it
 #: model:account.account.type,name:l10n_it.account_type_cash
diff --git a/addons/l10n_it/i18n/gl.po b/addons/l10n_it/i18n/gl.po
index 680a34807e8..bfa2b33350c 100644
--- a/addons/l10n_it/i18n/gl.po
+++ b/addons/l10n_it/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_it
 #: model:account.account.type,name:l10n_it.account_type_cash
diff --git a/addons/l10n_it/i18n/it.po b/addons/l10n_it/i18n/it.po
index 1f29e11f41f..ebedbe5c945 100644
--- a/addons/l10n_it/i18n/it.po
+++ b/addons/l10n_it/i18n/it.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_it
 #: model:account.account.type,name:l10n_it.account_type_cash
diff --git a/addons/l10n_it/i18n/pt_BR.po b/addons/l10n_it/i18n/pt_BR.po
index df22956f602..7fa60931306 100644
--- a/addons/l10n_it/i18n/pt_BR.po
+++ b/addons/l10n_it/i18n/pt_BR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_it
 #: model:account.account.type,name:l10n_it.account_type_cash
diff --git a/addons/l10n_it/i18n/tr.po b/addons/l10n_it/i18n/tr.po
index 27b72b5257b..f05c9c5b0b4 100644
--- a/addons/l10n_it/i18n/tr.po
+++ b/addons/l10n_it/i18n/tr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_it
 #: model:account.account.type,name:l10n_it.account_type_cash
diff --git a/addons/l10n_lu/__openerp__.py b/addons/l10n_lu/__openerp__.py
index 1ade34faaca..70f30444a3e 100644
--- a/addons/l10n_lu/__openerp__.py
+++ b/addons/l10n_lu/__openerp__.py
@@ -34,8 +34,7 @@ This is the base module to manage the accounting chart for Luxembourg.
     'author': 'OpenERP SA',
     'website': 'http://openerp.com',
     'depends': ['account', 'base_vat', 'base_iban'],
-    'init_xml': [],
-    'update_xml': [
+    'data': [
         'account.tax.code.template.csv',
         'l10n_lu_data.xml',
         'l10n_lu_wizard.xml',
@@ -43,7 +42,7 @@ This is the base module to manage the accounting chart for Luxembourg.
         'wizard/print_vat_view.xml'
     ],
     'test': ['test/l10n_lu_report.yml'],
-    'demo_xml': [],
+    'demo': [],
     'installable': True,
     'auto_install': False,
     'certificate': '0078164766621',
diff --git a/addons/l10n_lu/i18n/ar.po b/addons/l10n_lu/i18n/ar.po
index 385c80e37b7..7edad6dd1ee 100644
--- a/addons/l10n_lu/i18n/ar.po
+++ b/addons/l10n_lu/i18n/ar.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:26+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_lu
 #: view:vat.declaration.report:0
diff --git a/addons/l10n_lu/i18n/bg.po b/addons/l10n_lu/i18n/bg.po
index 1ee73cb4cf2..f5402072b29 100644
--- a/addons/l10n_lu/i18n/bg.po
+++ b/addons/l10n_lu/i18n/bg.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:26+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_lu
 #: view:vat.declaration.report:0
diff --git a/addons/l10n_lu/i18n/bs.po b/addons/l10n_lu/i18n/bs.po
index 3a68ef4901a..7792dd96e79 100644
--- a/addons/l10n_lu/i18n/bs.po
+++ b/addons/l10n_lu/i18n/bs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:26+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_lu
 #: view:vat.declaration.report:0
diff --git a/addons/l10n_lu/i18n/ca.po b/addons/l10n_lu/i18n/ca.po
index 2c63233d022..60508506d78 100644
--- a/addons/l10n_lu/i18n/ca.po
+++ b/addons/l10n_lu/i18n/ca.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:26+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_lu
 #: view:vat.declaration.report:0
diff --git a/addons/l10n_lu/i18n/cs.po b/addons/l10n_lu/i18n/cs.po
index d832d6421e5..f6695245ef2 100644
--- a/addons/l10n_lu/i18n/cs.po
+++ b/addons/l10n_lu/i18n/cs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:26+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_lu
 #: view:vat.declaration.report:0
diff --git a/addons/l10n_lu/i18n/da.po b/addons/l10n_lu/i18n/da.po
index cd6a994fcb2..e1b44a8936c 100644
--- a/addons/l10n_lu/i18n/da.po
+++ b/addons/l10n_lu/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:26+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_lu
 #: view:vat.declaration.report:0
diff --git a/addons/l10n_lu/i18n/de.po b/addons/l10n_lu/i18n/de.po
index 68c36f6e377..368dc741257 100644
--- a/addons/l10n_lu/i18n/de.po
+++ b/addons/l10n_lu/i18n/de.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:26+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_lu
 #: view:vat.declaration.report:0
diff --git a/addons/l10n_lu/i18n/es.po b/addons/l10n_lu/i18n/es.po
index 59e8b3feb49..494ff5e6195 100644
--- a/addons/l10n_lu/i18n/es.po
+++ b/addons/l10n_lu/i18n/es.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:26+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_lu
 #: view:vat.declaration.report:0
diff --git a/addons/l10n_lu/i18n/es_AR.po b/addons/l10n_lu/i18n/es_AR.po
index b84fcdb7cd4..95947cee434 100644
--- a/addons/l10n_lu/i18n/es_AR.po
+++ b/addons/l10n_lu/i18n/es_AR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:26+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_lu
 #: view:vat.declaration.report:0
diff --git a/addons/l10n_lu/i18n/es_CR.po b/addons/l10n_lu/i18n/es_CR.po
index 8840ffebc33..8fa2403204e 100644
--- a/addons/l10n_lu/i18n/es_CR.po
+++ b/addons/l10n_lu/i18n/es_CR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:26+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 "Language: \n"
 
 #. module: l10n_lu
diff --git a/addons/l10n_lu/i18n/es_PY.po b/addons/l10n_lu/i18n/es_PY.po
index 68ca6dce656..cba6a877b2e 100644
--- a/addons/l10n_lu/i18n/es_PY.po
+++ b/addons/l10n_lu/i18n/es_PY.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:26+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_lu
 #: view:vat.declaration.report:0
diff --git a/addons/l10n_lu/i18n/et.po b/addons/l10n_lu/i18n/et.po
index da0ef97ff1f..0ab6ffa64d4 100644
--- a/addons/l10n_lu/i18n/et.po
+++ b/addons/l10n_lu/i18n/et.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:26+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_lu
 #: view:vat.declaration.report:0
diff --git a/addons/l10n_lu/i18n/fr.po b/addons/l10n_lu/i18n/fr.po
index 2afabb38986..5ef5bdd65da 100644
--- a/addons/l10n_lu/i18n/fr.po
+++ b/addons/l10n_lu/i18n/fr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:26+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_lu
 #: view:vat.declaration.report:0
diff --git a/addons/l10n_lu/i18n/gl.po b/addons/l10n_lu/i18n/gl.po
index 5924e33cb50..ab7f936ad57 100644
--- a/addons/l10n_lu/i18n/gl.po
+++ b/addons/l10n_lu/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:26+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_lu
 #: view:vat.declaration.report:0
diff --git a/addons/l10n_lu/i18n/hr.po b/addons/l10n_lu/i18n/hr.po
index 318a6e8d029..5e6d0e9ee8c 100644
--- a/addons/l10n_lu/i18n/hr.po
+++ b/addons/l10n_lu/i18n/hr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:26+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_lu
 #: view:vat.declaration.report:0
diff --git a/addons/l10n_lu/i18n/hu.po b/addons/l10n_lu/i18n/hu.po
index 3a68ef4901a..7792dd96e79 100644
--- a/addons/l10n_lu/i18n/hu.po
+++ b/addons/l10n_lu/i18n/hu.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:26+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_lu
 #: view:vat.declaration.report:0
diff --git a/addons/l10n_lu/i18n/id.po b/addons/l10n_lu/i18n/id.po
index ad9d17090e0..99b7fb67637 100644
--- a/addons/l10n_lu/i18n/id.po
+++ b/addons/l10n_lu/i18n/id.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:26+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_lu
 #: view:vat.declaration.report:0
diff --git a/addons/l10n_lu/i18n/it.po b/addons/l10n_lu/i18n/it.po
index f5bef5036a8..7beb502f3ad 100644
--- a/addons/l10n_lu/i18n/it.po
+++ b/addons/l10n_lu/i18n/it.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:26+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_lu
 #: view:vat.declaration.report:0
diff --git a/addons/l10n_lu/i18n/ko.po b/addons/l10n_lu/i18n/ko.po
index 40ce779de38..70de724c9df 100644
--- a/addons/l10n_lu/i18n/ko.po
+++ b/addons/l10n_lu/i18n/ko.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:26+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_lu
 #: view:vat.declaration.report:0
diff --git a/addons/l10n_lu/i18n/lt.po b/addons/l10n_lu/i18n/lt.po
index 07f48f7cf3b..e51d04a1b81 100644
--- a/addons/l10n_lu/i18n/lt.po
+++ b/addons/l10n_lu/i18n/lt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:26+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_lu
 #: view:vat.declaration.report:0
diff --git a/addons/l10n_lu/i18n/nl.po b/addons/l10n_lu/i18n/nl.po
index 6dea7599331..cac63e9f73b 100644
--- a/addons/l10n_lu/i18n/nl.po
+++ b/addons/l10n_lu/i18n/nl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:26+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_lu
 #: view:vat.declaration.report:0
diff --git a/addons/l10n_lu/i18n/nl_BE.po b/addons/l10n_lu/i18n/nl_BE.po
index 4683304c56c..c2f9c074b74 100644
--- a/addons/l10n_lu/i18n/nl_BE.po
+++ b/addons/l10n_lu/i18n/nl_BE.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:26+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_lu
 #: view:vat.declaration.report:0
diff --git a/addons/l10n_lu/i18n/oc.po b/addons/l10n_lu/i18n/oc.po
index b4c95cc44a4..e586c5a8e57 100644
--- a/addons/l10n_lu/i18n/oc.po
+++ b/addons/l10n_lu/i18n/oc.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:26+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_lu
 #: view:vat.declaration.report:0
diff --git a/addons/l10n_lu/i18n/pl.po b/addons/l10n_lu/i18n/pl.po
index d344c31d864..0789c74d83e 100644
--- a/addons/l10n_lu/i18n/pl.po
+++ b/addons/l10n_lu/i18n/pl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:26+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_lu
 #: view:vat.declaration.report:0
diff --git a/addons/l10n_lu/i18n/pt.po b/addons/l10n_lu/i18n/pt.po
index 4d7e5141863..627eb2943e1 100644
--- a/addons/l10n_lu/i18n/pt.po
+++ b/addons/l10n_lu/i18n/pt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:26+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_lu
 #: view:vat.declaration.report:0
diff --git a/addons/l10n_lu/i18n/pt_BR.po b/addons/l10n_lu/i18n/pt_BR.po
index 12a3889abaa..0902603c4a8 100644
--- a/addons/l10n_lu/i18n/pt_BR.po
+++ b/addons/l10n_lu/i18n/pt_BR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:26+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_lu
 #: view:vat.declaration.report:0
diff --git a/addons/l10n_lu/i18n/ro.po b/addons/l10n_lu/i18n/ro.po
index 3a68ef4901a..7792dd96e79 100644
--- a/addons/l10n_lu/i18n/ro.po
+++ b/addons/l10n_lu/i18n/ro.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:26+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_lu
 #: view:vat.declaration.report:0
diff --git a/addons/l10n_lu/i18n/ru.po b/addons/l10n_lu/i18n/ru.po
index 3ac1306b6ff..51cb6602a9c 100644
--- a/addons/l10n_lu/i18n/ru.po
+++ b/addons/l10n_lu/i18n/ru.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:26+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_lu
 #: view:vat.declaration.report:0
diff --git a/addons/l10n_lu/i18n/sl.po b/addons/l10n_lu/i18n/sl.po
index 96fffa8116d..c48b39c2db3 100644
--- a/addons/l10n_lu/i18n/sl.po
+++ b/addons/l10n_lu/i18n/sl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:26+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_lu
 #: view:vat.declaration.report:0
diff --git a/addons/l10n_lu/i18n/sq.po b/addons/l10n_lu/i18n/sq.po
index 1ba6e5a2bec..e05d0cefc46 100644
--- a/addons/l10n_lu/i18n/sq.po
+++ b/addons/l10n_lu/i18n/sq.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:26+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_lu
 #: view:vat.declaration.report:0
diff --git a/addons/l10n_lu/i18n/sr@latin.po b/addons/l10n_lu/i18n/sr@latin.po
index ad6b7eab834..ed08df76f08 100644
--- a/addons/l10n_lu/i18n/sr@latin.po
+++ b/addons/l10n_lu/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:26+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_lu
 #: view:vat.declaration.report:0
diff --git a/addons/l10n_lu/i18n/sv.po b/addons/l10n_lu/i18n/sv.po
index 4c3d38100e8..a4c35efd6bf 100644
--- a/addons/l10n_lu/i18n/sv.po
+++ b/addons/l10n_lu/i18n/sv.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:26+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_lu
 #: view:vat.declaration.report:0
diff --git a/addons/l10n_lu/i18n/tlh.po b/addons/l10n_lu/i18n/tlh.po
index c4a94039936..2a9ae2ca566 100644
--- a/addons/l10n_lu/i18n/tlh.po
+++ b/addons/l10n_lu/i18n/tlh.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:26+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_lu
 #: view:vat.declaration.report:0
diff --git a/addons/l10n_lu/i18n/tr.po b/addons/l10n_lu/i18n/tr.po
index 87458736c0c..5897ec8e73a 100644
--- a/addons/l10n_lu/i18n/tr.po
+++ b/addons/l10n_lu/i18n/tr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:26+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_lu
 #: view:vat.declaration.report:0
diff --git a/addons/l10n_lu/i18n/uk.po b/addons/l10n_lu/i18n/uk.po
index 6bac1454679..1e0750437bf 100644
--- a/addons/l10n_lu/i18n/uk.po
+++ b/addons/l10n_lu/i18n/uk.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:26+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_lu
 #: view:vat.declaration.report:0
diff --git a/addons/l10n_lu/i18n/vi.po b/addons/l10n_lu/i18n/vi.po
index cfb2feb938a..0ecff642dbd 100644
--- a/addons/l10n_lu/i18n/vi.po
+++ b/addons/l10n_lu/i18n/vi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:26+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_lu
 #: view:vat.declaration.report:0
diff --git a/addons/l10n_lu/i18n/zh_CN.po b/addons/l10n_lu/i18n/zh_CN.po
index 70f61884525..4acd0141d95 100644
--- a/addons/l10n_lu/i18n/zh_CN.po
+++ b/addons/l10n_lu/i18n/zh_CN.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:26+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_lu
 #: view:vat.declaration.report:0
diff --git a/addons/l10n_lu/i18n/zh_TW.po b/addons/l10n_lu/i18n/zh_TW.po
index 6c43fc66b0b..426efc6cee6 100644
--- a/addons/l10n_lu/i18n/zh_TW.po
+++ b/addons/l10n_lu/i18n/zh_TW.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:26+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_lu
 #: view:vat.declaration.report:0
diff --git a/addons/l10n_ma/__openerp__.py b/addons/l10n_ma/__openerp__.py
index 52f453af8bb..37f477d363c 100644
--- a/addons/l10n_ma/__openerp__.py
+++ b/addons/l10n_ma/__openerp__.py
@@ -20,11 +20,11 @@
 ##############################################################################
 
 {
-    "name" : "Maroc - Accounting",
-    "version" : "1.0",
-    "author" : "kazacube",
-    "category" : "Localization/Account Charts",
-    "description": """
+    'name' : 'Maroc - Accounting',
+    'version' : '1.0',
+    'author' : 'kazacube',
+    'category' : 'Localization/Account Charts',
+    'description': """
 This is the base module to manage the accounting chart for Maroc.
 =================================================================
 
@@ -33,23 +33,21 @@ générer les états comptables aux normes marocaines (Bilan, CPC (comptes de
 produits et charges), balance générale à 6 colonnes, Grand livre cumulatif...).
 L'intégration comptable a été validé avec l'aide du Cabinet d'expertise comptable
 Seddik au cours du troisième trimestre 2010.""",
-    "website": "http://www.kazacube.com",
-    "depends" : ["base", "account"],
-    "init_xml" : [],
-    "update_xml" : [
-                    "security/compta_security.xml",
-                    "security/ir.model.access.csv",
-                    "account_type.xml",
-                    "account_pcg_morocco.xml",
-                    "l10n_ma_wizard.xml",
-                    "l10n_ma_tax.xml",
-                    "l10n_ma_journal.xml",
-
-                    ],
-    "demo_xml" : [],
-    "auto_install": False,
-    "installable": True,
-    "certificate" : "00599614652359069981",
+    'website': 'http://www.kazacube.com',
+    'depends' : ['base', 'account'],
+    'data' : [
+        'security/compta_security.xml',
+        'security/ir.model.access.csv',
+        'account_type.xml',
+        'account_pcg_morocco.xml',
+        'l10n_ma_wizard.xml',
+        'l10n_ma_tax.xml',
+        'l10n_ma_journal.xml',
+    ],
+    'demo' : [],
+    'auto_install': False,
+    'installable': True,
+    'certificate' : '00599614652359069981',
     'images': ['images/config_chart_l10n_ma.jpeg','images/l10n_ma_chart.jpeg'],
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/l10n_ma/i18n/ar.po b/addons/l10n_ma/i18n/ar.po
index caf9f411379..77523c6690a 100644
--- a/addons/l10n_ma/i18n/ar.po
+++ b/addons/l10n_ma/i18n/ar.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_ma
 #: model:account.account.type,name:l10n_ma.cpt_type_imm
diff --git a/addons/l10n_ma/i18n/ca.po b/addons/l10n_ma/i18n/ca.po
index 7846d4c72cf..a135219c159 100644
--- a/addons/l10n_ma/i18n/ca.po
+++ b/addons/l10n_ma/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_ma
 #: model:account.account.type,name:l10n_ma.cpt_type_imm
diff --git a/addons/l10n_ma/i18n/da.po b/addons/l10n_ma/i18n/da.po
index 1fa7b95b113..90622d7a1ec 100644
--- a/addons/l10n_ma/i18n/da.po
+++ b/addons/l10n_ma/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_ma
 #: model:account.account.type,name:l10n_ma.cpt_type_imm
diff --git a/addons/l10n_ma/i18n/de.po b/addons/l10n_ma/i18n/de.po
index 7cbe4b7ae53..9bd080be311 100644
--- a/addons/l10n_ma/i18n/de.po
+++ b/addons/l10n_ma/i18n/de.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_ma
 #: model:account.account.type,name:l10n_ma.cpt_type_imm
diff --git a/addons/l10n_ma/i18n/es.po b/addons/l10n_ma/i18n/es.po
index ef8c773f0f8..a7af5e8d405 100644
--- a/addons/l10n_ma/i18n/es.po
+++ b/addons/l10n_ma/i18n/es.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_ma
 #: model:account.account.type,name:l10n_ma.cpt_type_imm
diff --git a/addons/l10n_ma/i18n/es_CR.po b/addons/l10n_ma/i18n/es_CR.po
index ba9eaffe1e7..54c1ab72dd4 100644
--- a/addons/l10n_ma/i18n/es_CR.po
+++ b/addons/l10n_ma/i18n/es_CR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 "Language: es\n"
 
 #. module: l10n_ma
diff --git a/addons/l10n_ma/i18n/es_PY.po b/addons/l10n_ma/i18n/es_PY.po
index 11bd7bcfaa8..3b05146c683 100644
--- a/addons/l10n_ma/i18n/es_PY.po
+++ b/addons/l10n_ma/i18n/es_PY.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_ma
 #: model:account.account.type,name:l10n_ma.cpt_type_imm
diff --git a/addons/l10n_ma/i18n/fr.po b/addons/l10n_ma/i18n/fr.po
index 3ad5efaa79a..17019e719ee 100644
--- a/addons/l10n_ma/i18n/fr.po
+++ b/addons/l10n_ma/i18n/fr.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_ma
 #: model:account.account.type,name:l10n_ma.cpt_type_imm
diff --git a/addons/l10n_ma/i18n/gl.po b/addons/l10n_ma/i18n/gl.po
index cfee9e513e6..2f819a49683 100644
--- a/addons/l10n_ma/i18n/gl.po
+++ b/addons/l10n_ma/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_ma
 #: model:account.account.type,name:l10n_ma.cpt_type_imm
diff --git a/addons/l10n_ma/i18n/hu.po b/addons/l10n_ma/i18n/hu.po
index 6fc86039ee5..fd667b293f0 100644
--- a/addons/l10n_ma/i18n/hu.po
+++ b/addons/l10n_ma/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_ma
 #: model:account.account.type,name:l10n_ma.cpt_type_imm
diff --git a/addons/l10n_ma/i18n/it.po b/addons/l10n_ma/i18n/it.po
index 316c6a0dcd7..67e1c07255a 100644
--- a/addons/l10n_ma/i18n/it.po
+++ b/addons/l10n_ma/i18n/it.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_ma
 #: model:account.account.type,name:l10n_ma.cpt_type_imm
diff --git a/addons/l10n_ma/i18n/pt.po b/addons/l10n_ma/i18n/pt.po
index 7726e4f8bb1..b6fc099cb1a 100644
--- a/addons/l10n_ma/i18n/pt.po
+++ b/addons/l10n_ma/i18n/pt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_ma
 #: model:account.account.type,name:l10n_ma.cpt_type_imm
diff --git a/addons/l10n_ma/i18n/pt_BR.po b/addons/l10n_ma/i18n/pt_BR.po
index 5d3f1db5136..71877580cbd 100644
--- a/addons/l10n_ma/i18n/pt_BR.po
+++ b/addons/l10n_ma/i18n/pt_BR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_ma
 #: model:account.account.type,name:l10n_ma.cpt_type_imm
diff --git a/addons/l10n_ma/i18n/sr@latin.po b/addons/l10n_ma/i18n/sr@latin.po
index 5ef0c8915da..88ae3509f16 100644
--- a/addons/l10n_ma/i18n/sr@latin.po
+++ b/addons/l10n_ma/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_ma
 #: model:account.account.type,name:l10n_ma.cpt_type_imm
diff --git a/addons/l10n_ma/i18n/tr.po b/addons/l10n_ma/i18n/tr.po
index 83a4a1d85dc..3ab3326fdea 100644
--- a/addons/l10n_ma/i18n/tr.po
+++ b/addons/l10n_ma/i18n/tr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_ma
 #: model:account.account.type,name:l10n_ma.cpt_type_imm
diff --git a/addons/l10n_multilang/__openerp__.py b/addons/l10n_multilang/__openerp__.py
index cf521f124f4..5c91e1472c4 100644
--- a/addons/l10n_multilang/__openerp__.py
+++ b/addons/l10n_multilang/__openerp__.py
@@ -20,11 +20,11 @@
 ##############################################################################
 
 {
-    "name" : "Multi Language Chart of Accounts",
-    "version" : "1.1",
-    "author" : "OpenERP SA",
-    "category": 'Hidden/Dependency',
-    "description": """
+    'name': 'Multi Language Chart of Accounts',
+    'version': '1.1',
+    'author': 'OpenERP SA',
+    'category': 'Hidden/Dependency',
+    'description': """
     * Multi language support for Chart of Accounts, Taxes, Tax Codes, Journals,
       Accounting Templates, Analytic Chart of Accounts and Analytic Journals.
     * Setup wizard changes
@@ -32,12 +32,9 @@
           templates to target objects.
     """,
     'website': 'http://www.openerp.com',
-    'init_xml': [],
-    "depends" : ['account_accountant'],
-    'update_xml': [
-                ],
-    'demo_xml': [
-                ],
+    'depends' : ['account_accountant'],
+    'data': [],
+    'demo': [],
     'installable': True,
     'auto_install': False,
 }
diff --git a/addons/l10n_multilang/i18n/de.po b/addons/l10n_multilang/i18n/de.po
index f6368f897bb..6c856ac4e82 100644
--- a/addons/l10n_multilang/i18n/de.po
+++ b/addons/l10n_multilang/i18n/de.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:39+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_multilang
 #: model:ir.model,name:l10n_multilang.model_account_fiscal_position_template
diff --git a/addons/l10n_multilang/i18n/es_CR.po b/addons/l10n_multilang/i18n/es_CR.po
index 20dfed8ad6c..9b59ace6ca4 100644
--- a/addons/l10n_multilang/i18n/es_CR.po
+++ b/addons/l10n_multilang/i18n/es_CR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:39+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:43+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_multilang
 #: model:ir.model,name:l10n_multilang.model_account_fiscal_position_template
diff --git a/addons/l10n_multilang/i18n/fr.po b/addons/l10n_multilang/i18n/fr.po
index 1f220c618b5..b6f83287fec 100644
--- a/addons/l10n_multilang/i18n/fr.po
+++ b/addons/l10n_multilang/i18n/fr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:39+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_multilang
 #: model:ir.model,name:l10n_multilang.model_account_fiscal_position_template
diff --git a/addons/l10n_multilang/i18n/mn.po b/addons/l10n_multilang/i18n/mn.po
index 48e93562d1e..1d648d730cf 100644
--- a/addons/l10n_multilang/i18n/mn.po
+++ b/addons/l10n_multilang/i18n/mn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-08 04:36+0000\n"
-"X-Generator: Launchpad (build 15757)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:43+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_multilang
 #: model:ir.model,name:l10n_multilang.model_account_fiscal_position_template
diff --git a/addons/l10n_multilang/i18n/pt.po b/addons/l10n_multilang/i18n/pt.po
index 03aec5927ed..adfd1b3a853 100644
--- a/addons/l10n_multilang/i18n/pt.po
+++ b/addons/l10n_multilang/i18n/pt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:39+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:43+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_multilang
 #: model:ir.model,name:l10n_multilang.model_account_fiscal_position_template
diff --git a/addons/l10n_multilang/i18n/ro.po b/addons/l10n_multilang/i18n/ro.po
index 3fdea21d3a4..1045a1ce3b8 100644
--- a/addons/l10n_multilang/i18n/ro.po
+++ b/addons/l10n_multilang/i18n/ro.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:39+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:43+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_multilang
 #: model:ir.model,name:l10n_multilang.model_account_fiscal_position_template
diff --git a/addons/l10n_multilang/i18n/tr.po b/addons/l10n_multilang/i18n/tr.po
new file mode 100644
index 00000000000..e2e62ff0327
--- /dev/null
+++ b/addons/l10n_multilang/i18n/tr.po
@@ -0,0 +1,174 @@
+# Turkish 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-02-08 01:06+0000\n"
+"PO-Revision-Date: 2012-08-21 07:25+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: 2012-08-28 06:43+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
+
+#. module: l10n_multilang
+#: model:ir.model,name:l10n_multilang.model_account_fiscal_position_template
+msgid "Template for Fiscal Position"
+msgstr "Mali Durum Şablonu"
+
+#. module: l10n_multilang
+#: sql_constraint:account.account:0
+msgid "The code of the account must be unique per company !"
+msgstr "Hesap Kodu her şirket için benzersiz olmalı !"
+
+#. 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 ""
+"Yapılandırma Hatası!\n"
+"İç türü \"Görünüm\" den farklı olan bir hesaba alt hesap tanımlayamazsınız! "
+
+#. module: l10n_multilang
+#: model:ir.model,name:l10n_multilang.model_account_analytic_journal
+msgid "Analytic Journal"
+msgstr "Analiz Günlüğü"
+
+#. module: l10n_multilang
+#: constraint:account.account.template:0
+msgid "Error ! You can not create recursive account templates."
+msgstr "Hata! Yinelemeli hesap şablonları kullanamazsınız."
+
+#. module: l10n_multilang
+#: model:ir.model,name:l10n_multilang.model_account_journal
+msgid "Journal"
+msgstr "Günlük"
+
+#. module: l10n_multilang
+#: model:ir.model,name:l10n_multilang.model_account_chart_template
+msgid "Templates for Account Chart"
+msgstr "Hesap Tablosu Şablonu"
+
+#. module: l10n_multilang
+#: sql_constraint:account.tax:0
+msgid "The description must be unique per company!"
+msgstr "Her firma için açıklama benzersiz olmalı!"
+
+#. module: l10n_multilang
+#: constraint:account.tax.code.template:0
+msgid "Error ! You can not create recursive Tax Codes."
+msgstr "Hata! Yinelemeli Vergi Kodları oluşturmazsınız."
+
+#. module: l10n_multilang
+#: model:ir.model,name:l10n_multilang.model_account_tax_template
+msgid "account.tax.template"
+msgstr "muhasebe.vergi.şablon"
+
+#. module: l10n_multilang
+#: model:ir.model,name:l10n_multilang.model_account_tax
+msgid "account.tax"
+msgstr "hesap.vergi"
+
+#. module: l10n_multilang
+#: model:ir.model,name:l10n_multilang.model_account_account
+msgid "Account"
+msgstr "Hesap"
+
+#. module: l10n_multilang
+#: model:ir.model,name:l10n_multilang.model_wizard_multi_charts_accounts
+msgid "wizard.multi.charts.accounts"
+msgstr "sihirbaz.çoklu.tablolar.hesaplar"
+
+#. module: l10n_multilang
+#: constraint:account.journal:0
+msgid ""
+"Configuration error! The currency chosen should be shared by the default "
+"accounts too."
+msgstr ""
+"Yapılandırma hatası! Seçilen para birimi öntanımlı hesaplarla aynı olmalı."
+
+#. module: l10n_multilang
+#: model:ir.model,name:l10n_multilang.model_account_account_template
+msgid "Templates for Accounts"
+msgstr "Hesap Şablonu"
+
+#. 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 ""
+"Bu yerelleştirme modülünün kurulumu sırasında yüklenebilecek ve şablonlardan "
+"oluşturulan son nesneye kopyalanacak çeviri şablonu dillerini burada "
+"belirtin. Dil kodlarını ';' ile ayırın."
+
+#. module: l10n_multilang
+#: constraint:account.account:0
+msgid "Error ! You can not create recursive accounts."
+msgstr "Hata! Yinelen hesap oluşturamazsınız."
+
+#. 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 ""
+"Yapılandırma Hatası! \n"
+"\"Borç/Alacak\" iç türündeki hesapların \"Uzalaştırılmamış\" tan farklı "
+"erteleme yöntemli bir hesap türünü seçemezsiniz! "
+
+#. module: l10n_multilang
+#: sql_constraint:account.journal:0
+msgid "The name of the journal must be unique per company !"
+msgstr "Günlük adı her firmada benzersiz olmalı."
+
+#. module: l10n_multilang
+#: model:ir.model,name:l10n_multilang.model_account_analytic_account
+msgid "Analytic Account"
+msgstr "Analiz Hesabı"
+
+#. module: l10n_multilang
+#: sql_constraint:account.journal:0
+msgid "The code of the journal must be unique per company !"
+msgstr "Günlük kodu her firma için benzersiz olmalı."
+
+#. module: l10n_multilang
+#: model:ir.model,name:l10n_multilang.model_account_fiscal_position
+msgid "Fiscal Position"
+msgstr "Mali Durum"
+
+#. 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 ""
+"Yapılandırma Hatası! \n"
+"\"Görüntüle\"den farklı iç tipli hesaba alt hesap tanımlayamazsınız  ! "
+
+#. module: l10n_multilang
+#: constraint:account.analytic.account:0
+msgid "Error! You can not create recursive analytic accounts."
+msgstr "Hata! Yinelenen analiz hesabı oluşturamazsınız."
+
+#. module: l10n_multilang
+#: model:ir.model,name:l10n_multilang.model_account_tax_code_template
+msgid "Tax Code Template"
+msgstr "Vergi Kodu Şablonu"
+
+#. module: l10n_multilang
+#: field:account.chart.template,spoken_languages:0
+msgid "Spoken Languages"
+msgstr "Konuşulan Diller"
diff --git a/addons/l10n_mx/__openerp__.py b/addons/l10n_mx/__openerp__.py
index b52ac25f1ba..25ec7cc98c4 100644
--- a/addons/l10n_mx/__openerp__.py
+++ b/addons/l10n_mx/__openerp__.py
@@ -20,23 +20,24 @@
 #
 ##############################################################################
 {
-    "name" : "Mexico - Accounting",
-    "version" : "1.0",
-    "author" : "RelTek Mexico",
-    "category" : "Localization/Account Charts",
-    "description": """
+    'name': 'Mexico - Accounting',
+    'version': '1.0',
+    'author': 'RelTek Mexico',
+    'category': 'Localization/Account Charts',
+    'description': """
 This is the module to manage the accounting chart for Mexico in OpenERP.
 ========================================================================
 
 Mexican accounting chart and localization.
     """,
-    "depends" : ["account", "base_vat", "account_chart"],
-    "demo_xml" : [],
-    "update_xml" : ['account_tax_code.xml',"account_chart.xml",
-                    'account_tax.xml','l10n_chart_mx_wizard.xml'],
-    "auto_install": False,
-    "installable": True,
-    "certificate" : "00858539161332598061",
+    'depends': ['account', 'base_vat', 'account_chart'],
+    'demo': [],
+    'data': ['account_tax_code.xml','account_chart.xml',
+              'account_tax.xml','l10n_chart_mx_wizard.xml'
+    ],
+    'auto_install': False,
+    'installable': True,
+    'certificate': '00858539161332598061',
     'images': ['images/config_chart_l10n_mx.jpeg','images/l10n_mx_chart.jpeg'],
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/l10n_mx/i18n/ar.po b/addons/l10n_mx/i18n/ar.po
index 6b2bd0cb6af..7269de86170 100644
--- a/addons/l10n_mx/i18n/ar.po
+++ b/addons/l10n_mx/i18n/ar.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_mx
 #: model:account.account.type,name:l10n_mx.account_type_receivable
@@ -25,7 +25,7 @@ msgstr "الدائنون"
 #. module: l10n_mx
 #: model:account.account.type,name:l10n_mx.account_type_equity
 msgid "Equity"
-msgstr ""
+msgstr "الأسهم"
 
 #. module: l10n_mx
 #: model:account.account.type,name:l10n_mx.account_type_tax
diff --git a/addons/l10n_mx/i18n/bg.po b/addons/l10n_mx/i18n/bg.po
index 745fa73c3ba..c2f851addfe 100644
--- a/addons/l10n_mx/i18n/bg.po
+++ b/addons/l10n_mx/i18n/bg.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_mx
 #: model:account.account.type,name:l10n_mx.account_type_receivable
diff --git a/addons/l10n_mx/i18n/ca.po b/addons/l10n_mx/i18n/ca.po
index 3199ea15b96..2cfc2fdc9a7 100644
--- a/addons/l10n_mx/i18n/ca.po
+++ b/addons/l10n_mx/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_mx
 #: model:account.account.type,name:l10n_mx.account_type_receivable
diff --git a/addons/l10n_mx/i18n/da.po b/addons/l10n_mx/i18n/da.po
index aa4a7144fff..ab6a9b81016 100644
--- a/addons/l10n_mx/i18n/da.po
+++ b/addons/l10n_mx/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_mx
 #: model:account.account.type,name:l10n_mx.account_type_receivable
diff --git a/addons/l10n_mx/i18n/es.po b/addons/l10n_mx/i18n/es.po
index 258bf8480bf..7774e1068d3 100644
--- a/addons/l10n_mx/i18n/es.po
+++ b/addons/l10n_mx/i18n/es.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_mx
 #: model:account.account.type,name:l10n_mx.account_type_receivable
diff --git a/addons/l10n_mx/i18n/es_CR.po b/addons/l10n_mx/i18n/es_CR.po
index b8efa1c3561..4cb1c1ad072 100644
--- a/addons/l10n_mx/i18n/es_CR.po
+++ b/addons/l10n_mx/i18n/es_CR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 "Language: es\n"
 
 #. module: l10n_mx
diff --git a/addons/l10n_mx/i18n/es_PY.po b/addons/l10n_mx/i18n/es_PY.po
index 148c45280fe..14abe369a4c 100644
--- a/addons/l10n_mx/i18n/es_PY.po
+++ b/addons/l10n_mx/i18n/es_PY.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_mx
 #: model:account.account.type,name:l10n_mx.account_type_receivable
diff --git a/addons/l10n_mx/i18n/gl.po b/addons/l10n_mx/i18n/gl.po
index 3ee52eebde6..5b16d1a6c61 100644
--- a/addons/l10n_mx/i18n/gl.po
+++ b/addons/l10n_mx/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_mx
 #: model:account.account.type,name:l10n_mx.account_type_receivable
diff --git a/addons/l10n_mx/i18n/it.po b/addons/l10n_mx/i18n/it.po
index 09fc28de253..5b3c7283360 100644
--- a/addons/l10n_mx/i18n/it.po
+++ b/addons/l10n_mx/i18n/it.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_mx
 #: model:account.account.type,name:l10n_mx.account_type_receivable
diff --git a/addons/l10n_mx/i18n/pt.po b/addons/l10n_mx/i18n/pt.po
index 57879eb77c2..0b12692461f 100644
--- a/addons/l10n_mx/i18n/pt.po
+++ b/addons/l10n_mx/i18n/pt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_mx
 #: model:account.account.type,name:l10n_mx.account_type_receivable
diff --git a/addons/l10n_mx/i18n/pt_BR.po b/addons/l10n_mx/i18n/pt_BR.po
index d36844d00b1..7fb83abae03 100644
--- a/addons/l10n_mx/i18n/pt_BR.po
+++ b/addons/l10n_mx/i18n/pt_BR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_mx
 #: model:account.account.type,name:l10n_mx.account_type_receivable
diff --git a/addons/l10n_mx/i18n/sr@latin.po b/addons/l10n_mx/i18n/sr@latin.po
index 8739dbdc4d1..9e2c651419c 100644
--- a/addons/l10n_mx/i18n/sr@latin.po
+++ b/addons/l10n_mx/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_mx
 #: model:account.account.type,name:l10n_mx.account_type_receivable
diff --git a/addons/l10n_mx/i18n/tr.po b/addons/l10n_mx/i18n/tr.po
index 1e49ffd7bcc..bf6ef1f2808 100644
--- a/addons/l10n_mx/i18n/tr.po
+++ b/addons/l10n_mx/i18n/tr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_mx
 #: model:account.account.type,name:l10n_mx.account_type_receivable
diff --git a/addons/l10n_nl/__openerp__.py b/addons/l10n_nl/__openerp__.py
index 8b9cc3de451..a263f912183 100644
--- a/addons/l10n_nl/__openerp__.py
+++ b/addons/l10n_nl/__openerp__.py
@@ -58,7 +58,7 @@
 #   Opschonen van de code en verwijderen van niet gebruikte componenten.
 # Versie 5.0.0.4
 #   Aanpassen a_expense van 3000 -> 7000
-#   record id="btw_code_5b" op negatieve waarde gezet
+#   record id='btw_code_5b' op negatieve waarde gezet
 # Versie 5.0.0.5
 #   BTW rekeningen hebben typeaanduiding gekregen t.b.v. purchase of sale
 # Versie 5.0.0.6
@@ -86,10 +86,10 @@
 #   Changed naming of 7020 and 7030 to Kostprijs omzet xxxx
 
 {
-    "name" : "Netherlands - Accounting",
-    "version" : "1.5",
-    "category": "Localization/Account Charts",
-    "description": """
+    'name' : 'Netherlands - Accounting',
+    'version' : '1.5',
+    'category': 'Localization/Account Charts',
+    'description': """
 This is the module to manage the accounting chart for Netherlands in OpenERP.
 =============================================================================
 
@@ -101,7 +101,7 @@ De BTW rekeningen zijn waar nodig gekoppeld om de juiste rapportage te genereren
 denk b.v. aan intracommunautaire verwervingen waarbij u 19% BTW moet opvoeren,
 maar tegelijkertijd ook 19% als voorheffing weer mag aftrekken.
 
-Na installatie van deze module word de configuratie wizard voor "Accounting" aangeroepen.
+Na installatie van deze module word de configuratie wizard voor 'Accounting' aangeroepen.
     * U krijgt een lijst met grootboektemplates aangeboden waarin zich ook het
       Nederlandse grootboekschema bevind.
 
@@ -112,24 +112,21 @@ Na installatie van deze module word de configuratie wizard voor "Accounting" aan
 
 Let op!! -> De template van het Nederlandse rekeningschema is opgebouwd uit 4
 cijfers. Dit is het minimale aantal welk u moet invullen, u mag het aantal verhogen.
-De extra cijfers worden dan achter het rekeningnummer aangevult met "nullen".
+De extra cijfers worden dan achter het rekeningnummer aangevult met 'nullen'.
 
     """,
-    "author"  : "Veritos - Jan Verlaan",
-    "website" : "http://www.veritos.nl",
-    "depends" : ["account",
-                 "base_vat",
-                 "base_iban",
-                 "account_chart"
-                 ],
-    "init_xml" : [],
-    "update_xml" : ["account_chart_netherlands.xml",
-                    "l10n_nl_wizard.xml"
-                   ],
-    "demo_xml" : [
-                 ],
-
-    "installable": True,
+    'author'  : 'Veritos - Jan Verlaan',
+    'website' : 'http://www.veritos.nl',
+    'depends' : ['account',
+                 'base_vat',
+                 'base_iban',
+                 'account_chart'
+    ],
+    'data' : ['account_chart_netherlands.xml',
+              'l10n_nl_wizard.xml'
+    ],
+    'demo' : [],
+    'installable': True,
     'certificate': '00976041422960053277',
     'images': ['images/config_chart_l10n_nl.jpeg','images/l10n_nl_chart.jpeg'],
 }
diff --git a/addons/l10n_nl/i18n/ar.po b/addons/l10n_nl/i18n/ar.po
index f31135f7407..23eb7762836 100644
--- a/addons/l10n_nl/i18n/ar.po
+++ b/addons/l10n_nl/i18n/ar.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_nl
 #: model:account.account.type,name:l10n_nl.user_type_tax
diff --git a/addons/l10n_nl/i18n/ca.po b/addons/l10n_nl/i18n/ca.po
index 63b5268fc15..8526e3d175e 100644
--- a/addons/l10n_nl/i18n/ca.po
+++ b/addons/l10n_nl/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_nl
 #: model:account.account.type,name:l10n_nl.user_type_tax
diff --git a/addons/l10n_nl/i18n/da.po b/addons/l10n_nl/i18n/da.po
index fb588bf36bd..dca65bb8333 100644
--- a/addons/l10n_nl/i18n/da.po
+++ b/addons/l10n_nl/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_nl
 #: model:account.account.type,name:l10n_nl.user_type_tax
diff --git a/addons/l10n_nl/i18n/es.po b/addons/l10n_nl/i18n/es.po
index 4db1b178789..df55b9822c5 100644
--- a/addons/l10n_nl/i18n/es.po
+++ b/addons/l10n_nl/i18n/es.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_nl
 #: model:account.account.type,name:l10n_nl.user_type_tax
diff --git a/addons/l10n_nl/i18n/es_CR.po b/addons/l10n_nl/i18n/es_CR.po
index 015ef8d5768..5be29ac2e58 100644
--- a/addons/l10n_nl/i18n/es_CR.po
+++ b/addons/l10n_nl/i18n/es_CR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 "Language: es\n"
 
 #. module: l10n_nl
diff --git a/addons/l10n_nl/i18n/es_PY.po b/addons/l10n_nl/i18n/es_PY.po
index eadc2064b2c..26ed1826f0b 100644
--- a/addons/l10n_nl/i18n/es_PY.po
+++ b/addons/l10n_nl/i18n/es_PY.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_nl
 #: model:account.account.type,name:l10n_nl.user_type_tax
diff --git a/addons/l10n_nl/i18n/gl.po b/addons/l10n_nl/i18n/gl.po
index 4f165282de1..4bb3c635140 100644
--- a/addons/l10n_nl/i18n/gl.po
+++ b/addons/l10n_nl/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_nl
 #: model:account.account.type,name:l10n_nl.user_type_tax
diff --git a/addons/l10n_nl/i18n/it.po b/addons/l10n_nl/i18n/it.po
index f7308af1bef..116c11900d7 100644
--- a/addons/l10n_nl/i18n/it.po
+++ b/addons/l10n_nl/i18n/it.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_nl
 #: model:account.account.type,name:l10n_nl.user_type_tax
diff --git a/addons/l10n_nl/i18n/nl.po b/addons/l10n_nl/i18n/nl.po
index 8640accd2f9..9a6d9ac0504 100644
--- a/addons/l10n_nl/i18n/nl.po
+++ b/addons/l10n_nl/i18n/nl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_nl
 #: model:account.account.type,name:l10n_nl.user_type_tax
@@ -50,21 +50,20 @@ msgid ""
 msgstr ""
 "Na installatie van deze module word de configuratie wizard voor "
 "\"Accounting\" aangeroepen.\n"
-"* U krijgt een lijst met grootboektemplates aangeboden waarin zich ook het "
+"* U krijgt een lijst met grootboekschema's aangeboden waarin zich ook het "
 "Nederlandse grootboekschema bevind.\n"
 "* Als de configuratie wizard start, wordt u gevraagd om de naam van uw "
 "bedrijf in te voeren, welke grootboekschema te installeren, uit hoeveel "
 "cijfers een grootboekrekening mag bestaan, het rekeningnummer van uw bank en "
-"de currency om Journalen te creeren.\n"
+"de valuta om uw dagboeken te creeren.\n"
 "    \n"
-"Let op!! -> De template van het Nederlandse rekeningschema is opgebouwd uit "
-"4 cijfers. Dit is het minimale aantal welk u moet invullen, u mag het aantal "
-"verhogen. De extra cijfers worden dan achter het rekeningnummer aangevult "
-"met \"nullen\"\n"
+"Let op!! -> Het Nederlandse rekeningschema is opgebouwd uit 4 cijfers. Dit "
+"is het minimale aantal welk u moet invullen, u mag het aantal verhogen. De "
+"extra cijfers worden dan achter het rekeningnummer aangevult met \"nullen\"\n"
 "    \n"
 "* Dit is dezelfe configuratie wizard welke aangeroepen kan worden via "
-"Financial Management/Configuration/Financial Accounting/Financial "
-"Accounts/Generate Chart of Accounts from a Chart Template.\n"
+"Financieel\\Instellingen\\ Financiële administratie/Nieuwe Financiële "
+"administratie.\n"
 
 #. module: l10n_nl
 #: model:account.account.type,name:l10n_nl.user_type_cash
diff --git a/addons/l10n_nl/i18n/pt_BR.po b/addons/l10n_nl/i18n/pt_BR.po
index 9b6dbba1815..162104c62ea 100644
--- a/addons/l10n_nl/i18n/pt_BR.po
+++ b/addons/l10n_nl/i18n/pt_BR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_nl
 #: model:account.account.type,name:l10n_nl.user_type_tax
diff --git a/addons/l10n_nl/i18n/sr@latin.po b/addons/l10n_nl/i18n/sr@latin.po
index e6754c28a2b..d93378ed798 100644
--- a/addons/l10n_nl/i18n/sr@latin.po
+++ b/addons/l10n_nl/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_nl
 #: model:account.account.type,name:l10n_nl.user_type_tax
diff --git a/addons/l10n_nl/i18n/tr.po b/addons/l10n_nl/i18n/tr.po
index 78bb031c4e7..43d50f98c7d 100644
--- a/addons/l10n_nl/i18n/tr.po
+++ b/addons/l10n_nl/i18n/tr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_nl
 #: model:account.account.type,name:l10n_nl.user_type_tax
diff --git a/addons/l10n_pe/__openerp__.py b/addons/l10n_pe/__openerp__.py
index 7908664ca83..9ae3e351d13 100644
--- a/addons/l10n_pe/__openerp__.py
+++ b/addons/l10n_pe/__openerp__.py
@@ -17,36 +17,32 @@
 #    You should have received a copy of the GNU Affero General Public License
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
-##############################################################################
+##############################################################################
 {
-    "name": "Peru Localization Chart Account",
-    "version": "1.0",
-    "description": """
-Peruvian accounting chart and tax localization. Acording the PCGE 2010.
+    'name': 'Peru Localization Chart Account',
+    'version': '1.0',
+    'description': """
+Peruvian accounting chart and tax localization. According the PCGE 2010.
+========================================================================
 
 Plan contable peruano e impuestos de acuerdo a disposiciones vigentes de la
 SUNAT 2011 (PCGE 2010).
 
     """,
-    "author": ["Cubic ERP"],
-    "website": "http://cubicERP.com",
-    "category": "Localization/Account Charts",
-    "depends": [
-			"account_chart",
-			],
-	"data":[
-        "account_tax_code.xml",
-        "l10n_pe_chart.xml",
-        "account_tax.xml",
-        "l10n_pe_wizard.xml",			
-			],
-    "demo_xml": [
-			],
-    "update_xml": [
-			],
-    "active": False,
-    "installable": True,
-    "certificate" : "0045046493412",
+    'author': ['Cubic ERP'],
+    'website': 'http://cubicERP.com',
+    'category': 'Localization/Account Charts',
+    'depends': ['account_chart'],
+    'data':[
+        'account_tax_code.xml',
+        'l10n_pe_chart.xml',
+        'account_tax.xml',
+        'l10n_pe_wizard.xml',
+    ],
+    'demo': [],
+    'active': False,
+    'installable': True,
+    'certificate' : '0045046493412',
     'images': ['images/config_chart_l10n_pe.jpeg','images/l10n_pe_chart.jpeg'],
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/l10n_pl/__openerp__.py b/addons/l10n_pl/__openerp__.py
index 4b75dd92b79..df8d2955e8e 100644
--- a/addons/l10n_pl/__openerp__.py
+++ b/addons/l10n_pl/__openerp__.py
@@ -21,12 +21,12 @@
 #
 ##############################################################################
 {
-    "name" : "Poland - Accounting",
-    "version" : "1.0",
-    "author" : "Grzegorz Grzelak (Cirrus)",
-    "website": "http://www.cirrus.pl",
-    "category" : "Localization/Account Charts",
-    "description": """
+    'name' : 'Poland - Accounting',
+    'version' : '1.0',
+    'author' : 'Grzegorz Grzelak (Cirrus)',
+    'website': 'http://www.cirrus.pl',
+    'category' : 'Localization/Account Charts',
+    'description': """
 This is the module to manage the accounting chart and taxes for Poland in OpenERP.
 ==================================================================================
 
@@ -34,13 +34,14 @@ To jest moduł do tworzenia wzorcowego planu kont i podstawowych ustawień do po
 VAT 0%, 7% i 22%. Moduł ustawia też konta do kupna i sprzedaży towarów zakładając,
 że wszystkie towary są w obrocie hurtowym.
     """,
-    "depends" : ["account", "base_iban", "base_vat", "account_chart"],
-    "demo_xml" : [],
-    "update_xml" : ['account_tax_code.xml',"account_chart.xml",
-                    'account_tax.xml','l10n_chart_pl_wizard.xml'],
-    "auto_install": False,
-    "installable": True,
-    "certificate" : "00885794372803776829",
+    'depends' : ['account', 'base_iban', 'base_vat', 'account_chart'],
+    'demo' : [],
+    'data' : ['account_tax_code.xml','account_chart.xml',
+              'account_tax.xml','l10n_chart_pl_wizard.xml'
+    ],
+    'auto_install': False,
+    'installable': True,
+    'certificate' : '00885794372803776829',
     'images': ['images/config_chart_l10n_pl.jpeg','images/l10n_pl_chart.jpeg'],
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/l10n_pl/i18n/ar.po b/addons/l10n_pl/i18n/ar.po
index 3a54fc87858..846fac70cd0 100644
--- a/addons/l10n_pl/i18n/ar.po
+++ b/addons/l10n_pl/i18n/ar.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_pl
 #: model:account.account.type,name:l10n_pl.account_type_view
diff --git a/addons/l10n_pl/i18n/ca.po b/addons/l10n_pl/i18n/ca.po
index 64d28793f7e..5a983c2bef8 100644
--- a/addons/l10n_pl/i18n/ca.po
+++ b/addons/l10n_pl/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_pl
 #: model:account.account.type,name:l10n_pl.account_type_view
diff --git a/addons/l10n_pl/i18n/da.po b/addons/l10n_pl/i18n/da.po
index 5646b731c78..51725a56aa6 100644
--- a/addons/l10n_pl/i18n/da.po
+++ b/addons/l10n_pl/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_pl
 #: model:account.account.type,name:l10n_pl.account_type_view
diff --git a/addons/l10n_pl/i18n/es.po b/addons/l10n_pl/i18n/es.po
index 07005edb1fe..3832c8ca929 100644
--- a/addons/l10n_pl/i18n/es.po
+++ b/addons/l10n_pl/i18n/es.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_pl
 #: model:account.account.type,name:l10n_pl.account_type_view
diff --git a/addons/l10n_pl/i18n/es_CR.po b/addons/l10n_pl/i18n/es_CR.po
index 1631e416441..3a991102150 100644
--- a/addons/l10n_pl/i18n/es_CR.po
+++ b/addons/l10n_pl/i18n/es_CR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 "Language: es\n"
 
 #. module: l10n_pl
diff --git a/addons/l10n_pl/i18n/es_PY.po b/addons/l10n_pl/i18n/es_PY.po
index cb2c17425e2..bdeab42e2c4 100644
--- a/addons/l10n_pl/i18n/es_PY.po
+++ b/addons/l10n_pl/i18n/es_PY.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_pl
 #: model:account.account.type,name:l10n_pl.account_type_view
diff --git a/addons/l10n_pl/i18n/gl.po b/addons/l10n_pl/i18n/gl.po
index 0edb181d228..397f7926bf3 100644
--- a/addons/l10n_pl/i18n/gl.po
+++ b/addons/l10n_pl/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_pl
 #: model:account.account.type,name:l10n_pl.account_type_view
diff --git a/addons/l10n_pl/i18n/it.po b/addons/l10n_pl/i18n/it.po
index 7db71a4d21b..3262f025263 100644
--- a/addons/l10n_pl/i18n/it.po
+++ b/addons/l10n_pl/i18n/it.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_pl
 #: model:account.account.type,name:l10n_pl.account_type_view
diff --git a/addons/l10n_pl/i18n/pt_BR.po b/addons/l10n_pl/i18n/pt_BR.po
index 815358abf18..30231c57e5c 100644
--- a/addons/l10n_pl/i18n/pt_BR.po
+++ b/addons/l10n_pl/i18n/pt_BR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_pl
 #: model:account.account.type,name:l10n_pl.account_type_view
diff --git a/addons/l10n_pl/i18n/sr@latin.po b/addons/l10n_pl/i18n/sr@latin.po
index 5de1720b3c9..bcb0e33f369 100644
--- a/addons/l10n_pl/i18n/sr@latin.po
+++ b/addons/l10n_pl/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_pl
 #: model:account.account.type,name:l10n_pl.account_type_view
diff --git a/addons/l10n_pl/i18n/tr.po b/addons/l10n_pl/i18n/tr.po
index 0b94e1e246a..52535232ce6 100644
--- a/addons/l10n_pl/i18n/tr.po
+++ b/addons/l10n_pl/i18n/tr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_pl
 #: model:account.account.type,name:l10n_pl.account_type_view
diff --git a/addons/l10n_ro/__openerp__.py b/addons/l10n_ro/__openerp__.py
index f76eb178776..22df6955a5f 100644
--- a/addons/l10n_ro/__openerp__.py
+++ b/addons/l10n_ro/__openerp__.py
@@ -20,23 +20,23 @@
 #
 ##############################################################################
 {
-    "name" : "Romania - Accounting",
-    "version" : "1.1",
-    "author" : "filsys",
-    "website": "http://www.filsystem.ro",
-    "category" : "Localization/Account Charts",
-    "depends" : ["account_chart", 'base_vat'],
-    "description": """
+    'name' : 'Romania - Accounting',
+    'version' : '1.1',
+    'author' : 'filsys',
+    'website': 'http://www.filsystem.ro',
+    'category' : 'Localization/Account Charts',
+    'depends' : ['account_chart', 'base_vat'],
+    'description': """
 This is the module to manage the accounting chart, VAT structure and Registration Number for Romania in OpenERP.
 ================================================================================================================
 
 Romanian accounting chart and localization.
     """,
-    "demo_xml" : [],
-    "update_xml" : ['partner_view.xml','account_tax_code.xml','account_chart.xml','account_tax.xml','l10n_chart_ro_wizard.xml'],
-    "auto_install": False,
-    "installable": True,
-    "certificate" : "001308250150602948125",
+    'demo' : [],
+    'data' : ['partner_view.xml','account_tax_code.xml','account_chart.xml','account_tax.xml','l10n_chart_ro_wizard.xml'],
+    'auto_install': False,
+    'installable': True,
+    'certificate' : '001308250150602948125',
     'images': ['images/config_chart_l10n_ro.jpeg','images/l10n_ro_chart.jpeg'],
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/l10n_ro/i18n/ar.po b/addons/l10n_ro/i18n/ar.po
index 0cec0acae10..46629b53e49 100644
--- a/addons/l10n_ro/i18n/ar.po
+++ b/addons/l10n_ro/i18n/ar.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_ro
 #: model:account.account.type,name:l10n_ro.account_type_receivable
diff --git a/addons/l10n_ro/i18n/ca.po b/addons/l10n_ro/i18n/ca.po
index 2d391111574..0fed5b05cd1 100644
--- a/addons/l10n_ro/i18n/ca.po
+++ b/addons/l10n_ro/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_ro
 #: model:account.account.type,name:l10n_ro.account_type_receivable
diff --git a/addons/l10n_ro/i18n/da.po b/addons/l10n_ro/i18n/da.po
index 136187ac283..285875366b0 100644
--- a/addons/l10n_ro/i18n/da.po
+++ b/addons/l10n_ro/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_ro
 #: model:account.account.type,name:l10n_ro.account_type_receivable
diff --git a/addons/l10n_ro/i18n/es.po b/addons/l10n_ro/i18n/es.po
index b924e41ceda..00b6b3230d5 100644
--- a/addons/l10n_ro/i18n/es.po
+++ b/addons/l10n_ro/i18n/es.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_ro
 #: model:account.account.type,name:l10n_ro.account_type_receivable
diff --git a/addons/l10n_ro/i18n/es_CR.po b/addons/l10n_ro/i18n/es_CR.po
index 8c69c5e9a40..df552e4f0e3 100644
--- a/addons/l10n_ro/i18n/es_CR.po
+++ b/addons/l10n_ro/i18n/es_CR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 "Language: es\n"
 
 #. module: l10n_ro
diff --git a/addons/l10n_ro/i18n/es_PY.po b/addons/l10n_ro/i18n/es_PY.po
index 189f463e4ab..0c73bc7d7ea 100644
--- a/addons/l10n_ro/i18n/es_PY.po
+++ b/addons/l10n_ro/i18n/es_PY.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_ro
 #: model:account.account.type,name:l10n_ro.account_type_receivable
diff --git a/addons/l10n_ro/i18n/gl.po b/addons/l10n_ro/i18n/gl.po
index 4ad9458004c..cf256f8b49a 100644
--- a/addons/l10n_ro/i18n/gl.po
+++ b/addons/l10n_ro/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_ro
 #: model:account.account.type,name:l10n_ro.account_type_receivable
diff --git a/addons/l10n_ro/i18n/it.po b/addons/l10n_ro/i18n/it.po
index 2f94340346b..b138f832ede 100644
--- a/addons/l10n_ro/i18n/it.po
+++ b/addons/l10n_ro/i18n/it.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_ro
 #: model:account.account.type,name:l10n_ro.account_type_receivable
diff --git a/addons/l10n_ro/i18n/pt.po b/addons/l10n_ro/i18n/pt.po
index 966f99ffb84..ec9439cdd46 100644
--- a/addons/l10n_ro/i18n/pt.po
+++ b/addons/l10n_ro/i18n/pt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_ro
 #: model:account.account.type,name:l10n_ro.account_type_receivable
diff --git a/addons/l10n_ro/i18n/pt_BR.po b/addons/l10n_ro/i18n/pt_BR.po
index be57076a113..26730a4229f 100644
--- a/addons/l10n_ro/i18n/pt_BR.po
+++ b/addons/l10n_ro/i18n/pt_BR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_ro
 #: model:account.account.type,name:l10n_ro.account_type_receivable
diff --git a/addons/l10n_ro/i18n/ro.po b/addons/l10n_ro/i18n/ro.po
index 866eb5efc49..c6f32fa0300 100644
--- a/addons/l10n_ro/i18n/ro.po
+++ b/addons/l10n_ro/i18n/ro.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_ro
 #: model:account.account.type,name:l10n_ro.account_type_receivable
diff --git a/addons/l10n_ro/i18n/sr@latin.po b/addons/l10n_ro/i18n/sr@latin.po
index 335aa44e00a..f164a8a8f6d 100644
--- a/addons/l10n_ro/i18n/sr@latin.po
+++ b/addons/l10n_ro/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_ro
 #: model:account.account.type,name:l10n_ro.account_type_receivable
diff --git a/addons/l10n_ro/i18n/tr.po b/addons/l10n_ro/i18n/tr.po
index 4b01828bb58..bdeea0e7576 100644
--- a/addons/l10n_ro/i18n/tr.po
+++ b/addons/l10n_ro/i18n/tr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_ro
 #: model:account.account.type,name:l10n_ro.account_type_receivable
diff --git a/addons/l10n_syscohada/__openerp__.py b/addons/l10n_syscohada/__openerp__.py
index 2fd6917ec11..73b999d66ba 100644
--- a/addons/l10n_syscohada/__openerp__.py
+++ b/addons/l10n_syscohada/__openerp__.py
@@ -20,26 +20,29 @@
 ##############################################################################
 
 {
-    "name" : "OHADA - Accounting",
-    "version" : "1.0",
-    "author" : "Baamtu Senegal",
-    "category" : "Localization/Account Charts",
-    "description": """
+    'name' : 'OHADA - Accounting',
+    'version' : '1.0',
+    'author' : 'Baamtu Senegal',
+    'category' : 'Localization/Account Charts',
+    'description': """
 This module implements the accounting chart for OHADA area.
 ===========================================================
     
 It allows any company or association to manage its financial accounting.
+
 Countries that use OHADA are the following:
+-------------------------------------------
     Benin, Burkina Faso, Cameroon, Central African Republic, Comoros, Congo,
+    
     Ivory Coast, Gabon, Guinea, Guinea Bissau, Equatorial Guinea, Mali, Niger,
+    
     Replica of Democratic Congo, Senegal, Chad, Togo.
     """,
-    "website": "http://www.baamtu.com",
-    "depends" : ["account", "base_vat"],
-    "demo_xml" : [],
-    "init_xml":[],
-    "update_xml" : ["l10n_syscohada_data.xml","l10n_syscohada_wizard.xml"],
-    "auto_install": False,
-    "installable": True
+    'website': 'http://www.baamtu.com',
+    'depends' : ['account', 'base_vat'],
+    'demo' : [],
+    'data' : ['l10n_syscohada_data.xml','l10n_syscohada_wizard.xml'],
+    'auto_install': False,
+    'installable': True
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/l10n_syscohada/i18n/ar.po b/addons/l10n_syscohada/i18n/ar.po
index 5fcfa96f387..22f493425a9 100644
--- a/addons/l10n_syscohada/i18n/ar.po
+++ b/addons/l10n_syscohada/i18n/ar.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_syscohada
 #: model:account.account.type,name:l10n_syscohada.account_type_receivable
diff --git a/addons/l10n_syscohada/i18n/ca.po b/addons/l10n_syscohada/i18n/ca.po
index 122b6329385..322860cb7e6 100644
--- a/addons/l10n_syscohada/i18n/ca.po
+++ b/addons/l10n_syscohada/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_syscohada
 #: model:account.account.type,name:l10n_syscohada.account_type_receivable
diff --git a/addons/l10n_syscohada/i18n/es.po b/addons/l10n_syscohada/i18n/es.po
index 9c2e7bb8570..7263f388526 100644
--- a/addons/l10n_syscohada/i18n/es.po
+++ b/addons/l10n_syscohada/i18n/es.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_syscohada
 #: model:account.account.type,name:l10n_syscohada.account_type_receivable
diff --git a/addons/l10n_syscohada/i18n/es_CR.po b/addons/l10n_syscohada/i18n/es_CR.po
index 13f919ba337..b8cf9606d3a 100644
--- a/addons/l10n_syscohada/i18n/es_CR.po
+++ b/addons/l10n_syscohada/i18n/es_CR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 "Language: es\n"
 
 #. module: l10n_syscohada
diff --git a/addons/l10n_syscohada/i18n/fr.po b/addons/l10n_syscohada/i18n/fr.po
index cb911528f46..ed1cea6e014 100644
--- a/addons/l10n_syscohada/i18n/fr.po
+++ b/addons/l10n_syscohada/i18n/fr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_syscohada
 #: model:account.account.type,name:l10n_syscohada.account_type_receivable
diff --git a/addons/l10n_syscohada/i18n/pt.po b/addons/l10n_syscohada/i18n/pt.po
index aabdc1ac12f..c4b88f0980e 100644
--- a/addons/l10n_syscohada/i18n/pt.po
+++ b/addons/l10n_syscohada/i18n/pt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_syscohada
 #: model:account.account.type,name:l10n_syscohada.account_type_receivable
diff --git a/addons/l10n_syscohada/i18n/ro.po b/addons/l10n_syscohada/i18n/ro.po
index 43eb5062a55..09e45eeb505 100644
--- a/addons/l10n_syscohada/i18n/ro.po
+++ b/addons/l10n_syscohada/i18n/ro.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_syscohada
 #: model:account.account.type,name:l10n_syscohada.account_type_receivable
diff --git a/addons/l10n_syscohada/i18n/tr.po b/addons/l10n_syscohada/i18n/tr.po
index 5a8a42a8e58..eaab3a60fb5 100644
--- a/addons/l10n_syscohada/i18n/tr.po
+++ b/addons/l10n_syscohada/i18n/tr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_syscohada
 #: model:account.account.type,name:l10n_syscohada.account_type_receivable
diff --git a/addons/l10n_syscohada/l10n_syscohada_data.xml b/addons/l10n_syscohada/l10n_syscohada_data.xml
index feeea3a2314..d90988e00e3 100644
--- a/addons/l10n_syscohada/l10n_syscohada_data.xml
+++ b/addons/l10n_syscohada/l10n_syscohada_data.xml
@@ -1816,15 +1816,15 @@
     #
     -->
 
-      <record id="base.CFA" model="res.currency">
+      <record id="base.XOF" model="res.currency">
         <field name="name">XOF</field>
         <field name="symbol">CFA</field>
         <field name="rounding">1</field>
         <field name="accuracy">4</field>
     </record>
-    <record id="base.rateCFA" model="res.currency.rate">
+    <record id="base.rateXOF" model="res.currency.rate">
            <field name="rate">655.957</field>
-           <field name="currency_id" ref="base.CFA"/>
+           <field name="currency_id" ref="base.XOF"/>
            <field eval="time.strftime('%Y-01-01')" name="name"/>
        </record>
            <!--
diff --git a/addons/l10n_th/__openerp__.py b/addons/l10n_th/__openerp__.py
index c1534787721..d2c5d07142a 100644
--- a/addons/l10n_th/__openerp__.py
+++ b/addons/l10n_th/__openerp__.py
@@ -32,8 +32,7 @@ Thai accounting chart and localization.
     'author': 'Almacom',
     'website': 'http://almacom.co.th/',
     'depends': ['account_chart'],
-    'init_xml': [],
-    'update_xml': [ 'account_data.xml' ],
+    'data': [ 'account_data.xml' ],
     'installable': True,
     'certificate' : '00722263103978957725',
     'images': ['images/config_chart_l10n_th.jpeg','images/l10n_th_chart.jpeg'],
diff --git a/addons/l10n_th/i18n/ar.po b/addons/l10n_th/i18n/ar.po
index 74395fc28a4..2ab15300fd2 100644
--- a/addons/l10n_th/i18n/ar.po
+++ b/addons/l10n_th/i18n/ar.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_th
 #: model:ir.actions.todo,note:l10n_th.config_call_account_template_th
diff --git a/addons/l10n_th/i18n/ca.po b/addons/l10n_th/i18n/ca.po
index 854fede0198..faaa5873763 100644
--- a/addons/l10n_th/i18n/ca.po
+++ b/addons/l10n_th/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_th
 #: model:ir.actions.todo,note:l10n_th.config_call_account_template_th
diff --git a/addons/l10n_th/i18n/da.po b/addons/l10n_th/i18n/da.po
index 85d29926e51..6c3375a180f 100644
--- a/addons/l10n_th/i18n/da.po
+++ b/addons/l10n_th/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_th
 #: model:ir.actions.todo,note:l10n_th.config_call_account_template_th
diff --git a/addons/l10n_th/i18n/es.po b/addons/l10n_th/i18n/es.po
index e08134757fa..9799b0c78c0 100644
--- a/addons/l10n_th/i18n/es.po
+++ b/addons/l10n_th/i18n/es.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_th
 #: model:ir.actions.todo,note:l10n_th.config_call_account_template_th
diff --git a/addons/l10n_th/i18n/es_CR.po b/addons/l10n_th/i18n/es_CR.po
index 7a29ea85a04..e83974c14dd 100644
--- a/addons/l10n_th/i18n/es_CR.po
+++ b/addons/l10n_th/i18n/es_CR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 "Language: es\n"
 
 #. module: l10n_th
diff --git a/addons/l10n_th/i18n/es_PY.po b/addons/l10n_th/i18n/es_PY.po
index dedff25f3f6..f3f7f6779ee 100644
--- a/addons/l10n_th/i18n/es_PY.po
+++ b/addons/l10n_th/i18n/es_PY.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_th
 #: model:ir.actions.todo,note:l10n_th.config_call_account_template_th
diff --git a/addons/l10n_th/i18n/gl.po b/addons/l10n_th/i18n/gl.po
index 95524ed7447..570a6e2502f 100644
--- a/addons/l10n_th/i18n/gl.po
+++ b/addons/l10n_th/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_th
 #: model:ir.actions.todo,note:l10n_th.config_call_account_template_th
diff --git a/addons/l10n_th/i18n/it.po b/addons/l10n_th/i18n/it.po
index ec1a91d0fec..952605d2478 100644
--- a/addons/l10n_th/i18n/it.po
+++ b/addons/l10n_th/i18n/it.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_th
 #: model:ir.actions.todo,note:l10n_th.config_call_account_template_th
diff --git a/addons/l10n_th/i18n/pt.po b/addons/l10n_th/i18n/pt.po
index 803d4ea4fb6..9139b2d737d 100644
--- a/addons/l10n_th/i18n/pt.po
+++ b/addons/l10n_th/i18n/pt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_th
 #: model:ir.actions.todo,note:l10n_th.config_call_account_template_th
diff --git a/addons/l10n_th/i18n/pt_BR.po b/addons/l10n_th/i18n/pt_BR.po
index 7d1e96269a8..f1e2d23d3e6 100644
--- a/addons/l10n_th/i18n/pt_BR.po
+++ b/addons/l10n_th/i18n/pt_BR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_th
 #: model:ir.actions.todo,note:l10n_th.config_call_account_template_th
diff --git a/addons/l10n_th/i18n/sr@latin.po b/addons/l10n_th/i18n/sr@latin.po
index 19d393fdf16..aea104eb70d 100644
--- a/addons/l10n_th/i18n/sr@latin.po
+++ b/addons/l10n_th/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_th
 #: model:ir.actions.todo,note:l10n_th.config_call_account_template_th
diff --git a/addons/l10n_th/i18n/th.po b/addons/l10n_th/i18n/th.po
index 0400cd0d72c..5089d46ac8f 100644
--- a/addons/l10n_th/i18n/th.po
+++ b/addons/l10n_th/i18n/th.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_th
 #: model:ir.actions.todo,note:l10n_th.config_call_account_template_th
diff --git a/addons/l10n_th/i18n/tr.po b/addons/l10n_th/i18n/tr.po
index a2dc6e9a21b..3c92b7bc59d 100644
--- a/addons/l10n_th/i18n/tr.po
+++ b/addons/l10n_th/i18n/tr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_th
 #: model:ir.actions.todo,note:l10n_th.config_call_account_template_th
diff --git a/addons/l10n_tr/__openerp__.py b/addons/l10n_tr/__openerp__.py
index d72865a216c..6a0ad411867 100644
--- a/addons/l10n_tr/__openerp__.py
+++ b/addons/l10n_tr/__openerp__.py
@@ -18,7 +18,8 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
-{   'name': 'Turkey - Accounting',
+{
+    'name': 'Turkey - Accounting',
     'version': '1.beta',
     'category': 'Localization/Account Charts',
     'description': """
@@ -37,16 +38,15 @@ Bu modül kurulduktan sonra, Muhasebe yapılandırma sihirbazı çalışır
         'base_vat',
         'account_chart',
     ],
-    'init_xml': [],
-    'update_xml': [
+    'data': [
         'account_code_template.xml',
         'account_tdhp_turkey.xml',
         'account_tax_code_template.xml',
         'account_chart_template.xml',
         'account_tax_template.xml',
         'l10n_tr_wizard.xml',
-		],
-    'demo_xml': [],
+    ],
+    'demo': [],
     'installable': True,
     'images': ['images/chart_l10n_tr_1.jpg','images/chart_l10n_tr_2.jpg','images/chart_l10n_tr_3.jpg'],
 }
diff --git a/addons/l10n_uk/__openerp__.py b/addons/l10n_uk/__openerp__.py
index 444ea2b9dd3..0590224c364 100644
--- a/addons/l10n_uk/__openerp__.py
+++ b/addons/l10n_uk/__openerp__.py
@@ -24,8 +24,8 @@
     'version': '1.0',
     'category': 'Localization/Account Charts',
     'description': """
-This is the latest UK OpenERP localisation necessary to run OpenERP accounting
-for UK SME's with:
+This is the latest UK OpenERP localisation necessary to run OpenERP accounting for UK SME's with:
+=================================================================================================
     - a CT600-ready chart of accounts
     - VAT100-ready tax structure
     - InfoLogic UK counties listing
@@ -33,8 +33,7 @@ for UK SME's with:
     'author': 'SmartMode LTD',
     'website': 'http://www.smartmode.co.uk',
     'depends': ['base_iban', 'base_vat', 'account_chart'],
-    'init_xml': [],
-    'update_xml': [
+    'data': [
         'data/account.account.type.csv',
         'data/account.account.template.csv',
         'data/account.tax.code.template.csv',
@@ -43,9 +42,7 @@ for UK SME's with:
         'data/res.country.state.csv',
         'l10n_uk_wizard.xml',
     ],
-    'demo_xml' : [
-        'demo/demo.xml'
-    ],
+    'demo' : ['demo/demo.xml'],
     'installable': 'True',
     'images': ['images/config_chart_l10n_uk.jpeg','images/l10n_uk_chart.jpeg'],
 }
diff --git a/addons/l10n_uk/i18n/ar.po b/addons/l10n_uk/i18n/ar.po
index 2a7e616027a..3cb02e81a1e 100644
--- a/addons/l10n_uk/i18n/ar.po
+++ b/addons/l10n_uk/i18n/ar.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_uk
 #: model:account.account.type,name:l10n_uk.account_type_receivable
diff --git a/addons/l10n_uk/i18n/bg.po b/addons/l10n_uk/i18n/bg.po
index b17ca88cd91..77aceb432f6 100644
--- a/addons/l10n_uk/i18n/bg.po
+++ b/addons/l10n_uk/i18n/bg.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_uk
 #: model:account.account.type,name:l10n_uk.account_type_receivable
diff --git a/addons/l10n_uk/i18n/bs.po b/addons/l10n_uk/i18n/bs.po
index f135182ef01..27741530c28 100644
--- a/addons/l10n_uk/i18n/bs.po
+++ b/addons/l10n_uk/i18n/bs.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_uk
 #: model:account.account.type,name:l10n_uk.account_type_receivable
diff --git a/addons/l10n_uk/i18n/ca.po b/addons/l10n_uk/i18n/ca.po
index 35a9dc1fff8..83783182293 100644
--- a/addons/l10n_uk/i18n/ca.po
+++ b/addons/l10n_uk/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_uk
 #: model:account.account.type,name:l10n_uk.account_type_receivable
diff --git a/addons/l10n_uk/i18n/cs.po b/addons/l10n_uk/i18n/cs.po
index c535f5653f6..6a425062f49 100644
--- a/addons/l10n_uk/i18n/cs.po
+++ b/addons/l10n_uk/i18n/cs.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_uk
 #: model:account.account.type,name:l10n_uk.account_type_receivable
diff --git a/addons/l10n_uk/i18n/da.po b/addons/l10n_uk/i18n/da.po
index 8e2ba1e58ca..630ec3ac01c 100644
--- a/addons/l10n_uk/i18n/da.po
+++ b/addons/l10n_uk/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_uk
 #: model:account.account.type,name:l10n_uk.account_type_receivable
diff --git a/addons/l10n_uk/i18n/de.po b/addons/l10n_uk/i18n/de.po
index 05941175155..880c38f6bf5 100644
--- a/addons/l10n_uk/i18n/de.po
+++ b/addons/l10n_uk/i18n/de.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_uk
 #: model:account.account.type,name:l10n_uk.account_type_receivable
diff --git a/addons/l10n_uk/i18n/es.po b/addons/l10n_uk/i18n/es.po
index 5623aa1890a..ee8c177ba95 100644
--- a/addons/l10n_uk/i18n/es.po
+++ b/addons/l10n_uk/i18n/es.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_uk
 #: model:account.account.type,name:l10n_uk.account_type_receivable
diff --git a/addons/l10n_uk/i18n/es_CR.po b/addons/l10n_uk/i18n/es_CR.po
index aa32a4cb13c..d1676cfe3ea 100644
--- a/addons/l10n_uk/i18n/es_CR.po
+++ b/addons/l10n_uk/i18n/es_CR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 "Language: es\n"
 
 #. module: l10n_uk
diff --git a/addons/l10n_uk/i18n/es_PY.po b/addons/l10n_uk/i18n/es_PY.po
index 30fa25f2fae..b2243efc321 100644
--- a/addons/l10n_uk/i18n/es_PY.po
+++ b/addons/l10n_uk/i18n/es_PY.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_uk
 #: model:account.account.type,name:l10n_uk.account_type_receivable
diff --git a/addons/l10n_uk/i18n/et.po b/addons/l10n_uk/i18n/et.po
index 9db6c2292f2..1116b8a4f06 100644
--- a/addons/l10n_uk/i18n/et.po
+++ b/addons/l10n_uk/i18n/et.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_uk
 #: model:account.account.type,name:l10n_uk.account_type_receivable
diff --git a/addons/l10n_uk/i18n/fr.po b/addons/l10n_uk/i18n/fr.po
index 1b4e307a2b7..e0f2c5f6bad 100644
--- a/addons/l10n_uk/i18n/fr.po
+++ b/addons/l10n_uk/i18n/fr.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_uk
 #: model:account.account.type,name:l10n_uk.account_type_receivable
diff --git a/addons/l10n_uk/i18n/gl.po b/addons/l10n_uk/i18n/gl.po
index 884040b22dc..ca98dcec880 100644
--- a/addons/l10n_uk/i18n/gl.po
+++ b/addons/l10n_uk/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_uk
 #: model:account.account.type,name:l10n_uk.account_type_receivable
diff --git a/addons/l10n_uk/i18n/hr.po b/addons/l10n_uk/i18n/hr.po
index a622bcc5697..6fa0ec4a152 100644
--- a/addons/l10n_uk/i18n/hr.po
+++ b/addons/l10n_uk/i18n/hr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_uk
 #: model:account.account.type,name:l10n_uk.account_type_receivable
diff --git a/addons/l10n_uk/i18n/hu.po b/addons/l10n_uk/i18n/hu.po
index 4b605be30c6..b82ec029979 100644
--- a/addons/l10n_uk/i18n/hu.po
+++ b/addons/l10n_uk/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_uk
 #: model:account.account.type,name:l10n_uk.account_type_receivable
diff --git a/addons/l10n_uk/i18n/id.po b/addons/l10n_uk/i18n/id.po
index e7ec19ba206..10372206f73 100644
--- a/addons/l10n_uk/i18n/id.po
+++ b/addons/l10n_uk/i18n/id.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_uk
 #: model:account.account.type,name:l10n_uk.account_type_receivable
diff --git a/addons/l10n_uk/i18n/it.po b/addons/l10n_uk/i18n/it.po
index 1a9c191d5a0..938cec590e8 100644
--- a/addons/l10n_uk/i18n/it.po
+++ b/addons/l10n_uk/i18n/it.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_uk
 #: model:account.account.type,name:l10n_uk.account_type_receivable
diff --git a/addons/l10n_uk/i18n/ko.po b/addons/l10n_uk/i18n/ko.po
index ad52d7b2332..eb1749f9beb 100644
--- a/addons/l10n_uk/i18n/ko.po
+++ b/addons/l10n_uk/i18n/ko.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_uk
 #: model:account.account.type,name:l10n_uk.account_type_receivable
diff --git a/addons/l10n_uk/i18n/lt.po b/addons/l10n_uk/i18n/lt.po
index 89d8af39240..f6b6d8409bc 100644
--- a/addons/l10n_uk/i18n/lt.po
+++ b/addons/l10n_uk/i18n/lt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_uk
 #: model:account.account.type,name:l10n_uk.account_type_receivable
diff --git a/addons/l10n_uk/i18n/nl.po b/addons/l10n_uk/i18n/nl.po
index 5f39761082a..86efcb748d5 100644
--- a/addons/l10n_uk/i18n/nl.po
+++ b/addons/l10n_uk/i18n/nl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_uk
 #: model:account.account.type,name:l10n_uk.account_type_receivable
diff --git a/addons/l10n_uk/i18n/oc.po b/addons/l10n_uk/i18n/oc.po
index 623b588c446..b45c060b8a2 100644
--- a/addons/l10n_uk/i18n/oc.po
+++ b/addons/l10n_uk/i18n/oc.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_uk
 #: model:account.account.type,name:l10n_uk.account_type_receivable
diff --git a/addons/l10n_uk/i18n/pl.po b/addons/l10n_uk/i18n/pl.po
index 2d70208286f..050bc51a412 100644
--- a/addons/l10n_uk/i18n/pl.po
+++ b/addons/l10n_uk/i18n/pl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_uk
 #: model:account.account.type,name:l10n_uk.account_type_receivable
diff --git a/addons/l10n_uk/i18n/pt.po b/addons/l10n_uk/i18n/pt.po
index d69a5250822..a75ac38bedc 100644
--- a/addons/l10n_uk/i18n/pt.po
+++ b/addons/l10n_uk/i18n/pt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_uk
 #: model:account.account.type,name:l10n_uk.account_type_receivable
diff --git a/addons/l10n_uk/i18n/pt_BR.po b/addons/l10n_uk/i18n/pt_BR.po
index 1be2e299084..6fc7d231b03 100644
--- a/addons/l10n_uk/i18n/pt_BR.po
+++ b/addons/l10n_uk/i18n/pt_BR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_uk
 #: model:account.account.type,name:l10n_uk.account_type_receivable
diff --git a/addons/l10n_uk/i18n/ro.po b/addons/l10n_uk/i18n/ro.po
index abb18702c9b..106dd37ca02 100644
--- a/addons/l10n_uk/i18n/ro.po
+++ b/addons/l10n_uk/i18n/ro.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_uk
 #: model:account.account.type,name:l10n_uk.account_type_receivable
diff --git a/addons/l10n_uk/i18n/ru.po b/addons/l10n_uk/i18n/ru.po
index b62f6305cbd..83f9bcff42e 100644
--- a/addons/l10n_uk/i18n/ru.po
+++ b/addons/l10n_uk/i18n/ru.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_uk
 #: model:account.account.type,name:l10n_uk.account_type_receivable
diff --git a/addons/l10n_uk/i18n/sl.po b/addons/l10n_uk/i18n/sl.po
index e45dc979519..e7d1590814c 100644
--- a/addons/l10n_uk/i18n/sl.po
+++ b/addons/l10n_uk/i18n/sl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_uk
 #: model:account.account.type,name:l10n_uk.account_type_receivable
diff --git a/addons/l10n_uk/i18n/sq.po b/addons/l10n_uk/i18n/sq.po
index 266be67e3d4..41ead165ff6 100644
--- a/addons/l10n_uk/i18n/sq.po
+++ b/addons/l10n_uk/i18n/sq.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_uk
 #: model:account.account.type,name:l10n_uk.account_type_receivable
diff --git a/addons/l10n_uk/i18n/sr@latin.po b/addons/l10n_uk/i18n/sr@latin.po
index 6719fd8e4de..3dadf2f2355 100644
--- a/addons/l10n_uk/i18n/sr@latin.po
+++ b/addons/l10n_uk/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_uk
 #: model:account.account.type,name:l10n_uk.account_type_receivable
diff --git a/addons/l10n_uk/i18n/sv.po b/addons/l10n_uk/i18n/sv.po
index 764bd8d988f..572aa54dcfb 100644
--- a/addons/l10n_uk/i18n/sv.po
+++ b/addons/l10n_uk/i18n/sv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_uk
 #: model:account.account.type,name:l10n_uk.account_type_receivable
diff --git a/addons/l10n_uk/i18n/tlh.po b/addons/l10n_uk/i18n/tlh.po
index b32a20e0dcf..0cd942f2f0b 100644
--- a/addons/l10n_uk/i18n/tlh.po
+++ b/addons/l10n_uk/i18n/tlh.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_uk
 #: model:account.account.type,name:l10n_uk.account_type_receivable
diff --git a/addons/l10n_uk/i18n/tr.po b/addons/l10n_uk/i18n/tr.po
index 2fbdd8652b0..5875a8ea89b 100644
--- a/addons/l10n_uk/i18n/tr.po
+++ b/addons/l10n_uk/i18n/tr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_uk
 #: model:account.account.type,name:l10n_uk.account_type_receivable
diff --git a/addons/l10n_uk/i18n/uk.po b/addons/l10n_uk/i18n/uk.po
index df15af9236a..0d4c86aa9a2 100644
--- a/addons/l10n_uk/i18n/uk.po
+++ b/addons/l10n_uk/i18n/uk.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_uk
 #: model:account.account.type,name:l10n_uk.account_type_receivable
diff --git a/addons/l10n_uk/i18n/vi.po b/addons/l10n_uk/i18n/vi.po
index 2d4017eeb28..84a89c91275 100644
--- a/addons/l10n_uk/i18n/vi.po
+++ b/addons/l10n_uk/i18n/vi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_uk
 #: model:account.account.type,name:l10n_uk.account_type_receivable
diff --git a/addons/l10n_uk/i18n/zh_CN.po b/addons/l10n_uk/i18n/zh_CN.po
index eb8b902834e..f53076cea85 100644
--- a/addons/l10n_uk/i18n/zh_CN.po
+++ b/addons/l10n_uk/i18n/zh_CN.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_uk
 #: model:account.account.type,name:l10n_uk.account_type_receivable
diff --git a/addons/l10n_uk/i18n/zh_TW.po b/addons/l10n_uk/i18n/zh_TW.po
index 2910157533e..7ecb4c7c885 100644
--- a/addons/l10n_uk/i18n/zh_TW.po
+++ b/addons/l10n_uk/i18n/zh_TW.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_uk
 #: model:account.account.type,name:l10n_uk.account_type_receivable
diff --git a/addons/l10n_us/__openerp__.py b/addons/l10n_us/__openerp__.py
index f900c3d5e99..90c0e6fd4ad 100644
--- a/addons/l10n_us/__openerp__.py
+++ b/addons/l10n_us/__openerp__.py
@@ -19,20 +19,18 @@
 #
 ##############################################################################
 {
-    "name": "United States - Chart of accounts",
-    "version": "1.1",
-    "author": "OpenERP SA",
-    "category": 'Localization/Account Charts',
-    "description": """
+    'name': 'United States - Chart of accounts',
+    'version': '1.1',
+    'author': 'OpenERP SA',
+    'category': 'Localization/Account Charts',
+    'description': """
 United States - Chart of accounts.
+==================================
     """,
     'website': 'http://www.openerp.com',
-    'init_xml': [],
-    "depends": [
-        "account_chart",
-        ],
-    'update_xml': [
-        "l10n_us_account_type.xml",
+    'depends': ['account_chart'],
+    'data': [
+        'l10n_us_account_type.xml',
         'account_chart_template.xml',
         'account.account.template.csv',
         'account_tax_code_template.xml',
@@ -40,10 +38,8 @@ United States - Chart of accounts.
         'account_chart_template_after.xml',
         'l10n_us_wizard.xml'
     ],
-    'demo_xml': [
-    ],
-    'test': [
-    ],
+    'demo': [],
+    'test': [],
     'installable': True,
     'auto_install': False,
 }
diff --git a/addons/l10n_uy/__openerp__.py b/addons/l10n_uy/__openerp__.py
index 5e4eb51ffc0..e5e7aaf59c8 100644
--- a/addons/l10n_uy/__openerp__.py
+++ b/addons/l10n_uy/__openerp__.py
@@ -22,35 +22,32 @@
 ##############################################################################
 
 {
-    "name" : "Uruguay - Chart of Accounts",
-    "version" : "0.1",
-    "author" : "Uruguay l10n Team & Guillem Barba",
-    "category" : "Localization/Account Charts",
-    "website" : "https://launchpad.net/openerp-uruguay",
-    "description": """
+    'name': 'Uruguay - Chart of Accounts',
+    'version': '0.1',
+    'author': 'Uruguay l10n Team & Guillem Barba',
+    'category': 'Localization/Account Charts',
+    'website': 'https://launchpad.net/openerp-uruguay',
+    'description': """
 General Chart of Accounts.
 ==========================
 
 Provide Templates for Chart of Accounts, Taxes for Uruguay.
 
 """,
-    "license"   : "AGPL-3",
-    "depends"   : [
-                    "account",
-                  ],
-    "init_xml"  : [],
-    "update_xml": [
-                    "account_types.xml",
-                    "taxes_code_template.xml",
-                    "account_chart_template.xml",
-                    "taxes_template.xml",
-                    "l10n_uy_wizard.xml",
-                  ],
-    "demo_xml": [],
-    "auto_install": False,
-    "installable": True,
-    'certificate' : '0078287892698',
-    "images": ["images/config_chart_l10n_uy.jpeg","images/l10n_uy_chart.jpeg"],
+    'license': 'AGPL-3',
+    'depends': ['account'],
+    'data': [
+        'account_types.xml',
+        'taxes_code_template.xml',
+        'account_chart_template.xml',
+        'taxes_template.xml',
+        'l10n_uy_wizard.xml',
+    ],
+    'demo': [],
+    'auto_install': False,
+    'installable': True,
+    'certificate': '0078287892698',
+    'images': ['images/config_chart_l10n_uy.jpeg','images/l10n_uy_chart.jpeg'],
 }
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/l10n_ve/__openerp__.py b/addons/l10n_ve/__openerp__.py
index 921bdf13c80..fcb5110714e 100644
--- a/addons/l10n_ve/__openerp__.py
+++ b/addons/l10n_ve/__openerp__.py
@@ -23,24 +23,25 @@
 #
 ##############################################################################
 {
-    "name" : "Venezuela - Accounting",
-    "version" : "1.0",
-    "author" : ['OpenERP SA', "Netquatro"],
-    "category" : "Localization/Account Charts",
-    "description":
-'''
+    'name' : 'Venezuela - Accounting',
+    'version': '1.0',
+    'author': ['OpenERP SA', 'Netquatro'],
+    'category': 'Localization/Account Charts',
+    'description':
+"""
 This is the module to manage the accounting chart for Venezuela in OpenERP.
 ===========================================================================
 
 Este módulo es para manejar un catálogo de cuentas ejemplo para Venezuela.
-''',
-    "depends" : ["account", "base_vat", "account_chart"],
-    "demo_xml" : [],
-    "update_xml" : ['account_tax_code.xml',"account_chart.xml",
-                    'account_tax.xml','l10n_chart_ve_wizard.xml'],
-    "auto_install": False,
-    "installable": True,
-    "certificate" : "00763145921185574557",
+""",
+    'depends': ['account', 'base_vat', 'account_chart'],
+    'demo': [],
+    'data': ['account_tax_code.xml','account_chart.xml',
+              'account_tax.xml','l10n_chart_ve_wizard.xml'
+    ],
+    'auto_install': False,
+    'installable': True,
+    'certificate': '00763145921185574557',
     'images': ['images/config_chart_l10n_ve.jpeg','images/l10n_ve_chart.jpeg'],
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/l10n_ve/i18n/ar.po b/addons/l10n_ve/i18n/ar.po
index 6e863cf91be..50259cfe925 100644
--- a/addons/l10n_ve/i18n/ar.po
+++ b/addons/l10n_ve/i18n/ar.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_ve
 #: model:account.account.type,name:l10n_ve.account_type_receivable
@@ -30,7 +30,7 @@ msgstr "المصروفات"
 #. module: l10n_ve
 #: model:account.account.type,name:l10n_ve.account_type_equity
 msgid "Equity"
-msgstr ""
+msgstr "الأسهم"
 
 #. module: l10n_ve
 #: model:account.account.type,name:l10n_ve.account_type_tax
diff --git a/addons/l10n_ve/i18n/ca.po b/addons/l10n_ve/i18n/ca.po
index e53b2e2cdec..d88f8571956 100644
--- a/addons/l10n_ve/i18n/ca.po
+++ b/addons/l10n_ve/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_ve
 #: model:account.account.type,name:l10n_ve.account_type_receivable
diff --git a/addons/l10n_ve/i18n/da.po b/addons/l10n_ve/i18n/da.po
index bb8ad5d8413..6dc82b2bca0 100644
--- a/addons/l10n_ve/i18n/da.po
+++ b/addons/l10n_ve/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_ve
 #: model:account.account.type,name:l10n_ve.account_type_receivable
diff --git a/addons/l10n_ve/i18n/es.po b/addons/l10n_ve/i18n/es.po
index 5d1b5e23572..e2f51d228ef 100644
--- a/addons/l10n_ve/i18n/es.po
+++ b/addons/l10n_ve/i18n/es.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_ve
 #: model:account.account.type,name:l10n_ve.account_type_receivable
diff --git a/addons/l10n_ve/i18n/es_CR.po b/addons/l10n_ve/i18n/es_CR.po
index c8cb29a9f91..fedf951ffee 100644
--- a/addons/l10n_ve/i18n/es_CR.po
+++ b/addons/l10n_ve/i18n/es_CR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 "Language: es\n"
 
 #. module: l10n_ve
diff --git a/addons/l10n_ve/i18n/es_PY.po b/addons/l10n_ve/i18n/es_PY.po
index 2d02447a464..d9483b1de8f 100644
--- a/addons/l10n_ve/i18n/es_PY.po
+++ b/addons/l10n_ve/i18n/es_PY.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_ve
 #: model:account.account.type,name:l10n_ve.account_type_receivable
diff --git a/addons/l10n_ve/i18n/gl.po b/addons/l10n_ve/i18n/gl.po
index 5d6e703ec2f..d548e40b5e9 100644
--- a/addons/l10n_ve/i18n/gl.po
+++ b/addons/l10n_ve/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_ve
 #: model:account.account.type,name:l10n_ve.account_type_receivable
diff --git a/addons/l10n_ve/i18n/it.po b/addons/l10n_ve/i18n/it.po
index 48b2853f78c..8f49a34cf52 100644
--- a/addons/l10n_ve/i18n/it.po
+++ b/addons/l10n_ve/i18n/it.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_ve
 #: model:account.account.type,name:l10n_ve.account_type_receivable
diff --git a/addons/l10n_ve/i18n/pt.po b/addons/l10n_ve/i18n/pt.po
index 9eabe8a0417..a56b20773f0 100644
--- a/addons/l10n_ve/i18n/pt.po
+++ b/addons/l10n_ve/i18n/pt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_ve
 #: model:account.account.type,name:l10n_ve.account_type_receivable
diff --git a/addons/l10n_ve/i18n/pt_BR.po b/addons/l10n_ve/i18n/pt_BR.po
index 21e340093cb..c8e2163a058 100644
--- a/addons/l10n_ve/i18n/pt_BR.po
+++ b/addons/l10n_ve/i18n/pt_BR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_ve
 #: model:account.account.type,name:l10n_ve.account_type_receivable
diff --git a/addons/l10n_ve/i18n/sr@latin.po b/addons/l10n_ve/i18n/sr@latin.po
index 61bf2b492d2..068cfcd1dbf 100644
--- a/addons/l10n_ve/i18n/sr@latin.po
+++ b/addons/l10n_ve/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_ve
 #: model:account.account.type,name:l10n_ve.account_type_receivable
diff --git a/addons/l10n_ve/i18n/tr.po b/addons/l10n_ve/i18n/tr.po
index f1a85cfe0c9..007164af80e 100644
--- a/addons/l10n_ve/i18n/tr.po
+++ b/addons/l10n_ve/i18n/tr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: l10n_ve
 #: model:account.account.type,name:l10n_ve.account_type_receivable
diff --git a/addons/lunch/__openerp__.py b/addons/lunch/__openerp__.py
index ad476588e93..f84edb1db35 100644
--- a/addons/lunch/__openerp__.py
+++ b/addons/lunch/__openerp__.py
@@ -20,11 +20,11 @@
 ##############################################################################
 
 {
-    "name": "Lunch Orders",
-    "author": "OpenERP SA",
-    "version": "0.1",
-    "depends": ["base_tools"],
-    "category" : "Tools",
+    'name': 'Lunch Orders',
+    'author': 'OpenERP SA',
+    'version': '0.1',
+    'depends': ['base_tools'],
+    'category' : 'Tools',
     'description': """
 The base module to manage lunch.
 ================================
@@ -32,8 +32,7 @@ The base module to manage lunch.
 keep track for the Lunch Order, Cash Moves, CashBox, Product. Apply Different
 Category for the product.
     """,
-    "init_xml": [],
-    "update_xml": [
+    'data': [
         'security/lunch_security.xml',
         'security/ir.model.access.csv',
         'wizard/lunch_order_cancel_view.xml',
@@ -44,10 +43,10 @@ Category for the product.
         'report/report_lunch_order_view.xml',
         'lunch_installer_view.xml'
     ],
-    "demo_xml": ['lunch_demo.xml'],
-    "test": ['test/test_lunch.yml', 'test/lunch_report.yml'],
-    "installable": True,
-    "certificate" : "001292377792581874189",
+    'demo': ['lunch_demo.xml'],
+    'test': ['test/test_lunch.yml', 'test/lunch_report.yml'],
+    'installable': True,
+    'certificate' : '001292377792581874189',
     'images': ['images/cash_moves.jpeg','images/lunch_orders.jpeg','images/products.jpeg'],
 }
 
diff --git a/addons/lunch/i18n/ar.po b/addons/lunch/i18n/ar.po
index cebf22a091e..e44694042a8 100644
--- a/addons/lunch/i18n/ar.po
+++ b/addons/lunch/i18n/ar.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:40+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: lunch
 #: view:lunch.cashbox.clean:0
diff --git a/addons/lunch/i18n/bg.po b/addons/lunch/i18n/bg.po
index 9633de4c5aa..e5084e2c549 100644
--- a/addons/lunch/i18n/bg.po
+++ b/addons/lunch/i18n/bg.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:40+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: lunch
 #: view:lunch.cashbox.clean:0
diff --git a/addons/lunch/i18n/ca.po b/addons/lunch/i18n/ca.po
index 34aa572d5f4..ccd1f668811 100644
--- a/addons/lunch/i18n/ca.po
+++ b/addons/lunch/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:40+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: lunch
 #: view:lunch.cashbox.clean:0
diff --git a/addons/lunch/i18n/cs.po b/addons/lunch/i18n/cs.po
index 223258734bc..c01fcf3373e 100644
--- a/addons/lunch/i18n/cs.po
+++ b/addons/lunch/i18n/cs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:40+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 "X-Poedit-Language: Czech\n"
 
 #. module: lunch
diff --git a/addons/lunch/i18n/da.po b/addons/lunch/i18n/da.po
index bbcc10a300f..0a2e7fe4062 100644
--- a/addons/lunch/i18n/da.po
+++ b/addons/lunch/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:40+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: lunch
 #: view:lunch.cashbox.clean:0
diff --git a/addons/lunch/i18n/de.po b/addons/lunch/i18n/de.po
index 2e8762b176f..71dc88a4024 100644
--- a/addons/lunch/i18n/de.po
+++ b/addons/lunch/i18n/de.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:40+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: lunch
 #: view:lunch.cashbox.clean:0
diff --git a/addons/lunch/i18n/es.po b/addons/lunch/i18n/es.po
index 63aae7be4f0..e0782438720 100644
--- a/addons/lunch/i18n/es.po
+++ b/addons/lunch/i18n/es.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:40+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: lunch
 #: view:lunch.cashbox.clean:0
diff --git a/addons/lunch/i18n/es_CR.po b/addons/lunch/i18n/es_CR.po
index d4066ec8117..3415b8a68d5 100644
--- a/addons/lunch/i18n/es_CR.po
+++ b/addons/lunch/i18n/es_CR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:40+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 "Language: es\n"
 
 #. module: lunch
diff --git a/addons/lunch/i18n/es_PY.po b/addons/lunch/i18n/es_PY.po
index 3106f6a2a2e..954a6cd4330 100644
--- a/addons/lunch/i18n/es_PY.po
+++ b/addons/lunch/i18n/es_PY.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:40+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: lunch
 #: view:lunch.cashbox.clean:0
diff --git a/addons/lunch/i18n/fi.po b/addons/lunch/i18n/fi.po
index 38781830cd7..2a065665c1a 100644
--- a/addons/lunch/i18n/fi.po
+++ b/addons/lunch/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:40+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: lunch
 #: view:lunch.cashbox.clean:0
diff --git a/addons/lunch/i18n/fr.po b/addons/lunch/i18n/fr.po
index c474db0c272..152640fbad6 100644
--- a/addons/lunch/i18n/fr.po
+++ b/addons/lunch/i18n/fr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:40+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: lunch
 #: view:lunch.cashbox.clean:0
diff --git a/addons/lunch/i18n/gl.po b/addons/lunch/i18n/gl.po
index f94844dfabd..f84fe5e4858 100644
--- a/addons/lunch/i18n/gl.po
+++ b/addons/lunch/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:40+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: lunch
 #: view:lunch.cashbox.clean:0
diff --git a/addons/lunch/i18n/hr.po b/addons/lunch/i18n/hr.po
index 7e227800a1f..c534383e261 100644
--- a/addons/lunch/i18n/hr.po
+++ b/addons/lunch/i18n/hr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:40+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: lunch
 #: view:lunch.cashbox.clean:0
diff --git a/addons/lunch/i18n/hu.po b/addons/lunch/i18n/hu.po
index f46739be776..0b93eda8215 100644
--- a/addons/lunch/i18n/hu.po
+++ b/addons/lunch/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:40+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: lunch
 #: view:lunch.cashbox.clean:0
diff --git a/addons/lunch/i18n/it.po b/addons/lunch/i18n/it.po
index 91d248bf5e1..4fe86dc254c 100644
--- a/addons/lunch/i18n/it.po
+++ b/addons/lunch/i18n/it.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:40+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: lunch
 #: view:lunch.cashbox.clean:0
diff --git a/addons/lunch/i18n/ja.po b/addons/lunch/i18n/ja.po
index 4881ef1f9b1..46a179d8188 100644
--- a/addons/lunch/i18n/ja.po
+++ b/addons/lunch/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:40+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: lunch
 #: view:lunch.cashbox.clean:0
diff --git a/addons/lunch/i18n/nl.po b/addons/lunch/i18n/nl.po
index 047df98fd86..5317a3c7159 100644
--- a/addons/lunch/i18n/nl.po
+++ b/addons/lunch/i18n/nl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:40+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: lunch
 #: view:lunch.cashbox.clean:0
diff --git a/addons/lunch/i18n/pt.po b/addons/lunch/i18n/pt.po
index 1b1625ecb34..5920eb0984c 100644
--- a/addons/lunch/i18n/pt.po
+++ b/addons/lunch/i18n/pt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:40+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: lunch
 #: view:lunch.cashbox.clean:0
diff --git a/addons/lunch/i18n/pt_BR.po b/addons/lunch/i18n/pt_BR.po
index 5ca13c29969..38305da7217 100644
--- a/addons/lunch/i18n/pt_BR.po
+++ b/addons/lunch/i18n/pt_BR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:40+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: lunch
 #: view:lunch.cashbox.clean:0
diff --git a/addons/lunch/i18n/ro.po b/addons/lunch/i18n/ro.po
index c0e6e8d2ffb..47e0409b19a 100644
--- a/addons/lunch/i18n/ro.po
+++ b/addons/lunch/i18n/ro.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:40+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: lunch
 #: view:lunch.cashbox.clean:0
diff --git a/addons/lunch/i18n/ru.po b/addons/lunch/i18n/ru.po
index 7ec83e2c27f..9b274e5d3e3 100644
--- a/addons/lunch/i18n/ru.po
+++ b/addons/lunch/i18n/ru.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:40+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: lunch
 #: view:lunch.cashbox.clean:0
diff --git a/addons/lunch/i18n/sr@latin.po b/addons/lunch/i18n/sr@latin.po
index f3c41dcdac0..48314312862 100644
--- a/addons/lunch/i18n/sr@latin.po
+++ b/addons/lunch/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:40+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: lunch
 #: view:lunch.cashbox.clean:0
diff --git a/addons/lunch/i18n/sv.po b/addons/lunch/i18n/sv.po
index b4c88b1fe61..b7b10f93dd4 100644
--- a/addons/lunch/i18n/sv.po
+++ b/addons/lunch/i18n/sv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:40+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: lunch
 #: view:lunch.cashbox.clean:0
diff --git a/addons/lunch/i18n/tr.po b/addons/lunch/i18n/tr.po
index d68ef6d42cb..03befa9c538 100644
--- a/addons/lunch/i18n/tr.po
+++ b/addons/lunch/i18n/tr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:40+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: lunch
 #: view:lunch.cashbox.clean:0
diff --git a/addons/lunch/i18n/zh_CN.po b/addons/lunch/i18n/zh_CN.po
index aaeef553a25..704ad9ce969 100644
--- a/addons/lunch/i18n/zh_CN.po
+++ b/addons/lunch/i18n/zh_CN.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:40+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: lunch
 #: view:lunch.cashbox.clean:0
diff --git a/addons/lunch/i18n/zh_TW.po b/addons/lunch/i18n/zh_TW.po
index 45b8a36fc89..abe6d12e60d 100644
--- a/addons/lunch/i18n/zh_TW.po
+++ b/addons/lunch/i18n/zh_TW.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:40+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: lunch
 #: view:lunch.cashbox.clean:0
diff --git a/addons/mail/__init__.py b/addons/mail/__init__.py
index 289b9080fe7..da517ee17ad 100644
--- a/addons/mail/__init__.py
+++ b/addons/mail/__init__.py
@@ -20,11 +20,11 @@
 ##############################################################################
 
 import mail_alias
-import mail_message
 import mail_followers
+import mail_message
+import mail_mail
 import mail_thread
 import mail_group
-import ir_needaction
 import res_partner
 import res_users
 import report
diff --git a/addons/mail/__openerp__.py b/addons/mail/__openerp__.py
index 0e1caabcf65..99dd6bda6ac 100644
--- a/addons/mail/__openerp__.py
+++ b/addons/mail/__openerp__.py
@@ -22,13 +22,12 @@
 {
     'name': 'Social Network',
     'version': '1.0',
-    'category':'Social Network',
-    "sequence": 2,
-    "summary": "Discussions, Mailing Lists, News",
+    'category': 'Social Network',
+    'sequence': 2,
+    'summary': 'Discussions, Mailing Lists, News',
     'description': """
-A business oriented Social Networking with a fully-integrated email 
-and message management.
-=====================================================================
+A business oriented Social Networking with a fully-integrated email and message management.
+===========================================================================================
 
 The Social Networking module provides an unified social network
 abstraction layer allowing applications to display a complete 
@@ -40,6 +39,7 @@ allows to follow documents, and to be constantly updated about recent
 news.
         
 The main features of the module are:
+------------------------------------
     * a clean and renewed communication history for any OpenERP
       document that can act as a discussion topic,
     * a discussion mean on documents,
@@ -64,6 +64,7 @@ The main features of the module are:
         'wizard/mail_compose_message_view.xml',
         'res_config_view.xml',
         'mail_message_view.xml',
+        'mail_mail_view.xml',
         'mail_followers_view.xml',
         'mail_thread_view.xml',
         'mail_group_view.xml',
@@ -75,9 +76,7 @@ The main features of the module are:
         'mail_alias_view.xml',
         'res_users_view.xml',
     ],
-    'demo': [
-        'data/mail_demo.xml',
-    ],
+    'demo': ['data/mail_demo.xml'],
     'installable': True,
     'auto_install': False,
     'application': True,
diff --git a/addons/mail/data/mail_demo.xml b/addons/mail/data/mail_demo.xml
index e3d7c2ab1e1..1350fd33547 100644
--- a/addons/mail/data/mail_demo.xml
+++ b/addons/mail/data/mail_demo.xml
@@ -3,49 +3,43 @@
     <data noupdate="1">
 
         <record id="message_blogpost0" model="mail.message">
-            <field name="subject">Internal company announce</field>
             <field name="model">mail.group</field>
-            <field name="res_id" ref="group_all_employees"/>
-            <field name="content_subtype">html</field>
-            <field name="body_html"><![CDATA[Your monthly meal vouchers arrived. You can get them at Christine's office.
-This month you also have 250 EUR of eco-checks for all employees that worked with us since 1 year minimum.]]></field>
+            <field name="res_id" ref="mail.group_all_employees"/>
+            <field name="body">Your monthly meal vouchers arrived. You can get them at Christine's office.
+This month you also get 250 EUR of eco-vouchers if you have been in the company for more than a year.</field>
             <field name="type">comment</field>
-            <field name="user_id" ref="base.user_root"/>
         </record>
 
         <record id="message_blogpost0_comment0" model="mail.message">
             <field name="model">mail.group</field>
             <field name="res_id" ref="group_all_employees"/>
-            <field name="content_subtype">html</field>
-            <field name="body_html"><![CDATA[Great.]]></field>
+            <field name="body"><![CDATA[Great.]]></field>
             <field name="parent_id" ref="message_blogpost0"/>
             <field name="type">comment</field>
-            <field name="user_id" ref="base.user_root"/>
         </record>
 
         <record id="message_blogpost0_comment1" model="mail.message">
             <field name="model">mail.group</field>
             <field name="res_id" ref="group_all_employees"/>
-            <field name="content_subtype">html</field>
-            <field name="body_html"><![CDATA[Yes, that's a good news.]]></field>
+            <field name="body">Thanks, but where is Christine's office, if I may ask? (I'm new here)</field>
             <field name="parent_id" ref="message_blogpost0"/>
             <field name="type">comment</field>
-            <field name="user_id" ref="base.user_demo"/>
         </record>
 
         <record id="message_blogpost0_comment2" model="mail.message">
             <field name="model">mail.group</field>
             <field name="res_id" ref="group_all_employees"/>
-            <field name="content_subtype">html</field>
-            <field name="body_html"><![CDATA[Sure: Curabitur tempor bibendum diam, et euismod ante rutrum vel.
-
-In quis purus neque. Integer sodales dolor eu elit fringilla blandit. Maecenas lacus nisi, facilisis sit amet viverra eu, tristique vel augue.
-Donec viverra congue dui eu blandit. In lacinia molestie nulla, ut sagittis risus feugiat eu.
-
-Check the file in attachment for more information !  (third comment)]]></field>
+            <field name="body">Great news, I need to buy a new fridge, I think I can pay it with the eco-vouchers!</field>
             <field name="parent_id" ref="message_blogpost0"/>
             <field name="type">comment</field>
-            <field name="user_id" ref="base.user_root"/>
+        </record>
+
+        <record id="message_blogpost0_comment1_2" model="mail.message">
+            <field name="model">mail.group</field>
+            <field name="res_id" ref="group_all_employees"/>
+            <field name="body">Building B3, second floor on the right :-)</field>
+            <field name="parent_id" ref="message_blogpost0_comment1"/>
+            <field name="type">comment</field>
         </record>
 
         <record model="ir.config_parameter" id="user_mail_alias">
diff --git a/addons/mail/data/mail_group_data.xml b/addons/mail/data/mail_group_data.xml
index 2152706d056..53720926a5c 100644
--- a/addons/mail/data/mail_group_data.xml
+++ b/addons/mail/data/mail_group_data.xml
@@ -13,16 +13,16 @@
         </record>
 
         <!-- notify all employees of module installation -->
-        <function model="mail.group" name="message_append_note">
-            <!-- ids, subject, body, parent_id=False, type='notification', content_subtype='html' -->
-            <value eval="[ref('mail.group_all_employees')]"/>
-            <value>Welcome to OpenERP!</value>
-            <value>Your homepage is a summary of messages you received and key information about documents you follow.
+        <record model="mail.message" id="module_install_notification">
+            <field name="model">mail.group</field>
+            <field name="res_id" ref="mail.group_all_employees"/>
+            <field name="type">notification</field>
+            <field name="subject">Welcome to OpenERP!</field>
+            <field name="body">Your homepage is a summary of messages you received and key information about documents you follow.
 
 The top menu bar contains all applications you installed. You can use this &lt;i&gt;Settings&lt;/i&gt; menu to install more applications, activate others features or give access to new users.
 
-To setup your preferences (name, email signature, avatar), click on the top right corner.</value>
-        </function>
-
+To setup your preferences (name, email signature, avatar), click on the top right corner.</field>
+        </record>
     </data>
 </openerp>
diff --git a/addons/mail/doc/mail_openchatter_howto.rst b/addons/mail/doc/mail_openchatter_howto.rst
index 789acdd87eb..e4c86add7bc 100644
--- a/addons/mail/doc/mail_openchatter_howto.rst
+++ b/addons/mail/doc/mail_openchatter_howto.rst
@@ -57,7 +57,7 @@ Use the thread viewer widget inside your form view by using the mail_thread widg
 Send notifications
 +++++++++++++++++++
 
-When sending a notification is required in your workflow or business logic, use the ``message_append_note`` method. This method is a shortcut to the ``message_append`` method that takes all ``mail.message`` fields as arguments. This latter method calls ``message_create`` that
+When sending a notification is required in your workflow or business logic, use the ``message_post`` method. This method is a shortcut to the ``message_append`` method that takes all ``mail.message`` fields as arguments. This latter method calls ``message_create`` that
 
  - creates the message
  - parses the body to find users you want to push the message to (finding and parsing ``@login`` in the message body)
@@ -74,7 +74,7 @@ You should therefore not worry about subscriptions or anything else than sending
     return res
 
   def do_something_send_note(self, cr, uid, ids, context=None):
-    self.message_append_note(cr, uid, ids, _('My subject'),
+    self.message_post(cr, uid, ids, _('My subject'),
     _("has received a <b>notification</b> and is happy for it."), context=context)
 
 Notifications guidelines
@@ -147,7 +147,7 @@ The best way to direct the messages that will be displayed in the OpenChatter wi
         # add: search in the current task project messages
         '&', '&', ('res_id', '=', my_task.project_id.id), ('model', '=', 'project.project'),
         # ... containing the task name
-        '|', ('body_text', 'like', '%s' % (my_task.name)), ('body_html', 'like', '%s' % (my_task.name))
+        '|', ('body', 'like', '%s' % (my_task.name)), ('body_html', 'like', '%s' % (my_task.name))
         ] + domain, limit=limit, offset=offset, context=context)
     # if asked: add ancestor ids to have complete threads
     if (ascent): msg_ids = self._message_add_ancestor_ids(cr, uid, ids, msg_ids, root_ids, context=context)
diff --git a/addons/mail/doc/mail_state.rst b/addons/mail/doc/mail_state.rst
index 527a31ba835..fc2772bf094 100644
--- a/addons/mail/doc/mail_state.rst
+++ b/addons/mail/doc/mail_state.rst
@@ -1,15 +1,15 @@
 .. _mail_state:
 
-message_state
+message_unread
 =============
 
-``message_state`` is a boolean field that states whether the document
+``message_unread`` is a boolean field that states whether the document
 has unread messages. In previous versions, some documents were going
 back to ``pending`` state when receiving an email through the mail
 gateway. Now the state related to messages differs from the state or
 stage of the document itself.
 
-message_state and need action mechanism
+message_unread and need action mechanism
 +++++++++++++++++++++++++++++++++++++++
 
 The ``mail`` module introduces a default behavior for the need_action
@@ -23,6 +23,6 @@ mechanism [REF].
     """
     result = super(ir_needaction_mixin, self).get_needaction_user_ids(cr, uid, ids, context=context)
     for obj in self.browse(cr, uid, ids, context=context):
-      if obj.message_state == False and obj.user_id:
+      if obj.message_unread == False and obj.user_id:
         result[obj.id].append(obj.user_id.id)
     return result
diff --git a/addons/mail/i18n/ar.po b/addons/mail/i18n/ar.po
index 4a264fe8e96..afce37df26f 100644
--- a/addons/mail/i18n/ar.po
+++ b/addons/mail/i18n/ar.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:40+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: mail
 #: field:mail.compose.message,subtype:0 field:mail.message,subtype:0
diff --git a/addons/mail/i18n/bg.po b/addons/mail/i18n/bg.po
index 3c5156dcc9c..22731e69aa0 100644
--- a/addons/mail/i18n/bg.po
+++ b/addons/mail/i18n/bg.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:40+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: mail
 #: field:mail.compose.message,subtype:0 field:mail.message,subtype:0
diff --git a/addons/mail/i18n/ca.po b/addons/mail/i18n/ca.po
index 2d56066837a..db7efe926c5 100644
--- a/addons/mail/i18n/ca.po
+++ b/addons/mail/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:40+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: mail
 #: field:mail.compose.message,subtype:0 field:mail.message,subtype:0
diff --git a/addons/mail/i18n/da.po b/addons/mail/i18n/da.po
index 8b77ec859e1..886ad6c6fee 100644
--- a/addons/mail/i18n/da.po
+++ b/addons/mail/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:40+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: mail
 #: field:mail.compose.message,subtype:0 field:mail.message,subtype:0
diff --git a/addons/mail/i18n/de.po b/addons/mail/i18n/de.po
index 47076a52a1b..bf00f2d5207 100644
--- a/addons/mail/i18n/de.po
+++ b/addons/mail/i18n/de.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:40+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: mail
 #: field:mail.compose.message,subtype:0 field:mail.message,subtype:0
diff --git a/addons/mail/i18n/es.po b/addons/mail/i18n/es.po
index 35f6e936c51..ac7e7e0ee6b 100644
--- a/addons/mail/i18n/es.po
+++ b/addons/mail/i18n/es.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:40+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: mail
 #: field:mail.compose.message,subtype:0 field:mail.message,subtype:0
diff --git a/addons/mail/i18n/es_CR.po b/addons/mail/i18n/es_CR.po
index 36c0a77dee5..624db26525b 100644
--- a/addons/mail/i18n/es_CR.po
+++ b/addons/mail/i18n/es_CR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:40+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 "Language: es\n"
 
 #. module: mail
diff --git a/addons/mail/i18n/es_PY.po b/addons/mail/i18n/es_PY.po
index e202cfb32f5..fa2743b8e2f 100644
--- a/addons/mail/i18n/es_PY.po
+++ b/addons/mail/i18n/es_PY.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:40+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: mail
 #: field:mail.compose.message,subtype:0 field:mail.message,subtype:0
diff --git a/addons/mail/i18n/fi.po b/addons/mail/i18n/fi.po
index d17d3e0d3d4..b4204060a4e 100644
--- a/addons/mail/i18n/fi.po
+++ b/addons/mail/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:40+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: mail
 #: field:mail.compose.message,subtype:0 field:mail.message,subtype:0
diff --git a/addons/mail/i18n/fr.po b/addons/mail/i18n/fr.po
index 076b26689ef..ba727b36d19 100644
--- a/addons/mail/i18n/fr.po
+++ b/addons/mail/i18n/fr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:40+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: mail
 #: field:mail.compose.message,subtype:0 field:mail.message,subtype:0
diff --git a/addons/mail/i18n/gl.po b/addons/mail/i18n/gl.po
index 3e1de3af0ab..3a412453d54 100644
--- a/addons/mail/i18n/gl.po
+++ b/addons/mail/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:40+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: mail
 #: field:mail.compose.message,subtype:0 field:mail.message,subtype:0
diff --git a/addons/mail/i18n/hr.po b/addons/mail/i18n/hr.po
index 9fe02410386..0e78e7c8eac 100644
--- a/addons/mail/i18n/hr.po
+++ b/addons/mail/i18n/hr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:40+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: mail
 #: field:mail.compose.message,subtype:0 field:mail.message,subtype:0
diff --git a/addons/mail/i18n/hu.po b/addons/mail/i18n/hu.po
index 5207c68759d..7ccab506e7b 100644
--- a/addons/mail/i18n/hu.po
+++ b/addons/mail/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:40+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: mail
 #: field:mail.compose.message,subtype:0 field:mail.message,subtype:0
diff --git a/addons/mail/i18n/it.po b/addons/mail/i18n/it.po
index a8c0253ce65..95d3f6d3700 100644
--- a/addons/mail/i18n/it.po
+++ b/addons/mail/i18n/it.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:40+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: mail
 #: field:mail.compose.message,subtype:0 field:mail.message,subtype:0
diff --git a/addons/mail/i18n/ja.po b/addons/mail/i18n/ja.po
index 61c3d491f87..f869127f04c 100644
--- a/addons/mail/i18n/ja.po
+++ b/addons/mail/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:40+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: mail
 #: field:mail.compose.message,subtype:0 field:mail.message,subtype:0
diff --git a/addons/mail/i18n/lt.po b/addons/mail/i18n/lt.po
index 2cfee22ddb0..246f272ba03 100644
--- a/addons/mail/i18n/lt.po
+++ b/addons/mail/i18n/lt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:40+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: mail
 #: field:mail.compose.message,subtype:0 field:mail.message,subtype:0
diff --git a/addons/mail/i18n/lv.po b/addons/mail/i18n/lv.po
index bfdcda883e3..f7b7a0cbc5c 100644
--- a/addons/mail/i18n/lv.po
+++ b/addons/mail/i18n/lv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:40+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: mail
 #: field:mail.compose.message,subtype:0 field:mail.message,subtype:0
diff --git a/addons/mail/i18n/mn.po b/addons/mail/i18n/mn.po
index ea49507e842..e705b56d38b 100644
--- a/addons/mail/i18n/mn.po
+++ b/addons/mail/i18n/mn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:40+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: mail
 #: field:mail.compose.message,subtype:0 field:mail.message,subtype:0
diff --git a/addons/mail/i18n/nl.po b/addons/mail/i18n/nl.po
index 1a5600c5d0b..0fef9761c2f 100644
--- a/addons/mail/i18n/nl.po
+++ b/addons/mail/i18n/nl.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-09 00:36+0000\n"
-"PO-Revision-Date: 2012-05-10 17:39+0000\n"
-"Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
+"PO-Revision-Date: 2012-09-03 17:14+0000\n"
+"Last-Translator: Erwin <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: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-09-04 04:52+0000\n"
+"X-Generator: Launchpad (build 15890)\n"
 
 #. module: mail
 #: field:mail.compose.message,subtype:0 field:mail.message,subtype:0
@@ -196,7 +196,7 @@ msgstr "Ontvangers"
 #. module: mail
 #: model:ir.model,name:mail.model_mail_compose_message
 msgid "Email composition wizard"
-msgstr ""
+msgstr "E-mail samenstellen wizard"
 
 #. module: mail
 #: field:mail.compose.message,res_id:0 field:mail.message,res_id:0
diff --git a/addons/mail/i18n/pl.po b/addons/mail/i18n/pl.po
index c939ba58a87..4db3afe7733 100644
--- a/addons/mail/i18n/pl.po
+++ b/addons/mail/i18n/pl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:40+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: mail
 #: field:mail.compose.message,subtype:0 field:mail.message,subtype:0
diff --git a/addons/mail/i18n/pt.po b/addons/mail/i18n/pt.po
index 9b4283eec84..0dd39db2e5c 100644
--- a/addons/mail/i18n/pt.po
+++ b/addons/mail/i18n/pt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:40+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: mail
 #: field:mail.compose.message,subtype:0 field:mail.message,subtype:0
diff --git a/addons/mail/i18n/pt_BR.po b/addons/mail/i18n/pt_BR.po
index d9786945a70..a08977769d0 100644
--- a/addons/mail/i18n/pt_BR.po
+++ b/addons/mail/i18n/pt_BR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:40+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: mail
 #: field:mail.compose.message,subtype:0 field:mail.message,subtype:0
@@ -26,12 +26,12 @@ msgstr ""
 #. module: mail
 #: help:mail.compose.message,auto_delete:0
 msgid "Permanently delete emails after sending"
-msgstr ""
+msgstr "Excluir Permanentemente o email após o envio"
 
 #. module: mail
 #: view:mail.message:0
 msgid "Open Related Document"
-msgstr ""
+msgstr "Abrir Documento Relacionado"
 
 #. module: mail
 #: view:mail.message:0
@@ -46,7 +46,7 @@ msgstr "Detalhes da Mensagem"
 #. module: mail
 #: view:mail.thread:0
 msgid "Communication History"
-msgstr ""
+msgstr "Histórico de Comunicação"
 
 #. module: mail
 #: view:mail.message:0
@@ -57,24 +57,24 @@ msgstr "Agrupar Por..."
 #: model:ir.actions.act_window,name:mail.action_email_compose_message_wizard
 #: view:mail.compose.message:0
 msgid "Compose Email"
-msgstr ""
+msgstr "Escrever Email"
 
 #. module: mail
 #: help:mail.compose.message,body_text:0 help:mail.message,body_text:0
 #: help:mail.message.common,body_text:0
 msgid "Plain-text version of the message"
-msgstr ""
+msgstr "Versão em texto"
 
 #. module: mail
 #: view:mail.compose.message:0
 msgid "Body"
-msgstr ""
+msgstr "Corpo"
 
 #. module: mail
 #: help:mail.compose.message,email_to:0 help:mail.message,email_to:0
 #: help:mail.message.common,email_to:0
 msgid "Message recipients"
-msgstr ""
+msgstr "Destinatários da mensagem"
 
 #. module: mail
 #: field:mail.compose.message,body_text:0 field:mail.message,body_text:0
@@ -85,7 +85,7 @@ msgstr ""
 #. module: mail
 #: view:mail.message:0 selection:mail.message,state:0
 msgid "Received"
-msgstr ""
+msgstr "Recebida"
 
 #. module: mail
 #: view:mail.message:0
@@ -95,35 +95,35 @@ msgstr "Tópico"
 #. module: mail
 #: field:mail.message,mail_server_id:0
 msgid "Outgoing mail server"
-msgstr ""
+msgstr "Servidor de envio"
 
 #. module: mail
 #: selection:mail.message,state:0
 msgid "Cancelled"
-msgstr ""
+msgstr "Cancelado"
 
 #. module: mail
 #: field:mail.compose.message,reply_to:0 field:mail.message,reply_to:0
 #: field:mail.message.common,reply_to:0
 msgid "Reply-To"
-msgstr ""
+msgstr "Responder para"
 
 #. module: mail
 #: help:mail.compose.message,body_html:0 help:mail.message,body_html:0
 #: help:mail.message.common,body_html:0
 msgid "Rich-text/HTML version of the message"
-msgstr ""
+msgstr "Versão em Rich-text/HTML"
 
 #. module: mail
 #: field:mail.compose.message,auto_delete:0 field:mail.message,auto_delete:0
 msgid "Auto Delete"
-msgstr ""
+msgstr "Excluir automaticamente"
 
 #. module: mail
 #: help:mail.compose.message,email_bcc:0 help:mail.message,email_bcc:0
 #: help:mail.message.common,email_bcc:0
 msgid "Blind carbon copy message recipients"
-msgstr ""
+msgstr "Cópia oculta para os destinatários"
 
 #. module: mail
 #: model:ir.model,name:mail.model_res_partner view:mail.message:0
@@ -140,7 +140,7 @@ msgstr "Assunto"
 #: code:addons/mail/wizard/mail_compose_message.py:152
 #, python-format
 msgid "On %(date)s, "
-msgstr ""
+msgstr "Em %(date)s, "
 
 #. module: mail
 #: field:mail.compose.message,email_from:0 field:mail.message,email_from:0
@@ -151,32 +151,32 @@ msgstr "De"
 #. module: mail
 #: view:mail.message:0
 msgid "Email message"
-msgstr ""
+msgstr "Mensagem de Email"
 
 #. module: mail
 #: view:mail.compose.message:0
 msgid "Send"
-msgstr ""
+msgstr "Enviar"
 
 #. module: mail
 #: view:mail.message:0
 msgid "Failed"
-msgstr ""
+msgstr "Falhou"
 
 #. module: mail
 #: view:mail.message:0 field:mail.message,state:0
 msgid "State"
-msgstr ""
+msgstr "Situação"
 
 #. module: mail
 #: view:mail.message:0
 msgid "Reply"
-msgstr ""
+msgstr "Responder"
 
 #. module: mail
 #: view:mail.message:0 selection:mail.message,state:0
 msgid "Sent"
-msgstr ""
+msgstr "Enviado"
 
 #. module: mail
 #: help:mail.compose.message,subtype:0 help:mail.message,subtype:0
@@ -185,11 +185,13 @@ msgid ""
 "Type of message, usually 'html' or 'plain', used to select plaintext or rich "
 "text contents accordingly"
 msgstr ""
+"Tipo de mensagem, geralmente 'html' ou 'texto', usado para selecionar texto "
+"puro ou html"
 
 #. module: mail
 #: view:mail.message:0
 msgid "Recipients"
-msgstr ""
+msgstr "Destinatários"
 
 #. module: mail
 #: model:ir.model,name:mail.model_mail_compose_message
@@ -200,18 +202,18 @@ msgstr ""
 #: field:mail.compose.message,res_id:0 field:mail.message,res_id:0
 #: field:mail.message.common,res_id:0
 msgid "Related Document ID"
-msgstr ""
+msgstr "ID do Documento Relacionado"
 
 #. module: mail
 #: view:mail.message:0
 msgid "Advanced"
-msgstr ""
+msgstr "Avançado"
 
 #. module: mail
 #: code:addons/mail/wizard/mail_compose_message.py:157
 #, python-format
 msgid "Re:"
-msgstr ""
+msgstr "Re:"
 
 #. module: mail
 #: field:mail.compose.message,model:0 field:mail.message,model:0
@@ -232,7 +234,7 @@ msgstr "Pesquisar Email"
 #. module: mail
 #: help:mail.message,original:0
 msgid "Original version of the message, as it was sent on the network"
-msgstr ""
+msgstr "Versão original da mensagem, como foi enviada pela rede"
 
 #. module: mail
 #: view:mail.message:0
@@ -242,27 +244,27 @@ msgstr "Nome do Parceiro"
 #. module: mail
 #: view:mail.message:0
 msgid "Retry"
-msgstr ""
+msgstr "Tentar Novamente"
 
 #. module: mail
 #: view:mail.message:0 selection:mail.message,state:0
 msgid "Outgoing"
-msgstr ""
+msgstr "Enviando"
 
 #. module: mail
 #: view:mail.message:0
 msgid "Send Now"
-msgstr ""
+msgstr "Enviar agora"
 
 #. module: mail
 #: field:mail.message,partner_id:0
 msgid "Related partner"
-msgstr ""
+msgstr "Parceiro relacionado"
 
 #. module: mail
 #: view:mail.message:0
 msgid "User"
-msgstr ""
+msgstr "Usuário"
 
 #. module: mail
 #: field:mail.compose.message,date:0 field:mail.message,date:0
@@ -273,13 +275,13 @@ msgstr "Data"
 #. module: mail
 #: view:mail.message:0
 msgid "Extended Filters..."
-msgstr ""
+msgstr "Filtros Extendidos..."
 
 #. module: mail
 #: code:addons/mail/wizard/mail_compose_message.py:153
 #, python-format
 msgid "%(sender_name)s wrote:"
-msgstr ""
+msgstr "%(sender_name)s escreveu:"
 
 #. module: mail
 #: field:mail.compose.message,body_html:0 field:mail.message,body_html:0
@@ -290,7 +292,7 @@ msgstr ""
 #. module: mail
 #: field:mail.message,original:0
 msgid "Original"
-msgstr ""
+msgstr "Original"
 
 #. module: mail
 #: code:addons/mail/mail_thread.py:247 view:res.partner:0
@@ -302,7 +304,7 @@ msgstr "Histórico"
 #: field:mail.compose.message,message_id:0 field:mail.message,message_id:0
 #: field:mail.message.common,message_id:0
 msgid "Message-Id"
-msgstr ""
+msgstr "Cód da Mensagem"
 
 #. module: mail
 #: view:mail.compose.message:0 field:mail.compose.message,attachment_ids:0
@@ -326,6 +328,7 @@ msgstr " em "
 #: help:mail.message,auto_delete:0
 msgid "Permanently delete this email after sending it, to save space"
 msgstr ""
+"Excluir permanentemente este email depois do envio para economizar espaço"
 
 #. module: mail
 #: field:mail.compose.message,references:0 field:mail.message,references:0
@@ -341,18 +344,18 @@ msgstr "Mostrar o Texto"
 #. module: mail
 #: view:mail.compose.message:0 view:mail.message:0
 msgid "Cancel"
-msgstr ""
+msgstr "Cancelar"
 
 #. module: mail
 #: view:mail.message:0
 msgid "Open"
-msgstr ""
+msgstr "Abrir"
 
 #. module: mail
 #: code:addons/mail/mail_thread.py:434
 #, python-format
 msgid "[OpenERP-Forward-Failed] %s"
-msgstr ""
+msgstr "[OpenERP-Forward-Failed] %s"
 
 #. module: mail
 #: field:mail.message,user_id:0
@@ -366,11 +369,13 @@ msgid ""
 "Full message headers, e.g. SMTP session headers (usually available on "
 "inbound messages only)"
 msgstr ""
+"Cabeçalho completo da mensagem, Ex. SMTP session headers (geralmente "
+"disponível somente para mensagens recebidas)"
 
 #. module: mail
 #: view:mail.message:0
 msgid "Creation Month"
-msgstr ""
+msgstr "Mês de criação"
 
 #. module: mail
 #: field:mail.compose.message,email_to:0 field:mail.message,email_to:0
@@ -387,7 +392,7 @@ msgstr "Detalhes"
 #: model:ir.actions.act_window,name:mail.action_view_mailgate_thread
 #: view:mail.thread:0
 msgid "Email Threads"
-msgstr ""
+msgstr "Tópicos de Email"
 
 #. module: mail
 #: help:mail.compose.message,email_from:0 help:mail.message,email_from:0
@@ -396,28 +401,30 @@ msgid ""
 "Message sender, taken from user preferences. If empty, this is not a mail "
 "but a message."
 msgstr ""
+"Remetente da mensagem, anotado das preferências do usuário, Se estiver vazio "
+"não é um email mas uma mensagem"
 
 #. module: mail
 #: view:mail.message:0
 msgid "Body (Plain)"
-msgstr ""
+msgstr "Corpo (Simples)"
 
 #. module: mail
 #: code:addons/mail/wizard/mail_compose_message.py:153
 #, python-format
 msgid "You"
-msgstr ""
+msgstr "Você"
 
 #. module: mail
 #: help:mail.compose.message,message_id:0 help:mail.message,message_id:0
 #: help:mail.message.common,message_id:0
 msgid "Message unique identifier"
-msgstr ""
+msgstr "Identificador da mensagem"
 
 #. module: mail
 #: view:mail.message:0
 msgid "Body (Rich)"
-msgstr ""
+msgstr "Corpo (Rich)"
 
 #. module: mail
 #: code:addons/mail/mail_message.py:155
@@ -427,6 +434,9 @@ msgid ""
 " Subject: %s \n"
 "\t"
 msgstr ""
+"%s escreveu em %s: \n"
+" Assunto: %s \n"
+"\t"
 
 #. module: mail
 #: model:ir.actions.act_window,name:mail.act_res_partner_emails
@@ -456,53 +466,75 @@ msgstr "Cópia Oculta"
 #. module: mail
 #: model:ir.model,name:mail.model_mail_message_common
 msgid "mail.message.common"
-msgstr ""
+msgstr "mail.message.common"
 
 #. module: mail
 #: help:mail.compose.message,references:0 help:mail.message,references:0
 #: help:mail.message.common,references:0
 msgid "Message references, such as identifiers of previous messages"
 msgstr ""
+"Referências da mensagem, como identificadores de mensagens anteriores"
 
 #. module: mail
 #: constraint:res.partner:0
 msgid "Error ! You cannot create recursive associated members."
-msgstr ""
+msgstr "Erro! Você não pode criar recursivamente a membros associados."
 
 #. module: mail
 #: help:mail.compose.message,email_cc:0 help:mail.message,email_cc:0
 #: help:mail.message.common,email_cc:0
 msgid "Carbon copy message recipients"
-msgstr ""
+msgstr "Cópia oculta da mensagem para os destinatários"
 
 #. module: mail
 #: selection:mail.message,state:0
 msgid "Delivery Failed"
-msgstr ""
+msgstr "Falha no envio"
 
 #. module: mail
 #: model:ir.model,name:mail.model_mail_message
 msgid "Email Message"
-msgstr ""
+msgstr "Mensagem de Email"
 
 #. module: mail
 #: model:ir.model,name:mail.model_mail_thread view:mail.thread:0
 msgid "Email Thread"
-msgstr ""
+msgstr "Tópico do Email"
 
 #. module: mail
 #: field:mail.compose.message,filter_id:0
 msgid "Filters"
-msgstr ""
+msgstr "Filtros"
 
 #. module: mail
 #: code:addons/mail/mail_thread.py:220
 #, python-format
 msgid "Mail attachment"
-msgstr ""
+msgstr "Anexos"
 
 #. module: mail
 #: help:mail.compose.message,reply_to:0 help:mail.message,reply_to:0
 #: help:mail.message.common,reply_to:0
 msgid "Preferred response address for the message"
-msgstr ""
+msgstr "Endereço de resposta preferido"
+
+#~ msgid "Message type"
+#~ msgstr "Tipo de Mensagem"
+
+#~ msgid "Text contents"
+#~ msgstr "Conteúdo"
+
+#~ msgid "Related Document model"
+#~ msgstr "Modelo de Documento relacionado"
+
+#~ msgid "E-mail composition wizard"
+#~ msgstr "Assistente de composição de E-mail."
+
+#~ msgid "Rich-text contents"
+#~ msgstr "Conteúdo Rich-text"
+
+#~ msgid "Related user"
+#~ msgstr "Usuário relacionado"
+
+#~ msgid "Message headers"
+#~ msgstr "Cabeçalho da mensagem"
diff --git a/addons/mail/i18n/ro.po b/addons/mail/i18n/ro.po
index c2bb6d4aafe..1c2791c2fd0 100644
--- a/addons/mail/i18n/ro.po
+++ b/addons/mail/i18n/ro.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:40+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: mail
 #: field:mail.compose.message,subtype:0 field:mail.message,subtype:0
diff --git a/addons/mail/i18n/ru.po b/addons/mail/i18n/ru.po
index 49b9490d039..04c4d59738b 100644
--- a/addons/mail/i18n/ru.po
+++ b/addons/mail/i18n/ru.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:40+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: mail
 #: field:mail.compose.message,subtype:0 field:mail.message,subtype:0
diff --git a/addons/mail/i18n/sl.po b/addons/mail/i18n/sl.po
index b88fc2c7062..3c4e377510c 100644
--- a/addons/mail/i18n/sl.po
+++ b/addons/mail/i18n/sl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:40+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: mail
 #: field:mail.compose.message,subtype:0 field:mail.message,subtype:0
diff --git a/addons/mail/i18n/sr@latin.po b/addons/mail/i18n/sr@latin.po
index b2612459f9d..94ccc4386f3 100644
--- a/addons/mail/i18n/sr@latin.po
+++ b/addons/mail/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:40+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: mail
 #: field:mail.compose.message,subtype:0 field:mail.message,subtype:0
diff --git a/addons/mail/i18n/sv.po b/addons/mail/i18n/sv.po
index 6b612090875..64231a4d4e4 100644
--- a/addons/mail/i18n/sv.po
+++ b/addons/mail/i18n/sv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:40+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: mail
 #: field:mail.compose.message,subtype:0 field:mail.message,subtype:0
diff --git a/addons/mail/i18n/tr.po b/addons/mail/i18n/tr.po
index 8b03d2543a3..c8bc19f9a35 100644
--- a/addons/mail/i18n/tr.po
+++ b/addons/mail/i18n/tr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:40+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: mail
 #: field:mail.compose.message,subtype:0 field:mail.message,subtype:0
diff --git a/addons/mail/i18n/zh_CN.po b/addons/mail/i18n/zh_CN.po
index 1122c6c6b45..1fa1da248bc 100644
--- a/addons/mail/i18n/zh_CN.po
+++ b/addons/mail/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-02-09 00:36+0000\n"
-"PO-Revision-Date: 2012-05-10 18:19+0000\n"
-"Last-Translator: Jeff Wang <wjfonhand@hotmail.com>\n"
+"PO-Revision-Date: 2012-08-19 21:16+0000\n"
+"Last-Translator: Heling Yao <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: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:40+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: mail
 #: field:mail.compose.message,subtype:0 field:mail.message,subtype:0
@@ -194,7 +194,7 @@ msgstr "收件人"
 #. module: mail
 #: model:ir.model,name:mail.model_mail_compose_message
 msgid "Email composition wizard"
-msgstr ""
+msgstr "电子邮件撰写向导"
 
 #. module: mail
 #: field:mail.compose.message,res_id:0 field:mail.message,res_id:0
diff --git a/addons/mail/ir_needaction.py b/addons/mail/ir_needaction.py
deleted file mode 100644
index 8193ac4f385..00000000000
--- a/addons/mail/ir_needaction.py
+++ /dev/null
@@ -1,46 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2012-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 osv import osv
-
-class ir_needaction_mixin(osv.Model):
-    """ Update of ir.needaction_mixin class
-        - override the get_needaction_user_ids method to define the default
-          mail gateway need_action: when the object is unread, the object
-          responsible has an action to perform.
-    """
-    _name = 'ir.needaction_mixin'
-    _inherit = ['ir.needaction_mixin']
-    
-    def get_needaction_user_ids(self, cr, uid, ids, context=None):
-        """ Returns the user_ids that have to perform an action. It the
-            document mail state is unread (False), return object.user_id.id
-            as need_action uid.
-            :return: dict { record_id: [user_ids], }
-        """
-        result = super(ir_needaction_mixin, self).get_needaction_user_ids(cr, uid, ids, context=context)
-        for obj in self.browse(cr, uid, ids, context=context):
-            if obj.message_state == False and obj.user_id:
-                result[obj.id].append(obj.user_id.id)
-        return result
-
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/mail/mail_alias.py b/addons/mail/mail_alias.py
index 82b20f39480..27eb29051b9 100644
--- a/addons/mail/mail_alias.py
+++ b/addons/mail/mail_alias.py
@@ -19,11 +19,16 @@
 #
 ##############################################################################
 
+import logging
 import re
 import unicodedata
 
 from openerp.osv import fields, osv
 from openerp.tools import ustr
+from openerp.modules.registry import RegistryManager
+from openerp import SUPERUSER_ID
+
+_logger = logging.getLogger(__name__)
 
 # Inspired by http://stackoverflow.com/questions/517923
 def remove_accents(input_str):
@@ -87,9 +92,8 @@ class mail_alias(osv.Model):
     _defaults = {
         'alias_defaults': '{}',
         '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,1,[1],None,None)[1]
+        'alias_domain': lambda self,cr,uid,context: self._get_alias_domain(cr, SUPERUSER_ID,[1],None,None)[1]
     }
 
     _sql_constraints = [
@@ -129,6 +133,56 @@ class mail_alias(osv.Model):
             sequence = (sequence + 1) if sequence else 2
         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):
+        """ 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_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' + ...)
+            :param alias_force_key': name of the column for force_thread_id;
+                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'})
+        """
+
+        # disable the unique alias_id not null constraint, to avoid spurious warning during 
+        # super.auto_init. We'll reinstall it afterwards.
+        alias_id_column.required = False
+
+        # call _auto_init
+        child_model_auto_init_fct(cr, context=context)
+
+        registry = RegistryManager.get(cr.dbname)
+        mail_alias = registry.get('mail.alias')
+        child_class_model = registry.get(child_model_name)
+        no_alias_ids = child_class_model.search(cr, SUPERUSER_ID, [('alias_id', '=', False)], context={'active_test':False})
+        # 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]) }
+            if alias_force_key:
+                alias_vals['alias_force_thread_id'] = obj_data[alias_force_key]
+            alias_vals['alias_defaults'] = dict( (k, obj_data[v]) for k, v in alias_defaults.iteritems())
+            alias_id = mail_alias.create_unique_alias(cr, SUPERUSER_ID, alias_vals, model_name=child_model_name)
+            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'])
+
+        # Finally attempt to reinstate the missing constraint
+        try:
+            cr.execute('ALTER TABLE %s ALTER COLUMN alias_id SET NOT NULL' % (child_table_name))
+        except Exception:
+            _logger.warning("Table '%s': unable to set a NOT NULL constraint on column '%s' !\n"\
+                            "If you want to have it, you should update the records and execute manually:\n"\
+                            "ALTER TABLE %s ALTER COLUMN %s SET NOT NULL",
+                            child_table_name, 'alias_id', child_table_name, 'alias_id')
+
+        # set back the unique alias_id constraint
+        alias_id_column.required = True
+
     def create_unique_alias(self, cr, uid, vals, model_name=None, context=None):
         """Creates an email.alias record according to the values provided in ``vals``,
         with 2 alterations: the ``alias_name`` value may be suffixed in order to
diff --git a/addons/mail/mail_followers.py b/addons/mail/mail_followers.py
index fcdc78d5f0a..2aba685c4fa 100644
--- a/addons/mail/mail_followers.py
+++ b/addons/mail/mail_followers.py
@@ -21,43 +21,113 @@
 
 from osv import osv
 from osv import fields
+import tools
 
 class mail_followers(osv.Model):
     """ mail_followers holds the data related to the follow mechanism inside
-    OpenERP. Users can choose to follow documents (records) of any kind that
-    inherits from mail.thread. Following documents allow to receive
-    notifications for new messages.
-    A subscription is characterized by:
-        :param: res_model: model of the followed objects
-        :param: res_id: ID of resource (may be 0 for every objects)
-        :param: user_id: user_id of the follower
+        OpenERP. Partners can choose to follow documents (records) of any kind
+        that inherits from mail.thread. Following documents allow to receive
+        notifications for new messages.
+        A subscription is characterized by:
+            :param: res_model: model of the followed objects
+            :param: res_id: ID of resource (may be 0 for every objects)
     """
     _name = 'mail.followers'
-    _rec_name = 'id'
+    _rec_name = 'partner_id'
     _log_access = False
-    _order = 'res_model asc'
-    _description = 'Mail Document Followers'
+    _description = 'Document Followers'
     _columns = {
         'res_model': fields.char('Related Document Model', size=128,
                         required=True, select=1,
                         help='Model of the followed resource'),
         'res_id': fields.integer('Related Document ID', select=1,
                         help='Id of the followed resource'),
-        'user_id': fields.many2one('res.users', string='Related User',
+        'partner_id': fields.many2one('res.partner', string='Related Partner',
                         ondelete='cascade', required=True, select=1),
     }
 
+
 class mail_notification(osv.Model):
-    """ mail_notification is a relational table modeling messages pushed to users.
-    """
+    """ Class holding notifications pushed to partners. Followers and partners
+        added in 'contacts to notify' receive notifications. """
     _name = 'mail.notification'
-    _rec_name = 'id'
+    _rec_name = 'partner_id'
     _log_access = False
-    _order = 'message_id desc'
-    _description = 'Mail notification'
+    _description = 'Notifications'
+
     _columns = {
-        'user_id': fields.many2one('res.users', string='User',
-                        ondelete='cascade', required=True, select=1),
+        'partner_id': fields.many2one('res.partner', string='Contact',
+                        ondelete='cascade', required=True),
+        'read': fields.boolean('Read'),
         'message_id': fields.many2one('mail.message', string='Message',
-                        ondelete='cascade', required=True, select=1),
+                        ondelete='cascade', required=True),
     }
+
+    _defaults = {
+        'read': False,
+    }
+
+    def init(self, cr):
+        cr.execute('SELECT indexname FROM pg_indexes WHERE indexname = %s', ('mail_notification_partner_id_read_message_id',))
+        if not cr.fetchone():
+            cr.execute('CREATE INDEX mail_notification_partner_id_read_message_id ON mail_notification (partner_id, read, message_id)')
+
+    def create(self, cr, uid, vals, context=None):
+        """ Override of create to check that we can not create a notification
+            for a message the user can not read. """
+        if self.pool.get('mail.message').check_access_rights(cr, uid, 'read'):
+            return super(mail_notification, self).create(cr, uid, vals, context=context)
+        return False
+
+    def set_message_read(self, cr, uid, msg_id, context=None):
+        partner_id = self.pool.get('res.users').browse(cr, uid, uid, context=context).partner_id.id
+        notif_ids = self.search(cr, uid, [('partner_id', '=', partner_id), ('message_id', '=', msg_id)], context=context)
+        return self.write(cr, uid, notif_ids, {'read': True}, context=context)
+
+    def notify(self, cr, uid, partner_ids, msg_id, context=None):
+        """ Send by email the notification depending on the user preferences """
+        context = context or {}
+        # mail_noemail (do not send email) or no partner_ids: do not send, return
+        if context.get('mail_noemail') or not partner_ids:
+            return True
+
+        mail_mail = self.pool.get('mail.mail')
+        msg = self.pool.get('mail.message').browse(cr, uid, msg_id, context=context)
+
+        # add signature
+        body_html = msg.body
+        signature = msg.author_id and msg.author_id.user_ids[0].signature or ''
+        if signature:
+            body_html = tools.append_content_to_html(body_html, signature)
+
+        mail_values = {
+            'mail_message_id': msg.id,
+            'email_to': [],
+            'auto_delete': True,
+            'body_html': body_html,
+            'state': 'outgoing',
+        }
+
+        for partner in self.pool.get('res.partner').browse(cr, uid, partner_ids, context=context):
+            # Do not send an email to the writer
+            if partner.user_ids and partner.user_ids[0].id == uid:
+                continue
+            # Do not send to partners without email address defined
+            if not partner.email:
+                continue
+            # Partner does not want to receive any emails
+            if partner.notification_email_send == 'none':
+                continue
+            # Partner wants to receive only emails and comments
+            if partner.notification_email_send == 'comment' and msg.type not in ('email', 'comment'):
+                continue
+            # Partner wants to receive only emails
+            if partner.notification_email_send == 'email' and msg.type != 'email':
+                continue
+            if partner.email not in mail_values['email_to']:
+                mail_values['email_to'].append(partner.email)
+        if mail_values['email_to']:
+            mail_values['email_to'] = ', '.join(mail_values['email_to'])
+            email_notif_id = mail_mail.create(cr, uid, mail_values, context=context)
+            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 62e93430675..36f08b3814a 100644
--- a/addons/mail/mail_followers_view.xml
+++ b/addons/mail/mail_followers_view.xml
@@ -6,13 +6,12 @@
         <record model="ir.ui.view" id="view_followers_tree">
             <field name="name">mail.followers.tree</field>
             <field name="model">mail.followers</field>
-            <field name="type">tree</field>
             <field name="priority">10</field>
             <field name="arch" type="xml">
                 <tree string="Followers">
                     <field name="res_model"/>
                     <field name="res_id"/>
-                    <field name="user_id"/>
+                    <field name="partner_id"/>
                 </tree>
             </field>
         </record>
@@ -24,7 +23,7 @@
             <field name="priority">10</field>
             <field name="arch" type="xml">
                 <tree string="Notifications">
-                    <field name="user_id"/>
+                    <field name="partner_id"/>
                     <field name="message_id"/>
                 </tree>
             </field>
@@ -38,7 +37,7 @@
         </record>
 
         <record id="action_view_notifications" model="ir.actions.act_window">
-            <field name="name">Pushed notif</field>
+            <field name="name">Notifications</field>
             <field name="res_model">mail.notification</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
diff --git a/addons/mail/mail_group.py b/addons/mail/mail_group.py
index 6a14fef83aa..fdfeafd4afe 100644
--- a/addons/mail/mail_group.py
+++ b/addons/mail/mail_group.py
@@ -28,13 +28,8 @@ from osv import fields
 from tools.translate import _
 
 class mail_group(osv.Model):
-    """
-    A mail_group is a collection of users sharing messages in a discussion
-    group. Group users are users that follow the mail group, using the
-    subscription/follow mechanism of OpenSocial. A mail group has nothing
-    in common with res.users.group.
-    """
-    
+    """ A mail_group is a collection of users sharing messages in a discussion
+        group. The group mechanics are based on the followers. """
     _description = 'Discussion group'
     _name = 'mail.group'
     _inherit = ['mail.thread']
@@ -45,31 +40,16 @@ class mail_group(osv.Model):
         for obj in self.browse(cr, uid, ids, context=context):
             result[obj.id] = tools.image_get_resized_images(obj.image)
         return result
-    
+
     def _set_image(self, cr, uid, id, name, value, args, context=None):
         return self.write(cr, uid, [id], {'image': tools.image_resize_image_big(value)}, context=context)
-    
-    def _get_last_month_msg_nbr(self, cr, uid, ids, name, args, context=None):
-        result = {}
-        for id in ids:
-            lower_date = (DT.datetime.now() - DT.timedelta(days=30)).strftime(tools.DEFAULT_SERVER_DATE_FORMAT)
-            result[id] = self.message_search(cr, uid, [id], limit=None, domain=[('date', '>=', lower_date)], count=True, context=context)
-        return result
-    
-    def _get_default_image(self, cr, uid, context=None):
-        image_path = openerp.modules.get_module_resource('mail', 'static/src/img', 'groupdefault.png')
-        return tools.image_resize_image_big(open(image_path, 'rb').read().encode('base64'))
-    
+
     _columns = {
         'description': fields.text('Description'),
         'menu_id': fields.many2one('ir.ui.menu', string='Related Menu', required=True, ondelete="cascade"),
-        'responsible_id': fields.many2one('res.users', string='Responsible',
-            ondelete='set null', required=True, select=1,
-            help="Responsible of the group that has all rights on the record."),
-        'public': fields.selection([('public', 'Public'), ('private', 'Private'), ('groups', 'Selected Group Only')],
-            string='Privacy', required=True,
-            help='This group is visible by non members. '\
-                 'Invisible groups can add members through the invite button.'),
+        'public': fields.selection([('public','Public'),('private','Private'),('groups','Selected Group Only')], 'Privacy', required=True,
+            help='This group is visible by non members. \
+            Invisible groups can add members through the invite button.'),
         'group_public_id': fields.many2one('res.groups', string='Authorized Group'),
         'group_ids': fields.many2many('res.groups', rel='mail_group_res_group_rel',
             id1='mail_group_id', id2='groups_id', string='Auto Subscription',
@@ -79,7 +59,7 @@ class mail_group(osv.Model):
         'image': fields.binary("Photo",
             help="This field holds the image used as photo for the "\
                  "user. The image is base64 encoded, and PIL-supported. "\
-                 "It is limited to a 12024x1024 px image."),
+                 "It is limited to a 1024x1024 px image."),
         'image_medium': fields.function(_get_image, fnct_inv=_set_image,
             string="Medium-sized photo", type="binary", multi="_get_image",
             store = {
@@ -96,17 +76,19 @@ class mail_group(osv.Model):
             help="Small-sized photo of the group. It is automatically "\
                  "resized as a 50x50px image, with aspect ratio preserved. "\
                  "Use this field anywhere a small image is required."),
-        'last_month_msg_nbr': fields.function(_get_last_month_msg_nbr, type='integer',
-            string='Messages count for last month'),
-        'alias_id': fields.many2one('mail.alias', 'Alias', ondelete="cascade", 
-                                    help="The email address associated with this group. New emails received will automatically "
-                                         "create new topics."),
+        'alias_id': fields.many2one('mail.alias', 'Alias', ondelete="cascade", required=True,
+            help="The email address associated with this group. New emails received will automatically "
+                 "create new topics."),
     }
 
     def _get_default_employee_group(self, cr, uid, context=None):
         ref = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'base', 'group_user')
         return ref and ref[1] or False
 
+    def _get_default_image(self, cr, uid, context=None):
+        image_path = openerp.modules.get_module_resource('mail', 'static/src/img', 'groupdefault.png')
+        return tools.image_resize_image_big(open(image_path, 'rb').read().encode('base64'))
+
     def _get_menu_parent(self, cr, uid, context=None):
         ref = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'mail', 'mail_group_root')
         return ref and ref[1] or False
@@ -114,29 +96,23 @@ class mail_group(osv.Model):
     _defaults = {
         'public': 'groups',
         'group_public_id': _get_default_employee_group,
-        'responsible_id': (lambda s, cr, uid, ctx: uid),
         'image': _get_default_image,
         'parent_id': _get_menu_parent,
-        'alias_domain': False, # always hide alias during creation 
+        'alias_domain': False, # always hide alias during creation
     }
 
-    def _subscribe_user_with_group_m2m_command(self, cr, uid, ids, group_ids_command, context=None):
-        # form: {'group_ids': [(3, 10), (3, 3), (4, 10), (4, 3)]} or {'group_ids': [(6, 0, [ids]}
-        user_group_ids = [command[1] for command in group_ids_command if command[0] == 4]
-        user_group_ids += [id for command in group_ids_command if command[0] == 6 for id in command[2]]
-        # retrieve the user member of those groups
-        user_ids = []
-        res_groups_obj = self.pool.get('res.groups')
-        for group in res_groups_obj.browse(cr, uid, user_group_ids, context=context):
-            user_ids += [user.id for user in group.users]
-        # subscribe the users
-        return self.message_subscribe(cr, uid, ids, user_ids, context=context)
+    def _subscribe_users(self, cr, uid, ids, context=None):
+        for mail_group in self.browse(cr, uid, ids, context=context):
+            partner_ids = []
+            for group in mail_group.group_ids:
+                partner_ids += [user.partner_id.id for user in group.users]
+            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, 
+            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']},
@@ -148,23 +124,22 @@ class mail_group(osv.Model):
         # Create client action for this group and link the menu to it
         ref = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'mail', 'action_mail_group_feeds')
         if ref:
-            search_ref = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'mail', 'view_message_search_wall')
+            search_ref = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'mail', 'view_message_search')
             params = {
                 'search_view_id': search_ref and search_ref[1] or False,
-                'domain': [('model','=','mail.group'),('res_id','=',mail_group_id)],
-                'res_model': 'mail.group',
-                'res_id': mail_group_id,
-                'thread_level': 2
+                'domain': [('model','=','mail.group'), ('res_id','=',mail_group_id)],
+                'context': {'default_model': 'mail.group', 'default_res_id': mail_group_id},
+                'res_model': 'mail.message',
+                'thread_level': 1,
             }
             cobj = self.pool.get('ir.actions.client')
             newref = cobj.copy(cr, uid, ref[1], default={'params': str(params), 'name': vals['name']}, context=context)
             self.write(cr, uid, [mail_group_id], {'action': 'ir.actions.client,'+str(newref), 'mail_group_id': mail_group_id}, context=context)
 
         mail_alias.write(cr, uid, [vals['alias_id']], {"alias_force_thread_id": mail_group_id}, context)
-       
-        if vals.get('group_ids'):
-            self._subscribe_user_with_group_m2m_command(cr, uid, [mail_group_id], vals.get('group_ids'), context=context)
 
+        if vals.get('group_ids'):
+            self._subscribe_users(cr, uid, [mail_group_id], context=context)
         return mail_group_id
 
     def unlink(self, cr, uid, ids, context=None):
@@ -176,21 +151,17 @@ class mail_group(osv.Model):
         return res
 
     def write(self, cr, uid, ids, vals, context=None):
+        result = super(mail_group, self).write(cr, uid, ids, vals, context=context)
         if vals.get('group_ids'):
-            self._subscribe_user_with_group_m2m_command(cr, uid, ids, vals.get('group_ids'), context=context)
-        return super(mail_group, self).write(cr, uid, ids, vals, context=context)
+            self._subscribe_users(cr, uid, ids, vals.get('group_ids'), context=context)
+        return result
 
-    def action_group_join(self, cr, uid, ids, context=None):
-        return self.message_subscribe(cr, uid, ids, context=context)
+    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)
 
-    def action_group_leave(self, cr, uid, ids, context=None):
-        return self.message_unsubscribe(cr, uid, ids, context=context)
-
-    # ----------------------------------------
-    # OpenChatter methods and notifications
-    # ----------------------------------------
-
-    def message_get_monitored_follower_fields(self, cr, uid, ids, context=None):
-        """ Add 'responsible_id' to the monitored fields """
-        res = super(mail_group, self).message_get_monitored_follower_fields(cr, uid, ids, context=context)
-        return res + ['responsible_id']
+    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)
diff --git a/addons/mail/mail_group_menu.py b/addons/mail/mail_group_menu.py
index 8625285d640..25b85bb7b22 100644
--- a/addons/mail/mail_group_menu.py
+++ b/addons/mail/mail_group_menu.py
@@ -40,11 +40,12 @@ class ir_ui_menu(osv.osv):
         """ Override to take off menu entries (mail.group) the user is not
             following. """
         ids = super(ir_ui_menu, self).search(cr, uid, args, offset=0, limit=None, order=order, context=context, count=False)
+        partner_id = self.pool.get('res.users').browse(cr, uid, uid, context=context).partner_id.id
         follower_obj = self.pool.get('mail.followers')
         for menu in self.browse(cr, uid, ids, context=context):
             if menu.mail_group_id:
                 sub_ids = follower_obj.search(cr, uid, [
-                    ('user_id', '=', uid), ('res_model', '=', 'mail.group'),
+                    ('partner_id', '=', partner_id), ('res_model', '=', 'mail.group'),
                     ('res_id', '=', menu.mail_group_id.id)
                     ], context=context)
                 if not sub_ids:
diff --git a/addons/mail/mail_group_view.xml b/addons/mail/mail_group_view.xml
index a71ec972326..31beba80ecc 100644
--- a/addons/mail/mail_group_view.xml
+++ b/addons/mail/mail_group_view.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0"?>
 <openerp>
     <data>
+        <!-- this record will be dynamically adapted to each new menu created -->
         <record id="action_mail_group_feeds" model="ir.actions.client">
             <field name="name">Discussion Group</field>
             <field name="tag">mail.wall</field>
-            <field name="params" eval="{'search_view_id': ref('view_message_search_wall')}"/>
+            <field name="res_model">mail.message</field>
         </record>
 
         <!-- Group Kanban View  !-->
@@ -14,8 +15,9 @@
             <field name="priority" eval="10"/>
             <field name="arch" type="xml">
                 <kanban>
-                    <field name="message_follower_ids"/>
                     <field name="message_is_follower"/>
+                    <field name="message_follower_ids"/>
+                    <field name="message_summary"/>
                     <templates>
                         <t t-name="kanban-description">
                             <div class="oe_group_description" t-if="record.description.raw_value">
@@ -23,20 +25,16 @@
                             </div>
                         </t>
                         <t t-name="kanban-box">
-                            <div t-attf-class="{record.message_is_follower.raw_value} oe_group_vignette">
+                            <div t-attf-class="{record.message_is_follower.raw_value} oe_group_vignette oe_semantic_html_override">
                                 <div class="oe_group_image">
-                                    <a type="edit"><img t-att-src="kanban_image('mail.group', 'image_medium', record.id.value)" class="oe_group_photo" tooltip="kanban-description"/></a>
+                                    <a type="open"><img t-att-src="kanban_image('mail.group', 'image_medium', record.id.value)" class="oe_group_photo" tooltip="kanban-description"/></a>
                                 </div>
                                 <div class="oe_group_details">
-                                    <h4><a type="edit"><field name="name"/></a></h4>
+                                    <h4><a type="open"><field name="name"/></a></h4>
                                     <ul>
-                                        <!-- <li><field name="message_follower_count"/> member(s)</li> -->
-                                        <li>
-                                            <t t-raw="record.message_follower_ids.raw_value.length"/> member(s)
-                                        </li>
-                                        <li t-if="! record.message_is_follower.raw_value"><a name="action_group_join" string="Join" type="object" class="oe_group_join">Not following</a></li>
-                                        <li t-if="record.message_is_follower.raw_value"><a name="action_group_leave" string="Join" type="object" class="oe_group_leave">Following</a></li>
-                                        <li><field name="last_month_msg_nbr"/> messages last month</li>
+                                        <li><t t-raw="record.message_summary.raw_value"/></li>
+                                        <li t-if="! record.message_is_follower.raw_value"><a name="action_follow" string="Join" type="object" class="oe_group_join">Not following</a></li>
+                                        <li t-if="record.message_is_follower.raw_value"><a name="action_unfollow" string="Leave" type="object" class="oe_group_leave">Following</a></li>
                                     </ul>
                                 </div>
                             </div>
@@ -58,11 +56,11 @@
             <field name="arch" type="xml">
                 <form string="Group Form" version="7.0">
                     <sheet class="openerp_mail_group_sheet">
-                        <field name="image_small" widget='image' class="oe_avatar oe_left"/>
+                        <field name="image" widget='image' class="oe_avatar oe_left" options='{"preview_image": "image_medium"}'/>
                         <div class="oe_title">
                             <div class="oe_edit_only">
-                                <label for="name" string="Group Name"/> 
-                            </div> 
+                                <label for="name" string="Group Name"/>
+                            </div>
                             <h1><field name="name"/></h1>
                             <div name="alias_box" colspan="4" attrs="{'invisible': [('alias_domain', '=', False)]}">
                                     <field name="alias_id" invisible="1" required="0"/>
@@ -80,16 +78,12 @@
                                     />
                                 <field name="group_ids" widget="many2many_tags" class="oe_inline"/>
                             </group>
-                            <group class="oe_edit_only">
-                                <field name="responsible_id" class="oe_inline"/>
-                            </group>
                         </group>
                     </sheet>
                     <div class="oe_chatter">
                         <field name="message_ids" widget="mail_thread"
                                 options='{"thread_level": 1}'/>
-                        <field name="message_follower_ids" widget="mail_followers"
-                                context="{'lapin': 'nouille'}" image="image_small"/>
+                        <field name="message_follower_ids" widget="mail_followers"/>
                     </div>
                 </form>
             </field>
@@ -103,7 +97,6 @@
             <field name="arch" type="xml">
                 <tree string="Groups">
                     <field name="name" string="Group Name"/>
-                    <field name="responsible_id"/>
                 </tree>
             </field>
         </record>
@@ -116,14 +109,13 @@
             <field name="arch" type="xml">
                 <search string="Search Groups">
                     <field name="name" string="Group"/>
-                    <field name="responsible_id"/>
                 </search>
             </field>
         </record>
 
         <!-- group record !-->
         <record id="action_view_groups" model="ir.actions.act_window">
-            <field name="name">Groups</field>
+            <field name="name">Join a group</field>
             <field name="res_model">mail.group</field>
             <field name="view_type">form</field>
             <field name="view_mode">kanban,tree,form</field>
@@ -132,6 +124,6 @@
 
         <!-- left-side menu: Groups !-->
         <menuitem id="mail_group_root" parent="mail_feeds_main" sequence="12" name="My Groups"/>
-        <menuitem id="mail_allgroups" parent="mail_feeds" sequence="12" action="action_view_groups"/>
+        <menuitem id="mail_allgroups" parent="mail_group_root" sequence="100" action="action_view_groups"/>
     </data>
 </openerp>
diff --git a/addons/mail/mail_mail.py b/addons/mail/mail_mail.py
new file mode 100644
index 00000000000..7b593c5b998
--- /dev/null
+++ b/addons/mail/mail_mail.py
@@ -0,0 +1,204 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2010-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/>
+#
+##############################################################################
+
+# import ast
+import base64
+import logging
+import tools
+
+from osv import osv
+from osv import fields
+from tools.translate import _
+
+_logger = logging.getLogger(__name__)
+
+class mail_mail(osv.Model):
+    """ Model holding RFC2822 email messages to send. This model also provides
+        facilities to queue and send new email messages.  """
+    _name = 'mail.mail'
+    _description = 'Outgoing Mails'
+    _inherits = {'mail.message': 'mail_message_id'}
+    _order = 'id desc'
+
+    _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'),
+            ('received', 'Received'),
+            ('exception', 'Delivery Failed'),
+            ('cancel', 'Cancelled'),
+        ], 'Status', readonly=True),
+        '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'),
+        'email_cc': fields.char('Cc', help='Carbon copy message recipients'),
+        'reply_to': fields.char('Reply-To', help='Preferred response address for the message'),
+        'body_html': fields.text('Rich-text Contents', help="Rich-text/HTML message"),
+
+        # Auto-detected based on create() - if 'mail_message_id' was passed then this mail is a notification
+        # and during unlink() we will cascade delete the parent and its attachments 
+        'notification': fields.boolean('Is Notification') 
+    }
+
+    def _get_default_from(self, cr, uid, context=None):
+        cur = self.pool.get('res.users').browse(cr, uid, uid, context=context)
+        if not cur.alias_domain:
+            raise osv.except_osv(_('Invalid Action!'), _('Unable to send email, set an alias domain in your server settings.'))
+        return cur.alias_name + '@' + cur.alias_domain
+
+    _defaults = {
+        'state': 'outgoing',
+        'email_from': lambda self, cr, uid, ctx=None: self._get_default_from(cr, uid, ctx),
+    }
+
+    def create(self, cr, uid, values, context=None):
+        if 'notification' not in values and values.get('mail_message_id'):
+            values['notification'] = True
+        return super(mail_mail,self).create(cr, uid, values, context=context)
+
+    def unlink(self, cr, uid, ids, context=None):
+        # cascade-delete the parent message for all mails that are not created for a notification
+        ids_to_cascade = self.search(cr, uid, [('notification','=',False),('id','in',ids)])
+        parent_msg_ids = [m.mail_message_id.id for m in self.browse(cr, uid, ids_to_cascade, context=context)]
+        res = super(mail_mail,self).unlink(cr, uid, ids, context=context)
+        self.pool.get('mail.message').unlink(cr, uid, parent_msg_ids, context=context)
+        return res
+
+    def mark_outgoing(self, cr, uid, ids, context=None):
+        return self.write(cr, uid, ids, {'state':'outgoing'}, context=context)
+
+    def cancel(self, cr, uid, ids, context=None):
+        return self.write(cr, uid, ids, {'state':'cancel'}, context=context)
+
+    def process_email_queue(self, cr, uid, ids=None, context=None):
+        """Send immediately queued messages, committing after each
+           message is sent - this is not transactional and should
+           not be called during another transaction!
+
+           :param list ids: optional list of emails ids to send. If passed
+                            no search is performed, and these ids are used
+                            instead.
+           :param dict context: if a 'filters' key is present in context,
+                                this value will be used as an additional
+                                filter to further restrict the outgoing
+                                messages to send (by default all 'outgoing'
+                                messages are sent).
+        """
+        if context is None:
+            context = {}
+        if not ids:
+            filters = ['&', ('state', '=', 'outgoing'), ('type', '=', 'email')]
+            if 'filters' in context:
+                filters.extend(context['filters'])
+            ids = self.search(cr, uid, filters, context=context)
+        res = None
+        try:
+            # Force auto-commit - this is meant to be called by
+            # the scheduler, and we can't allow rolling back the status
+            # of previously sent emails!
+            res = self.send(cr, uid, ids, auto_commit=True, context=context)
+        except Exception:
+            _logger.exception("Failed processing mail queue")
+        return res
+
+    def _postprocess_sent_message(self, cr, uid, mail, context=None):
+        """Perform any post-processing necessary after sending ``mail``
+        successfully, including deleting it completely along with its
+        attachment if the ``auto_delete`` flag of the mail was set.
+        Overridden by subclasses for extra post-processing behaviors. 
+
+        :param browse_record mail: the mail that was just sent
+        :return: True
+        """
+        if mail.auto_delete:
+            mail.unlink()
+        return True
+
+    def _send_get_mail_subject(self, cr, uid, mail, force=False, context=None):
+        """ if void and related document: '<Author> posted on <Resource>'
+            :param mail: mail.mail browse_record """
+        if force or (not mail.subject and mail.model and mail.res_id):
+            return '%s posted on %s' % (mail.author_id.name, mail.record_name)
+        return mail.subject
+
+    def send(self, cr, uid, ids, auto_commit=False, context=None):
+        """ Sends the selected emails immediately, ignoring their current
+            state (mails that have already been sent should not be passed
+            unless they should actually be re-sent).
+            Emails successfully delivered are marked as 'sent', and those
+            that fail to be deliver are marked as 'exception', and the
+            corresponding error mail is output in the server logs.
+
+            :param bool auto_commit: whether to force a commit of the mail status
+                after sending each mail (meant only for scheduler processing);
+                should never be True during normal transactions (default: False)
+            :return: True
+        """
+        ir_mail_server = self.pool.get('ir.mail_server')
+        for mail in self.browse(cr, uid, ids, context=context):
+            try:
+                body = mail.body_html
+                subject = self._send_get_mail_subject(cr, uid, mail, context=context)
+
+                # handle attachments
+                attachments = []
+                for attach in mail.attachment_ids:
+                    attachments.append((attach.datas_fname, base64.b64decode(attach.datas)))
+
+                # use only sanitized html and set its plaintexted version as alternative
+                body_alternative = tools.html2plaintext(body)
+                content_subtype_alternative = 'plain'
+
+                # build an RFC2822 email.message.Message object and send it without queuing
+                msg = ir_mail_server.build_email(
+                    email_from = mail.email_from,
+                    email_to = tools.email_split(mail.email_to),
+                    subject = subject,
+                    body = body,
+                    body_alternative = body_alternative,
+                    email_cc = tools.email_split(mail.email_cc),
+                    reply_to = mail.reply_to,
+                    attachments = attachments,
+                    message_id = mail.message_id,
+                    references = mail.references,
+                    object_id = mail.res_id and ('%s-%s' % (mail.res_id, mail.model)),
+                    subtype = 'html',
+                    subtype_alternative = content_subtype_alternative)
+                res = ir_mail_server.send_email(cr, uid, msg,
+                    mail_server_id=mail.mail_server_id.id, context=context)
+                if res:
+                    mail.write({'state':'sent', 'message_id': res})
+                else:
+                    mail.write({'state':'exception'})
+                mail.refresh()
+                if mail.state == 'sent':
+                    self._postprocess_sent_message(cr, uid, mail, context=context)
+            except Exception:
+                _logger.exception('failed sending mail.mail %s', mail.id)
+                mail.write({'state':'exception'})
+
+            if auto_commit == True:
+                cr.commit()
+        return True
diff --git a/addons/mail/mail_mail_view.xml b/addons/mail/mail_mail_view.xml
new file mode 100644
index 00000000000..72d41e33a84
--- /dev/null
+++ b/addons/mail/mail_mail_view.xml
@@ -0,0 +1,127 @@
+<?xml version="1.0"?>
+<openerp>
+    <data>
+        <record model="ir.ui.view" id="view_mail_form">
+            <field name="name">mail.mail.form</field>
+            <field name="model">mail.mail</field>
+            <field name="arch" type="xml">
+                <form string="Email message" version="7.0">
+                    <sheet>
+                        <label for="subject" class="oe_edit_only"/>
+                        <h2><field name="subject"/></h2>
+                        <div>
+                            by <field name="author_id" class="oe_inline" string="User"/> on <field name="date" class="oe_inline"/>
+                            <button name="%(action_email_compose_message_wizard)d" string="Reply" type="action" icon="terp-mail-replied"
+                                context="{'default_composition_mode':'reply', 'default_parent_id': active_id}" states='received,sent,exception,cancel'/>
+                        </div>
+                        <notebook colspan="4">
+                            <page string="Message Details">
+                                <group>
+                                    <group>
+                                        <field name="email_from"/>
+                                        <field name="email_to"/>
+                                        <field name="email_cc"/>
+                                        <field name="reply_to"/>
+                                    </group>
+                                    <group>
+                                        <field name="partner_ids" widget="many2many_tags"/>
+                                    </group>
+                                </group>
+                                <notebook>
+                                    <page string="Body">
+                                        <field name="body_html"/>
+                                    </page>
+                                </notebook>
+                            </page>
+                            <page string="Advanced" groups="base.group_no_one">
+                                <group>
+                                    <group>
+                                        <field name="auto_delete"/>
+                                        <field name="type"/>
+                                        <field name="state" colspan="2"/>
+                                        <field name="mail_server_id"/>
+                                        <field name="model"/>
+                                        <field name="res_id"/>
+                                    </group>
+                                    <group>
+                                        <field name="message_id"/>
+                                        <field name="references"/>
+                                    </group>
+                                </group>
+                            </page>
+                            <page string="Attachments">
+                                <field name="attachment_ids"/>
+                            </page>
+                        </notebook>
+                    </sheet>
+                </form>
+            </field>
+        </record>
+
+        <record model="ir.ui.view" id="view_mail_tree">
+            <field name="name">mail.mail.tree</field>
+            <field name="model">mail.mail</field>
+            <field name="arch" type="xml">
+                <tree string="Emails" colors="grey:state in ('sent', 'cancel');blue:state=='outgoing';red:state=='exception';black:state=='received'">
+                    <field name="date"/>
+                    <field name="subject"/>
+                    <field name="author_id" string="User"/>
+                    <field name="message_id" invisible="1"/>
+                    <field name="partner_ids" invisible="1"/>
+                    <field name="model" invisible="1"/>
+                    <field name="res_id" invisible="1"/>
+                    <field name="email_from" invisible="1"/>
+                    <field name="state" invisible="1"/>
+                    <field name="type" invisible="1"/>
+                    <button name="send" string="Send Now" type="object" icon="gtk-media-play" states='outgoing'/>
+                    <button name="mark_outgoing" string="Retry" type="object" icon="gtk-redo" states='exception,cancel'/>
+                    <button name="cancel" string="Cancel" type="object" icon="terp-gtk-stop" states='outgoing'/>
+                </tree>
+            </field>
+        </record>
+
+        <record model="ir.ui.view" id="view_mail_search">
+            <field name="name">mail.mail.search</field>
+            <field name="model">mail.mail</field>
+            <field name="arch" type="xml">
+                <search string="Email Search">
+                    <field name="email_from" filter_domain="['|' '|',('email_from','ilike',self), ('email_to','ilike',self), ('subject','ilike',self)]" string="Email"/>
+                    <field name="date"/>
+                    <filter icon="terp-camera_test" name="received" string="Received" domain="[('state','=','received')]"/>
+                    <filter icon="terp-call-start" name="outgoing" string="Outgoing" domain="[('state','=','outgoing')]"/>
+                    <filter icon="terp-check" name="sent" string="Sent" domain="[('state','=','sent')]"/>
+                    <filter icon="terp-gtk-stop" name="exception" string="Failed" domain="[('state','=','exception')]"/>
+                    <separator/>
+                    <filter icon="terp-camera_test" name="type_email" string="Email" domain="[('type','=','email')]"/>
+                    <filter icon="terp-camera_test" name="type_comment" string="Comment" domain="[('type','=','comment')]"/>
+                    <filter icon="terp-camera_test" name="type_notification" string="Notification" domain="[('type','=','notification')]"/>
+                    <group expand="0" string="Extended Filters...">
+                        <field name="author_id"/>
+                        <field name="partner_ids"/>
+                        <field name="model"/>
+                        <field name="res_id"/>
+                    </group>
+                    <group expand="0" string="Group By...">
+                        <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
+                        <filter string="Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>
+                        <filter string="User" name="User" icon="terp-personal" context="{'group_by':'user_id'}"/>
+                        <filter string="Thread" icon="terp-mail-" domain="[]" context="{'group_by':'message_id'}"/>
+                        <filter string="Month" help="Creation Month" icon="terp-go-month" domain="[]" context="{'group_by':'date'}"/>
+                    </group>
+                </search>
+            </field>
+        </record>
+
+        <record id="action_view_mail_mail" model="ir.actions.act_window">
+            <field name="name">Emails</field>
+            <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="search_view_id" ref="view_mail_search"/>
+        </record>
+
+        <!-- Add menu entry in Settings/Email -->
+        <menuitem name="Emails" id="menu_mail_mail" parent="base.menu_email" action="action_view_mail_mail" />
+    </data>
+</openerp>
diff --git a/addons/mail/mail_message.py b/addons/mail/mail_message.py
index 7801a9b42d9..e4862ca9fb9 100644
--- a/addons/mail/mail_message.py
+++ b/addons/mail/mail_message.py
@@ -19,25 +19,13 @@
 #
 ##############################################################################
 
-import ast
-import base64
-import dateutil.parser
-import email
 import logging
-import re
-import time
-import datetime
-from email.header import decode_header
-from email.message import Message
-
-from openerp import SUPERUSER_ID
-from osv import osv
-from osv import fields
-import pytz
-from tools import DEFAULT_SERVER_DATETIME_FORMAT
-from tools.translate import _
 import tools
 
+from email.header import decode_header
+from operator import itemgetter
+from osv import osv, fields
+
 _logger = logging.getLogger(__name__)
 
 """ Some tools for parsing / creating email fields """
@@ -47,633 +35,309 @@ def decode(text):
         text = decode_header(text.replace('\r', ''))
         return ''.join([tools.ustr(x[0], x[1]) for x in text])
 
-def mail_tools_to_email(text):
-    """Return a list of the email addresses found in ``text``"""
-    if not text: return []
-    return re.findall(r'([^ ,<@]+@[^> ,]+)', text)
+class mail_message(osv.Model):
+    """ Messages model: system notification (replacing res.log notifications),
+        comments (OpenChatter discussion) and incoming emails. """
+    _name = 'mail.message'
+    _description = 'Message'
+    _inherit = ['ir.needaction_mixin']
+    _order = 'id desc'
 
-# TODO: remove that after cleaning
-def to_email(text):
-    return mail_tools_to_email(text)
+    _message_read_limit = 10
+    _message_record_name_length = 18
 
-class mail_message_common(osv.TransientModel):
-    """ Common abstract class for holding the main attributes of a 
-        message object. It could be reused as parent model for any
-        database model or wizard screen that needs to hold a kind of
-        message.
-        All internal logic should be in another model while this
-        model holds the basics of a message. For example, a wizard for writing
-        emails should inherit from this class and not from mail.message."""
+    def _shorten_name(self, name):
+        if len(name) <= (self._message_record_name_length + 3):
+            return name
+        return name[:self._message_record_name_length] + '...'
 
-    def get_body(self, cr, uid, ids, name, arg, context=None):
-        """ get correct body version: body_html for html messages, and
-            body_text for plain text messages
-        """
-        result = dict.fromkeys(ids, '')
-        for message in self.browse(cr, uid, ids, context=context):
-            if message.content_subtype == 'html':
-                result[message.id] = message.body_html
-            else:
-                result[message.id] = message.body_text
-        return result
-    
-    def search_body(self, cr, uid, obj, name, args, context=None):
-        # will receive:
-        #   - obj: mail.message object
-        #   - name: 'body'
-        #   - args: [('body', 'ilike', 'blah')]
-        return ['|', '&', ('content_subtype', '=', 'html'), ('body_html', args[0][1], args[0][2]), ('body_text', args[0][1], args[0][2])]
-    
-    def get_record_name(self, cr, uid, ids, name, arg, context=None):
+    def _get_record_name(self, cr, uid, ids, name, arg, context=None):
+        """ Return the related document name, using get_name. """
         result = dict.fromkeys(ids, '')
         for message in self.browse(cr, uid, ids, context=context):
             if not message.model or not message.res_id:
                 continue
-            result[message.id] = self.pool.get(message.model).name_get(cr, uid, [message.res_id], context=context)[0][1]
+            result[message.id] = self._shorten_name(self.pool.get(message.model).name_get(cr, uid, [message.res_id], context=context)[0][1])
         return result
 
+    def _get_unread(self, cr, uid, ids, name, arg, context=None):
+        """ Compute if the message is unread by the current user. """
+        res = dict((id, {'unread': False}) for id in ids)
+        partner_id = self.pool.get('res.users').browse(cr, uid, uid, context=context).partner_id.id
+        notif_obj = self.pool.get('mail.notification')
+        notif_ids = notif_obj.search(cr, uid, [
+            ('partner_id', 'in', [partner_id]),
+            ('message_id', 'in', ids),
+            ('read', '=', False)
+        ], context=context)
+        for notif in notif_obj.browse(cr, uid, notif_ids, context=context):
+            res[notif.message_id.id]['unread'] = True
+        return res
+
+    def _search_unread(self, cr, uid, obj, name, domain, context=None):
+        """ Search for messages unread by the current user. Condition is
+            inversed because we search unread message on a read column. """
+        if domain[0][2]:
+            read_cond = '(read = false or read is null)'
+        else:
+            read_cond = 'read = true'
+        partner_id = self.pool.get('res.users').browse(cr, uid, uid, context=context).partner_id.id
+        cr.execute("SELECT message_id FROM mail_notification "\
+                        "WHERE partner_id = %%s AND %s" % read_cond,
+                    (partner_id,))
+        return [('id', 'in', [r[0] for r in cr.fetchall()])]
+
     def name_get(self, cr, uid, ids, context=None):
         # name_get may receive int id instead of an id list
         if isinstance(ids, (int, long)):
             ids = [ids]
         res = []
         for message in self.browse(cr, uid, ids, context=context):
-            name = ''
-            if message.subject:
-                name = '%s: ' % (message.subject)
-            if message.body_text:
-                name = '%s%s ' % (name, message.body_text[0:20])
-            if message.date:
-                name = '%s(%s)' % (name, message.date)
-            res.append((message.id, name))
+            name = '%s: %s' % (message.subject or '', message.body or '')
+            res.append((message.id, self._shorten_name(name.lstrip(' :'))))
         return res
 
-    _name = 'mail.message.common'
-    _rec_name = 'subject'
-    _columns = {
-        'subject': fields.char('Subject', size=512),
-        'model': fields.char('Related Document Model', size=128, select=1),
-        'res_id': fields.integer('Related Document ID', select=1),
-        'record_name': fields.function(get_record_name, type='string',
-            string='Message Record Name',
-            help="Name get of the related document."),
-        'date': fields.datetime('Date'),
-        'email_from': fields.char('From', size=128, help='Message sender, taken from user preferences.'),
-        'email_to': fields.char('To', size=256, help='Message recipients'),
-        'email_cc': fields.char('Cc', size=256, help='Carbon copy message recipients'),
-        'email_bcc': fields.char('Bcc', size=256, help='Blind carbon copy message recipients'),
-        'reply_to':fields.char('Reply-To', size=256, help='Preferred response address for the message'),
-        'headers': fields.text('Message Headers', readonly=1,
-            help="Full message headers, e.g. SMTP session headers (usually available on inbound messages only)"),
-        'message_id': fields.char('Message-Id', size=256, help='Message unique identifier', select=1, readonly=1),
-        'references': fields.text('References', help='Message references, such as identifiers of previous messages', readonly=1),
-        'content_subtype': fields.char('Message content subtype', size=32,
-            oldname="subtype", readonly=1,
-            help="Type of message, usually 'html' or 'plain', used to select "\
-                  "plain-text or rich-text contents accordingly"),
-        'body_text': fields.text('Text Contents', help="Plain-text version of the message"),
-        'body_html': fields.html('Rich-text Contents', help="Rich-text/HTML version of the message"),
-        'body': fields.function(get_body, fnct_search = search_body, type='text',
-            string='Message Content', store=True,
-            help="Content of the message. This content equals the body_text field "\
-                 "for plain-test messages, and body_html for rich-text/HTML "\
-                 "messages. This allows having one field if we want to access "\
-                 "the content matching the message content_subtype."),
-        'parent_id': fields.many2one('mail.message.common', 'Parent Message',
-            select=True, ondelete='set null',
-            help="Parent message, used for displaying as threads with hierarchy"),
-    }
-
-    _defaults = {
-        'content_subtype': 'plain',
-        'date': (lambda *a: fields.datetime.now()),
-    }
-
-class mail_message(osv.Model):
-    """Model holding messages: system notification (replacing res.log
-       notifications), comments (for OpenChatter feature) and
-       RFC2822 email messages. This model also provides facilities to
-       parse, queue and send new email messages. Type of messages
-       are differentiated using the 'type' column. """
-
-    _name = 'mail.message'
-    _inherit = 'mail.message.common'
-    _description = 'Mail Message (email, comment, notification)'
-    _order = 'date desc'
-
-    def open_document(self, cr, uid, ids, context=None):
-        """ Open the message related document. Note that only the document of
-            ids[0] will be opened.
-            TODO: how to determine the action to use ?
-        """
-        action_data = False
-        if not ids:
-            return action_data
-        msg = self.browse(cr, uid, ids[0], context=context)
-        ir_act_window = self.pool.get('ir.actions.act_window')
-        action_ids = ir_act_window.search(cr, uid, [('res_model', '=', msg.model)], context=context)
-        if action_ids:
-            action_data = ir_act_window.read(cr, uid, action_ids[0], context=context)
-            action_data.update({
-                    'domain' : "[('id', '=', %d)]" % (msg.res_id),
-                    'nodestroy': True,
-                    'context': {}
-                    })
-        return action_data
-
-    def open_attachment(self, cr, uid, ids, context=None):
-        """ Open the message related attachments.
-            TODO: how to determine the action to use ?
-        """
-        action_data = False
-        if not ids:
-            return action_data
-        action_pool = self.pool.get('ir.actions.act_window')
-        messages = self.browse(cr, uid, ids, context=context)
-        att_ids = [x.id for message in messages for x in message.attachment_ids]
-        action_ids = action_pool.search(cr, uid, [('res_model', '=', 'ir.attachment')], context=context)
-        if action_ids:
-            action_data = action_pool.read(cr, uid, action_ids[0], context=context)
-            action_data.update({
-                'domain': [('id', 'in', att_ids)],
-                'nodestroy': True
-                })
-        return action_data
-    
     _columns = {
         'type': fields.selection([
-                        ('email', 'email'),
+                        ('email', 'Email'),
                         ('comment', 'Comment'),
                         ('notification', 'System notification'),
                         ], 'Type',
             help="Message type: email for email message, notification for system "\
-                  "message, comment for other messages such as user replies"),
-        'partner_id': fields.many2one('res.partner', 'Related partner',
-            help="Deprecated field. Use partner_ids instead."),
-        'partner_ids': fields.many2many('res.partner',
-            'mail_message_res_partner_rel',
-            'message_id', 'partner_id', 'Destination partners',
-            help="When sending emails through the social network composition wizard"\
-                 "you may choose to send a copy of the mail to partners."),
-        'user_id': fields.many2one('res.users', 'Related User', readonly=1),
+                 "message, comment for other messages such as user replies"),
+        'author_id': fields.many2one('res.partner', 'Author', required=True),
+        'partner_ids': fields.many2many('res.partner', 'mail_notification', 'message_id', 'partner_id', 'Recipients'),
         'attachment_ids': fields.many2many('ir.attachment', 'message_attachment_rel',
             'message_id', 'attachment_id', 'Attachments'),
-        'mail_server_id': fields.many2one('ir.mail_server', 'Outgoing mail server', readonly=1),
-        'state': fields.selection([
-                        ('outgoing', 'Outgoing'),
-                        ('sent', 'Sent'),
-                        ('received', 'Received'),
-                        ('exception', 'Delivery Failed'),
-                        ('cancel', 'Cancelled'),
-                        ], 'Status', readonly=True),
-        'auto_delete': fields.boolean('Auto Delete',
-            help="Permanently delete this email after sending it, to save space"),
-        'original': fields.binary('Original', readonly=1,
-            help="Original version of the message, as it was sent on the network"),
-        'parent_id': fields.many2one('mail.message', 'Parent Message',
-            select=True, ondelete='set null',
-            help="Parent message, used for displaying as threads with hierarchy"),
+        'parent_id': fields.many2one('mail.message', 'Parent Message', select=True, ondelete='set null', help="Initial thread message."),
         'child_ids': fields.one2many('mail.message', 'parent_id', 'Child Messages'),
+        'model': fields.char('Related Document Model', size=128, select=1),
+        'res_id': fields.integer('Related Document ID', select=1),
+        'record_name': fields.function(_get_record_name, type='string',
+            string='Message Record Name',
+            help="Name get of the related document."),
+        'notification_ids': fields.one2many('mail.notification', 'message_id', 'Notifications'),
+        'subject': fields.char('Subject'),
+        'date': fields.datetime('Date'),
+        'message_id': fields.char('Message-Id', help='Message unique identifier', select=1, readonly=1),
+        'body': fields.html('Contents', help='Automatically sanitized HTML contents'),
+        'unread': fields.function(_get_unread, fnct_search=_search_unread,
+            type='boolean', string='Unread',
+            help='Functional field to search for unread messages linked to uid'),
     }
-        
+
+    def _needaction_domain_get(self, cr, uid, context=None):
+        if self._needaction:
+            return [('unread', '=', True)]
+        return []
+
+    def _get_default_author(self, cr, uid, context=None):
+        return self.pool.get('res.users').browse(cr, uid, uid, context=context).partner_id.id
+
     _defaults = {
         'type': 'email',
-        'state': 'received',
+        'date': lambda *a: fields.datetime.now(),
+        'author_id': lambda self, cr, uid, ctx={}: self._get_default_author(cr, uid, ctx),
+        'body': '',
     }
-    
+
+    #------------------------------------------------------
+    # Message loading for web interface
+    #------------------------------------------------------
+
+    def _message_dict_get(self, cr, uid, msg, context=None):
+        """ Return a dict representation of the message browse record. """
+        attachment_ids = self.pool.get('ir.attachment').name_get(cr, uid, [x.id for x in msg.attachment_ids], context=context)
+        author_id = self.pool.get('res.partner').name_get(cr, uid, [msg.author_id.id], context=context)[0]
+        author_user_id = self.pool.get('res.users').name_get(cr, uid, [msg.author_id.user_ids[0].id], context=context)[0]
+        partner_ids = self.pool.get('res.partner').name_get(cr, uid, [x.id for x in msg.partner_ids], context=context)
+        return {
+            'id': msg.id,
+            'type': msg.type,
+            'attachment_ids': attachment_ids,
+            'body': msg.body,
+            'model': msg.model,
+            'res_id': msg.res_id,
+            'record_name': msg.record_name,
+            'subject': msg.subject,
+            'date': msg.date,
+            'author_id': author_id,
+            'author_user_id': author_user_id,
+            'partner_ids': partner_ids,
+            'child_ids': [],
+        }
+
+    def message_read_tree_flatten(self, cr, uid, messages, current_level, level, context=None):
+        """ Given a tree with several roots of following structure :
+            [   {'id': 1, 'child_ids': [
+                    {'id': 11, 'child_ids': [...] },],
+                {...}   ]
+            Flatten it to have a maximum number of levels, 0 being flat and
+            sort messages in a level according to a key of the messages.
+            Perform the flattening at leafs if above the maximum depth, then get
+            back in the tree.
+            :param context: ``sort_key``: key for sorting (id by default)
+            :param context: ``sort_reverse``: reverser order for sorting (True by default)
+        """
+        def _flatten(msg_dict):
+            """ from    {'id': x, 'child_ids': [{child1}, {child2}]}
+                get     [{'id': x, 'child_ids': []}, {child1}, {child2}]
+            """
+            child_ids = msg_dict.pop('child_ids', [])
+            msg_dict['child_ids'] = []
+            return [msg_dict] + child_ids
+            # return sorted([msg_dict] + child_ids, key=itemgetter('id'), reverse=True)
+        context = context or {}
+        # Depth-first flattening
+        for message in messages:
+            if message.get('type') == 'expandable':
+                continue
+            message['child_ids'] = self.message_read_tree_flatten(cr, uid, message['child_ids'], current_level + 1, level, context=context)
+        # Flatten if above maximum depth
+        if current_level < level:
+            return_list = messages
+        else:
+            return_list = []
+            for message in messages:
+                for flat_message in _flatten(message):
+                    return_list.append(flat_message)
+        return sorted(return_list, key=itemgetter(context.get('sort_key', 'id')), reverse=context.get('sort_reverse', True))
+
+    def message_read(self, cr, uid, ids=False, domain=[], thread_level=0, limit=None, context=None):
+        """ If IDs are provided, fetch these records. Otherwise use the domain
+            to fetch the matching records.
+            After having fetched the records provided by IDs, it will fetch the
+            parents to have well-formed threads.
+            :return list: list of trees of messages
+        """
+        limit = limit or self._message_read_limit
+        context = context or {}
+        if not ids:
+            ids = self.search(cr, uid, domain, context=context, limit=limit)
+        messages = self.browse(cr, uid, ids, context=context)
+
+        result = []
+        tree = {} # key: ID, value: record
+        for msg in messages:
+            if len(result) < (limit - 1):
+                record = self._message_dict_get(cr, uid, msg, context=context)
+                if thread_level and msg.parent_id:
+                    while msg.parent_id:
+                        if msg.parent_id.id in tree:
+                            record_parent = tree[msg.parent_id.id]
+                        else:
+                            record_parent = self._message_dict_get(cr, uid, msg.parent_id, context=context)
+                            if msg.parent_id.parent_id:
+                                tree[msg.parent_id.id] = record_parent
+                        if record['id'] not in [x['id'] for x in record_parent['child_ids']]:
+                            record_parent['child_ids'].append(record)
+                        record = record_parent
+                        msg = msg.parent_id
+                if msg.id not in tree:
+                    result.append(record)
+                    tree[msg.id] = record
+            else:
+                result.append({
+                    'type': 'expandable',
+                    'domain': [('id', '<=', msg.id)] + domain,
+                    'context': context,
+                    'thread_level': thread_level,  # should be improve accodting to level of records
+                    'id': -1,
+                })
+                break
+
+        # Flatten the result
+        if thread_level > 0:
+            result = self.message_read_tree_flatten(cr, uid, result, 0, thread_level, context=context)
+        return result
+
     #------------------------------------------------------
     # Email api
     #------------------------------------------------------
-    
+
     def init(self, cr):
         cr.execute("""SELECT indexname FROM pg_indexes WHERE indexname = 'mail_message_model_res_id_idx'""")
         if not cr.fetchone():
             cr.execute("""CREATE INDEX mail_message_model_res_id_idx ON mail_message (model, res_id)""")
 
-    def check(self, cr, uid, ids, mode, context=None, values=None):
-        """Restricts the access to a mail.message, according to referred model
-        """
-        if not ids:
-            return
-        res_ids = {}
+    def check_access_rule(self, cr, uid, ids, operation, context=None):
+        """ mail.message access rule check
+            - message received (a notification exists) -> ok
+            - check rules of related document if exists
+            - fallback on normal mail.message check """
         if isinstance(ids, (int, long)):
             ids = [ids]
-        cr.execute('SELECT DISTINCT model, res_id FROM mail_message WHERE id = ANY (%s)', (ids,))
-        for rmod, rid in cr.fetchall():
+
+        # check messages for which you have a notification
+        partner_id = self.pool.get('res.users').browse(cr, uid, uid, context=context).partner_id.id
+        not_obj = self.pool.get('mail.notification')
+        not_ids = not_obj.search(cr, uid, [
+            ('partner_id', '=', partner_id),
+            ('message_id', 'in', ids),
+        ], context=context)
+        notified_ids = [notification.message_id.id for notification in not_obj.browse(cr, uid, not_ids, context=context)
+            if notification.message_id.id in ids]
+
+        # check messages linked to an existing document
+        model_record_ids = {}
+        document_ids = []
+        cr.execute('SELECT DISTINCT id, model, res_id FROM mail_message WHERE id = ANY (%s)', (ids,))
+        for id, rmod, rid in cr.fetchall():
             if not (rmod and rid):
                 continue
-            res_ids.setdefault(rmod,set()).add(rid)
-        if values:
-            if 'res_model' in values and 'res_id' in values:
-                res_ids.setdefault(values['res_model'],set()).add(values['res_id'])
+            document_ids.append(id)
+            model_record_ids.setdefault(rmod, set()).add(rid)
+        for model, mids in model_record_ids.items():
+            model_obj = self.pool.get(model)
+            mids = model_obj.exists(cr, uid, mids)
+            model_obj.check_access_rights(cr, uid, operation)
+            model_obj.check_access_rule(cr, uid, mids, operation, context=context)
+
+        # fall back on classic operation for other ids
+        other_ids = set(ids).difference(set(notified_ids), set(document_ids))
+        super(mail_message, self).check_access_rule(cr, uid, other_ids, operation, context=None)
 
-        ima_obj = self.pool.get('ir.model.access')
-        for model, mids in res_ids.items():
-            # ignore mail messages that are not attached to a resource anymore when checking access rights
-            # (resource was deleted but message was not)
-            mids = self.pool.get(model).exists(cr, uid, mids)
-            ima_obj.check(cr, uid, model, mode)
-            self.pool.get(model).check_access_rule(cr, uid, mids, mode, context=context)
-    
     def create(self, cr, uid, values, context=None):
-        self.check(cr, uid, [], mode='create', context=context, values=values)
-        return super(mail_message, self).create(cr, uid, values, context)
+        if not values.get('message_id') and values.get('res_id') and values.get('model'):
+            values['message_id'] = tools.generate_tracking_message_id('%(model)s-%(res_id)s' % values)
+        newid = super(mail_message, self).create(cr, uid, values, context)
+        self.notify(cr, uid, newid, context=context)
+        return newid
 
-    def read(self, cr, uid, ids, fields_to_read=None, context=None, load='_classic_read'):
-        self.check(cr, uid, ids, 'read', context=context)
-        return super(mail_message, self).read(cr, uid, ids, fields_to_read, context, load)
+    def unlink(self, cr, uid, ids, context=None):
+        # cascade-delete attachments that are directly attached to the message (should only happen
+        # for mail.messages that act as parent for a standalone mail.mail record.
+        attachments_to_delete = []
+        for mail in self.browse(cr, uid, ids, context=context):
+            for attach in mail.attachment_ids:
+                if attach.res_model == 'mail.message' and attach.res_id == mail.id:
+                    attachments_to_delete.append(attach.id)
+        if attachments_to_delete:
+            self.pool.get('ir.attachment').unlink(cr, uid, attachments_to_delete, context=context)
+        return super(mail_message,self).unlink(cr, uid, ids, context=context)
+
+    def notify(self, cr, uid, newid, context=None):
+        """ Add the related record followers to the destination partner_ids.
+            Call mail_notification.notify to manage the email sending
+        """
+        message = self.browse(cr, uid, newid, context=context)
+        partners_to_notify = set([])
+        # add all partner_ids of the message
+        if message.partner_ids:
+            partners_to_notify |= set(partner.id for partner in message.partner_ids)
+        # add all followers and set add them in partner_ids
+        if message.model and message.res_id:
+            record = self.pool.get(message.model).browse(cr, uid, message.res_id, context=context)
+            extra_notified = set(partner.id for partner in record.message_follower_ids)
+            missing_notified = extra_notified - partners_to_notify
+            if missing_notified:
+                message.write({'partner_ids': [(4, p_id) for p_id in missing_notified]})
+            partners_to_notify |= extra_notified
+        self.pool.get('mail.notification').notify(cr, uid, list(partners_to_notify), newid, context=context)
 
     def copy(self, cr, uid, id, default=None, context=None):
         """Overridden to avoid duplicating fields that are unique to each email"""
         if default is None:
             default = {}
-        self.check(cr, uid, [id], 'read', context=context)
-        default.update(message_id=False, original=False, headers=False)
-        return super(mail_message,self).copy(cr, uid, id, default=default, context=context)
-    
-    def write(self, cr, uid, ids, vals, context=None):
-        self.check(cr, uid, ids, 'write', context=context, values=vals)
-        return super(mail_message, self).write(cr, uid, ids, vals, context)
-
-    def unlink(self, cr, uid, ids, context=None):
-        self.check(cr, uid, ids, 'unlink', context=context)
-        return super(mail_message, self).unlink(cr, uid, ids, context)
-
-    def schedule_with_attach(self, cr, uid, email_from, email_to, subject, body, model=False, type='email',
-                             email_cc=None, email_bcc=None, reply_to=False, partner_ids=None, attachments=None,
-                             message_id=False, references=False, res_id=False, content_subtype='plain',
-                             headers=None, mail_server_id=False, auto_delete=False, context=None):
-        """ Schedule sending a new email message, to be sent the next time the
-            mail scheduler runs, or the next time :meth:`process_email_queue` is
-            called explicitly.
-
-            :param string email_from: sender email address
-            :param list email_to: list of recipient addresses (to be joined with commas) 
-            :param string subject: email subject (no pre-encoding/quoting necessary)
-            :param string body: email body, according to the ``content_subtype`` 
-                (by default, plaintext). If html content_subtype is used, the
-                message will be automatically converted to plaintext and wrapped
-                in multipart/alternative.
-            :param list email_cc: optional list of string values for CC header
-                (to be joined with commas)
-            :param list email_bcc: optional list of string values for BCC header
-                (to be joined with commas)
-            :param string model: optional model name of the document this mail
-                is related to (this will also be used to generate a tracking id,
-                used to match any response related to the same document)
-            :param int res_id: optional resource identifier this mail is related
-                to (this will also be used to generate a tracking id, used to
-                match any response related to the same document)
-            :param string reply_to: optional value of Reply-To header
-            :param partner_ids: destination partner_ids
-            :param string content_subtype: optional mime content_subtype for
-                the text body (usually 'plain' or 'html'), must match the format
-                of the ``body`` parameter. Default is 'plain', making the content
-                part of the mail "text/plain".
-            :param dict attachments: map of filename to filecontents, where
-                filecontents is a string containing the bytes of the attachment
-            :param dict headers: optional map of headers to set on the outgoing
-                mail (may override the other headers, including Subject,
-                Reply-To, Message-Id, etc.)
-            :param int mail_server_id: optional id of the preferred outgoing
-                mail server for this mail
-            :param bool auto_delete: optional flag to turn on auto-deletion of
-                the message after it has been successfully sent (default to False)
-        """
-        if context is None:
-            context = {}
-        if attachments is None:
-            attachments = {}
-        if partner_ids is None:
-            partner_ids = []
-        attachment_obj = self.pool.get('ir.attachment')
-        for param in (email_to, email_cc, email_bcc):
-            if param and not isinstance(param, list):
-                param = [param]
-        msg_vals = {
-                'subject': subject,
-                'date': fields.datetime.now(),
-                'user_id': uid,
-                'model': model,
-                'res_id': res_id,
-                'type': type,
-                'body_text': body if content_subtype != 'html' else False,
-                'body_html': body if content_subtype == 'html' else False,
-                'email_from': email_from,
-                'email_to': email_to and ','.join(email_to) or '',
-                'email_cc': email_cc and ','.join(email_cc) or '',
-                'email_bcc': email_bcc and ','.join(email_bcc) or '',
-                'partner_ids': partner_ids,
-                'reply_to': reply_to,
-                'message_id': message_id,
-                'references': references,
-                'content_subtype': content_subtype,
-                'headers': headers, # serialize the dict on the fly
-                'mail_server_id': mail_server_id,
-                'state': 'outgoing',
-                'auto_delete': auto_delete
-            }
-        email_msg_id = self.create(cr, uid, msg_vals, context)
-        attachment_ids = []
-        for attachment in attachments:
-            fname, fcontent = attachment
-            attachment_data = {
-                    'name': fname,
-                    'datas_fname': fname,
-                    'datas': fcontent and fcontent.encode('base64'),
-                    'res_model': self._name,
-                    'res_id': email_msg_id,
-            }
-            if context.has_key('default_type'):
-                del context['default_type']
-            attachment_ids.append(attachment_obj.create(cr, uid, attachment_data, context))
-        if attachment_ids:
-            self.write(cr, uid, email_msg_id, { 'attachment_ids': [(6, 0, attachment_ids)]}, context=context)
-        return email_msg_id
-
-    def mark_outgoing(self, cr, uid, ids, context=None):
-        return self.write(cr, uid, ids, {'state':'outgoing'}, context=context)
-
-    def cancel(self, cr, uid, ids, context=None):
-        return self.write(cr, uid, ids, {'state':'cancel'}, context=context)
-
-    def process_email_queue(self, cr, uid, ids=None, context=None):
-        """Send immediately queued messages, committing after each
-           message is sent - this is not transactional and should
-           not be called during another transaction!
-
-           :param list ids: optional list of emails ids to send. If passed
-                            no search is performed, and these ids are used
-                            instead.
-           :param dict context: if a 'filters' key is present in context,
-                                this value will be used as an additional
-                                filter to further restrict the outgoing
-                                messages to send (by default all 'outgoing'
-                                messages are sent).
-        """
-        if context is None:
-            context = {}
-        if not ids:
-            filters = ['&', ('state', '=', 'outgoing'), ('type', '=', 'email')]
-            if 'filters' in context:
-                filters.extend(context['filters'])
-            ids = self.search(cr, uid, filters, context=context)
-        res = None
-        try:
-            # Force auto-commit - this is meant to be called by
-            # the scheduler, and we can't allow rolling back the status
-            # of previously sent emails!
-            res = self.send(cr, uid, ids, auto_commit=True, context=context)
-        except Exception:
-            _logger.exception("Failed processing mail queue")
-        return res
-
-    def parse_message(self, message, save_original=False, context=None):
-        """Parses a string or email.message.Message representing an
-           RFC-2822 email, and returns a generic dict holding the
-           message details.
-
-           :param message: the message to parse
-           :type message: email.message.Message | string | unicode
-           :param bool save_original: whether the returned dict
-               should include an ``original`` entry with the base64
-               encoded source of the message.
-           :rtype: dict
-           :return: A dict with the following structure, where each
-                    field may not be present if missing in original
-                    message::
-
-                    { 'message-id': msg_id,
-                      'subject': subject,
-                      'from': from,
-                      'to': to,
-                      'cc': cc,
-                      'headers' : { 'X-Mailer': mailer,
-                                    #.. all X- headers...
-                                  },
-                      'content_subtype': msg_mime_subtype,
-                      'body_text': plaintext_body
-                      'body_html': html_body,
-                      'attachments': [('file1', 'bytes'),
-                                       ('file2', 'bytes') }
-                       # ...
-                       'original': source_of_email,
-                    }
-        """
-        msg_txt = message
-        if isinstance(message, str):
-            msg_txt = email.message_from_string(message)
-
-        # Warning: message_from_string doesn't always work correctly on unicode,
-        # we must use utf-8 strings here :-(
-        if isinstance(message, unicode):
-            message = message.encode('utf-8')
-            msg_txt = email.message_from_string(message)
-
-        message_id = msg_txt.get('message-id', False)
-        msg = {}
-
-        if save_original:
-            # save original, we need to be able to read the original email sometimes
-            msg['original'] = message.as_string() if isinstance(message, Message) \
-                                                  else message
-            msg['original'] = base64.b64encode(msg['original']) # binary fields are b64
-
-        if not message_id:
-            # Very unusual situation, be we should be fault-tolerant here
-            message_id = time.time()
-            msg_txt['message-id'] = message_id
-            _logger.info('Parsing Message without message-id, generating a random one: %s', message_id)
-
-        msg_fields = msg_txt.keys()
-        msg['id'] = message_id
-        msg['message-id'] = message_id
-
-        if 'Subject' in msg_fields:
-            msg['subject'] = decode(msg_txt.get('Subject'))
-
-        if 'Content-Type' in msg_fields:
-            msg['content-type'] = msg_txt.get('Content-Type')
-
-        if 'From' in msg_fields:
-            msg['from'] = decode(msg_txt.get('From') or msg_txt.get_unixfrom())
-
-        if 'To' in msg_fields:
-            msg['to'] = decode(msg_txt.get('To'))
-
-        if 'Delivered-To' in msg_fields:
-            msg['to'] = decode(msg_txt.get('Delivered-To'))
-
-        if 'CC' in msg_fields:
-            msg['cc'] = decode(msg_txt.get('CC'))
-
-        if 'Cc' in msg_fields:
-            msg['cc'] = decode(msg_txt.get('Cc'))
-
-        if 'Reply-To' in msg_fields:
-            msg['reply'] = decode(msg_txt.get('Reply-To'))
-
-        if 'Date' in msg_fields:
-            date_hdr = decode(msg_txt.get('Date'))
-            # convert from email timezone to server timezone
-            date_server_datetime = dateutil.parser.parse(date_hdr).astimezone(pytz.timezone(tools.get_server_timezone()))
-            date_server_datetime_str = date_server_datetime.strftime(DEFAULT_SERVER_DATETIME_FORMAT)
-            msg['date'] = date_server_datetime_str
-
-        if 'Content-Transfer-Encoding' in msg_fields:
-            msg['encoding'] = msg_txt.get('Content-Transfer-Encoding')
-
-        if 'References' in msg_fields:
-            msg['references'] = msg_txt.get('References')
-
-        if 'In-Reply-To' in msg_fields:
-            msg['in-reply-to'] = msg_txt.get('In-Reply-To')
-
-        msg['headers'] = {}
-        msg['content_subtype'] = 'plain'
-        for item in msg_txt.items():
-            if item[0].startswith('X-'):
-                msg['headers'].update({item[0]: item[1]})
-        if not msg_txt.is_multipart() or 'text/plain' in msg.get('content-type', ''):
-            encoding = msg_txt.get_content_charset()
-            body = msg_txt.get_payload(decode=True)
-            if 'text/html' in msg.get('content-type', ''):
-                msg['body_html'] =  body
-                msg['content_subtype'] = 'html'
-                if body:
-                    body = tools.html2plaintext(body)
-            msg['body_text'] = tools.ustr(body, encoding)
-
-        attachments = []
-        if msg_txt.is_multipart() or 'multipart/alternative' in msg.get('content-type', ''):
-            body = ""
-            if 'multipart/alternative' in msg.get('content-type', ''):
-                msg['content_subtype'] = 'alternative'
-            else:
-                msg['content_subtype'] = 'mixed'
-            for part in msg_txt.walk():
-                if part.get_content_maintype() == 'multipart':
-                    continue
-
-                encoding = part.get_content_charset()
-                filename = part.get_filename()
-                if part.get_content_maintype()=='text':
-                    content = part.get_payload(decode=True)
-                    if filename:
-                        attachments.append((filename, content))
-                    content = tools.ustr(content, encoding)
-                    if part.get_content_subtype() == 'html':
-                        msg['body_html'] = content
-                        msg['content_subtype'] = 'html' # html version prevails
-                        body = tools.ustr(tools.html2plaintext(content))
-                        body = body.replace('&#13;', '')
-                    elif part.get_content_subtype() == 'plain':
-                        body = content
-                elif part.get_content_maintype() in ('application', 'image'):
-                    if filename :
-                        attachments.append((filename,part.get_payload(decode=True)))
-                    else:
-                        res = part.get_payload(decode=True)
-                        body += tools.ustr(res, encoding)
-
-            msg['body_text'] = body
-        msg['attachments'] = attachments
-
-        # for backwards compatibility:
-        msg['body'] = msg['body_text']
-        msg['sub_type'] = msg['content_subtype'] or 'plain'
-        return msg
-
-    def _postprocess_sent_message(self, cr, uid, message, context=None):
-        """Perform any post-processing necessary after sending ``message``
-        successfully, including deleting it completely along with its
-        attachment if the ``auto_delete`` flag of the message was set.
-        Overridden by subclasses for extra post-processing behaviors. 
-
-        :param browse_record message: the message that was just sent
-        :return: True
-        """
-        if message.auto_delete:
-            self.pool.get('ir.attachment').unlink(cr, uid,
-                [x.id for x in message.attachment_ids
-                    if x.res_model == self._name and x.res_id == message.id],
-                context=context)
-            message.unlink()
-        return True
-
-    def send(self, cr, uid, ids, auto_commit=False, context=None):
-        """Sends the selected emails immediately, ignoring their current
-           state (mails that have already been sent should not be passed
-           unless they should actually be re-sent).
-           Emails successfully delivered are marked as 'sent', and those
-           that fail to be deliver are marked as 'exception', and the
-           corresponding error message is output in the server logs.
-
-           :param bool auto_commit: whether to force a commit of the message
-                                    status after sending each message (meant
-                                    only for processing by the scheduler),
-                                    should never be True during normal
-                                    transactions (default: False)
-           :return: True
-        """
-        ir_mail_server = self.pool.get('ir.mail_server')
-        self.write(cr, uid, ids, {'state': 'outgoing'}, context=context)
-        for message in self.browse(cr, uid, ids, context=context):
-            try:
-                attachments = []
-                for attach in message.attachment_ids:
-                    attachments.append((attach.datas_fname, base64.b64decode(attach.datas)))
-
-                body = message.body_html if message.content_subtype == 'html' else message.body_text
-                body_alternative = None
-                content_subtype_alternative = None
-                if message.content_subtype == 'html' and message.body_text:
-                    # we have a plain text alternative prepared, pass it to 
-                    # build_message instead of letting it build one
-                    body_alternative = message.body_text
-                    content_subtype_alternative = 'plain'
-
-                # handle destination_partners
-                partner_ids_email_to = ''
-                for partner in message.partner_ids:
-                    partner_ids_email_to += '%s ' % (partner.email or '')
-                message_email_to = '%s %s' % (partner_ids_email_to, message.email_to or '')
-
-                # build an RFC2822 email.message.Message object and send it
-                # without queuing
-                msg = ir_mail_server.build_email(
-                    email_from=message.email_from,
-                    email_to=mail_tools_to_email(message_email_to),
-                    subject=message.subject,
-                    body=body,
-                    body_alternative=body_alternative,
-                    email_cc=mail_tools_to_email(message.email_cc),
-                    email_bcc=mail_tools_to_email(message.email_bcc),
-                    reply_to=message.reply_to,
-                    attachments=attachments, message_id=message.message_id,
-                    references = message.references,
-                    object_id=message.res_id and ('%s-%s' % (message.res_id,message.model)),
-                    subtype=message.content_subtype,
-                    subtype_alternative=content_subtype_alternative,
-                    headers=message.headers and ast.literal_eval(message.headers))
-                res = ir_mail_server.send_email(cr, uid, msg,
-                                                mail_server_id=message.mail_server_id.id,
-                                                context=context)
-                if res:
-                    message.write({'state':'sent', 'message_id': res, 'email_to': message_email_to})
-                else:
-                    message.write({'state':'exception', 'email_to': message_email_to})
-                message.refresh()
-                if message.state == 'sent':
-                    self._postprocess_sent_message(cr, uid, message, context=context)
-            except Exception:
-                _logger.exception('failed sending mail.message %s', message.id)
-                message.write({'state':'exception'})
-
-            if auto_commit == True:
-                cr.commit()
-        return True
-
-
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+        default.update(message_id=False, headers=False)
+        return super(mail_message, self).copy(cr, uid, id, default=default, context=context)
diff --git a/addons/mail/mail_message_view.xml b/addons/mail/mail_message_view.xml
index 0aa5261d7e7..914937a34f3 100644
--- a/addons/mail/mail_message_view.xml
+++ b/addons/mail/mail_message_view.xml
@@ -2,15 +2,15 @@
 <openerp>
     <data>
         <!-- mail.message tree: short view !-->
-        <record model="ir.ui.view" id="view_message_tree_short">
-            <field name="name">mail.message.tree.short</field>
+        <record model="ir.ui.view" id="view_message_tree">
+            <field name="name">mail.message.tree</field>
             <field name="model">mail.message</field>
             <field name="priority">20</field>
             <field name="arch" type="xml">
                 <tree string="Messages">
                     <field name="date"/>
                     <field name="subject"/>
-                    <field name="user_id"/>
+                    <field name="author_id"/>
                     <field name="model"/>
                     <field name="res_id"/>
                 </tree>
@@ -18,8 +18,8 @@
         </record>
 
         <!-- mail.message form: short view !-->
-        <record model="ir.ui.view" id="view_message_form_short">
-            <field name="name">mail.message.form.short</field>
+        <record model="ir.ui.view" id="view_message_form">
+            <field name="name">mail.message.form</field>
             <field name="model">mail.message</field>
             <field name="priority">20</field>
             <field name="arch" type="xml">
@@ -28,10 +28,9 @@
                         <group>
                             <group>
                                 <field name="subject"/>
-                                <field name="user_id"/>
+                                <field name="author_id"/>
                                 <field name="date"/>
                                 <field name="type"/>
-                                <field name="content_subtype"/>
                             </group>
                             <group>
                                 <field name="model"/>
@@ -40,45 +39,22 @@
                                 <field name="partner_ids" widget="many2many_tags"/>
                             </group>
                         </group>
-                        <notebook>
-                            <page string="Body (Rich)">
-                                <field name="body_html"/>
-                            </page>
-                            <page string="Body (Plain)">
-                                <field name="body_text" widget="text"/>
-                            </page>
-                        </notebook>
+                        <field name="body"/>
                     </sheet>
                 </form>
             </field>
         </record>
 
-        <!-- mail.message search: short view !-->
-        <record model="ir.ui.view" id="view_message_search_short">
-            <field name="name">mail.message.search.short</field>
-            <field name="model">mail.message</field>
-            <field name="priority">20</field>
-            <field name="arch" type="xml">
-                <search string="Messages Search">
-                    <field name="model" string="Message"/>
-                    <field name="date"/>
-                    <field name="user_id"/>
-                </search>
-            </field>
-        </record>
-
         <!-- mail.message search: wall view !-->
-        <record model="ir.ui.view" id="view_message_search_wall">
-            <field name="name">mail.message.search.wall</field>
+        <record model="ir.ui.view" id="view_message_search">
+            <field name="name">mail.message.search</field>
             <field name="model">mail.message</field>
             <field name="priority">25</field>
             <field name="arch" type="xml">
                 <search string="Messages Search">
                     <field name="subject" string="Content" filter_domain="['|', ('subject', 'ilike', self), ('body', 'ilike', self)]" />
                     <field name="type"/>
-                    <filter icon="terp-personal+" string="My Feeds"
-                            name="my_feeds" help="My Feeds"
-                            domain="[('user_id','=',uid)]"/>
+                    <field name="author_id"/>
                     <filter icon="terp-personal+" string="Comments"
                             name="comments" help="Comments"
                             domain="[('type', '=', 'comment')]"/>
@@ -88,159 +64,17 @@
                     <filter icon="terp-personal+" string="Emails"
                             name="emails" help="Emails"
                             domain="[('type', '=', 'email')]"/>
-                    <filter icon="terp-go-today" string="Today"
-                            name="today" help="Today"
-                            domain="[   ('date', '&lt;=', datetime.date.today().strftime('%%Y-%%m-%%d 23:59:59')),
-                                        ('date', '&gt;=', datetime.date.today().strftime('%%Y-%%m-%%d 00:00:00'))
-                                    ]"/>
-                    <filter icon="terp-go-week" string="This week"
-                            name="7_days" help="This week"
-                            domain="[   ('date', '&lt;=', datetime.date.today().strftime('%%Y-%%m-%%d 23:59:59')),
-                                        ('date', '&gt;=', (datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d 00:00:00'))
-                                    ]"/>
-                    <field name="user_id"/>
+                    <field name="author_id"/>
                 </search>
             </field>
         </record>
 
-        <record model="ir.ui.view" id="view_email_message_form">
-            <field name="name">mail.message.form</field>
-            <field name="model">mail.message</field>
-            <field name="arch" type="xml">
-                <form string="Email message" version="7.0">
-                    <sheet>
-                        <label for="subject" class="oe_edit_only"/>
-                        <h2><field name="subject"/></h2>
-						<div>
-                            by <field name="user_id" class="oe_inline" string="User"/> on <field name="date" class="oe_inline"/>
-                            <button name="%(action_email_compose_message_wizard)d" string="Reply" type="action" icon="terp-mail-replied"
-                                context="{'mail.compose.message.mode':'reply', 'message_id':active_id}" states='received,sent,exception,cancel'/>
-                        </div>
-                        <notebook colspan="4">
-                            <page string="Message Details">
-                                <group>
-                                    <group>
-                                        <field name="email_from"/>
-                                        <field name="email_to"/>
-                                        <field name="email_cc"/>
-                                        <field name="email_bcc"/>
-                                        <field name="reply_to"/>
-                                    </group>
-                                    <group>
-                                        <field name="partner_id" readonly="1"/>
-                                        <field name="partner_ids" widget="many2many_tags"/>
-                                    </group>
-                                </group>
-                                <notebook>
-                                    <page string="Body (Rich)">
-                                        <field name="body_html"/>
-                                    </page>
-                                    <page string="Body (Plain)">
-                                        <field name="body_text" widget="text"/>
-                                    </page>
-                                </notebook>
-                            </page>
-                            <page string="Advanced" groups="base.group_no_one">
-                                <group>
-                                    <group>
-                                        <field name="auto_delete"/>
-                                        <field name="type"/>
-                                        <field name="content_subtype"/>
-                                        <field name="state" colspan="2"/>
-                                        <field name="mail_server_id"/>
-                                        <field name="original"/>
-                                        <field name="model"/>
-                                        <field name="res_id"/>
-                                        <button name="open_document" string="Open" type="object" icon="gtk-jump-to" colspan="2"
-                                            attrs="{'invisible':['|', ('model', '=', ''), ('res_id', '=', False)]}"/>
-                                    </group>
-                                    <group>
-                                        <field name="message_id"/>
-                                        <field name="references"/>
-                                        <field name="headers"/>
-                                    </group>
-                                </group>
-                            </page>
-                            <page string="Attachments">
-                                <field name="attachment_ids"/>
-                            </page>
-                        </notebook>
-                    </sheet>
-                </form>
-            </field>
-        </record>
-
-        <record model="ir.ui.view" id="view_email_message_tree">
-            <field name="name">mail.message.tree</field>
-            <field name="model">mail.message</field>
-            <field name="arch" type="xml">
-                <tree string="Emails" colors="grey:state in ('sent', 'cancel');blue:state=='outgoing';red:state=='exception';black:state=='received'">
-                    <field name="date"/>
-                    <field name="subject"/>
-                    <field name="email_from"/>
-                    <field name="user_id" string="User"/>
-                    <field name="message_id" invisible="1"/>
-                    <field name="partner_id" invisible="1"/>
-                    <field name="model" invisible="1"/>
-                    <field name="res_id" invisible="1"/>
-                    <field name="state"/>
-                    <button name="send" string="Send Now" type="object" icon="gtk-media-play" states='outgoing'/>
-                    <button name="mark_outgoing" string="Retry" type="object" icon="gtk-redo" states='exception,cancel'/>
-                    <button name="cancel" string="Cancel" type="object" icon="terp-gtk-stop" states='outgoing'/>
-                    <button name="open_document" string="Open Related Document" type="object" icon="gtk-jump-to"/>
-                    <button name="open_attachment" string="Open Attachments" type="object" icon="gtk-jump-to"/>
-                </tree>
-            </field>
-        </record>
-
-        <record model="ir.ui.view" id="view_email_message_search">
-            <field name="name">mail.message.search</field>
-            <field name="model">mail.message</field>
-            <field name="arch" type="xml">
-                <search string="Email Search">
-                    <field name="email_from" filter_domain="['|' '|',('email_from','ilike',self), ('email_to','ilike',self), ('subject','ilike',self)]" string="Email"/>
-                    <field name="date"/>
-                    <filter icon="terp-camera_test" name="received" string="Received" domain="[('state','=','received')]"/>
-                    <filter icon="terp-call-start" name="outgoing" string="Outgoing" domain="[('state','=','outgoing')]"/>
-                    <filter icon="terp-check" name="sent" string="Sent" domain="[('state','=','sent')]"/>
-                    <filter icon="terp-gtk-stop" name="exception" string="Failed" domain="[('state','=','exception')]"/>
-                    <separator/>
-                    <filter icon="terp-camera_test" name="type_email" string="Email" domain="[('type','=','email')]"/>
-                    <filter icon="terp-camera_test" name="type_comment" string="Comment" domain="[('type','=','comment')]"/>
-                    <filter icon="terp-camera_test" name="type_notification" string="Notification" domain="[('type','=','notification')]"/>
-                    <group expand="0" string="Extended Filters...">
-                        <field name="user_id" string="User"/>
-                        <field name="partner_id" string="Partner Name"/>
-                        <field name="model"/>
-                        <field name="res_id"/>
-                    </group>
-                    <group expand="0" string="Group By...">
-                        <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
-                        <filter string="Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>
-                        <filter string="User" name="User" icon="terp-personal" context="{'group_by':'user_id'}"/>
-                        <filter string="Thread" icon="terp-mail-" domain="[]" context="{'group_by':'message_id'}"/>
-                        <filter string="Month" help="Creation Month" icon="terp-go-month" domain="[]" context="{'group_by':'date'}"/>
-                    </group>
-                </search>
-            </field>
-        </record>
-
-        <record id="action_view_all_messages_short" model="ir.actions.act_window">
-            <field name="name">Messages</field>
-            <field name="res_model">mail.message</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-            <field name="context">{'tree_view_ref': 'mail.view_message_tree_short', 'form_view_ref': 'mail.view_message_form_short'}</field>
-            <field name="search_view_id" ref="view_message_search_short"/>
-        </record>
-
         <record id="action_view_mail_message" model="ir.actions.act_window">
             <field name="name">Messages</field>
             <field name="res_model">mail.message</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
-            <field name="context">{'search_default_received': 1, 'search_default_type_email': 1}</field>
-            <field name="search_view_id" ref="view_email_message_search"/>
+            <field name="search_view_id" ref="view_message_search"/>
         </record>
 
         <act_window domain="[('partner_id', '=', active_id), ('email_from', '!=', False)]"
@@ -248,24 +82,23 @@
             id="act_res_partner_emails" name="Emails"
             res_model="mail.message"
             src_model="res.partner"
-            view_id="view_email_message_tree"/>
-
-        <!-- Add menu entry in Settings/Email -->
-        <menuitem name="Messages" id="menu_email_message" parent="base.menu_email" action="action_view_mail_message" />
+            view_id="view_message_tree"/>
         
         <!-- Add menu entry in Settings/Email -->
-        <menuitem name="Feeds" id="menu_email_message_all" parent="base.menu_email" action="action_view_all_messages_short" groups="base.group_no_one"/>
+        <menuitem name="Messages" id="menu_mail_message" parent="base.menu_email" action="action_view_mail_message"/>
 
         <record id="action_mail_all_feeds" model="ir.actions.client">
             <field name="name">News Feed</field>
             <field name="tag">mail.wall</field>
-            <field name="params" eval="{'search_view_id': ref('view_message_search_wall')}"/>
+            <field name="params" eval="&quot;{'domain': [('notification_ids.partner_id.user_ids', 'in', [uid])],
+                'context': {'default_model': 'res.users', 'default_res_id': uid} }&quot;"/>
         </record>
 
         <record id="action_mail_my_feeds" model="ir.actions.client">
             <field name="name">My Feeds</field>
             <field name="tag">mail.wall</field>
-            <field name="params" eval="{'search_view_id': ref('view_message_search_wall'), 'my_feeds': True}"/>
+            <field name="params" eval="&quot;{'domain': [('author_id.user_ids', 'in', [uid])],
+                'context': {'default_model': 'res.users', 'default_res_id': uid} }&quot;"/>
         </record>
     </data>
 </openerp>
diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py
index 56c7e6b7088..c0d6ac90fe6 100644
--- a/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@@ -20,314 +20,197 @@
 ##############################################################################
 
 import base64
+import dateutil
 import email
 import logging
-import re
+import pytz
 import time
-import xmlrpclib
-from email.utils import parsedate
-from email.message import Message
-
-from osv import osv, fields
-from mail_message import decode, to_email
 import tools
-from tools.translate import _
+import xmlrpclib
+
+from email.message import Message
+from mail_message import decode
+from osv import osv, fields
 from tools.safe_eval import safe_eval as eval
 
 _logger = logging.getLogger(__name__)
 
 def decode_header(message, header, separator=' '):
-    return separator.join(map(decode,message.get_all(header, [])))
+    return separator.join(map(decode, message.get_all(header, [])))
 
 class many2many_reference(fields.many2many):
-    """ many2many_reference is an override of fields.many2many. It manages
-        many2many-like table where one id is given by two fields, res_model
-        and res_id.
-    """
-    
+    """ many2many_reference manages many2many fields where one id is found
+        by a reference-like key (a char column in addition to the foreign id).
+        The reference_column attribute on the many2many fields is used;
+        if not defined, ``res_model`` is used. """
+
     def _get_query_and_where_params(self, cr, model, ids, values, where_params):
-        """ Add in where:
-            - mail_followers.res_model = 'crm.lead'
-        """
+        """ Add in where condition like mail_followers.res_model = 'crm.lead' """
+        reference_column = self.reference_column if self.reference_column else 'res_model'
+        values.update(reference_column=reference_column, reference_value=model._name)
         query = 'SELECT %(rel)s.%(id2)s, %(rel)s.%(id1)s \
                     FROM %(rel)s, %(from_c)s \
                     WHERE %(rel)s.%(id1)s IN %%s \
                     AND %(rel)s.%(id2)s = %(tbl)s.id \
-                    AND %(rel)s.res_model = %%s \
+                    AND %(rel)s.%(reference_column)s = \'%(reference_value)s\' \
                     %(where_c)s  \
                     %(order_by)s \
                     %(limit)s \
                     OFFSET %(offset)d' \
                 % values
-        where_params = [model._name] + where_params
         return query, where_params
 
     def set(self, cr, model, id, name, values, user=None, context=None):
-        """ Override to add the res_model field in queries. """
+        """ Override to add the reference field in queries. """
         if not values: return
         rel, id1, id2 = self._sql_names(model)
         obj = model.pool.get(self._obj)
+        # reference column name: given by attribute or res_model
+        reference_column = self.reference_column if self.reference_column else 'res_model'
         for act in values:
             if not (isinstance(act, list) or isinstance(act, tuple)) or not act:
                 continue
             if act[0] == 0:
                 idnew = obj.create(cr, user, act[2], context=context)
-                cr.execute('INSERT INTO '+rel+' ('+id1+','+id2+',res_model) VALUES (%s,%s,%s)', (id, idnew, model._name))
+                cr.execute('INSERT INTO '+rel+' ('+id1+','+id2+','+reference_column+') VALUES (%s,%s,%s)', (id, idnew, model._name))
             elif act[0] == 3:
-                cr.execute('DELETE FROM '+rel+' WHERE '+id1+'=%s AND '+id2+'=%s AND res_model=%s', (id, act[1], model._name))
+                cr.execute('DELETE FROM '+rel+' WHERE '+id1+'=%s AND '+id2+'=%s AND '+reference_column+'=%s', (id, act[1], model._name))
             elif act[0] == 4:
                 # following queries are in the same transaction - so should be relatively safe
-                cr.execute('SELECT 1 FROM '+rel+' WHERE '+id1+'=%s AND '+id2+'=%s AND res_model=%s', (id, act[1], model._name))
+                cr.execute('SELECT 1 FROM '+rel+' WHERE '+id1+'=%s AND '+id2+'=%s AND '+reference_column+'=%s', (id, act[1], model._name))
                 if not cr.fetchone():
-                    cr.execute('INSERT INTO '+rel+' ('+id1+','+id2+',res_model) VALUES (%s,%s,%s)', (id, act[1], model._name))
+                    cr.execute('INSERT INTO '+rel+' ('+id1+','+id2+','+reference_column+') VALUES (%s,%s,%s)', (id, act[1], model._name))
+            elif act[0] == 5:
+                cr.execute('delete from '+rel+' where '+id1+' = %s AND '+reference_column+'=%s', (id, model._name))
             elif act[0] == 6:
                 d1, d2,tables = obj.pool.get('ir.rule').domain_get(cr, user, obj._name, context=context)
                 if d1:
                     d1 = ' and ' + ' and '.join(d1)
                 else:
                     d1 = ''
-                cr.execute('DELETE FROM '+rel+' WHERE '+id1+'=%s AND res_model=%s AND '+id2+' IN (SELECT '+rel+'.'+id2+' FROM '+rel+', '+','.join(tables)+' WHERE '+rel+'.'+id1+'=%s AND '+rel+'.'+id2+' = '+obj._table+'.id '+ d1 +')', [id, model._name, id]+d2)
+                cr.execute('DELETE FROM '+rel+' WHERE '+id1+'=%s AND '+reference_column+'=%s AND '+id2+' IN (SELECT '+rel+'.'+id2+' FROM '+rel+', '+','.join(tables)+' WHERE '+rel+'.'+id1+'=%s AND '+rel+'.'+id2+' = '+obj._table+'.id '+ d1 +')', [id, model._name, id]+d2)
                 for act_nbr in act[2]:
-                    cr.execute('INSERT INTO '+rel+' ('+id1+','+id2+',res_model) VALUES (%s,%s,%s)', (id, act_nbr, model._name))
+                    cr.execute('INSERT INTO '+rel+' ('+id1+','+id2+','+reference_column+') VALUES (%s,%s,%s)', (id, act_nbr, model._name))
+            # cases 1, 2: performs write and unlink -> default implementation is ok
             else:
                 return super(many2many_reference, self).set(cr, model, id, name, values, user, context)
 
-class mail_thread(osv.Model):
-    '''Mixin model, meant to be inherited by any model that needs to
-       act as a discussion topic on which messages can be attached.
-       Public methods are prefixed with ``message_`` in order to avoid
-       name collisions with methods of the models that will inherit
-       from this mixin.
+class mail_thread(osv.AbstractModel):
+    ''' mail_thread model is meant to be inherited by any model that needs to
+        act as a discussion topic on which messages can be attached. Public
+        methods are prefixed with ``message_`` in order to avoid name
+        collisions with methods of the models that will inherit from this class.
 
-       ``mail.thread`` is designed to work without adding any field
-       to the extended models. All functionalities and expected behavior
-       are managed by mail.thread, using model name and record ids.
-       A widget has been designed for the 6.1 and following version of OpenERP
-       web-client. However, due to technical limitations, ``mail.thread``
-       adds a simulated one2many field, to display the web widget by
-       overriding the default field displayed. Using this field
-       is not recommanded has it will disappeear in future version
-       of OpenERP, leading to a pure mixin class.
+        ``mail.thread`` defines fields used to handle and display the
+        communication history. ``mail.thread`` also manages followers of
+        inheriting classes. All features and expected behavior are managed
+        by mail.thread. Widgets has been designed for the 7.0 and following
+        versions of OpenERP.
 
-       Inheriting classes are not required to implement any method, as the
-       default implementation will work for any model. However it is common
-       to override at least the ``message_new`` and ``message_update``
-       methods (calling ``super``) to add model-specific behavior at
-       creation and update of a thread.
-       
-       #TODO: UPDATE WITH SUBTYPE / NEW FOLLOW MECHANISM
+        Inheriting classes are not required to implement any method, as the
+        default implementation will work for any model. However it is common
+        to override at least the ``message_new`` and ``message_update``
+        methods (calling ``super``) to add model-specific behavior at
+        creation and update of a thread when processing incoming emails.
     '''
     _name = 'mail.thread'
     _description = 'Email Thread'
 
-    def _get_message_data(self, cr, uid, ids, field_names, args, context=None):
-        res = dict.fromkeys(ids)
-        for id in ids:
-            res[id] = {'message_ids': self.message_search(cr, uid, [id], context=context)}
+    def _get_message_data(self, cr, uid, ids, name, args, context=None):
+        res = dict((id, dict(message_unread=False, message_summary='')) for id in ids)
+        user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
+
+        notif_obj = self.pool.get('mail.notification')
+        notif_ids = notif_obj.search(cr, uid, [
+            ('partner_id.user_ids', 'in', [uid]),
+            ('message_id.res_id', 'in', ids),
+            ('message_id.model', '=', self._name),
+            ('read', '=', False)
+        ], context=context)
+        for notif in notif_obj.browse(cr, uid, notif_ids, context=context):
+            res[notif.message_id.res_id]['message_unread'] = True
+
         for thread in self.browse(cr, uid, ids, context=context):
-            message_follower_ids = [follower.id for follower in thread.message_follower_ids]
-            res[thread.id].update({
-                'message_is_follower': uid in message_follower_ids,
-                'message_summary': "<span><span class='oe_e'>9</span> %d</span> <span><span class='oe_e'>+</span> %d</span>" % 
-                    (len(res[thread.id]['message_ids']), len(thread.message_follower_ids))
-                })
+            cls = res[thread.id]['message_unread'] and ' class="oe_kanban_mail_new"' or ''
+            res[thread.id]['message_summary'] = "<span%s><span class='oe_e'>9</span> %d</span> <span><span class='oe_e'>+</span> %d</span>" % (cls, len(thread.message_comment_ids), len(thread.message_follower_ids))
+            res[thread.id]['message_is_follower'] = user.partner_id.id in [follower.id for follower in thread.message_follower_ids]
         return res
 
-    def _search_message_ids(self, cr, uid, obj, name, args, context=None):
-        msg_obj = self.pool.get('mail.message')
-        msg_ids = msg_obj.search(cr, uid, ['&', ('res_id', 'in', args[0][2]), ('model', '=', self._name)], context=context)
-        return [('id', 'in', msg_ids)]
+    def _search_unread(self, cr, uid, obj=None, name=None, domain=None, context=None):
+        partner_id = self.pool.get('res.users').browse(cr, uid, uid, context=context).partner_id.id
+        res = {}
+        notif_obj = self.pool.get('mail.notification')
+        notif_ids = notif_obj.search(cr, uid, [
+            ('partner_id', '=', partner_id),
+            ('message_id.model', '=', self._name),
+            ('read', '=', False)
+        ], context=context)
+        for notif in notif_obj.browse(cr, uid, notif_ids, context=context):
+            res[notif.message_id.res_id] = True
+        return [('id', 'in', res.keys())]
 
     _columns = {
-        'message_ids': fields.function(_get_message_data,
-			fnct_search=_search_message_ids,
-            type='one2many', obj='mail.message', _fields_id = 'res_id',
-            string='Messages', multi="_get_message_data",
-            help="Field holding discussion about the current document."),
-        'message_follower_ids': many2many_reference('res.users',
-            rel='mail_followers', id1='res_id', id2='user_id', string="Followers",
-            help="Followers of the document. The followers have full access to " \
-                 "the document details, as well as the conversation."),
-        'message_is_follower': fields.function(_get_message_data, method=True,
-            type='boolean', string='I am Follower', multi='_get_message_data',
-            help='True if the current user is following the current document.'),
-        'message_state': fields.boolean('Read',
-            help="When checked, new messages require your attention."),
+        'message_is_follower': fields.function(_get_message_data,
+            type='boolean', string='Is a Follower', multi='_get_message_data'),
+        'message_follower_ids': many2many_reference('res.partner',
+            'mail_followers', 'res_id', 'partner_id',
+            reference_column='res_model', string='Followers'),
+        'message_comment_ids': fields.one2many('mail.message', 'res_id',
+            domain=lambda self: [('model', '=', self._name), ('type', 'in', ('comment', 'email'))],
+            string='Comments and emails',
+            help="Comments and emails"),
+        'message_ids': fields.one2many('mail.message', 'res_id',
+            domain=lambda self: [('model', '=', self._name)],
+            string='Messages',
+            help="Messages and communication history"),
+        'message_unread': fields.function(_get_message_data, fnct_search=_search_unread,
+            type='boolean', string='Unread Messages', multi="_get_message_data",
+            help="If checked new messages require your attention."),
         'message_summary': fields.function(_get_message_data, method=True,
-            type='text', string='Summary', multi='_get_message_data',
+            type='text', string='Summary', multi="_get_message_data",
             help="Holds the Chatter summary (number of messages, ...). "\
                  "This summary is directly in html format in order to "\
                  "be inserted in kanban views."),
     }
 
-    _defaults = {
-        'message_state': True,
-    }
-
     #------------------------------------------------------
-    # Automatic subscription when creating/reading
+    # Automatic subscription when creating
     #------------------------------------------------------
 
     def create(self, cr, uid, vals, context=None):
-        """ Override of create to subscribe :
-            - the writer
-            - followers given by the monitored fields
-        """
+        """ Override to subscribe the current user. """
         thread_id = super(mail_thread, self).create(cr, uid, vals, context=context)
-        followers_command = self.message_get_automatic_followers(cr, uid, thread_id, vals, fetch_missing=False, context=context)
-        if followers_command:
-            self.write(cr, uid, [thread_id], {'message_follower_ids': followers_command}, context=context)
+        self.message_subscribe_users(cr, uid, [thread_id], [uid], context=context)
         return thread_id
 
-    def write(self, cr, uid, ids, vals, context=None):
-        """ Override of write to subscribe :
-            - the writer
-            - followers given by the monitored fields
-        """
-        if isinstance(ids, (int, long)):
-            ids = [ids]
-        for id in ids:
-            # copy original vals because we are going to modify it
-            specific_vals = dict(vals)
-            # we modify followers: do not subscribe the uid
-            if specific_vals.get('message_follower_ids'):
-                followers_command = self.message_get_automatic_followers(cr, uid, id, specific_vals, add_uid=False, context=context)
-                specific_vals['message_follower_ids'] += followers_command
-            else:
-                followers_command = self.message_get_automatic_followers(cr, uid, id, specific_vals, context=context)
-                specific_vals['message_follower_ids'] = followers_command
-            write_res = super(mail_thread, self).write(cr, uid, ids, specific_vals, context=context)
-        return True
-
     def unlink(self, cr, uid, ids, context=None):
-        """Override unlink, to automatically delete messages
-           that are linked with res_model and res_id, not through
-           a foreign key with a 'cascade' ondelete attribute.
-           Notifications will be deleted with messages
-        """
+        """ Override unlink to delete messages and followers. This cannot be
+            cascaded, because link is done through (res_model, res_id). """
         msg_obj = self.pool.get('mail.message')
+        fol_obj = self.pool.get('mail.followers')
         # delete messages and notifications
-        msg_to_del_ids = msg_obj.search(cr, uid, [('model', '=', self._name), ('res_id', 'in', ids)], context=context)
-        msg_obj.unlink(cr, uid, msg_to_del_ids, context=context)
+        msg_ids = msg_obj.search(cr, uid, [('model', '=', self._name), ('res_id', 'in', ids)], context=context)
+        msg_obj.unlink(cr, uid, msg_ids, context=context)
+        # delete followers
+        fol_ids = fol_obj.search(cr, uid, [('res_model', '=', self._name), ('res_id', 'in', ids)], context=context)
+        fol_obj.unlink(cr, uid, fol_ids, context=context)
         return super(mail_thread, self).unlink(cr, uid, ids, context=context)
 
-    def message_get_automatic_followers(self, cr, uid, id, record_vals, add_uid=True, fetch_missing=False, context=None):
-        """ Return the command for the many2many follower_ids field to manage
-            subscribers. Behavior :
-            - get the monitored fields (ex: ['user_id', 'responsible_id']); those
-              fields should be relationships to res.users (#TODO: res.partner)
-            - if this field is in the record_vals: it means it has been modified
-              thus add its value to the followers
-            - if this fields is not in record_vals, but fetch_missing paramter
-              is set to True: fetch the value in the record (use: at creation
-              for default values, not present in record_vals)
-            - if add_uid: add the current user (for example: writer is subscriber)
-            - generate the command and return it
-            This method has to be used on 1 id, because otherwise it would imply
-            to track which user.id is used for which record.id.
-
-            :param record_vals: values given to the create method of the new
-                record, or values updated in a write.
-            :param monitored_fields: a list of fields that are monitored. Those
-                fields must be many2one fields to the res.users model.
-            :param fetch_missing: is set to True, the method will read the
-                record to find values that are not present in record_vals.
-
-            #TODO : UPDATE WHEN MERGING TO PARTNERS
-        """
-        # get monitored fields
-        monitored_fields = self.message_get_monitored_follower_fields(cr, uid, [id], context=context)
-        modified_fields = [field for field in monitored_fields if field in record_vals.iterkeys()]
-        other_fields = [field for field in monitored_fields if field not in record_vals.iterkeys()] if fetch_missing else []
-        # for each monitored field: if in record_vals, it has been modified/added
-        follower_ids = []
-        for field in modified_fields:
-            # do not add 'False'
-            if record_vals.get(fields):
-                follower_ids.append(record_vals.get(field))
-        # for other fields: read in record if fetch_missing (otherwise list is void)
-        for field in other_fields:
-            record = self.browse(cr, uid, id, context=context)
-            value = getattr(record, field)
-            if value:
-                follower_ids.append(value)
-        # add uid if asked and not already present
-        if add_uid and uid not in follower_ids:
-            follower_ids.append(uid)
-        return self.message_subscribe_get_command(cr, uid, follower_ids, context=context)
-
     #------------------------------------------------------
     # mail.message wrappers and tools
     #------------------------------------------------------
 
-    def message_create(self, cr, uid, thread_id, vals, context=None):
-        """ OpenChatter: wrapper of mail.message create method
-           - creates the mail.message
-           - automatically subscribe the message writer
-           - push the message to followers
-        """
-        if context is None:
-            context = {}
-
-        # create message
-        msg_id = self.pool.get('mail.message').create(cr, uid, vals, context=context)
-
-        # automatically subscribe the writer of the message
-        if vals.get('user_id'):
-            record = self.browse(cr, uid, thread_id, context=context)
-            follower_ids = [follower.id for follower in record.message_follower_ids]
-            if vals.get('user_id') not in follower_ids:
-                self.message_subscribe(cr, uid, [thread_id], [vals.get('user_id')], context=context)
-
-        # Set as unread if writer is not the document responsible
-        self.message_create_set_unread(cr, uid, [thread_id], context=context)
-        
-        # special: if install mode, do not push demo data
-        if context.get('install_mode', False):
-            return msg_id
-        
-        # get users that will get a notification pushed
-        notification_obj = self.pool.get('mail.notification')
-        user_to_push_ids = self.message_get_user_ids_to_notify(cr, uid, [thread_id], vals, context=context)
-        for id in user_to_push_ids:
-            notification_obj.create(cr, uid, {'user_id': id, 'message_id': msg_id}, context=context)
-        
-        # create the email to send
-        self.message_create_notify_by_email(cr, uid, vals, user_to_push_ids, context=context)
-        
-        return msg_id
-    
-    def message_get_user_ids_to_notify(self, cr, uid, thread_ids, new_msg_vals, context=None):
-        # get body
-        body = new_msg_vals.get('body_html', '') if new_msg_vals.get('content_subtype') == 'html' else new_msg_vals.get('body_text', '')
-        
-        # get subscribers
-        subscr_obj = self.pool.get('mail.followers')
-        subscr_ids = subscr_obj.search(cr, uid, ['&', ('res_model', '=', self._name), ('res_id', 'in', thread_ids)], context=context)
-        notif_user_ids = [sub['user_id'][0] for sub in subscr_obj.read(cr, uid, subscr_ids, ['user_id'], context=context)]
-    
-        # add users requested to perform an action (need_action mechanism)
-        if hasattr(self, 'get_needaction_user_ids') and self._columns.get('user_id'):
-            user_ids_dict = self.get_needaction_user_ids(cr, uid, thread_ids, context=context)
-            for id, user_ids in user_ids_dict.iteritems():
-                notif_user_ids += user_ids
-        
-        # add users notified of the parent messages (because: if parent message contains @login, login must receive the replies)
-        if new_msg_vals.get('parent_id'):
-            notif_obj = self.pool.get('mail.notification')
-            parent_notif_ids = notif_obj.search(cr, uid, [('message_id', '=', new_msg_vals.get('parent_id'))], context=context)
-            parent_notifs = notif_obj.read(cr, uid, parent_notif_ids, context=context)
-            notif_user_ids += [parent_notif['user_id'][0] for parent_notif in parent_notifs]
-
-        # remove duplicate entries
-        notif_user_ids = list(set(notif_user_ids))
-        return notif_user_ids
+    def _needaction_domain_get(self, cr, uid, context=None):
+        if self._needaction:
+            return [('message_unread', '=', True)]
+        return []
 
     #------------------------------------------------------
-    # Generic message api
+    # Mail gateway
     #------------------------------------------------------
 
     def message_capable_models(self, cr, uid, context=None):
+        """ Used by the plugin addon, based for plugin_outlook and others. """
         ret_dict = {}
         for model_name in self.pool.obj_list():
             model = self.pool.get(model_name)
@@ -335,343 +218,20 @@ class mail_thread(osv.Model):
                 ret_dict[model_name] = model._description
         return ret_dict
 
-    def message_append(self, cr, uid, threads, subject, body_text=None, body_html=None,
-                        type='email', email_date=None, parent_id=False,
-                        content_subtype='plain', state=None,
-                        partner_ids=None, email_from=False, email_to=False,
-                        email_cc=None, email_bcc=None, reply_to=None,
-                        headers=None, message_id=False, references=None,
-                        attachments=None, original=None, context=None):
-        """ Creates a new mail.message through message_create. The new message
-            is attached to the current mail.thread, containing all the details 
-            passed as parameters. All attachments will be attached to the 
-            thread record as well as to the actual message.
-           
-            This method calls message_create that will handle management of
-            subscription and notifications, and effectively create the message.
-           
-            If ``email_from`` is not set or ``type`` not set as 'email',
-            a note message is created (comment or system notification), 
-            without the usual envelope attributes (sender, recipients, etc.).
-
-            :param threads: list of thread ids, or list of browse_records
-                representing threads to which a new message should be attached
-            :param subject: subject of the message, or description of the event;
-                this is totally optional as subjects are not important except
-                for specific messages (blog post, job offers) or for emails
-            :param body_text: plaintext contents of the mail or log message
-            :param body_html: html contents of the mail or log message
-            :param type: type of message: 'email', 'comment', 'notification';
-                email by default
-            :param email_date: email date string if different from now, in
-                server timezone
-            :param parent_id: id of the parent message (threaded messaging model)
-            :param content_subtype: optional content_subtype of message: 'plain'
-                or 'html', corresponding to the main body contents (body_text or
-                body_html).
-            :param state: state of message
-            :param partner_ids: destination partners of the message, in addition
-                to the now fully optional email_to; this method is supposed to
-                received a list of ids is not None. The specific many2many
-                instruction will be generated by this method.
-            :param email_from: Email From / Sender address if any
-            :param email_to: Email-To / Recipient address
-            :param email_cc: Comma-Separated list of Carbon Copy Emails To
-                addresses if any
-            :param email_bcc: Comma-Separated list of Blind Carbon Copy Emails To
-                addresses if any
-            :param reply_to: reply_to header
-            :param headers: mail headers to store
-            :param message_id: optional email identifier
-            :param references: optional email references
-            :param dict attachments: map of attachment filenames to binary
-                contents, if any.
-            :param str original: optional full source of the RFC2822 email, for
-                reference
-            :param dict context: if a ``thread_model`` value is present in the
-                context, its value will be used to determine the model of the
-                thread to update (instead of the current model).
-        """
-        if context is None:
-            context = {}
-        if attachments is None:
-            attachments = {}
-
-        if email_date:
-            edate = parsedate(email_date)
-            if edate is not None:
-                email_date = time.strftime('%Y-%m-%d %H:%M:%S', edate)
-
-        if all(isinstance(thread_id, (int, long)) for thread_id in threads):
-            model = context.get('thread_model') or self._name
-            model_pool = self.pool.get(model)
-            threads = model_pool.browse(cr, uid, threads, context=context)
-
-        ir_attachment = self.pool.get('ir.attachment')
-
-        new_msg_ids = []
-        for thread in threads:
-            to_attach = []
-            for attachment in attachments:
-                fname, fcontent = attachment
-                if isinstance(fcontent, unicode):
-                    fcontent = fcontent.encode('utf-8')
-                data_attach = {
-                    'name': fname,
-                    'datas': base64.b64encode(str(fcontent)),
-                    'datas_fname': fname,
-                    'description': _('Mail attachment'),
-                    'res_model': thread._name,
-                    'res_id': thread.id,
-                }
-                to_attach.append(ir_attachment.create(cr, uid, data_attach, context=context))
-            # find related partner: partner_id column in thread object, or self is res.partner model
-            partner_id = ('partner_id' in thread._columns.keys()) and (thread.partner_id and thread.partner_id.id or False) or False
-            if not partner_id and thread._name == 'res.partner':
-                partner_id = thread.id
-            # destination partners
-            if partner_ids is None:
-                partner_ids = []
-            mail_partner_ids = [(6, 0, partner_ids)]
-
-            data = {
-                'subject': subject,
-                'body_text': body_text or thread._model._columns.get('description') and thread.description or '',
-                'body_html': body_html or '',
-                'parent_id': parent_id,
-                'date': email_date or fields.datetime.now(),
-                'type': type,
-                'content_subtype': content_subtype,
-                'state': state,
-                'message_id': message_id,
-                'partner_ids': mail_partner_ids,
-                'attachment_ids': [(6, 0, to_attach)],
-                'user_id': uid,
-                'model' : thread._name,
-                'res_id': thread.id,
-                'partner_id': partner_id,
-            }
-
-            if email_from or type == 'email':
-                for param in (email_to, email_cc, email_bcc):
-                    if isinstance(param, list):
-                        param = ", ".join(param)
-                data.update({
-                    'email_to': email_to,
-                    'email_from': email_from or \
-                        thread._model._columns.get('user_id') and thread.user_id and thread.user_id.user_email,
-                    'email_cc': email_cc,
-                    'email_bcc': email_bcc,
-                    'references': references,
-                    'headers': headers,
-                    'reply_to': reply_to,
-                    'original': original, })
-
-            new_msg_ids.append(self.message_create(cr, uid, thread.id, data, context=context))
-        return new_msg_ids
-
-    def message_append_dict(self, cr, uid, ids, msg_dict, context=None):
-        """Creates a new mail.message attached to the given threads (``ids``),
-           with the contents of ``msg_dict``, by calling ``message_append``
-           with the mail details. All attachments in msg_dict will be
-           attached to the object record as well as to the actual
-           mail message.
-
-           :param dict msg_dict: a map containing the email details and
-                                 attachments. See ``message_process()`` and
-                                ``mail.message.parse()`` for details on
-                                the dict structure.
-           :param dict context: if a ``thread_model`` value is present
-                                in the context, its value will be used
-                                to determine the model of the thread to
-                                update (instead of the current model).
-        """
-        return self.message_append(cr, uid, ids,
-                            subject = msg_dict.get('subject'),
-                            body_text = msg_dict.get('body_text'),
-                            body_html= msg_dict.get('body_html'),
-                            parent_id = msg_dict.get('parent_id', False),
-                            type = msg_dict.get('type', 'email'),
-                            content_subtype = msg_dict.get('content_subtype'),
-                            state = msg_dict.get('state'),
-                            partner_ids = msg_dict.get('partner_ids'),
-                            email_from = msg_dict.get('from', msg_dict.get('email_from')),
-                            email_to = msg_dict.get('to', msg_dict.get('email_to')),
-                            email_cc = msg_dict.get('cc', msg_dict.get('email_cc')),
-                            email_bcc = msg_dict.get('bcc', msg_dict.get('email_bcc')),
-                            reply_to = msg_dict.get('reply', msg_dict.get('reply_to')),
-                            email_date = msg_dict.get('date'),
-                            message_id = msg_dict.get('message-id', msg_dict.get('message_id')),
-                            references = msg_dict.get('references')\
-                                      or msg_dict.get('in-reply-to'),
-                            attachments = msg_dict.get('attachments'),
-                            headers = msg_dict.get('headers'),
-                            original = msg_dict.get('original'),
-                            context = context)
-
-    #------------------------------------------------------
-    # Message loading
-    #------------------------------------------------------
-
-    def _message_search_ancestor_ids(self, cr, uid, ids, child_ids, ancestor_ids, context=None):
-        """ Given message child_ids ids, find their ancestors until ancestor_ids
-            using their parent_id relationship.
-
-            :param child_ids: the first nodes of the search
-            :param ancestor_ids: list of ancestors. When the search reach an
-                                 ancestor, it stops.
-        """
-        def _get_parent_ids(message_list, ancestor_ids, child_ids):
-            """ Tool function: return the list of parent_ids of messages
-                contained in message_list. Parents that are in ancestor_ids
-                or in child_ids are not returned. """
-            return [message['parent_id'][0] for message in message_list
-                        if message['parent_id']
-                        and message['parent_id'][0] not in ancestor_ids
-                        and message['parent_id'][0] not in child_ids
-                    ]
-
-        message_obj = self.pool.get('mail.message')
-        messages_temp = message_obj.read(cr, uid, child_ids, ['id', 'parent_id'], context=context)
-        parent_ids = _get_parent_ids(messages_temp, ancestor_ids, child_ids)
-        child_ids += parent_ids
-        cur_iter = 0; max_iter = 100; # avoid infinite loop
-        while (parent_ids and (cur_iter < max_iter)):
-            cur_iter += 1
-            messages_temp = message_obj.read(cr, uid, parent_ids, ['id', 'parent_id'], context=context)
-            parent_ids = _get_parent_ids(messages_temp, ancestor_ids, child_ids)
-            child_ids += parent_ids
-        if (cur_iter > max_iter):
-            _logger.warning("Possible infinite loop in _message_search_ancestor_ids. "\
-                "Note that this algorithm is intended to check for cycle in "\
-                "message graph, leading to a curious error. Have fun.")
-        return child_ids
-
-    def message_search_get_domain(self, cr, uid, ids, context=None):
-        """ OpenChatter feature: get the domain to search the messages related
-            to a document. mail.thread defines the default behavior as
-            being messages with model = self._name, id in ids.
-            This method should be overridden if a model has to implement a
-            particular behavior.
-        """
-        return ['&', ('res_id', 'in', ids), ('model', '=', self._name)]
-
-    def message_search(self, cr, uid, ids, fetch_ancestors=False, ancestor_ids=None, 
-                        limit=100, offset=0, domain=None, count=False, context=None):
-        """ OpenChatter feature: return thread messages ids according to the
-            search domain given by ``message_search_get_domain``.
-            
-            It is possible to add in the search the parent of messages by
-            setting the fetch_ancestors flag to True. In that case, using
-            the parent_id relationship, the method returns the id list according
-            to the search domain, but then calls ``_message_search_ancestor_ids``
-            that will add to the list the ancestors ids. The search is limited
-            to parent messages having an id in ancestor_ids or having
-            parent_id set to False.
-            
-            If ``count==True``, the number of ids is returned instead of the
-            id list. The count is done by hand instead of passing it as an 
-            argument to the search call because we might want to perform
-            a research including parent messages until some ancestor_ids.
-            
-            :param fetch_ancestors: performs an ascended search; will add 
-                                    to fetched msgs all their parents until
-                                    ancestor_ids
-            :param ancestor_ids: used when fetching ancestors
-            :param domain: domain to add to the search; especially child_of
-                           is interesting when dealing with threaded display.
-                           Note that the added domain is anded with the 
-                           default domain.
-            :param limit, offset, count, context: as usual
-        """
-        search_domain = self.message_search_get_domain(cr, uid, ids, context=context)
-        if domain:
-            search_domain += domain
-        message_obj = self.pool.get('mail.message')
-        message_res = message_obj.search(cr, uid, search_domain, limit=limit, offset=offset, count=count, context=context)
-        if not count and fetch_ancestors:
-            message_res += self._message_search_ancestor_ids(cr, uid, ids, message_res, ancestor_ids, context=context) 
-        return message_res
-
-    def message_read(self, cr, uid, ids, fetch_ancestors=False, ancestor_ids=None, 
-                        limit=100, offset=0, domain=None, context=None):
-        """ OpenChatter feature: read the messages related to some threads.
-            This method is used mainly the Chatter widget, to directly have
-            read result instead of searching then reading.
-
-            Please see message_search for more information about the parameters.
-        """
-        message_ids = self.message_search(cr, uid, ids, fetch_ancestors, ancestor_ids,
-            limit, offset, domain, context=context)
-        messages = self.pool.get('mail.message').read(cr, uid, message_ids, context=context)
-
-        """ Retrieve all attachments names """
-        map_id_to_name = dict((attachment_id, '') for message in messages for attachment_id in message['attachment_ids'])
-
-        ids = map_id_to_name.keys()
-        names = self.pool.get('ir.attachment').name_get(cr, uid, ids, context=context)
-        
-        # convert the list of tuples into a dictionnary
-        for name in names: 
-            map_id_to_name[name[0]] = name[1]
-        
-        # give corresponding ids and names to each message
-        for msg in messages:
-            msg["attachments"] = []
-            
-            for attach_id in msg["attachment_ids"]:
-                msg["attachments"].append({'id': attach_id, 'name': map_id_to_name[attach_id]})
-        
-        # Set the threads as read
-        self.message_check_and_set_read(cr, uid, ids, context=context)
-        # Sort and return the messages
-        messages = sorted(messages, key=lambda d: (-d['id']))
-        return messages
-
-    def message_get_pushed_messages(self, cr, uid, ids, fetch_ancestors=False, ancestor_ids=None,
-                            limit=100, offset=0, msg_search_domain=[], context=None):
-        """ OpenChatter: wall: get the pushed notifications and used them
-            to fetch messages to display on the wall.
-            
-            :param fetch_ancestors: performs an ascended search; will add
-                                    to fetched msgs all their parents until
-                                    ancestor_ids
-            :param ancestor_ids: used when fetching ancestors
-            :param domain: domain to add to the search; especially child_of
-                           is interesting when dealing with threaded display
-            :param ascent: performs an ascended search; will add to fetched msgs
-                           all their parents until root_ids
-            :param root_ids: for ascent search
-            :return: list of mail.messages sorted by date
-        """
-        notification_obj = self.pool.get('mail.notification')
-        msg_obj = self.pool.get('mail.message')
-        # update message search
-        for arg in msg_search_domain:
-            if isinstance(arg, (tuple, list)):
-                arg[0] = 'message_id.' + arg[0]
-        # compose final domain
-        domain = [('user_id', '=', uid)] + msg_search_domain
-        # get notifications
-        notification_ids = notification_obj.search(cr, uid, domain, limit=limit, offset=offset, context=context)
-        notifications = notification_obj.browse(cr, uid, notification_ids, context=context)
-        msg_ids = [notification.message_id.id for notification in notifications]
-        # get messages
-        msg_ids = msg_obj.search(cr, uid, [('id', 'in', msg_ids)], context=context)
-        if (fetch_ancestors): msg_ids = self._message_search_ancestor_ids(cr, uid, ids, msg_ids, ancestor_ids, context=context)
-        msgs = msg_obj.read(cr, uid, msg_ids, context=context)
-        return msgs
+    def _message_find_partners(self, cr, uid, message, header_fields=['From'], context=None):
+        """ Find partners related to some header fields of the message. """
+        s = ', '.join([decode(message.get(h)) for h in header_fields if message.get(h)])
+        return [partner_id for email in tools.email_split(s)
+                for partner_id in self.pool.get('res.partner').search(cr, uid, [('email', 'ilike', email)], context=context)]
 
     def _message_find_user_id(self, cr, uid, message, context=None):
-        from_local_part = to_email(decode(message.get('From')))[0]
-        user_ids = self.pool.get('res.users').search(cr, uid, [('login', '=', from_local_part)], context=context)
+        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
 
-    #------------------------------------------------------
-    # Mail gateway
-    #------------------------------------------------------
-    # message_process will call either message_new or message_update.
-
     def message_route(self, cr, uid, message, model=None, thread_id=None,
                       custom_values=None, context=None):
         """Attempt to figure out the correct target model, thread_id,
@@ -679,11 +239,11 @@ class mail_thread(osv.Model):
         Multiple values may be returned, if a message had multiple
         recipients matching existing mail.aliases, for example.
 
-        The following heuristics are used, in this order: 
+        The following heuristics are used, in this order:
              1. If the message replies to an existing thread_id, and
                 properly contains the thread model in the 'In-Reply-To'
                 header, use this model/thread_id pair, and ignore
-                custom_value (not needed as no creation will take place) 
+                custom_value (not needed as no creation will take place)
              2. Look for a mail.alias entry matching the message
                 recipient, and use the corresponding model, thread_id,
                 custom_values and user_id.
@@ -719,7 +279,7 @@ class mail_thread(osv.Model):
                 _logger.debug('Routing mail with Message-Id %s: direct reply to model: %s, thread_id: %s, custom_values: %s, uid: %s',
                               message_id, model, thread_id, custom_values, uid)
                 return [(model, thread_id, custom_values, uid)]
-        
+
         # 2. 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.
@@ -728,7 +288,7 @@ class mail_thread(osv.Model):
                        decode_header(message, 'Cc'),
                        decode_header(message, 'Resent-To'),
                        decode_header(message, 'Resent-Cc')])
-        local_parts = [e.split('@')[0] for e in to_email(rcpt_tos)]
+        local_parts = [e.split('@')[0] for e in tools.email_split(rcpt_tos)]
         if local_parts:
             mail_alias = self.pool.get('mail.alias')
             alias_ids = mail_alias.search(cr, uid, [('alias_name', 'in', local_parts)])
@@ -742,7 +302,7 @@ class mail_thread(osv.Model):
                                    eval(alias.alias_defaults), user_id))
                 _logger.debug('Routing mail with Message-Id %s: direct alias match: %r', message_id, routes)
                 return routes
-        
+
         # 3. Fallback to the provided parameters, if they work
         model_pool = self.pool.get(model)
         if not thread_id:
@@ -760,19 +320,16 @@ class mail_thread(osv.Model):
                       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,
                         thread_id=None, context=None):
         """Process an incoming RFC2822 email message, relying on
            ``mail.message.parse()`` for the parsing operation,
-           and ``message_route()`` to figure out the target model. 
-           
+           and ``message_route()`` to figure out the target model.
+
            Once the target model is known, its ``message_new`` method
            is called with the new message (if the thread record did not exist)
-            or its ``message_update`` method (if it did). Finally,
-           ``message_forward`` is called to automatically notify other
-           people that should receive this message.
+            or its ``message_update`` method (if it did).
 
            :param string model: the fallback model to use if the message
                does not match any of the currently configured mail aliases
@@ -807,11 +364,9 @@ class mail_thread(osv.Model):
         routes = self.message_route(cr, uid, msg_txt, model,
                                     thread_id, custom_values,
                                     context=context)
-        msg = self.pool.get('mail.message').parse_message(msg_txt, save_original=save_original, context=context)
-        msg['state'] = 'received'     
-        if strip_attachments and 'attachments' in msg:
-            del msg['attachments']
-        for model, thread_id, custom_values, user_id in routes:   
+        msg = self.message_parse(cr, uid, msg_txt, save_original=save_original, context=context)
+        if strip_attachments: msg.pop('attachments', None)
+        for model, thread_id, custom_values, user_id in routes:
             if self._name != model:
                 context.update({'thread_model': model})
             model_pool = self.pool.get(model)
@@ -822,10 +377,7 @@ class mail_thread(osv.Model):
                 model_pool.message_update(cr, user_id, [thread_id], msg, context=context)
             else:
                 thread_id = model_pool.message_new(cr, user_id, msg, custom_values, context=context)
-    
-            # Forward the email to other followers
-            self.message_forward(cr, uid, model, [thread_id], msg_txt, context=context)
-            model_pool.message_mark_as_unread(cr, uid, [thread_id], context=context)
+            self.message_post(cr, uid, [thread_id], context=context, **msg)
         return True
 
     def message_new(self, cr, uid, msg_dict, custom_values=None, context=None):
@@ -833,9 +385,7 @@ class mail_thread(osv.Model):
            for a given thread model, if the message did not belong to
            an existing thread.
            The default behavior is to create a new record of the corresponding
-           model (based on some very basic info extracted from the message),
-           then attach the message to the newly created record
-           (by calling ``message_append_dict``).
+           model (based on some very basic info extracted from the message).
            Additional behavior may be implemented by overriding this method.
 
            :param dict msg_dict: a map containing the email details and
@@ -864,14 +414,12 @@ class mail_thread(osv.Model):
         if custom_values and isinstance(custom_values, dict):
             data.update(custom_values)
         res_id = model_pool.create(cr, uid, data, context=context)
-        self.message_append_dict(cr, uid, [res_id], msg_dict, context=context)
         return res_id
 
     def message_update(self, cr, uid, ids, msg_dict, update_vals=None, context=None):
         """Called by ``message_process`` when a new message is received
-           for an existing thread. The default behavior is to create a
-           new mail.message in the given thread (by calling
-           ``message_append_dict``)
+           for an existing thread. The default behavior is to update the record
+           with update_vals taken from the incoming email.
            Additional behavior may be implemented by overriding this
            method.
            :param dict msg_dict: a map containing the email details and
@@ -883,285 +431,248 @@ class mail_thread(osv.Model):
         """
         if update_vals:
             self.write(cr, uid, ids, update_vals, context=context)
-        return self.message_append_dict(cr, uid, ids, msg_dict, context=context)
-
-    def message_thread_followers(self, cr, uid, ids, context=None):
-        """ Returns a list of email addresses of the people following
-            this thread, including the sender of each mail, and the
-            people who were in CC of the messages, if any.
-        """
-        res = {}
-        if isinstance(ids, (str, int, long)):
-            ids = [long(ids)]
-        for thread in self.browse(cr, uid, ids, context=context):
-            l = set()
-            for message in thread.message_ids:
-                l.add((message.user_id and message.user_id.email) or '')
-                l.add(message.email_from or '')
-                l.add(message.email_cc or '')
-            res[thread.id] = filter(None, l)
-        return res
-
-    def message_forward(self, cr, uid, model, thread_ids, msg, email_error=False, context=None):
-        """Sends an email to all people following the given threads.
-           The emails are forwarded immediately, not queued for sending,
-           and not archived.
-
-        :param str model: thread model
-        :param list thread_ids: ids of the thread records
-        :param msg: email.message.Message object to forward
-        :param email_error: optional email address to notify in case
-                            of any delivery error during the forward.
-        :return: True
-        """
-        model_pool = self.pool.get(model)
-        smtp_server_obj = self.pool.get('ir.mail_server')
-        for res in model_pool.browse(cr, uid, thread_ids, context=context):
-            if hasattr(model_pool, 'message_thread_followers'):
-                followers = model_pool.message_thread_followers(cr, uid, [res.id])[res.id]
-            else:
-                followers = self.message_thread_followers(cr, uid, [res.id])[res.id]
-            message_followers_emails = to_email(','.join(filter(None, followers)))
-            message_recipients = to_email(','.join(filter(None,
-                                                                       [decode(msg['from']),
-                                                                        decode(msg['to']),
-                                                                        decode(msg['cc'])])))
-            forward_to = [i for i in message_followers_emails if (i and (i not in message_recipients))]
-            if forward_to:
-                # TODO: we need an interface for this for all types of objects, not just leads
-                if model_pool._columns.get('section_id'):
-                    del msg['reply-to']
-                    msg['reply-to'] = res.section_id.reply_to
-
-                smtp_from, = to_email(msg['from'])
-                msg['from'] = smtp_from
-                msg['to'] =  ", ".join(forward_to)
-                msg['message-id'] = tools.generate_tracking_message_id(res.id)
-                if not smtp_server_obj.send_email(cr, uid, msg) and email_error:
-                    subj = msg['subject']
-                    del msg['subject'], msg['to'], msg['cc'], msg['bcc']
-                    msg['subject'] = _('[OpenERP-Forward-Failed] %s') % subj
-                    msg['to'] = email_error
-                    smtp_server_obj.send_email(cr, uid, msg)
         return True
 
-    def message_partner_by_email(self, cr, uid, email, context=None):
-        """Attempts to return the id of a partner address matching
-           the given ``email``, and the corresponding partner id.
-           Can be used by classes using the ``mail.thread`` mixin
-           to lookup the partner and use it in their implementation
-           of ``message_new`` to link the new record with a
-           corresponding partner.
-           The keys used in the returned dict are meant to map
-           to usual names for relationships towards a partner
-           and one of its addresses.
+    def _message_extract_payload(self, message, save_original=False):
+        """Extract body as HTML and attachments from the mail message"""
+        attachments = []
+        body = u''
+        if save_original:
+            attachments.append(('original_email.eml', message.as_string()))
+        if not message.is_multipart() or 'text/' in message.get('content-type', ''):
+            encoding = message.get_content_charset()
+            body = message.get_payload(decode=True)
+            body = tools.ustr(body, encoding, errors='replace')
+            if message.get_content_type() == 'text/plain':
+                # text/plain -> <pre/>
+                body = tools.append_content_to_html(u'', body)
+        else:
+            alternative = (message.get_content_type() == 'multipart/alternative')
+            for part in message.walk():
+                if part.get_content_maintype() == 'multipart':
+                    continue # skip container
+                filename = part.get_filename() # None if normal part
+                encoding = part.get_content_charset() # None if attachment
+                # 1) Explicit Attachments -> attachments
+                if filename or part.get('content-disposition', '').strip().startswith('attachment'):
+                    attachments.append((filename or 'attachment', part.get_payload(decode=True)))
+                    continue
+                # 2) text/plain -> <pre/>
+                if part.get_content_type() == 'text/plain' and (not alternative or not body):
+                    body = tools.append_content_to_html(body, tools.ustr(part.get_payload(decode=True),
+                                                                         encoding, errors='replace'))
+                # 3) text/html -> raw
+                elif part.get_content_type() == 'text/html':
+                    html = tools.ustr(part.get_payload(decode=True), encoding, errors='replace')
+                    if alternative:
+                        body = html
+                    else:
+                        body = tools.append_content_to_html(body, html, plaintext=False)
+                # 4) Anything else -> attachment
+                else:
+                    attachments.append((filename or 'attachment', part.get_payload(decode=True)))
+        return body, attachments
 
-           :param email: email address for which a partner
-                         should be searched for.
+    def message_parse(self, cr, uid, message, save_original=False, context=None):
+        """Parses a string or email.message.Message representing an
+           RFC-2822 email, and returns a generic dict holding the
+           message details.
+
+           :param message: the message to parse
+           :type message: email.message.Message | string | unicode
+           :param bool save_original: whether the returned dict
+               should include an ``original`` attachment containing
+               the source of the message
            :rtype: dict
-           :return: a map of the following form::
+           :return: A dict with the following structure, where each
+                    field may not be present if missing in original
+                    message::
 
-                      { 'partner_address_id': id or False,
-                        'partner_id': pid or False }
+                    { 'message-id': msg_id,
+                      'subject': subject,
+                      'from': from,
+                      'to': to,
+                      'cc': cc,
+                      'body': unified_body,
+                      'attachments': [('file1', 'bytes'),
+                                      ('file2', 'bytes')}
+                    }
         """
-        partner_pool = self.pool.get('res.partner')
-        res = {'partner_id': False}
-        if email:
-            email = to_email(email)[0]
-            contact_ids = partner_pool.search(cr, uid, [('email', '=', email)])
-            if contact_ids:
-                contact = partner_pool.browse(cr, uid, contact_ids[0])
-                res['partner_id'] = contact.id
-        return res
+        msg_dict = {}
+        if not isinstance(message, Message):
+            if isinstance(message, unicode):
+                # Warning: message_from_string doesn't always work correctly on unicode,
+                # we must use utf-8 strings here :-(
+                message = message.encode('utf-8')
+            message = email.message_from_string(message)
 
-    # for backwards-compatibility with old scripts
-    process_email = message_process
+        message_id = message['message-id']
+        if not message_id:
+            # Very unusual situation, be we should be fault-tolerant here
+            message_id = "<%s@localhost>" % time.time()
+            _logger.debug('Parsing Message without message-id, generating a random one: %s', message_id)
+        msg_dict['message_id'] = message_id
+
+        if 'Subject' in message:
+            msg_dict['subject'] = decode(message.get('Subject'))
+
+        # Envelope fields not stored in  mail.message but made available for message_new()
+        msg_dict['from'] = decode(message.get('from'))
+        msg_dict['to'] = decode(message.get('to'))
+        msg_dict['cc'] = decode(message.get('cc'))
+
+        if 'From' in message:
+            author_ids = self._message_find_partners(cr, uid, message, ['From'], context=context)
+            if author_ids:
+                msg_dict['author_id'] = author_ids[0]
+        partner_ids = self._message_find_partners(cr, uid, message, ['From', 'To', 'Cc'], context=context)
+        msg_dict['partner_ids'] = partner_ids
+
+        if 'Date' in message:
+            date_hdr = decode(message.get('Date'))
+            # convert from email timezone to server timezone
+            date_server_datetime = dateutil.parser.parse(date_hdr).astimezone(pytz.timezone(tools.get_server_timezone()))
+            date_server_datetime_str = date_server_datetime.strftime(tools.DEFAULT_SERVER_DATETIME_FORMAT)
+            msg_dict['date'] = date_server_datetime_str
+
+        if 'In-Reply-To' in message:
+            parent_ids = self.pool.get('mail.message').search(cr, uid, [('message_id', '=', decode(message['In-Reply-To']))])
+            if parent_ids:
+                msg_dict['parent_id'] = parent_ids[0]
+
+        if 'References' in message and 'parent_id' not in msg_dict:
+            parent_ids = self.pool.get('mail.message').search(cr, uid, [('message_id', 'in',
+                                                                         [x.strip() for x in decode(message['References']).split()])])
+            if parent_ids:
+                msg_dict['parent_id'] = parent_ids[0]
+
+        msg_dict['body'], msg_dict['attachments'] = self._message_extract_payload(message)
+        return msg_dict
 
     #------------------------------------------------------
     # Note specific
     #------------------------------------------------------
 
     def log(self, cr, uid, id, message, secondary=False, context=None):
-        _logger.warning("log() is deprecated. As this module inherit from \
-                        mail.thread, the message will be managed by this \
-                        module instead of by the res.log mechanism. Please \
-                        use the mail.thread OpenChatter API instead of the \
-                        now deprecated res.log.")
-        self.message_append_note(cr, uid, [id], 'res.log', message, context=context)
+        _logger.warning("log() is deprecated. As this module inherit from "\
+                        "mail.thread, the message will be managed by this "\
+                        "module instead of by the res.log mechanism. Please "\
+                        "use mail_thread.message_post() instead of the "\
+                        "now deprecated res.log.")
+        self.message_post(cr, uid, [id], message, context=context)
 
-    def message_append_note(self, cr, uid, ids, subject=None, body=None, parent_id=False,
-                            type='notification', content_subtype='html', context=None):
-        if content_subtype == 'html':
-            body_html = body
-            body_text = body
-        else:
-            body_html = body
-            body_text = body
-        return self.message_append(cr, uid, ids, subject, body_html, body_text,
-                                    type, parent_id=parent_id,
-                                    content_subtype=content_subtype, context=context)
+    def message_post(self, cr, uid, thread_id, body='', subject=False,
+            type='notification', parent_id=False, attachments=None, context=None, **kwargs):
+        """ Post a new message in an existing thread, returning the new
+            mail.message ID. Extra keyword arguments will be used as default
+            column values for the new mail.message record.
 
-    #------------------------------------------------------
-    # Subscription mechanism
-    #------------------------------------------------------
-
-    def message_get_monitored_follower_fields(self, cr, uid, ids, context=None):
-        """ Returns a list of fields containing a res.user.id. Those fields
-            will be checked to automatically subscribe those users.
+            :param int thread_id: thread ID to post into, or list with one ID
+            :param str body: body of the message, usually raw HTML that will
+                be sanitized
+            :param str subject: optional subject
+            :param str type: mail_message.type
+            :param int parent_id: optional ID of parent message in this thread
+            :param tuple(str,str) attachments: list of attachment tuples in the form
+                ``(name,content)``, where content is NOT base64 encoded
+            :return: ID of newly created mail.message
         """
+        context = context or {}
+        attachments = attachments or []
+        assert (not thread_id) or isinstance(thread_id, (int,long)) or \
+            (isinstance(thread_id, (list, tuple)) and len(thread_id) == 1), "Invalid thread_id" 
+        if isinstance(thread_id, (list, tuple)):
+            thread_id = thread_id and thread_id[0]
+
+        attachment_ids = []
+        for name, content in attachments:
+            if isinstance(content, unicode):
+                content = content.encode('utf-8')
+            data_attach = {
+                'name': name,
+                'datas': base64.b64encode(str(content)),
+                'datas_fname': name,
+                'description': name,
+                'res_model': context.get('thread_model') or self._name,
+                'res_id': thread_id,
+            }
+            attachment_ids.append((0, 0, data_attach))
+
+        values = kwargs
+        values.update({
+            'model': context.get('thread_model', self._name) if thread_id else False,
+            'res_id': thread_id or False,
+            'body': body,
+            'subject': subject,
+            'type': type,
+            'parent_id': parent_id,
+            'attachment_ids': attachment_ids,
+        })
+        for x in ('from', 'to', 'cc'): values.pop(x, None) # Avoid warnings 
+        return self.pool.get('mail.message').create(cr, uid, values, context=context)
+
+    #------------------------------------------------------
+    # Followers API
+    #------------------------------------------------------
+
+    def message_subscribe_users(self, cr, uid, ids, user_ids=None, context=None):
+        """ Wrapper on message_subscribe, using users. If user_ids is not
+            provided, subscribe uid instead. """
+        if not user_ids: user_ids = [uid]
+        partner_ids = [user.partner_id.id for user in self.pool.get('res.users').browse(cr, uid, user_ids, context=context)]
+        return self.message_subscribe(cr, uid, ids, partner_ids, context=context)
+
+    def message_subscribe(self, cr, uid, ids, partner_ids, context=None):
+        """ Add partners to the records followers.
+            :param partner_ids: a list of partner_ids to subscribe
+            :param return: new value of followers if read_back key in context
+        """
+        self.write(cr, uid, ids, {'message_follower_ids': [(4, pid) for pid in partner_ids]}, context=context)
+        if context and context.get('read_back'):
+            return [follower.id for thread in self.browse(cr, uid, ids, context=context) for follower in thread.message_follower_ids]
         return []
 
-    def message_subscribe(self, cr, uid, ids, user_ids = None, context=None):
-        """ Subscribe the user (or user_ids) to the current document.
-            
-            :param user_ids: a list of user_ids; if not set, subscribe
-                             uid instead
-            :param return: new value of followers, for Chatter
+    def message_unsubscribe_users(self, cr, uid, ids, user_ids=None, context=None):
+        """ Wrapper on message_subscribe, using users. If user_ids is not
+            provided, unsubscribe uid instead. """
+        if not user_ids: user_ids = [uid]
+        partner_ids = [user.partner_id.id for user in self.pool.get('res.users').browse(cr, uid, user_ids, context=context)]
+        return self.message_unsubscribe(cr, uid, ids, partner_ids, context=context)
+
+    def message_unsubscribe(self, cr, uid, ids, partner_ids, context=None):
+        """ Remove partners from the records followers.
+            :param partner_ids: a list of partner_ids to unsubscribe
+            :param return: new value of followers if read_back key in context
         """
-        to_subscribe_uids = [uid] if user_ids is None else user_ids
-        write_res = self.write(cr, uid, ids, {'message_follower_ids': self.message_subscribe_get_command(cr, uid, to_subscribe_uids, context)}, context=context)
-        return [follower.id for thread in self.browse(cr, uid, ids, context=context) for follower in thread.message_follower_ids]
-
-    def message_subscribe_get_command(self, cr, uid, follower_ids, context=None):
-        """ Generate the many2many command to add followers. """
-        return [(4, id) for id in follower_ids]
-
-    def message_unsubscribe(self, cr, uid, ids, user_ids = None, context=None):
-        """ Unsubscribe the user (or user_ids) from the current document.
-            
-            :param user_ids: a list of user_ids; if not set, subscribe
-                             uid instead
-            :param return: new value of followers, for Chatter
-        """
-        to_unsubscribe_uids = [uid] if user_ids is None else user_ids
-        write_res = self.write(cr, uid, ids, {'message_follower_ids': self.message_unsubscribe_get_command(cr, uid, to_unsubscribe_uids, context)}, context=context)
-        return [follower.id for thread in self.browse(cr, uid, ids, context=context) for follower in thread.message_follower_ids]
-
-    def message_unsubscribe_get_command(self, cr, uid, follower_ids, context=None):
-        """ Generate the many2many command to remove followers. """
-        return [(3, id) for id in follower_ids]
+        self.write(cr, uid, ids, {'message_follower_ids': [(3, pid) for pid in partner_ids]}, context=context)
+        if context and context.get('read_back'):
+            return [follower.id for thread in self.browse(cr, uid, ids, context=context) for follower in thread.message_follower_ids]
+        return []
 
     #------------------------------------------------------
-    # Notification API
+    # Thread state
     #------------------------------------------------------
 
-    def message_create_notify_by_email(self, cr, uid, new_msg_values, user_to_notify_ids, context=None):
-        """ When creating a new message and pushing notifications, emails
-            must be send if users have chosen to receive notifications
-            by email via the notification_email_pref field.
-            
-            ``notification_email_pref`` can have 3 values :
-            - all: receive all notification by email (for example for shared
-              users)
-            - to_me: messages send directly to me (@login, messages on res.users)
-            - never: never receive notifications
-            Note that an user should never receive notifications for messages
-            he has created.
-            
-            :param new_msg_values: dictionary of message values, those that
-                                   are given to the create method
-            :param user_to_notify_ids: list of user_ids, user that will
-                                       receive a notification on their Wall
-        """
-        message_obj = self.pool.get('mail.message')
-        res_users_obj = self.pool.get('res.users')
-        body = new_msg_values.get('body_html', '') if new_msg_values.get('content_subtype') == 'html' else new_msg_values.get('body_text', '')
-        
-        # remove message writer
-        if user_to_notify_ids.count(new_msg_values.get('user_id')) > 0:
-            user_to_notify_ids.remove(new_msg_values.get('user_id'))
-
-        # try to find an email_to
-        email_to = ''
-        for user in res_users_obj.browse(cr, uid, user_to_notify_ids, context=context):
-            # TO BE REFACTORED BY FP, JUSTE REMOVED TO_ME, NOT SURE WHAT S NEW BEHAVIOR
-            if not user.notification_email_pref == 'all':
-                continue
-            if not user.email:
-                continue
-            email_to = '%s, %s' % (email_to, user.email)
-            email_to = email_to.lstrip(', ')
-        
-        # did not find any email address: not necessary to create an email
-        if not email_to:
-            return
-        
-        # try to find an email_from
-        current_user = res_users_obj.browse(cr, uid, [uid], context=context)[0]
-        email_from = new_msg_values.get('email_from')
-        if not email_from:
-            email_from = current_user.email
-        
-        # get email content, create it (with mail_message.create)
-        email_values = self.message_create_notify_get_email_dict(cr, uid, new_msg_values, email_from, email_to, context)
-        email_id = message_obj.create(cr, uid, email_values, context=context)
-        return email_id
-    
-    def message_create_notify_get_email_dict(self, cr, uid, new_msg_values, email_from, email_to, context=None):
-        values = dict(new_msg_values)
-        
-        body_html = new_msg_values.get('body_html', '')
-        if body_html:
-            body_html += '\n\n----------\nThis email was send automatically by OpenERP, because you have subscribed to a document.'
-        body_text = new_msg_values.get('body_text', '')
-        if body_text:
-            body_text += '\n\n----------\nThis email was send automatically by OpenERP, because you have subscribed to a document.'
-        values.update({
-            'type': 'email',
-            'state': 'outgoing',
-            'email_from': email_from,
-            'email_to': email_to,
-            'subject': 'New message',
-            'content_subtype': new_msg_values.get('content_subtype', 'plain'),
-            'body_html': body_html,
-            'body_text': body_text,
-            'auto_delete': True,
-            'res_model': '',
-            'res_id': False,
-        })
-        return values
-
-    def message_remove_pushed_notifications(self, cr, uid, ids, msg_ids, remove_childs=True, context=None):
-        notif_obj = self.pool.get('mail.notification')
-        msg_obj = self.pool.get('mail.message')
-        if remove_childs:
-            notif_msg_ids = msg_obj.search(cr, uid, [('id', 'child_of', msg_ids)], context=context)
-        else:
-            notif_msg_ids = msg_ids
-        to_del_notif_ids = notif_obj.search(cr, uid, ['&', ('user_id', '=', uid), ('message_id', 'in', notif_msg_ids)], context=context)
-        return notif_obj.unlink(cr, uid, to_del_notif_ids, context=context)
-
-    #------------------------------------------------------
-    # Thread_state
-    #------------------------------------------------------
-
-    def message_create_set_unread(self, cr, uid, ids, context=None):
-        """ When creating a new message, set as unread if uid is not the
-            object responsible. """
-        for obj in self.browse(cr, uid, ids, context=context):
-            if obj.message_state and self._columns.get('user_id') and (not obj.user_id or obj.user_id.id != uid):
-                self.message_mark_as_unread(cr, uid, [obj.id], context=context)
-
-    def message_check_and_set_unread(self, cr, uid, ids, context=None):
-        """ Set unread if uid is the object responsible or if the object has
-            no responsible. """
-        for obj in self.browse(cr, uid, ids, context=context):
-            if obj.message_state and self._columns.get('user_id') and (not obj.user_id or obj.user_id.id == uid):
-                self.message_mark_as_unread(cr, uid, [obj.id], context=context)
-
     def message_mark_as_unread(self, cr, uid, ids, context=None):
         """ Set as unread. """
-        return self.write(cr, uid, ids, {'message_state': False}, context=context)
+        partner_id = self.pool.get('res.users').browse(cr, uid, uid, context=context).partner_id.id
+        cr.execute('''
+            UPDATE mail_notification SET
+                read=false
+            WHERE
+                message_id IN (SELECT id from mail_message where res_id=any(%s) and model=%s limit 1) and
+                partner_id = %s
+        ''', (ids, self._name, partner_id))
+        return True
 
-    def message_check_and_set_read(self, cr, uid, ids, context=None):
-        """ Set read if uid is the object responsible. """
-        for obj in self.browse(cr, uid, ids, context=context):
-            if not obj.message_state and self._columns.get('user_id') and obj.user_id and obj.user_id.id == uid:
-                self.message_mark_as_read(cr, uid, [obj.id], context=context)
-    
     def message_mark_as_read(self, cr, uid, ids, context=None):
         """ Set as read. """
-        return self.write(cr, uid, ids, {'message_state': True}, context=context)
-
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+        partner_id = self.pool.get('res.users').browse(cr, uid, uid, context=context).partner_id.id
+        cr.execute('''
+            UPDATE mail_notification SET
+                read=true
+            WHERE
+                message_id IN (SELECT id FROM mail_message WHERE res_id=ANY(%s) AND model=%s) AND
+                partner_id = %s
+        ''', (ids, self._name, partner_id))
+        return True
diff --git a/addons/mail/mail_thread_view.xml b/addons/mail/mail_thread_view.xml
index 68727832e53..34efa05f812 100644
--- a/addons/mail/mail_thread_view.xml
+++ b/addons/mail/mail_thread_view.xml
@@ -3,22 +3,22 @@
     <data>
 
         <!-- Top menu item -->
-        <menuitem name="Feeds"
+        <menuitem name="Home"
           id="mail_feeds_main"
           groups="base.group_user"
           sequence="10"/>
 
-        <!-- left-side menu: Feeds !-->
+        <!-- Left-side menu: Feeds -->
         <menuitem id="mail_feeds" name="Feeds" parent="mail_feeds_main" groups="base.group_user" sequence="10"/>
 
         <record id="mail_wallfeeds" model="ir.ui.menu">
-          <field name="name">News Feed</field>
+          <field name="name">My Feeds</field>
           <field name="sequence" eval="10"/>
           <field name="action" ref="action_mail_all_feeds"/>
           <field name="parent_id" ref="mail_feeds"/>
         </record>
         <record id="mail_myfeeds" model="ir.ui.menu">
-          <field name="name">My Feeds</field>
+          <field name="name">My Posts</field>
           <field name="sequence" eval="11"/>
           <field name="action" ref="action_mail_my_feeds"/>
           <field name="parent_id" ref="mail_feeds"/>
diff --git a/addons/mail/res_config_view.xml b/addons/mail/res_config_view.xml
index c4bc23c9357..d3797ba2dcc 100644
--- a/addons/mail/res_config_view.xml
+++ b/addons/mail/res_config_view.xml
@@ -6,9 +6,10 @@
             <field name="model">base.config.settings</field>
             <field name="inherit_id" ref="base_setup.view_general_configuration"/>
             <field name="arch" type="xml">
-                <xpath expr="/form/group[last()]/div[last()]/div[last()]" position='after' version="7.0">
+                <xpath expr="//div[@name='email']" position='inside'>
                     <div>
-                        <label for="alias_domain" class="oe_inline"/><field name="alias_domain" placeholder="mycompany.my.openerp.com" class="oe_inline"/>
+                        <label for="alias_domain" class="oe_inline"/>
+                        <field name="alias_domain" placeholder="mycompany.my.openerp.com" class="oe_inline"/>
                     </div>
                 </xpath>
             </field>
diff --git a/addons/mail/res_partner.py b/addons/mail/res_partner.py
index d3a61b31a8a..2988cee3d9c 100644
--- a/addons/mail/res_partner.py
+++ b/addons/mail/res_partner.py
@@ -19,29 +19,27 @@
 #
 ##############################################################################
 
-from osv import osv
+from osv import osv, fields
 
 class res_partner_mail(osv.Model):
-    """ Inherits partner and adds CRM information in the partner form """
+    """ Update partner to add a field about notification preferences """
     _name = "res.partner"
     _inherit = ['res.partner', 'mail.thread']
 
-    def message_search_get_domain(self, cr, uid, ids, context=None):
-        """ Override of message_search_get_domain for partner discussion page.
-            The purpose is to add messages directly sent to the partner. It also
-            adds messages pushed to the related user, if any, using @login.
-        """
-        initial_domain = super(res_partner_mail, self).message_search_get_domain(cr, uid, ids, context=context)
-        # to avoid models inheriting from res.partner
-        if self._name != 'res.partner':
-            return initial_domain
-        # add message linked to the partner
-        search_domain = ['|'] + initial_domain + ['|', ('partner_id', 'in', ids), ('partner_ids', 'in', ids)]
-        # if partner is linked to a user: find @login
-        res_users_obj = self.pool.get('res.users')
-        user_ids = res_users_obj.search(cr, uid, [('partner_id', 'in', ids)], context=context)
-        for user in res_users_obj.browse(cr, uid, user_ids, context=context):
-            search_domain = ['|'] + search_domain + ['|', ('body_text', 'like', '@%s' % (user.login)), ('body_html', 'like', '@%s' % (user.login))]
-        return search_domain
+    _columns = {
+        'notification_email_send': fields.selection([
+            ('all', 'All feeds'),
+            ('comment', 'Comments and Emails'),
+            ('email', 'Emails only'),
+            ('none', 'Never')
+            ], 'Receive Feeds by Email', required=True,
+            help="Choose in which case you want to receive an email when you "\
+                  "receive new feeds."),
+    }
+
+    _defaults = {
+        'notification_email_send': lambda *args: 'comment'
+    }
+
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/mail/res_users.py b/addons/mail/res_users.py
index f985ac4f88d..1bc193051a1 100644
--- a/addons/mail/res_users.py
+++ b/addons/mail/res_users.py
@@ -19,15 +19,10 @@
 #
 ##############################################################################
 
-import logging
-
 from osv import osv, fields
-from openerp.modules.registry import RegistryManager
 from openerp import SUPERUSER_ID
 from tools.translate import _
 
-_logger = logging.getLogger(__name__)
-
 class res_users(osv.Model):
     """ Update of res.users class
         - add a preference about sending emails about notifications
@@ -39,65 +34,30 @@ class res_users(osv.Model):
     _inherits = {'mail.alias': 'alias_id'}
 
     _columns = {
-        'notification_email_pref': fields.selection([
-            ('all', 'All Feeds'),
-            ('to_me', 'Only send directly to me'),
-            ('none', 'Never')
-            ], 'Receive Feeds by Email', required=True,
-            help="Choose in which case you want to receive an email when you "\
-                 "receive new feeds."),
         '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."),
     }
     
     _defaults = {
-        'notification_email_pref': 'to_me',
         'alias_domain': False, # always hide alias during creation
     }
 
     def __init__(self, pool, cr):
-        """ Override of __init__ to add access rights on notification_email_pref
+        """ Override of __init__ to add access rights on notification_email_send
             field. Access rights are disabled by default, but allowed on
             fields defined in self.SELF_WRITEABLE_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('notification_email_pref')
+        self.SELF_WRITEABLE_FIELDS.append('notification_email_send')
         return init_res
 
     def _auto_init(self, cr, context=None):
         """Installation hook to create aliases for all users and avoid constraint errors."""
-
-        # disable the unique alias_id not null constraint, to avoid spurious warning during 
-        # super.auto_init. We'll reinstall it afterwards.
-        self._columns['alias_id'].required = False
-
-        super(res_users,self)._auto_init(cr, context=context)
-
-        registry = RegistryManager.get(cr.dbname)
-        mail_alias = registry.get('mail.alias')
-        res_users_model = registry.get('res.users')
-        users_no_alias = res_users_model.search(cr, SUPERUSER_ID, [('alias_id', '=', False)])
-        # Use read() not browse(), to avoid prefetching uninitialized inherited fields
-        for user_data in res_users_model.read(cr, SUPERUSER_ID, users_no_alias, ['login']):
-            alias_id = mail_alias.create_unique_alias(cr, SUPERUSER_ID, {'alias_name': user_data['login'],
-                                                                         'alias_force_id': user_data['id']},
-                                                      model_name=self._name)
-            res_users_model.write(cr, SUPERUSER_ID, user_data['id'], {'alias_id': alias_id})
-            _logger.info('Mail alias created for user %s (uid %s)', user_data['login'], user_data['id'])
-
-        # Finally attempt to reinstate the missing constraint
-        try:
-            cr.execute('ALTER TABLE res_users ALTER COLUMN alias_id SET NOT NULL')
-        except Exception:
-            _logger.warning("Table '%s': unable to set a NOT NULL constraint on column '%s' !\n"\
-                            "If you want to have it, you should update the records and execute manually:\n"\
-                            "ALTER TABLE %s ALTER COLUMN %s SET NOT NULL",
-                            self._table, 'alias_id', self._table, 'alias_id')
-
-        self._columns['alias_id'].required = True
+        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)
 
     def create(self, cr, uid, data, context=None):
         # create default alias same as the login
@@ -105,23 +65,23 @@ class res_users(osv.Model):
         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 that follows its related partner
         user_id = super(res_users, self).create(cr, uid, data, context=context)
         user = self.browse(cr, uid, user_id, context=context)
-        self.pool.get('res.partner').message_subscribe(cr, uid, [user.partner_id.id], [user_id], context=context)
+        self.pool.get('res.partner').message_subscribe(cr, uid, [user.partner_id.id], [user.partner_id.id], context=context)
         # alias
         mail_alias.write(cr, SUPERUSER_ID, [alias_id], {"alias_force_thread_id": user_id}, context)
         # create a welcome message
-        self.create_welcome_message(cr, uid, user, context=context)
+        self._create_welcome_message(cr, uid, user, context=context)
         return user_id
 
-    def create_welcome_message(self, cr, uid, user, context=None):
+    def _create_welcome_message(self, cr, uid, user, context=None):
         company_name = user.company_id.name if user.company_id else _('the company')
-        subject = '''%s has joined %s.''' % (user.name, company_name)
-        body = '''Welcome to OpenERP !''' 
-        # TODO change 1 into user.id but catch errors
-        return self.pool.get('res.partner').message_append_note(cr, 1, [user.partner_id.id],
-            subject=subject, body=body, type='comment', content_subtype='html', context=context)
+        body = _('%s has joined %s.') % (user.name, company_name)
+        # TODO change SUPERUSER_ID into user.id but catch errors
+        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
@@ -136,52 +96,19 @@ class res_users(osv.Model):
         alias_pool.unlink(cr, uid, alias_ids, context=context)
         return res
 
-    # --------------------------------------------------
-    # Wrappers on partner methods for Chatter
-    # #FIXME: another branch holds a refactoring of mail.thread
-    # that should help cleaning those wrappers
-    # --------------------------------------------------
-
-    def message_append(self, cr, uid, threads, subject, body_text=None, body_html=None,
-                        type='email', email_date=None, parent_id=False,
-                        content_subtype='plain', state=None,
-                        partner_ids=None, email_from=False, email_to=False,
-                        email_cc=None, email_bcc=None, reply_to=None,
-                        headers=None, message_id=False, references=None,
-                        attachments=None, original=None, context=None):
-        for user in self.browse(cr, uid, threads, context=context):
-            user.partner_id.message_append(subject, body_text, body_html, type, email_date, parent_id,
-                content_subtype, state, partner_ids, email_from, email_to, email_cc, email_bcc, reply_to,
-                headers, message_id, references, attachments, original)
-
-    def message_read(self, cr, uid, ids, fetch_ancestors=False, ancestor_ids=None, 
-                        limit=100, offset=0, domain=None, context=None):
-        for user in self.browse(cr, uid, ids, context=context):
-            return user.partner_id.message_read(fetch_ancestors, ancestor_ids, limit, offset, domain)
-
-    def message_search(self, cr, uid, ids, fetch_ancestors=False, ancestor_ids=None, 
-                        limit=100, offset=0, domain=None, count=False, context=None):
-        for user in self.browse(cr, uid, ids, context=context):
-            return user.partner_id.message_search(fetch_ancestors, ancestor_ids, limit, offset, domain, count)
-
-    def message_subscribe(self, cr, uid, ids, user_ids = None, context=None):
-        for user in self.browse(cr, uid, ids, context=context):
-            return user.partner_id.message_subscribe(user_ids)
-
-    def message_unsubscribe(self, cr, uid, ids, user_ids = None, context=None):
-        for user in self.browse(cr, uid, ids, context=context):
-            return user.partner_id.message_unsubscribe(user_ids)
-
+    def message_post(self, cr, uid, thread_id, **kwargs):
+        partner_id = self.pool.get('res.users').browse(cr, uid, thread_id)[0].partner_id.id
+        return self.pool.get('res.partner').message_post(cr, uid, partner_id, **kwargs)
 
 class res_users_mail_group(osv.Model):
-    """ Update of res.groups class
-        - if adding/removing users from a group, check mail.groups linked to
-          this user group, and subscribe / unsubscribe them from the discussion
-          group. This is done by overriding the write method.
+    """ Update of res.users class
+        - if adding groups to an user, check mail.groups linked to this user
+          group, and the user. This is done by overriding the write method.
     """
     _name = 'res.users'
     _inherit = ['res.users']
 
+    # FP Note: to improve, post processing may be better ?
     def write(self, cr, uid, ids, vals, context=None):
         write_res = super(res_users_mail_group, self).write(cr, uid, ids, vals, context=context)
         if vals.get('groups_id'):
@@ -190,26 +117,25 @@ class res_users_mail_group(osv.Model):
             user_group_ids += [id for command in vals['groups_id'] if command[0] == 6 for id in command[2]]
             mail_group_obj = self.pool.get('mail.group')
             mail_group_ids = mail_group_obj.search(cr, uid, [('group_ids', 'in', user_group_ids)], context=context)
-            mail_group_obj.message_subscribe(cr, uid, mail_group_ids, ids, context=context)
+            mail_group_obj.message_subscribe_users(cr, uid, mail_group_ids, ids, context=context)
         return write_res
 
 class res_groups_mail_group(osv.Model):
     """ Update of res.groups class
-        - if adding/removing users from a group, check mail.groups linked to
-          this user group, and subscribe / unsubscribe them from the discussion
-          group. This is done by overriding the write method.
+        - if adding users from a group, check mail.groups linked to this user
+          group and subscribe them. This is done by overriding the write method.
     """
     _name = 'res.groups'
     _inherit = 'res.groups'
 
+    # FP Note: to improve, post processeing, after the super may be better
     def write(self, cr, uid, ids, vals, context=None):
+        write_res = super(res_groups_mail_group, self).write(cr, uid, ids, vals, context=context)
         if vals.get('users'):
             # form: {'group_ids': [(3, 10), (3, 3), (4, 10), (4, 3)]} or {'group_ids': [(6, 0, [ids]}
             user_ids = [command[1] for command in vals['users'] if command[0] == 4]
             user_ids += [id for command in vals['users'] if command[0] == 6 for id in command[2]]
             mail_group_obj = self.pool.get('mail.group')
             mail_group_ids = mail_group_obj.search(cr, uid, [('group_ids', 'in', ids)], context=context)
-            mail_group_obj.message_subscribe(cr, uid, mail_group_ids, user_ids, context=context)
-        return super(res_groups_mail_group, self).write(cr, uid, ids, vals, context=context)
-
-# vim:et:
+            mail_group_obj.message_subscribe_users(cr, uid, mail_group_ids, user_ids, context=context)
+        return write_res
diff --git a/addons/mail/res_users_view.xml b/addons/mail/res_users_view.xml
index 005d71cb09f..a119765e1ec 100644
--- a/addons/mail/res_users_view.xml
+++ b/addons/mail/res_users_view.xml
@@ -10,7 +10,7 @@
             <field name="arch" type="xml">
             <data>
                 <field name="email" position="before">
-                    <field name="notification_email_pref" readonly="0"/>
+                    <field name="notification_email_send" readonly="0"/>
                 </field>
             </data>
             </field>
@@ -24,7 +24,7 @@
             <field name="arch" type="xml">
             <data>
                 <field name="email" position="before">
-                    <field name="notification_email_pref"/>
+                    <field name="notification_email_send"/>
                 </field>
                 <field name="email" position="after">
                     <field name="alias_domain" invisible="1"/>
diff --git a/addons/mail/static/src/css/mail.css b/addons/mail/static/src/css/mail.css
index 7cee91e30e5..240627c9e6c 100644
--- a/addons/mail/static/src/css/mail.css
+++ b/addons/mail/static/src/css/mail.css
@@ -1,3 +1,20 @@
+/* ------------------------------------------------------------ */
+/* Reset because of ugly display of end of August
+/* ------------------------------------------------------------ */
+
+.openerp .oe_mail_wall ul, .openerp .oe_mail_wall li {
+    list-style-type: none;
+    padding: 0;
+    margin: 0;
+}
+
+.openerp .oe_chatter ul, .openerp .oe_chatter li {
+    list-style-type: none;
+    padding: 0;
+    margin: 0;
+}
+
+
 /* ------------------------------------------------------------ */
 /* Wall
 /* ------------------------------------------------------------ */
@@ -8,49 +25,22 @@
     background: white;
 }
 
-.openerp div.oe_mail_wall_main {
-    float: left;
-    width: 560px;
-    margin: 8px;
-}
-
-.openerp div.oe_mail_wall_aside {
+.openerp div.oe_mail_wall div.oe_mail_wall_aside {
     margin-left: 565px;
     margin: 8px;
 }
 
-.openerp div.oe_mail_wall_action {
-    padding: 8px;
-    background: #eee;
-    border: 1px solid #ccc;
-}
-
-.openerp div.oe_mail_wall_action:after {
-    content: "";
-    display: block;
-    clear: both; 
-}
-
-.openerp div.oe_mail_wall_action .oe_mail_msg_content {
-    width: 484px;
-}
-
-.openerp div.oe_mail_wall_action textarea.oe_mail_compose_textarea,
-.openerp div.oe_mail_wall_action div.oe_mail_compose_message_body_text textarea {
-    width: 474px;
-    height: 60px;
-    padding: 4px;
-    margin-bottom: 2px;
-}
-
-.openerp ul.oe_mail_wall_threads {
-    margin-top: 8px;
+.openerp div.oe_mail_wall ul.oe_mail_wall_threads {
+    float: left;
+    width: 560px;
+    margin: 8px;
+    list-style-type: none;
 }
 
 /* Specific display of threads in the wall */
 /* ------------------------------------------------------------ */
 
-.openerp ul.oe_mail_wall_threads .oe_mail_msg_content textarea {
+.openerp ul.oe_mail_wall_threads .oe_mail_msg_content textarea.oe_mail_compose_textarea {
     width: 434px;
     height: 30px;
     padding: 4px;
@@ -70,7 +60,7 @@
     width: 486px;
 }
 
-.openerp div.oe_mail_msg_content li {
+.openerp div.oe_mail_msg_content > li {
     float: left;
     margin-right: 3px;
 }
@@ -79,11 +69,6 @@
     width: 440px;
 }
 
-.openerp div.oe_mail_wall_more {
-    text-align: center;
-    display: none;
-}
-
 
 /* ------------------------------------------------------------ */
 /* RecordThread
@@ -93,10 +78,6 @@
     overflow: auto;
 }
 
-.openerp div.oe_mail_recthread {
-    /*overflow: auto;*/
-}
-
 .openerp div.oe_mail_recthread_main {
     float: left;
     width: 560px;
@@ -165,9 +146,9 @@
     clear: both; 
 }
 
-/* default textarea (oe_mail_compose_textarea), and body_text textarea for compose form view */
+/* default textarea (oe_mail_compose_textarea), and body textarea for compose form view */
 .openerp .oe_mail_msg_content textarea.oe_mail_compose_textarea,
-.openerp .oe_mail_msg_content div.oe_mail_compose_message_body_text textarea {
+.openerp .oe_mail_msg_content div.oe_mail_compose_message_body textarea {
     width: 474px;
     height: 60px;
     padding: 4px;
@@ -175,9 +156,9 @@
     border: 1px solid #cccccc;
 }
 
-/* default textarea (oe_mail_compose_textarea), and body_text textarea for compose form view */
+/* default textarea (oe_mail_compose_textarea), and body textarea for compose form view */
 .openerp .oe_mail_msg_content textarea.oe_mail_compose_textarea:focus,
-.openerp .oe_mail_msg_content div.oe_mail_compose_message_body_text textarea:focus {
+.openerp .oe_mail_msg_content div.oe_mail_compose_message_body textarea:focus {
     outline: 0;
     border-color: rgba(82, 168, 236, 0.8);
     -moz-box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.1), 0 0 8px rgba(82, 168, 236, 0.6);
@@ -349,6 +330,11 @@
     color: #888;
 }
 
+.openerp .oe_mail_msg_footer li {
+  float: left;
+  margin-right: 3px;
+}
+
 .openerp .oe_mail_msg_body {
     margin-bottom: .5em;
     text-align: justify;
diff --git a/addons/mail/static/src/css/mail_compose_message.css b/addons/mail/static/src/css/mail_compose_message.css
index 4cd1339ded4..ba7ed36a695 100644
--- a/addons/mail/static/src/css/mail_compose_message.css
+++ b/addons/mail/static/src/css/mail_compose_message.css
@@ -2,10 +2,6 @@
 /* Compose Message Wizard Form */
 /* ------------------------------ */
 
-.openerp tr td .oe_form_field.oe_mail_compose_message_invisible {
-    display: none;
-}
-
 .openerp .oe_mail_compose_message_icons {
     text-align: right;
 }
diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index 16404b28594..a5a64a59a8b 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -17,8 +17,15 @@ openerp.mail = function(session) {
      */
 
     session.web.FormView = session.web.FormView.extend({
+        // TDE FIXME TODO: CHECK WITH NEW BRANCH
         do_action: function(action, on_close) {
-            if (action.res_model == 'mail.compose.message' && this.fields && this.fields.message_ids && this.fields.message_ids.view.get("actual_mode") != 'create') {
+            if (action.res_model == 'mail.compose.message' &&
+                this.fields && this.fields.message_ids &&
+                this.fields.message_ids.view.get("actual_mode") != 'create') {
+                // debug
+                console.groupCollapsed('FormView do_action on mail.compose.message');
+                console.log('message_ids field:', this.fields.message_ids);
+                console.groupEnd();
                 var record_thread = this.fields.message_ids;
                 var thread = record_thread.thread;
                 thread.instantiate_composition_form('comment', true, false, 0, action.context);
@@ -30,7 +37,6 @@ openerp.mail = function(session) {
         },
     });
 
-
     /**
      * ------------------------------------------------------------
      * ChatterUtils
@@ -38,181 +44,37 @@ openerp.mail = function(session) {
      * 
      * This class holds a few tools method that will be used by
      * the various Chatter widgets.
+     *
+     * Some regular expressions not used anymore, kept because I want to
+     * - (^|\s)@((\w|@|\.)*): @login@log.log
+     *      1. '(void)'
+     *      2. login@log.log
+     * - (^|\s)\[(\w+).(\w+),(\d)\|*((\w|[@ .,])*)\]: [ir.attachment,3|My Label],
+     *   for internal links
+     *      1. '(void)'
+     *      2. 'ir'
+     *      3. 'attachment'
+     *      4. '3'
+     *      5. 'My Label'
      */
 
     mail.ChatterUtils = {
 
-        /**
-        * mail_int_mapping: structure to keep a trace of internal links mapping
-        *      mail_int_mapping['model'] = {
-        *          'name_get': [[id,label], [id,label], ...]
-        *          'fetch_ids': [id, id, ...] } */
-        //var mail_int_mapping = {};
-        
-        /**
-        * mail_msg_struct: structure to orrganize chatter messages
-        */
-        //var mail_msg_struct = {}; // TODO: USE IT OR NOT :)
-
-        /* generic chatter events binding */
-        bind_events: function(widget) {
-            // event: click on an internal link to a document: model, login
-            widget.$element.delegate('a.oe_mail_internal_link', 'click', function (event) {
-                event.preventDefault();
-                // lazy implementation: fetch data and try to redirect
-                if (! event.srcElement.dataset.resModel) return false;
-                else var res_model = event.srcElement.dataset.resModel;
-                var res_login = event.srcElement.dataset.resLogin;
-                if (! res_login) return false;
-                var ds = new session.web.DataSet(widget, res_model);
-                var defer = ds.call('search', [[['login', '=', res_login]]]).pipe(function (records) {
-                    if (records[0]) {
-                        widget.do_action({ type: 'ir.actions.act_window', res_model: res_model, res_id: parseInt(records[0]), views: [[false, 'form']]});
-                    }
-                    else return false;
-                });
-            });
-        },
-
         /** get an image in /web/binary/image?... */
         get_image: function(session_prefix, session_id, model, field, id) {
             return session_prefix + '/web/binary/image?session_id=' + session_id + '&model=' + model + '&field=' + field + '&id=' + (id || '');
         },
 
-        /** checks if tue current user is the message author */
+        /** check if the current user is the message author */
         is_author: function (widget, message_user_id) {
             return (widget.session && widget.session.uid != 0 && widget.session.uid == message_user_id);
         },
 
-        /**
-        * Add records to comments_structure array
-        * @param {Array} records records from mail.message sorted by date desc
-        * @returns {Object} cs comments_structure: dict
-        *       cs.model_to_root_ids = {model: [root_ids], }
-        *       cs.new_root_ids = [new_root_ids]
-        *       cs.root_ids = [root_ids]
-        *       cs.msgs = {record.id: record,}
-        *       cs.tree_struct = {record.id: {
-        *           'level': record_level in hierarchy, 0 is root,
-        *           'msg_nbr': number of childs,
-        *           'direct_childs': [msg_ids],
-        *           'all_childs': [msg_ids],
-        *           'for_thread_msgs': [records],
-        *           'ancestors': [msg_ids], } }
-        */
-        records_struct_add_records: function(cs, records, parent_id) {
-            var cur_iter = 0; var max_iter = 10; var modif = true;
-            while ( modif && (cur_iter++) < max_iter) {
-                modif = false;
-                _(records).each(function (record) {
-                    // root and not yet recorded
-                    if ( (record.parent_id == false || record.parent_id[0] == parent_id) && ! cs['msgs'][record.id]) {
-                        // add to model -> root_list ids
-                        if (! cs['model_to_root_ids'][record.model]) cs['model_to_root_ids'][record.model] = [record.id];
-                        else cs['model_to_root_ids'][record.model].push(record.id);
-                        // add root data
-                        cs['new_root_ids'].push(record.id);
-                        // add record
-                        cs['tree_struct'][record.id] = {'level': 0, 'direct_childs': [], 'all_childs': [], 'for_thread_msgs': [record], 'msg_nbr': -1, 'ancestors': []};
-                        cs['msgs'][record.id] = record;
-                        modif = true;
-                    }
-                    // not yet recorded, but parent is recorded
-                    else if (! cs['msgs'][record.id] && cs['msgs'][record.parent_id[0]]) {
-                        var parent_level = cs['tree_struct'][record.parent_id[0]]['level'];
-                        // update parent structure
-                        cs['tree_struct'][record.parent_id[0]]['direct_childs'].push(record.id);
-                        cs['tree_struct'][record.parent_id[0]]['for_thread_msgs'].push(record);
-                        // update ancestors structure
-                        for (ancestor_id in cs['tree_struct'][record.parent_id[0]]['ancestors']) {
-                            cs['tree_struct'][ancestor_id]['all_childs'].push(record.id);
-                        }
-                        // add record
-                        cs['tree_struct'][record.id] = {'level': parent_level+1, 'direct_childs': [], 'all_childs': [], 'for_thread_msgs': [], 'msg_nbr': -1, 'ancestors': []};
-                        cs['msgs'][record.id] = record;
-                        modif = true;
-                    }
-                });
-            }
-            return cs;
-        },
-
-        /* copy cs.new_root_ids into cs.root_ids */
-        records_struct_update_after_display: function(cs) {
-            // update TODO
-            cs['root_ids'] = _.union(cs['root_ids'], cs['new_root_ids']);
-            cs['new_root_ids'] = [];
-            return cs;
-        },
-
-        /**
-         *    CONTENT MANIPULATION
-         * 
-         * Regular expressions
-         * - (^|\s)@((\w|@|\.)*): @login@log.log, supports inner '@' for
-         *   logins that are emails
-         *      1. '(void)'
-         *      2. login@log.log
-         * - (^|\s)\[(\w+).(\w+),(\d)\|*((\w|[@ .,])*)\]: [ir.attachment,3|My Label],
-         *   for internal links to model ir.attachment, id=3, and with
-         *   optional label 'My Label'. Note that having a '|Label' is not
-         *   mandatory, because the regex should still be correct.
-         *      1. '(void)'
-         *      2. 'ir'
-         *      3. 'attachment'
-         *      4. '3'
-         *      5. 'My Label'
-         */
-
-        /** Removes html tags, except b, em, br, ul, li */
-        do_text_remove_html_tags: function (string) {
-            var html = $('<div/>').text(string.replace(/\s+/g, ' ')).html().replace(new RegExp('&lt;(/)?(b|em|br|br /|ul|li|div)\\s*&gt;', 'gi'), '<$1$2>');
-            return html;
-        },
-        
-        /** Replaces line breaks by html line breaks (br) */
-        do_text_nl2br: function (str, is_xhtml) {   
-            var break_tag = (is_xhtml || typeof is_xhtml === 'undefined') ? '<br />' : '<br>';    
-            return (str + '').replace(/([^>\r\n]?)(\r\n|\n\r|\r|\n)/g, '$1'+ break_tag +'$2');
-        },
-
-        /* Add a prefix before each new line of the original string */
-        do_text_quote: function (str, prefix) {
-            return str.replace(/([^>\r\n]?)(\r\n|\n\r|\r|\n)/g, '$1'+ break_tag +'$2' + prefix || '> ');
-        },
-
-        /**
-         * Replaces some expressions
-         * - @login - shorcut to link to a res.user, given its login
-         * - [ir.attachment,3|My Label] - shortcut to an internal
-         *   document
+        /** Replaces some expressions
          * - :name - shortcut to an image
          */
         do_replace_expressions: function (string) {
-            var self = this;
             var icon_list = ['al', 'pinky']
-            /* shortcut to user: @login */
-            var regex_login = new RegExp(/(^|\s)@((\w|@|\.)*)/g);
-            var regex_res = regex_login.exec(string);
-            while (regex_res != null) {
-                var login = regex_res[2];
-                string = string.replace(regex_res[0], regex_res[1] + '<a href="#" class="oe_mail_internal_link" data-res-model="res.users" data-res-login = ' + login + '>@' + login + '</a>');
-                regex_res = regex_login.exec(string);
-            }
-            /* shortcut for internal document */
-            var regex_login = new RegExp(/(^|\s)\[(\w+).(\w+),(\d)\|*((\w|[@ .,])*)\]/g);
-            var regex_res = regex_login.exec(string);
-            while (regex_res != null) {
-                var res_model = regex_res[2] + '.' + regex_res[3];
-                var res_id = regex_res[4];
-                if (! regex_res[5]) {
-                    var label = res_model + ':' + res_id }
-                else {
-                    var label = regex_res[5];
-                }
-                string = string.replace(regex_res[0], regex_res[1] + '<a href="#model=' + res_model + '&id=' + res_id + '>' + label + '</a>');
-                regex_res = regex_login.exec(string);
-            }
             /* special shortcut: :name, try to find an icon if in list */
             var regex_login = new RegExp(/(^|\s):((\w)*)/g);
             var regex_res = regex_login.exec(string);
@@ -224,46 +86,6 @@ openerp.mail = function(session) {
             }
             return string;
         },
-
-        /**
-         * Checks a string to find an expression that will be replaced
-         * by an internal link and requiring a name_get to replace
-         * the expression.
-         * :param mapping: structure to keep a trace of internal links mapping
-         *                  mapping['model'] = {
-         *                      name_get': [[id,label], [id,label], ...]
-         *                      'to_fetch_ids': [id, id, ...]
-         *                  }
-         * CURRENTLY NOT IMPLEMENTED */
-        do_check_for_name_get_mapping: function(string, mapping) {
-            /* shortcut to user: @login */
-            //var regex_login = new RegExp(/(^|\s)@((\w|@|\.)*)/g);
-            //var regex_res = regex_login.exec(string);
-            //while (regex_res != null) {
-                //var login = regex_res[2];
-                //if (! ('res.users' in this.map_hash)) { this.map_hash['res.users']['name'] = []; }
-                //this.map_hash['res.users']['login'].push(login);
-                //regex_res = regex_login.exec(string);
-            //}
-            /* document link with name_get: [res.model,name] */
-            /* internal link with id: [res.model,id], or [res.model,id|display_name] */
-            //var regex_intlink = new RegExp(/(^|\s)#(\w*[a-zA-Z_]+\w*)\.(\w+[a-zA-Z_]+\w*),(\w+)/g);
-            //regex_res = regex_intlink.exec(string);
-            //while (regex_res != null) {
-                //var res_model = regex_res[2] + '.' + regex_res[3];
-                //var res_name = regex_res[4];
-                //if (! (res_model in this.map_hash)) { this.map_hash[res_model]['name'] = []; }
-                //this.map_hash[res_model]['name'].push(res_name);
-                //regex_res = regex_intlink.exec(string);
-            //}
-        },
-        
-        /**
-         * Updates the mapping; check for to_fetch_ids for each recorded
-         * model, and perform a name_get to update the mapping.
-         * CURRENTLY NOT IMPLEMENTED */
-        do_update_name_get_mapping: function(mapping) {
-        },
     };
 
 
@@ -273,8 +95,7 @@ openerp.mail = function(session) {
      * ------------------------------------------------------------
      * 
      * This widget handles the display of a form to compose a new message.
-     * This form is an OpenERP form_view, build on a mail.compose.message
-     * wizard.
+     * This form is a mail.compose.message form_view.
      */
 
     mail.ComposeMessage = session.web.Widget.extend({
@@ -282,113 +103,80 @@ openerp.mail = function(session) {
         
         /**
          * @param {Object} parent parent
-         * @param {Object} [params]
-         * @param {String} [params.res_model] res_model of document [REQUIRED]
-         * @param {Number} [params.res_id] res_id of record [REQUIRED]
-         * @param {Number} [params.email_mode] true/false, tells whether
-         *      we are in email sending mode
-         * @param {Number} [params.formatting] true/false, tells whether
-         *      we are in advance formatting mode
-         * @param {String} [params.model] mail.compose.message.mode (see
-         *      composition wizard)
-         * @param {Number} [params.msg_id] id of a message in case we are in
-         *      reply mode
+         * @param {Object} [options]
+         * @param {Object} [options.context] context passed to the
+         *  mail.compose.message DataSetSearch. Please refer to this model
+         *  for more details about fields and default values.
          */
-        init: function(parent, params) {
+        init: function (parent, options) {
             var self = this;
             this._super(parent);
             // options
-            this.params = params || {};
-            this.params.context = params.context || {};
-            this.params.email_mode = params.email_mode || false;
-            this.params.formatting = params.formatting || false;
-            this.params.mode = params.mode || 'comment';
-            this.params.form_xml_id = params.form_xml_id || 'email_compose_message_wizard_form_chatter';
-            this.params.form_view_id = false;
-            if (this.params.mode == 'reply') {
-                this.params.active_id = this.params.msg_id;
-            } else {
-                this.params.active_id = this.params.res_id;
-            }
-            this.email_mode = false;
-            this.formatting = false;
+            this.options = options || {};
+            this.options.context = options.context || {};
+            this.options.form_xml_id = options.form_xml_id || 'email_compose_message_wizard_form_chatter';
+            this.options.form_view_id = options.form_view_id || false;
+            // debug
+            // console.groupCollapsed('New ComposeMessage: model', this.options.context.default_res_model, ', id', this.options.context.default_res_id);
+            // console.log('context:', this.options.context);
+            // console.groupEnd();
         },
 
-        /**
-         * Reinitialize the widget field values to the default values. The
-         * purpose is to avoid to destroy and re-build a form view. Default
-         * values are therefore given as for an onchange. */
-        reinit: function() {
-            var self = this;
-            if (! this.form_view) return;
-            var call_defer = this.ds_compose.call('default_get', [['subject', 'body_text', 'body_html', 'dest_partner_ids'], this.ds_compose.get_context()]).then(
-                function (result) {
-                    self.form_view.on_processed_onchange({'value': result}, []);
-                });
-            return call_defer;
-        },
-
-        /**
-         * Override-hack of do_action: clean the form */
-        do_action: function(action, on_close) {
-            // this.init_comments();
-            return this._super(action, on_close);
-        },
-
-        /**
-         * Widget start function
-         * - builds and initializes the form view */
-        start: function() {
-            var self = this;
+        start: function () {
             this._super.apply(this, arguments);
             // customize display: add avatar, clean previous content
-            var user_avatar = mail.ChatterUtils.get_image(this.session.prefix,
-                this.session.session_id, 'res.users', 'image_small', this.session.uid);
-            this.$element.find('img.oe_mail_icon').attr('src', user_avatar);
-            this.$element.find('div.oe_mail_msg_content').empty();
-            // create a context for the default_get of the compose form
-            var widget_context = {
-                'active_model': this.params.res_model,
-                'active_id': this.params.active_id,
-                'mail.compose.message.mode': this.params.mode,
-            };
-            var context = _.extend({}, this.params.context, widget_context);
+            var user_avatar = mail.ChatterUtils.get_image(this.session.prefix, this.session.session_id, 'res.users', 'image_small', this.session.uid);
+            this.$el.find('img.oe_mail_icon').attr('src', user_avatar);
+            this.$el.find('div.oe_mail_msg_content').empty();
+            // create a context for the dataset and default_get of the wizard
+            var context = _.extend({}, this.options.context);
             this.ds_compose = new session.web.DataSetSearch(this, 'mail.compose.message', context);
             // find the id of the view to display in the chatter form
-            var data_ds = new session.web.DataSetSearch(this, 'ir.model.data');
-            var deferred_form_id =data_ds.call('get_object_reference', ['mail', this.params.form_xml_id]).then( function (result) {
-                if (result) {
-                    self.params.form_view_id = result[1];
-                }
-            }).pipe(this.proxy('create_form_view'));
-            return deferred_form_id;
+            if (this.options.form_view_id) {
+                return this.create_form_view();
+            }
+            else {
+                var data_ds = new session.web.DataSetSearch(this, 'ir.model.data');
+                return data_ds.call('get_object_reference', ['mail', this.options.form_xml_id]).pipe(this.proxy('create_form_view'));
+            }
         },
 
-        /**
-         * Create a FormView, then append it to the to widget DOM. */
-        create_form_view: function () {
+        /** Create a FormView, then append it to the to widget DOM. */
+        create_form_view: function (new_form_view_id) {
             var self = this;
+            this.options.form_view_id = (new_form_view_id && new_form_view_id[1]) || this.options.form_view_id;
             // destroy previous form_view if any
             if (this.form_view) { this.form_view.destroy(); }
             // create the FormView
-            this.form_view = new session.web.FormView(this, this.ds_compose, this.params.form_view_id, {
+            this.form_view = new session.web.FormView(this, this.ds_compose, this.options.form_view_id, {
                 action_buttons: false,
                 pager: false,
                 initial_mode: 'edit',
                 disable_autofocus: true,
             });
             // add the form, bind events, activate the form
-            var msg_node = this.$element.find('div.oe_mail_msg_content');
+            var msg_node = this.$el.find('div.oe_mail_msg_content');
             return $.when(this.form_view.appendTo(msg_node)).pipe(function() {
                 self.bind_events();
                 self.form_view.do_show();
-                if (self.params.email_mode) { self.toggle_email_mode(); }
-                if (self.params.formatting) { self.toggle_formatting_mode(); }
             });
         },
 
-        destroy: function() {
-            this._super.apply(this, arguments);
+        /**
+         * Reinitialize the widget field values to the default values obtained
+         * using default_get on mail.compose.message. This allows to reinitialize
+         * the widget without having to rebuild a complete form view.
+         * @param {Object} new_context: context of the refresh */
+        refresh: function (new_context) {
+            if (! this.form_view) return;
+            var self = this;
+            this.options.context = _.extend(this.options.context, new_context || {});
+            this.ds_compose.context = _.extend(this.ds_compose.context, this.options.context);
+            return this.ds_compose.call('default_get', [
+                ['subject', 'body_text', 'body', 'attachment_ids', 'partner_ids', 'composition_mode',
+                    'model', 'res_id', 'parent_id', 'content_subtype'],
+                this.ds_compose.get_context(),
+            ]).then( function (result) { self.form_view.on_processed_onchange({'value': result}, []); });
         },
 
         /**
@@ -396,86 +184,11 @@ openerp.mail = function(session) {
          * in the function. */
         bind_events: function() {
             var self = this;
-            this.$element.find('button.oe_form_button').click(function (event) {
-                event.preventDefault();
-            });
-            // event: click on 'Send an Email' link that toggles the form for
-            // sending an email (partner_ids)
-            this.$element.find('a.oe_mail_compose_message_email').click(function (event) {
-                event.preventDefault();
-                self.toggle_email_mode();
-            });
-            // event: click on 'Formatting' icon-link that toggles the advanced
-            // formatting options for writing a message (subject, body_html)
-            this.$element.find('a.oe_mail_compose_message_formatting').click(function (event) {
-                event.preventDefault();
-                self.toggle_formatting_mode();
-            });
             // event: click on 'Attachment' icon-link that opens the dialog to
             // add an attachment.
-            this.$element.find('a.oe_mail_compose_message_attachment').click(function (event) {
-                event.preventDefault();
-                // not yet implemented
-                self.set_body_value('attachment', 'attachment');
+            this.$el.on('click', 'button.oe_mail_compose_message_attachment', function (event) {
+                event.stopImmediatePropagation();
             });
-            // event: click on 'Checklist' icon-link that toggles the options
-            // for adding checklist.
-            this.$element.find('a.oe_mail_compose_message_checklist').click(function (event) {
-                event.preventDefault();
-                // not yet implemented
-                self.set_body_value('checklist', 'checklist');
-            });
-        },
-
-        /**
-         * Toggle the formatting mode. */
-        toggle_formatting_mode: function() {
-            var self = this;
-            this.formatting = ! this.formatting;
-            // calls onchange
-            var call_defer = this.ds_compose.call('onchange_formatting', [[], this.formatting, this.params.res_model, this.params.res_id]).then(
-                function (result) {
-                    self.form_view.on_processed_onchange(result, []);
-                });
-            // update context of datasetsearch
-            this.ds_compose.context.formatting = this.formatting;
-            // toggle display
-            this.$element.find('span.oe_mail_compose_message_subject').toggleClass('oe_mail_compose_message_invisible');
-            this.$element.find('div.oe_mail_compose_message_body_text').toggleClass('oe_mail_compose_message_invisible');
-            this.$element.find('div.oe_mail_compose_message_body_html').toggleClass('oe_mail_compose_message_invisible');
-        },
-
-        /**
-         * Toggle the email mode. */
-        toggle_email_mode: function() {
-            var self = this;
-            this.email_mode = ! this.email_mode;
-            // calls onchange
-            var call_defer = this.ds_compose.call('onchange_email_mode', [[], this.email_mode, this.params.res_model, this.params.res_id]).then(
-                function (result) {
-                    self.form_view.on_processed_onchange(result, []);
-                });
-            // update context of datasetsearch
-            this.ds_compose.context.email_mode = this.email_mode;
-            // update 'Post' button -> 'Send'
-            // update 'Send an Email' link -> 'Post a comment'
-            if (this.email_mode) {
-                this.$element.find('button.oe_mail_compose_message_button_send').html('<span>Send</span>');
-                this.$element.find('a.oe_mail_compose_message_email').html('Comment');
-            } else {
-                this.$element.find('button.oe_mail_compose_message_button_send').html('<span>Post</span>');
-                this.$element.find('a.oe_mail_compose_message_email').html('Send an Email');
-            }
-            // toggle display
-            this.$element.find('div.oe_mail_compose_message_partner_ids').toggleClass('oe_mail_compose_message_invisible');
-        },
-
-        /**
-         * Update the values of the composition form; with possible different
-         * values for body_text and body_html. */
-        set_body_value: function(body_text, body_html) {
-            this.form_view.fields.body_text.set_value(body_text);
-            this.form_view.fields.body_html.set_value(body_html);
         },
     }),
 
@@ -490,9 +203,6 @@ openerp.mail = function(session) {
      * - - sub message (parent_id = root message)
      * - - - sub sub message (parent id = sub message)
      * - - sub message (parent_id = root message)
-     * This widget has 2 ways of initialization, either you give records
-     * to be rendered, either it will fetch [limit] messages related to
-     * [res_model]:[res_id].
      */
 
     mail.Thread = session.web.Widget.extend({
@@ -500,95 +210,67 @@ openerp.mail = function(session) {
 
         /**
          * @param {Object} parent parent
-         * @param {Object} [params]
-         * @param {String} [params.res_model] res_model of document [REQUIRED]
-         * @param {Number} [params.res_id] res_id of record [REQUIRED]
-         * @param {Number} [params.uid] user id [REQUIRED]
-         * @param {Bool}   [params.parent_id=false] parent_id of message
-         * @param {Number} [params.thread_level=0] number of levels in the thread
-         *      (only 0 or 1 currently)
-         * @param {Bool}   [params.is_wall=false] thread is displayed in the wall
-         * @param {Number} [params.msg_more_limit=150] number of character to
+         * @param {Object} [options]
+         * @param {Object} [options.context] context of the thread. It should
+            contain at least default_model, default_res_id. Please refer to
+            the ComposeMessage widget for more information about it.
+         * @param {Number} [options.thread_level=0] number of thread levels
+         * @param {Number} [options.message_ids=null] ids for message_fetch
+         * @param {Number} [options.message_data=null] already formatted message
+            data, for subthreads getting data from their parent
+         * @param {Boolean} [options.composer] use the advanced composer, or
+            the default basic textarea if not set
+         * @param {Number} [options.truncate_limit=250] number of character to
          *      display before having a "show more" link; note that the text
          *      will not be truncated if it does not have 110% of the parameter
-         *      (ex: 110 characters needed to be truncated and be displayed as
-         *      a 100-characters message)
-         * @param {Number} [params.limit=100] maximum number of messages to fetch
-         * @param {Number} [params.offset=0] offset for fetching messages
-         * @param {Number} [params.records=null] records to show instead of fetching messages
          */
-        init: function(parent, params) {
+        init: function(parent, options) {
             this._super(parent);
             // options
-            this.params = params;
-            this.params.parent_id = this.params.parent_id || false;
-            this.params.thread_level = this.params.thread_level || 0;
-            this.params.is_wall = this.params.is_wall || (this.params.records != undefined) || false;
-            this.params.msg_more_limit = this.params.msg_more_limit || 250;
-            this.params.limit = this.params.limit || 100;
-            // this.params.limit = 3; // tmp for testing
-            this.params.offset = this.params.offset || 0;
-            this.params.records = this.params.records || null;
+            this.options = options || {};
+            this.options.domain = options.domain || [];
+            this.options.context = _.extend({
+                default_model: 'mail.thread',
+                default_res_id:  0,
+                default_parent_id: false }, options.context || {});
+            this.options.thread_level = options.thread_level || 0;
+            this.options.composer = options.composer || false;
+            this.options.message_ids = options.message_ids || null;
+            this.options.message_data = options.message_data || null;
             // datasets and internal vars
-            this.ds = new session.web.DataSetSearch(this, this.params.res_model);
-            this.ds_users = new session.web.DataSetSearch(this, 'res.users');
-            this.ds_msg = new session.web.DataSetSearch(this, 'mail.message');
-            this.comments_structure = {'root_ids': [], 'new_root_ids': [], 'msgs': {}, 'tree_struct': {}, 'model_to_root_ids': {}};
+            this.ds_thread = new session.web.DataSetSearch(this, this.options.context.default_model);
+            this.ds_notification = new session.web.DataSetSearch(this, 'mail.notification');
+            this.ds_message = new session.web.DataSetSearch(this, 'mail.message');
             // display customization vars
-            this.display = {};
-            this.display.show_post_comment = this.params.show_post_comment || false;
-            this.display.show_reply = (this.params.thread_level > 0 && this.params.is_wall);
-            this.display.show_delete = ! this.params.is_wall;
-            this.display.show_hide = this.params.is_wall;
-            this.display.show_reply_by_email = ! this.params.is_wall;
-            this.display.show_more = (this.params.thread_level == 0);
+            this.display = {
+                truncate_limit: options.truncate_limit || 250,
+                show_header_compose: options.show_header_compose || false,
+                show_reply: options.show_reply || false,
+                show_delete: options.show_delete || false,
+                show_hide: options.show_hide || false,
+                show_reply_by_email: options.show_reply_by_email || false,
+                show_more: options.show_more || false,
+            }
         },
         
         start: function() {
+            // TDE TODO: check for deferred, not sure it is correct
             this._super.apply(this, arguments);
-            // add events
             this.bind_events();
-            // display user, fetch comments
-            this.display_current_user();
-            if (this.params.records) var display_done = this.display_comments_from_parameters(this.params.records);
-            else var display_done = this.init_comments();
-            // customize display
-            $.when(display_done).then(this.proxy('do_customize_display'));            
+            // fetch and display message, using message_ids if set
+            var display_done = $.when(this.message_fetch(true, [], {})).then(this.proxy('do_customize_display'));
             // add message composition form view
-            if (this.display.show_post_comment) {
+            if (this.display.show_header_compose && this.options.composer) {
                 var compose_done = this.instantiate_composition_form();
             }
             return display_done && compose_done;
         },
 
-        /**
-         * Override-hack of do_action: automatically reload the chatter.
-         * Normally it should be called only when clicking on 'Post/Send'
-         * in the composition form. */
-        do_action: function(action, on_close) {
-            this.init_comments();
-            if (this.compose_message_widget) {
-                this.compose_message_widget.reinit(); }
-            return this._super(action, on_close);
-        },
-
-        instantiate_composition_form: function(mode, email_mode, formatting, msg_id, context) {
-            if (this.compose_message_widget) {
-                this.compose_message_widget.destroy();
-            }
-            this.compose_message_widget = new mail.ComposeMessage(this, {
-                'extended_mode': false, 'uid': this.params.uid, 'res_model': this.params.res_model,
-                'res_id': this.params.res_id, 'mode': mode || 'comment', 'msg_id': msg_id,
-                'email_mode': email_mode || false, 'formatting': formatting || false,
-                'context': context || false } );
-            var composition_node = this.$element.find('div.oe_mail_thread_action');
-            composition_node.empty();
-            var compose_done = this.compose_message_widget.appendTo(composition_node);
-            return compose_done;
-        },
-
+        /** Customize the display
+         * - show_header_compose: show the composition form in the header */
         do_customize_display: function() {
-            if (this.display.show_post_comment) { this.$element.find('div.oe_mail_thread_action').eq(0).show(); }
+            this.display_user_avatar();
+            if (this.display.show_header_compose) { this.$el.find('div.oe_mail_thread_action').eq(0).show(); }
         },
 
         /**
@@ -596,171 +278,183 @@ openerp.mail = function(session) {
          * in the function. */
         bind_events: function() {
             var self = this;
-            // generic events from Chatter Mixin
-            mail.ChatterUtils.bind_events(this);
             // event: click on 'more' at bottom of thread
-            this.$element.find('button.oe_mail_button_more').click(function () {
-                self.do_more();
+            this.$el.find('button.oe_mail_button_more').click(function () {
+                self.do_message_fetch();
             });
             // event: writing in basic textarea of composition form (quick reply)
-            this.$element.find('textarea.oe_mail_compose_textarea').keyup(function (event) {
+            this.$el.find('textarea.oe_mail_compose_textarea').keyup(function (event) {
                 var charCode = (event.which) ? event.which : window.event.keyCode;
                 if (event.shiftKey && charCode == 13) { this.value = this.value+"\n"; }
-                else if (charCode == 13) { return self.do_comment(); }
+                else if (charCode == 13) { return self.message_post(); }
             });
             // event: click on 'Reply' in msg
-            this.$element.find('div.oe_mail_thread_display').delegate('a.oe_mail_msg_reply', 'click', function (event) {
-                var act_dom = $(this).parents('div.oe_mail_thread_display').find('div.oe_mail_thread_action:first');
-                act_dom.toggle();
+            this.$el.on('click', 'a.oe_mail_msg_reply', function (event) {
                 event.preventDefault();
+                event.stopPropagation();
+                var act_dom = $(this).parents('li.oe_mail_thread_msg').eq(0).find('div.oe_mail_thread_action:first');
+                act_dom.toggle();
             });
             // event: click on 'attachment(s)' in msg
-            this.$element.delegate('a.oe_mail_msg_view_attachments', 'click', function (event) {
+            this.$el.on('click', 'a.oe_mail_msg_view_attachments', function (event) {
+                event.preventDefault();
+                event.stopPropagation();
                 var act_dom = $(this).parent().parent().parent().find('.oe_mail_msg_attachments');
                 act_dom.toggle();
-                event.preventDefault();
             });
             // event: click on 'Delete' in msg side menu
-            this.$element.find('div.oe_mail_thread_display').delegate('a.oe_mail_msg_delete', 'click', function (event) {
+            this.$el.on('click', 'a.oe_mail_msg_delete', function (event) {
+                event.preventDefault();
+                event.stopPropagation();
                 if (! confirm(_t("Do you really want to delete this message?"))) { return false; }
                 var msg_id = event.srcElement.dataset.id;
                 if (! msg_id) return false;
-                var call_defer = self.ds_msg.unlink([parseInt(msg_id)]);
-                $(event.srcElement).parents('li.oe_mail_thread_msg').eq(0).hide();
-                if (self.params.thread_level > 0) {
-                    $(event.srcElement).parents('.oe_mail_thread').eq(0).hide();
-                }
-                event.preventDefault();
-                return call_defer;
+                $(event.srcElement).parents('li.oe_mail_thread_msg').eq(0).remove();
+                return self.ds_msg.unlink([parseInt(msg_id)]);
             });
             // event: click on 'Hide' in msg side menu
-            this.$element.find('div.oe_mail_thread_display').delegate('a.oe_mail_msg_hide', 'click', function (event) {
-                if (! confirm(_t("Do you really want to hide this thread ?"))) { return false; }
+            this.$el.on('click', 'a.oe_mail_msg_hide', function (event) {
+                event.preventDefault();
+                event.stopPropagation();
                 var msg_id = event.srcElement.dataset.id;
                 if (! msg_id) return false;
-                var call_defer = self.ds.call('message_remove_pushed_notifications', [[self.params.res_id], [parseInt(msg_id)], true]);
-                $(event.srcElement).parents('li.oe_mail_thread_msg').eq(0).hide();
-                if (self.params.thread_level > 0) {
-                    $(event.srcElement).parents('.oe_mail_thread').eq(0).hide();
-                }
-                event.preventDefault();
-                return call_defer;
+                $(event.srcElement).parents('li.oe_mail_thread_msg').eq(0).remove();
+                return self.ds_notif.call('set_message_read', [parseInt(msg_id)]);
             });
-            // event: click on "Reply" in msg side menu (email style)
-            this.$element.find('div.oe_mail_thread_display').delegate('a.oe_mail_msg_reply_by_email', 'click', function (event) {
+            // event: click on "Reply by email" in msg side menu (email style)
+            this.$el.on('click', 'a.oe_mail_msg_reply_by_email', function (event) {
+                event.preventDefault();
+                event.stopPropagation();
                 var msg_id = event.srcElement.dataset.msg_id;
-                var email_mode = (event.srcElement.dataset.type == 'email');
-                var formatting = (event.srcElement.dataset.formatting == 'html');
                 if (! msg_id) return false;
-                self.instantiate_composition_form('reply', email_mode, formatting, msg_id);
-                event.preventDefault();
+                self.compose_message_widget.refresh({
+                    'default_composition_mode': 'reply',
+                    'default_parent_id': parseInt(msg_id),
+                    'default_content_subtype': 'html'} );
             });
         },
-        
-        destroy: function () {
-            this._super.apply(this, arguments);
-        },
-        
-        init_comments: function() {
-            var self = this;
-            this.params.offset = 0;
-            this.comments_structure = {'root_ids': [], 'new_root_ids': [], 'msgs': {}, 'tree_struct': {}, 'model_to_root_ids': {}};
-            this.$element.find('div.oe_mail_thread_display').empty();
-            var domain = this.get_fetch_domain(this.comments_structure);
-            return this.fetch_comments(this.params.limit, this.params.offset, domain).then();
-        },
-        
-        fetch_comments: function (limit, offset, domain) {
-            var self = this;
-            var defer = this.ds.call('message_read', [[this.params.res_id], (this.params.thread_level > 0), (this.comments_structure['root_ids']),
-                                    (limit+1) || (this.params.limit+1), offset||this.params.offset, domain||undefined ]).then(function (records) {
-                if (records.length <= self.params.limit) self.display.show_more = false;
-                // else { self.display.show_more = true; records.pop(); }
-                // else { self.display.show_more = true; records.splice(0, 1); }
-                else { self.display.show_more = true; }
-                self.display_comments(records);
-                // TODO: move to customize display
-                if (self.display.show_more == true) self.$element.find('div.oe_mail_thread_more:last').show();
-                else  self.$element.find('div.oe_mail_thread_more:last').hide();
-            });
-            
-            return defer;
-        },
 
-        display_comments_from_parameters: function (records) {
-            if (records.length > 0 && records.length < (records[0].child_ids.length+1) ) this.display.show_more = true;
-            else this.display.show_more = false;
-            var defer = this.display_comments(records);
-            // TODO: move to customize display
-            if (this.display.show_more == true) $('div.oe_mail_thread_more').eq(-2).show();
-            else $('div.oe_mail_thread_more').eq(-2).hide();
-            return defer;
-        },
-        
-        display_comments: function (records) {
-            var self = this;
-            // sort the records
-            mail.ChatterUtils.records_struct_add_records(this.comments_structure, records, this.params.parent_id);
-            //build attachments download urls and compute time-relative from dates
-            for (var k in records) {
-                records[k].timerelative = $.timeago(records[k].date);
-                if (records[k].attachments) {
-                    for (var l in records[k].attachments) {
-                        var url = self.session.origin + '/web/binary/saveas?session_id=' + self.session.session_id + '&model=ir.attachment&field=datas&filename_field=datas_fname&id='+records[k].attachments[l].id;
-                        records[k].attachments[l].url = url;
-                    }
-                }
+        /**
+         * Override-hack of do_action: automatically reload the chatter.
+         * Normally it should be called only when clicking on 'Post/Send'
+         * in the composition form. */
+        do_action: function(action, on_close) {
+            this.message_clean();
+            this.message_fetch();
+            if (this.compose_message_widget) {
+                this.compose_message_widget.refresh({
+                    'default_composition_mode': 'comment',
+                    'default_parent_id': this.options.default_parent_id,
+                    'default_content_subtype': 'plain'} );
             }
+            return this._super(action, on_close);
+        },
+
+        /** Instantiate the composition form, with every parameters in context
+            or in the widget context. */
+        instantiate_composition_form: function(context) {
+            if (this.compose_message_widget) {
+                this.compose_message_widget.destroy();
+            }
+            this.compose_message_widget = new mail.ComposeMessage(this, {
+                'context': _.extend(context || {}, this.options.context),
+            });
+            var composition_node = this.$el.find('div.oe_mail_thread_action');
+            composition_node.empty();
+            var compose_done = this.compose_message_widget.appendTo(composition_node);
+            return compose_done;
+        },
+
+        /** Clean the thread */
+        message_clean: function() {
+            this.$el.find('div.oe_mail_thread_display').empty();
+        },
+
+        /** Fetch messages
+         * @param {Bool} initial_mode: initial mode: try to use message_data or
+         *  message_ids, if nothing available perform a message_read; otherwise
+         *  directly perform a message_read
+         * @param {Array} additional_domain: added to options.domain
+         * @param {Object} additional_context: added to options.context
+         */
+        message_fetch: function (initial_mode, additional_domain, additional_context) {
+            var self = this;
+            // domain and context: options + additional
+            fetch_domain = _.flatten([this.options.domain, additional_domain || []], true)
+            fetch_context = _.extend(this.options.context, additional_context || {})
+            // if message_ids is set: try to use it
+            if (initial_mode && this.options.message_data) {
+                return this.message_display(this.options.message_data);
+            }
+            return this.ds_message.call('message_read',
+                [(initial_mode && this.options.message_ids) || false, fetch_domain, this.options.thread_level, undefined, fetch_context]
+                ).then(this.proxy('message_display'));
+        },
+
+        /* Display a list of records
+         * A specific case is done for 'expandable' messages that are messages
+            displayed under a 'show more' button form
+         */
+        message_display: function (records) {
+            var self = this;
+            var _expendable = false;
             _(records).each(function (record) {
-                var sub_msgs = [];
-                if ((record.parent_id == false || record.parent_id[0] == self.params.parent_id) && self.params.thread_level > 0 ) {
-                    var sub_list = self.comments_structure['tree_struct'][record.id]['direct_childs'];
-                    _(records).each(function (record) {
-                        //if (record.parent_id == false || record.parent_id[0] == self.params.parent_id) return;
-                        if (_.indexOf(sub_list, record.id) != -1) {
-                            sub_msgs.push(record);
-                        }
-                    });
-                    self.display_comment(record);
-                    self.thread = new mail.Thread(self, {'res_model': self.params.res_model, 'res_id': self.params.res_id, 'uid': self.params.uid,
-                                                            'records': sub_msgs, 'thread_level': (self.params.thread_level-1), 'parent_id': record.id,
-                                                            'is_wall': self.params.is_wall});
-                    self.$element.find('li.oe_mail_thread_msg:last').append('<div class="oe_mail_thread_subthread"/>');
-                    self.thread.appendTo(self.$element.find('div.oe_mail_thread_subthread:last'));
+                if (record.type == 'expandable') {
+                    _expendable = true;
+                    self.update_fetch_more(true);
+                    self.fetch_more_domain = record.domain;
+                    self.fetch_more_context = record.context;
                 }
-                else if (self.params.thread_level == 0) {
-                    self.display_comment(record);
+                else {
+                    self.display_record(record);
+                    // if (self.options.thread_level >= 0) {
+                    self.thread = new mail.Thread(self, {
+                        'context': {
+                            'default_model': record.model,
+                            'default_id': record.res_id,
+                            'default_parent_id': record.id },
+                        'message_data': record.child_ids, 'thread_level': self.options.thread_level-1,
+                        'show_header_compose': false, 'show_reply': self.options.thread_level > 1,
+                        'show_hide': self.display.show_hide, 'show_delete': self.display.show_delete,
+                    });
+                    self.$el.find('li.oe_mail_thread_msg:last').append('<div class="oe_mail_thread_subthread"/>');
+                    self.thread.appendTo(self.$el.find('div.oe_mail_thread_subthread:last'));
+                    // }
                 }
             });
-            mail.ChatterUtils.records_struct_update_after_display(this.comments_structure);
-            // update offset for "More" buttons
-            if (this.params.thread_level == 0) this.params.offset += records.length;
+            if (! _expendable) {
+                this.update_fetch_more(false);
+            }
         },
 
-        /** Displays a record, performs text/link formatting */
-        display_comment: function (record) {
-            record.body = mail.ChatterUtils.do_text_nl2br($.trim(record.body), true);
-            // if (record.type == 'email' && record.state == 'received') {
-            if (record.type == 'email') {
-                record.mini_url = ('/mail/static/src/img/email_icon.png');
-            } else {
-                record.mini_url = mail.ChatterUtils.get_image(this.session.prefix, this.session.session_id, 'res.users', 'image_small', record.user_id[0]);
-            }
-            // body text manipulation
-            if (record.subtype == 'plain') {
-                record.body = mail.ChatterUtils.do_text_remove_html_tags(record.body);
-            }
-            record.body = mail.ChatterUtils.do_replace_expressions(record.body);
-            // format date according to the user timezone
+        /** Displays a record and performs some formatting on the record :
+         * - record.date: formatting according to the user timezone
+         * - record.timerelative: relative time givein by timeago lib
+         * - record.avatar: image url
+         * - record.attachments[].url: url of each attachment
+         * - record.is_author: is the current user the author of the record */
+        display_record: function (record) {
+            // formatting and additional fields
             record.date = session.web.format_value(record.date, {type:"datetime"});
-            // is the user the author ?
-            record.is_author = mail.ChatterUtils.is_author(this, record.user_id[0]);
-            // render
-            var rendered = session.web.qweb.render('mail.thread.message', {'record': record, 'thread': this, 'params': this.params, 'display': this.display});
-            // expand feature
-            $(rendered).appendTo(this.$element.children('div.oe_mail_thread_display:first'));
-            this.$element.find('div.oe_mail_msg_record_body').expander({
-                slicePoint: this.params.msg_more_limit,
+            record.timerelative = $.timeago(record.date);
+            if (record.type == 'email') {
+                record.avatar = ('/mail/static/src/img/email_icon.png');
+            } else {
+                record.avatar = mail.ChatterUtils.get_image(this.session.prefix, this.session.session_id, 'res.partner', 'image_small', record.author_id[0]);
+            }
+            //TDE: FIX
+            if (record.attachments) {
+                for (var l in record.attachments) {
+                    var url = self.session.origin + '/web/binary/saveas?session_id=' + self.session.session_id + '&model=ir.attachment&field=datas&filename_field=datas_fname&id='+records[k].attachments[l].id;
+                    record.attachments[l].url = url;
+                }
+            }
+            record.is_author = mail.ChatterUtils.is_author(this, record.author_user_id[0]);
+            // render, add the expand feature
+            var rendered = session.web.qweb.render('mail.thread.message', {'record': record, 'thread': this, 'params': this.options, 'display': this.display});
+            $(rendered).appendTo(this.$el.children('div.oe_mail_thread_display:first'));
+            this.$el.find('div.oe_mail_msg_record_body').expander({
+                slicePoint: this.options.msg_more_limit,
                 expandText: 'read more',
                 userCollapseText: '[^]',
                 detailClass: 'oe_mail_msg_tail',
@@ -769,54 +463,68 @@ openerp.mail = function(session) {
                 });
         },
 
-        display_current_user: function () {
-            var avatar = mail.ChatterUtils.get_image(this.session.prefix, this.session.session_id, 'res.users', 'image_small', this.params.uid);
-            return this.$element.find('img.oe_mail_icon').attr('src', avatar);
+        /** Display 'show more' button */
+        update_fetch_more: function (new_value) {
+            if (new_value) {
+                    this.$el.find('div.oe_mail_thread_more:last').show();
+            } else {
+                    this.$el.find('div.oe_mail_thread_more:last').hide();
+            }
+        },
+
+        display_user_avatar: function () {
+            var avatar = mail.ChatterUtils.get_image(this.session.prefix, this.session.session_id, 'res.users', 'image_small', this.options.uid);
+            return this.$el.find('img.oe_mail_icon').attr('src', avatar);
         },
         
-        do_comment: function () {
-            var comment_node = this.$element.find('textarea');
-            var body_text = comment_node.val();
-            comment_node.val('');
-            return this.ds.call('message_append_note', [[this.params.res_id], '', body_text, this.params.parent_id, 'comment', 'plain']).then(
-                this.proxy('init_comments'));
-        },
-        
-        /**
-         * Create a domain to fetch new comments according to
-         * comment already present in comments_structure
-         * @param {Object} comments_structure (see chatter utils)
-         * @returns {Array} fetch_domain (OpenERP domain style)
-         */
-        get_fetch_domain: function (comments_structure) {
-            var domain = [];
-            var ids = comments_structure.root_ids.slice();
-            var ids2 = [];
-            // must be child of current parent
-            if (this.params.parent_id) { domain.push(['id', 'child_of', this.params.parent_id]); }
-            _(comments_structure.root_ids).each(function (id) { // each record
-                ids.push(id);
-                ids2.push(id);
-            });
-            if (this.params.parent_id != false) {
-                ids2.push(this.params.parent_id);
+        message_post: function (body) {
+            var self = this;
+            if (! body) {
+                var comment_node = this.$el.find('textarea');
+                var body = comment_node.val();
+                comment_node.val('');
             }
-            // must not be children of already fetched messages
-            if (ids.length > 0) {
-                domain.push('&');
-                domain.push('!');
-                domain.push(['id', 'child_of', ids]);
-            }
-            if (ids2.length > 0) {
-                domain.push(['id', 'not in', ids2]);
-            }
-            return domain;
+            return this.ds_post.call('message_post', [
+                [this.options.context.res_id], body, false, 'comment', this.options.context.parent_id]
+                ).then(this.proxy('message_fetch'));
         },
-        
-        do_more: function () {
-            domain = this.get_fetch_domain(this.comments_structure);
-            return this.fetch_comments(this.params.limit, this.params.offset, domain);
+
+        /** Action: 'shows more' to fetch new messages */
+        do_message_fetch: function () {
+            return this.message_fetch(false, this.fetch_more_domain, this.fetch_more_context);
         },
+
+        // TDE: keep currently because need something similar
+        // /**
+        //  * Create a domain to fetch new comments according to
+        //  * comment already present in comments_structure
+        //  * @param {Object} comments_structure (see chatter utils)
+        //  * @returns {Array} fetch_domain (OpenERP domain style)
+        //  */
+        // get_fetch_domain: function (comments_structure) {
+        //     var domain = [];
+        //     var ids = comments_structure.root_ids.slice();
+        //     var ids2 = [];
+        //     // must be child of current parent
+        //     if (this.options.parent_id) { domain.push(['id', 'child_of', this.options.parent_id]); }
+        //     _(comments_structure.root_ids).each(function (id) { // each record
+        //         ids.push(id);
+        //         ids2.push(id);
+        //     });
+        //     if (this.options.parent_id != false) {
+        //         ids2.push(this.options.parent_id);
+        //     }
+        //     // must not be children of already fetched messages
+        //     if (ids.length > 0) {
+        //         domain.push('&');
+        //         domain.push('!');
+        //         domain.push(['id', 'child_of', ids]);
+        //     }
+        //     if (ids2.length > 0) {
+        //         domain.push(['id', 'not in', ids2]);
+        //     }
+        //     return domain;
+        // },
     });
 
 
@@ -833,55 +541,60 @@ openerp.mail = function(session) {
 
     /** mail_thread widget: thread of comments */
     mail.RecordThread = session.web.form.AbstractField.extend({
-        // QWeb template to use when rendering the object
         template: 'mail.record_thread',
 
-       init: function() {
+        init: function() {
             this._super.apply(this, arguments);
-            this.params = this.get_definition_options();
-            this.params.thread_level = this.params.thread_level || 0;
-            this.thread = null;
-            this.ds = new session.web.DataSet(this, this.view.model);
-            this.ds_users = new session.web.DataSet(this, 'res.users');
+            this.options.domain = this.options.domain || [];
+            this.options.context = {'default_model': 'mail.thread', 'default_res_id': false};
+            this.options.thread_level = this.options.thread_level || 0;
+            this.thread_list = [];
         },
-        
+
         start: function() {
+            this._super.apply(this, arguments);
             // NB: all the widget should be modified to check the actual_mode property on view, not use
             // any other method to know if the view is in create mode anymore
             this.view.on("change:actual_mode", this, this._check_visibility);
             this._check_visibility();
-            mail.ChatterUtils.bind_events(this);
         },
-        
+
         _check_visibility: function() {
-            this.$element.toggle(this.view.get("actual_mode") !== "create");
+            this.$el.toggle(this.view.get("actual_mode") !== "create");
         },
-        
-        destroy: function () {
+
+        destroy: function() {
+            for (var i in this.thread_list) { this.thread_list[i].destroy(); }
             this._super.apply(this, arguments);
         },
-        
+
         set_value: function() {
+            var self = this;
             this._super.apply(this, arguments);
-            if (! this.view.datarecord.id ||
-                session.web.BufferedDataSet.virtual_id_regex.test(this.view.datarecord.id)) {
-                this.$element.find('.oe_mail_thread').hide();
+            if (! this.view.datarecord.id || session.web.BufferedDataSet.virtual_id_regex.test(this.view.datarecord.id)) {
+                this.$el.find('oe_mail_thread').hide();
                 return;
             }
+            // update context
+            _.extend(this.options.context, {
+                default_res_id: this.view.datarecord.id,
+                default_model: this.view.model });
             // create and render Thread widget
-            this.$element.find('div.oe_mail_recthread_main').empty();
-            if (this.thread) this.thread.destroy();
-            this.thread = new mail.Thread(this, {'res_model': this.view.model, 'res_id': this.view.datarecord.id, 'uid': this.session.uid,
-                                                'thread_level': this.params.thread_level, 'show_post_comment': true, 'limit': 15});
-            var thread_done = this.thread.appendTo(this.$element.find('div.oe_mail_recthread_main'));
-            return thread_done;
+            this.$el.find('div.oe_mail_recthread_main').empty();
+            for (var i in this.thread_list) { this.thread_list[i].destroy(); }
+            var thread = new mail.Thread(self, {
+                'context': this.options.context,
+                'thread_level': this.options.thread_level, 'show_header_compose': true,
+                'show_delete': true, 'composer': true });
+            this.thread_list.push(thread);
+            return thread.appendTo(this.$el.find('div.oe_mail_recthread_main'));
         },
     });
 
 
     /** 
      * ------------------------------------------------------------
-     * WallView Widget
+     * Wall Widget
      * ------------------------------------------------------------
      *
      * This widget handles the display of the Chatter on the Wall.
@@ -896,92 +609,45 @@ openerp.mail = function(session) {
 
         /**
          * @param {Object} parent parent
-         * @param {Object} [params]
-         * @param {Number} [params.limit=20] number of messages to show and fetch
-         * @param {Number} [params.search_view_id=false] search view id for messages
-         * @var {Array} comments_structure (see chatter utils)
+         * @param {Object} [options]
+         * @param {Number} [options.domain] domain on the Wall, is an array.
+         * @param {Number} [options.domain] context, is an object. It should
+         *      contain default_model, default_res_id, to give it to the threads.
          */
-        init: function (parent, params) {
+        init: function (parent, options) {
             this._super(parent);
-            this.params = {};
-            this.params.limit = params.limit || 25;
-            this.params.domain = params.domain || [];
-            this.params.context = params.context || {};
-            this.params.res_model = params.res_model || false;
-            this.params.res_id = params.res_id || false;
-            this.params.search_view_id = params.search_view_id || false;
-            this.params.thread_level = params.thread_level || 1;
-            this.comments_structure = {'root_ids': [], 'new_root_ids': [], 'msgs': {}, 'tree_struct': {}, 'model_to_root_ids': {}};
-            this.display_show_more = true;
+            this.options = options || {};
+            this.options.domain = options.domain || [];
+            this.options.context = options.context || {};
+            this.options.thread_level = options.thread_level || 1;
             this.thread_list = [];
+            this.ds_msg = new session.web.DataSetSearch(this, 'mail.message');
+            // for search view
             this.search = {'domain': [], 'context': {}, 'groupby': {}}
             this.search_results = {'domain': [], 'context': {}, 'groupby': {}}
-            // datasets
-            this.ds_msg = new session.web.DataSet(this, 'mail.message');
-            this.ds_thread = new session.web.DataSet(this, 'mail.thread');
-            this.ds_users = new session.web.DataSet(this, 'res.users');
         },
 
         start: function () {
             this._super.apply(this, arguments);
-            this.display_current_user();
-            // add events
-            this.add_event_handlers();
-            // load mail.message search view
-            var search_view_ready = this.load_search_view(this.params.search_view_id, {}, false);
-            // load composition form
-            var compose_done = this.instantiate_composition_form();
-            // fetch first threads
-            var comments_ready = this.init_and_fetch_comments(this.params.limit, 0);
-            return (search_view_ready && comments_ready && compose_done);
-        },
-
-        /**
-         * Override-hack of do_action: automatically reload the chatter.
-         * Normally it should be called only when clicking on 'Post/Send'
-         * in the composition form. */
-        do_action: function(action, on_close) {
-            this.init_and_fetch_comments();
-            if (this.compose_message_widget) {
-                this.compose_message_widget.reinit(); }
-            return this._super(action, on_close);
+            var search_view_ready = this.load_search_view({}, false);
+            var thread_displayed = this.message_display();
+            return (search_view_ready && thread_displayed);
         },
 
         destroy: function () {
+            for (var i in this.thread_list) { this.thread_list[i].destroy(); }
             this._super.apply(this, arguments);
         },
 
-        instantiate_composition_form: function(mode, msg_id) {
-            if (this.compose_message_widget) {
-                this.compose_message_widget.destroy();
-            }
-            this.compose_message_widget = new mail.ComposeMessage(this, {
-                'extended_mode': false, 'uid': this.session.uid, 'res_model': this.params.res_model,
-                'res_id': this.params.res_id, 'mode': mode || 'comment', 'msg_id': msg_id });
-            var composition_node = this.$element.find('div.oe_mail_wall_action');
-            composition_node.empty();
-            var compose_done = this.compose_message_widget.appendTo(composition_node);
-            return compose_done;
-        },
-
-        /** Add events */
-        add_event_handlers: function () {
-            var self = this;
-            // display more threads
-            this.$element.find('button.oe_mail_wall_button_more').click(function () { return self.do_more(); });
-        },
-
         /**
-         * Loads the mail.message search view
-         * @param {Number} view_id id of the search view to load
+         * Load the mail.message search view
          * @param {Object} defaults ??
          * @param {Boolean} hidden some kind of trick we do not care here
          */
-        load_search_view: function (view_id, defaults, hidden) {
+        load_search_view: function (defaults, hidden) {
             var self = this;
-            this.searchview = new session.web.SearchView(this, this.ds_msg, view_id || false, defaults || {}, hidden || false);
-            var search_view_loaded = this.searchview.appendTo(this.$element.find('.oe_view_manager_view_search'));
-            return $.when(search_view_loaded).then(function () {
+            this.searchview = new session.web.SearchView(this, this.ds_msg, false, defaults || {}, hidden || false);
+            return this.searchview.appendTo(this.$el.find('.oe_view_manager_view_search')).then(function () {
                 self.searchview.on_search.add(self.do_searchview_search);
             });
         },
@@ -1004,100 +670,30 @@ openerp.mail = function(session) {
                 self.search_results['context'] = results.context;
                 self.search_results['domain'] = results.domain;
                 self.search_results['groupby'] = results.group_by;
-                return self.init_and_fetch_comments();
+                self.message_clean();
+                return self.message_display();
             });
         },
 
-        display_current_user: function () {
-            //return this.$element.find('img.oe_mail_msg_image').attr('src', this.thread_get_avatar('res.users', 'avatar', this.session.uid));
-        }, 
-
-        /**
-         * Initializes the wall and calls fetch_comments
-         * @param {Number} limit: number of notifications to fetch
-         * @param {Number} offset: offset in notifications search
-         * @param {Array} domain
-         * @param {Array} context
-         */
-        init_and_fetch_comments: function() {
-            this.search['domain'] = _.union(this.params.domain, this.search_results.domain);
-            this.search['context'] = _.extend(this.params.context, this.search_results.context);
-            this.display_show_more = true;
-            this.comments_structure = {'root_ids': [], 'new_root_ids': [], 'msgs': {}, 'tree_struct': {}, 'model_to_root_ids': {}};
-            this.$element.find('ul.oe_mail_wall_threads').empty();
-            return this.fetch_comments(this.params.limit, 0);
+        /** Clean the wall */
+        message_clean: function() {
+            this.$el.find('ul.oe_mail_wall_threads').empty();
         },
 
-        /**
-         * Fetches wall messages
-         * @param {Number} limit: number of notifications to fetch
-         * @param {Number} offset: offset in notifications search
-         * @param {Array} domain
-         * @param {Array} context
-         */
-        fetch_comments: function (limit, offset, additional_domain, additional_context) {
-            var self = this;
-            if (additional_domain) var fetch_domain = this.search['domain'].concat(additional_domain);
-            else var fetch_domain = this.search['domain'];
-            if (additional_context) var fetch_context = _.extend(this.search['context'], additional_context);
-            else var fetch_context = this.search['context'];
-            return this.ds_thread.call('message_get_pushed_messages', 
-                [[this.session.uid], true, [], (limit || 0), (offset || 0), fetch_domain, fetch_context]).then(this.proxy('display_comments'));
-        },
-
-        /**
-         * @param {Array} records records to show in threads
-         */
-        display_comments: function (records) {
-            var self = this;
-            this.do_update_show_more(records.length >= self.params.limit);
-            mail.ChatterUtils.records_struct_add_records(this.comments_structure, records, false);
-            _(this.comments_structure['new_root_ids']).each(function (root_id) {
-                var records = self.comments_structure.tree_struct[root_id]['for_thread_msgs'];
-                var model_name = self.comments_structure.msgs[root_id]['model'];
-                var res_id = self.comments_structure.msgs[root_id]['res_id'];
-                var render_res = session.web.qweb.render('mail.wall_thread_container', {});
-                $('<li class="oe_mail_wall_thread">').html(render_res).appendTo(self.$element.find('ul.oe_mail_wall_threads'));
-                var thread = new mail.Thread(self, {
-                    'res_model': model_name, 'res_id': res_id, 'uid': self.session.uid, 'records': records,
-                    'parent_id': false, 'thread_level': self.params.thread_level, 'show_hide': true, 'is_wall': true}
-                    );
-                self.thread_list.push(thread);
-                return thread.appendTo(self.$element.find('li.oe_mail_wall_thread:last'));
-            });
-            // update TODO
-            this.comments_structure['root_ids'] = _.union(this.comments_structure['root_ids'], this.comments_structure['new_root_ids']);
-            this.comments_structure['new_root_ids'] = [];
-        },
-
-        /**
-         * Create a domain to fetch new comments according to
-         * comments already present in comments_structure
-         * - for each model:
-         * -- should not be child of already displayed ids
-         * @returns {Array} fetch_domain (OpenERP domain style)
-         */
-        get_fetch_domain: function () {
-            var self = this;
-            var model_to_root = {};
-            var fetch_domain = [];
-            _(this.comments_structure['model_to_root_ids']).each(function (sc_model, model_name) {
-                fetch_domain.push('|', ['model', '!=', model_name], '!', ['id', 'child_of', sc_model]);
-            });
-            return fetch_domain;
-        },
-        
-        /** Display update: show more button */
-        do_update_show_more: function (new_value) {
-            if (new_value != undefined) this.display_show_more = new_value;
-            if (this.display_show_more) this.$element.find('div.oe_mail_wall_more:last').show();
-            else this.$element.find('div.oe_mail_wall_more:last').hide();
-        },
-        
-        /** Action: Shows more discussions */
-        do_more: function () {
-            var domain = this.get_fetch_domain();
-            return this.fetch_comments(this.params.limit, 0, domain);
+        /** Display the Wall threads */
+        message_display: function () {
+            var render_res = session.web.qweb.render('mail.wall_thread_container', {});
+            $('<li class="oe_mail_wall_thread">').html(render_res).appendTo(this.$el.find('ul.oe_mail_wall_threads'));
+            var thread = new mail.Thread(this, {
+                'domain': this.options.domain, 'context': this.options.context,
+                'thread_level': this.options.thread_level, 'composer': true,
+                // display options
+                'show_header_compose': true,  'show_reply': this.options.thread_level > 0,
+                'show_hide': true, 'show_reply_by_email': true,
+                }
+            );
+            thread.appendTo(this.$el.find('li.oe_mail_wall_thread:last'));
+            this.thread_list.push(thread);
         },
     });
 };
diff --git a/addons/mail/static/src/js/mail_followers.js b/addons/mail/static/src/js/mail_followers.js
index 0e920f73041..e5d216ed3d2 100644
--- a/addons/mail/static/src/js/mail_followers.js
+++ b/addons/mail/static/src/js/mail_followers.js
@@ -9,7 +9,7 @@ openerp_mail_followers = function(session, mail) {
      * mail_followers Widget
      * ------------------------------------------------------------
      *
-     * This widget handles the display of a list of records as a vetical
+     * This widget handles the display of a list of records as a vertical
      * list, with an image on the left. The widget itself is a floatting
      * right-sided box.
      * This widget is mainly used to display the followers of records
@@ -24,12 +24,8 @@ openerp_mail_followers = function(session, mail) {
 
         init: function() {
             this._super.apply(this, arguments);
-            this.params = {};
-            this.params.image = this.node.attrs.image || 'image_small';
-            this.params.title = this.node.attrs.title || 'Followers';
-            this.params.display_followers = true;
-            this.params.display_control = this.node.attrs.display_control || false;
-            this.params.display_actions = this.node.attrs.display_actions || false;
+            this.options.image = this.node.attrs.image || 'image_small';
+            this.options.title = this.node.attrs.title || 'Followers';
             this.ds_model = new session.web.DataSetSearch(this, this.view.model);
             this.ds_follow = new session.web.DataSetSearch(this, this.field.relation);
         },
@@ -40,20 +36,17 @@ openerp_mail_followers = function(session, mail) {
             // any other method to know if the view is in create mode anymore
             this.view.on("change:actual_mode", this, this._check_visibility);
             this._check_visibility();
-            this.$element.find('button.oe_mail_button_followers').click(function () { self.do_toggle_followers(); });
-            if (! this.params.display_control) {
-                this.$element.find('button.oe_mail_button_followers').hide(); }
-            this.$element.find('button.oe_mail_button_follow').click(function () { self.do_follow(); })
+            this.$el.find('button.oe_mail_button_follow').click(function () { self.do_follow(); })
                 .mouseover(function () { $(this).html('Follow').removeClass('oe_mail_button_mouseout').addClass('oe_mail_button_mouseover'); })
                 .mouseleave(function () { $(this).html('Not following').removeClass('oe_mail_button_mouseover').addClass('oe_mail_button_mouseout'); });
-            this.$element.find('button.oe_mail_button_unfollow').click(function () { self.do_unfollow(); })
+            this.$el.find('button.oe_mail_button_unfollow').click(function () { self.do_unfollow(); })
                 .mouseover(function () { $(this).html('Unfollow').removeClass('oe_mail_button_mouseout').addClass('oe_mail_button_mouseover'); })
                 .mouseleave(function () { $(this).html('Following').removeClass('oe_mail_button_mouseover').addClass('oe_mail_button_mouseout'); });
             this.reinit();
         },
 
         _check_visibility: function() {
-            this.$element.toggle(this.view.get("actual_mode") !== "create");
+            this.$el.toggle(this.view.get("actual_mode") !== "create");
         },
 
         destroy: function () {
@@ -61,62 +54,50 @@ openerp_mail_followers = function(session, mail) {
         },
 
         reinit: function() {
-            this.params.display_followers = true;
-            this.params.display_control = this.node.attrs.display_control || false;
-            this.params.display_actions = this.node.attrs.display_actions || false;
-            this.$element.find('button.oe_mail_button_followers').html('Hide followers')
-            this.$element.find('button.oe_mail_button_follow').hide();
-            this.$element.find('button.oe_mail_button_unfollow').hide();
+            this.$el.find('button.oe_mail_button_follow').hide();
+            this.$el.find('button.oe_mail_button_unfollow').hide();
         },
 
         set_value: function(value_) {
             this.reinit();
             if (! this.view.datarecord.id ||
                 session.web.BufferedDataSet.virtual_id_regex.test(this.view.datarecord.id)) {
-                this.$element.find('div.oe_mail_recthread_aside').hide();
+                this.$el.find('div.oe_mail_recthread_aside').hide();
                 return;
             }
-            return this.fetch_subscribers(value_);
+            return this.fetch_followers(value_);
         },
 
-        fetch_subscribers: function (value_) {
-            return this.ds_follow.call('read', [value_ || this.get_value(), ['name', this.params.image]]).then(this.proxy('display_subscribers'));
+        fetch_followers: function (value_) {
+            return this.ds_follow.call('read', [value_ || this.get_value(), ['name', 'user_ids']]).then(this.proxy('display_followers'));
         },
 
-        /**
-         * Display the followers.
-         * TODO: replace the is_subscriber check by fields read */
-        display_subscribers: function (records) {
+        /** Display the followers, evaluate is_follower directly */
+        display_followers: function (records) {
             var self = this;
-            this.is_subscriber = false;
-            var user_list = this.$element.find('ul.oe_mail_followers_display').empty();
-            this.$element.find('div.oe_mail_recthread_followers h4').html(this.params.title + ' (' + records.length + ')');
+            this.message_is_follower = _.indexOf(_.flatten(_.pluck(records, 'user_ids')), this.session.uid) != -1;
+            var node_user_list = this.$el.find('ul.oe_mail_followers_display').empty();
+            this.$el.find('div.oe_mail_recthread_followers h4').html(this.options.title + ' (' + records.length + ')');
             _(records).each(function (record) {
-                if (record.id == self.session.uid) { self.is_subscriber = true; }
-                record.avatar_url = mail.ChatterUtils.get_image(self.session.prefix, self.session.session_id, 'res.users', 'image_small', record.id);
-                $(session.web.qweb.render('mail.followers.partner', {'record': record})).appendTo(user_list);
+                record.avatar_url = mail.ChatterUtils.get_image(self.session.prefix, self.session.session_id, 'res.partner', 'image_small', record.id);
+                $(session.web.qweb.render('mail.followers.partner', {'record': record})).appendTo(node_user_list);
             });
-            if (this.is_subscriber) {
-                this.$element.find('button.oe_mail_button_follow').hide();
-                this.$element.find('button.oe_mail_button_unfollow').show(); }
+            if (this.message_is_follower) {
+                this.$el.find('button.oe_mail_button_follow').hide();
+                this.$el.find('button.oe_mail_button_unfollow').show(); }
             else {
-                this.$element.find('button.oe_mail_button_follow').show();
-                this.$element.find('button.oe_mail_button_unfollow').hide(); }
+                this.$el.find('button.oe_mail_button_follow').show();
+                this.$el.find('button.oe_mail_button_unfollow').hide(); }
         },
 
         do_follow: function () {
-            return this.ds_model.call('message_subscribe', [[this.view.datarecord.id]]).pipe(this.proxy('set_value'));
+            var context = new session.web.CompoundContext(this.build_context(), {'read_back': true});
+            return this.ds_model.call('message_subscribe_users', [[this.view.datarecord.id], undefined, context]).pipe(this.proxy('set_value'));
         },
 
         do_unfollow: function () {
-            return this.ds_model.call('message_unsubscribe', [[this.view.datarecord.id]]).pipe(this.proxy('set_value'));
-        },
-
-        do_toggle_followers: function () {
-            this.params.see_subscribers = ! this.params.see_subscribers;
-            if (this.params.see_subscribers) { this.$element.find('button.oe_mail_button_followers').html('Hide followers'); }
-            else { this.$element.find('button.oe_mail_button_followers').html('Show followers'); }
-            this.$element.find('div.oe_mail_recthread_followers').toggle();
+            var context = new session.web.CompoundContext(this.build_context(), {'read_back': true});
+            return this.ds_model.call('message_unsubscribe_users', [[this.view.datarecord.id], undefined, context]).pipe(this.proxy('set_value'));
         },
     });
 };
diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index 7f49b7f3943..f6be765c603 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -17,8 +17,9 @@
                 <td colspan="2">
                     <h2 class="oe_view_title">
                         <span class="oe_view_title_text">
-                            <t t-if="! widget.params.res_model">News Feeds</t>
-                            <t t-if="widget.params.res_model" t-esc="widget.params.res_model"/>
+                            News Feed
+                            <t t-if="widget.options.res_model"> / </t>
+                            <t t-if="widget.options.res_model" t-esc="widget.options.res_model"/>
                         </span>
                     </h2>
                 </td>
@@ -26,19 +27,9 @@
             </tr>
           </tbody>
         </table>
-        <div class="oe_mail_wall_main">
-            <div class="oe_mail_wall_action">
-                <!-- call the composition form -->
-                <t t-call ="mail.compose_message"/>
-            </div>
-            <div class="oe_clear"/>
-            <ul class="oe_mail_wall_threads">
-                <!-- contains threads -->
-            </ul>
-            <div class="oe_mail_wall_more">
-                <button class="oe_mail_wall_button_more" type="button">See more...</button>
-            </div>
-        </div>
+        <ul class="oe_mail_wall_threads">
+            <!-- contains threads -->
+        </ul>
         <div class="oe_mail_wall_aside">
                 <!-- contains currently nothing -->
         </div>
@@ -56,7 +47,7 @@
         Template used to display the communication history in documents
         form view.
         -->
-    <div t-name="mail.record_thread" class="oe_mail_recthread">
+    <div t-name="mail.record_thread">
         <!-- <h4>History and Comments</h4> -->
         <div class="oe_mail_recthread_main">
             <!-- contains the document thread -->
@@ -88,7 +79,7 @@
         container, holding the composition form. Then come the various
         messages. Then comes the 'more' button.
         -->
-    <ul t-name="mail.thread" class="oe_mail oe_mail_thread">
+    <ul t-name="mail.thread" class="oe_mail oe_mail_thread oe_semantic_html_override">
         <div class="oe_mail_thread_action">
             <!-- contains the composition box (form + image) -->
             <t t-call="mail.compose_message"/>
@@ -103,21 +94,21 @@
 
     <!-- default layout -->
     <li t-name="mail.thread.message" class="oe_mail oe_mail_thread_msg">
-        <div t-attf-class="oe_mail_msg_#{record.type}">
-            <img class="oe_mail_icon oe_left" t-att-src="record.mini_url"/>
+        <div t-attf-class="oe_mail_msg_#{record.type} oe_semantic_html_override">
+            <img class="oe_mail_icon oe_mail_frame oe_left" t-att-src="record.avatar"/>
             <div class="oe_mail_msg_content">
                 <!-- dropdown menu with message options and actions -->
                 <span class="oe_dropdown_toggle oe_dropdown_arrow">
                     <ul class="oe_dropdown_menu">
-                        <t t-if="display['show_delete']">
-                                <li t-if="record.is_author"><a href="#" class="oe_mail_msg_delete" t-attf-data-id='{record.id}'>Delete</a></li>
+                        <t t-if="record.is_author">
+                            <li t-if="display['show_delete']"><a href="#" class="oe_mail_msg_delete" t-attf-data-id='{record.id}'>Delete</a></li>
                         </t>
-                        <li t-if="display['show_hide']"><a href="#" class="oe_mail_msg_hide" t-attf-data-id='{record.id}'>Hide</a></li>
+                        <li t-if="display['show_hide']"><a href="#" class="oe_mail_msg_hide" t-attf-data-id='{record.id}'>Remove notification</a></li>
 <!--                    Uncomment when adding subtype hiding
                         <li t-if="display['show_hide']">
                             <a href="#" class="oe_mail_msg_hide_type" t-attf-data-subtype='{record.subtype}'>Hide '<t t-esc="record.subtype"/>' for this document</a>
                         </li> -->
-                        <li><a href="#" t-attf-data-msg_id="{record.id}" t-attf-data-type="{record.type}" t-attf-data-formatting="{record.content_subtype}" class="oe_mail_msg_reply_by_email">Reply by email</a></li>
+                        <li><a href="#" t-attf-data-msg_id="{record.id}" class="oe_mail_msg_reply_by_email">Quote and reply</a></li>
                         <li t-if="record.type == 'email'"><a t-attf-href="#model=mail.message&amp;id=#{record.id}" class="oe_mail_msg_details">Details</a></li>
                     </ul>
                 </span>
@@ -136,7 +127,7 @@
                     <div class="oe_clear"/>
                     <ul class="oe_mail_msg_footer">
                       <li t-if="record.subject &amp; params.thread_level > 0"><a t-attf-href="#model=#{params.res_model}&amp;id=#{params.res_id}"><t t-raw="record.record_name"/></a></li>
-                      <li><a t-attf-href="#model=res.users&amp;id=#{record.user_id[0]}"><t t-raw="record.user_id[1]"/></a></li>
+                      <li><a t-attf-href="#model=res.partner&amp;id=#{record.author_id[0]}"><t t-raw="record.author_id[1]"/></a></li>
                       <li><span t-att-title="record.date"><t t-raw="record.timerelative"/></span></li>
                       <li t-if="display['show_reply']"><a href="#" class="oe_mail_msg_reply">Reply</a></li>
                       <!-- uncomment when merging vote
diff --git a/addons/mail/static/src/xml/mail_followers.xml b/addons/mail/static/src/xml/mail_followers.xml
index 53c899b9569..39622f42abf 100644
--- a/addons/mail/static/src/xml/mail_followers.xml
+++ b/addons/mail/static/src/xml/mail_followers.xml
@@ -5,15 +5,14 @@
         followers main template
         Template used to display the followers and the actions in a record.
         -->
-    <div t-name="mail.followers" class="oe_mail_recthread_aside">
+    <div t-name="mail.followers" class="oe_mail_recthread_aside oe_semantic_html_override">
         <div class="oe_mail_recthread_actions">
             <button type="button" class="oe_mail_button_follow oe_mail_button_mouseout">Not following</button>
             <button type="button" class="oe_mail_button_unfollow oe_mail_button_mouseout">Following</button>
-            <button type="button" class="oe_mail_button_followers">Show followers</button>
         </div>
         <div class="oe_mail_recthread_followers">
-            <t t-if="widget.params.title">
-                <h4><t t-raw="widget.params.title"/></h4>
+            <t t-if="widget.options.title">
+                <h4><t t-raw="widget.options.title"/></h4>
             </t>
             <ul class="oe_mail_followers_display"></ul>
         </div>
@@ -25,7 +24,7 @@
         -->
     <li t-name="mail.followers.partner">
         <img class="oe_mail_thumbnail oe_mail_frame" t-attf-src="{record.avatar_url}"/>
-        <a t-attf-href="#model=res.users&amp;id=#{record.id}"><t t-raw="record.name"/></a>
+        <a t-attf-href="#model=res.partner&amp;id=#{record.id}"><t t-raw="record.name"/></a>
     </li>
 
 </template>
diff --git a/addons/mail/tests/test_mail.py b/addons/mail/tests/test_mail.py
index 0940d72c490..f45745f31dc 100644
--- a/addons/mail/tests/test_mail.py
+++ b/addons/mail/tests/test_mail.py
@@ -20,6 +20,7 @@
 ##############################################################################
 
 from openerp.tests import common
+from openerp.tools.html_sanitize import html_sanitize
 
 MAIL_TEMPLATE = """Return-Path: <whatever-2a840@postmaster.twitter.com>
 To: {to}
@@ -62,51 +63,544 @@ Content-Transfer-Encoding: quoted-printable
 ------=_Part_4200734_24778174.1344608186754--
 """
 
+MAIL_TEMPLATE_PLAINTEXT = """Return-Path: <whatever-2a840@postmaster.twitter.com>
+To: {to}
+Received: by mail1.openerp.com (Postfix, from userid 10002)
+    id 5DF9ABFB2A; Fri, 10 Aug 2012 16:16:39 +0200 (CEST)
+From: Sylvie Lelitre <sylvie.lelitre@agrolait.com>
+Subject: {subject}
+MIME-Version: 1.0
+Content-Type: text/plain
+Date: Fri, 10 Aug 2012 14:16:26 +0000
+Message-ID: {msg_id}
+{extra}
+
+Please call me as soon as possible this afternoon!
+
+--
+Sylvie
+"""
+
 
 class test_mail(common.TransactionCase):
 
+    def _mock_smtp_gateway(self, *args, **kwargs):
+        return True
+
+    def _mock_build_email(self, *args, **kwargs):
+        self._build_email_args = args
+        self._build_email_kwargs = kwargs
+        return self.build_email_real(*args, **kwargs)
+
     def setUp(self):
         super(test_mail, self).setUp()
         self.ir_model = self.registry('ir.model')
         self.mail_alias = self.registry('mail.alias')
         self.mail_thread = self.registry('mail.thread')
         self.mail_group = self.registry('mail.group')
+        self.mail_mail = self.registry('mail.mail')
+        self.mail_message = self.registry('mail.message')
+        self.mail_notification = self.registry('mail.notification')
+        self.mail_followers = self.registry('mail.followers')
         self.res_users = self.registry('res.users')
+        self.res_partner = self.registry('res.partner')
+
+        # Install mock SMTP gateway
+        self.build_email_real = self.registry('ir.mail_server').build_email
+        self.registry('ir.mail_server').build_email = self._mock_build_email
+        self.registry('ir.mail_server').send_email = self._mock_smtp_gateway
 
         # groups@.. will cause the creation of new mail groups
-        self.mail_group_model_id = self.ir_model.search(self.cr, self.uid, [('model','=', 'mail.group')])[0]
+        self.mail_group_model_id = self.ir_model.search(self.cr, self.uid, [('model', '=', 'mail.group')])[0]
         self.mail_alias.create(self.cr, self.uid, {'alias_name': 'groups',
                                                    'alias_model_id': self.mail_group_model_id})
-        
-        # tech@... will append new messages to the 'tech' group 
-        self.group_tech_id = self.mail_group.create(self.cr, self.uid, {'name': 'tech'})
+        # create a 'pigs' group that will be used through the various tests
+        self.group_pigs_id = self.mail_group.create(self.cr, self.uid,
+            {'name': 'Pigs', 'description': 'Fans of Pigs, unite !'})
 
-    def test_message_process(self):
+    def test_00_message_process(self):
+        cr, uid = self.cr, self.uid
         # Incoming mail creates a new mail_group "frogs"
-        self.assertEqual(self.mail_group.search(self.cr, self.uid, [('name','=','frogs')]), [])
+        self.assertEqual(self.mail_group.search(cr, uid, [('name', '=', 'frogs')]), [])
         mail_frogs = MAIL_TEMPLATE.format(to='groups@example.com, other@gmail.com', subject='frogs', extra='')
-        self.mail_thread.message_process(self.cr, self.uid, None, mail_frogs)
-        frog_groups = self.mail_group.search(self.cr, self.uid, [('name','=','frogs')])
+        self.mail_thread.message_process(cr, uid, None, mail_frogs)
+        frog_groups = self.mail_group.search(cr, uid, [('name', '=', 'frogs')])
         self.assertTrue(len(frog_groups) == 1)
 
         # Previously-created group can be emailed now - it should have an implicit alias group+frogs@...
-        frog_group = self.mail_group.browse(self.cr, self.uid, frog_groups[0])
+        frog_group = self.mail_group.browse(cr, uid, frog_groups[0])
         group_messages = frog_group.message_ids
         self.assertTrue(len(group_messages) == 1, 'New group should only have the original message')
         mail_frog_news = MAIL_TEMPLATE.format(to='Friendly Frogs <group+frogs@example.com>', subject='news', extra='')
-        self.mail_thread.message_process(self.cr, self.uid, None, mail_frog_news)
+        self.mail_thread.message_process(cr, uid, None, mail_frog_news)
         frog_group.refresh()
         self.assertTrue(len(frog_group.message_ids) == 2, 'Group should contain 2 messages now')
 
         # Even with a wrong destination, a reply should end up in the correct thread
         mail_reply = MAIL_TEMPLATE.format(to='erroneous@example.com>', subject='Re: news',
-                                          extra='In-Reply-To: <12321321-openerp-%d-mail.group@example.com>\n'%frog_group.id)
-        self.mail_thread.message_process(self.cr, self.uid, None, mail_reply)
+                                          extra='In-Reply-To: <12321321-openerp-%d-mail.group@example.com>\n' % frog_group.id)
+        self.mail_thread.message_process(cr, uid, None, mail_reply)
         frog_group.refresh()
         self.assertTrue(len(frog_group.message_ids) == 3, 'Group should contain 3 messages now')
-        
+
         # No model passed and no matching alias must raise
         mail_spam = MAIL_TEMPLATE.format(to='noone@example.com', subject='spam', extra='')
         self.assertRaises(Exception,
                           self.mail_thread.message_process,
-                          self.cr, self.uid, None, mail_spam)
+                          cr, uid, None, mail_spam)
+
+        # plain text content should be wrapped and stored as html
+        test_msg_id = '<deadcafe.1337@smtp.agrolait.com>'
+        mail_text = MAIL_TEMPLATE_PLAINTEXT.format(to='groups@example.com', subject='frogs', extra='', msg_id=test_msg_id)
+        self.mail_thread.message_process(cr, uid, None, mail_text)
+        new_mail = self.mail_message.browse(cr, uid, self.mail_message.search(cr, uid, [('message_id','=',test_msg_id)])[0])
+        self.assertEqual(new_mail.body, '\n<pre>\nPlease call me as soon as possible this afternoon!\n\n--\nSylvie\n</pre>\n',
+                         'plaintext mail incorrectly parsed')
+
+    def test_10_many2many_reference_field(self):
+        """ Tests designed for the many2many_reference field (follower_ids).
+            We will test to perform writes using the many2many commands 0, 3, 4,
+            5 and 6. """
+        cr, uid = self.cr, self.uid
+        user_admin = self.res_users.browse(cr, uid, uid)
+        group_pigs = self.mail_group.browse(cr, uid, self.group_pigs_id)
+
+        # Create partner Bert Poilu
+        partner_bert_id = self.res_partner.create(cr, uid, {'name': 'Bert Poilu'})
+
+        # Create 'disturbing' values in mail.followers: same res_id, other res_model; same res_model, other res_id
+        group_dummy_id = self.mail_group.create(cr, uid,
+            {'name': 'Dummy group'})
+        self.mail_followers.create(cr, uid,
+            {'res_model': 'mail.thread', 'res_id': self.group_pigs_id, 'partner_id': partner_bert_id})
+        self.mail_followers.create(cr, uid,
+            {'res_model': 'mail.group', 'res_id': group_dummy_id, 'partner_id': partner_bert_id})
+
+        # Pigs just created: should be only Admin as follower
+        follower_ids = set([follower.id for follower in group_pigs.message_follower_ids])
+        self.assertEqual(follower_ids, set([user_admin.partner_id.id]), 'Admin should be the only Pigs fan')
+
+        # Subscribe Bert through a '4' command
+        group_pigs.write({'message_follower_ids': [(4, partner_bert_id)]})
+        group_pigs.refresh()
+        follower_ids = set([follower.id for follower in group_pigs.message_follower_ids])
+        self.assertEqual(follower_ids, set([partner_bert_id, user_admin.partner_id.id]), 'Bert and Admin should be the only Pigs fans')
+
+        # Unsubscribe Bert through a '3' command
+        group_pigs.write({'message_follower_ids': [(3, partner_bert_id)]})
+        group_pigs.refresh()
+        follower_ids = set([follower.id for follower in group_pigs.message_follower_ids])
+        self.assertEqual(follower_ids, set([user_admin.partner_id.id]), 'Admin should be the only Pigs fan')
+
+        # Set followers through a '6' command
+        group_pigs.write({'message_follower_ids': [(6, 0, [partner_bert_id])]})
+        group_pigs.refresh()
+        follower_ids = set([follower.id for follower in group_pigs.message_follower_ids])
+        self.assertEqual(follower_ids, set([partner_bert_id]), 'Bert should be the only Pigs fan')
+
+        # Add a follower created on the fly through a '0' command
+        group_pigs.write({'message_follower_ids': [(0, 0, {'name': 'Patrick Fiori'})]})
+        partner_patrick_id = self.res_partner.search(cr, uid, [('name', '=', 'Patrick Fiori')])[0]
+        group_pigs.refresh()
+        follower_ids = set([follower.id for follower in group_pigs.message_follower_ids])
+        self.assertEqual(follower_ids, set([partner_bert_id, partner_patrick_id]), 'Bert and Patrick should be the only Pigs fans')
+
+        # Finally, unlink through a '5' command
+        group_pigs.write({'message_follower_ids': [(5, 0)]})
+        group_pigs.refresh()
+        follower_ids = set([follower.id for follower in group_pigs.message_follower_ids])
+        self.assertFalse(follower_ids, 'Pigs group should not have fans anymore')
+
+        # Test dummy data has not been altered
+        fol_obj_ids = self.mail_followers.search(cr, uid, [('res_model', '=', 'mail.thread'), ('res_id', '=', self.group_pigs_id)])
+        follower_ids = set([follower.partner_id.id for follower in self.mail_followers.browse(cr, uid, fol_obj_ids)])
+        self.assertEqual(follower_ids, set([partner_bert_id]), 'Bert should be the follower of dummy mail.thread data')
+        fol_obj_ids = self.mail_followers.search(cr, uid, [('res_model', '=', 'mail.group'), ('res_id', '=', group_dummy_id)])
+        follower_ids = set([follower.partner_id.id for follower in self.mail_followers.browse(cr, uid, fol_obj_ids)])
+        self.assertEqual(follower_ids, set([partner_bert_id, user_admin.partner_id.id]), 'Bert and Admin should be the followers of dummy mail.group data')
+
+    def test_11_message_followers(self):
+        """ Tests designed for the subscriber API. """
+        cr, uid = self.cr, self.uid
+        user_admin = self.res_users.browse(cr, uid, uid)
+        group_pigs = self.mail_group.browse(cr, uid, self.group_pigs_id)
+
+        # Create user Raoul
+        user_raoul_id = self.res_users.create(cr, uid, {'name': 'Raoul Grosbedon', 'login': 'raoul'})
+        user_raoul = self.res_users.browse(cr, uid, user_raoul_id)
+
+        # Subscribe Raoul three times (niak niak) through message_subscribe_users
+        group_pigs.message_subscribe_users([user_raoul_id, user_raoul_id])
+        group_pigs.message_subscribe_users([user_raoul_id])
+        group_pigs.refresh()
+        follower_ids = [follower.id for follower in group_pigs.message_follower_ids]
+        self.assertEqual(len(follower_ids), 2, 'There should be 2 Pigs fans')
+        self.assertEqual(set(follower_ids), set([user_raoul.partner_id.id, user_admin.partner_id.id]), 'Admin and Raoul should be the only 2 Pigs fans')
+
+        # Unsubscribe Raoul twice through message_unsubscribe_users
+        group_pigs.message_unsubscribe_users([user_raoul_id, user_raoul_id])
+        group_pigs.refresh()
+        follower_ids = [follower.id for follower in group_pigs.message_follower_ids]
+        self.assertEqual(follower_ids, [user_admin.partner_id.id], 'Admin must be the only Pigs fan')
+
+    def test_20_message_post(self):
+        """ Tests designed for message_post. """
+        cr, uid = self.cr, self.uid
+        self.res_users.write(cr, uid, [uid], {'signature': 'Admin', 'email': 'a@a'})
+        user_admin = self.res_users.browse(cr, uid, uid)
+        group_pigs = self.mail_group.browse(cr, uid, self.group_pigs_id)
+
+        # 0 - Admin
+        p_a_id = user_admin.partner_id.id
+        # 1 - Bert Tartopoils, with email, should receive emails for comments and emails
+        p_b_id = self.res_partner.create(cr, uid, {'name': 'Bert Tartopoils', 'email': 'b@b'})
+        # 2 - Carine Poilvache, with email, should never receive emails
+        p_c_id = self.res_partner.create(cr, uid, {'name': 'Carine Poilvache', 'email': 'c@c', 'notification_email_send': 'email'})
+        # 3 - Dédé Grosbedon, without email, to test email verification; should receive emails for every message
+        p_d_id = self.res_partner.create(cr, uid, {'name': 'Dédé Grosbedon', 'notification_email_send': 'all'})
+
+        # Subscribe #1, #2
+        group_pigs.message_subscribe([p_b_id, p_c_id])
+
+        # Mail data
+        _subject = 'Pigs'
+        _mail_subject = '%s posted on %s' % (user_admin.name, group_pigs.name)
+        _body1 = 'Pigs rules'
+        _mail_body1 = 'Pigs rules\n<pre>Admin</pre>\n'
+        _mail_bodyalt1 = 'Pigs rules\nAdmin'
+        _body2 = '<html>Pigs rules</html>'
+        _mail_body2 = html_sanitize('<html>Pigs rules\n<pre>Admin</pre>\n</html>')
+        _mail_bodyalt2 = 'Pigs rules\nAdmin'
+        _attachments = [('First', 'My first attachment'), ('Second', 'My second attachment')]
+
+        # CASE1: post comment, body and subject specified
+        msg_id = self.mail_group.message_post(cr, uid, self.group_pigs_id, body=_body1, subject=_subject, type='comment')
+        message = self.mail_message.browse(cr, uid, msg_id)
+        sent_email = self._build_email_kwargs
+        # Test: notifications have been deleted
+        self.assertFalse(self.mail_mail.search(cr, uid, [('mail_message_id', '=', msg_id)]), 'mail.mail notifications should have been auto-deleted!')
+        # Test: mail_message: subject is _subject, body is _body1 (no formatting done)
+        self.assertEqual(message.subject, _subject, 'mail.message subject incorrect')
+        self.assertEqual(message.body, _body1, 'mail.message body incorrect')
+        # Test: sent_email: email send by server: correct subject, body; body_alternative
+        self.assertEqual(sent_email['subject'], _subject, 'sent_email subject incorrect')
+        self.assertEqual(sent_email['body'], _mail_body1, 'sent_email body incorrect')
+        self.assertEqual(sent_email['body_alternative'], _mail_bodyalt1, 'sent_email body_alternative is incorrect')
+        # Test: mail_message: partner_ids = group followers
+        message_pids = set([partner.id for partner in message.partner_ids])
+        test_pids = set([p_a_id, p_b_id, p_c_id])
+        self.assertEqual(test_pids, message_pids, 'mail.message partners incorrect')
+        # Test: notification linked to this message = group followers = partner_ids
+        notif_ids = self.mail_notification.search(cr, uid, [('message_id', '=', message.id)])
+        notif_pids = set([notif.partner_id.id for notif in self.mail_notification.browse(cr, uid, notif_ids)])
+        self.assertEqual(notif_pids, test_pids, 'mail.message notification partners incorrect')
+        # Test: sent_email: email_to should contain b@b, not c@c (pref email), not a@a (writer)
+        self.assertEqual(sent_email['email_to'], ['b@b'], 'sent_email email_to is incorrect')
+
+        # CASE2: post an email with attachments, parent_id, partner_ids
+        # TESTS: automatic subject, signature in body_html, attachments propagation
+        msg_id2 = self.mail_group.message_post(cr, uid, self.group_pigs_id, body=_body2, type='email',
+            partner_ids=[(6, 0, [p_d_id])], parent_id=msg_id, attachments=_attachments)
+        message = self.mail_message.browse(cr, uid, msg_id2)
+        sent_email = self._build_email_kwargs
+        self.assertFalse(self.mail_mail.search(cr, uid, [('mail_message_id', '=', msg_id2)]), 'mail.mail notifications should have been auto-deleted!')
+
+        # Test: mail_message: subject is False, body is _body2 (no formatting done), parent_id is msg_id
+        self.assertEqual(message.subject, False, 'mail.message subject incorrect')
+        self.assertEqual(message.body, html_sanitize(_body2), 'mail.message body incorrect')
+        self.assertEqual(message.parent_id.id, msg_id, 'mail.message parent_id incorrect')
+        # Test: sent_email: email send by server: correct subject, body, body_alternative
+        self.assertEqual(sent_email['subject'], _mail_subject, 'sent_email subject incorrect')
+        self.assertEqual(sent_email['body'], _mail_body2, 'sent_email body incorrect')
+        self.assertEqual(sent_email['body_alternative'], _mail_bodyalt2, 'sent_email body_alternative incorrect')
+        # Test: mail_message: partner_ids = group followers
+        message_pids = set([partner.id for partner in message.partner_ids])
+        test_pids = set([p_a_id, p_b_id, p_c_id, p_d_id])
+        self.assertEqual(message_pids, test_pids, 'mail.message partners incorrect')
+        # Test: notifications linked to this message = group followers = partner_ids
+        notif_ids = self.mail_notification.search(cr, uid, [('message_id', '=', message.id)])
+        notif_pids = set([notif.partner_id.id for notif in self.mail_notification.browse(cr, uid, notif_ids)])
+        self.assertEqual(notif_pids, test_pids, 'mail.message notification partners incorrect')
+        # Test: sent_email: email_to should contain b@b, c@c, not a@a (writer)
+        self.assertEqual(set(sent_email['email_to']), set(['b@b', 'c@c']), 'sent_email email_to incorrect')
+        # Test: attachments
+        for attach in message.attachment_ids:
+            self.assertEqual(attach.res_model, 'mail.group', 'mail.message attachment res_model incorrect')
+            self.assertEqual(attach.res_id, self.group_pigs_id, 'mail.message attachment res_id incorrect')
+            self.assertIn((attach.name, attach.datas.decode('base64')), _attachments,
+                'mail.message attachment name / data incorrect')
+
+    def test_21_message_compose_wizard(self):
+        """ Tests designed for the mail.compose.message wizard. """
+        cr, uid = self.cr, self.uid
+        mail_compose = self.registry('mail.compose.message')
+        self.res_users.write(cr, uid, [uid], {'signature': 'Admin', 'email': 'a@a'})
+        user_admin = self.res_users.browse(cr, uid, uid)
+        group_pigs = self.mail_group.browse(cr, uid, self.group_pigs_id)
+        group_bird_id = self.mail_group.create(cr, uid, {'name': 'Bird', 'description': 'Bird resistance'})
+        group_bird = self.mail_group.browse(cr, uid, group_bird_id)
+
+        # Mail data
+        _subject = 'Pigs'
+        _body_text = 'Pigs rules'
+        _msg_reply = 'Re: Pigs'
+        _msg_body = '<pre>Pigs rules</pre>'
+        _attachments = [
+            {'name': 'First', 'datas_fname': 'first.txt', 'datas': 'My first attachment'.encode('base64')},
+            {'name': 'Second', 'datas_fname': 'second.txt', 'datas': 'My second attachment'.encode('base64')}
+            ]
+        _attachments_test = [('first.txt', 'My first attachment'), ('second.txt', 'My second attachment')]
+
+        # Create partners
+        # 0 - Admin
+        p_a_id = user_admin.partner_id.id
+        # 1 - Bert Tartopoils, with email, should receive emails for comments and emails
+        p_b_id = self.res_partner.create(cr, uid, {'name': 'Bert Tartopoils', 'email': 'b@b'})
+        # 2 - Carine Poilvache, with email, should never receive emails
+        p_c_id = self.res_partner.create(cr, uid, {'name': 'Carine Poilvache', 'email': 'c@c', 'notification_email_send': 'email'})
+        # 3 - Dédé Grosbedon, without email, to test email verification; should receive emails for every message
+        p_d_id = self.res_partner.create(cr, uid, {'name': 'Dédé Grosbedon', 'notification_email_send': 'all'})
+
+        # Subscribe #1
+        group_pigs.message_subscribe([p_b_id])
+
+        # ----------------------------------------
+        # CASE1: comment on group_pigs
+        # ----------------------------------------
+
+        # 1. Comment group_pigs with body_text and subject
+        compose_id = mail_compose.create(cr, uid,
+            {'subject': _subject, 'body_text': _body_text, 'partner_ids': [(4, p_c_id), (4, p_d_id)]},
+            {'default_composition_mode': 'comment', 'default_model': 'mail.group', 'default_res_id': self.group_pigs_id})
+        compose = mail_compose.browse(cr, uid, compose_id)
+        # Test: mail.compose.message: composition_mode, model, res_id
+        self.assertEqual(compose.composition_mode,  'comment', 'mail.compose.message incorrect composition_mode')
+        self.assertEqual(compose.model,  'mail.group', 'mail.compose.message incorrect model')
+        self.assertEqual(compose.res_id, self.group_pigs_id, 'mail.compose.message incorrect res_id')
+
+        # 2. Post the comment, get created message
+        mail_compose.send_mail(cr, uid, [compose_id])
+        group_pigs.refresh()
+        message = group_pigs.message_ids[0]
+        # Test: mail.message: subject, body inside pre
+        self.assertEqual(message.subject,  False, 'mail.message incorrect subject')
+        self.assertEqual(message.body, _msg_body, 'mail.message incorrect body')
+        # Test: mail.message: partner_ids = entries in mail.notification: group_pigs fans (a, b) + mail.compose.message partner_ids (c, d)
+        msg_pids = [partner.id for partner in message.partner_ids]
+        test_pids = [p_a_id, p_b_id, p_c_id, p_d_id]
+        notif_ids = self.mail_notification.search(cr, uid, [('message_id', '=', message.id)])
+        self.assertEqual(len(notif_ids), 4, 'mail.message: too much notifications created')
+        self.assertEqual(set(msg_pids), set(test_pids), 'mail.message partner_ids incorrect')
+
+        # ----------------------------------------
+        # CASE2: reply to last comment with attachments
+        # ----------------------------------------
+
+        # 1. Update last comment subject, reply with attachments
+        message.write({'subject': _subject})
+        compose_id = mail_compose.create(cr, uid,
+            {'attachment_ids': [(0, 0, _attachments[0]), (0, 0, _attachments[1])]},
+            {'default_composition_mode': 'reply', 'default_model': 'mail.thread', 'default_res_id': self.group_pigs_id, 'default_parent_id': message.id})
+        compose = mail_compose.browse(cr, uid, compose_id)
+        # Test: model, res_id, parent_id, content_subtype
+        self.assertEqual(compose.model,  'mail.group', 'mail.compose.message incorrect model')
+        self.assertEqual(compose.res_id, self.group_pigs_id, 'mail.compose.message incorrect res_id')
+        self.assertEqual(compose.parent_id.id, message.id, 'mail.compose.message incorrect parent_id')
+        self.assertEqual(compose.content_subtype, 'html', 'mail.compose.message incorrect content_subtype')
+
+        # 2. Post the comment, get created message
+        mail_compose.send_mail(cr, uid, [compose_id])
+        group_pigs.refresh()
+        message = group_pigs.message_ids[0]
+        # Test: mail.message: subject as Re:.., body in html
+        self.assertEqual(message.subject, _msg_reply, 'mail.message incorrect subject')
+        self.assertIn('Administrator wrote:<blockquote><pre>Pigs rules</pre></blockquote></div>', message.body, 'mail.message body is incorrect')
+        # Test: mail.message: attachments
+        for attach in message.attachment_ids:
+            self.assertEqual(attach.res_model, 'mail.group', 'mail.message attachment res_model incorrect')
+            self.assertEqual(attach.res_id, self.group_pigs_id, 'mail.message attachment res_id incorrect')
+            self.assertIn((attach.name, attach.datas.decode('base64')), _attachments_test,
+                'mail.message attachment name / data incorrect')
+
+        # ----------------------------------------
+        # CASE3: mass_mail on Pigs and Bird
+        # ----------------------------------------
+
+        # 1. mass_mail on pigs and bird
+        compose_id = mail_compose.create(cr, uid,
+            {'subject': _subject, 'body': '${object.description}'},
+            {'default_composition_mode': 'mass_mail', 'default_model': 'mail.group', 'default_res_id': -1,
+                'active_ids': [self.group_pigs_id, group_bird_id]})
+        compose = mail_compose.browse(cr, uid, compose_id)
+        # Test: content_subtype is html
+        self.assertEqual(compose.content_subtype, 'html', 'mail.compose.message content_subtype incorrect')
+
+        # 2. Post the comment, get created message for each group
+        mail_compose.send_mail(cr, uid, [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, 'Pigs did not receive its mass mailing message')
+        self.assertIn(message2.id, test_msg_ids, 'Bird did not receive its mass mailing message')
+        # Test: mail.message: subject, body
+        self.assertEqual(message1.subject, _subject, 'mail.message subject incorrect')
+        self.assertEqual(message1.body, group_pigs.description, 'mail.message body incorrect')
+        self.assertEqual(message2.subject, _subject, 'mail.message subject incorrect')
+        self.assertEqual(message2.body, group_bird.description, 'mail.message body incorrect')
+
+    def test_30_message_read(self):
+        """ Tests designed for message_read. """
+        # TDE NOTE: this test is not finished, as the message_read method is not fully specified.
+        # It will be updated as soon as we have fixed specs !
+        cr, uid = self.cr, self.uid
+        group_pigs = self.mail_group.browse(cr, uid, self.group_pigs_id)
+        def _compare_structures(struct1, struct2, n=0):
+            # print '%scompare structure' % ('\t' * n)
+            self.assertEqual(len(struct1), len(struct2), 'message_read structure number of childs incorrect')
+            for x in range(len(struct1)):
+                # print '%s' % ('\t' * n), struct1[x]['id'], struct2[x]['id'], struct1[x].get('subject') or ''
+                self.assertEqual(struct1[x]['id'], struct2[x]['id'], 'message_read failure %s' % struct1[x].get('subject'))
+                _compare_structures(struct1[x]['child_ids'], struct2[x]['child_ids'], n + 1)
+            # print '%send compare' % ('\t' * n)
+
+        # ----------------------------------------
+        # CASE1: Flattening test
+        # ----------------------------------------
+
+        # Create dummy message structure
+        import copy
+        tree = [{'id': 2, 'child_ids': [
+                    {'id': 6, 'child_ids': [
+                        {'id': 8, 'child_ids': []},
+                        ]},
+                    ]},
+                {'id': 1, 'child_ids':[
+                    {'id': 7, 'child_ids': [
+                        {'id': 9, 'child_ids': []},
+                        ]},
+                    {'id': 4, 'child_ids': [
+                        {'id': 10, 'child_ids': []},
+                        {'id': 5, 'child_ids': []},
+                        ]},
+                    {'id': 3, 'child_ids': []},
+                    ]},
+                ]
+        # Test: completely flat
+        new_tree = self.mail_message.message_read_tree_flatten(cr, uid, copy.deepcopy(tree), 0, 0)
+        self.assertEqual(len(new_tree), 10, 'message_read_tree_flatten wrong in flat')
+        # Test: 1 thread level
+        tree_test = [{'id': 2, 'child_ids': [
+                        {'id': 8, 'child_ids': []}, {'id': 6, 'child_ids': []},
+                    ]},
+                    {'id': 1, 'child_ids': [
+                        {'id': 10, 'child_ids': []}, {'id': 9, 'child_ids': []},
+                        {'id': 7, 'child_ids': []}, {'id': 5, 'child_ids': []},
+                        {'id': 4, 'child_ids': []}, {'id': 3, 'child_ids': []},
+                    ]},
+                    ]
+        new_tree = self.mail_message.message_read_tree_flatten(cr, uid, copy.deepcopy(tree), 0, 1)
+        _compare_structures(new_tree, tree_test)
+        # Test: 2 thread levels
+        new_tree = self.mail_message.message_read_tree_flatten(cr, uid, copy.deepcopy(tree), 0, 2)
+        _compare_structures(new_tree, tree)
+
+        # ----------------------------------------
+        # CASE2: message_read test
+        # ----------------------------------------
+
+        # 1. Add a few messages to pigs group
+        msgid1 = group_pigs.message_post(body='1', subject='1', parent_id=False)
+        msgid2 = group_pigs.message_post(body='2', subject='1-1', parent_id=msgid1)
+        msgid3 = group_pigs.message_post(body='3', subject='1-2', parent_id=msgid1)
+        msgid4 = group_pigs.message_post(body='4', subject='2', parent_id=False)
+        msgid5 = group_pigs.message_post(body='5', subject='1-1-1', parent_id=msgid2)
+        msgid6 = group_pigs.message_post(body='6', subject='2-1', parent_id=msgid4)
+
+        # Test: read all messages flat
+        tree_test = [{'id': msgid6, 'child_ids': []}, {'id': msgid5, 'child_ids': []},
+                        {'id': msgid4, 'child_ids': []}, {'id': msgid3, 'child_ids': []},
+                        {'id': msgid2, 'child_ids': []}, {'id': msgid1, 'child_ids': []}]
+        tree = self.mail_message.message_read(cr, uid, ids=False, domain=[('model', '=', 'mail.group'), ('res_id', '=', self.group_pigs_id)], thread_level=0, limit=10)
+        _compare_structures(tree, tree_test)
+        # Test: read with 1 level of thread
+        tree_test = [{'id': msgid4, 'child_ids': [{'id': msgid6, 'child_ids': []}, ]},
+                    {'id': msgid1, 'child_ids': [
+                        {'id': msgid5, 'child_ids': []}, {'id': msgid3, 'child_ids': []},
+                        {'id': msgid2, 'child_ids': []},
+                    ]},
+                    ]
+        tree = self.mail_message.message_read(cr, uid, ids=False, domain=[('model', '=', 'mail.group'), ('res_id', '=', self.group_pigs_id)], thread_level=1, limit=10)
+        _compare_structures(tree, tree_test)
+        # Test: read with 2 levels of thread
+        tree_test = [{'id': msgid4, 'child_ids': [{'id': msgid6, 'child_ids': []}, ]},
+                    {'id': msgid1, 'child_ids': [
+                        {'id': msgid3, 'child_ids': []},
+                        {'id': msgid2, 'child_ids': [{'id': msgid5, 'child_ids': []}, ]},
+                    ]},
+                    ]
+        tree = self.mail_message.message_read(cr, uid, ids=False, domain=[('model', '=', 'mail.group'), ('res_id', '=', self.group_pigs_id)], thread_level=2, limit=10)
+        _compare_structures(tree, tree_test)
+
+        # 2. Test expandables
+        # TDE FIXME: add those tests when expandables are specified and implemented
+
+    def test_40_needaction(self):
+        """ Tests for mail.message needaction. """
+        cr, uid = self.cr, self.uid
+        group_pigs = self.mail_group.browse(cr, uid, self.group_pigs_id)
+        user_admin = self.res_users.browse(cr, uid, uid)
+
+        # Demo values: check unread notification = needaction on mail.message
+        notif_ids = self.mail_notification.search(cr, uid, [
+            ('partner_id', '=', user_admin.partner_id.id),
+            ('read', '=', False)
+            ])
+        na_count = self.mail_message._needaction_count(cr, uid, domain=[])
+        self.assertEqual(len(notif_ids), na_count, 'unread notifications count does not match needaction count')
+
+        # Post 4 message on group_pigs
+        for dummy in range(4):
+            group_pigs.message_post(body='My Body')
+
+        # Check there are 4 new needaction on mail.message
+        notif_ids = self.mail_notification.search(cr, uid, [
+            ('partner_id', '=', user_admin.partner_id.id),
+            ('read', '=', False)
+            ])
+        na_count = self.mail_message._needaction_count(cr, uid, domain=[])
+        self.assertEqual(len(notif_ids), na_count, 'unread notifications count does not match needaction count')
+
+        # Check there are 4 needaction on mail.message with particular domain
+        na_count = self.mail_message._needaction_count(cr, uid, domain=[('model', '=', 'mail.group'), ('res_id', '=', self.group_pigs_id)])
+        self.assertEqual(na_count, 4, 'posted message count does not match needaction count')
+
+    def test_50_thread_parent_resolution(self):
+        """Verify parent/child relationships are correctly established when processing incoming mails"""
+        cr, uid = self.cr, self.uid
+        group_pigs = self.mail_group.browse(cr, uid, self.group_pigs_id)
+        msg1 = group_pigs.message_post(body='My Body', subject='1')
+        msg2 = group_pigs.message_post(body='My Body', subject='2')
+        msg1, msg2 = self.mail_message.browse(cr, uid, [msg1, msg2])
+        self.assertTrue(msg1.message_id, "New message should have a proper message_id")
+
+        # Reply to msg1, make sure the reply is properly attached using the various reply identification mechanisms
+        # 1. In-Reply-To header
+        reply_msg = MAIL_TEMPLATE.format(to='Pretty Pigs <group+pigs@example.com>, other@gmail.com', subject='Re: 1',
+                                         extra='In-Reply-To: %s' % msg1.message_id)
+        self.mail_thread.message_process(cr, uid, None, reply_msg)
+        # 2. References header
+        reply_msg2 = MAIL_TEMPLATE.format(to='Pretty Pigs <group+pigs@example.com>, other@gmail.com', subject='Re: Re: 1',
+                                         extra='References: <2233@a.com>\r\n\t<3edss_dsa@b.com> %s' % msg1.message_id)
+        self.mail_thread.message_process(cr, uid, None, reply_msg2)
+        # 3. Subject contains [<ID>] + model passed to message+process -> only attached to group, not to mail
+        reply_msg3 = MAIL_TEMPLATE.format(to='Pretty Pigs <group+pigs@example.com>, other@gmail.com',
+                                          extra='', subject='Re: [%s] 1' % self.group_pigs_id)
+        self.mail_thread.message_process(cr, uid, 'mail.group', reply_msg3)
+        group_pigs.refresh()
+        msg1.refresh()
+        self.assertEqual(5, len(group_pigs.message_ids), 'group should contain 5 messages')
+        self.assertEqual(2, len(msg1.child_ids), 'msg1 should have 2 children now')
diff --git a/addons/mail/wizard/mail_compose_message.py b/addons/mail/wizard/mail_compose_message.py
index fe87b7584e0..3153ccc2069 100644
--- a/addons/mail/wizard/mail_compose_message.py
+++ b/addons/mail/wizard/mail_compose_message.py
@@ -19,417 +19,289 @@
 #
 ##############################################################################
 
-import ast
+import base64
 import re
-
 import tools
+
 from osv import osv
 from osv import fields
 from tools.safe_eval import safe_eval as eval
 from tools.translate import _
 
-from ..mail_message import to_email
-
 # main mako-like expression pattern
 EXPRESSION_PATTERN = re.compile('(\$\{.+?\})')
 
 class mail_compose_message(osv.TransientModel):
-    """Generic Email composition wizard. This wizard is meant to be inherited
-       at model and view level to provide specific wizard features.
+    """ Generic message composition wizard. You may inherit from this wizard
+        at model and view levels to provide specific features.
 
-       The behavior of the wizard can be modified through the use of context
-       parameters, among which are:
-
-         * mail.compose.message.mode: if set to 'reply', the wizard is in 
-            reply to a previous message mode and pre-populated with the original
-            quote. If set to 'comment', it means you are writing a new message to
-            be attached to a document. If set to 'mass_mail', the wizard is in
-            mass mailing where the mail details can contain template placeholders
-            that will be merged with actual data before being sent to each
-            recipient.
-         * active_model: model name of the document to which the mail being
-                        composed is related
-         * active_id: id of the document to which the mail being composed is
-                      related, or id of the message to which user is replying,
-                      in case ``mail.compose.message.mode == 'reply'``
-         * active_ids: ids of the documents to which the mail being composed is
-                      related, in case ``mail.compose.message.mode == 'mass_mail'``.
+        The behavior of the wizard depends on the composition_mode field:
+        - 'reply': reply to a previous message. The wizard is pre-populated
+            via ``get_message_data``.
+        - 'comment': new post on a record. The wizard is pre-populated via
+            ``get_record_data``
+        - 'mass_mail': wizard in mass mailing mode where the mail details can
+            contain template placeholders that will be merged with actual data
+            before being sent to each recipient.
     """
     _name = 'mail.compose.message'
-    _inherit = 'mail.message.common'
+    _inherit = 'mail.message'
     _description = 'Email composition wizard'
+    _log_access = True
 
     def default_get(self, cr, uid, fields, context=None):
-        """ Overridden to provide specific defaults depending on the context
-            parameters.
-
-            Composition mode
-            - comment: default mode; active_model, active_id = model and ID of a
-            document we are commenting,
-            - reply: active_id = ID of a mail.message to which we are replying.
-            From this message we can find the related model and res_id,
-            - mass_mailing mode: active_model, active_id  = model and ID of a
-            document we are commenting,
-
-           :param dict context: several context values will modify the behavior
-                                of the wizard, cfr. the class description.
+        """ Handle composition mode. Some details about context keys:
+            - comment: default mode, model and ID of a record the user comments
+                - default_model or active_model
+                - default_res_id or active_id
+            - reply: active_id of a message the user replies to
+                - default_parent_id or message_id or active_id: ID of the
+                    mail.message we reply to
+                - message.res_model or default_model
+                - message.res_id or default_res_id
+            - mass_mail: model and IDs of records the user mass-mails
+                - active_ids: record IDs
+                - default_model or active_model
         """
         if context is None:
             context = {}
-        compose_mode = context.get('mail.compose.message.mode', 'comment')
-        active_model = context.get('active_model')
-        active_id = context.get('active_id')
         result = super(mail_compose_message, self).default_get(cr, uid, fields, context=context)
 
+        # get some important values from context
+        composition_mode = context.get('default_composition_mode', context.get('mail.compose.message.mode'))
+        model = context.get('default_model', context.get('active_model'))
+        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')
+
         # get default values according to the composition mode
-        vals = {}
-        if compose_mode in ['reply']:
-            vals = self.get_message_data(cr, uid, int(context['active_id']), context=context)
-        elif compose_mode in ['comment', 'mass_mail'] and active_model and active_id:
-            vals = self.get_value(cr, uid, active_model, active_id, context)
+        if composition_mode == 'reply':
+            vals = self.get_message_data(cr, uid, message_id, context=context)
+        elif composition_mode == 'comment' and model and res_id:
+            vals = self.get_record_data(cr, uid, model, res_id, context=context)
+        elif composition_mode == 'mass_mail' and model and active_ids:
+            vals = {'model': model, 'res_id': res_id, 'content_subtype': 'html'}
+        else:
+            vals = {'model': model, 'res_id': res_id}
+        if composition_mode:
+            vals['composition_mode'] = composition_mode
+
         for field in vals:
             if field in fields:
                 result[field] = vals[field]
-
-        # link to model and record if not done yet
-        if not result.get('model') and active_model:
-            result['model'] = active_model
-        if not result.get('res_id') and active_id:
-            result['res_id'] = active_id
-
-        # Try to provide default email_from if not specified yet
-        if not result.get('email_from'):
-            current_user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
-            result['email_from'] = current_user.email or False
         return result
 
+    def _get_composition_mode_selection(self, cr, uid, context=None):
+        return [('comment', 'Comment a document'), ('reply', 'Reply to a message'), ('mass_mail', 'Mass mailing')]
+
     _columns = {
-        'dest_partner_ids': fields.many2many('res.partner',
-            'email_message_send_partner_rel',
-            'wizard_id', 'partner_id', 'Destination partners',
-            help="When sending emails through the social network composition wizard"\
-                 "you may choose to send a copy of the mail to partners."),
-        'attachment_ids': fields.many2many('ir.attachment','email_message_send_attachment_rel', 'wizard_id', 'attachment_id', 'Attachments'),
-        'auto_delete': fields.boolean('Auto Delete', help="Permanently delete emails after sending"),
+        'composition_mode': fields.selection(
+            lambda s, *a, **k: s._get_composition_mode_selection(*a, **k),
+            string='Composition mode'),
+        'partner_ids': fields.many2many('res.partner',
+            'mail_compose_message_res_partner_rel',
+            'wizard_id', 'partner_id', 'Additional contacts'),
+        'attachment_ids': fields.many2many('ir.attachment',
+            'mail_compose_message_ir_attachments_rel',
+            'wizard_id', 'attachment_id', 'Attachments'),
         'filter_id': fields.many2one('ir.filters', 'Filters'),
+        'body_text': fields.text('Plain-text Contents'),
+        'content_subtype': fields.char('Message content subtype', size=32, readonly=1,
+            help="Type of message, usually 'html' or 'plain', used to select "\
+                  "plain-text or rich-text contents accordingly"),
     }
 
-    def get_value(self, cr, uid, model, res_id, context=None):
+    _defaults = {
+        'composition_mode': 'comment',
+        'content_subtype': lambda self, cr, uid, ctx={}: 'plain',
+        'body_text': lambda self, cr, uid, ctx={}: False,
+        'body': lambda self, cr, uid, ctx={}: '',
+        'subject': lambda self, cr, uid, ctx={}: False,
+    }
+
+    def notify(self, cr, uid, newid, context=None):
+        """ Override specific notify method of mail.message, because we do
+            not want that feature in the wizard. """
+        return
+
+    def get_record_data(self, cr, uid, model, res_id, context=None):
         """ Returns a defaults-like dict with initial values for the composition
             wizard when sending an email related to the document record
             identified by ``model`` and ``res_id``.
 
-            The default implementation returns an empty dictionary, and is meant
-            to be overridden by subclasses.
-
             :param str model: model name of the document record this mail is
                 related to.
-            :param int res_id: id of the document record this mail is related to.
-            :param dict context: several context values will modify the behavior
-                of the wizard, cfr. the class description.
+            :param int res_id: id of the document record this mail is related to
         """
-        result = {}
-        user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
-        result.update({
-            'model': model,
-            'res_id': res_id,
-            'email_from': user.email or tools.config.get('email_from', False),
-            'body_html': False,
-            'body_text': False,
-            'subject': False,
-            'dest_partner_ids': [],
-        })
-        return result
-
-    def onchange_email_mode(self, cr, uid, ids, value, model, res_id, context=None):
-        """ email_mode (values: True or False). This onchange on the email mode
-            allows to have some specific behavior when going in email mode, or
-            when going out of email mode.
-            Basically, dest_partner_ids is reset when going out of email
-            mode.
-            This method can be overridden for models that want to have their
-            specific behavior.
-            Note that currently, this onchange is used in mail.js and called
-            manually on the form instantiated in the Chatter.
-        """
-        if not value:
-            return {'value': {'dest_partner_ids': []}}
-        return {'value': {}}
-
-    def onchange_formatting(self, cr, uid, ids, value, model, res_id, context=None):
-        """ onchange_formatting (values: True or False). This onchange on the
-            formatting allows to have some specific behavior when going in 
-            formatting mode, or when going out of formatting.
-            Basically, subject is reset when going out of formatting mode.
-            This method can be overridden for models that want to have their
-            specific behavior.
-            Note that currently, this onchange is used in mail.js and called
-            manually on the form instantiated in the Chatter.
-        """
-        if not value:
-            return {'value': {'subject': False}}
-        return {'value': {}}
+        return {'model': model, 'res_id': res_id}
 
     def get_message_data(self, cr, uid, message_id, context=None):
         """ Returns a defaults-like dict with initial values for the composition
             wizard when replying to the given message (e.g. including the quote
-            of the initial message, and the correct recipient). It should not be
-            called unless ``context['mail.compose.message.mode'] == 'reply'``.
+            of the initial message, and the correct recipients).
 
             :param int message_id: id of the mail.message to which the user
                 is replying.
-            :param dict context: several context values will modify the behavior
-                of the wizard, cfr. the class description.
         """
+        if not message_id:
+            return {}
         if context is None:
             context = {}
-        result = {}
-        if not message_id:
-            return result
+        message_data = self.pool.get('mail.message').browse(cr, uid, message_id, context=context)
 
-        current_user = self.pool.get('res.users').browse(cr, uid, uid, context)
-        message_data = self.pool.get('mail.message').browse(cr, uid, message_id, context)
-        # Form the subject
-        re_prefix = _("Re:")
+        # create subject
+        re_prefix = _('Re:')
         reply_subject = tools.ustr(message_data.subject or '')
         if not (reply_subject.startswith('Re:') or reply_subject.startswith(re_prefix)):
             reply_subject = "%s %s" % (re_prefix, reply_subject)
-        # Form the bodies (text and html). We use the plain text version of the
-        # original mail, by default, as it is easier to quote than the HTML
-        # version. TODO: make it possible to switch to HTML on the fly
-        sent_date = _('On %(date)s, ') % {'date': message_data.date} if message_data.date else ''
-        sender = _('%(sender_name)s wrote:') % {'sender_name': tools.ustr(message_data.email_from or _('You'))}
-        body_text = message_data.body_text or ''
-        body_html = message_data.body_html or ''
-        quoted_body_text = '> %s' % tools.ustr(body_text.replace('\n', "\n> ") or '')
-        quoted_body_html = '<blockquote>%s</blockquote>' % (tools.ustr(body_html)),
-        reply_body_text = '\n%s%s\n%s\n%s' % (sent_date, sender, quoted_body_text, current_user.signature)
-        reply_body_html = '<br /><br />%s%s<br />%s<br />%s' % (sent_date, sender, quoted_body_html, current_user.signature)
-        # form dest_partner_ids
-        dest_partner_ids = [partner.id for partner in message_data.partner_ids]
-        # Update header and references
-        reply_headers = {}
-        reply_references = message_data.references and tools.ustr(message_data.references) or False
-        reply_message_id = message_data.message_id or False
-        if reply_message_id:
-            reply_references = (reply_references or '') + " " + message_data.message_id
-            reply_headers['In-Reply-To'] = message_data.message_id
+        # create the reply in the body
+        reply_body = _('<div>On %(date)s, %(sender_name)s wrote:<blockquote>%(body)s</blockquote></div>') % {
+            'date': message_data.date if message_data.date else '',
+            'sender_name': message_data.author_id.name,
+            'body': message_data.body,
+            }
+        # get partner_ids from original message
+        partner_ids = [partner.id for partner in message_data.partner_ids] if message_data.partner_ids else []
+
         # update the result
-        result.update({
-            'body_text': reply_body_text,
-            'body_html': reply_body_html,
+        result = {
+            'model': message_data.model,
+            'res_id': message_data.res_id,
+            'parent_id': message_data.id,
+            'body': reply_body,
             'subject': reply_subject,
-            'attachment_ids': [],
-            'dest_partner_ids': dest_partner_ids,
-            'model': message_data.model or False,
-            'res_id': message_data.res_id or False,
-            'email_from': current_user.email or message_data.email_to or False,
-            'email_to': message_data.reply_to or message_data.email_from or False,
-            'email_cc': message_data.email_cc or False,
-            'user_id': uid,
-            # pass msg-id and references of mail we're replying to, to construct the
-            # new ones later when sending
-            'message_id': reply_message_id,
-            'references': reply_references,
-            'headers': reply_headers,
-        })
+            'partner_ids': partner_ids,
+            'content_subtype': 'html',
+        }
         return result
 
-    def send_mail(self, cr, uid, ids, context=None):
-        '''Process the wizard contents and proceed with sending the corresponding
-           email(s), rendering any template patterns on the fly if needed.
-           If the wizard is in mass-mail mode (context['mail.compose.message.mode'] is
-           set to ``'mass_mail'``), the resulting email(s) are scheduled for being
-           sent the next time the mail.message scheduler runs, or the next time
-           ``mail.message.process_email_queue`` is called.
-           Otherwise the new message is sent immediately.
+    def toggle_content_subtype(self, cr, uid, ids, context=None):
+        """ hit toggle formatting mode button: calls onchange_formatting to
+            emulate an on_change, then writes the value to update the form. """
+        for record in self.browse(cr, uid, ids, context=context):
+            content_st_new_value = 'plain' if record.content_subtype == 'html' else 'html'
+            onchange_res = self.onchange_content_subtype(cr, uid, ids, content_st_new_value, record.model, record.res_id, context=context)
+            self.write(cr, uid, [record.id], onchange_res['value'], context=context)
+        return True
 
-           :param dict context: several context values will modify the behavior
-                                of the wizard, cfr. the class description.
-        '''
+    def onchange_content_subtype(self, cr, uid, ids, value, model, res_id, context=None):
+        """ onchange_content_subtype (values: 'plain' or 'html'). This onchange
+            on the subtype allows to have some specific behavior when switching
+            between text or html mode.
+            This method can be overridden for models that want to have their
+            specific behavior. """
+        return {'value': {'content_subtype': value}}
+
+    def _verify_partner_email(self, cr, uid, partner_ids, context=None):
+        """ Verify that selected partner_ids have an email_address defined.
+            Otherwise throw a warning. """
+        partner_wo_email_lst = []
+        for partner in self.pool.get('res.partner').browse(cr, uid, partner_ids, context=context):
+            if not partner.email:
+                partner_wo_email_lst.append(partner)
+        if not partner_wo_email_lst:
+            return {}
+        warning_msg = _('The following partners chosen as recipients for the email have no email address linked :')
+        for partner in partner_wo_email_lst:
+            warning_msg += '\n- %s' % (partner.name)
+        return {'warning': {
+                    'title': _('Partners email addresses not found'),
+                    'message': warning_msg,
+                    }
+                }
+
+    def onchange_partner_ids(self, cr, uid, ids, value, context=None):
+        """ onchange_partner_ids (value format: [[6, 0, [3, 4]]]). The
+            basic purpose of this method is to check that destination partners
+            effectively have email addresses. Otherwise a warning is thrown.
+        """
+        res = {'value': {}}
+        if not value or not value[0] or not value[0][0] == 6:
+            return
+        res.update(self._verify_partner_email(cr, uid, value[0][2], context=context))
+        return res
+
+    def unlink(self, cr, uid, ids, context=None):
+        # Cascade delete all attachments, as they are owned by the composition wizard
+        for wizard in self.read(cr, uid, ids, ['attachment_ids'], context=context):
+            self.pool.get('ir.attachment').unlink(cr, uid, wizard['attachment_ids'], context=context)
+        return super(mail_compose_message, self).unlink(cr, uid, ids, context=context)
+
+    def dummy(self, cr, uid, ids, context=None):
+        """ TDE: defined to have buttons that do basically nothing. It is
+            currently impossible to have buttons that do nothing special
+            in views (if type not specified, considered as 'object'). """
+        return True
+
+    #------------------------------------------------------
+    # Wizard validation and send
+    #------------------------------------------------------
+
+    def send_mail(self, cr, uid, ids, context=None):
+        """ Process the wizard content and proceed with sending the related
+            email(s), rendering any template patterns on the fly if needed. """
         if context is None:
             context = {}
-        # composition wizard options
-        email_mode = context.get('email_mode')
-        formatting = context.get('formatting')
-        mass_mail_mode = context.get('mail.compose.message.mode') == 'mass_mail'
+        active_ids = context.get('active_ids')
 
-        mail_message_obj = self.pool.get('mail.message')
-        for mail_wiz in self.browse(cr, uid, ids, context=context):
-            # attachments
-            attachment = {}
-            for attach in mail_wiz.attachment_ids:
-                attachment[attach.datas_fname] = attach.datas and attach.datas.decode('base64')
+        for wizard in self.browse(cr, uid, ids, context=context):
+            mass_mail_mode = wizard.composition_mode == 'mass_mail'
+            active_model_pool = self.pool.get(wizard.model if wizard.model else 'mail.thread')
 
-            # default values, according to the wizard options
-            subject = mail_wiz.subject if formatting else False
-            content_subtype = 'html' if formatting else 'plain'
-            type = 'email' if email_mode else 'comment'
-            state = 'outgoing' if email_mode else False
-            partner_ids = [partner.id for partner in mail_wiz.dest_partner_ids]
-            references = None
-            headers = {}
-            body = mail_wiz.body_html if content_subtype == 'html' else mail_wiz.body_text
-
-            # get model, active_ids, and check if model is openchatter-enabled
-            if mass_mail_mode and context.get('active_ids') and context.get('active_model'):
-                active_ids = context['active_ids']
-                active_model = context['active_model']
-            elif mass_mail_mode:
-                active_model = mail_wiz.model
-                active_model_pool = self.pool.get(active_model)
-                active_ids = active_model_pool.search(cr, uid, ast.literal_eval(mail_wiz.filter_id.domain), context=ast.literal_eval(mail_wiz.filter_id.context))
-            else:
-                active_model = mail_wiz.model
-                active_ids = [mail_wiz.res_id]
-            active_model_pool = self.pool.get(active_model)
-            mail_thread_enabled = hasattr(active_model_pool, 'message_append')
-
-            if context.get('mail.compose.message.mode') == 'mass_mail':
-                # Mass mailing: must render the template patterns
-                for active_id in active_ids:
-                    rendered_subject = self.render_template(cr, uid, subject, active_model, active_id)
-                    rendered_body_html = self.render_template(cr, uid, mail_wiz.body_html, active_model, active_id)
-                    rendered_body_text = self.render_template(cr, uid, mail_wiz.body_text, active_model, active_id)
-                    email_from = self.render_template(cr, uid, mail_wiz.email_from, active_model, active_id)
-                    email_to = self.render_template(cr, uid, mail_wiz.email_to, active_model, active_id)
-                    email_cc = self.render_template(cr, uid, mail_wiz.email_cc, active_model, active_id)
-                    email_bcc = self.render_template(cr, uid, mail_wiz.email_bcc, active_model, active_id)
-                    reply_to = self.render_template(cr, uid, mail_wiz.reply_to, active_model, active_id)
-
-                    # in mass-mailing mode we only schedule the mail for sending, it will be 
-                    # processed as soon as the mail scheduler runs.
-                    if mail_thread_enabled:
-                        active_model_pool.message_append(cr, uid, [active_id], rendered_subject, rendered_body_text, rendered_body_html,
-                            type=type, content_subtype=content_subtype, state=state, partner_ids=partner_ids,
-                            email_from=email_from, email_to=email_to, email_cc=email_cc, email_bcc=email_bcc,
-                            reply_to=reply_to, references=references, attachments=attachment, headers=headers, context=context)
-                    else:
-                        mail_message_obj.schedule_with_attach(cr, uid, email_from, to_email(email_to), subject, rendered_body_text,
-                            model=mail_wiz.model, email_cc=to_email(email_cc), email_bcc=to_email(email_bcc), reply_to=reply_to,
-                            attachments=attachment, references=references, res_id=active_id, partner_ids=partner_ids,
-                            content_subtype=mail_wiz.content_subtype, headers=headers, context=context)
-            else:
-                # normal mode - no mass-mailing
-                if mail_thread_enabled:
-                    msg_ids = active_model_pool.message_append(cr, uid, active_ids, subject, mail_wiz.body_text, mail_wiz.body_html,
-                        type=type, content_subtype=content_subtype, state=state, partner_ids=partner_ids,
-                        email_from=mail_wiz.email_from, email_to=mail_wiz.email_to, email_cc=mail_wiz.email_cc, email_bcc=mail_wiz.email_bcc,
-                        reply_to=mail_wiz.reply_to, references=references, attachments=attachment, headers=headers, context=context)
-                else:
-                    msg_ids = [mail_message_obj.schedule_with_attach(cr, uid, mail_wiz.email_from, to_email(mail_wiz.email_to), subject, mail_wiz.body_text,
-                        type=type, model=mail_wiz.model, email_cc=to_email(mail_wiz.email_cc), email_bcc=to_email(mail_wiz.email_bcc), reply_to=mail_wiz.reply_to,
-                        attachments=attachment, references=references, res_id=int(mail_wiz.res_id), partner_ids=partner_ids,
-                        content_subtype=mail_wiz.content_subtype, headers=headers, context=context)]
-                # in normal mode, we send the email immediately, as the user expects us to (delay should be sufficiently small)
-                if type == 'email':
-                    mail_message_obj.send(cr, uid, msg_ids, context=context)
+            # wizard works in batch mode: [res_id] or active_ids
+            res_ids = active_ids if mass_mail_mode and wizard.model and active_ids else [wizard.res_id]
+            for res_id in res_ids:
+                # default values, according to the wizard options
+                post_values = {
+                    'subject': wizard.subject if wizard.content_subtype == 'html' else False,
+                    'body': wizard.body if wizard.content_subtype == 'html' else '<pre>%s</pre>' % tools.ustr(wizard.body_text),
+                    'partner_ids': [(4, partner.id) for partner in wizard.partner_ids],
+                    'attachments': [(attach.datas_fname or attach.name, base64.b64decode(attach.datas)) for attach in wizard.attachment_ids],
+                }
+                # mass mailing: render and override default values
+                if mass_mail_mode and wizard.model:
+                    email_dict = self.render_message(cr, uid, wizard, res_id, context=context)
+                    new_partner_ids = email_dict.pop('partner_ids', [])
+                    post_values['partner_ids'] += [(4, partner_id) for partner_id in new_partner_ids]
+                    new_attachments = email_dict.pop('attachments', [])
+                    post_values['attachments'] += new_attachments
+                    post_values.update(email_dict)
+                # post the message
+                active_model_pool.message_post(cr, uid, [res_id], type='comment', context=context, **post_values)
 
         return {'type': 'ir.actions.act_window_close'}
 
+    def render_message(self, cr, uid, wizard, res_id, context=None):
+        """ Generate an email from the template for given (wizard.model, res_id)
+            pair. This method is meant to be inherited by email_template that
+            will produce a more complete dictionary. """
+        return {
+            'subject': self.render_template(cr, uid, wizard.subject, wizard.model, res_id, context),
+            'body': self.render_template(cr, uid, wizard.body, wizard.model, res_id, context),
+        }
+
     def render_template(self, cr, uid, template, model, res_id, context=None):
-        """Render the given template text, replace mako-like expressions ``${expr}``
-           with the result of evaluating these expressions with an evaluation context
-           containing:
+        """ Render the given template text, replace mako-like expressions ``${expr}``
+            with the result of evaluating these expressions with an evaluation context
+            containing:
 
                 * ``user``: browse_record of the current user
                 * ``object``: browse_record of the document record this mail is
                               related to
                 * ``context``: the context passed to the mail composition wizard
 
-           :param str template: the template text to render
-           :param str model: model name of the document record this mail is related to.
-           :param int res_id: id of the document record this mail is related to.
+            :param str template: the template text to render
+            :param str model: model name of the document record this mail is related to.
+            :param int res_id: id of the document record this mail is related to.
         """
         if context is None:
             context = {}
         def merge(match):
             exp = str(match.group()[2:-1]).strip()
-            result = eval(exp,
-                          {
-                            'user' : self.pool.get('res.users').browse(cr, uid, uid, context=context),
-                            'object' : self.pool.get(model).browse(cr, uid, res_id, context=context),
-                            'context': dict(context), # copy context to prevent side-effects of eval
-                          })
-            if result in (None, False):
-                return ""
-            return tools.ustr(result)
+            result = eval(exp, {
+                'user': self.pool.get('res.users').browse(cr, uid, uid, context=context),
+                'object': self.pool.get(model).browse(cr, uid, res_id, context=context),
+                'context': dict(context), # copy context to prevent side-effects of eval
+                })
+            return result and tools.ustr(result) or ''
         return template and EXPRESSION_PATTERN.sub(merge, template)
-
-
-class mail_compose_message_extended(osv.TransientModel):
-    """ Extension of 'mail.compose.message' to support default field values related
-        to CRM-like models that follow the following conventions:
-
-        1. The model object must have an attribute '_mail_compose_message' equal to True.
-
-        2. The model should define the following fields:
-            - 'name' as subject of the message (required);
-            - 'email_from' as destination email address (required);
-            - 'email_cc' as cc email addresses (required);
-            - 'section_id.reply_to' as reply-to address (optional).
-    """
-    _inherit = 'mail.compose.message'
-
-    def get_value(self, cr, uid, model, res_id, context=None):
-        """ Overrides the default implementation to provide more default field values
-            related to the corresponding CRM case.
-        """
-        result = super(mail_compose_message_extended, self).get_value(cr, uid, model, res_id, context=context)
-        model_obj = self.pool.get(model)
-        if getattr(model_obj, '_mail_compose_message', False) and res_id:
-            data = model_obj.browse(cr, uid , res_id, context)
-            result.update({
-                'email_to': data.email_from or False,
-                'email_cc': tools.ustr(data.email_cc or ''),
-                'subject': data.name or False,
-            })
-            if hasattr(data, 'section_id'):
-                result['reply_to'] = data.section_id and data.section_id.reply_to or False
-        return result
-
-    def onchange_email_mode(self, cr, uid, ids, value, model, res_id, context=None):
-        """ Overrides the default implementation to provide default values for
-            dest_partner_ids. This method checks that a partner maching the
-            ``email_from`` of the record exists. It it does not exist, it
-            creates a new partner. The found or created partner is then added
-            in dest_partner_ids.
-            Partner check/creation valid inly if the value is True, and if 
-            the model has the ``_mail_compose_message`` attribute.
-        """
-        result = super(mail_compose_message_extended, self).onchange_email_mode(cr, uid, ids, value, model, res_id, context=context)
-        model_obj = self.pool.get(model)
-        if not value or not (getattr(model_obj, '_mail_compose_message', False) and res_id):
-            return result
-        data = model_obj.browse(cr, uid , res_id, context=context)
-        partner_obj = self.pool.get('res.partner')
-        partner_ids = partner_obj.search(cr, uid, [('email', '=', data.email_from)], context=context)
-        if partner_ids:
-            partner_id = partner_ids[0]
-        else:
-            partner_id = partner_obj.name_create(cr, uid, data.email_from, context=context)[0]
-        result['value'].update({
-            'dest_partner_ids': [partner_id],
-            'email_cc': tools.ustr(data.email_cc or ''),
-        })
-        if hasattr(data, 'section_id'):
-            result['value']['reply_to'] = data.section_id and data.section_id.reply_to or False
-        return result
-
-    def onchange_formatting(self, cr, uid, ids, value, model, res_id, context=None):
-        """ Overrides the default implementation to provide default values for
-            the subject.
-            Subject re-creation valid only if the value is True, and if the
-            model has the ``_mail_compose_message`` attribute.
-        """
-        result = super(mail_compose_message_extended, self).onchange_formatting(cr, uid, ids, value, model, res_id, context=context)
-        model_obj = self.pool.get(model)
-        if not value or not (getattr(model_obj, '_mail_compose_message', False) and res_id):
-            return result
-        data = model_obj.browse(cr, uid , res_id, context=context)
-        result['value'].update({
-            'subject': data.name or False,
-        })
-        return result
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/mail/wizard/mail_compose_message_view.xml b/addons/mail/wizard/mail_compose_message_view.xml
index 73fb03cdc28..70b50c154ac 100644
--- a/addons/mail/wizard/mail_compose_message_view.xml
+++ b/addons/mail/wizard/mail_compose_message_view.xml
@@ -6,73 +6,87 @@
             <field name="model">mail.compose.message</field>
             <field name="arch" type="xml">
                 <form string="Compose Email" version="7.0">
+                    <field name="composition_mode" nolabel="1" invisible="1"/>
+                    <field name="model" nolabel="1" invisible="1"/>
+                    <field name="res_id" nolabel="1" invisible="1"/>
+                    <field name="parent_id" nolabel="1" invisible="1"/>
+                    <field name="content_subtype" nolabel="1" invisible="1"/>
                     <group>
-                        <field name="model" invisible="1"/>
-                        <field name="res_id" invisible="1"/>
-                        <field name='filter_id' invisible="context.get('active_model',False)"/>
-                        <field name="email_from" required="1"/>
-                        <field name="email_to" required="1"/>
-                        <field name="email_cc"/>
-                        <field name="email_bcc"/>
-                        <field name="reply_to"/>
-                        <field name="subject" widget="char" size="512"/>
-                        <field name="references"/>
-                        <field name="message_id"/>
+                        <field name="subject" placeholder="Subject..."/>
+                        <field name="partner_ids" widget="many2many_tags" placeholder="Add contacts to notify..."
+                                context="{'force_create':True}"
+                                on_change="onchange_partner_ids(partner_ids)"/>
                     </group>
-                    <notebook colspan="4">
+                    <notebook>
                         <page string="Body">
-                            <field name="body_text" colspan="4" nolabel="1" height="300" width="300"/>
+                            <field name="body_text" nolabel="1"
+                                attrs="{'invisible':[('content_subtype', '=', 'html')]}"/>
+                            <field name="body" nolabel="1"
+                                attrs="{'invisible':[('content_subtype', '=', 'plain')]}"/>
                         </page>
                         <page string="Attachments">
                             <field name="attachment_ids" colspan="4" nolabel="1"/>
                         </page>
                     </notebook>
                     <footer>
-                        <button name="send_mail" string="Send" type="object" class="oe_highlight"  />
+                        <button string="Send" name="send_mail" type="object" class="oe_highlight"  />
                         or
                         <button string="Cancel" class="oe_link" special="cancel" />
+                        <div class="oe_right">
+                            <button string="" name="toggle_content_subtype" type="object" icon="/mail/static/src/img/formatting.png" 
+                                help="Toggle advanced formatting mode"/>
+                        </div>
                     </footer>
                 </form>
             </field>
         </record>
 
         <record model="ir.ui.view" id="email_compose_message_wizard_form_chatter">
-            <field name="name">mail.compose.message.form</field>
+            <field name="name">mail.compose.message.form.chatter</field>
             <field name="model">mail.compose.message</field>
             <field name="priority">18</field>
             <field name="arch" type="xml">
                 <form string="Compose Email" version="7.0" >
                     <group>
+                        <!-- truly invisible fields for control and options -->
+                        <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"/>
+                        <field name="parent_id" colspan="2" nolabel="1" invisible="1"/>
+                        <field name="content_subtype" colspan="2" nolabel="1" invisible="1"/>
+                        <!-- visible wizard -->
                         <field name="subject" colspan="2" nolabel="1" placeholder="Subject..."
-                                class="oe_mail_compose_message_subject oe_mail_compose_message_invisible"/>
+                                class="oe_mail_compose_message_subject"
+                                attrs="{'invisible':[('content_subtype', '=', 'plain')]}"/>
                         <field name="body_text" colspan="2" nolabel="1" placeholder="What are you working on ?"
-                                class="oe_mail_compose_message_body_text"/>
-                        <field name="body_html" colspan="2" nolabel="1" placeholder="What are you working on HTML ?"
-                                class="oe_mail_compose_message_body_html oe_mail_compose_message_invisible"/>
-                        <field name="dest_partner_ids" colspan="2" nolabel="1" widget="many2many_tags"
-                                placeholder="Add contacts to notify..."
-                                class="oe_mail_compose_message_partner_ids oe_mail_compose_message_invisible"/>
+                                class="oe_mail_compose_message_body"
+                                attrs="{'invisible':[('content_subtype', '=', 'html')]}"/>
+                        <field name="body" colspan="2" nolabel="1" placeholder="What are you working on ?"
+                                class="oe_mail_compose_message_body_html"
+                                attrs="{'invisible':[('content_subtype', '=', 'plain')]}"/>
+                        <field name="partner_ids" colspan="2" nolabel="1" widget="many2many_tags" placeholder="Add contacts to notify..."
+                                context="{'force_create':True}"
+                                on_change="onchange_partner_ids(partner_ids)"
+                                class="oe_mail_compose_message_partner_ids"/>
+                        <field name="attachment_ids" colspan="2" nolabel="1" widget="many2many_tags"
+                                placeholder="Add attachments..." invisible="1"
+                                class="oe_mail_compose_message_attachment_ids"/>
+                        <!-- void div to display attachments, Chatter-controlled -->
+                        <div colspan="2" class="oe_mail_compose_message_attachments"/>
+                        <!-- buttons, with as few Chatter logic as possible -->
                         <div>
                             <button name="send_mail" string="Post" type="object"
                                 class="oe_mail_compose_message_button_send"/>
-                            or <a href="#" class="oe_mail_compose_message_email">Send an Email</a>
                         </div>
                         <div class='oe_mail_compose_message_icons'>
-<!--                             <button icon="../../../../../mail/static/src/img/checklist"
-                                type="object" name="checklist" string=""
-                                help="Add a checklist"/> -->
-                            <a href="#" class="oe_mail_compose_message_checklist">
-                                <img src='/mail/static/src/img/checklist.png/' alt='Checklist'
-                                    title='Add a checklist'/>
-                            </a>
-                            <a href="#" class="oe_mail_compose_message_attachment">
-                                <img src='/mail/static/src/img/attachment.png/' alt='Attachment'
-                                    title='Add an attachment'/>
-                            </a>
-                            <a href="#" class="oe_mail_compose_message_formatting">
-                                <img src='/mail/static/src/img/formatting.png/' alt='Formatting'
-                                    title='Switch to advanced formatting mode'/>
-                            </a>
+                            <button icon="/mail/static/src/img/attachment.png"
+                                class="oe_mail_compose_message_attachment" string=""
+                                name="dummy"
+                                help="Add an attachment"/>
+                            <button icon="/mail/static/src/img/formatting.png"
+                                class="oe_mail_compose_message_formatting" string=""
+                                type="object" name="toggle_content_subtype"
+                                help="Toggle advanced formatting mode"/>
                         </div>
                     </group>
                 </form>
@@ -97,6 +111,6 @@
                 target="new"
                 key2="client_action_multi"
                 id="base.action_partner_mass_mail"
-                context="{'mail.compose.message.mode':'mass_mail'}"/>
+                context="{'default_composition_mode': 'mass_mail'}"/>
     </data>
 </openerp>
diff --git a/addons/marketing/__openerp__.py b/addons/marketing/__openerp__.py
index 81751891e66..90f6e076cae 100644
--- a/addons/marketing/__openerp__.py
+++ b/addons/marketing/__openerp__.py
@@ -21,29 +21,28 @@
 
 
 {
-    "name" : "Marketing",
-    "version" : "1.1",
-    "depends" : ["base", "base_setup"],
-    "author" : "OpenERP SA",
-    "category": 'Hidden/Dependency',
-    "description": """
+    'name': 'Marketing',
+    'version': '1.1',
+    'depends': ['base', 'base_setup'],
+    'author': 'OpenERP SA',
+    'category': 'Hidden/Dependency',
+    'description': """
 Menu for Marketing.
 ===================
 
 Contains the installer for marketing-related modules.
     """,
     'website': 'http://www.openerp.com',
-    'init_xml': [],
-    'update_xml': [
+    'data': [
         'security/marketing_security.xml',
         'security/ir.model.access.csv',
         'marketing_view.xml',
         'res_config_view.xml',
     ],
-    'demo_xml': ['marketing_demo.xml'],
+    'demo': ['marketing_demo.xml'],
     'installable': True,
     'auto_install': False,
-    'certificate' : '00598574977629228189',
+    'certificate': '00598574977629228189',
     'images': ['images/config_marketing.jpeg'],
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/marketing/i18n/ar.po b/addons/marketing/i18n/ar.po
index 6f0c17676c7..fcaca987765 100644
--- a/addons/marketing/i18n/ar.po
+++ b/addons/marketing/i18n/ar.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:36+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: marketing
 #: model:res.groups,name:marketing.group_marketing_manager
diff --git a/addons/marketing/i18n/bg.po b/addons/marketing/i18n/bg.po
index 79454f40dba..9ea92523418 100644
--- a/addons/marketing/i18n/bg.po
+++ b/addons/marketing/i18n/bg.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:36+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: marketing
 #: model:res.groups,name:marketing.group_marketing_manager
diff --git a/addons/marketing/i18n/ca.po b/addons/marketing/i18n/ca.po
index 6bf75b0628e..1356e38bf7b 100644
--- a/addons/marketing/i18n/ca.po
+++ b/addons/marketing/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:36+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: marketing
 #: model:res.groups,name:marketing.group_marketing_manager
diff --git a/addons/marketing/i18n/cs.po b/addons/marketing/i18n/cs.po
index e74a70b8d4d..e370a95505d 100644
--- a/addons/marketing/i18n/cs.po
+++ b/addons/marketing/i18n/cs.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:36+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: marketing
 #: model:res.groups,name:marketing.group_marketing_manager
diff --git a/addons/marketing/i18n/da.po b/addons/marketing/i18n/da.po
index bd99eda5e90..0bf409584f4 100644
--- a/addons/marketing/i18n/da.po
+++ b/addons/marketing/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:36+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: marketing
 #: model:res.groups,name:marketing.group_marketing_manager
diff --git a/addons/marketing/i18n/de.po b/addons/marketing/i18n/de.po
index cc74e0fabb9..b9a01242148 100644
--- a/addons/marketing/i18n/de.po
+++ b/addons/marketing/i18n/de.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:36+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: marketing
 #: model:res.groups,name:marketing.group_marketing_manager
diff --git a/addons/marketing/i18n/el.po b/addons/marketing/i18n/el.po
index 5ff21d2031f..92c688411c3 100644
--- a/addons/marketing/i18n/el.po
+++ b/addons/marketing/i18n/el.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:36+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: marketing
 #: model:res.groups,name:marketing.group_marketing_manager
diff --git a/addons/marketing/i18n/es.po b/addons/marketing/i18n/es.po
index 0077d3488cd..7e37e342a36 100644
--- a/addons/marketing/i18n/es.po
+++ b/addons/marketing/i18n/es.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:36+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: marketing
 #: model:res.groups,name:marketing.group_marketing_manager
diff --git a/addons/marketing/i18n/es_CR.po b/addons/marketing/i18n/es_CR.po
index 1ec4c8e8af0..7db95b66fca 100644
--- a/addons/marketing/i18n/es_CR.po
+++ b/addons/marketing/i18n/es_CR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:36+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 "Language: es\n"
 
 #. module: marketing
diff --git a/addons/marketing/i18n/fi.po b/addons/marketing/i18n/fi.po
index 746462145a6..618e197fd9b 100644
--- a/addons/marketing/i18n/fi.po
+++ b/addons/marketing/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:36+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: marketing
 #: model:res.groups,name:marketing.group_marketing_manager
diff --git a/addons/marketing/i18n/fr.po b/addons/marketing/i18n/fr.po
index 7b055c7f0bc..93e09d9c9d5 100644
--- a/addons/marketing/i18n/fr.po
+++ b/addons/marketing/i18n/fr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:36+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: marketing
 #: model:res.groups,name:marketing.group_marketing_manager
diff --git a/addons/marketing/i18n/gl.po b/addons/marketing/i18n/gl.po
index c310756d0b8..31daee91388 100644
--- a/addons/marketing/i18n/gl.po
+++ b/addons/marketing/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:36+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: marketing
 #: model:res.groups,name:marketing.group_marketing_manager
diff --git a/addons/marketing/i18n/hr.po b/addons/marketing/i18n/hr.po
index d6ee4328e74..eb13657d336 100644
--- a/addons/marketing/i18n/hr.po
+++ b/addons/marketing/i18n/hr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:36+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: marketing
 #: model:res.groups,name:marketing.group_marketing_manager
diff --git a/addons/marketing/i18n/hu.po b/addons/marketing/i18n/hu.po
index ce4f5dcb5ce..3925f213dc8 100644
--- a/addons/marketing/i18n/hu.po
+++ b/addons/marketing/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:36+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: marketing
 #: model:res.groups,name:marketing.group_marketing_manager
diff --git a/addons/marketing/i18n/id.po b/addons/marketing/i18n/id.po
index 87fc4cee4e3..d0609b1a4de 100644
--- a/addons/marketing/i18n/id.po
+++ b/addons/marketing/i18n/id.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:36+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: marketing
 #: model:res.groups,name:marketing.group_marketing_manager
diff --git a/addons/marketing/i18n/it.po b/addons/marketing/i18n/it.po
index b1b7e74ab44..640b1db969a 100644
--- a/addons/marketing/i18n/it.po
+++ b/addons/marketing/i18n/it.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:36+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: marketing
 #: model:res.groups,name:marketing.group_marketing_manager
diff --git a/addons/marketing/i18n/ja.po b/addons/marketing/i18n/ja.po
index 761e4e54340..fcbeb5afdc5 100644
--- a/addons/marketing/i18n/ja.po
+++ b/addons/marketing/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:36+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: marketing
 #: model:res.groups,name:marketing.group_marketing_manager
diff --git a/addons/marketing/i18n/lv.po b/addons/marketing/i18n/lv.po
index 28aeeacd059..1e08b8f99e0 100644
--- a/addons/marketing/i18n/lv.po
+++ b/addons/marketing/i18n/lv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:36+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: marketing
 #: model:res.groups,name:marketing.group_marketing_manager
diff --git a/addons/marketing/i18n/mn.po b/addons/marketing/i18n/mn.po
index 548d64d4060..34cd23d545a 100644
--- a/addons/marketing/i18n/mn.po
+++ b/addons/marketing/i18n/mn.po
@@ -14,18 +14,18 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:36+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: marketing
 #: model:res.groups,name:marketing.group_marketing_manager
 msgid "Manager"
-msgstr ""
+msgstr "Менежер"
 
 #. module: marketing
 #: model:res.groups,name:marketing.group_marketing_user
 msgid "User"
-msgstr ""
+msgstr "Хэрэглэгч"
 
 #~ msgid "Image"
 #~ msgstr "Зураг"
diff --git a/addons/marketing/i18n/nb.po b/addons/marketing/i18n/nb.po
index 7d3bfe51c2f..791fea43df3 100644
--- a/addons/marketing/i18n/nb.po
+++ b/addons/marketing/i18n/nb.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:36+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: marketing
 #: model:res.groups,name:marketing.group_marketing_manager
diff --git a/addons/marketing/i18n/nl.po b/addons/marketing/i18n/nl.po
index 54d79b4ff5e..07ffd12067d 100644
--- a/addons/marketing/i18n/nl.po
+++ b/addons/marketing/i18n/nl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:36+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: marketing
 #: model:res.groups,name:marketing.group_marketing_manager
diff --git a/addons/marketing/i18n/pl.po b/addons/marketing/i18n/pl.po
index 5aaf86fcf06..be3f5e1af29 100644
--- a/addons/marketing/i18n/pl.po
+++ b/addons/marketing/i18n/pl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:36+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: marketing
 #: model:res.groups,name:marketing.group_marketing_manager
diff --git a/addons/marketing/i18n/pt.po b/addons/marketing/i18n/pt.po
index a8b499b5769..5f711d6dc19 100644
--- a/addons/marketing/i18n/pt.po
+++ b/addons/marketing/i18n/pt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:36+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: marketing
 #: model:res.groups,name:marketing.group_marketing_manager
diff --git a/addons/marketing/i18n/pt_BR.po b/addons/marketing/i18n/pt_BR.po
index c4f7e31a680..5b1fb9595b4 100644
--- a/addons/marketing/i18n/pt_BR.po
+++ b/addons/marketing/i18n/pt_BR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:36+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: marketing
 #: model:res.groups,name:marketing.group_marketing_manager
diff --git a/addons/marketing/i18n/ro.po b/addons/marketing/i18n/ro.po
index 00b5a24ce90..946919c9fe9 100644
--- a/addons/marketing/i18n/ro.po
+++ b/addons/marketing/i18n/ro.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:36+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: marketing
 #: model:res.groups,name:marketing.group_marketing_manager
diff --git a/addons/marketing/i18n/ru.po b/addons/marketing/i18n/ru.po
index 934d1404828..424f92e4d93 100644
--- a/addons/marketing/i18n/ru.po
+++ b/addons/marketing/i18n/ru.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:36+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: marketing
 #: model:res.groups,name:marketing.group_marketing_manager
diff --git a/addons/marketing/i18n/sk.po b/addons/marketing/i18n/sk.po
index 2c4224f9e88..bee76d7c48d 100644
--- a/addons/marketing/i18n/sk.po
+++ b/addons/marketing/i18n/sk.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:36+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: marketing
 #: model:res.groups,name:marketing.group_marketing_manager
diff --git a/addons/marketing/i18n/sl.po b/addons/marketing/i18n/sl.po
index c70707c8790..b2471b5f060 100644
--- a/addons/marketing/i18n/sl.po
+++ b/addons/marketing/i18n/sl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:36+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: marketing
 #: model:res.groups,name:marketing.group_marketing_manager
diff --git a/addons/marketing/i18n/sr.po b/addons/marketing/i18n/sr.po
index 5af5f1194ae..44bebcfea9e 100644
--- a/addons/marketing/i18n/sr.po
+++ b/addons/marketing/i18n/sr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:36+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: marketing
 #: model:res.groups,name:marketing.group_marketing_manager
diff --git a/addons/marketing/i18n/sr@latin.po b/addons/marketing/i18n/sr@latin.po
index 0497040739f..8ff7c4d1a9c 100644
--- a/addons/marketing/i18n/sr@latin.po
+++ b/addons/marketing/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:36+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: marketing
 #: model:res.groups,name:marketing.group_marketing_manager
diff --git a/addons/marketing/i18n/sv.po b/addons/marketing/i18n/sv.po
index 3216f36937e..4a457aa5e80 100644
--- a/addons/marketing/i18n/sv.po
+++ b/addons/marketing/i18n/sv.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:36+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: marketing
 #: model:res.groups,name:marketing.group_marketing_manager
diff --git a/addons/marketing/i18n/th.po b/addons/marketing/i18n/th.po
index d687242c933..20f64448306 100644
--- a/addons/marketing/i18n/th.po
+++ b/addons/marketing/i18n/th.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:36+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: marketing
 #: model:res.groups,name:marketing.group_marketing_manager
diff --git a/addons/marketing/i18n/tr.po b/addons/marketing/i18n/tr.po
index 1b6a8938c33..2b93daed593 100644
--- a/addons/marketing/i18n/tr.po
+++ b/addons/marketing/i18n/tr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:36+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: marketing
 #: model:res.groups,name:marketing.group_marketing_manager
diff --git a/addons/marketing/i18n/zh_CN.po b/addons/marketing/i18n/zh_CN.po
index 3ddc284ddb0..98c484dafc9 100644
--- a/addons/marketing/i18n/zh_CN.po
+++ b/addons/marketing/i18n/zh_CN.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:36+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: marketing
 #: model:res.groups,name:marketing.group_marketing_manager
diff --git a/addons/marketing/i18n/zh_TW.po b/addons/marketing/i18n/zh_TW.po
new file mode 100644
index 00000000000..f761cafa968
--- /dev/null
+++ b/addons/marketing/i18n/zh_TW.po
@@ -0,0 +1,28 @@
+# Chinese (Traditional) 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-02-08 00:36+0000\n"
+"PO-Revision-Date: 2012-08-19 10:41+0000\n"
+"Last-Translator: Eric Huang <eh@cenoq.com>\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: 2012-08-28 06:36+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
+
+#. module: marketing
+#: model:res.groups,name:marketing.group_marketing_manager
+msgid "Manager"
+msgstr "主管"
+
+#. module: marketing
+#: model:res.groups,name:marketing.group_marketing_user
+msgid "User"
+msgstr "使用者"
diff --git a/addons/marketing_campaign/__openerp__.py b/addons/marketing_campaign/__openerp__.py
index e0cf8b56439..61d5d2ada29 100644
--- a/addons/marketing_campaign/__openerp__.py
+++ b/addons/marketing_campaign/__openerp__.py
@@ -21,20 +21,21 @@
 
 
 {
-    "name" : "Marketing Campaigns",
-    "version" : "1.1",
-    "depends" : ["marketing",
-                 "document",
-                 "email_template",
-                 "decimal_precision"
-                ],
-    "author" : "OpenERP SA",
-    "category": 'Marketing',
-    "description": """
+    'name': 'Marketing Campaigns',
+    'version': '1.1',
+    'depends': ['marketing',
+                 'document',
+                 'email_template',
+                 'decimal_precision'
+    ],
+    'author': 'OpenERP SA',
+    'category': 'Marketing',
+    'description': """
 This module provides leads automation through marketing campaigns (campaigns can in fact be defined on any resource, not just CRM Leads).
 =========================================================================================================================================
 
 The campaigns are dynamic and multi-channels. The process is as follows:
+------------------------------------------------------------------------
     * Design marketing campaigns like workflows, including email templates to
       send, reports to print and send by email, custom actions
     * Define input segments that will select the items that should enter the
@@ -49,30 +50,25 @@ The campaigns are dynamic and multi-channels. The process is as follows:
 While the campaign runs you can of course continue to fine-tune the parameters,
 input segments, workflow.
 
-Note: If you need demo data, you can install the marketing_campaign_crm_demo
+**Note:** If you need demo data, you can install the marketing_campaign_crm_demo
       module, but this will also install the CRM application as it depends on
       CRM Leads.
     """,
     'website': 'http://www.openerp.com',
-    'init_xml': [],
-    'update_xml': [
+    'data': [
         '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"
+        'security/marketing_campaign_security.xml',
+        'security/ir.model.access.csv'
     ],
-    'demo_xml': [
-        'marketing_campaign_demo.xml',
-    ],
-    'test': [
-        'test/marketing_campaign.yml',
-     ],
+    'demo': ['marketing_campaign_demo.xml'],
+    'test': ['test/marketing_campaign.yml'],
     'installable': True,
     'auto_install': False,
-    'certificate' : '00421723279617928365',
+    'certificate': '00421723279617928365',
     'images': ['images/campaign.png', 'images/campaigns.jpeg','images/email_account.jpeg','images/email_templates.jpeg','images/segments.jpeg'],
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/marketing_campaign/i18n/ar.po b/addons/marketing_campaign/i18n/ar.po
index 6efa9bd005f..141a567ac52 100644
--- a/addons/marketing_campaign/i18n/ar.po
+++ b/addons/marketing_campaign/i18n/ar.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:34+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:38+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: marketing_campaign
 #: view:marketing.campaign:0
diff --git a/addons/marketing_campaign/i18n/bg.po b/addons/marketing_campaign/i18n/bg.po
index 4d7fb9191c3..1aab5881108 100644
--- a/addons/marketing_campaign/i18n/bg.po
+++ b/addons/marketing_campaign/i18n/bg.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:34+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:38+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: marketing_campaign
 #: view:marketing.campaign:0
diff --git a/addons/marketing_campaign/i18n/ca.po b/addons/marketing_campaign/i18n/ca.po
index 235727a15d0..1a39a738ef9 100644
--- a/addons/marketing_campaign/i18n/ca.po
+++ b/addons/marketing_campaign/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:34+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:38+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: marketing_campaign
 #: view:marketing.campaign:0
diff --git a/addons/marketing_campaign/i18n/da.po b/addons/marketing_campaign/i18n/da.po
index b1f8c1e6fc2..f08207fdbc9 100644
--- a/addons/marketing_campaign/i18n/da.po
+++ b/addons/marketing_campaign/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:34+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:38+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: marketing_campaign
 #: view:marketing.campaign:0
diff --git a/addons/marketing_campaign/i18n/de.po b/addons/marketing_campaign/i18n/de.po
index 1163e0f2746..97c1387cf89 100644
--- a/addons/marketing_campaign/i18n/de.po
+++ b/addons/marketing_campaign/i18n/de.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:34+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:38+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: marketing_campaign
 #: view:marketing.campaign:0
diff --git a/addons/marketing_campaign/i18n/el.po b/addons/marketing_campaign/i18n/el.po
index ddfd32685d0..19319314877 100644
--- a/addons/marketing_campaign/i18n/el.po
+++ b/addons/marketing_campaign/i18n/el.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:34+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:38+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: marketing_campaign
 #: view:marketing.campaign:0
diff --git a/addons/marketing_campaign/i18n/es.po b/addons/marketing_campaign/i18n/es.po
index 660b7c78421..238e82e75c5 100644
--- a/addons/marketing_campaign/i18n/es.po
+++ b/addons/marketing_campaign/i18n/es.po
@@ -9,13 +9,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:36+0000\n"
 "PO-Revision-Date: 2012-02-10 18:37+0000\n"
-"Last-Translator: Carlos @ smile-iberia <Unknown>\n"
+"Last-Translator: Carlos Ch. <Unknown>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:34+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:38+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: marketing_campaign
 #: view:marketing.campaign:0
diff --git a/addons/marketing_campaign/i18n/es_CR.po b/addons/marketing_campaign/i18n/es_CR.po
index 8a16a0987ea..b045437c4a0 100644
--- a/addons/marketing_campaign/i18n/es_CR.po
+++ b/addons/marketing_campaign/i18n/es_CR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:34+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:38+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 "Language: es\n"
 
 #. module: marketing_campaign
diff --git a/addons/marketing_campaign/i18n/fi.po b/addons/marketing_campaign/i18n/fi.po
index 5ecec5c4b41..ad2f1816b92 100644
--- a/addons/marketing_campaign/i18n/fi.po
+++ b/addons/marketing_campaign/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:34+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:38+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: marketing_campaign
 #: view:marketing.campaign:0
diff --git a/addons/marketing_campaign/i18n/fr.po b/addons/marketing_campaign/i18n/fr.po
index 84da37fe7b1..a016e27cb9b 100644
--- a/addons/marketing_campaign/i18n/fr.po
+++ b/addons/marketing_campaign/i18n/fr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:34+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:38+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: marketing_campaign
 #: view:marketing.campaign:0
diff --git a/addons/marketing_campaign/i18n/hi.po b/addons/marketing_campaign/i18n/hi.po
index e490c6bfef4..49293901188 100644
--- a/addons/marketing_campaign/i18n/hi.po
+++ b/addons/marketing_campaign/i18n/hi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:34+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:38+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: marketing_campaign
 #: view:marketing.campaign:0
diff --git a/addons/marketing_campaign/i18n/hr.po b/addons/marketing_campaign/i18n/hr.po
index 2ca106056ba..a45f7cacdbe 100644
--- a/addons/marketing_campaign/i18n/hr.po
+++ b/addons/marketing_campaign/i18n/hr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:34+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:38+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: marketing_campaign
 #: view:marketing.campaign:0
diff --git a/addons/marketing_campaign/i18n/hu.po b/addons/marketing_campaign/i18n/hu.po
index dd8eb2da3c4..d1f4c6d25e0 100644
--- a/addons/marketing_campaign/i18n/hu.po
+++ b/addons/marketing_campaign/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:34+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:38+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: marketing_campaign
 #: view:marketing.campaign:0
diff --git a/addons/marketing_campaign/i18n/it.po b/addons/marketing_campaign/i18n/it.po
index 8c05c18a958..edaac45095a 100644
--- a/addons/marketing_campaign/i18n/it.po
+++ b/addons/marketing_campaign/i18n/it.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:34+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:38+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: marketing_campaign
 #: view:marketing.campaign:0
diff --git a/addons/marketing_campaign/i18n/ja.po b/addons/marketing_campaign/i18n/ja.po
index d28c9e1722f..dd76162b46e 100644
--- a/addons/marketing_campaign/i18n/ja.po
+++ b/addons/marketing_campaign/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:34+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:38+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: marketing_campaign
 #: view:marketing.campaign:0
diff --git a/addons/marketing_campaign/i18n/lv.po b/addons/marketing_campaign/i18n/lv.po
index 3bbe5edb8ac..9681740a7b0 100644
--- a/addons/marketing_campaign/i18n/lv.po
+++ b/addons/marketing_campaign/i18n/lv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:34+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:38+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: marketing_campaign
 #: view:marketing.campaign:0
diff --git a/addons/marketing_campaign/i18n/mn.po b/addons/marketing_campaign/i18n/mn.po
index 3d22e7b3cc7..45bb0cdb408 100644
--- a/addons/marketing_campaign/i18n/mn.po
+++ b/addons/marketing_campaign/i18n/mn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:34+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:38+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: marketing_campaign
 #: view:marketing.campaign:0
diff --git a/addons/marketing_campaign/i18n/nl.po b/addons/marketing_campaign/i18n/nl.po
index 5c2d645b0f9..b471dc51cf1 100644
--- a/addons/marketing_campaign/i18n/nl.po
+++ b/addons/marketing_campaign/i18n/nl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:34+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:38+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: marketing_campaign
 #: view:marketing.campaign:0
diff --git a/addons/marketing_campaign/i18n/pl.po b/addons/marketing_campaign/i18n/pl.po
index 74f734daa38..1f6f96df1f7 100644
--- a/addons/marketing_campaign/i18n/pl.po
+++ b/addons/marketing_campaign/i18n/pl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:34+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:38+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: marketing_campaign
 #: view:marketing.campaign:0
diff --git a/addons/marketing_campaign/i18n/pt.po b/addons/marketing_campaign/i18n/pt.po
index f4f0a401f08..2ee91f953d5 100644
--- a/addons/marketing_campaign/i18n/pt.po
+++ b/addons/marketing_campaign/i18n/pt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:34+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:38+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: marketing_campaign
 #: view:marketing.campaign:0
diff --git a/addons/marketing_campaign/i18n/pt_BR.po b/addons/marketing_campaign/i18n/pt_BR.po
index 1de9a57a8a6..46a3987be2c 100644
--- a/addons/marketing_campaign/i18n/pt_BR.po
+++ b/addons/marketing_campaign/i18n/pt_BR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:34+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:38+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: marketing_campaign
 #: view:marketing.campaign:0
diff --git a/addons/marketing_campaign/i18n/ro.po b/addons/marketing_campaign/i18n/ro.po
index 7ae3cba4286..fe982e6520c 100644
--- a/addons/marketing_campaign/i18n/ro.po
+++ b/addons/marketing_campaign/i18n/ro.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:34+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:38+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: marketing_campaign
 #: view:marketing.campaign:0
diff --git a/addons/marketing_campaign/i18n/ru.po b/addons/marketing_campaign/i18n/ru.po
index 0eb16667773..e2676d3573c 100644
--- a/addons/marketing_campaign/i18n/ru.po
+++ b/addons/marketing_campaign/i18n/ru.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:34+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:38+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: marketing_campaign
 #: view:marketing.campaign:0
diff --git a/addons/marketing_campaign/i18n/sr@latin.po b/addons/marketing_campaign/i18n/sr@latin.po
index 08a6adfbd0d..5008e9d9e76 100644
--- a/addons/marketing_campaign/i18n/sr@latin.po
+++ b/addons/marketing_campaign/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:34+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:38+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: marketing_campaign
 #: view:marketing.campaign:0
diff --git a/addons/marketing_campaign/i18n/sv.po b/addons/marketing_campaign/i18n/sv.po
index e68e0ca2e48..c495186be0f 100644
--- a/addons/marketing_campaign/i18n/sv.po
+++ b/addons/marketing_campaign/i18n/sv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:34+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:38+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: marketing_campaign
 #: view:marketing.campaign:0
diff --git a/addons/marketing_campaign/i18n/tr.po b/addons/marketing_campaign/i18n/tr.po
index 58a76b111eb..54a3160fb71 100644
--- a/addons/marketing_campaign/i18n/tr.po
+++ b/addons/marketing_campaign/i18n/tr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:34+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:38+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: marketing_campaign
 #: view:marketing.campaign:0
diff --git a/addons/marketing_campaign/i18n/zh_CN.po b/addons/marketing_campaign/i18n/zh_CN.po
index bfaf302c956..c69e288bec5 100644
--- a/addons/marketing_campaign/i18n/zh_CN.po
+++ b/addons/marketing_campaign/i18n/zh_CN.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:34+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:38+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: marketing_campaign
 #: view:marketing.campaign:0
diff --git a/addons/marketing_campaign/marketing_campaign_demo.xml b/addons/marketing_campaign/marketing_campaign_demo.xml
index 54897cd111a..92443fe987d 100644
--- a/addons/marketing_campaign/marketing_campaign_demo.xml
+++ b/addons/marketing_campaign/marketing_campaign_demo.xml
@@ -3,29 +3,29 @@
     <data>
         <!-- Email tempalte -->
         <record id="email_template_1" model="email.template">
-            <field name="name">Template for New Partner</field>
+            <field name="name">welcome new partner</field>
             <field name="email_from">info@openerp.com</field>
-            <field name="subject">Welcome in OpenERP Partner Channel!</field>
+            <field name="subject">Welcome to the OpenERP Partner Channel!</field>
             <field name="email_to">${object.email or ''}</field>
             <field name="model_id" ref="base.model_res_partner"/>
-            <field name="body_text">Hello, We are very happy to send Welcome message.</field>
+            <field name="body_html">Hello, you will receive your welcome pack via email shortly.</field>
         </record>
         <record id="email_template_2" model="email.template">
-            <field name="name">Template for Silver Partner</field>
+            <field name="name">congrats silver partner</field>
             <field name="email_from">info@openerp.com</field>
-            <field name="subject">Congratulation! You become now our Silver Partner.</field>
+            <field name="subject">Congratulations! You are now a Silver Partner!</field>
             <field name="email_to">${object.email or ''}</field>
             <field name="model_id" ref="base.model_res_partner"/>
-            <field name="body_text">Hello, We are happy to announce that you now become our Silver Partner.</field>
+            <field name="body_html">Hi, we are delighted to welcome you among our Silver Partners as of today!</field>
         </record>
 
         <record id="email_template_3" model="email.template">
-            <field name="name">Template for Gold Partner</field>
+            <field name="name">congrats gold partner</field>
             <field name="email_from">info@openerp.com</field>
-            <field name="subject">Congratulation! You become our Gold Partner.</field>
+            <field name="subject">Congratulations! You are now one of our Gold Partners!</field>
             <field name="email_to">${object.email or ''}</field>
             <field name="model_id" ref="base.model_res_partner"/>
-            <field name="body_text">Hello, We are happy to announce that you become our Gold Partner.</field>
+            <field name="body_html">Hi, we are delighted to let you know that you have entered the select circle of our Gold Partners</field>
         </record>
 
 
@@ -64,7 +64,7 @@
         </record>
 
 
-    <!-- Tranisition -->
+    <!-- Transition -->
         <record id="marketing_campaign_transition_0" model="marketing.campaign.transition">
             <field model="marketing.campaign.activity" name="activity_from_id" ref = "marketing_campaign_activity_0"/>
             <field model="marketing.campaign.activity" name="activity_to_id" ref = "marketing_campaign_activity_1"/>
diff --git a/addons/marketing_campaign/test/marketing_campaign.yml b/addons/marketing_campaign/test/marketing_campaign.yml
index 04063a6fbc1..3d540b4ccb7 100644
--- a/addons/marketing_campaign/test/marketing_campaign.yml
+++ b/addons/marketing_campaign/test/marketing_campaign.yml
@@ -42,7 +42,7 @@
     record = self.browse(cr, uid, ids[0])
     assert record.state == 'todo' or record.state == 'done' , 'Marketing Workitem shoud be in draft state.'
 -
-  I check follow-up detail of first activity.
+  I process follow-up of first activity.
 -
   !python {model: marketing.campaign.workitem}: |
     ids = self.search(cr, uid, [('segment_id', '=', ref('marketing_campaign_segment0')),
@@ -50,12 +50,6 @@
     assert ids, 'Follow-up item is not created for first activity.'
     work_item_id = self.browse(cr ,uid ,ids[0] ,context)
     assert work_item_id.res_name, 'Resource Name is not defined.'
--
-  I process follow-up of first activity.
--
-  !python {model: marketing.campaign.workitem}: |
-    ids = self.search(cr, uid, [('segment_id', '=', ref('marketing_campaign_segment0')),
-    ('campaign_id', '=', ref('marketing_campaign_openerppartnerchannel')), ('activity_id', '=', ref('marketing_campaign_activity_0'))])
     self.process(cr, uid, ids)
     record = self.browse(cr, uid, ids)[0]
     assert record.state == "done", "Follow-up item should be closed after process."
diff --git a/addons/marketing_campaign_crm_demo/__openerp__.py b/addons/marketing_campaign_crm_demo/__openerp__.py
index 5a3c7bde1f7..aae0d72e9d0 100644
--- a/addons/marketing_campaign_crm_demo/__openerp__.py
+++ b/addons/marketing_campaign_crm_demo/__openerp__.py
@@ -21,28 +21,25 @@
 
 
 {
-    "name" : "Marketing Campaign - Demo",
-    "version" : "1.0",
-    "depends" : ["marketing_campaign",
-                 "crm",
-                ],
-    "author" : "OpenERP SA",
-    "category": 'Marketing',
-    "description": """
+    'name': 'Marketing Campaign - Demo',
+    'version': '1.0',
+    'depends': ['marketing_campaign',
+                 'crm',
+    ],
+    'author': 'OpenERP SA',
+    'category': 'Marketing',
+    'description': """
 Demo data for the module marketing_campaign.
 ============================================
 
 Creates demo data like leads, campaigns and segments for the module marketing_campaign.
     """,
     'website': 'http://www.openerp.com',
-    'init_xml': [],
-    'update_xml': [],
-    'demo_xml': [
-        'marketing_campaign_demo.xml',
-    ],
+    'data': [],
+    'demo': ['marketing_campaign_demo.xml'],
     'installable': True,
     'auto_install': False,
-    'certificate' : '001005497972871352957',
+    'certificate': '001005497972871352957',
     'images': ['images/campaigns.jpeg','images/email_templates.jpeg'],
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/marketing_campaign_crm_demo/i18n/ar.po b/addons/marketing_campaign_crm_demo/i18n/ar.po
index 267eb1589af..3c2084532df 100644
--- a/addons/marketing_campaign_crm_demo/i18n/ar.po
+++ b/addons/marketing_campaign_crm_demo/i18n/ar.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:32+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:37+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: marketing_campaign_crm_demo
 #: model:ir.actions.report.xml,name:marketing_campaign_crm_demo.mc_crm_lead_demo_report
diff --git a/addons/marketing_campaign_crm_demo/i18n/bg.po b/addons/marketing_campaign_crm_demo/i18n/bg.po
index 0c1bc6f6631..16aa4af5320 100644
--- a/addons/marketing_campaign_crm_demo/i18n/bg.po
+++ b/addons/marketing_campaign_crm_demo/i18n/bg.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:32+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:37+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: marketing_campaign_crm_demo
 #: model:ir.actions.report.xml,name:marketing_campaign_crm_demo.mc_crm_lead_demo_report
diff --git a/addons/marketing_campaign_crm_demo/i18n/ca.po b/addons/marketing_campaign_crm_demo/i18n/ca.po
index 150efd9a1ee..7868d228e0f 100644
--- a/addons/marketing_campaign_crm_demo/i18n/ca.po
+++ b/addons/marketing_campaign_crm_demo/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:32+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:37+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: marketing_campaign_crm_demo
 #: model:ir.actions.report.xml,name:marketing_campaign_crm_demo.mc_crm_lead_demo_report
diff --git a/addons/marketing_campaign_crm_demo/i18n/da.po b/addons/marketing_campaign_crm_demo/i18n/da.po
index 87814ad174e..b6eeea4ea31 100644
--- a/addons/marketing_campaign_crm_demo/i18n/da.po
+++ b/addons/marketing_campaign_crm_demo/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:32+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:37+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: marketing_campaign_crm_demo
 #: model:ir.actions.report.xml,name:marketing_campaign_crm_demo.mc_crm_lead_demo_report
diff --git a/addons/marketing_campaign_crm_demo/i18n/de.po b/addons/marketing_campaign_crm_demo/i18n/de.po
index 6f1307d95b9..038e75f9388 100644
--- a/addons/marketing_campaign_crm_demo/i18n/de.po
+++ b/addons/marketing_campaign_crm_demo/i18n/de.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:32+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:37+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: marketing_campaign_crm_demo
 #: model:ir.actions.report.xml,name:marketing_campaign_crm_demo.mc_crm_lead_demo_report
diff --git a/addons/marketing_campaign_crm_demo/i18n/es.po b/addons/marketing_campaign_crm_demo/i18n/es.po
index 11a6ea7acb6..d356330c8eb 100644
--- a/addons/marketing_campaign_crm_demo/i18n/es.po
+++ b/addons/marketing_campaign_crm_demo/i18n/es.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:32+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:37+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: marketing_campaign_crm_demo
 #: model:ir.actions.report.xml,name:marketing_campaign_crm_demo.mc_crm_lead_demo_report
diff --git a/addons/marketing_campaign_crm_demo/i18n/es_CR.po b/addons/marketing_campaign_crm_demo/i18n/es_CR.po
index a513aec0098..cacda2b6042 100644
--- a/addons/marketing_campaign_crm_demo/i18n/es_CR.po
+++ b/addons/marketing_campaign_crm_demo/i18n/es_CR.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:32+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:37+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 "Language: es\n"
 
 #. module: marketing_campaign_crm_demo
diff --git a/addons/marketing_campaign_crm_demo/i18n/fr.po b/addons/marketing_campaign_crm_demo/i18n/fr.po
index 5cec8cdc3cb..d35230c73ee 100644
--- a/addons/marketing_campaign_crm_demo/i18n/fr.po
+++ b/addons/marketing_campaign_crm_demo/i18n/fr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:32+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:37+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: marketing_campaign_crm_demo
 #: model:ir.actions.report.xml,name:marketing_campaign_crm_demo.mc_crm_lead_demo_report
diff --git a/addons/marketing_campaign_crm_demo/i18n/gl.po b/addons/marketing_campaign_crm_demo/i18n/gl.po
index 900c72199c8..9f57cc699d9 100644
--- a/addons/marketing_campaign_crm_demo/i18n/gl.po
+++ b/addons/marketing_campaign_crm_demo/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:32+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:37+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: marketing_campaign_crm_demo
 #: model:ir.actions.report.xml,name:marketing_campaign_crm_demo.mc_crm_lead_demo_report
diff --git a/addons/marketing_campaign_crm_demo/i18n/hr.po b/addons/marketing_campaign_crm_demo/i18n/hr.po
index 6f03a88c348..e5c0df64830 100644
--- a/addons/marketing_campaign_crm_demo/i18n/hr.po
+++ b/addons/marketing_campaign_crm_demo/i18n/hr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:32+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:37+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: marketing_campaign_crm_demo
 #: model:ir.actions.report.xml,name:marketing_campaign_crm_demo.mc_crm_lead_demo_report
diff --git a/addons/marketing_campaign_crm_demo/i18n/hu.po b/addons/marketing_campaign_crm_demo/i18n/hu.po
index b02d2ba6cd5..a6120b85dc3 100644
--- a/addons/marketing_campaign_crm_demo/i18n/hu.po
+++ b/addons/marketing_campaign_crm_demo/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:32+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:37+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: marketing_campaign_crm_demo
 #: model:ir.actions.report.xml,name:marketing_campaign_crm_demo.mc_crm_lead_demo_report
diff --git a/addons/marketing_campaign_crm_demo/i18n/it.po b/addons/marketing_campaign_crm_demo/i18n/it.po
index fc820e784ac..66791fea6c2 100644
--- a/addons/marketing_campaign_crm_demo/i18n/it.po
+++ b/addons/marketing_campaign_crm_demo/i18n/it.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:32+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:37+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: marketing_campaign_crm_demo
 #: model:ir.actions.report.xml,name:marketing_campaign_crm_demo.mc_crm_lead_demo_report
diff --git a/addons/marketing_campaign_crm_demo/i18n/ja.po b/addons/marketing_campaign_crm_demo/i18n/ja.po
index 10e109a4956..989bc854e6a 100644
--- a/addons/marketing_campaign_crm_demo/i18n/ja.po
+++ b/addons/marketing_campaign_crm_demo/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:32+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:37+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: marketing_campaign_crm_demo
 #: model:ir.actions.report.xml,name:marketing_campaign_crm_demo.mc_crm_lead_demo_report
diff --git a/addons/marketing_campaign_crm_demo/i18n/nl.po b/addons/marketing_campaign_crm_demo/i18n/nl.po
index 919668b2323..741639b1af5 100644
--- a/addons/marketing_campaign_crm_demo/i18n/nl.po
+++ b/addons/marketing_campaign_crm_demo/i18n/nl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:32+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:37+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: marketing_campaign_crm_demo
 #: model:ir.actions.report.xml,name:marketing_campaign_crm_demo.mc_crm_lead_demo_report
diff --git a/addons/marketing_campaign_crm_demo/i18n/pt.po b/addons/marketing_campaign_crm_demo/i18n/pt.po
index 707d41e96b4..2d01e02ba6d 100644
--- a/addons/marketing_campaign_crm_demo/i18n/pt.po
+++ b/addons/marketing_campaign_crm_demo/i18n/pt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:32+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:37+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: marketing_campaign_crm_demo
 #: model:ir.actions.report.xml,name:marketing_campaign_crm_demo.mc_crm_lead_demo_report
diff --git a/addons/marketing_campaign_crm_demo/i18n/pt_BR.po b/addons/marketing_campaign_crm_demo/i18n/pt_BR.po
index 8c02325a86b..87b48c14565 100644
--- a/addons/marketing_campaign_crm_demo/i18n/pt_BR.po
+++ b/addons/marketing_campaign_crm_demo/i18n/pt_BR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:32+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:37+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: marketing_campaign_crm_demo
 #: model:ir.actions.report.xml,name:marketing_campaign_crm_demo.mc_crm_lead_demo_report
diff --git a/addons/marketing_campaign_crm_demo/i18n/ro.po b/addons/marketing_campaign_crm_demo/i18n/ro.po
index 1030bc8d3cc..f426ae20bf8 100644
--- a/addons/marketing_campaign_crm_demo/i18n/ro.po
+++ b/addons/marketing_campaign_crm_demo/i18n/ro.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:32+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:37+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: marketing_campaign_crm_demo
 #: model:ir.actions.report.xml,name:marketing_campaign_crm_demo.mc_crm_lead_demo_report
diff --git a/addons/marketing_campaign_crm_demo/i18n/ru.po b/addons/marketing_campaign_crm_demo/i18n/ru.po
index b306eff4170..9c7f1b27655 100644
--- a/addons/marketing_campaign_crm_demo/i18n/ru.po
+++ b/addons/marketing_campaign_crm_demo/i18n/ru.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:32+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:37+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: marketing_campaign_crm_demo
 #: model:ir.actions.report.xml,name:marketing_campaign_crm_demo.mc_crm_lead_demo_report
diff --git a/addons/marketing_campaign_crm_demo/i18n/sr.po b/addons/marketing_campaign_crm_demo/i18n/sr.po
index 0c89dcfc252..9ec3f9608a1 100644
--- a/addons/marketing_campaign_crm_demo/i18n/sr.po
+++ b/addons/marketing_campaign_crm_demo/i18n/sr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:32+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:37+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: marketing_campaign_crm_demo
 #: model:ir.actions.report.xml,name:marketing_campaign_crm_demo.mc_crm_lead_demo_report
diff --git a/addons/marketing_campaign_crm_demo/i18n/sr@latin.po b/addons/marketing_campaign_crm_demo/i18n/sr@latin.po
index 0560a07b40e..a5a25f2ac01 100644
--- a/addons/marketing_campaign_crm_demo/i18n/sr@latin.po
+++ b/addons/marketing_campaign_crm_demo/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:32+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:37+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: marketing_campaign_crm_demo
 #: model:ir.actions.report.xml,name:marketing_campaign_crm_demo.mc_crm_lead_demo_report
diff --git a/addons/marketing_campaign_crm_demo/i18n/tr.po b/addons/marketing_campaign_crm_demo/i18n/tr.po
index b8ebaab5418..904dea59b11 100644
--- a/addons/marketing_campaign_crm_demo/i18n/tr.po
+++ b/addons/marketing_campaign_crm_demo/i18n/tr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:32+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:37+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: marketing_campaign_crm_demo
 #: model:ir.actions.report.xml,name:marketing_campaign_crm_demo.mc_crm_lead_demo_report
diff --git a/addons/marketing_campaign_crm_demo/i18n/zh_CN.po b/addons/marketing_campaign_crm_demo/i18n/zh_CN.po
index c86282455b1..c6b86477b15 100644
--- a/addons/marketing_campaign_crm_demo/i18n/zh_CN.po
+++ b/addons/marketing_campaign_crm_demo/i18n/zh_CN.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:32+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:37+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: marketing_campaign_crm_demo
 #: model:ir.actions.report.xml,name:marketing_campaign_crm_demo.mc_crm_lead_demo_report
diff --git a/addons/marketing_campaign_crm_demo/marketing_campaign_demo.xml b/addons/marketing_campaign_crm_demo/marketing_campaign_demo.xml
index 0946ff6e129..141981a21d6 100644
--- a/addons/marketing_campaign_crm_demo/marketing_campaign_demo.xml
+++ b/addons/marketing_campaign_crm_demo/marketing_campaign_demo.xml
@@ -40,7 +40,10 @@
             <field model="ir.values" name="ref_ir_value" search="[('name', '=', u'Send Mail (For OpenERP OnDemand Free Trial 2010)')]"/>
             <field name="model_id" ref="crm.model_crm_lead"/>
             <field eval="0" name="user_signature"/>
-            <field name="body_text">Hello,Thanks for generous interest you have shown in the openERP.Regards,OpenERP Team,</field>
+            <field name="body_html"><![CDATA[<p>Hello,</p>
+            <p>Thanks for the genuine interest you have shown in OpenERP.</p>
+            <p>If any further information is required, do not hesitate to reply to this message.</p>
+            <p>Regards,OpenERP Team,</p>]]></field>
             <field name="name">For OpenERP OnDemand Free Trial 2010</field>
         </record>
         <record id="email_template_2" model="email.template">
@@ -50,11 +53,11 @@
             <field model="ir.values" name="ref_ir_value" search="[('name', '=', u'Send Mail (For OpenERP OnDemand Free Trial 2010)')]"/>
             <field name="model_id" ref="crm.model_crm_lead"/>
             <field eval="0" name="user_signature"/>
-            <field name="body_text">Hello,We have very good offer that might suit you.
-            We propose you to subscribe to the OpenERP Discovery Day on May 2010.
-            If any further information required kindly revert back.
-            We really appreciate your co-operation on this.
-            Regards,OpenERP Team,</field>
+            <field name="body_html"><![CDATA[<p>Hello,</p>
+            <p>We have very good offer that might suit you.
+            We suggest you subscribe to the OpenERP Discovery Day on May 2010.</p>
+            <p>If any further information is required, do not hesitate to reply to this message.</p>
+            <p>Regards,OpenERP Team,</p>]]></field>
             <field name="name">For OpenERP Discovery Day on May 2010</field>
         </record>
 
@@ -65,10 +68,10 @@
             <field model="ir.values" name="ref_ir_value" search="[('name', '=', u'Send Mail (For OpenERP OnDemand Free Trial 2010)')]"/>
             <field name="model_id" ref="crm.model_crm_lead"/>
             <field eval="0" name="user_signature"/>
-            <field name="body_text">Hello,Thanks for showing intrest and for subscribing to the OpenERP Discovery Day.
-             If any further information required kindly revert back.
-             I really appreciate your co-operation on this.
-             Regards,OpenERP Team,</field>
+            <field name="body_html"><![CDATA[<p>Hello,</p>
+            <p>Thanks for showing interest and for subscribing to the OpenERP Discovery Day.</p>
+            <p>If any further information is required, do not hesitate to reply to this message.</p>
+            <p>Regards,OpenERP Team,</p>]]></field>
             <field name="name">For OpenERP Discovery Day</field>
         </record>
 
@@ -79,10 +82,10 @@
            <field model="ir.values" name="ref_ir_value" search="[('name', '=', u'Send Mail (For OpenERP OnDemand Free Trial 2010)')]"/>
              <field name="model_id" ref="crm.model_crm_lead"/>
             <field eval="0" name="user_signature"/>
-            <field name="body_text">Hello,Thanks for showing intrest and buying the OpenERP book.
+            <field name="body_html"><![CDATA[<p>Hello,</p>
+            <p>Thanks for showing interest and buying the OpenERP book.</p>
             If any further information required kindly revert back.
-            I really appreciate your co-operation on this.
-            Regards,OpenERP Team,</field>
+            <p>Regards,OpenERP Team,</p>]]></field>
             <field name="name">For OpenERP book</field>
         </record>
 
@@ -92,12 +95,12 @@
             <field model="ir.actions.act_window" name="ref_ir_act_window" search="[('name', '=', u'For OpenERP OnDemand Free Trial 2010 Mail Form')]"/>
             <field model="ir.values" name="ref_ir_value" search="[('name', '=', u'Send Mail (For OpenERP OnDemand Free Trial 2010)')]"/>
             <field eval="0" name="user_signature"/>
-            <field name="body_text">Hello, We have very good offer that might suit you.
-            For our gold partners,We are arranging free technical training on june,2010.
-            If any further information required kindly revert back.
-            I really appreciate your co-operation on this.
-            Regards,OpenERP Team,</field>
-            <field name="name">For technical training to Gold partners</field>
+            <field name="body_html"><![CDATA[<p>Hello,</p>
+            <p>We have very good offer that might suit you.
+            For our gold partners,We are arranging free technical training on june,2010.</p>
+            <p>If any further information is required, do not hesitate to reply to this message.</p>
+            <p>Regards,OpenERP Team,</p>]]></field>
+            <field name="name">technical training to gold partners</field>
         </record>
 
           <record id="email_template_6" model="email.template">
@@ -107,12 +110,12 @@
             <field model="ir.values" name="ref_ir_value" search="[('name', '=', u'Send Mail (For OpenERP OnDemand Free Trial 2010)')]"/>
             <field name="model_id" ref="crm.model_crm_lead"/>
             <field eval="0" name="user_signature"/>
-            <field name="body_text">Hello, We have very good offer that might suit you.
-            For our silver partners,We are  paid technical training on june,2010.
-            If any further information required kindly revert back.
-            I really appreciate your co-operation on this.
-            Regards,OpenERP Team,</field>
-            <field name="name">For training to Silver partners</field>
+            <field name="body_html"><![CDATA[<p>Hello,</p>
+            <p>We have very good offer that might suit you.
+            For our silver partners,We are  paid technical training on june,2010.</p>
+            <p>If any further information is required, do not hesitate to reply to this message.</p>
+            <p>Regards,OpenERP Team,</p>]]></field>
+            <field name="name">training to silver partners</field>
         </record>
 
         <record id="email_template_7" model="email.template">
@@ -122,12 +125,12 @@
             <field model="ir.values" name="ref_ir_value" search="[('name', '=', u'Send Mail (For OpenERP OnDemand Free Trial 2010)')]"/>
             <field name="model_id" ref="crm.model_crm_lead"/>
             <field eval="0" name="user_signature"/>
-            <field name="body_text">Hello, We have very good offer that might suit you.
-            For our silver partners,We are  offering Gold partnership.
-            If any further information required kindly revert back.
-            I really appreciate your co-operation on this.
-            Regards,OpenERP Team,</field>
-            <field name="name">For gold partnership to silver partners</field>
+            <field name="body_html"><![CDATA[<p>Hello,</p>
+            <p>We have very good offer that might suit you.
+            For our silver partners, we are  offering Gold partnership.</p>
+            <p>If any further information is required, do not hesitate to reply to this message.</p>
+            <p>Regards,OpenERP Team,</p>]]></field>
+            <field name="name">gold partnership to silver partners</field>
         </record>
 
         <record id="email_template_8" model="email.template">
@@ -137,9 +140,12 @@
             <field model="ir.values" name="ref_ir_value" search="[('name', '=', u'Send Mail (For OpenERP OnDemand Free Trial 2010)')]"/>
             <field name="model_id" ref="crm.model_crm_lead"/>
             <field eval="0" name="user_signature"/>
-            <field name="body_text">Hello, Thanks for showing intrest and for subscribing to technical training.If any further information required kindly revert back.I really appreciate your co-operation on this.
-            Regards,OpenERP Team,</field>
-            <field name="name">For subscribing to technical training</field>
+            <field name="body_html"><![CDATA[<p>Hello,</p>
+            <p>Thanks for showing interest and for subscribing to technical training.</p>
+            If any further information required kindly revert back.I really appreciate your co-operation on this.</p>
+            <p>If any further information is required, do not hesitate to reply to this message.</p>
+            <p>Regards,OpenERP Team,</p>]]></field>
+            <field name="name">subscribing to technical training</field>
         </record>
         <!-- Report -->
 
diff --git a/addons/membership/__openerp__.py b/addons/membership/__openerp__.py
index a05240c08e7..316a2f0f120 100644
--- a/addons/membership/__openerp__.py
+++ b/addons/membership/__openerp__.py
@@ -29,6 +29,7 @@ This module allows you to manage all operations for managing memberships.
 =========================================================================
 
 It supports different kind of members:
+--------------------------------------
     * Free member
     * Associated member (e.g.: a group subscribes to a membership for all subsidiaries)
     * Paid members
@@ -39,15 +40,14 @@ invoice and send propositions for membership renewal.
     """,
     'author': 'OpenERP SA',
     'depends': ['base', 'product', 'account', 'process'],
-    'init_xml': ['membership_data.xml'],
-    'update_xml': [
+    'data': [
         'security/ir.model.access.csv',
         'wizard/membership_invoice_view.xml',
         'membership_view.xml',
         'report/report_membership_view.xml',
-        'process/membership_process.xml'
+        'process/membership_process.xml',
     ],
-    'demo_xml': ['membership_demo.xml'],
+    'demo': ['membership_demo.xml'],
     'test': ['test/test_membership.yml'],
     'installable': True,
     'auto_install': False,
diff --git a/addons/membership/i18n/ar.po b/addons/membership/i18n/ar.po
index ea2aa8cb8d0..441379a7210 100644
--- a/addons/membership/i18n/ar.po
+++ b/addons/membership/i18n/ar.po
@@ -13,25 +13,25 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:55+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:02+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: membership
 #: model:process.transition,name:membership.process_transition_invoicetoassociate0
 msgid "invoice to associate"
-msgstr ""
+msgstr "فاتورة لربطها"
 
 #. module: membership
 #: model:process.process,name:membership.process_process_membershipprocess0
 msgid "Membership Process"
-msgstr ""
+msgstr "عملية العضوية"
 
 #. module: membership
 #: selection:membership.membership_line,state:0
 #: selection:report.membership,membership_state:0
 #: selection:res.partner,membership_state:0
 msgid "Paid Member"
-msgstr ""
+msgstr "عضو دافع"
 
 #. module: membership
 #: view:report.membership:0
@@ -42,17 +42,17 @@ msgstr ""
 #. module: membership
 #: field:report.membership,num_paid:0
 msgid "# Paid"
-msgstr ""
+msgstr "# دفع"
 
 #. module: membership
 #: field:report.membership,tot_earned:0
 msgid "Earned Amount"
-msgstr ""
+msgstr "تحصيل المبلغ"
 
 #. module: membership
 #: model:ir.model,name:membership.model_report_membership
 msgid "Membership Analysis"
-msgstr ""
+msgstr "تحليل العضوية"
 
 #. module: membership
 #: selection:report.membership,month:0
@@ -67,7 +67,7 @@ msgstr ""
 #. module: membership
 #: model:process.transition,note:membership.process_transition_invoicetopaid0
 msgid "Invoice is be paid."
-msgstr ""
+msgstr "فاتورة تم دفعها"
 
 #. module: membership
 #: field:membership.membership_line,company_id:0
@@ -79,7 +79,7 @@ msgstr ""
 #. module: membership
 #: view:res.partner:0
 msgid "Ending Date Of Membership"
-msgstr ""
+msgstr "التاريخ النهائي للعضوية"
 
 #. module: membership
 #: field:product.product,membership_date_to:0
@@ -89,12 +89,12 @@ msgstr ""
 #. module: membership
 #: model:process.transition,name:membership.process_transition_waitingtoinvoice0
 msgid "Waiting to invoice"
-msgstr ""
+msgstr "انتظار الفاتورة"
 
 #. module: membership
 #: view:report.membership:0
 msgid "This will display paid, old and total earned columns"
-msgstr ""
+msgstr "سيتم عرض الدفع، القديم ومجموع أعمدة التحصيل"
 
 #. module: membership
 #: view:res.partner:0
@@ -106,42 +106,42 @@ msgstr ""
 #: selection:report.membership,membership_state:0
 #: selection:res.partner,membership_state:0
 msgid "Non Member"
-msgstr ""
+msgstr "ليس عضو"
 
 #. module: membership
 #: model:product.template,name:membership.membership_2_product_template
 msgid "Basic Membership"
-msgstr ""
+msgstr "عضوية أساسية"
 
 #. module: membership
 #: view:res.partner:0
 msgid "All Members"
-msgstr ""
+msgstr "كل الأعضاء"
 
 #. module: membership
 #: field:res.partner,membership_stop:0
 msgid "Stop membership date"
-msgstr ""
+msgstr "إيقاف تاريخ العضوية"
 
 #. module: membership
 #: model:process.transition,name:membership.process_transition_producttomember0
 msgid "Product to member"
-msgstr ""
+msgstr "المنتج لعضو"
 
 #. module: membership
 #: view:res.partner:0
 msgid "Join Membership"
-msgstr ""
+msgstr "إنضمام للعضوية"
 
 #. module: membership
 #: field:res.partner,associate_member:0
 msgid "Associate member"
-msgstr ""
+msgstr "عضو منتسب"
 
 #. module: membership
 #: model:process.node,note:membership.process_node_associatedmember0
 msgid "Member is associated."
-msgstr ""
+msgstr "العضو منتسب"
 
 #. module: membership
 #: view:report.membership:0
@@ -151,22 +151,22 @@ msgstr ""
 #. module: membership
 #: field:report.membership,tot_pending:0
 msgid "Pending Amount"
-msgstr ""
+msgstr "في انتظار المبلغ"
 
 #. module: membership
 #: model:process.transition,note:membership.process_transition_associationpartner0
 msgid "Associated partner."
-msgstr ""
+msgstr "شريك منتسب"
 
 #. module: membership
 #: view:res.partner:0
 msgid "Supplier Partners"
-msgstr ""
+msgstr "الشركاء الموردون"
 
 #. module: membership
 #: field:report.membership,num_invoiced:0
 msgid "# Invoiced"
-msgstr ""
+msgstr "# فاتورة"
 
 #. module: membership
 #: constraint:account.invoice:0
@@ -177,12 +177,12 @@ msgstr ""
 #: model:ir.actions.act_window,name:membership.action_report_membership_tree
 #: model:ir.ui.menu,name:membership.menu_report_membership
 msgid "Members Analysis"
-msgstr ""
+msgstr "تحليل الأعضاء"
 
 #. module: membership
 #: view:res.partner:0
 msgid "End Membership Date"
-msgstr ""
+msgstr "تاريخ انتهاء العضوية"
 
 #. module: membership
 #: field:product.product,membership_date_from:0
@@ -822,17 +822,17 @@ msgstr ""
 #. module: membership
 #: field:membership.membership_line,date_cancel:0
 msgid "Cancel date"
-msgstr ""
+msgstr "تاريخ الإلغاء"
 
 #. module: membership
 #: model:process.node,name:membership.process_node_waitingmember0
 msgid "Waiting member"
-msgstr ""
+msgstr "عضو منتظر"
 
 #. module: membership
 #: model:ir.actions.act_window,name:membership.action_membership_invoice_view
 msgid "Invoice Membership"
-msgstr ""
+msgstr "فاتورة عضوية"
 
 #. module: membership
 #: model:process.node,name:membership.process_node_membershipproduct0
diff --git a/addons/membership/i18n/bg.po b/addons/membership/i18n/bg.po
index 77302212c51..28c0cddf7d8 100644
--- a/addons/membership/i18n/bg.po
+++ b/addons/membership/i18n/bg.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:56+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:02+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: membership
 #: model:process.transition,name:membership.process_transition_invoicetoassociate0
diff --git a/addons/membership/i18n/bs.po b/addons/membership/i18n/bs.po
index 5643fc63fd0..833a862c374 100644
--- a/addons/membership/i18n/bs.po
+++ b/addons/membership/i18n/bs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:55+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:02+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: membership
 #: model:process.transition,name:membership.process_transition_invoicetoassociate0
diff --git a/addons/membership/i18n/ca.po b/addons/membership/i18n/ca.po
index 4731836ce89..2e503a8898c 100644
--- a/addons/membership/i18n/ca.po
+++ b/addons/membership/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:56+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:03+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: membership
 #: model:process.transition,name:membership.process_transition_invoicetoassociate0
diff --git a/addons/membership/i18n/cs.po b/addons/membership/i18n/cs.po
index 1182eb6da20..6ca9cd0ce8b 100644
--- a/addons/membership/i18n/cs.po
+++ b/addons/membership/i18n/cs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:56+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:03+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 "X-Poedit-Language: Czech\n"
 
 #. module: membership
diff --git a/addons/membership/i18n/da.po b/addons/membership/i18n/da.po
index ae48cc9a04f..de991c3f742 100644
--- a/addons/membership/i18n/da.po
+++ b/addons/membership/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:56+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:03+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: membership
 #: model:process.transition,name:membership.process_transition_invoicetoassociate0
diff --git a/addons/membership/i18n/de.po b/addons/membership/i18n/de.po
index 0f67424ed77..2775a416519 100644
--- a/addons/membership/i18n/de.po
+++ b/addons/membership/i18n/de.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:56+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:03+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: membership
 #: model:process.transition,name:membership.process_transition_invoicetoassociate0
diff --git a/addons/membership/i18n/es.po b/addons/membership/i18n/es.po
index ea6dbb6f3d8..512dcb7f9ac 100644
--- a/addons/membership/i18n/es.po
+++ b/addons/membership/i18n/es.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:56+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:03+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: membership
 #: model:process.transition,name:membership.process_transition_invoicetoassociate0
diff --git a/addons/membership/i18n/es_AR.po b/addons/membership/i18n/es_AR.po
index 82b50aeec96..003bcafd57c 100644
--- a/addons/membership/i18n/es_AR.po
+++ b/addons/membership/i18n/es_AR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:56+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:03+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: membership
 #: model:process.transition,name:membership.process_transition_invoicetoassociate0
diff --git a/addons/membership/i18n/es_CR.po b/addons/membership/i18n/es_CR.po
index 53dd445a827..94b95f3cc77 100644
--- a/addons/membership/i18n/es_CR.po
+++ b/addons/membership/i18n/es_CR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:56+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:03+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 "Language: \n"
 
 #. module: membership
diff --git a/addons/membership/i18n/et.po b/addons/membership/i18n/et.po
index b16b604a39c..617e4dfab94 100644
--- a/addons/membership/i18n/et.po
+++ b/addons/membership/i18n/et.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:56+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:03+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: membership
 #: model:process.transition,name:membership.process_transition_invoicetoassociate0
diff --git a/addons/membership/i18n/fi.po b/addons/membership/i18n/fi.po
index 1d42c6e99bb..a5624f5d7cf 100644
--- a/addons/membership/i18n/fi.po
+++ b/addons/membership/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:56+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:03+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: membership
 #: model:process.transition,name:membership.process_transition_invoicetoassociate0
diff --git a/addons/membership/i18n/fr.po b/addons/membership/i18n/fr.po
index a5609cce1f5..d71ace2c5ab 100644
--- a/addons/membership/i18n/fr.po
+++ b/addons/membership/i18n/fr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:56+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:03+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: membership
 #: model:process.transition,name:membership.process_transition_invoicetoassociate0
diff --git a/addons/membership/i18n/gl.po b/addons/membership/i18n/gl.po
index 8afe5ad35ef..23fd15ec2fc 100644
--- a/addons/membership/i18n/gl.po
+++ b/addons/membership/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:56+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:03+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: membership
 #: model:process.transition,name:membership.process_transition_invoicetoassociate0
diff --git a/addons/membership/i18n/hr.po b/addons/membership/i18n/hr.po
index 1c22710f5d2..98f1fb14128 100644
--- a/addons/membership/i18n/hr.po
+++ b/addons/membership/i18n/hr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:56+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:03+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: membership
 #: model:process.transition,name:membership.process_transition_invoicetoassociate0
diff --git a/addons/membership/i18n/hu.po b/addons/membership/i18n/hu.po
index 061ae2ddb9f..82353575fac 100644
--- a/addons/membership/i18n/hu.po
+++ b/addons/membership/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:56+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:03+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: membership
 #: model:process.transition,name:membership.process_transition_invoicetoassociate0
diff --git a/addons/membership/i18n/id.po b/addons/membership/i18n/id.po
index 4df6504ce22..421beeb304d 100644
--- a/addons/membership/i18n/id.po
+++ b/addons/membership/i18n/id.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:56+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:03+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: membership
 #: model:process.transition,name:membership.process_transition_invoicetoassociate0
diff --git a/addons/membership/i18n/it.po b/addons/membership/i18n/it.po
index ffc82bd56e3..c39a315021b 100644
--- a/addons/membership/i18n/it.po
+++ b/addons/membership/i18n/it.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:56+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:03+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: membership
 #: model:process.transition,name:membership.process_transition_invoicetoassociate0
diff --git a/addons/membership/i18n/ja.po b/addons/membership/i18n/ja.po
index 14d79afa68c..50790debb90 100644
--- a/addons/membership/i18n/ja.po
+++ b/addons/membership/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:56+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:03+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: membership
 #: model:process.transition,name:membership.process_transition_invoicetoassociate0
diff --git a/addons/membership/i18n/ko.po b/addons/membership/i18n/ko.po
index e3879d067a3..a87729c79c9 100644
--- a/addons/membership/i18n/ko.po
+++ b/addons/membership/i18n/ko.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:56+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:03+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: membership
 #: model:process.transition,name:membership.process_transition_invoicetoassociate0
diff --git a/addons/membership/i18n/lt.po b/addons/membership/i18n/lt.po
index 0eb8e7ee1be..d6ede96634c 100644
--- a/addons/membership/i18n/lt.po
+++ b/addons/membership/i18n/lt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:56+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:03+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: membership
 #: model:process.transition,name:membership.process_transition_invoicetoassociate0
diff --git a/addons/membership/i18n/mn.po b/addons/membership/i18n/mn.po
index 140663176a0..17a10802b60 100644
--- a/addons/membership/i18n/mn.po
+++ b/addons/membership/i18n/mn.po
@@ -14,13 +14,13 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:56+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:03+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: membership
 #: model:process.transition,name:membership.process_transition_invoicetoassociate0
 msgid "invoice to associate"
-msgstr ""
+msgstr "холбох нэхэмжлэл"
 
 #. module: membership
 #: model:process.process,name:membership.process_process_membershipprocess0
@@ -38,54 +38,54 @@ msgstr "Төлсөн гишүүн"
 #: view:report.membership:0
 #: view:res.partner:0
 msgid "Group By..."
-msgstr ""
+msgstr "Бүлэглэх..."
 
 #. module: membership
 #: field:report.membership,num_paid:0
 msgid "# Paid"
-msgstr ""
+msgstr "# Төлөгдсөн"
 
 #. module: membership
 #: field:report.membership,tot_earned:0
 msgid "Earned Amount"
-msgstr ""
+msgstr "Хуримтлуулсан Дүн"
 
 #. module: membership
 #: model:ir.model,name:membership.model_report_membership
 msgid "Membership Analysis"
-msgstr ""
+msgstr "Гишүүнчлэлийн Шинжилгээ"
 
 #. module: membership
 #: selection:report.membership,month:0
 msgid "March"
-msgstr ""
+msgstr "3-р сар"
 
 #. module: membership
 #: model:process.node,note:membership.process_node_setassociation0
 msgid "Set an associate member of partner."
-msgstr ""
+msgstr "Харилцагчийн холбогдох гишүүнийг тохируулах"
 
 #. module: membership
 #: model:process.transition,note:membership.process_transition_invoicetopaid0
 msgid "Invoice is be paid."
-msgstr ""
+msgstr "Төлөх нэхэмжлэлүүд"
 
 #. module: membership
 #: field:membership.membership_line,company_id:0
 #: view:report.membership:0
 #: field:report.membership,company_id:0
 msgid "Company"
-msgstr ""
+msgstr "Компани"
 
 #. module: membership
 #: view:res.partner:0
 msgid "Ending Date Of Membership"
-msgstr ""
+msgstr "Гишүүнчлэлийн дуусах огноо"
 
 #. module: membership
 #: field:product.product,membership_date_to:0
 msgid "Date to"
-msgstr ""
+msgstr "Хүртэл огноо"
 
 #. module: membership
 #: model:process.transition,name:membership.process_transition_waitingtoinvoice0
@@ -95,12 +95,12 @@ msgstr "Нэхэмжлэл хүлээж байгаа"
 #. module: membership
 #: view:report.membership:0
 msgid "This will display paid, old and total earned columns"
-msgstr ""
+msgstr "Энэ нь хуримталсан төлөгдсөн хуучин болон дүн багануудыг харуулна."
 
 #. module: membership
 #: view:res.partner:0
 msgid "Suppliers"
-msgstr ""
+msgstr "Нийлүүлэгчид"
 
 #. module: membership
 #: selection:membership.membership_line,state:0
@@ -112,12 +112,12 @@ msgstr "Гишүүн бус"
 #. module: membership
 #: model:product.template,name:membership.membership_2_product_template
 msgid "Basic Membership"
-msgstr ""
+msgstr "Энгийн гишүүнчлэл"
 
 #. module: membership
 #: view:res.partner:0
 msgid "All Members"
-msgstr ""
+msgstr "Бүх гишүүд"
 
 #. module: membership
 #: field:res.partner,membership_stop:0
@@ -127,47 +127,47 @@ msgstr "Гишүүнчлэлийг зогсоох огноо"
 #. module: membership
 #: model:process.transition,name:membership.process_transition_producttomember0
 msgid "Product to member"
-msgstr ""
+msgstr "Гишүүнд бараа"
 
 #. module: membership
 #: view:res.partner:0
 msgid "Join Membership"
-msgstr ""
+msgstr "Гишүүнчлэлийн холбоо"
 
 #. module: membership
 #: field:res.partner,associate_member:0
 msgid "Associate member"
-msgstr ""
+msgstr "Гишүүнийг холбох"
 
 #. module: membership
 #: model:process.node,note:membership.process_node_associatedmember0
 msgid "Member is associated."
-msgstr ""
+msgstr "Гишүүн холбогдсон"
 
 #. module: membership
 #: view:report.membership:0
 msgid "   Month   "
-msgstr ""
+msgstr "   Сар   "
 
 #. module: membership
 #: field:report.membership,tot_pending:0
 msgid "Pending Amount"
-msgstr ""
+msgstr "Хүлээгдэж байгаа дүн"
 
 #. module: membership
 #: model:process.transition,note:membership.process_transition_associationpartner0
 msgid "Associated partner."
-msgstr ""
+msgstr "Холбогдсон харилцагч"
 
 #. module: membership
 #: view:res.partner:0
 msgid "Supplier Partners"
-msgstr ""
+msgstr "Нийлүүлэгч Харилцагчид"
 
 #. module: membership
 #: field:report.membership,num_invoiced:0
 msgid "# Invoiced"
-msgstr ""
+msgstr "# нэхэмжлэгдсэн"
 
 #. module: membership
 #: constraint:account.invoice:0
@@ -178,23 +178,23 @@ msgstr ""
 #: model:ir.actions.act_window,name:membership.action_report_membership_tree
 #: model:ir.ui.menu,name:membership.menu_report_membership
 msgid "Members Analysis"
-msgstr ""
+msgstr "Гишүүдийн Шинжилгээ"
 
 #. module: membership
 #: view:res.partner:0
 msgid "End Membership Date"
-msgstr ""
+msgstr "Гишүүнчлэлийн дуусах огноо"
 
 #. module: membership
 #: field:product.product,membership_date_from:0
 msgid "Date from"
-msgstr ""
+msgstr "Эхлэх огноо"
 
 #. module: membership
 #: code:addons/membership/membership.py:414
 #, python-format
 msgid "Partner doesn't have an address to make the invoice."
-msgstr ""
+msgstr "Харилцагч нэхэмлжлэх хаяг байхгүй байна."
 
 #. module: membership
 #: model:ir.model,name:membership.model_res_partner
@@ -205,12 +205,12 @@ msgstr "Харилцагч"
 #. module: membership
 #: model:process.transition,name:membership.process_transition_invoicetopaid0
 msgid "Invoice to paid"
-msgstr ""
+msgstr "Төлөгдсөн нэхэмжлэл"
 
 #. module: membership
 #: view:res.partner:0
 msgid "Customer Partners"
-msgstr ""
+msgstr "Захиалагч Харилцагчид"
 
 #. module: membership
 #: view:res.partner:0
@@ -220,7 +220,7 @@ msgstr "Харилцагч"
 #. module: membership
 #: field:membership.membership_line,date_from:0
 msgid "From"
-msgstr ""
+msgstr "Эхлэх"
 
 #. module: membership
 #: constraint:membership.membership_line:0
@@ -244,6 +244,15 @@ msgid ""
 "                    -Paid Member: A member who has paid the membership "
 "amount."
 msgstr ""
+"Энэ гишүүнчлэлийн төлөвийг илтгэдэг.\n"
+"\n"
+"-Гишүүн биш: Гишүүнчлэлд өргөдөл гаргаагүй гишүүн.\n"
+"-Цуцлагдсан гишүүн: Гишүүнчлэлээ цуцалсан гишүүн.\n"
+"-Хуучин гишүүн: Гишүүнчлэлийн хугацаа дууссан гишүүн.\n"
+"-Хүлээж буй гишүүн: Гишүүнчлэлийн өргөдлөө гаргасан нэхэмжлэл нь үүсэх гэж "
+"байгаа гишүүн.\n"
+"-Нэхэмжлэгдсэн гишүүн: Нэхэмжлэл нь үүссэн гишүүн.\n"
+"-Төлсөн гишүүн: Гишүүнчлэлийн төлбөрөө төлсөн гишүүн."
 
 #. module: membership
 #: model:process.transition.action,name:membership.process_transition_action_create0
@@ -253,12 +262,12 @@ msgstr "Үүсгэх"
 #. module: membership
 #: view:product.product:0
 msgid "Membership products"
-msgstr ""
+msgstr "Гишүүнчлэлийн бараа"
 
 #. module: membership
 #: model:ir.model,name:membership.model_membership_membership_line
 msgid "Member line"
-msgstr ""
+msgstr "Гишүүний мөр"
 
 #. module: membership
 #: help:report.membership,date_from:0
@@ -269,19 +278,19 @@ msgstr "Гишүүнчлэл эхлэх огноо"
 #. module: membership
 #: view:report.membership:0
 msgid "Events created in current month"
-msgstr ""
+msgstr "Энэ сард үүсгэгдсэн үйл явдал"
 
 #. module: membership
 #: view:report.membership:0
 msgid "This will display waiting, invoiced and total pending columns"
-msgstr ""
+msgstr "Энэ нь хүлээгдэж буй нэхэмжилсэн багануудыг харуулна."
 
 #. module: membership
 #: code:addons/membership/membership.py:410
 #: code:addons/membership/membership.py:413
 #, python-format
 msgid "Error !"
-msgstr ""
+msgstr "Алдаа !"
 
 #. module: membership
 #: model:process.node,name:membership.process_node_paidmember0
@@ -291,22 +300,22 @@ msgstr "Төлсөн гишүүн"
 #. module: membership
 #: view:report.membership:0
 msgid "    Month-1    "
-msgstr ""
+msgstr "    Сар-1    "
 
 #. module: membership
 #: view:report.membership:0
 msgid "Events created in last month"
-msgstr ""
+msgstr "Сүүлийн сард үүсгэгдсэн үйл явдал"
 
 #. module: membership
 #: field:report.membership,num_waiting:0
 msgid "# Waiting"
-msgstr ""
+msgstr "# Хүлээж буй"
 
 #. module: membership
 #: view:report.membership:0
 msgid "Events created in current year"
-msgstr ""
+msgstr "Энэ жил үүсгэгдсэн үйл явдал"
 
 #. module: membership
 #: model:ir.actions.act_window,name:membership.action_membership_members
@@ -318,7 +327,7 @@ msgstr "Гишүүд"
 #. module: membership
 #: view:res.partner:0
 msgid "Invoiced/Paid/Free"
-msgstr ""
+msgstr "Нэхэмжилсэн/Төлсөн/Үнэгүй"
 
 #. module: membership
 #: model:process.node,note:membership.process_node_invoicedmember0
@@ -328,12 +337,12 @@ msgstr "Нэхэмжлэл нээх."
 #. module: membership
 #: selection:report.membership,month:0
 msgid "July"
-msgstr ""
+msgstr "7-р сар"
 
 #. module: membership
 #: model:product.template,name:membership.membership_0_product_template
 msgid "Golden Membership"
-msgstr ""
+msgstr "Алтан гишүүнчлэл"
 
 #. module: membership
 #: help:res.partner,associate_member:0
@@ -341,89 +350,91 @@ msgid ""
 "A member with whom you want to associate your membership.It will consider "
 "the membership state of the associated member."
 msgstr ""
+"Өөрийн гишүүнчлэлийг холбохыг хүсч буй гишүүн. Энэ нь холбогдсон гишүүний "
+"гишүүнчлэлийг тооцож үзнэ."
 
 #. module: membership
 #: field:membership.membership_line,membership_id:0
 #: view:report.membership:0
 #: field:report.membership,membership_id:0
 msgid "Membership Product"
-msgstr ""
+msgstr "Гишүүнчлэлийн бараа"
 
 #. module: membership
 #: model:process.transition,note:membership.process_transition_producttomember0
 msgid "Define product for membership."
-msgstr ""
+msgstr "Гишүүнчлэлийн барааг тодорхойл"
 
 #. module: membership
 #: model:process.transition,note:membership.process_transition_invoicetoassociate0
 msgid "Invoiced member may be Associated member."
-msgstr ""
+msgstr "Нэхэмжилсэн гишүүд нь Холбогдсон гишүүд байж болно."
 
 #. module: membership
 #: view:membership.invoice:0
 msgid "Join"
-msgstr ""
+msgstr "Холбогдох"
 
 #. module: membership
 #: help:product.product,membership_date_to:0
 #: help:res.partner,membership_stop:0
 msgid "Date until which membership remains active."
-msgstr ""
+msgstr "Гишүүнчлэл идэвхтэй байх эцсийн хугацаа."
 
 #. module: membership
 #: field:res.partner,membership_cancel:0
 msgid "Cancel membership date"
-msgstr ""
+msgstr "Гишүүнчлэлийг цуцласан огноо"
 
 #. module: membership
 #: field:membership.membership_line,date:0
 msgid "Join Date"
-msgstr ""
+msgstr "Холбогдсон огноо"
 
 #. module: membership
 #: help:res.partner,free_member:0
 msgid "Select if you want to give membership free of cost."
-msgstr ""
+msgstr "Гишүүнчлэлийг үнэгүй олгохоор бол сонгоно уу."
 
 #. module: membership
 #: model:process.node,name:membership.process_node_setassociation0
 msgid "Set association"
-msgstr ""
+msgstr "Холбоог тааруулах"
 
 #. module: membership
 #: view:res.partner:0
 msgid " Membership State"
-msgstr ""
+msgstr " Гишүүнчлэлийн Төлөв"
 
 #. module: membership
 #: view:res.partner:0
 msgid "Memberships"
-msgstr ""
+msgstr "Гишүүнчлэлүүд"
 
 #. module: membership
 #: model:process.node,note:membership.process_node_paidmember0
 msgid "Membership invoice paid."
-msgstr ""
+msgstr "Гишүүнчлэлийн нэхэмжлэл төлөгдсөн."
 
 #. module: membership
 #: model:ir.model,name:membership.model_product_template
 msgid "Product Template"
-msgstr ""
+msgstr "Барааны үлгэр"
 
 #. module: membership
 #: selection:report.membership,month:0
 msgid "September"
-msgstr ""
+msgstr "9-р сар"
 
 #. module: membership
 #: selection:report.membership,month:0
 msgid "December"
-msgstr ""
+msgstr "12-р сар"
 
 #. module: membership
 #: model:ir.model,name:membership.model_account_invoice_line
 msgid "Invoice Line"
-msgstr ""
+msgstr "Нэхэмжлэлийн мөр"
 
 #. module: membership
 #: help:membership.membership_line,state:0
@@ -442,68 +453,77 @@ msgid ""
 "                        -Paid Member: A member who has paid the membership "
 "amount."
 msgstr ""
+"Энэ гишүүнчлэлийн төлөвийг илтгэдэг.\n"
+"\n"
+"-Гишүүн биш: Гишүүнчлэлд өргөдөл гаргаагүй гишүүн.\n"
+"-Цуцлагдсан гишүүн: Гишүүнчлэлээ цуцалсан гишүүн.\n"
+"-Хуучин гишүүн: Гишүүнчлэлийн хугацаа дууссан гишүүн.\n"
+"-Хүлээж буй гишүүн: Гишүүнчлэлийн өргөдлөө гаргасан нэхэмжлэл нь үүсэх гэж "
+"байгаа гишүүн.\n"
+"-Нэхэмжлэгдсэн гишүүн: Нэхэмжлэл нь үүссэн гишүүн.\n"
+"-Төлсөн гишүүн: Гишүүнчлэлийн төлбөрөө төлсөн гишүүн."
 
 #. module: membership
 #: view:report.membership:0
 #: field:report.membership,month:0
 msgid "Month"
-msgstr ""
+msgstr "Сар"
 
 #. module: membership
 #: view:product.product:0
 msgid "Group by..."
-msgstr ""
+msgstr "Бүлэглэх..."
 
 #. module: membership
 #: code:addons/membership/membership.py:411
 #, python-format
 msgid "Partner is a free Member."
-msgstr ""
+msgstr "Харилцагч нь төлбөргүй гишүүн."
 
 #. module: membership
 #: model:product.pricelist,name:membership.list1m
 msgid "Member Sale Pricelist"
-msgstr ""
+msgstr "Гишүүний Хөнгөлөлтийн Үнийн жагсаалт"
 
 #. module: membership
 #: field:report.membership,associate_member_id:0
 #: view:res.partner:0
 msgid "Associate Member"
-msgstr ""
+msgstr "Гишүүнийг холбох"
 
 #. module: membership
 #: help:product.product,membership_date_from:0
 #: help:res.partner,membership_start:0
 msgid "Date from which membership becomes active."
-msgstr ""
+msgstr "Гишүүнчлэл идэвхтэй болох эхлэх хугацаа"
 
 #. module: membership
 #: view:report.membership:0
 msgid "Associated Partner"
-msgstr ""
+msgstr "Холбогдсон харилцагч"
 
 #. module: membership
 #: model:ir.model,name:membership.model_membership_invoice
 #: view:membership.invoice:0
 msgid "Membership Invoice"
-msgstr ""
+msgstr "Гишүүнчлэлийн нэхэмжлэл"
 
 #. module: membership
 #: view:report.membership:0
 #: field:report.membership,user_id:0
 #: view:res.partner:0
 msgid "Salesman"
-msgstr ""
+msgstr "Борлуулагч"
 
 #. module: membership
 #: model:process.node,note:membership.process_node_membershipproduct0
 msgid "Define membership product."
-msgstr ""
+msgstr "Гишүүнчлэлийн барааг тодорхойл"
 
 #. module: membership
 #: view:product.product:0
 msgid "Category"
-msgstr ""
+msgstr "Ангилал"
 
 #. module: membership
 #: selection:membership.membership_line,state:0
@@ -515,7 +535,7 @@ msgstr "Чөлөөт гишүүн"
 #. module: membership
 #: model:product.pricelist.version,name:membership.ver1m
 msgid "Member Sale Pricelist Version"
-msgstr ""
+msgstr "Гишүүний хөнгөлөлтийн үнийн жагсаалтын хувилбар"
 
 #. module: membership
 #: constraint:product.template:0
@@ -527,42 +547,42 @@ msgstr ""
 #. module: membership
 #: view:report.membership:0
 msgid "Forecast"
-msgstr ""
+msgstr "Урьдчилсан таамаг"
 
 #. module: membership
 #: field:report.membership,partner_id:0
 msgid "Member"
-msgstr ""
+msgstr "Гишүүн"
 
 #. module: membership
 #: view:product.product:0
 msgid "Date From"
-msgstr ""
+msgstr "Эхлэх өдөр"
 
 #. module: membership
 #: model:process.node,name:membership.process_node_associatedmember0
 msgid "Associated member"
-msgstr ""
+msgstr "Холбогдсон гишүүн"
 
 #. module: membership
 #: view:product.product:0
 msgid "Accounting Info"
-msgstr ""
+msgstr "Санхүүгийн мэдээлэл"
 
 #. module: membership
 #: help:report.membership,date_to:0
 msgid "End membership date"
-msgstr ""
+msgstr "Гишүүнчлэл дуусах огноо"
 
 #. module: membership
 #: view:res.partner:0
 msgid "Customers"
-msgstr ""
+msgstr "Захиалагчид"
 
 #. module: membership
 #: selection:report.membership,month:0
 msgid "August"
-msgstr ""
+msgstr "8-р сар"
 
 #. module: membership
 #: model:ir.actions.act_window,name:membership.action_membership_products
@@ -574,7 +594,7 @@ msgstr "Гишүүнчлэлийн бараанууд"
 #. module: membership
 #: selection:report.membership,month:0
 msgid "June"
-msgstr ""
+msgstr "6-р сар"
 
 #. module: membership
 #: model:ir.ui.menu,name:membership.menu_membership
@@ -597,7 +617,7 @@ msgstr "Нэхэмжлэгдсэн гишүүн"
 #. module: membership
 #: help:membership.membership_line,date:0
 msgid "Date on which member has joined the membership"
-msgstr ""
+msgstr "Гишүүнийн гишүүнчлэлээр холбогдсон огноо"
 
 #. module: membership
 #: selection:membership.membership_line,state:0
@@ -609,53 +629,53 @@ msgstr "Хүлээж байгаа гишүүн"
 #. module: membership
 #: model:process.transition,name:membership.process_transition_associationpartner0
 msgid "Association Partner"
-msgstr ""
+msgstr "Холбоо Харилцагч"
 
 #. module: membership
 #: field:report.membership,date_from:0
 #: view:res.partner:0
 msgid "Start Date"
-msgstr ""
+msgstr "Эхлэл огноо"
 
 #. module: membership
 #: selection:report.membership,month:0
 msgid "November"
-msgstr ""
+msgstr "11-р сар"
 
 #. module: membership
 #: help:product.product,membership:0
 msgid "Select if a product is a membership product."
-msgstr ""
+msgstr "Хэрэв бараа нь гишүүнчлэл бараа бол сонгоно"
 
 #. module: membership
 #: field:membership.membership_line,state:0
 msgid "Membership State"
-msgstr ""
+msgstr "Гишүүнчлэлийн төлөв"
 
 #. module: membership
 #: selection:report.membership,month:0
 msgid "October"
-msgstr ""
+msgstr "10-р сар"
 
 #. module: membership
 #: view:product.product:0
 msgid "Sale Description"
-msgstr ""
+msgstr "Борлуулалтын тайлбар"
 
 #. module: membership
 #: selection:report.membership,month:0
 msgid "January"
-msgstr ""
+msgstr "1-р сар"
 
 #. module: membership
 #: view:res.partner:0
 msgid "Membership Partners"
-msgstr ""
+msgstr "Гишүүнчлэлийн Харилцагчид"
 
 #. module: membership
 #: view:product.product:0
 msgid "Membership Fee"
-msgstr ""
+msgstr "Үнэгүй Гишүүнчлэл"
 
 #. module: membership
 #: field:res.partner,membership_amount:0
@@ -665,17 +685,17 @@ msgstr "Гишүүнчлэлийн дүн"
 #. module: membership
 #: help:res.partner,membership_amount:0
 msgid "The price negotiated by the partner"
-msgstr ""
+msgstr "Үнийг харилагчтай тохиролцдог"
 
 #. module: membership
 #: sql_constraint:account.invoice:0
 msgid "Invoice Number must be unique per Company!"
-msgstr ""
+msgstr "Компаний хэмжээнд нэхэмжлэлийн дугаар үл давхцах ёстой!"
 
 #. module: membership
 #: view:res.partner:0
 msgid "None/Canceled/Old/Waiting"
-msgstr ""
+msgstr "Хоосон/Цуцалсан/Хуучин/Хүлээж буй"
 
 #. module: membership
 #: selection:membership.membership_line,state:0
@@ -687,19 +707,19 @@ msgstr "Хуучин гишүүн"
 #. module: membership
 #: field:membership.membership_line,date_to:0
 msgid "To"
-msgstr ""
+msgstr "Хэнд"
 
 #. module: membership
 #: view:report.membership:0
 #: field:report.membership,membership_state:0
 #: field:res.partner,membership_state:0
 msgid "Current Membership State"
-msgstr ""
+msgstr "Одоогийн Гишүүнчлэлийн Төлөв"
 
 #. module: membership
 #: view:product.product:0
 msgid "General"
-msgstr ""
+msgstr "Ерөнхий"
 
 #. module: membership
 #: model:process.transition,note:membership.process_transition_waitingtoinvoice0
@@ -709,23 +729,23 @@ msgstr "Ноорог нэхэмжлэл нээгдлээ"
 #. module: membership
 #: view:product.product:0
 msgid "Inactive"
-msgstr ""
+msgstr "Идэвхгүй"
 
 #. module: membership
 #: model:ir.model,name:membership.model_account_invoice
 #: field:membership.membership_line,account_invoice_id:0
 msgid "Invoice"
-msgstr ""
+msgstr "Нэхэмжлэл"
 
 #. module: membership
 #: view:membership.invoice:0
 msgid "Close"
-msgstr ""
+msgstr "Хаах"
 
 #. module: membership
 #: view:res.partner:0
 msgid "All non Members"
-msgstr ""
+msgstr "Бүх гишүүн бишүүд"
 
 #. module: membership
 #: view:product.product:0
@@ -735,12 +755,12 @@ msgstr "Мэдээлэл"
 #. module: membership
 #: field:membership.membership_line,account_invoice_line:0
 msgid "Account Invoice line"
-msgstr ""
+msgstr "Санхүүгийн Нэхэмжлэлийн Мөр"
 
 #. module: membership
 #: view:product.product:0
 msgid "Categorization"
-msgstr ""
+msgstr "Ангилал"
 
 #. module: membership
 #: model:process.node,note:membership.process_node_waitingmember0
@@ -758,17 +778,17 @@ msgstr "Гишүүний үнэ"
 #. module: membership
 #: view:product.product:0
 msgid "Purchase Description"
-msgstr ""
+msgstr "Худалдан авалтын тайлбар, тэмдэглэл"
 
 #. module: membership
 #: model:ir.model,name:membership.model_product_product
 msgid "Product"
-msgstr ""
+msgstr "Бараа"
 
 #. module: membership
 #: view:product.product:0
 msgid "Description"
-msgstr ""
+msgstr "Тайлбар"
 
 #. module: membership
 #: field:res.partner,free_member:0
@@ -778,48 +798,48 @@ msgstr "Чөлөөт гишүүн"
 #. module: membership
 #: selection:report.membership,month:0
 msgid "May"
-msgstr ""
+msgstr "5-р сар"
 
 #. module: membership
 #: model:product.template,name:membership.membership_1_product_template
 msgid "Silver Membership"
-msgstr ""
+msgstr "Мөнгөн гишүүнчлэл"
 
 #. module: membership
 #: view:product.product:0
 msgid "Sale Taxes"
-msgstr ""
+msgstr "Борлуулалтын татвар"
 
 #. module: membership
 #: field:report.membership,date_to:0
 #: view:res.partner:0
 msgid "End Date"
-msgstr ""
+msgstr "Дуусах огноо"
 
 #. module: membership
 #: selection:report.membership,month:0
 msgid "February"
-msgstr ""
+msgstr "2-р сар"
 
 #. module: membership
 #: model:process.node,name:membership.process_node_invoicedmember0
 msgid "Invoiced member"
-msgstr ""
+msgstr "Нэхэмжлэгдсэн гишүүд"
 
 #. module: membership
 #: selection:report.membership,month:0
 msgid "April"
-msgstr ""
+msgstr "4-р сар"
 
 #. module: membership
 #: view:res.partner:0
 msgid "Starting Date Of Membership"
-msgstr ""
+msgstr "Гишүүнчлэлийн эхлэл огноо"
 
 #. module: membership
 #: help:res.partner,membership_cancel:0
 msgid "Date on which membership has been cancelled"
-msgstr ""
+msgstr "Гишүүнчлэл цуцлагдсан огноо"
 
 #. module: membership
 #: field:membership.membership_line,date_cancel:0
@@ -834,7 +854,7 @@ msgstr "Хүлээж байгаа гишүүн"
 #. module: membership
 #: model:ir.actions.act_window,name:membership.action_membership_invoice_view
 msgid "Invoice Membership"
-msgstr ""
+msgstr "Гишүүнчлэлийн нэхэмжлэл"
 
 #. module: membership
 #: model:process.node,name:membership.process_node_membershipproduct0
@@ -844,19 +864,19 @@ msgstr "Гишүүнчлэлийн бараа"
 #. module: membership
 #: help:membership.membership_line,member_price:0
 msgid "Amount for the membership"
-msgstr ""
+msgstr "Гишүүнчлэлийн дүн"
 
 #. module: membership
 #: constraint:res.partner:0
 msgid "Error ! You cannot create recursive associated members."
-msgstr ""
+msgstr "Алдаа ! Тойрч холбогдсон гишүүдийг үүсгэх боломжгүй."
 
 #. module: membership
 #: selection:membership.membership_line,state:0
 #: selection:report.membership,membership_state:0
 #: selection:res.partner,membership_state:0
 msgid "Cancelled Member"
-msgstr ""
+msgstr "Цуцлагдсан гишүүн"
 
 #. module: membership
 #: constraint:product.product:0
@@ -872,7 +892,7 @@ msgstr "Жил"
 #. module: membership
 #: view:report.membership:0
 msgid "Revenue Done"
-msgstr ""
+msgstr "Орлого хийгдсэн"
 
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Үйлдлийн тодорхойлолтод буруу моделийн нэр байна."
diff --git a/addons/membership/i18n/nl.po b/addons/membership/i18n/nl.po
index 087a46aa1eb..3c9d4bf815c 100644
--- a/addons/membership/i18n/nl.po
+++ b/addons/membership/i18n/nl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:56+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:03+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: membership
 #: model:process.transition,name:membership.process_transition_invoicetoassociate0
diff --git a/addons/membership/i18n/nl_BE.po b/addons/membership/i18n/nl_BE.po
index 327a74b9c03..85c1870df62 100644
--- a/addons/membership/i18n/nl_BE.po
+++ b/addons/membership/i18n/nl_BE.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:56+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:03+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: membership
 #: model:process.transition,name:membership.process_transition_invoicetoassociate0
diff --git a/addons/membership/i18n/pl.po b/addons/membership/i18n/pl.po
index 999da7daaa9..f1a816ceafd 100644
--- a/addons/membership/i18n/pl.po
+++ b/addons/membership/i18n/pl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:56+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:03+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: membership
 #: model:process.transition,name:membership.process_transition_invoicetoassociate0
diff --git a/addons/membership/i18n/pt.po b/addons/membership/i18n/pt.po
index 818c6affda2..67c5b05804e 100644
--- a/addons/membership/i18n/pt.po
+++ b/addons/membership/i18n/pt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:56+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:03+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: membership
 #: model:process.transition,name:membership.process_transition_invoicetoassociate0
diff --git a/addons/membership/i18n/pt_BR.po b/addons/membership/i18n/pt_BR.po
index 62c6266eee6..fc66f51c780 100644
--- a/addons/membership/i18n/pt_BR.po
+++ b/addons/membership/i18n/pt_BR.po
@@ -8,13 +8,14 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 00:36+0000\n"
 "PO-Revision-Date: 2012-07-28 19:37+0000\n"
-"Last-Translator: Fábio Martinelli <webmaster@guaru.net>\n"
+"Last-Translator: Fábio Martinelli - http://zupy.com.br "
+"<webmaster@guaru.net>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:56+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:03+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: membership
 #: model:process.transition,name:membership.process_transition_invoicetoassociate0
diff --git a/addons/membership/i18n/ro.po b/addons/membership/i18n/ro.po
index 72d5edc3b4b..d11b24923a1 100644
--- a/addons/membership/i18n/ro.po
+++ b/addons/membership/i18n/ro.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:56+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:03+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: membership
 #: model:process.transition,name:membership.process_transition_invoicetoassociate0
diff --git a/addons/membership/i18n/ru.po b/addons/membership/i18n/ru.po
index 0ec1ff0bbc4..8287a4483fc 100644
--- a/addons/membership/i18n/ru.po
+++ b/addons/membership/i18n/ru.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:56+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:03+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: membership
 #: model:process.transition,name:membership.process_transition_invoicetoassociate0
diff --git a/addons/membership/i18n/sk.po b/addons/membership/i18n/sk.po
index 471d79f2709..baf3685da5b 100644
--- a/addons/membership/i18n/sk.po
+++ b/addons/membership/i18n/sk.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:56+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:03+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: membership
 #: model:process.transition,name:membership.process_transition_invoicetoassociate0
diff --git a/addons/membership/i18n/sl.po b/addons/membership/i18n/sl.po
index 26fb0c355bc..d7eb7cf5dca 100644
--- a/addons/membership/i18n/sl.po
+++ b/addons/membership/i18n/sl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:56+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:03+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: membership
 #: model:process.transition,name:membership.process_transition_invoicetoassociate0
diff --git a/addons/membership/i18n/sq.po b/addons/membership/i18n/sq.po
index fb45a523327..4af5c94d735 100644
--- a/addons/membership/i18n/sq.po
+++ b/addons/membership/i18n/sq.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:55+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:02+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: membership
 #: model:process.transition,name:membership.process_transition_invoicetoassociate0
diff --git a/addons/membership/i18n/sr@latin.po b/addons/membership/i18n/sr@latin.po
index 2225c8119be..19fdfaf043a 100644
--- a/addons/membership/i18n/sr@latin.po
+++ b/addons/membership/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:56+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:03+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: membership
 #: model:process.transition,name:membership.process_transition_invoicetoassociate0
diff --git a/addons/membership/i18n/sv.po b/addons/membership/i18n/sv.po
index 3e95939d9c4..9670203e843 100644
--- a/addons/membership/i18n/sv.po
+++ b/addons/membership/i18n/sv.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:56+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:03+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: membership
 #: model:process.transition,name:membership.process_transition_invoicetoassociate0
diff --git a/addons/membership/i18n/tlh.po b/addons/membership/i18n/tlh.po
index e99cc3f8f4e..a53f1a6080d 100644
--- a/addons/membership/i18n/tlh.po
+++ b/addons/membership/i18n/tlh.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:56+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:03+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: membership
 #: model:process.transition,name:membership.process_transition_invoicetoassociate0
diff --git a/addons/membership/i18n/tr.po b/addons/membership/i18n/tr.po
index 0ad6a88ca4c..85b0b6fa180 100644
--- a/addons/membership/i18n/tr.po
+++ b/addons/membership/i18n/tr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:56+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:03+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: membership
 #: model:process.transition,name:membership.process_transition_invoicetoassociate0
diff --git a/addons/membership/i18n/uk.po b/addons/membership/i18n/uk.po
index 8839dc7ef79..44dbdb5b74f 100644
--- a/addons/membership/i18n/uk.po
+++ b/addons/membership/i18n/uk.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:56+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:03+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: membership
 #: model:process.transition,name:membership.process_transition_invoicetoassociate0
diff --git a/addons/membership/i18n/vi.po b/addons/membership/i18n/vi.po
index 62fd013e0e2..eee248b6f9d 100644
--- a/addons/membership/i18n/vi.po
+++ b/addons/membership/i18n/vi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:56+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:03+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: membership
 #: model:process.transition,name:membership.process_transition_invoicetoassociate0
diff --git a/addons/membership/i18n/zh_CN.po b/addons/membership/i18n/zh_CN.po
index 39e057c060c..bcda31c6ebb 100644
--- a/addons/membership/i18n/zh_CN.po
+++ b/addons/membership/i18n/zh_CN.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:56+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:03+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: membership
 #: model:process.transition,name:membership.process_transition_invoicetoassociate0
diff --git a/addons/membership/i18n/zh_TW.po b/addons/membership/i18n/zh_TW.po
index 171d4ccb0d6..2d55fb2a80c 100644
--- a/addons/membership/i18n/zh_TW.po
+++ b/addons/membership/i18n/zh_TW.po
@@ -7,31 +7,31 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2010-08-13 13:26+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2012-08-24 06:17+0000\n"
+"Last-Translator: Rossi Liu <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: 2012-08-07 04:56+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:03+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: membership
 #: model:process.transition,name:membership.process_transition_invoicetoassociate0
 msgid "invoice to associate"
-msgstr ""
+msgstr "發票抬頭"
 
 #. module: membership
 #: model:process.process,name:membership.process_process_membershipprocess0
 msgid "Membership Process"
-msgstr ""
+msgstr "會員管理"
 
 #. module: membership
 #: selection:membership.membership_line,state:0
 #: selection:report.membership,membership_state:0
 #: selection:res.partner,membership_state:0
 msgid "Paid Member"
-msgstr ""
+msgstr "付費會員"
 
 #. module: membership
 #: view:report.membership:0
diff --git a/addons/membership/membership.py b/addons/membership/membership.py
index 3439f97f833..2a006814629 100644
--- a/addons/membership/membership.py
+++ b/addons/membership/membership.py
@@ -146,7 +146,7 @@ class membership_line(osv.osv):
         'date_to': fields.date('To', readonly=True),
         'date_cancel': fields.date('Cancel date'),
         'date': fields.date('Join Date', help="Date on which member has joined the membership"),
-        'member_price': fields.float('Member Price', digits_compute= dp.get_precision('Product Price'), required=True, help='Amount for the membership'),
+        'member_price': fields.float('Membership Fee', digits_compute= dp.get_precision('Product Price'), required=True, help='Amount for the membership'),
         'account_invoice_line': fields.many2one('account.invoice.line', 'Account Invoice line', readonly=True),
         'account_invoice_id': fields.related('account_invoice_line', 'invoice_id', type='many2one', relation='account.invoice', string='Invoice', readonly=True),
         'state': fields.function(_state,
@@ -444,14 +444,6 @@ class Partner(osv.osv):
 
 Partner()
 
-class product_template(osv.osv):
-    _inherit = 'product.template'
-    _columns = {
-        'member_price': fields.float('Member Price', digits_compute= dp.get_precision('Product Price')),
-    }
-
-product_template()
-
 class Product(osv.osv):
 
     def fields_view_get(self, cr, user, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
diff --git a/addons/membership/membership_data.xml b/addons/membership/membership_data.xml
deleted file mode 100644
index 14fbb00f9a2..00000000000
--- a/addons/membership/membership_data.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" ?>
-<openerp>
-    <data noupdate="1">
-
-    <!--
-    Price type
-    -->
-    <record model="product.price.type" id="product_price_type_memberprice" >
-        <field name="name">Member Price</field>
-        <field name="field">member_price</field>
-    </record>
-
-    <!--
-    Price list
-    -->
-    <record model="product.pricelist" id="list1m">
-        <field name="name">Member Sale Pricelist</field>
-        <field name="type">sale</field>
-    </record>
-    <record model="product.pricelist.version" id="ver1m">
-        <field name="pricelist_id" ref="list1m"/>
-        <field name="name">Member Sale Pricelist Version</field>
-    </record>
-    <record model="product.pricelist.item" id="item1m">
-        <field name="price_version_id" ref="ver1m"/>
-        <field name="base" ref="product_price_type_memberprice" />
-        <field name="name">Member Sale Pricelist Line</field>
-    </record>
-
-    </data>
-</openerp>
diff --git a/addons/membership/membership_view.xml b/addons/membership/membership_view.xml
index fb128585fd2..ce0e55e37c9 100644
--- a/addons/membership/membership_view.xml
+++ b/addons/membership/membership_view.xml
@@ -88,11 +88,11 @@
             <field name="arch" type="xml">
                 <page string="Information" position="after">
                     <page string="Membership">
-                        <group>
+                        <group col="1">
                             <group>
                                 <field name="membership" readonly="0"/>
                             </group>
-                            <group>
+                            <group attrs="{'invisible':[('membership','=',False)]}">
                                 <field name="membership_date_from" readonly="0" attrs="{'required':[('membership','=',True)]}"/>
                                 <field name="membership_date_to" readonly="0" attrs="{'required':[('membership','=',True)]}"/>
                             </group>
@@ -270,17 +270,5 @@
         <!-- MEMBERSHIP/REPORTING -->
         <menuitem name="Reporting" id="base.menu_report_association" parent="base.menu_association" sequence="20"/>
 
-        <!-- View for product.product object inherited from product module -->
-        <record model="ir.ui.view" id="view_product_form_inherit1">
-            <field name="name">product.normal.form</field>
-            <field name="model">product.product</field>
-            <field name="inherit_id" ref="product.product_normal_form_view"/>
-            <field name="arch" type="xml">
-                <field name="list_price" position="after">
-                    <field name="member_price" groups="base.group_user"/>
-                </field>
-            </field>
-        </record>
-
     </data>
 </openerp>
diff --git a/addons/mrp/__openerp__.py b/addons/mrp/__openerp__.py
index be820de4856..2ecd690a686 100644
--- a/addons/mrp/__openerp__.py
+++ b/addons/mrp/__openerp__.py
@@ -21,16 +21,16 @@
 
 
 {
-    "name" : "MRP",
-    "version" : "1.1",
-    "author" : "OpenERP SA",
-    "website" : "http://www.openerp.com",
-    "category" : "Manufacturing",
-    "sequence": 18,
-    "summary": "Manufacturing Orders, Bill of Materials, Routing",
-    "images" : ["images/bill_of_materials.jpeg", "images/manufacturing_order.jpeg", "images/planning_manufacturing_order.jpeg", "images/production_analysis.jpeg", "images/production_dashboard.jpeg","images/routings.jpeg","images/work_centers.jpeg"],
-    "depends" : ["procurement", "stock", "resource", "purchase", "product","process"],
-    "description": """
+    'name': 'MRP',
+    'version': '1.1',
+    'author': 'OpenERP SA',
+    'website': 'http://www.openerp.com',
+    'category': 'Manufacturing',
+    'sequence': 18,
+    'summary': 'Manufacturing Orders, Bill of Materials, Routing',
+    'images': ['images/bill_of_materials.jpeg', 'images/manufacturing_order.jpeg', 'images/planning_manufacturing_order.jpeg', 'images/production_analysis.jpeg', 'images/production_dashboard.jpeg','images/routings.jpeg','images/work_centers.jpeg'],
+    'depends': ['procurement', 'stock', 'resource', 'purchase', 'product','process'],
+    'description': """
 This is the base module to manage the manufacturing process in OpenERP.
 =======================================================================
 
@@ -67,8 +67,7 @@ Dashboard provided by this module:
     * List of next production orders
     * Graph of stock value variation
     """,
-    'init_xml': [],
-    'update_xml': [
+    'data': [
         'security/mrp_security.xml',
         'security/ir.model.access.csv',
         'mrp_workflow.xml',
@@ -88,9 +87,7 @@ Dashboard provided by this module:
         'board_manufacturing_view.xml',
         'res_config_view.xml',
     ],
-    'demo_xml': [
-         'mrp_demo.xml',
-    ],
+    'demo': ['mrp_demo.xml'],
     #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': [
diff --git a/addons/mrp/board_manufacturing_view.xml b/addons/mrp/board_manufacturing_view.xml
index e7668517a70..cae1fea07dc 100644
--- a/addons/mrp/board_manufacturing_view.xml
+++ b/addons/mrp/board_manufacturing_view.xml
@@ -9,7 +9,6 @@
                     <board style="2-1">
                         <column>
                             <action name="%(procurement.procurement_exceptions)d" string="Procurements in Exception" domain="[('state','=','exception')]"/>
-                            <action name="%(mrp.mrp_production_action2)d" string="Next Production Orders" creatable="true"/>
                         </column>
                         <column>
                             <action name="%(mrp.action_report_in_out_picking_tree)d" string="Stock Value Variation"/>
diff --git a/addons/mrp/i18n/ar.po b/addons/mrp/i18n/ar.po
index 1a590a5c616..4dd8634257b 100644
--- a/addons/mrp/i18n/ar.po
+++ b/addons/mrp/i18n/ar.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:43+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:58+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: mrp
 #: view:mrp.routing.workcenter:0
diff --git a/addons/mrp/i18n/bg.po b/addons/mrp/i18n/bg.po
index fe59c3db351..c433a374169 100644
--- a/addons/mrp/i18n/bg.po
+++ b/addons/mrp/i18n/bg.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:43+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:58+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: mrp
 #: view:mrp.routing.workcenter:0
diff --git a/addons/mrp/i18n/bs.po b/addons/mrp/i18n/bs.po
index 919176726f5..221b8dfd6af 100644
--- a/addons/mrp/i18n/bs.po
+++ b/addons/mrp/i18n/bs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:43+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:58+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: mrp
 #: view:mrp.routing.workcenter:0
diff --git a/addons/mrp/i18n/ca.po b/addons/mrp/i18n/ca.po
index ffddcf4c8c6..48007166a19 100644
--- a/addons/mrp/i18n/ca.po
+++ b/addons/mrp/i18n/ca.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:43+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:58+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: mrp
 #: view:mrp.routing.workcenter:0
diff --git a/addons/mrp/i18n/cs.po b/addons/mrp/i18n/cs.po
index 897fb245946..a6f97ebee88 100644
--- a/addons/mrp/i18n/cs.po
+++ b/addons/mrp/i18n/cs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:43+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:58+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 "X-Poedit-Language: Czech\n"
 
 #. module: mrp
diff --git a/addons/mrp/i18n/da.po b/addons/mrp/i18n/da.po
index 4cda30f1690..becdcd330fc 100644
--- a/addons/mrp/i18n/da.po
+++ b/addons/mrp/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:43+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:58+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: mrp
 #: view:mrp.routing.workcenter:0
diff --git a/addons/mrp/i18n/de.po b/addons/mrp/i18n/de.po
index 5a4fa18831b..b3c8716c9f4 100644
--- a/addons/mrp/i18n/de.po
+++ b/addons/mrp/i18n/de.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:43+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:59+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: mrp
 #: view:mrp.routing.workcenter:0
diff --git a/addons/mrp/i18n/el.po b/addons/mrp/i18n/el.po
index 7ee9e1fbcd1..32dfa7a3025 100644
--- a/addons/mrp/i18n/el.po
+++ b/addons/mrp/i18n/el.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:43+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:59+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
 "X-Poedit-SourceCharset: utf-8\n"
diff --git a/addons/mrp/i18n/es.po b/addons/mrp/i18n/es.po
index a53cbe5d40b..b044729d30a 100644
--- a/addons/mrp/i18n/es.po
+++ b/addons/mrp/i18n/es.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:44+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:59+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: mrp
 #: view:mrp.routing.workcenter:0
diff --git a/addons/mrp/i18n/es_AR.po b/addons/mrp/i18n/es_AR.po
index a0c3d57ea76..995d32da5d5 100644
--- a/addons/mrp/i18n/es_AR.po
+++ b/addons/mrp/i18n/es_AR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:44+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:59+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: mrp
 #: view:mrp.routing.workcenter:0
diff --git a/addons/mrp/i18n/es_CL.po b/addons/mrp/i18n/es_CL.po
index 85baff2bc2d..2c24b479f82 100644
--- a/addons/mrp/i18n/es_CL.po
+++ b/addons/mrp/i18n/es_CL.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:44+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:59+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: mrp
 #: view:mrp.routing.workcenter:0
diff --git a/addons/mrp/i18n/es_CR.po b/addons/mrp/i18n/es_CR.po
index 97ba5aa7bac..77292b8bc9c 100644
--- a/addons/mrp/i18n/es_CR.po
+++ b/addons/mrp/i18n/es_CR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:44+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:59+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 "Language: \n"
 
 #. module: mrp
diff --git a/addons/mrp/i18n/es_EC.po b/addons/mrp/i18n/es_EC.po
index a57d2449bb4..a654c6db97f 100644
--- a/addons/mrp/i18n/es_EC.po
+++ b/addons/mrp/i18n/es_EC.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:44+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:59+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: mrp
 #: view:mrp.routing.workcenter:0
diff --git a/addons/mrp/i18n/et.po b/addons/mrp/i18n/et.po
index 3d0f120d08f..9745405756c 100644
--- a/addons/mrp/i18n/et.po
+++ b/addons/mrp/i18n/et.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:43+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:58+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: mrp
 #: view:mrp.routing.workcenter:0
diff --git a/addons/mrp/i18n/fi.po b/addons/mrp/i18n/fi.po
index c11311dfb32..ad1704e1441 100644
--- a/addons/mrp/i18n/fi.po
+++ b/addons/mrp/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:43+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:58+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: mrp
 #: view:mrp.routing.workcenter:0
diff --git a/addons/mrp/i18n/fr.po b/addons/mrp/i18n/fr.po
index becabf6f550..f2f572d6c27 100644
--- a/addons/mrp/i18n/fr.po
+++ b/addons/mrp/i18n/fr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:43+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:59+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: mrp
 #: field:mrp.bom,product_uom:0
diff --git a/addons/mrp/i18n/gl.po b/addons/mrp/i18n/gl.po
index 3e33548acd0..22cabf88895 100644
--- a/addons/mrp/i18n/gl.po
+++ b/addons/mrp/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:43+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:59+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: mrp
 #: view:mrp.routing.workcenter:0
diff --git a/addons/mrp/i18n/hi.po b/addons/mrp/i18n/hi.po
index 2ce7e5598b5..427d50288fe 100644
--- a/addons/mrp/i18n/hi.po
+++ b/addons/mrp/i18n/hi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:43+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:59+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: mrp
 #: view:mrp.routing.workcenter:0
diff --git a/addons/mrp/i18n/hr.po b/addons/mrp/i18n/hr.po
index 7891c604a13..7f545f986d5 100644
--- a/addons/mrp/i18n/hr.po
+++ b/addons/mrp/i18n/hr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:44+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:59+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: mrp
 #: view:mrp.routing.workcenter:0
diff --git a/addons/mrp/i18n/hu.po b/addons/mrp/i18n/hu.po
index 18809e54855..a54f4137326 100644
--- a/addons/mrp/i18n/hu.po
+++ b/addons/mrp/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:43+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:59+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: mrp
 #: view:mrp.routing.workcenter:0
diff --git a/addons/mrp/i18n/id.po b/addons/mrp/i18n/id.po
index d4097c3c9f1..86b71f3e881 100644
--- a/addons/mrp/i18n/id.po
+++ b/addons/mrp/i18n/id.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:43+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:59+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: mrp
 #: view:mrp.routing.workcenter:0
diff --git a/addons/mrp/i18n/it.po b/addons/mrp/i18n/it.po
index ee5d8ee37b7..5efbb7870e7 100644
--- a/addons/mrp/i18n/it.po
+++ b/addons/mrp/i18n/it.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:43+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:59+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: mrp
 #: view:mrp.routing.workcenter:0
diff --git a/addons/mrp/i18n/ja.po b/addons/mrp/i18n/ja.po
index 529f023d803..e3837617d63 100644
--- a/addons/mrp/i18n/ja.po
+++ b/addons/mrp/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:44+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:59+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: mrp
 #: view:mrp.routing.workcenter:0
diff --git a/addons/mrp/i18n/ko.po b/addons/mrp/i18n/ko.po
index 3683bb43d14..1f34ff36b9f 100644
--- a/addons/mrp/i18n/ko.po
+++ b/addons/mrp/i18n/ko.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:44+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:59+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: mrp
 #: view:mrp.routing.workcenter:0
diff --git a/addons/mrp/i18n/lt.po b/addons/mrp/i18n/lt.po
index c31eca24835..83ff2a3e314 100644
--- a/addons/mrp/i18n/lt.po
+++ b/addons/mrp/i18n/lt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:44+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:59+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 "Language: lt\n"
 
 #. module: mrp
diff --git a/addons/mrp/i18n/lv.po b/addons/mrp/i18n/lv.po
index de8d5b14744..437122ce2cd 100644
--- a/addons/mrp/i18n/lv.po
+++ b/addons/mrp/i18n/lv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:44+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:59+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: mrp
 #: view:mrp.routing.workcenter:0
diff --git a/addons/mrp/i18n/mn.po b/addons/mrp/i18n/mn.po
index 38ade2cd236..a66cb6ffe1e 100644
--- a/addons/mrp/i18n/mn.po
+++ b/addons/mrp/i18n/mn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:44+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:59+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: mrp
 #: view:mrp.routing.workcenter:0
diff --git a/addons/mrp/i18n/nb.po b/addons/mrp/i18n/nb.po
index 259c027d4f0..e94a0636397 100644
--- a/addons/mrp/i18n/nb.po
+++ b/addons/mrp/i18n/nb.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:44+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:59+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: mrp
 #: view:mrp.routing.workcenter:0
@@ -337,7 +337,7 @@ msgstr "Produkt Produser"
 #. module: mrp
 #: constraint:mrp.bom:0
 msgid "Error ! You cannot create recursive BoM."
-msgstr ""
+msgstr "Feil! Du kan ikke lage en uendelig struktur!"
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_routing_workcenter
@@ -406,6 +406,11 @@ msgid ""
 "sales person creates a sales order, he can relate it to several properties "
 "and OpenERP will automatically select the BoM to use according the needs."
 msgstr ""
+"Egenskapene i OpenERP benyttes for å velge riktig materialliste for "
+"produksjon av et produkt hvor det finnes ulike måter å bygge opp produktet. "
+"Du kan legge flere egenskaper på hver materialliste. Når en selger lager en "
+"salgsordre kan han knytte den til ulike egenskaper, og OpenERP vil "
+"automatisk velge riktig materialliste i henhold til behovene."
 
 #. module: mrp
 #: help:mrp.production,picking_id:0
@@ -912,6 +917,8 @@ msgid ""
 "You must first cancel related internal picking attached to this "
 "manufacturing order."
 msgstr ""
+"Du må først annullere tilhørende intern plukkliste knyttet til "
+"produksjonsordren."
 
 #. module: mrp
 #: model:process.node,name:mrp.process_node_minimumstockrule0
diff --git a/addons/mrp/i18n/nl.po b/addons/mrp/i18n/nl.po
index fefa80907c7..f890f30bf59 100644
--- a/addons/mrp/i18n/nl.po
+++ b/addons/mrp/i18n/nl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:43+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:58+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: mrp
 #: view:mrp.routing.workcenter:0
diff --git a/addons/mrp/i18n/nl_BE.po b/addons/mrp/i18n/nl_BE.po
index 60295606495..720234c8f5a 100644
--- a/addons/mrp/i18n/nl_BE.po
+++ b/addons/mrp/i18n/nl_BE.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:44+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:59+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: mrp
 #: view:mrp.routing.workcenter:0
diff --git a/addons/mrp/i18n/pl.po b/addons/mrp/i18n/pl.po
index 5c056d49c51..2d4647be9e1 100644
--- a/addons/mrp/i18n/pl.po
+++ b/addons/mrp/i18n/pl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:44+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:59+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: mrp
 #: view:mrp.routing.workcenter:0
diff --git a/addons/mrp/i18n/pt.po b/addons/mrp/i18n/pt.po
index 2ddb44d160a..f4f70b7fa58 100644
--- a/addons/mrp/i18n/pt.po
+++ b/addons/mrp/i18n/pt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:44+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:59+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: mrp
 #: view:mrp.routing.workcenter:0
diff --git a/addons/mrp/i18n/pt_BR.po b/addons/mrp/i18n/pt_BR.po
index 702d360fa94..aa7250aa3a7 100644
--- a/addons/mrp/i18n/pt_BR.po
+++ b/addons/mrp/i18n/pt_BR.po
@@ -8,13 +8,14 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 00:49+0000\n"
 "PO-Revision-Date: 2012-07-28 22:20+0000\n"
-"Last-Translator: Fábio Martinelli <webmaster@guaru.net>\n"
+"Last-Translator: Fábio Martinelli - http://zupy.com.br "
+"<webmaster@guaru.net>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:44+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:59+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: mrp
 #: view:mrp.routing.workcenter:0
diff --git a/addons/mrp/i18n/ro.po b/addons/mrp/i18n/ro.po
index d8a7645f51d..4c4687d1f25 100644
--- a/addons/mrp/i18n/ro.po
+++ b/addons/mrp/i18n/ro.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:44+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:59+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: mrp
 #: view:mrp.routing.workcenter:0
diff --git a/addons/mrp/i18n/ru.po b/addons/mrp/i18n/ru.po
index 7ad382ef9d4..4a0d3eaf5c4 100644
--- a/addons/mrp/i18n/ru.po
+++ b/addons/mrp/i18n/ru.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:44+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:59+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: mrp
 #: view:mrp.routing.workcenter:0
diff --git a/addons/mrp/i18n/sk.po b/addons/mrp/i18n/sk.po
index 96b3d198348..7f62c1836c9 100644
--- a/addons/mrp/i18n/sk.po
+++ b/addons/mrp/i18n/sk.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:44+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:59+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: mrp
 #: view:mrp.routing.workcenter:0
diff --git a/addons/mrp/i18n/sl.po b/addons/mrp/i18n/sl.po
index 6bf62b9884c..80603cd1591 100644
--- a/addons/mrp/i18n/sl.po
+++ b/addons/mrp/i18n/sl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:44+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:59+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: mrp
 #: view:mrp.routing.workcenter:0
diff --git a/addons/mrp/i18n/sq.po b/addons/mrp/i18n/sq.po
index 29d3023b322..131a02ab8a8 100644
--- a/addons/mrp/i18n/sq.po
+++ b/addons/mrp/i18n/sq.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:43+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:58+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: mrp
 #: view:mrp.routing.workcenter:0
diff --git a/addons/mrp/i18n/sr@latin.po b/addons/mrp/i18n/sr@latin.po
index 0ef68a9a6d5..06c5da4ea56 100644
--- a/addons/mrp/i18n/sr@latin.po
+++ b/addons/mrp/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:44+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:59+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: mrp
 #: view:mrp.routing.workcenter:0
diff --git a/addons/mrp/i18n/sv.po b/addons/mrp/i18n/sv.po
index 7c6d626fcc5..98c0b5615c3 100644
--- a/addons/mrp/i18n/sv.po
+++ b/addons/mrp/i18n/sv.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:44+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:59+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: mrp
 #: view:mrp.routing.workcenter:0
diff --git a/addons/mrp/i18n/tlh.po b/addons/mrp/i18n/tlh.po
index e3807eedcaf..a1ec5465328 100644
--- a/addons/mrp/i18n/tlh.po
+++ b/addons/mrp/i18n/tlh.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:44+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:59+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: mrp
 #: view:mrp.routing.workcenter:0
diff --git a/addons/mrp/i18n/tr.po b/addons/mrp/i18n/tr.po
index aec87da93e6..2e4f1a91a8c 100644
--- a/addons/mrp/i18n/tr.po
+++ b/addons/mrp/i18n/tr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:44+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:59+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: mrp
 #: view:mrp.routing.workcenter:0
@@ -49,7 +49,7 @@ msgstr "İş Merkezi Kullanımı"
 #. module: mrp
 #: model:product.template,name:mrp.product_sugar_product_template
 msgid "Sugar"
-msgstr ""
+msgstr "Şeker"
 
 #. module: mrp
 #: report:mrp.production.order:0
@@ -64,7 +64,7 @@ msgstr "Çevrim Sayısı"
 #. module: mrp
 #: model:product.uom.categ,name:mrp.product_uom_categ_fluid
 msgid "Fluid"
-msgstr ""
+msgstr "Sıvı"
 
 #. module: mrp
 #: model:process.transition,note:mrp.process_transition_minimumstockprocure0
@@ -111,17 +111,17 @@ msgstr "İş Merkezi Ürünü"
 #. module: mrp
 #: view:mrp.bom:0
 msgid "Search Bill Of Material"
-msgstr "Ürün Ağacını Ara"
+msgstr "Ürün Ağacı Ara"
 
 #. module: mrp
 #: model:process.node,note:mrp.process_node_stockproduct1
 msgid "For stockable products and consumables"
-msgstr "Stoklanabilir ürünler ve sarf malzemeleri"
+msgstr "Stoklanabilir ürünler ve sarf malzemeleri için"
 
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_stockproduction0
 msgid "To Produce"
-msgstr "Üretim için"
+msgstr "Üretilir"
 
 #. module: mrp
 #: help:mrp.routing.workcenter,cycle_nbr:0
@@ -138,7 +138,7 @@ msgstr ""
 #: view:mrp.production:0
 #: field:mrp.production,name:0
 msgid "Reference"
-msgstr "Referans"
+msgstr "Kaynak"
 
 #. module: mrp
 #: view:mrp.production:0
@@ -148,13 +148,13 @@ msgstr "Bitmiş Ürünler"
 #. module: mrp
 #: view:mrp.production:0
 msgid "Manufacturing Orders which are currently in production."
-msgstr "Şu an Üretilen Üretim Emirleri"
+msgstr "Şu an üretimde olan Üretim Emirleri"
 
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_servicerfq0
 #: model:process.transition,name:mrp.process_transition_stockrfq0
 msgid "To Buy"
-msgstr "Satın Almak için"
+msgstr "Satınalınır"
 
 #. module: mrp
 #: model:process.transition,note:mrp.process_transition_purchaseprocure0
@@ -170,7 +170,7 @@ msgstr "Bitirilecek Ürünler"
 #. module: mrp
 #: selection:mrp.bom,method:0
 msgid "Set / Pack"
-msgstr "Set / Paket"
+msgstr "Takım / Paket"
 
 #. module: mrp
 #: view:mrp.production:0
@@ -186,7 +186,7 @@ msgstr "Saat Maliyeti"
 #. module: mrp
 #: model:product.template,name:mrp.product_orange_product_template
 msgid "Orange"
-msgstr ""
+msgstr "Portakal"
 
 #. module: mrp
 #: model:process.transition,note:mrp.process_transition_servicemts0
@@ -200,7 +200,7 @@ msgstr ""
 #. module: mrp
 #: view:mrp.production:0
 msgid "UOM"
-msgstr "Birim"
+msgstr "Ölçü Birimi"
 
 #. module: mrp
 #: field:change.production.qty,product_qty:0
@@ -216,8 +216,8 @@ msgid ""
 "Fill this product to track easily your production costs in the analytic "
 "accounting."
 msgstr ""
-"Üretim maliyetinizi analitik hesaplamada kolaylıkla takip etmek için bu "
-"ürünü doldurun."
+"Üretim maliyetinizi analiz muhasebesinde kolaylıklaizlemek için bu ürünü "
+"doldurun."
 
 #. module: mrp
 #: model:process.node,note:mrp.process_node_purchaseprocure0
@@ -227,7 +227,7 @@ msgstr "Satın alınan malzemeler için"
 #. module: mrp
 #: field:mrp.bom.revision,indice:0
 msgid "Revision"
-msgstr "Revizyon"
+msgstr "Düzeltme"
 
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.product_form_config_action
@@ -277,7 +277,7 @@ msgstr "Üretilmiş Ürünler"
 #. module: mrp
 #: report:mrp.production.order:0
 msgid "Destination Location"
-msgstr "Hedef Lokasyon"
+msgstr "Varış Konumu"
 
 #. module: mrp
 #: model:ir.ui.menu,name:mrp.menu_mrp_bom
@@ -290,13 +290,13 @@ msgid ""
 "The system waits for the products to be available in the stock. These "
 "products are typically procured manually or through a minimum stock rule."
 msgstr ""
-"Sistem ürünlerin stokta mevcut olmasını bekler. Bu ürünler normalde manuel "
-"olarak veya minimum stok kuralı aracılığıyla satın alınır."
+"Sistem ürünlerin stokta mevcut olmasını bekler. Bu ürünler normalde elle "
+"veya enaz stok kuralı aracılığıyla satın alınır."
 
 #. module: mrp
 #: report:mrp.production.order:0
 msgid "Partner Ref"
-msgstr "Cari Ref."
+msgstr "Paydaş Ref"
 
 #. module: mrp
 #: field:mrp.production,origin:0
@@ -312,32 +312,32 @@ msgstr "Planlanmış mallar"
 #. module: mrp
 #: selection:mrp.bom,type:0
 msgid "Sets / Phantom"
-msgstr "Setler / Hayalet"
+msgstr "Takımlar / Görüntü"
 
 #. module: mrp
 #: help:mrp.bom,position:0
 msgid "Reference to a position in an external plan."
-msgstr "Harici bir plandaki pozisyona referans."
+msgstr "Dış bir plandaki duruma gönderme."
 
 #. module: mrp
 #: constraint:stock.move:0
 msgid "You try to assign a lot which is not from the same product"
-msgstr "Aynı üründen olmayan bir lota atamaya çalışıyorsunuz."
+msgstr "Aynı üründen olmayan bir parti atamaya çalışıyorsunuz"
 
 #. module: mrp
 #: model:product.template,name:mrp.product_cloth_product_template
 msgid "Cloth"
-msgstr ""
+msgstr "Kumaş"
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_product_produce
 msgid "Product Produce"
-msgstr "Ürün Üretimi"
+msgstr "Ürün Üret"
 
 #. module: mrp
 #: constraint:mrp.bom:0
 msgid "Error ! You cannot create recursive BoM."
-msgstr "Hata ! Kendini İçeren  BoM oluşturamazsınız."
+msgstr "Hata ! Yinelemeli Ürün Ağacı oluşturamazsınız."
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_routing_workcenter
@@ -352,13 +352,13 @@ msgstr "Stoklanabilir Ürün Satınalma"
 #. module: mrp
 #: view:mrp.bom:0
 msgid "Default UOM"
-msgstr "Varsayılan Birim"
+msgstr "Varsayılan Ölçü Birimi"
 
 #. module: mrp
 #: sql_constraint:mrp.production:0
 #: sql_constraint:stock.picking:0
 msgid "Reference must be unique per Company!"
-msgstr "Referans her şirket için tekil olmalı!"
+msgstr "Kaynak her firma için benzersiz olmalı!"
 
 #. module: mrp
 #: code:addons/mrp/report/price.py:139
@@ -412,7 +412,7 @@ msgstr ""
 msgid ""
 "This is the Internal Picking List that brings the finished product to the "
 "production plan"
-msgstr "Bu, bitmiş ürünü üretim planına getiren dahili toplama listesidir"
+msgstr "Bu, bitmiş ürünü üretim planına getiren İç Toplama Listesidir"
 
 #. module: mrp
 #: model:ir.ui.menu,name:mrp.menu_view_resource_calendar_search_mrp
@@ -448,9 +448,9 @@ msgid ""
 "needed.Set a location if you produce at a fixed location. This can be a "
 "partner location if you subcontract the manufacturing operations."
 msgstr ""
-"Bitmiş ürünlerin gerekli olduğu lokasyonda üretim yapıyorsanız boş bırakın. "
-"Sabit bir lokasyonda üretim yapıyorsanız bir lokasyon belirleyin. Üretim "
-"işlemlerini bir alt yükleniciye devrederseniz bu ortak bir lokasyon olabilir."
+"Bitmiş ürünlerin gerekli olduğu konumda üretim yapıyorsanız boş bırakın. "
+"Sabit bir konumda üretim yapıyorsanız bir konum belirleyin. Üretim "
+"işlemlerini bir alt yükleniciye devrederseniz bu ortak bir konum olabilir."
 
 #. module: mrp
 #: view:board.board:0
@@ -470,7 +470,7 @@ msgstr "Ürün tipi hizmettir"
 #. module: mrp
 #: sql_constraint:res.company:0
 msgid "The company name must be unique !"
-msgstr "Şirket adı tekil olmalı !"
+msgstr "Firma adı benzersiz olmalı !"
 
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.mrp_property_group_action
@@ -508,8 +508,8 @@ msgid ""
 "Complete this only if you want automatic analytic accounting entries on "
 "production orders."
 msgstr ""
-"Yalnızca üretim emirleri hakkında otomatik analitik hesaplama istiyorsanız "
-"bunu doldurun."
+"Üretim emirlerinde yalnızca otomatik analiz muhasebesi girişleri "
+"istiyorsanız bunu tamamlayın."
 
 #. module: mrp
 #: field:mrp.production.workcenter.line,cycle:0
@@ -573,7 +573,7 @@ msgstr "Stok Değeri"
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.action_product_bom_structure
 msgid "Product BoM Structure"
-msgstr "Ürün BOM Yapısı"
+msgstr "Ürün Ürün Ağacı Yapısı"
 
 #. module: mrp
 #: view:mrp.production:0
@@ -595,19 +595,19 @@ msgstr "Rota iş merkezlerinin listesini gösterirken sıra numarası verir"
 #. module: mrp
 #: constraint:stock.move:0
 msgid "You can not move products from or to a location of the type view."
-msgstr "view tipinde bir lokasyona ürün giriş çıkışı yapamazsınız."
+msgstr "Görünüm tipindeki bir konuma ürün giriş çıkışı yapamazsınız."
 
 #. module: mrp
 #: field:mrp.bom,child_complete_ids:0
 msgid "BoM Hierarchy"
-msgstr "Bom Hiyerarşisi"
+msgstr "Ürün Ağacı Sıradüzeni"
 
 #. module: mrp
 #: field:mrp.bom,product_uom:0
 #: field:mrp.production,product_uom:0
 #: field:mrp.production.product.line,product_uom:0
 msgid "Product UOM"
-msgstr "Birim"
+msgstr "Ürün Ölçü Birimi"
 
 #. module: mrp
 #: selection:mrp.production,state:0
@@ -617,7 +617,7 @@ msgstr "Toplama İstisnası"
 #. module: mrp
 #: field:mrp.bom,bom_lines:0
 msgid "BoM Lines"
-msgstr "BoM Satırları"
+msgstr "Ürün Ağacı Satırları"
 
 #. module: mrp
 #: field:mrp.workcenter,time_start:0
@@ -630,7 +630,7 @@ msgid ""
 "If the active field is set to False, it will allow you to hide the routing "
 "without removing it."
 msgstr ""
-"Aktif alan Yanlış olarak belirlenirse, kaldırmadan rotayı gizlemenize izin "
+"Etkin alan Yanlış olarak ayarlanırsa, kaldırmadan rotayı gizlemenize izin "
 "verecektir."
 
 #. module: mrp
@@ -643,7 +643,7 @@ msgstr "Malzeme Rotası"
 #: field:mrp.production,move_lines2:0
 #: report:mrp.production.order:0
 msgid "Consumed Products"
-msgstr "Sarfedilen Ürünler"
+msgstr "Tüketilen Ürünler"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.action_mrp_workcenter_load_wizard
@@ -656,7 +656,7 @@ msgstr "İş Merkezi Yükü"
 #: code:addons/mrp/procurement.py:43
 #, python-format
 msgid "No BoM defined for this product !"
-msgstr "Bu ürün için herhangi bir BoM tanımlanmadı !"
+msgstr "Bu ürün için herhangi bir Ürün Ağacı tanımlanmadı !"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_bom_form_action2
@@ -682,7 +682,7 @@ msgstr "Hazır"
 #. module: mrp
 #: model:product.template,name:mrp.product_buttons_product_template
 msgid "Shirt Buttons"
-msgstr ""
+msgstr "Gömlek Düğmeleri"
 
 #. module: mrp
 #: help:mrp.production,routing_id:0
@@ -705,7 +705,7 @@ msgstr "Bir çevrimin tamamlanması için saat olarak süre."
 #. module: mrp
 #: constraint:mrp.bom:0
 msgid "BoM line product should not be same as BoM product."
-msgstr "BoM satırındaki ürün BoM ürünü ile aynı olamaz."
+msgstr "Ürün Ağacı satırındaki ürün Ürün Ağacı ürünü ile aynı olamaz."
 
 #. module: mrp
 #: view:mrp.production:0
@@ -722,9 +722,7 @@ msgstr "Ana Ürün Ağacı"
 msgid ""
 "Product UOS (Unit of Sale) is the unit of measurement for the invoicing and "
 "promotion of stock."
-msgstr ""
-"Stok 2. Birim (Satış Birimi), faturalama ve stok artırımı için ölçüm "
-"birimidir."
+msgstr "Ürün UoS (Satış Birimi), fatura ve ürün arttırımı ölçü birimidir."
 
 #. module: mrp
 #: view:mrp.product_price:0
@@ -736,12 +734,12 @@ msgstr "Yazdır"
 #: view:mrp.bom:0
 #: view:mrp.workcenter:0
 msgid "Type"
-msgstr "Tipi"
+msgstr "Tür"
 
 #. module: mrp
 #: model:process.node,note:mrp.process_node_minimumstockrule0
 msgid "Linked to the 'Minimum stock rule' supplying method."
-msgstr "'Minimum stok kuralı' tedarik yöntemine bağlıdır."
+msgstr "'Enaz stok kuralı' tedarik yöntemine bağlıdır."
 
 #. module: mrp
 #: selection:mrp.workcenter.load,time_unit:0
@@ -758,7 +756,7 @@ msgstr "Ürüne ait ürün ağacı bulunamadı"
 #. module: mrp
 #: report:bom.structure:0
 msgid "Product Name"
-msgstr "Stok Adı"
+msgstr "Ürün Adı"
 
 #. module: mrp
 #: code:addons/mrp/mrp.py:503
@@ -770,7 +768,7 @@ msgstr "Geçersiz eylem !"
 #: help:mrp.bom,product_efficiency:0
 msgid "A factor of 0.9 means a loss of 10% within the production process."
 msgstr ""
-"0,9'luk bir faktör üretim işleminde %10'luk bir kayıp anlamına gelir."
+"0,9 luk bir faktör üretim işleminde %10'luk bir kayıp anlamına gelir."
 
 #. module: mrp
 #: code:addons/mrp/mrp.py:734
@@ -812,9 +810,9 @@ msgid ""
 "order creates a RFQ for a subcontracting purchase order or waits until the "
 "service is done (= the delivery of the products)."
 msgstr ""
-"Seçilen hizmet 'tedarik' yöntemine bağlı olarak, satınalma emri bir fason "
-"satınalma emri için Teklif İsteği oluşturur ya da hizmet sona erene kadar "
-"bekler (= ürünlerin teslimi)."
+"Hizmeti 'tedarik' için seçilen yönteme bağlı olarak, satınalma emri bir "
+"fason satınalma emri için Teklif  İsteği oluşturur ya da hizmet sona erene "
+"kadar bekler (= ürünlerin teslimi)."
 
 #. module: mrp
 #: selection:mrp.production,priority:0
@@ -875,7 +873,7 @@ msgstr "Tarih"
 #. module: mrp
 #: field:mrp.bom,type:0
 msgid "BoM Type"
-msgstr "BoM Tipi"
+msgstr "Ürün Ağacı Tipi"
 
 #. module: mrp
 #: code:addons/mrp/procurement.py:45
@@ -883,7 +881,8 @@ msgstr "BoM Tipi"
 msgid ""
 "Procurement '%s' has an exception: 'No BoM defined for this product !'"
 msgstr ""
-"'%s' satınalmanın istisnası mevcuttur: 'Bu ürün için BoM tanımlanmamıştır !'"
+"'%s' satınalmanın istisnası mevcuttur: 'Bu ürün için Ürün Ağacı "
+"tanımlanmamıştır !'"
 
 #. module: mrp
 #: view:mrp.property:0
@@ -894,7 +893,7 @@ msgstr "Ara"
 #: code:addons/mrp/mrp.py:626
 #, python-format
 msgid "Could not cancel manufacturing order !"
-msgstr "Üretim Emrini iptal edilemiyor !"
+msgstr "Üretim Emri iptal edilemiyor !"
 
 #. module: mrp
 #: field:report.workcenter.load,cycle:0
@@ -904,7 +903,7 @@ msgstr "Çevrim Sayısı"
 #. module: mrp
 #: model:ir.model,name:mrp.model_res_company
 msgid "Companies"
-msgstr "Şirketler"
+msgstr "Firmalar"
 
 #. module: mrp
 #: code:addons/mrp/mrp.py:627
@@ -912,19 +911,20 @@ msgstr "Şirketler"
 msgid ""
 "You must first cancel related internal picking attached to this "
 "manufacturing order."
-msgstr "Önce bu üretim emri ne eklemiş iç alımları iptal etmelisiniz."
+msgstr ""
+"Önce bu üretim emrine eklenmiş ilişkili iç toplamaları iptal etmelisiniz."
 
 #. module: mrp
 #: model:process.node,name:mrp.process_node_minimumstockrule0
 #: model:process.node,name:mrp.process_node_productminimumstockrule0
 msgid "Minimum Stock"
-msgstr "Minimum Stok"
+msgstr "Enaz Stok"
 
 #. module: mrp
 #: code:addons/mrp/mrp.py:503
 #, python-format
 msgid "Cannot delete a manufacturing order in state '%s'"
-msgstr "'%s' durumundaki üretim emirini silinemez."
+msgstr "'%s' durumundaki üretim emri silinemez."
 
 #. module: mrp
 #: model:ir.ui.menu,name:mrp.menus_dash_mrp
@@ -936,7 +936,7 @@ msgstr "Kontrol paneli"
 #: code:addons/mrp/report/price.py:211
 #, python-format
 msgid "Total Cost of %s %s"
-msgstr "Toplam maliyet %s %s"
+msgstr "%s %s in Toplam Maliyeti"
 
 #. module: mrp
 #: model:process.node,name:mrp.process_node_stockproduct0
@@ -981,7 +981,7 @@ msgstr "Üretim Planı."
 #: view:mrp.routing:0
 #: view:mrp.workcenter:0
 msgid "Inactive"
-msgstr "Etkin Olmayan"
+msgstr "Etkin Değil"
 
 #. module: mrp
 #: view:change.production.qty:0
@@ -996,7 +996,7 @@ msgstr "İptal"
 #: code:addons/mrp/wizard/change_production_qty.py:63
 #, python-format
 msgid "Active Id is not found"
-msgstr "Aktif Kimlik bulunmadı"
+msgstr "Etkin Kimlik bulunmadı"
 
 #. module: mrp
 #: model:process.transition,note:mrp.process_transition_servicerfq0
@@ -1015,7 +1015,7 @@ msgstr "Ürün Hareketi"
 #. module: mrp
 #: view:mrp.production:0
 msgid "Late"
-msgstr "Geç"
+msgstr "Son"
 
 #. module: mrp
 #: model:process.node,name:mrp.process_node_servicemts0
@@ -1025,7 +1025,7 @@ msgstr "Stoğa Üretim"
 #. module: mrp
 #: report:bom.structure:0
 msgid "BOM Name"
-msgstr "BOM Adı"
+msgstr "Ürün Ağacı Adı"
 
 #. module: mrp
 #: view:mrp.production:0
@@ -1036,7 +1036,7 @@ msgstr "Üretimi Başlat"
 #: model:ir.actions.act_window,name:mrp.open_board_manufacturing
 #: model:ir.ui.menu,name:mrp.menu_board_manufacturing
 msgid "Production Dashboard"
-msgstr "Üretim Paneli"
+msgstr "Üretim Kontrol Paneli"
 
 #. module: mrp
 #: model:res.groups,name:mrp.group_mrp_manager
@@ -1046,17 +1046,17 @@ msgstr "Yönetici"
 #. module: mrp
 #: view:mrp.production:0
 msgid "Source Loc."
-msgstr "Kaynak Lok."
+msgstr "Kaynak Kon."
 
 #. module: mrp
 #: field:mrp.bom,position:0
 msgid "Internal Reference"
-msgstr "Dahili Referans"
+msgstr "İç Kaynak"
 
 #. module: mrp
 #: model:process.node,note:mrp.process_node_billofmaterial0
 msgid "Product's structure"
-msgstr "Ürün yapısı"
+msgstr "Ürünün yapısı"
 
 #. module: mrp
 #: field:mrp.bom,name:0
@@ -1070,7 +1070,7 @@ msgstr "Adı"
 #. module: mrp
 #: field:mrp.product.produce,mode:0
 msgid "Mode"
-msgstr "Kip"
+msgstr "Biçim"
 
 #. module: mrp
 #: report:bom.structure:0
@@ -1080,7 +1080,7 @@ msgstr "]"
 #. module: mrp
 #: field:mrp.workcenter.load,measure_unit:0
 msgid "Amount measuring unit"
-msgstr "Değer Ölçü Birimi"
+msgstr "Tutar Ölçü Birimi"
 
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.mrp_production_action_planning
@@ -1121,7 +1121,7 @@ msgstr ""
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_production_action3
 msgid "Manufacturing Orders in Progress"
-msgstr "Ürün Emirleri Sürüyor"
+msgstr "Ürün Emirleri İşlemde"
 
 #. module: mrp
 #: view:mrp.bom:0
@@ -1130,7 +1130,7 @@ msgstr "Ürün Emirleri Sürüyor"
 #: view:mrp.routing:0
 #: view:mrp.workcenter:0
 msgid "Group By..."
-msgstr "Grupla..."
+msgstr "Gruplandır..."
 
 #. module: mrp
 #: code:addons/mrp/report/price.py:130
@@ -1141,12 +1141,12 @@ msgstr "Çevrim Maliyeti"
 #. module: mrp
 #: selection:mrp.workcenter.load,measure_unit:0
 msgid "Amount in cycles"
-msgstr "Çevrim miktarı"
+msgstr "Çevrim tutarı"
 
 #. module: mrp
 #: field:mrp.production,location_dest_id:0
 msgid "Finished Products Location"
-msgstr "Bitmiş Ürün Lokasyonu"
+msgstr "Bitmiş Ürün Konumu"
 
 #. module: mrp
 #: model:ir.ui.menu,name:mrp.menu_pm_resources_config
@@ -1158,13 +1158,12 @@ msgstr "Kaynaklar"
 msgid ""
 "Time in hours for this Work Center to achieve the operation of the specified "
 "routing."
-msgstr ""
-"Bu iş merkezinin belirlenen rotadaki operasyonu yapması için gereken saat"
+msgstr "Bu iş merkezinin belirlenen rotadaki iemi yapması için gereken saat"
 
 #. module: mrp
 #: field:mrp.workcenter,costs_journal_id:0
 msgid "Analytic Journal"
-msgstr "Yevmiye Analizi"
+msgstr "Analiz Günlüğü"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_workcenter_action
@@ -1193,12 +1192,12 @@ msgstr ""
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.product_form_config_action
 msgid "Create or Import Products"
-msgstr "Ürünleri Oluştur ya da İçeri Aktar"
+msgstr "Ürünleri Oluştur ya da İçeaktar"
 
 #. module: mrp
 #: field:report.workcenter.load,hour:0
 msgid "Nbr of hour"
-msgstr "Saat"
+msgstr "Saat Sayısı"
 
 #. module: mrp
 #: view:mrp.routing:0
@@ -1213,7 +1212,7 @@ msgstr "Notlar"
 #. module: mrp
 #: view:mrp.production:0
 msgid "Manufacturing Orders which are ready to start production."
-msgstr "Üretime başlamaya hazır Üretim Emirleri"
+msgstr "Üretimi başlatmaya hazır Üretim Emirleri"
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_bom
@@ -1226,7 +1225,7 @@ msgstr "Ürün Ağacı"
 #. module: mrp
 #: view:mrp.workcenter.load:0
 msgid "Select time unit"
-msgstr "Zaman Birimi Seç"
+msgstr "Zaman birimini seç"
 
 #. module: mrp
 #: view:report.workcenter.load:0
@@ -1236,7 +1235,7 @@ msgstr "İş Merkezi yükü"
 #. module: mrp
 #: help:mrp.production,location_dest_id:0
 msgid "Location where the system will stock the finished products."
-msgstr "Sistemin bitmiş ürünleri stokladığı lokasyon."
+msgstr "Sistemin bitmiş ürünleri stokladığı konum."
 
 #. module: mrp
 #: help:mrp.routing.workcenter,routing_id:0
@@ -1256,29 +1255,29 @@ msgid ""
 "maxi quantity. It's available in the Inventory management menu and "
 "configured by product."
 msgstr ""
-"Minimum Stok Kuralı mini ve maksi miktarı temel alan otomatik bir satınalma "
+"Enaz Stok Kuralı enaz ve ençok miktarı temel alan otomatik bir satınalma "
 "kuralıdır. Envanter yönetim menüsündedir ve ürün tarafından yapılandırılır."
 
 #. module: mrp
 #: code:addons/mrp/report/price.py:187
 #, python-format
 msgid "Components Cost of %s %s"
-msgstr "%s %s Bileşen Maliyeti"
+msgstr "%s %s in Bileşen Maliyeti"
 
 #. module: mrp
 #: selection:mrp.workcenter.load,time_unit:0
 msgid "Day by day"
-msgstr "Güne Gün"
+msgstr "Gün ve Gün"
 
 #. module: mrp
 #: view:mrp.bom:0
 msgid "Revisions"
-msgstr "Revizyonlar"
+msgstr "Düzeltmeler"
 
 #. module: mrp
 #: model:product.template,name:mrp.product_shirt_product_template
 msgid "Shirt"
-msgstr ""
+msgstr "Gömlek"
 
 #. module: mrp
 #: field:mrp.production,priority:0
@@ -1326,7 +1325,7 @@ msgstr "Her üretim işlemi için güvenli günler."
 #. module: mrp
 #: model:product.template,name:mrp.product_water_product_template
 msgid "Water"
-msgstr ""
+msgstr "Su"
 
 #. module: mrp
 #: view:mrp.bom:0
@@ -1434,7 +1433,7 @@ msgstr "&Kalan Mesajları Gönder"
 #: code:addons/mrp/mrp.py:603
 #, python-format
 msgid "Couldn't find a bill of material for this product."
-msgstr ""
+msgstr "Bu ürün için gereç listesi bulunamıyor"
 
 #. module: mrp
 #: field:mrp.bom,active:0
@@ -1739,6 +1738,8 @@ msgid ""
 "You are going to consume total %s quantities of \"%s\".\n"
 "But you can only consume up to total %s quantities."
 msgstr ""
+"%s te toplam \"%s\" kadar tüketeceksiniz.\n"
+"Ama ençok %s kadar tüketebilirsiniz."
 
 #. module: mrp
 #: model:process.transition,note:mrp.process_transition_bom0
@@ -1988,7 +1989,7 @@ msgstr "Ayar için saat cinsinden süre."
 #. module: mrp
 #: model:product.template,name:mrp.product_orangejuice_product_template
 msgid "Orange Juice"
-msgstr ""
+msgstr "Portakal Suyu"
 
 #. module: mrp
 #: field:mrp.bom.revision,bom_id:0
@@ -2086,7 +2087,7 @@ msgstr ""
 #. module: mrp
 #: model:product.uom,name:mrp.product_uom_litre
 msgid "Litre"
-msgstr ""
+msgstr "Litre"
 
 #. module: mrp
 #: code:addons/mrp/mrp.py:762
@@ -2095,6 +2096,8 @@ msgid ""
 "You are going to produce total %s quantities of \"%s\".\n"
 "But you can only produce up to total %s quantities."
 msgstr ""
+"%s te  toplam \"%s\" kadar tüketeceksiniz.\n"
+"Ama ençok %s kadar üretebilirsiniz."
 
 #. module: mrp
 #: model:process.node,note:mrp.process_node_stockproduct0
diff --git a/addons/mrp/i18n/uk.po b/addons/mrp/i18n/uk.po
index f0a007ddc51..163fab92b6a 100644
--- a/addons/mrp/i18n/uk.po
+++ b/addons/mrp/i18n/uk.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:44+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:59+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: mrp
 #: view:mrp.routing.workcenter:0
diff --git a/addons/mrp/i18n/vi.po b/addons/mrp/i18n/vi.po
index 932fa991b85..61357a82208 100644
--- a/addons/mrp/i18n/vi.po
+++ b/addons/mrp/i18n/vi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:44+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:59+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: mrp
 #: view:mrp.routing.workcenter:0
diff --git a/addons/mrp/i18n/zh_CN.po b/addons/mrp/i18n/zh_CN.po
index 34d740f2ba3..0f584b45e31 100644
--- a/addons/mrp/i18n/zh_CN.po
+++ b/addons/mrp/i18n/zh_CN.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:44+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:59+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: mrp
 #: view:mrp.routing.workcenter:0
diff --git a/addons/mrp/i18n/zh_HK.po b/addons/mrp/i18n/zh_HK.po
index 662988d2c10..34419ffcba6 100644
--- a/addons/mrp/i18n/zh_HK.po
+++ b/addons/mrp/i18n/zh_HK.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:44+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:59+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: mrp
 #: view:mrp.routing.workcenter:0
diff --git a/addons/mrp/i18n/zh_TW.po b/addons/mrp/i18n/zh_TW.po
index ab524b705a6..cba37db93e5 100644
--- a/addons/mrp/i18n/zh_TW.po
+++ b/addons/mrp/i18n/zh_TW.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:44+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:59+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: mrp
 #: view:mrp.routing.workcenter:0
diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py
index 7b8442b4c46..c667daadbec 100644
--- a/addons/mrp/mrp.py
+++ b/addons/mrp/mrp.py
@@ -369,7 +369,7 @@ class mrp_bom(osv.osv):
         prod_obj = self.pool.get('product.product')
         for obj in self.browse(cr, uid, ids, context=context):
             for prod in prod_obj.browse(cr, uid, [obj.product_id], context=context):
-                self.message_append_note(cr, uid, [obj.id], body=_("Bill of Material has been <b>created</b> for <em>%s</em> product.") % (prod.id.name_template), context=context)
+                self.message_post(cr, uid, [obj.id], body=_("Bill of Material has been <b>created</b> for <em>%s</em> product.") % (prod.id.name_template), context=context)
         return True
 
 mrp_bom()
@@ -407,7 +407,7 @@ class mrp_production(osv.osv):
     _name = 'mrp.production'
     _description = 'Manufacturing Order'
     _date_name  = 'date_planned'
-    _inherit = ['ir.needaction_mixin', 'mail.thread']
+    _inherit = ['mail.thread', 'ir.needaction_mixin']
 
     def _production_calc(self, cr, uid, ids, prop, unknow_none, context=None):
         """ Calculates total hours and total no. of cycles for a production order.
@@ -1046,33 +1046,28 @@ class mrp_production(osv.osv):
     # OpenChatter methods and notifications
     # ---------------------------------------------------
 
-    def message_get_monitored_follower_fields(self, cr, uid, ids, context=None):
-        """ Add 'user_id' to the monitored fields """
-        res = super(mrp_production, self).message_get_monitored_follower_fields(cr, uid, ids, context=context)
-        return res + ['user_id']
-
     def create_send_note(self, cr, uid, ids, context=None):
-        self.message_append_note(cr, uid, ids, body=_("Manufacturing order has been <b>created</b>."), context=context)
+        self.message_post(cr, uid, ids, body=_("Manufacturing order has been <b>created</b>."), context=context)
         return True
 
     def action_cancel_send_note(self, cr, uid, ids, context=None):
         message = _("Manufacturing order has been <b>canceled</b>.")
-        self.message_append_note(cr, uid, ids, body=message, context=context)
+        self.message_post(cr, uid, ids, body=message, context=context)
         return True
 
     def action_ready_send_note(self, cr, uid, ids, context=None):
         message = _("Manufacturing order is <b>ready to produce</b>.")
-        self.message_append_note(cr, uid, ids, body=message, context=context)
+        self.message_post(cr, uid, ids, body=message, context=context)
         return True
 
     def action_in_production_send_note(self, cr, uid, ids, context=None):
         message = _("Manufacturing order is <b>in production</b>.")
-        self.message_append_note(cr, uid, ids, body=message, context=context)
+        self.message_post(cr, uid, ids, body=message, context=context)
         return True
 
     def action_done_send_note(self, cr, uid, ids, context=None):
         message = _("Manufacturing order has been <b>done</b>.")
-        self.message_append_note(cr, uid, ids, body=message, context=context)
+        self.message_post(cr, uid, ids, body=message, context=context)
         return True
 
     def action_confirm_send_note(self, cr, uid, ids, context=None):
@@ -1082,7 +1077,7 @@ class mrp_production(osv.osv):
             obj_datetime = fields.DT.datetime.strptime(obj.date_planned, DEFAULT_SERVER_DATETIME_FORMAT)
             obj_date_str = fields.datetime.context_timestamp(cr, uid, obj_datetime, context=context).strftime(DATETIME_FORMATS_MAP['%+'] + " (%Z)")
             message = _("Manufacturing order has been <b>confirmed</b> and is <b>scheduled</b> for the <em>%s</em>.") % (obj_date_str)
-            self.message_append_note(cr, uid, [obj.id], body=message, context=context)
+            self.message_post(cr, uid, [obj.id], body=message, context=context)
         return True
 
 
diff --git a/addons/mrp/mrp_data.xml b/addons/mrp/mrp_data.xml
index e5d5380f96a..0bbf2d3b64c 100644
--- a/addons/mrp/mrp_data.xml
+++ b/addons/mrp/mrp_data.xml
@@ -2,14 +2,16 @@
 <openerp>
     <data noupdate="1">
         <!-- notify all employees of module installation -->
-        <function model="mail.group" name="message_append_note">
-            <!-- ids, subject, body, parent_id=False, type='notification', content_subtype='html' -->
-            <value eval="[ref('mail.group_all_employees')]"/>
-            <value>Module MRP has been installed</value>
-            <value>Manage your manufacturing process in OpenERP by defining bill of materials (BoM), routings and work centers.  This module supports complete integration and planification of stockable goods, consumable, and services.
+        <record model="mail.message" id="module_install_notification">
+            <field name="model">mail.group</field>
+            <field name="res_id" ref="mail.group_all_employees"/>
+            <field name="type">notification</field>
+            <field name="subject">MRP application installed!</field>
+            <field name="body">Manage your manufacturing process with OpenERP by defining your bills of materials (BoM), routings and work centers.
+This application supports complete integration and production scheduling for stockable goods, consumables, and services.
 
-From the Manufacturing Settings, you can choose to compute production schedules periodically or just-in-time.</value>
-        </function>
+From the Manufacturing Settings, you can choose to compute production schedules periodically or just-in-time.</field>
+        </record>
         
         <record id="sequence_mrp_prod_type" model="ir.sequence.type">
             <field name="name">Production order</field>
diff --git a/addons/mrp/mrp_demo.xml b/addons/mrp/mrp_demo.xml
index d0f05a2aaff..952a5e0e3de 100644
--- a/addons/mrp/mrp_demo.xml
+++ b/addons/mrp/mrp_demo.xml
@@ -49,7 +49,7 @@
             <field name="costs_hour_account_id" ref="account_assembly_hours"/>
             <field name="costs_cycle">0.05</field>
             <field name="costs_cycle_account_id" ref="account_assembly_cycle"/>
-            <field name="costs_journal_id" ref="account.expenses_journal"/>
+            <field name="costs_journal_id" ref="account.exp"/>
             <field name="costs_general_account_id" ref="account.a_expense"/>
             <field name="costs_general_account_id" ref="account.a_expense"/>
             <field name="calendar_id" ref="resource.timesheet_group1"/>
diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index c394544574d..8121f6e84d1 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -362,6 +362,10 @@
                         </group>
                         <group>
                             <field name="type"/>
+                            <p colspan="2" class="oe_grey" attrs="{'invisible': [('type','=','normal')]}">
+                                When processing a sale order for this product, the delivery order
+                                will contain the raw materials, instead of the finished product.
+                            </p>
                             <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                             <label for="product_uos_qty" groups="product.group_uos"/>
                             <div groups="product.group_uos" >
@@ -497,7 +501,7 @@
             <field name="res_model">mrp.bom</field>
             <field name="view_type">form</field>
             <field name="view_id" ref="mrp_bom_component_tree_view"/>
-            <field name="domain">[('bom_id','!=',False)]</field>
+            <field name="domain">[]</field>
             <field name="help" type="html">
               <p class="oe_view_nocontent_create">
                 Click to add a component to a bill of material.
@@ -520,6 +524,7 @@
             action="mrp_bom_form_action2"
             id="menu_mrp_bom_form_action2"
             parent="menu_mrp_configuration"
+            groups="base.group_no_one"
             sequence="20"/>
 
         <record id="action2" model="ir.actions.act_window">
@@ -574,8 +579,8 @@
             <field name="name">mrp.production.tree</field>
             <field name="model">mrp.production</field>
             <field name="arch" type="xml">
-                <tree fonts="bold:needaction_pending==True" colors="blue:state in ('draft','confirmed');red:date_planned&lt;current_date and state not in ('done','cancel');black:date_planned&gt;=current_date;gray:state in ('done','cancel') " string="Manufacturing Orders">
-                    <field name="needaction_pending" invisible="1"/>
+                <tree fonts="bold:message_unread==True" colors="blue:state in ('draft','confirmed');red:date_planned&lt;current_date and state not in ('done','cancel');black:date_planned&gt;=current_date;gray:state in ('done','cancel') " string="Manufacturing Orders">
+                    <field name="message_unread" invisible="1"/>
                     <field name="name"/>
                     <field name="date_planned"/>
                     <field name="product_id"/>
@@ -643,50 +648,42 @@
                     <field name="state" widget="statusbar" statusbar_visible="draft,ready,in_production,done" statusbar_colors='{"picking_except":"red","confirmed":"blue"}'/>
                 </header>
                 <sheet>
-                    <label for="product_id" class="oe_edit_only"/>
-                    <h1>
-                        <field name="product_id" on_change="product_id_change(product_id)" domain="[('bom_ids','&lt;&gt;',False),('bom_ids.bom_id','=',False)]" class="oe_inline"/>
-                    </h1>
-                    <label for="product_qty" class="oe_edit_only"/>
-                    <h2>
-                        <field name="product_qty" class="oe_inline"/>
-                        <field name="product_uom" groups="product.group_uom" class="oe_inline"/>
-                        <button type="action"
-                            icon="terp-accessories-archiver+"
-                            name="%(mrp.action_change_production_qty)d"
-                            string="Change Qty" states="ready,confirmed" class="oe_inline"/>
-                    </h2>
-                    <div groups="mrp.group_mrp_routings">
-                        <label for="routing_id" class="oe_edit_only"/>
-                        <h2><field name="routing_id" class="oe_inline"/></h2>
+                    <div class="oe_title">
+                        <h1>Manufacturing Order <field name="name" class="oe_inline"/></h1>
                     </div>
                     <group>
                         <group>
-                            <field name="name"/>
-                            <field name="date_planned"/>
-                            <field name="origin"/>
-                        </group>
-                        <group>
-                            <field name="user_id"/>
+                            <field name="product_id" on_change="product_id_change(product_id)" domain="[('bom_ids','&lt;&gt;',False),('bom_ids.bom_id','=',False)]" class="oe_inline"/>
+                            <label for="product_qty"/>
+                            <div>
+                                <field name="product_qty" class="oe_inline"/>
+                                <field name="product_uom" groups="product.group_uom" class="oe_inline"/>
+                                <button type="action"
+                                    icon="terp-accessories-archiver+"
+                                    name="%(mrp.action_change_production_qty)d"
+                                    string="(Update)" states="ready,confirmed" class="oe_edit_only oe_link"/>
+                            </div>
                             <label for="product_uos_qty" groups="product.group_uos"/>
                             <div groups="product.group_uos">
                                 <field name="product_uos_qty" class="oe_inline"/>
                                 <label string="-" attrs="{'invisible':[('product_uos','=',False)]}" class="oe_inline"/>
                                 <field name="product_uos" class="oe_inline"/>
                             </div>
+                            <field name="date_planned"/>
+                        </group>
+                        <group>
+                            <field name="bom_id" domain="[('product_id','=',product_id)]" context="{'default_product_id': product_id}" on_change="bom_id_change(bom_id)"/>
+                            <field name="routing_id" class="oe_inline" groups="mrp.group_mrp_routings"/>
+                            <field name="user_id"/>
+                            <field name="origin"/>
+                        </group>
+                        <group groups="stock.group_locations">
+                            <field name="location_src_id" domain="[('usage','=','internal')]" on_change="location_id_change(location_src_id,location_dest_id)"/>
+                            <field name="location_dest_id" domain="[('usage','=','internal')]"/>
                         </group>
                     </group>
                     <notebook>
                         <page string="Consumed Products">
-                            <group groups="stock.group_locations">
-                                <group>
-                                    <field name="bom_id" domain="[('product_id','=',product_id)]" context="{'default_product_id': product_id}" on_change="bom_id_change(bom_id)"/>
-                                </group>
-                                <group>
-                                    <field name="location_src_id" domain="[('usage','=','internal')]" on_change="location_id_change(location_src_id,location_dest_id)"/>
-                                    <field name="location_dest_id" domain="[('usage','=','internal')]"/>
-                                </group>
-                            </group>
                             <group>
                                 <group string="Products to Consume">
                                     <field name="move_lines" domain="[('state','&lt;&gt;', ('done', 'cancel'))]" nolabel="1">
@@ -981,33 +978,14 @@
                </data>
             </field>
         </record>
-
-        <record id="product_normal_form_view" model="ir.ui.view">
+        <record id="product_normal_form_supply_view" model="ir.ui.view">
             <field name="name">product.normal.form.mrp.inherit</field>
             <field name="model">product.product</field>
             <field name="inherit_id" ref="product.product_normal_form_view"/>
             <field name="arch" type="xml">
-                <page string="Procurement &amp; Locations" position="inside">
-                    <separator string="Bill of Materials"/>
-                    <field name="bom_ids" widget="one2many_list" mode="tree" context="{'default_product_id': active_id}">
-                        <tree string="Bill of Materials">
-                            <field name="name" string="Component Name"/>
-                            <field name="bom_id"/>
-                            <field name="product_qty" string="Quantity of Product"/>
-                            <field name="type"/>
-                            <field name="date_start"/>
-                            <field name="date_stop"/>
-                        </tree>
-                        <form string="Bill of Material">
-                            <field name="name" string="Component Name"/>
-                            <field name="bom_id"/>
-                            <field name="product_qty" string="Quantity of Product"/>
-                            <field name="type"/>
-                            <field name="date_start"/>
-                            <field name="date_stop"/>
-                        </form>
-                    </field>
-                </page>
+                <xpath expr="//field[@name='procure_method']" position="after">
+                    <field name="supply_method" groups="base.group_user"/>
+                </xpath>
             </field>
         </record>
 
@@ -1065,5 +1043,24 @@
                 id="menu_mrp_production_order_action" name="Orders Planning"
                 parent="menu_mrp_planning" sequence="1"/>
 
+
+        <record model="ir.actions.act_window" id="product_open_bom">
+            <field name="context">{'default_product_id': active_id, 'search_default_product_id': active_id}</field>
+            <field name="name">Bill of Materials</field>
+            <field name="res_model">mrp.bom</field>
+        </record>
+
+        <record model="ir.ui.view" id="product_form_view_bom_button">
+            <field name="name">product.product.procurement</field>
+            <field name="model">product.product</field>
+            <field name="inherit_id" ref="product.product_normal_form_view"/>
+            <field name="arch" type="xml">
+                <xpath expr="//div[@name='buttons']" position="inside">
+                    <button string="Bill of Materials" name="%(product_open_bom)d" type="action"/>
+                </xpath>
+            </field>
+        </record>
+
+
     </data>
 </openerp>
diff --git a/addons/mrp/procurement.py b/addons/mrp/procurement.py
index 363f98e35d1..7f417dc18b1 100644
--- a/addons/mrp/procurement.py
+++ b/addons/mrp/procurement.py
@@ -43,7 +43,7 @@ class procurement_order(osv.osv):
             cr.execute('update procurement_order set message=%s where id=%s', (_('No BoM defined for this product !'), procurement.id))
             for (id, name) in self.name_get(cr, uid, procurement.id):
                 message = _("Procurement '%s' has an exception: 'No BoM defined for this product !'") % name
-                self.message_append_note(cr, uid, [procurement.id], body=message, context=context)
+                self.message_post(cr, uid, [procurement.id], body=message, context=context)
             return False
         return True
     
diff --git a/addons/mrp/product.py b/addons/mrp/product.py
index 1bc3bb749ce..1fa0f2c8a97 100644
--- a/addons/mrp/product.py
+++ b/addons/mrp/product.py
@@ -26,7 +26,7 @@ from tools.translate import _
 class product_product(osv.osv):
     _inherit = "product.product"    
     _columns = {
-        "bom_ids": fields.one2many('mrp.bom', 'product_id','Bill of Materials'),
+        "bom_ids": fields.one2many('mrp.bom', 'product_id','Bill of Materials', domain=[('bom_id','=',False)]),
     }
     def copy(self, cr, uid, id, default=None, context=None):
         if not default:
diff --git a/addons/mrp_jit/__openerp__.py b/addons/mrp_jit/__openerp__.py
index ee00ac703cb..ddd5e3d63fb 100644
--- a/addons/mrp_jit/__openerp__.py
+++ b/addons/mrp_jit/__openerp__.py
@@ -40,8 +40,8 @@ In that case, you can not use priorities any more on the different picking.
     """,
     'author': 'OpenERP SA',
     'depends': ['procurement'],
-    'update_xml': ['mrp_jit.xml'],
-    'demo_xml': [],
+    'data': ['mrp_jit.xml'],
+    'demo': [],
     'test': ['test/mrp_jit.yml'],
     'installable': True,
     'auto_install': False,
diff --git a/addons/mrp_jit/i18n/ar.po b/addons/mrp_jit/i18n/ar.po
index 0c6682c9bc7..5f0d12af153 100644
--- a/addons/mrp_jit/i18n/ar.po
+++ b/addons/mrp_jit/i18n/ar.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:29+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: mrp_jit
 #: model:ir.module.module,shortdesc:mrp_jit.module_meta_information
diff --git a/addons/mrp_jit/i18n/bg.po b/addons/mrp_jit/i18n/bg.po
index 3a87d759e3c..2e8b505cd33 100644
--- a/addons/mrp_jit/i18n/bg.po
+++ b/addons/mrp_jit/i18n/bg.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:29+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: mrp_jit
 #: model:ir.module.module,shortdesc:mrp_jit.module_meta_information
diff --git a/addons/mrp_jit/i18n/bs.po b/addons/mrp_jit/i18n/bs.po
index faab11b32d5..7d9485a372a 100644
--- a/addons/mrp_jit/i18n/bs.po
+++ b/addons/mrp_jit/i18n/bs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:29+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: mrp_jit
 #: model:ir.module.module,shortdesc:mrp_jit.module_meta_information
diff --git a/addons/mrp_jit/i18n/ca.po b/addons/mrp_jit/i18n/ca.po
index 467e46c9082..945190bbd2a 100644
--- a/addons/mrp_jit/i18n/ca.po
+++ b/addons/mrp_jit/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:29+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: mrp_jit
 #: model:ir.module.module,shortdesc:mrp_jit.module_meta_information
diff --git a/addons/mrp_jit/i18n/cs.po b/addons/mrp_jit/i18n/cs.po
index f88805c6b72..c568e2523a1 100644
--- a/addons/mrp_jit/i18n/cs.po
+++ b/addons/mrp_jit/i18n/cs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:29+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: mrp_jit
 #: model:ir.module.module,shortdesc:mrp_jit.module_meta_information
diff --git a/addons/mrp_jit/i18n/da.po b/addons/mrp_jit/i18n/da.po
index 5b00f155b5e..679fbf32e31 100644
--- a/addons/mrp_jit/i18n/da.po
+++ b/addons/mrp_jit/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:29+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: mrp_jit
 #: model:ir.module.module,shortdesc:mrp_jit.module_meta_information
diff --git a/addons/mrp_jit/i18n/de.po b/addons/mrp_jit/i18n/de.po
index f7bb4b6607f..6e6f3de57a4 100644
--- a/addons/mrp_jit/i18n/de.po
+++ b/addons/mrp_jit/i18n/de.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:29+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: mrp_jit
 #: model:ir.module.module,shortdesc:mrp_jit.module_meta_information
diff --git a/addons/mrp_jit/i18n/el.po b/addons/mrp_jit/i18n/el.po
index 271fb8a3834..1c7435a510f 100644
--- a/addons/mrp_jit/i18n/el.po
+++ b/addons/mrp_jit/i18n/el.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:29+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
 "X-Poedit-SourceCharset: utf-8\n"
diff --git a/addons/mrp_jit/i18n/es.po b/addons/mrp_jit/i18n/es.po
index addd50239a8..0ca0346f567 100644
--- a/addons/mrp_jit/i18n/es.po
+++ b/addons/mrp_jit/i18n/es.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:29+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: mrp_jit
 #: model:ir.module.module,shortdesc:mrp_jit.module_meta_information
diff --git a/addons/mrp_jit/i18n/es_AR.po b/addons/mrp_jit/i18n/es_AR.po
index 2732765feea..f2f02b39312 100644
--- a/addons/mrp_jit/i18n/es_AR.po
+++ b/addons/mrp_jit/i18n/es_AR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:29+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: mrp_jit
 #: model:ir.module.module,shortdesc:mrp_jit.module_meta_information
diff --git a/addons/mrp_jit/i18n/es_CR.po b/addons/mrp_jit/i18n/es_CR.po
index bbad1816919..4230c269b6f 100644
--- a/addons/mrp_jit/i18n/es_CR.po
+++ b/addons/mrp_jit/i18n/es_CR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:29+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 "Language: \n"
 
 #. module: mrp_jit
diff --git a/addons/mrp_jit/i18n/es_EC.po b/addons/mrp_jit/i18n/es_EC.po
index 3a502305280..b7f880c475a 100644
--- a/addons/mrp_jit/i18n/es_EC.po
+++ b/addons/mrp_jit/i18n/es_EC.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:29+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: mrp_jit
 #: model:ir.module.module,shortdesc:mrp_jit.module_meta_information
diff --git a/addons/mrp_jit/i18n/et.po b/addons/mrp_jit/i18n/et.po
index 9f309c74d58..f88a2d89c91 100644
--- a/addons/mrp_jit/i18n/et.po
+++ b/addons/mrp_jit/i18n/et.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:29+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: mrp_jit
 #: model:ir.module.module,shortdesc:mrp_jit.module_meta_information
diff --git a/addons/mrp_jit/i18n/fi.po b/addons/mrp_jit/i18n/fi.po
index bc4150abac7..91d5e7b6bb9 100644
--- a/addons/mrp_jit/i18n/fi.po
+++ b/addons/mrp_jit/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:29+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: mrp_jit
 #: model:ir.module.module,shortdesc:mrp_jit.module_meta_information
diff --git a/addons/mrp_jit/i18n/fr.po b/addons/mrp_jit/i18n/fr.po
index e583884d23b..018a8212698 100644
--- a/addons/mrp_jit/i18n/fr.po
+++ b/addons/mrp_jit/i18n/fr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:29+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: mrp_jit
 #: model:ir.module.module,shortdesc:mrp_jit.module_meta_information
diff --git a/addons/mrp_jit/i18n/gl.po b/addons/mrp_jit/i18n/gl.po
index 4d914d15abe..38e76ca1438 100644
--- a/addons/mrp_jit/i18n/gl.po
+++ b/addons/mrp_jit/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:29+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: mrp_jit
 #: model:ir.module.module,shortdesc:mrp_jit.module_meta_information
diff --git a/addons/mrp_jit/i18n/hr.po b/addons/mrp_jit/i18n/hr.po
index ad7efdaa535..6bea556299b 100644
--- a/addons/mrp_jit/i18n/hr.po
+++ b/addons/mrp_jit/i18n/hr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:29+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: mrp_jit
 #: model:ir.module.module,shortdesc:mrp_jit.module_meta_information
diff --git a/addons/mrp_jit/i18n/hu.po b/addons/mrp_jit/i18n/hu.po
index c79f867beb1..f12b66f6d1a 100644
--- a/addons/mrp_jit/i18n/hu.po
+++ b/addons/mrp_jit/i18n/hu.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:29+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: mrp_jit
 #: model:ir.module.module,shortdesc:mrp_jit.module_meta_information
diff --git a/addons/mrp_jit/i18n/id.po b/addons/mrp_jit/i18n/id.po
index 2fd4478cf95..3612631c20a 100644
--- a/addons/mrp_jit/i18n/id.po
+++ b/addons/mrp_jit/i18n/id.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:29+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: mrp_jit
 #: model:ir.module.module,shortdesc:mrp_jit.module_meta_information
diff --git a/addons/mrp_jit/i18n/it.po b/addons/mrp_jit/i18n/it.po
index 1b36adc4d2b..3f2a5d27baf 100644
--- a/addons/mrp_jit/i18n/it.po
+++ b/addons/mrp_jit/i18n/it.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:29+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: mrp_jit
 #: model:ir.module.module,shortdesc:mrp_jit.module_meta_information
diff --git a/addons/mrp_jit/i18n/ja.po b/addons/mrp_jit/i18n/ja.po
index 60c7037307a..449c029f2d0 100644
--- a/addons/mrp_jit/i18n/ja.po
+++ b/addons/mrp_jit/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:29+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: mrp_jit
 #: model:ir.module.module,shortdesc:mrp_jit.module_meta_information
diff --git a/addons/mrp_jit/i18n/kab.po b/addons/mrp_jit/i18n/kab.po
index 3908d1e4de6..47ee985b908 100644
--- a/addons/mrp_jit/i18n/kab.po
+++ b/addons/mrp_jit/i18n/kab.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:29+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: mrp_jit
 #: model:ir.module.module,shortdesc:mrp_jit.module_meta_information
diff --git a/addons/mrp_jit/i18n/ko.po b/addons/mrp_jit/i18n/ko.po
index c92e58d6a1e..02d639f8bb1 100644
--- a/addons/mrp_jit/i18n/ko.po
+++ b/addons/mrp_jit/i18n/ko.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:29+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: mrp_jit
 #: model:ir.module.module,shortdesc:mrp_jit.module_meta_information
diff --git a/addons/mrp_jit/i18n/lt.po b/addons/mrp_jit/i18n/lt.po
index eb2dd2abafe..a2d9c7b648c 100644
--- a/addons/mrp_jit/i18n/lt.po
+++ b/addons/mrp_jit/i18n/lt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:29+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: mrp_jit
 #: model:ir.module.module,shortdesc:mrp_jit.module_meta_information
diff --git a/addons/mrp_jit/i18n/ml.po b/addons/mrp_jit/i18n/ml.po
index 99dae32372b..6ef29550b09 100644
--- a/addons/mrp_jit/i18n/ml.po
+++ b/addons/mrp_jit/i18n/ml.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:29+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: mrp_jit
 #: model:ir.module.module,shortdesc:mrp_jit.module_meta_information
diff --git a/addons/mrp_jit/i18n/mn.po b/addons/mrp_jit/i18n/mn.po
index 1c376af608a..0bc62694b18 100644
--- a/addons/mrp_jit/i18n/mn.po
+++ b/addons/mrp_jit/i18n/mn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:29+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: mrp_jit
 #: model:ir.module.module,shortdesc:mrp_jit.module_meta_information
diff --git a/addons/mrp_jit/i18n/nb.po b/addons/mrp_jit/i18n/nb.po
index 1503ab7fa3e..de59412a969 100644
--- a/addons/mrp_jit/i18n/nb.po
+++ b/addons/mrp_jit/i18n/nb.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:29+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: mrp_jit
 #: model:ir.module.module,shortdesc:mrp_jit.module_meta_information
diff --git a/addons/mrp_jit/i18n/nl.po b/addons/mrp_jit/i18n/nl.po
index 14478c33041..ed6aaffe5eb 100644
--- a/addons/mrp_jit/i18n/nl.po
+++ b/addons/mrp_jit/i18n/nl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:29+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: mrp_jit
 #: model:ir.module.module,shortdesc:mrp_jit.module_meta_information
diff --git a/addons/mrp_jit/i18n/nl_BE.po b/addons/mrp_jit/i18n/nl_BE.po
index 54dff44ba01..d32bc9e546b 100644
--- a/addons/mrp_jit/i18n/nl_BE.po
+++ b/addons/mrp_jit/i18n/nl_BE.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:29+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: mrp_jit
 #: model:ir.module.module,shortdesc:mrp_jit.module_meta_information
diff --git a/addons/mrp_jit/i18n/oc.po b/addons/mrp_jit/i18n/oc.po
index 508d97296e8..f3d17900f19 100644
--- a/addons/mrp_jit/i18n/oc.po
+++ b/addons/mrp_jit/i18n/oc.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:29+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: mrp_jit
 #: model:ir.module.module,shortdesc:mrp_jit.module_meta_information
diff --git a/addons/mrp_jit/i18n/pl.po b/addons/mrp_jit/i18n/pl.po
index 190fa3dfe95..36ee34fc759 100644
--- a/addons/mrp_jit/i18n/pl.po
+++ b/addons/mrp_jit/i18n/pl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:29+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: mrp_jit
 #: model:ir.module.module,shortdesc:mrp_jit.module_meta_information
diff --git a/addons/mrp_jit/i18n/pt.po b/addons/mrp_jit/i18n/pt.po
index d6782cbe7bc..b19542461ad 100644
--- a/addons/mrp_jit/i18n/pt.po
+++ b/addons/mrp_jit/i18n/pt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:29+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: mrp_jit
 #: model:ir.module.module,shortdesc:mrp_jit.module_meta_information
diff --git a/addons/mrp_jit/i18n/pt_BR.po b/addons/mrp_jit/i18n/pt_BR.po
index 5d17a0aad2c..7e684dfdf59 100644
--- a/addons/mrp_jit/i18n/pt_BR.po
+++ b/addons/mrp_jit/i18n/pt_BR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:29+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: mrp_jit
 #: model:ir.module.module,shortdesc:mrp_jit.module_meta_information
diff --git a/addons/mrp_jit/i18n/ro.po b/addons/mrp_jit/i18n/ro.po
index 8eb7de9d617..d85d67069d5 100644
--- a/addons/mrp_jit/i18n/ro.po
+++ b/addons/mrp_jit/i18n/ro.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:29+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: mrp_jit
 #: model:ir.module.module,shortdesc:mrp_jit.module_meta_information
diff --git a/addons/mrp_jit/i18n/ru.po b/addons/mrp_jit/i18n/ru.po
index 13b445f1a5b..017834fa3e0 100644
--- a/addons/mrp_jit/i18n/ru.po
+++ b/addons/mrp_jit/i18n/ru.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:29+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: mrp_jit
 #: model:ir.module.module,shortdesc:mrp_jit.module_meta_information
diff --git a/addons/mrp_jit/i18n/sk.po b/addons/mrp_jit/i18n/sk.po
index b851a9eef29..0263cc201b4 100644
--- a/addons/mrp_jit/i18n/sk.po
+++ b/addons/mrp_jit/i18n/sk.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:29+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: mrp_jit
 #: model:ir.module.module,shortdesc:mrp_jit.module_meta_information
diff --git a/addons/mrp_jit/i18n/sl.po b/addons/mrp_jit/i18n/sl.po
index 59e047adeb5..7e8d26a6ecc 100644
--- a/addons/mrp_jit/i18n/sl.po
+++ b/addons/mrp_jit/i18n/sl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:29+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: mrp_jit
 #: model:ir.module.module,shortdesc:mrp_jit.module_meta_information
diff --git a/addons/mrp_jit/i18n/sq.po b/addons/mrp_jit/i18n/sq.po
index 0aa329d1ca1..c006fd41857 100644
--- a/addons/mrp_jit/i18n/sq.po
+++ b/addons/mrp_jit/i18n/sq.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:29+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: mrp_jit
 #: model:ir.module.module,shortdesc:mrp_jit.module_meta_information
diff --git a/addons/mrp_jit/i18n/sr.po b/addons/mrp_jit/i18n/sr.po
index 81b6622aaa3..d1953099287 100644
--- a/addons/mrp_jit/i18n/sr.po
+++ b/addons/mrp_jit/i18n/sr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:29+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: mrp_jit
 #: model:ir.module.module,shortdesc:mrp_jit.module_meta_information
diff --git a/addons/mrp_jit/i18n/sr@latin.po b/addons/mrp_jit/i18n/sr@latin.po
index fb37b8574b8..166cda0176e 100644
--- a/addons/mrp_jit/i18n/sr@latin.po
+++ b/addons/mrp_jit/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:29+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: mrp_jit
 #: model:ir.module.module,shortdesc:mrp_jit.module_meta_information
diff --git a/addons/mrp_jit/i18n/sv.po b/addons/mrp_jit/i18n/sv.po
index c004b69400d..3e1c5f3040a 100644
--- a/addons/mrp_jit/i18n/sv.po
+++ b/addons/mrp_jit/i18n/sv.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:29+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: mrp_jit
 #: model:ir.module.module,shortdesc:mrp_jit.module_meta_information
diff --git a/addons/mrp_jit/i18n/ta.po b/addons/mrp_jit/i18n/ta.po
index 427bfb1c3a8..0e889181fdf 100644
--- a/addons/mrp_jit/i18n/ta.po
+++ b/addons/mrp_jit/i18n/ta.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:29+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: mrp_jit
 #: model:ir.module.module,shortdesc:mrp_jit.module_meta_information
diff --git a/addons/mrp_jit/i18n/tr.po b/addons/mrp_jit/i18n/tr.po
index dd2239fe4c9..ad01b69d6d2 100644
--- a/addons/mrp_jit/i18n/tr.po
+++ b/addons/mrp_jit/i18n/tr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:29+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: mrp_jit
 #: model:ir.module.module,shortdesc:mrp_jit.module_meta_information
diff --git a/addons/mrp_jit/i18n/uk.po b/addons/mrp_jit/i18n/uk.po
index 82f9dd9d966..c95d005a073 100644
--- a/addons/mrp_jit/i18n/uk.po
+++ b/addons/mrp_jit/i18n/uk.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:29+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: mrp_jit
 #: model:ir.module.module,shortdesc:mrp_jit.module_meta_information
diff --git a/addons/mrp_jit/i18n/vi.po b/addons/mrp_jit/i18n/vi.po
index 0e5c7d7c224..7889e243658 100644
--- a/addons/mrp_jit/i18n/vi.po
+++ b/addons/mrp_jit/i18n/vi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:29+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: mrp_jit
 #: model:ir.module.module,shortdesc:mrp_jit.module_meta_information
diff --git a/addons/mrp_jit/i18n/zh_CN.po b/addons/mrp_jit/i18n/zh_CN.po
index 7804a7f8659..9dcd5914364 100644
--- a/addons/mrp_jit/i18n/zh_CN.po
+++ b/addons/mrp_jit/i18n/zh_CN.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:29+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: mrp_jit
 #: model:ir.module.module,shortdesc:mrp_jit.module_meta_information
diff --git a/addons/mrp_jit/i18n/zh_TW.po b/addons/mrp_jit/i18n/zh_TW.po
index aac69710050..6963c3a518b 100644
--- a/addons/mrp_jit/i18n/zh_TW.po
+++ b/addons/mrp_jit/i18n/zh_TW.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:29+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: mrp_jit
 #: model:ir.module.module,shortdesc:mrp_jit.module_meta_information
diff --git a/addons/mrp_operations/__openerp__.py b/addons/mrp_operations/__openerp__.py
index 25446456dec..a5bda80f924 100644
--- a/addons/mrp_operations/__openerp__.py
+++ b/addons/mrp_operations/__openerp__.py
@@ -25,7 +25,7 @@
     'version': '1.0',
     'category': 'Manufacturing',
     'description': """
-This module adds state, date_start, date_stop in manufacturing order operation lines (in the "Work Orders" tab).
+This module adds state, date_start, date_stop in manufacturing order operation lines (in the 'Work Orders' tab).
 ================================================================================================================
 
 Status: draft, confirm, done, cancel
@@ -33,17 +33,19 @@ When finishing/confirming, cancelling manufacturing orders set all state lines
 to the according state.
 
 Create menus:
-    Manufacturing > Manufacturing > Work Orders
+-------------
+    **Manufacturing** > **Manufacturing** > **Work Orders**
 
-Which is a view on "Work Orders" lines in manufacturing order.
+Which is a view on 'Work Orders' lines in manufacturing order.
 
 Add buttons in the form view of manufacturing order under workorders tab:
+-------------------------------------------------------------------------
     * start (set state to confirm), set date_start
     * done (set state to done), set date_stop
     * set to draft (set state to draft)
     * cancel set state to cancel
 
-When the manufacturing order becomes "ready to produce", operations must
+When the manufacturing order becomes 'ready to produce', operations must
 become 'confirmed'. When the manufacturing order is done, all operations
 must become done.
 
@@ -54,8 +56,7 @@ So, that we can compare the theoretic delay and real delay.
     'website': 'http://www.openerp.com',
     'images': ['images/work_order_analysis.jpeg','images/work_order_planning.jpeg','images/work_order.jpeg'],
     'depends': ['mrp'],
-    'init_xml': [],
-    'update_xml': [
+    'data': [
         'security/ir.model.access.csv',
         'mrp_operations_workflow.xml',
         'mrp_operations_view.xml',
@@ -64,10 +65,11 @@ So, that we can compare the theoretic delay and real delay.
         'process/mrp_operation_process.xml',
         'mrp_operations_workflow_instance.xml'
     ],
-    'demo_xml': ['mrp_operation_data.xml', 
-                 'mrp_operations_demo.yml'],
+    'demo': ['mrp_operation_data.xml', 
+             'mrp_operations_demo.yml'
+    ],
     'test': [ 
-#             'test/workcenter_operations.yml',
+#        'test/workcenter_operations.yml',
     ],
     'installable': True,
     'auto_install': False,
diff --git a/addons/mrp_operations/i18n/ar.po b/addons/mrp_operations/i18n/ar.po
index 0142583f8fd..76511298c62 100644
--- a/addons/mrp_operations/i18n/ar.po
+++ b/addons/mrp_operations/i18n/ar.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:52+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:24+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_action_form
diff --git a/addons/mrp_operations/i18n/bg.po b/addons/mrp_operations/i18n/bg.po
index 01e0ba59fdd..216d8d4a76a 100644
--- a/addons/mrp_operations/i18n/bg.po
+++ b/addons/mrp_operations/i18n/bg.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:53+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:24+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_action_form
diff --git a/addons/mrp_operations/i18n/bs.po b/addons/mrp_operations/i18n/bs.po
index b4676b00d6f..f3b294f94a9 100644
--- a/addons/mrp_operations/i18n/bs.po
+++ b/addons/mrp_operations/i18n/bs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:53+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:24+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_action_form
diff --git a/addons/mrp_operations/i18n/ca.po b/addons/mrp_operations/i18n/ca.po
index 01d4945364b..e5b8a40f6cd 100644
--- a/addons/mrp_operations/i18n/ca.po
+++ b/addons/mrp_operations/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:53+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:24+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_action_form
diff --git a/addons/mrp_operations/i18n/cs.po b/addons/mrp_operations/i18n/cs.po
index f1201d398ad..897b8d6c6ba 100644
--- a/addons/mrp_operations/i18n/cs.po
+++ b/addons/mrp_operations/i18n/cs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:53+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:24+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 "X-Poedit-Language: Czech\n"
 
 #. module: mrp_operations
diff --git a/addons/mrp_operations/i18n/da.po b/addons/mrp_operations/i18n/da.po
index 49e11f4644c..00583b521d7 100644
--- a/addons/mrp_operations/i18n/da.po
+++ b/addons/mrp_operations/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:53+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:24+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_action_form
diff --git a/addons/mrp_operations/i18n/de.po b/addons/mrp_operations/i18n/de.po
index d05bd53da94..d6674937331 100644
--- a/addons/mrp_operations/i18n/de.po
+++ b/addons/mrp_operations/i18n/de.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:53+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:25+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_action_form
diff --git a/addons/mrp_operations/i18n/es.po b/addons/mrp_operations/i18n/es.po
index 647f7d35195..4300d002b0d 100644
--- a/addons/mrp_operations/i18n/es.po
+++ b/addons/mrp_operations/i18n/es.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:53+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:25+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_action_form
diff --git a/addons/mrp_operations/i18n/es_AR.po b/addons/mrp_operations/i18n/es_AR.po
index f9e733db292..06ab7cd60d7 100644
--- a/addons/mrp_operations/i18n/es_AR.po
+++ b/addons/mrp_operations/i18n/es_AR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:53+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:25+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_action_form
diff --git a/addons/mrp_operations/i18n/es_CR.po b/addons/mrp_operations/i18n/es_CR.po
index 6ced4178ed3..af5dd644135 100644
--- a/addons/mrp_operations/i18n/es_CR.po
+++ b/addons/mrp_operations/i18n/es_CR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:53+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:25+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 "Language: \n"
 
 #. module: mrp_operations
diff --git a/addons/mrp_operations/i18n/es_EC.po b/addons/mrp_operations/i18n/es_EC.po
index 5f2ab1e949e..3bcaf56bf69 100644
--- a/addons/mrp_operations/i18n/es_EC.po
+++ b/addons/mrp_operations/i18n/es_EC.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:53+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:25+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_action_form
diff --git a/addons/mrp_operations/i18n/et.po b/addons/mrp_operations/i18n/et.po
index 81d1537944f..b8f6e7130c7 100644
--- a/addons/mrp_operations/i18n/et.po
+++ b/addons/mrp_operations/i18n/et.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:53+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:24+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_action_form
diff --git a/addons/mrp_operations/i18n/fi.po b/addons/mrp_operations/i18n/fi.po
index 76fd30c0c7f..8f045989009 100644
--- a/addons/mrp_operations/i18n/fi.po
+++ b/addons/mrp_operations/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:53+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:24+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_action_form
diff --git a/addons/mrp_operations/i18n/fr.po b/addons/mrp_operations/i18n/fr.po
index 4796958dda6..8396a8392fb 100644
--- a/addons/mrp_operations/i18n/fr.po
+++ b/addons/mrp_operations/i18n/fr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:53+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:24+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_action_form
diff --git a/addons/mrp_operations/i18n/hi.po b/addons/mrp_operations/i18n/hi.po
index c3e79cf3fa5..dd6a5e4952a 100644
--- a/addons/mrp_operations/i18n/hi.po
+++ b/addons/mrp_operations/i18n/hi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:53+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:25+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_action_form
diff --git a/addons/mrp_operations/i18n/hr.po b/addons/mrp_operations/i18n/hr.po
index 6432ceabe4a..8b0a5d3e1af 100644
--- a/addons/mrp_operations/i18n/hr.po
+++ b/addons/mrp_operations/i18n/hr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:53+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:25+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_action_form
diff --git a/addons/mrp_operations/i18n/hu.po b/addons/mrp_operations/i18n/hu.po
index 7c5ded1ec0f..087c1ae7d71 100644
--- a/addons/mrp_operations/i18n/hu.po
+++ b/addons/mrp_operations/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:53+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:25+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_action_form
diff --git a/addons/mrp_operations/i18n/id.po b/addons/mrp_operations/i18n/id.po
index 73becc507d0..5ff0f45cd61 100644
--- a/addons/mrp_operations/i18n/id.po
+++ b/addons/mrp_operations/i18n/id.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:53+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:25+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_action_form
diff --git a/addons/mrp_operations/i18n/it.po b/addons/mrp_operations/i18n/it.po
index b1e09f23e5c..0f36395f74a 100644
--- a/addons/mrp_operations/i18n/it.po
+++ b/addons/mrp_operations/i18n/it.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:53+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:25+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_action_form
diff --git a/addons/mrp_operations/i18n/ja.po b/addons/mrp_operations/i18n/ja.po
index 19ee0fc0e86..e660ef544fc 100644
--- a/addons/mrp_operations/i18n/ja.po
+++ b/addons/mrp_operations/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:53+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:25+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_action_form
diff --git a/addons/mrp_operations/i18n/ko.po b/addons/mrp_operations/i18n/ko.po
index 98bd4323384..421abd0706d 100644
--- a/addons/mrp_operations/i18n/ko.po
+++ b/addons/mrp_operations/i18n/ko.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:53+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:25+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_action_form
diff --git a/addons/mrp_operations/i18n/lt.po b/addons/mrp_operations/i18n/lt.po
index b2639dca72b..85d276a7553 100644
--- a/addons/mrp_operations/i18n/lt.po
+++ b/addons/mrp_operations/i18n/lt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:53+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:25+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_action_form
diff --git a/addons/mrp_operations/i18n/mn.po b/addons/mrp_operations/i18n/mn.po
index b34fcc577c3..3b32dfac363 100644
--- a/addons/mrp_operations/i18n/mn.po
+++ b/addons/mrp_operations/i18n/mn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:53+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:25+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_action_form
diff --git a/addons/mrp_operations/i18n/nl.po b/addons/mrp_operations/i18n/nl.po
index 72e007f774b..18d4cc34255 100644
--- a/addons/mrp_operations/i18n/nl.po
+++ b/addons/mrp_operations/i18n/nl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:53+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:24+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_action_form
diff --git a/addons/mrp_operations/i18n/nl_BE.po b/addons/mrp_operations/i18n/nl_BE.po
index 6b53a58811b..99dc6e18183 100644
--- a/addons/mrp_operations/i18n/nl_BE.po
+++ b/addons/mrp_operations/i18n/nl_BE.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:53+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:25+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_action_form
diff --git a/addons/mrp_operations/i18n/pl.po b/addons/mrp_operations/i18n/pl.po
index 58ecef07c85..4577d29d898 100644
--- a/addons/mrp_operations/i18n/pl.po
+++ b/addons/mrp_operations/i18n/pl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:53+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:25+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_action_form
diff --git a/addons/mrp_operations/i18n/pt.po b/addons/mrp_operations/i18n/pt.po
index fc3b0b8ebf4..51c27da351f 100644
--- a/addons/mrp_operations/i18n/pt.po
+++ b/addons/mrp_operations/i18n/pt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:53+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:25+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_action_form
diff --git a/addons/mrp_operations/i18n/pt_BR.po b/addons/mrp_operations/i18n/pt_BR.po
index e21f236c84a..c2911159362 100644
--- a/addons/mrp_operations/i18n/pt_BR.po
+++ b/addons/mrp_operations/i18n/pt_BR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:53+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:25+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_action_form
@@ -29,7 +29,7 @@ msgstr "Ordens de Serviço"
 #: code:addons/mrp_operations/mrp_operations.py:489
 #, python-format
 msgid "Operation is already finished!"
-msgstr ""
+msgstr "A Operação já está concluída!"
 
 #. module: mrp_operations
 #: model:process.node,note:mrp_operations.process_node_canceloperation0
@@ -39,7 +39,7 @@ msgstr "Cancelar a Operação"
 #. module: mrp_operations
 #: model:ir.model,name:mrp_operations.model_mrp_operations_operation_code
 msgid "mrp_operations.operation.code"
-msgstr ""
+msgstr "mrp_operations.operation.code"
 
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
@@ -88,7 +88,7 @@ msgstr "Operação de Produção"
 #. module: mrp_operations
 #: view:mrp.production:0
 msgid "Set to Draft"
-msgstr ""
+msgstr "Definir como Provisório"
 
 #. module: mrp_operations
 #: field:mrp.production,allow_reorder:0
@@ -114,7 +114,7 @@ msgstr "Dia"
 #. module: mrp_operations
 #: view:mrp.production:0
 msgid "Cancel Order"
-msgstr ""
+msgstr "Cancelar Pedido"
 
 #. module: mrp_operations
 #: model:process.node,name:mrp_operations.process_node_productionorder0
@@ -142,6 +142,17 @@ msgid ""
 "* When the user cancels the work order it will be set in 'Canceled' state.\n"
 "* When order is completely processed that time it is set in 'Finished' state."
 msgstr ""
+"* Quando uma ordem de produção é criada, a situação é definida como "
+"'Provisório'.\n"
+"* Quando o usuário inicia uma ordem de produção a situação muda para 'Em "
+"Progresso'.\n"
+"* Quando a ordem de produção está em executando, neste momento se o usuário "
+"desejar parar ou fazer alterações nesta ordem ele pode definir a situação "
+"como 'Pendente'.\n"
+"* Quando o usuário cancela uma ordem de trabalho, a situação muda para "
+"'Cancelada'.\n"
+"* Quando uma ordem é completamente concluída, a situação é definida como "
+"'Finalizada'."
 
 #. module: mrp_operations
 #: model:process.transition,note:mrp_operations.process_transition_productionstart0
@@ -169,13 +180,13 @@ msgstr "Cancelado"
 #: code:addons/mrp_operations/mrp_operations.py:486
 #, python-format
 msgid "There is no Operation to be cancelled!"
-msgstr ""
+msgstr "Não existe Operação para ser cancelada!"
 
 #. module: mrp_operations
 #: code:addons/mrp_operations/mrp_operations.py:482
 #, python-format
 msgid "Operation is Already Cancelled!"
-msgstr ""
+msgstr "A Operação já está Cancelada!"
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.mrp_production_operation_action
@@ -194,6 +205,7 @@ msgstr "Mov. de Estoque"
 msgid ""
 "In order to Finish the operation, it must be in the Start or Resume state!"
 msgstr ""
+"Para poder Finalizar a operação, ela precisará estar em Início ou Continuar!"
 
 #. module: mrp_operations
 #: field:mrp.workorder,nbr:0
@@ -204,7 +216,7 @@ msgstr "# de Linhas"
 #: view:mrp.production:0
 #: view:mrp.production.workcenter.line:0
 msgid "Finish Order"
-msgstr ""
+msgstr "Finalizar Pedido"
 
 #. module: mrp_operations
 #: field:mrp.production.workcenter.line,date_finished:0
@@ -263,6 +275,7 @@ msgstr "UdM"
 #: constraint:stock.move:0
 msgid "You can not move products from or to a location of the type view."
 msgstr ""
+"Você não pode mover os produtos de/para um Local do tipo Visualização"
 
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
@@ -279,7 +292,7 @@ msgstr "Qtd do Produto"
 #: code:addons/mrp_operations/mrp_operations.py:134
 #, python-format
 msgid "Manufacturing order cannot start in state \"%s\"!"
-msgstr ""
+msgstr "Ordem de Produção não pode iniciar com a situação \"%s\"!"
 
 #. module: mrp_operations
 #: selection:mrp.workorder,month:0
@@ -314,7 +327,7 @@ msgstr ""
 #. module: mrp_operations
 #: view:mrp.workorder:0
 msgid "Planned Year"
-msgstr ""
+msgstr "Ano Planejado"
 
 #. module: mrp_operations
 #: field:mrp_operations.operation,order_date:0
@@ -329,12 +342,13 @@ msgstr "Ordens de Serviço Futuras"
 #. module: mrp_operations
 #: view:mrp.workorder:0
 msgid "Work orders during last month"
-msgstr ""
+msgstr "Ordens trabalhadas durante o mês passado"
 
 #. module: mrp_operations
 #: help:mrp.production.workcenter.line,delay:0
 msgid "The elapsed time between operation start and stop in this Work Center"
 msgstr ""
+"O tempo decorrido entre iniciar e parar a operação neste Centro de Trabalho"
 
 #. module: mrp_operations
 #: model:process.node,name:mrp_operations.process_node_canceloperation0
@@ -345,7 +359,7 @@ msgstr "Operação Cancelada"
 #: view:mrp.production:0
 #: view:mrp.production.workcenter.line:0
 msgid "Pause Work Order"
-msgstr ""
+msgstr "Pausar Ordem de Trabalho"
 
 #. module: mrp_operations
 #: selection:mrp.workorder,month:0
@@ -371,7 +385,7 @@ msgstr "Cancelada"
 #. module: mrp_operations
 #: model:ir.model,name:mrp_operations.model_mrp_operations_operation
 msgid "mrp_operations.operation"
-msgstr ""
+msgstr "mrp_operations.operation"
 
 #. module: mrp_operations
 #: model:ir.model,name:mrp_operations.model_mrp_workorder
@@ -381,7 +395,7 @@ msgstr "Relatório Ordem de Serviço"
 #. module: mrp_operations
 #: constraint:mrp.production:0
 msgid "Order quantity cannot be negative or zero!"
-msgstr ""
+msgstr "A quantidade do pedido não pode ser negativa ou zero!"
 
 #. module: mrp_operations
 #: field:mrp.production.workcenter.line,date_start:0
@@ -398,7 +412,7 @@ msgstr "Aguardando Mercadorias"
 #. module: mrp_operations
 #: view:mrp.workorder:0
 msgid "Work orders made during current year"
-msgstr ""
+msgstr "Ordens de trabalho este ano"
 
 #. module: mrp_operations
 #: selection:mrp.workorder,state:0
@@ -419,12 +433,14 @@ msgstr "Em Progresso"
 msgid ""
 "In order to Pause the operation, it must be in the Start or Resume state!"
 msgstr ""
+"Para Pausar uma operação, ela precisará estar definida como Início ou "
+"Reiniciar"
 
 #. module: mrp_operations
 #: code:addons/mrp_operations/mrp_operations.py:474
 #, python-format
 msgid "In order to Resume the operation, it must be in the Pause state!"
-msgstr ""
+msgstr "Para Reiniciar uma operação, ela precisará estar em Pausa!"
 
 #. module: mrp_operations
 #: view:mrp.production:0
@@ -472,6 +488,7 @@ msgid ""
 "Operation has already started !Youcan either Pause/Finish/Cancel the "
 "operation"
 msgstr ""
+"Operação já está iniciada! Você pode Pausar/Finalizar/Cancelar a operação"
 
 #. module: mrp_operations
 #: selection:mrp.workorder,month:0
@@ -486,12 +503,12 @@ msgstr "Iniciada"
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
 msgid "Production started late"
-msgstr ""
+msgstr "Produção iniciada com atraso"
 
 #. module: mrp_operations
 #: view:mrp.workorder:0
 msgid "Planned Day"
-msgstr ""
+msgstr "Dia Planejado"
 
 #. module: mrp_operations
 #: selection:mrp.workorder,month:0
@@ -549,7 +566,7 @@ msgstr "Janeiro"
 #: view:mrp.production:0
 #: view:mrp.production.workcenter.line:0
 msgid "Resume Work Order"
-msgstr ""
+msgstr "Continuar Ordem de Trabalho"
 
 #. module: mrp_operations
 #: model:process.node,note:mrp_operations.process_node_doneoperation0
@@ -570,7 +587,7 @@ msgstr "Informação da ordem de Produção."
 #. module: mrp_operations
 #: sql_constraint:mrp.production:0
 msgid "Reference must be unique per Company!"
-msgstr ""
+msgstr "A referência deve ser única por empresa!"
 
 #. module: mrp_operations
 #: code:addons/mrp_operations/mrp_operations.py:459
@@ -732,7 +749,7 @@ msgstr ""
 #. module: mrp_operations
 #: report:mrp.code.barcode:0
 msgid ")"
-msgstr ""
+msgstr ")"
 
 #. module: mrp_operations
 #: model:ir.ui.menu,name:mrp_operations.menu_report_mrp_workorders_tree
@@ -760,7 +777,7 @@ msgstr "Horas Trabalhadas"
 #. module: mrp_operations
 #: view:mrp.workorder:0
 msgid "Planned Month"
-msgstr ""
+msgstr "Mês Planejado"
 
 #. module: mrp_operations
 #: selection:mrp.workorder,month:0
@@ -770,7 +787,7 @@ msgstr "Fevereiro"
 #. module: mrp_operations
 #: view:mrp.workorder:0
 msgid "Work orders made during current month"
-msgstr ""
+msgstr "Ordens de Trabalho feitas este mÊs"
 
 #. module: mrp_operations
 #: model:process.transition,name:mrp_operations.process_transition_startcanceloperation0
@@ -801,7 +818,7 @@ msgstr "Linha Ordens"
 #: view:mrp.production:0
 #: view:mrp.production.workcenter.line:0
 msgid "Start Working"
-msgstr ""
+msgstr "Iniciar o trabalho"
 
 #. module: mrp_operations
 #: model:process.transition,note:mrp_operations.process_transition_startdoneoperation0
diff --git a/addons/mrp_operations/i18n/ro.po b/addons/mrp_operations/i18n/ro.po
index 04bb4f160c4..cb9cf825585 100644
--- a/addons/mrp_operations/i18n/ro.po
+++ b/addons/mrp_operations/i18n/ro.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:53+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:25+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_action_form
diff --git a/addons/mrp_operations/i18n/ru.po b/addons/mrp_operations/i18n/ru.po
index 66fe9afaf29..80b91b3a4df 100644
--- a/addons/mrp_operations/i18n/ru.po
+++ b/addons/mrp_operations/i18n/ru.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:53+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:25+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_action_form
diff --git a/addons/mrp_operations/i18n/sl.po b/addons/mrp_operations/i18n/sl.po
index c385b5af159..c5ef86a334d 100644
--- a/addons/mrp_operations/i18n/sl.po
+++ b/addons/mrp_operations/i18n/sl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:53+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:25+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_action_form
diff --git a/addons/mrp_operations/i18n/sq.po b/addons/mrp_operations/i18n/sq.po
index f2b678ec976..57bf5e5f6eb 100644
--- a/addons/mrp_operations/i18n/sq.po
+++ b/addons/mrp_operations/i18n/sq.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:52+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:24+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_action_form
diff --git a/addons/mrp_operations/i18n/sr.po b/addons/mrp_operations/i18n/sr.po
index 075637c8133..d295ba47b21 100644
--- a/addons/mrp_operations/i18n/sr.po
+++ b/addons/mrp_operations/i18n/sr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:53+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:25+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_action_form
diff --git a/addons/mrp_operations/i18n/sr@latin.po b/addons/mrp_operations/i18n/sr@latin.po
index 1d7cffcf953..a96a48bdaaf 100644
--- a/addons/mrp_operations/i18n/sr@latin.po
+++ b/addons/mrp_operations/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:53+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:25+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_action_form
diff --git a/addons/mrp_operations/i18n/sv.po b/addons/mrp_operations/i18n/sv.po
index a1d119712b1..8449acc7739 100644
--- a/addons/mrp_operations/i18n/sv.po
+++ b/addons/mrp_operations/i18n/sv.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:53+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:25+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_action_form
diff --git a/addons/mrp_operations/i18n/tlh.po b/addons/mrp_operations/i18n/tlh.po
index 4ab222857d2..cdd11587c10 100644
--- a/addons/mrp_operations/i18n/tlh.po
+++ b/addons/mrp_operations/i18n/tlh.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:53+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:25+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_action_form
diff --git a/addons/mrp_operations/i18n/tr.po b/addons/mrp_operations/i18n/tr.po
index f897f234e48..fd64f0fcb2e 100644
--- a/addons/mrp_operations/i18n/tr.po
+++ b/addons/mrp_operations/i18n/tr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:53+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:25+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_action_form
diff --git a/addons/mrp_operations/i18n/uk.po b/addons/mrp_operations/i18n/uk.po
index c582822b451..af7de66c97f 100644
--- a/addons/mrp_operations/i18n/uk.po
+++ b/addons/mrp_operations/i18n/uk.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:53+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:25+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_action_form
diff --git a/addons/mrp_operations/i18n/vi.po b/addons/mrp_operations/i18n/vi.po
index 4d047e6b0af..4c07d846893 100644
--- a/addons/mrp_operations/i18n/vi.po
+++ b/addons/mrp_operations/i18n/vi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:53+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:25+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_action_form
diff --git a/addons/mrp_operations/i18n/zh_CN.po b/addons/mrp_operations/i18n/zh_CN.po
index 04185f5fda5..a8a44edbbef 100644
--- a/addons/mrp_operations/i18n/zh_CN.po
+++ b/addons/mrp_operations/i18n/zh_CN.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:53+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:25+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_action_form
diff --git a/addons/mrp_operations/i18n/zh_TW.po b/addons/mrp_operations/i18n/zh_TW.po
index cff9e646d42..4f63fabd430 100644
--- a/addons/mrp_operations/i18n/zh_TW.po
+++ b/addons/mrp_operations/i18n/zh_TW.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:53+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:25+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_action_form
diff --git a/addons/mrp_operations/mrp_operations.py b/addons/mrp_operations/mrp_operations.py
index 8692dab5c87..ee2547bc7df 100644
--- a/addons/mrp_operations/mrp_operations.py
+++ b/addons/mrp_operations/mrp_operations.py
@@ -224,7 +224,7 @@ class mrp_production_workcenter_line(osv.osv):
         for workorder in self.browse(cr, uid, ids):
             for prod in prod_obj.browse(cr, uid, [workorder.production_id]):
                 message = _("Work order has been <b>created</b> for production order <em>%s</em>.") % (prod.id.name)
-                self.message_append_note(cr, uid, [workorder.id], body=message, context=context)
+                self.message_post(cr, uid, [workorder.id], body=message, context=context)
         return True
 
     def action_start_send_note(self, cr, uid, ids, context=None):
@@ -232,7 +232,7 @@ class mrp_production_workcenter_line(osv.osv):
         for workorder in self.browse(cr, uid, ids):
             for prod in prod_obj.browse(cr, uid, [workorder.production_id]):
                 message = _("Work order has been <b>started</b> for production order <em>%s</em>.") % (prod.id.name)
-                self.message_append_note(cr, uid, [workorder.id], body=message, context=context)
+                self.message_post(cr, uid, [workorder.id], body=message, context=context)
         return True
 
     def action_done_send_note(self, cr, uid, ids, context=None):
@@ -240,7 +240,7 @@ class mrp_production_workcenter_line(osv.osv):
         for workorder in self.browse(cr, uid, ids):
             for prod in prod_obj.browse(cr, uid, [workorder.production_id]):
                 message = _("Work order has been <b>done</b> for production order <em>%s</em>.") % (prod.id.name)
-                self.message_append_note(cr, uid, [workorder.id], body=message, context=context)
+                self.message_post(cr, uid, [workorder.id], body=message, context=context)
         return True
 
     def action_pending_send_note(self, cr, uid, ids, context=None):
@@ -248,7 +248,7 @@ class mrp_production_workcenter_line(osv.osv):
         for workorder in self.browse(cr, uid, ids):
             for prod in prod_obj.browse(cr, uid, [workorder.production_id]):
                 message = _("Work order is <b>pending</b> for production order <em>%s</em>.") % (prod.id.name)
-                self.message_append_note(cr, uid, [workorder.id], body=message, context=context)
+                self.message_post(cr, uid, [workorder.id], body=message, context=context)
         return True
 
     def action_cancel_send_note(self, cr, uid, ids, context=None):
@@ -256,7 +256,7 @@ class mrp_production_workcenter_line(osv.osv):
         for workorder in self.browse(cr, uid, ids):
             for prod in prod_obj.browse(cr, uid, [workorder.production_id]):
                 message = _("Work order has been <b>cancelled</b> for production order <em>%s</em>.") % (prod.id.name)
-                self.message_append_note(cr, uid, [workorder.id], body=message, context=context)
+                self.message_post(cr, uid, [workorder.id], body=message, context=context)
         return True
 
 mrp_production_workcenter_line()
diff --git a/addons/mrp_repair/__openerp__.py b/addons/mrp_repair/__openerp__.py
index c54a0c383ee..da4070d6210 100644
--- a/addons/mrp_repair/__openerp__.py
+++ b/addons/mrp_repair/__openerp__.py
@@ -29,6 +29,7 @@ The aim is to have a complete module to manage all products repairs.
 ====================================================================
 
 The following topics should be covered by this module:
+------------------------------------------------------
     * Add/remove products in the reparation
     * Impact for stocks
     * Invoicing (products and/or services)
@@ -39,7 +40,7 @@ The following topics should be covered by this module:
     'author': 'OpenERP SA',
     'images': ['images/repair_order.jpeg'],
     'depends': ['mrp', 'sale', 'account'],
-    'update_xml': [
+    'data': [
         'security/ir.model.access.csv',
         'security/mrp_repair_security.xml',
         'mrp_repair_sequence.xml',
@@ -49,12 +50,13 @@ The following topics should be covered by this module:
         'mrp_repair_workflow.xml',
         'mrp_repair_report.xml',
     ],
-    'demo_xml': ['mrp_repair_demo.yml'],
+    'demo': ['mrp_repair_demo.yml'],
     'test': ['test/test_mrp_repair_noneinv.yml',
              'test/test_mrp_repair_b4inv.yml',
              'test/test_mrp_repair_afterinv.yml',
              'test/test_mrp_repair_cancel.yml',
-             'test/mrp_repair_report.yml'],
+             'test/mrp_repair_report.yml'
+    ],
     'installable': True,
     'auto_install': False,
     'certificate': '0060814381277',
diff --git a/addons/mrp_repair/i18n/ar.po b/addons/mrp_repair/i18n/ar.po
index ea1069c0334..983e2c0d177 100644
--- a/addons/mrp_repair/i18n/ar.po
+++ b/addons/mrp_repair/i18n/ar.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:29+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
@@ -514,7 +514,7 @@ msgstr "خط رسوم الاصلاح"
 #: code:addons/mrp_repair/mrp_repair.py:334
 #, python-format
 msgid "You cannot confirm a repair order which has no line."
-msgstr ""
+msgstr "لا يمكنك تأكيد أمر تصليح بلا سطور."
 
 #. module: mrp_repair
 #: selection:mrp.repair,state:0
diff --git a/addons/mrp_repair/i18n/bg.po b/addons/mrp_repair/i18n/bg.po
index 5ea892f93c1..2310c132a41 100644
--- a/addons/mrp_repair/i18n/bg.po
+++ b/addons/mrp_repair/i18n/bg.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:29+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
diff --git a/addons/mrp_repair/i18n/bs.po b/addons/mrp_repair/i18n/bs.po
index acef8856936..97f20e86be6 100644
--- a/addons/mrp_repair/i18n/bs.po
+++ b/addons/mrp_repair/i18n/bs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:29+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
diff --git a/addons/mrp_repair/i18n/ca.po b/addons/mrp_repair/i18n/ca.po
index f680a14ea30..ead6c3d4b3a 100644
--- a/addons/mrp_repair/i18n/ca.po
+++ b/addons/mrp_repair/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:29+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
diff --git a/addons/mrp_repair/i18n/cs.po b/addons/mrp_repair/i18n/cs.po
index 9a1d99b7d75..3bf8dcef834 100644
--- a/addons/mrp_repair/i18n/cs.po
+++ b/addons/mrp_repair/i18n/cs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:29+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
diff --git a/addons/mrp_repair/i18n/da.po b/addons/mrp_repair/i18n/da.po
index f4d8f1e908b..4ceaace2614 100644
--- a/addons/mrp_repair/i18n/da.po
+++ b/addons/mrp_repair/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:29+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
diff --git a/addons/mrp_repair/i18n/de.po b/addons/mrp_repair/i18n/de.po
index dca44ae5a7d..7cf81b8a325 100644
--- a/addons/mrp_repair/i18n/de.po
+++ b/addons/mrp_repair/i18n/de.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:29+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
diff --git a/addons/mrp_repair/i18n/es.po b/addons/mrp_repair/i18n/es.po
index b625aad4a20..45abd13dc26 100644
--- a/addons/mrp_repair/i18n/es.po
+++ b/addons/mrp_repair/i18n/es.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:29+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
diff --git a/addons/mrp_repair/i18n/es_AR.po b/addons/mrp_repair/i18n/es_AR.po
index 38c2a2d09b5..121ea43888d 100644
--- a/addons/mrp_repair/i18n/es_AR.po
+++ b/addons/mrp_repair/i18n/es_AR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:29+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
diff --git a/addons/mrp_repair/i18n/es_CR.po b/addons/mrp_repair/i18n/es_CR.po
index d4e8fcfd61a..9ab75a64d29 100644
--- a/addons/mrp_repair/i18n/es_CR.po
+++ b/addons/mrp_repair/i18n/es_CR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:29+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 "Language: \n"
 
 #. module: mrp_repair
diff --git a/addons/mrp_repair/i18n/es_EC.po b/addons/mrp_repair/i18n/es_EC.po
index 1ebd461d874..8c4af4f9cee 100644
--- a/addons/mrp_repair/i18n/es_EC.po
+++ b/addons/mrp_repair/i18n/es_EC.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:29+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
diff --git a/addons/mrp_repair/i18n/et.po b/addons/mrp_repair/i18n/et.po
index 0ffa5cf93ec..2be2292ea30 100644
--- a/addons/mrp_repair/i18n/et.po
+++ b/addons/mrp_repair/i18n/et.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:29+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
diff --git a/addons/mrp_repair/i18n/fi.po b/addons/mrp_repair/i18n/fi.po
index e54b49b9e79..166512ec0ad 100644
--- a/addons/mrp_repair/i18n/fi.po
+++ b/addons/mrp_repair/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:29+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
diff --git a/addons/mrp_repair/i18n/fr.po b/addons/mrp_repair/i18n/fr.po
index d2f9b4be6f9..ff48fdda591 100644
--- a/addons/mrp_repair/i18n/fr.po
+++ b/addons/mrp_repair/i18n/fr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:29+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
diff --git a/addons/mrp_repair/i18n/hi.po b/addons/mrp_repair/i18n/hi.po
index 24251b2c61c..f5d7b109345 100644
--- a/addons/mrp_repair/i18n/hi.po
+++ b/addons/mrp_repair/i18n/hi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:29+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
diff --git a/addons/mrp_repair/i18n/hr.po b/addons/mrp_repair/i18n/hr.po
index bc396eb8e10..7335efa9c5d 100644
--- a/addons/mrp_repair/i18n/hr.po
+++ b/addons/mrp_repair/i18n/hr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:29+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
diff --git a/addons/mrp_repair/i18n/hu.po b/addons/mrp_repair/i18n/hu.po
index 6f4099dc925..8bcd76855a7 100644
--- a/addons/mrp_repair/i18n/hu.po
+++ b/addons/mrp_repair/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:29+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
diff --git a/addons/mrp_repair/i18n/id.po b/addons/mrp_repair/i18n/id.po
index e93e8001315..fac3c2c070f 100644
--- a/addons/mrp_repair/i18n/id.po
+++ b/addons/mrp_repair/i18n/id.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:29+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
diff --git a/addons/mrp_repair/i18n/it.po b/addons/mrp_repair/i18n/it.po
index edee45edbcf..3582d81099c 100644
--- a/addons/mrp_repair/i18n/it.po
+++ b/addons/mrp_repair/i18n/it.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:29+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
diff --git a/addons/mrp_repair/i18n/ja.po b/addons/mrp_repair/i18n/ja.po
index 187bf9f5586..d438dc67a5c 100644
--- a/addons/mrp_repair/i18n/ja.po
+++ b/addons/mrp_repair/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:29+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
diff --git a/addons/mrp_repair/i18n/ko.po b/addons/mrp_repair/i18n/ko.po
index ca96cd77574..f71081f9587 100644
--- a/addons/mrp_repair/i18n/ko.po
+++ b/addons/mrp_repair/i18n/ko.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:29+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
diff --git a/addons/mrp_repair/i18n/lt.po b/addons/mrp_repair/i18n/lt.po
index 997ea5a340c..e80033372b3 100644
--- a/addons/mrp_repair/i18n/lt.po
+++ b/addons/mrp_repair/i18n/lt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:29+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
diff --git a/addons/mrp_repair/i18n/mn.po b/addons/mrp_repair/i18n/mn.po
index 1ace870b02f..9ea4e345e70 100644
--- a/addons/mrp_repair/i18n/mn.po
+++ b/addons/mrp_repair/i18n/mn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:29+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
diff --git a/addons/mrp_repair/i18n/nl.po b/addons/mrp_repair/i18n/nl.po
index 5634a09e935..0909f2459c1 100644
--- a/addons/mrp_repair/i18n/nl.po
+++ b/addons/mrp_repair/i18n/nl.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-05-10 17:14+0000\n"
-"Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
+"PO-Revision-Date: 2012-08-26 14:03+0000\n"
+"Last-Translator: Erwin <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: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:29+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
@@ -192,7 +192,7 @@ msgstr "Waarschuwing !"
 #. module: mrp_repair
 #: report:repair.order:0
 msgid "Tax"
-msgstr ""
+msgstr "Belasting"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
diff --git a/addons/mrp_repair/i18n/nl_BE.po b/addons/mrp_repair/i18n/nl_BE.po
index 9719d59c6e3..3b43efcd510 100644
--- a/addons/mrp_repair/i18n/nl_BE.po
+++ b/addons/mrp_repair/i18n/nl_BE.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:29+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
diff --git a/addons/mrp_repair/i18n/pl.po b/addons/mrp_repair/i18n/pl.po
index 78da67ad12f..0400504d165 100644
--- a/addons/mrp_repair/i18n/pl.po
+++ b/addons/mrp_repair/i18n/pl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:29+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
diff --git a/addons/mrp_repair/i18n/pt.po b/addons/mrp_repair/i18n/pt.po
index 439703a8f11..e7b312397b5 100644
--- a/addons/mrp_repair/i18n/pt.po
+++ b/addons/mrp_repair/i18n/pt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:29+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
diff --git a/addons/mrp_repair/i18n/pt_BR.po b/addons/mrp_repair/i18n/pt_BR.po
index 14e1a53046b..cf9c24dd2bd 100644
--- a/addons/mrp_repair/i18n/pt_BR.po
+++ b/addons/mrp_repair/i18n/pt_BR.po
@@ -13,13 +13,13 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:29+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "Fees Line"
-msgstr ""
+msgstr "Linhas de Preço"
 
 #. module: mrp_repair
 #: help:mrp.repair,state:0
@@ -50,6 +50,11 @@ msgid ""
 "date on the production lot in order to know if whether the repair should be "
 "invoiced to the customer or not."
 msgstr ""
+"Pedidos de conserto permitem que você organize reparos de seus produtos. Em "
+"um pedido de conserto, você pode detalhar os componentes que você remover, "
+"adicionar ou substituir e registrar o tempo que você gastou em diferentes "
+"operações. O pedido usa o tempo da garantia de reparo no lote de produção, a "
+"fim de saber se se a reparação deverá ser cobrada do cliente ou não."
 
 #. module: mrp_repair
 #: view:mrp.repair:0
@@ -69,6 +74,10 @@ msgid ""
 "that you can select the locations in the Info tab, if you have the extended "
 "view."
 msgstr ""
+"Marque esta caixa se você deseja gerenciar a entrega do produto assim que "
+"for reparado. Se selecionado, ele irá criar uma separação com o produto "
+"selecionado. Note que você pode selecionar os locais na aba Info, se você "
+"tem a visão extendida."
 
 #. module: mrp_repair
 #: model:ir.actions.act_window,name:mrp_repair.action_cancel_repair
@@ -96,13 +105,13 @@ msgstr "Agrupar pelo Endereço de Faturamento do Parceiro"
 #: code:addons/mrp_repair/mrp_repair.py:435
 #, python-format
 msgid "No product defined on Fees!"
-msgstr ""
+msgstr "Nenhum produto definido no valor!"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
 #: field:mrp.repair,company_id:0
 msgid "Company"
-msgstr ""
+msgstr "Empresa"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
@@ -205,7 +214,7 @@ msgstr "Cotação / Ordem"
 #: code:addons/mrp_repair/mrp_repair.py:337
 #, python-format
 msgid "Warning"
-msgstr ""
+msgstr "Alerta"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
@@ -256,7 +265,7 @@ msgstr "Número do Lote"
 #. module: mrp_repair
 #: field:mrp.repair,fees_lines:0
 msgid "Fees Lines"
-msgstr ""
+msgstr "Linhas de Valor"
 
 #. module: mrp_repair
 #: field:mrp.repair.line,type:0
@@ -266,7 +275,7 @@ msgstr "Tipo"
 #. module: mrp_repair
 #: report:repair.order:0
 msgid "Fees Line(s)"
-msgstr ""
+msgstr "Linhas de Valor(es)"
 
 #. module: mrp_repair
 #: selection:mrp.repair,state:0
@@ -383,6 +392,7 @@ msgstr "Cancelado"
 #, python-format
 msgid "Production lot is required for opration line with product '%s'"
 msgstr ""
+"O Lote de Produção é obrigatório para a linha de operação com o produto '%s'"
 
 #. module: mrp_repair
 #: selection:mrp.repair,invoice_method:0
@@ -490,13 +500,14 @@ msgstr "Data:"
 #. module: mrp_repair
 #: model:ir.model,name:mrp_repair.model_mrp_repair_fee
 msgid "Repair Fees Line"
-msgstr ""
+msgstr "Linhas de Valores do Conserto"
 
 #. module: mrp_repair
 #: code:addons/mrp_repair/mrp_repair.py:334
 #, python-format
 msgid "You cannot confirm a repair order which has no line."
 msgstr ""
+"Você não pode confirmar um Pedido de Conserto que não possui nenhuma linha."
 
 #. module: mrp_repair
 #: selection:mrp.repair,state:0
@@ -579,6 +590,10 @@ msgid ""
 "operation and fee you will add will be set as 'not to invoiced' by default. "
 "Note that you can change manually afterwards."
 msgstr ""
+"O limite de garantia é calculado como: data de último movimento + garantia "
+"definida no produto selecionado. Se a data atual está abaixo do limite de "
+"garantia, cada operação e taxa que você acrescentar será definido como \"não "
+"faturado\" por padrão. Observe que você pode alterar manualmente mais tarde."
 
 #. module: mrp_repair
 #: field:mrp.repair,invoice_id:0
@@ -874,3 +889,6 @@ msgstr "Sem parceiro !"
 
 #~ msgid "Products Repairs Module - Manage All products Repairs"
 #~ msgstr "Modulo de Reparo de Produtos - Gerencie o Reparo dos Produtos"
+
+#~ msgid "VAT"
+#~ msgstr "Imposto"
diff --git a/addons/mrp_repair/i18n/ro.po b/addons/mrp_repair/i18n/ro.po
index 7f85531c33a..50c3f4667fd 100644
--- a/addons/mrp_repair/i18n/ro.po
+++ b/addons/mrp_repair/i18n/ro.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:29+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
diff --git a/addons/mrp_repair/i18n/ru.po b/addons/mrp_repair/i18n/ru.po
index 1f118970748..ce41e6232f7 100644
--- a/addons/mrp_repair/i18n/ru.po
+++ b/addons/mrp_repair/i18n/ru.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:29+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
diff --git a/addons/mrp_repair/i18n/sl.po b/addons/mrp_repair/i18n/sl.po
index 49a6895c806..42a34f0a3ab 100644
--- a/addons/mrp_repair/i18n/sl.po
+++ b/addons/mrp_repair/i18n/sl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:29+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
diff --git a/addons/mrp_repair/i18n/sq.po b/addons/mrp_repair/i18n/sq.po
index 067b4adbfb8..3190b81a392 100644
--- a/addons/mrp_repair/i18n/sq.po
+++ b/addons/mrp_repair/i18n/sq.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:29+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
diff --git a/addons/mrp_repair/i18n/sr.po b/addons/mrp_repair/i18n/sr.po
index 9ea353849c1..47799afb237 100644
--- a/addons/mrp_repair/i18n/sr.po
+++ b/addons/mrp_repair/i18n/sr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:29+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
diff --git a/addons/mrp_repair/i18n/sr@latin.po b/addons/mrp_repair/i18n/sr@latin.po
index 876538f4adb..a95fbdef54c 100644
--- a/addons/mrp_repair/i18n/sr@latin.po
+++ b/addons/mrp_repair/i18n/sr@latin.po
@@ -9,13 +9,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:36+0000\n"
 "PO-Revision-Date: 2012-05-10 17:22+0000\n"
-"Last-Translator: Maroje Delibasic <Unknown>\n"
+"Last-Translator: MD <Unknown>\n"
 "Language-Team: Serbian latin <sr@latin@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:29+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
diff --git a/addons/mrp_repair/i18n/sv.po b/addons/mrp_repair/i18n/sv.po
index 8ef9859cac4..f89ffd7e304 100644
--- a/addons/mrp_repair/i18n/sv.po
+++ b/addons/mrp_repair/i18n/sv.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:29+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
diff --git a/addons/mrp_repair/i18n/tlh.po b/addons/mrp_repair/i18n/tlh.po
index 6104e89776c..ebdb3964753 100644
--- a/addons/mrp_repair/i18n/tlh.po
+++ b/addons/mrp_repair/i18n/tlh.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:29+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
diff --git a/addons/mrp_repair/i18n/tr.po b/addons/mrp_repair/i18n/tr.po
index 393468c9a6f..58260aef272 100644
--- a/addons/mrp_repair/i18n/tr.po
+++ b/addons/mrp_repair/i18n/tr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:29+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
diff --git a/addons/mrp_repair/i18n/uk.po b/addons/mrp_repair/i18n/uk.po
index ab550c7eb94..ce30b59624e 100644
--- a/addons/mrp_repair/i18n/uk.po
+++ b/addons/mrp_repair/i18n/uk.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:29+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
diff --git a/addons/mrp_repair/i18n/vi.po b/addons/mrp_repair/i18n/vi.po
index 6448c9e60da..704d23969e3 100644
--- a/addons/mrp_repair/i18n/vi.po
+++ b/addons/mrp_repair/i18n/vi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:29+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
diff --git a/addons/mrp_repair/i18n/zh_CN.po b/addons/mrp_repair/i18n/zh_CN.po
index a3e13b920fc..bf2cf8002a9 100644
--- a/addons/mrp_repair/i18n/zh_CN.po
+++ b/addons/mrp_repair/i18n/zh_CN.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:29+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
diff --git a/addons/mrp_repair/i18n/zh_TW.po b/addons/mrp_repair/i18n/zh_TW.po
index 9990ea940b0..ed6997bdc98 100644
--- a/addons/mrp_repair/i18n/zh_TW.po
+++ b/addons/mrp_repair/i18n/zh_TW.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:29+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
diff --git a/addons/mrp_repair/mrp_repair.py b/addons/mrp_repair/mrp_repair.py
index f41abb58c08..c1ac8f809ce 100644
--- a/addons/mrp_repair/mrp_repair.py
+++ b/addons/mrp_repair/mrp_repair.py
@@ -571,40 +571,40 @@ class mrp_repair(osv.osv):
     def create_send_note(self, cr, uid, ids, context=None):
         for repair in self.browse(cr, uid, ids, context):
             message = _("Repair Order for <em>%s</em> has been <b>created</b>." % (repair.product_id.name))
-            self.message_append_note(cr, uid, [repair.id], body=message, context=context)
+            self.message_post(cr, uid, [repair.id], body=message, context=context)
         return True
 
     def set_start_send_note(self, cr, uid, ids, context=None):
         for repair in self.browse(cr, uid, ids, context):
             message = _("Repair Order for <em>%s</em> has been <b>started</b>." % (repair.product_id.name))
-            self.message_append_note(cr, uid, [repair.id], body=message, context=context)
+            self.message_post(cr, uid, [repair.id], body=message, context=context)
         return True
 
     def set_toinvoiced_send_note(self, cr, uid, ids, context=None):
         for repair in self.browse(cr, uid, ids, context):
             message = _("Draft Invoice of %s %s <b>waiting for validation</b>.") % (repair.invoice_id.amount_total, repair.invoice_id.currency_id.symbol)
-            self.message_append_note(cr, uid, [repair.id], body=message, context=context)
+            self.message_post(cr, uid, [repair.id], body=message, context=context)
         return True
 
     def set_confirm_send_note(self, cr, uid, ids, context=None):
         for repair in self.browse(cr, uid, ids, context):
             message = _( "Repair Order for <em>%s</em> has been <b>accepted</b>." % (repair.product_id.name))
-            self.message_append_note(cr, uid, [repair.id], body=message, context=context)
+            self.message_post(cr, uid, [repair.id], body=message, context=context)
         return True
 
     def set_cancel_send_note(self, cr, uid, ids, context=None):
         message = _("Repair has been <b>cancelled</b>.")
-        self.message_append_note(cr, uid, ids, body=message, context=context)
+        self.message_post(cr, uid, ids, body=message, context=context)
         return True
 
     def set_ready_send_note(self, cr, uid, ids, context=None):
         message = _("Repair Order is now <b>ready</b> to repair.")
-        self.message_append_note(cr, uid, ids, body=message, context=context)
+        self.message_post(cr, uid, ids, body=message, context=context)
         return True
 
     def set_done_send_note(self, cr, uid, ids, context=None):
         message = _("Repair Order is <b>closed</b>.")
-        self.message_append_note(cr, uid, ids, body=message, context=context)
+        self.message_post(cr, uid, ids, body=message, context=context)
         return True
 
 mrp_repair()
diff --git a/addons/mrp_repair/mrp_repair_demo.yml b/addons/mrp_repair/mrp_repair_demo.yml
index 5421b376348..1e296573876 100644
--- a/addons/mrp_repair/mrp_repair_demo.yml
+++ b/addons/mrp_repair/mrp_repair_demo.yml
@@ -5,7 +5,7 @@
     date_expected: !eval datetime.today().strftime("%Y-%m-%d %H:%M:%S")
     location_dest_id: stock.stock_location_14
     location_id: stock.stock_location_stock
-    name: '[PC1] Basic PC'
+    name: '[PCSC234] PC Assemble SC234'
     product_id: product.product_product_3
     product_qty: 1.0
     product_uom: product.product_uom_unit
@@ -23,7 +23,7 @@
     operations:
       - location_dest_id: stock.location_production
         location_id: stock.stock_location_stock
-        name: '[HDD1] HDD Seagate 7200.8 80GB'
+        name: '[M-Las] Mouse, Laser'
         price_unit: 50.0
         product_id: product.product_product_11
         product_uom: product.product_uom_unit
@@ -32,7 +32,7 @@
         to_invoice: 1
         type: add
     fees_lines:
-      - name: 'HDD1 Seagate repair fees'
+      - name: 'Mouse repair fees'
         product_id: product.product_product_11
         product_uom_qty: 1.0
         product_uom: product.product_uom_unit
@@ -46,7 +46,7 @@
     date_expected: !eval datetime.today().strftime("%Y-%m-%d %H:%M:%S")
     location_dest_id: stock.stock_location_14
     location_id: stock.stock_location_stock
-    name: '[PC3] Medium PC'
+    name: '[PC-DEM] PC on Demand'
     product_id: product.product_product_5
     product_qty: 1.0
     product_uom: product.product_uom_unit
@@ -64,7 +64,7 @@
     operations:
       - location_dest_id: stock.location_production
         location_id: stock.stock_location_stock
-        name: '[HDD2] HDD Seagate 7200.8 120GB'
+        name: '[M-Wir] Mouse, Wireless'
         price_unit: 50.0
         product_id: product.product_product_12
         product_uom: product.product_uom_unit
@@ -73,7 +73,7 @@
         to_invoice: 1
         type: add
     fees_lines:
-      - name: 'HDD2 Seagate repair fees'
+      - name: 'Mouse Seagate repair fees'
         product_id: product.product_product_12
         product_uom_qty: 1.0
         product_uom: product.product_uom_unit
@@ -87,7 +87,7 @@
     date_expected: !eval datetime.today().strftime("%Y-%m-%d %H:%M:%S")
     location_dest_id: stock.stock_location_14
     location_id: stock.stock_location_stock
-    name: '[PC4] Customizable PC'
+    name: '[LCD15] 15” LCD Monitor'
     product_id: product.product_product_6
     product_qty: 1.0
     product_uom: product.product_uom_unit
@@ -105,7 +105,7 @@
     operations:
       - location_dest_id: stock.location_production
         location_id: stock.stock_location_stock
-        name: '[HDD3] HDD Seagate 7200.8 160GB'
+        name: '[RAM-SR5] RAM DDR SR5'
         price_unit: 50.0
         product_id: product.product_product_13
         product_uom: product.product_uom_unit
@@ -114,7 +114,7 @@
         to_invoice: 1
         type: add
     fees_lines:
-      - name: 'HDD3 Seagate repair fees'
+      - name: 'RAM fees'
         product_id: product.product_product_13
         product_uom_qty: 1.0
         product_uom: product.product_uom_unit
diff --git a/addons/mrp_repair/test/test_mrp_repair_cancel.yml b/addons/mrp_repair/test/test_mrp_repair_cancel.yml
index 6a355f35b41..ee0e9c379e7 100644
--- a/addons/mrp_repair/test/test_mrp_repair_cancel.yml
+++ b/addons/mrp_repair/test/test_mrp_repair_cancel.yml
@@ -1,6 +1,6 @@
 -
   In order to test the cancel flow of mrp_repair module,
-  I start by creating new copy Repair order for "Basic PC" product.
+  I start by creating new copy Repair order for "PC Assemble SC234" product.
 -
   !python {model: mrp.repair}: |
     copy_id = self.copy(cr, uid, ref("mrp_repair_rmrp1"))
diff --git a/addons/mrp_subproduct/__openerp__.py b/addons/mrp_subproduct/__openerp__.py
index 793d0f104e0..c45584eb1a9 100644
--- a/addons/mrp_subproduct/__openerp__.py
+++ b/addons/mrp_subproduct/__openerp__.py
@@ -31,24 +31,23 @@ This module allows you to produce several products from one production order.
 You can configure sub-products in the bill of material.
 
 Without this module:
+--------------------
     A + B + C -> D
 
 With this module:
+-----------------
     A + B + C -> D + E
     """,
     'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
     'images': ['images/bom_subproduct.jpeg'],
     'depends': ['base', 'mrp'],
-    'init_xml': [],
-    'update_xml': [
+    'data': [
        'security/ir.model.access.csv',
        'mrp_subproduct_view.xml'
     ],
-    'demo_xml': [],
-    'test': [
-             'test/mrp_subproduct.yml'
-             ],
+    'demo': [],
+    'test': ['test/mrp_subproduct.yml'],
     'installable': True,
     'auto_install': False,
     'certificate': '0050060616733',
diff --git a/addons/mrp_subproduct/i18n/ab.po b/addons/mrp_subproduct/i18n/ab.po
index 08f531680cc..025a89d4422 100644
--- a/addons/mrp_subproduct/i18n/ab.po
+++ b/addons/mrp_subproduct/i18n/ab.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:28+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: mrp_subproduct
 #: field:mrp.subproduct,product_id:0
diff --git a/addons/mrp_subproduct/i18n/ar.po b/addons/mrp_subproduct/i18n/ar.po
index 9c6188155e1..f5e158ff9f8 100644
--- a/addons/mrp_subproduct/i18n/ar.po
+++ b/addons/mrp_subproduct/i18n/ar.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:28+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: mrp_subproduct
 #: field:mrp.subproduct,product_id:0
diff --git a/addons/mrp_subproduct/i18n/bg.po b/addons/mrp_subproduct/i18n/bg.po
index 75cb71a1bb4..a4cf39203a6 100644
--- a/addons/mrp_subproduct/i18n/bg.po
+++ b/addons/mrp_subproduct/i18n/bg.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:28+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: mrp_subproduct
 #: field:mrp.subproduct,product_id:0
diff --git a/addons/mrp_subproduct/i18n/bs.po b/addons/mrp_subproduct/i18n/bs.po
index f3cbb1aa6e2..a79fed4fce6 100644
--- a/addons/mrp_subproduct/i18n/bs.po
+++ b/addons/mrp_subproduct/i18n/bs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:28+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: mrp_subproduct
 #: field:mrp.subproduct,product_id:0
diff --git a/addons/mrp_subproduct/i18n/ca.po b/addons/mrp_subproduct/i18n/ca.po
index f2801496cad..cb0ba3b90e4 100644
--- a/addons/mrp_subproduct/i18n/ca.po
+++ b/addons/mrp_subproduct/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:28+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: mrp_subproduct
 #: field:mrp.subproduct,product_id:0
diff --git a/addons/mrp_subproduct/i18n/cs.po b/addons/mrp_subproduct/i18n/cs.po
index 6ff4a1b89e0..cbb8107f157 100644
--- a/addons/mrp_subproduct/i18n/cs.po
+++ b/addons/mrp_subproduct/i18n/cs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:28+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: mrp_subproduct
 #: field:mrp.subproduct,product_id:0
diff --git a/addons/mrp_subproduct/i18n/da.po b/addons/mrp_subproduct/i18n/da.po
index 4f20e32f3f1..7fd057fc347 100644
--- a/addons/mrp_subproduct/i18n/da.po
+++ b/addons/mrp_subproduct/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:28+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: mrp_subproduct
 #: field:mrp.subproduct,product_id:0
diff --git a/addons/mrp_subproduct/i18n/de.po b/addons/mrp_subproduct/i18n/de.po
index bd517814f94..0081c432d5c 100644
--- a/addons/mrp_subproduct/i18n/de.po
+++ b/addons/mrp_subproduct/i18n/de.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:28+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: mrp_subproduct
 #: field:mrp.subproduct,product_id:0
diff --git a/addons/mrp_subproduct/i18n/es.po b/addons/mrp_subproduct/i18n/es.po
index fc33fe80d7c..9fe51b12b4e 100644
--- a/addons/mrp_subproduct/i18n/es.po
+++ b/addons/mrp_subproduct/i18n/es.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:29+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: mrp_subproduct
 #: field:mrp.subproduct,product_id:0
diff --git a/addons/mrp_subproduct/i18n/es_AR.po b/addons/mrp_subproduct/i18n/es_AR.po
index c93ef9c1638..3412d0ba1d6 100644
--- a/addons/mrp_subproduct/i18n/es_AR.po
+++ b/addons/mrp_subproduct/i18n/es_AR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:29+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: mrp_subproduct
 #: field:mrp.subproduct,product_id:0
diff --git a/addons/mrp_subproduct/i18n/es_CR.po b/addons/mrp_subproduct/i18n/es_CR.po
index 86268bc1843..0f04bde65b1 100644
--- a/addons/mrp_subproduct/i18n/es_CR.po
+++ b/addons/mrp_subproduct/i18n/es_CR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:29+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 "Language: \n"
 
 #. module: mrp_subproduct
diff --git a/addons/mrp_subproduct/i18n/es_EC.po b/addons/mrp_subproduct/i18n/es_EC.po
index ab0ed28a640..b99d9148605 100644
--- a/addons/mrp_subproduct/i18n/es_EC.po
+++ b/addons/mrp_subproduct/i18n/es_EC.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:29+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: mrp_subproduct
 #: field:mrp.subproduct,product_id:0
diff --git a/addons/mrp_subproduct/i18n/et.po b/addons/mrp_subproduct/i18n/et.po
index dbe54005fb5..d0394fc6e3e 100644
--- a/addons/mrp_subproduct/i18n/et.po
+++ b/addons/mrp_subproduct/i18n/et.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:28+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: mrp_subproduct
 #: field:mrp.subproduct,product_id:0
diff --git a/addons/mrp_subproduct/i18n/fi.po b/addons/mrp_subproduct/i18n/fi.po
index 7e9d86833ce..6aef736bb83 100644
--- a/addons/mrp_subproduct/i18n/fi.po
+++ b/addons/mrp_subproduct/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:28+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: mrp_subproduct
 #: field:mrp.subproduct,product_id:0
diff --git a/addons/mrp_subproduct/i18n/fr.po b/addons/mrp_subproduct/i18n/fr.po
index 006cb507bc6..6a90cb6dbc8 100644
--- a/addons/mrp_subproduct/i18n/fr.po
+++ b/addons/mrp_subproduct/i18n/fr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:28+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: mrp_subproduct
 #: field:mrp.subproduct,product_id:0
diff --git a/addons/mrp_subproduct/i18n/gl.po b/addons/mrp_subproduct/i18n/gl.po
index e020d6d764f..77f731d3eda 100644
--- a/addons/mrp_subproduct/i18n/gl.po
+++ b/addons/mrp_subproduct/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:28+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: mrp_subproduct
 #: field:mrp.subproduct,product_id:0
diff --git a/addons/mrp_subproduct/i18n/hr.po b/addons/mrp_subproduct/i18n/hr.po
index 4fc2349db48..be85772dd4e 100644
--- a/addons/mrp_subproduct/i18n/hr.po
+++ b/addons/mrp_subproduct/i18n/hr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:29+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: mrp_subproduct
 #: field:mrp.subproduct,product_id:0
diff --git a/addons/mrp_subproduct/i18n/hu.po b/addons/mrp_subproduct/i18n/hu.po
index e96c1d25e56..4c7e1fe4fe1 100644
--- a/addons/mrp_subproduct/i18n/hu.po
+++ b/addons/mrp_subproduct/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:28+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: mrp_subproduct
 #: field:mrp.subproduct,product_id:0
diff --git a/addons/mrp_subproduct/i18n/id.po b/addons/mrp_subproduct/i18n/id.po
index e73364df8be..d3bd8eb03f8 100644
--- a/addons/mrp_subproduct/i18n/id.po
+++ b/addons/mrp_subproduct/i18n/id.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:28+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: mrp_subproduct
 #: field:mrp.subproduct,product_id:0
diff --git a/addons/mrp_subproduct/i18n/it.po b/addons/mrp_subproduct/i18n/it.po
index be8a54ee73f..c36807a5582 100644
--- a/addons/mrp_subproduct/i18n/it.po
+++ b/addons/mrp_subproduct/i18n/it.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:28+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: mrp_subproduct
 #: field:mrp.subproduct,product_id:0
diff --git a/addons/mrp_subproduct/i18n/ja.po b/addons/mrp_subproduct/i18n/ja.po
index 0c863129217..05189cf60fd 100644
--- a/addons/mrp_subproduct/i18n/ja.po
+++ b/addons/mrp_subproduct/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:28+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: mrp_subproduct
 #: field:mrp.subproduct,product_id:0
diff --git a/addons/mrp_subproduct/i18n/ko.po b/addons/mrp_subproduct/i18n/ko.po
index 9c9cad23b6b..cd3ce6623c5 100644
--- a/addons/mrp_subproduct/i18n/ko.po
+++ b/addons/mrp_subproduct/i18n/ko.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:28+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: mrp_subproduct
 #: field:mrp.subproduct,product_id:0
diff --git a/addons/mrp_subproduct/i18n/lt.po b/addons/mrp_subproduct/i18n/lt.po
index fe33f25fabd..6224626fdfa 100644
--- a/addons/mrp_subproduct/i18n/lt.po
+++ b/addons/mrp_subproduct/i18n/lt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:28+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: mrp_subproduct
 #: field:mrp.subproduct,product_id:0
diff --git a/addons/mrp_subproduct/i18n/mn.po b/addons/mrp_subproduct/i18n/mn.po
index 8b573c20cd5..1ac0db8ba46 100644
--- a/addons/mrp_subproduct/i18n/mn.po
+++ b/addons/mrp_subproduct/i18n/mn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:28+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: mrp_subproduct
 #: field:mrp.subproduct,product_id:0
diff --git a/addons/mrp_subproduct/i18n/nl.po b/addons/mrp_subproduct/i18n/nl.po
index db84c2c5645..f906be0af9e 100644
--- a/addons/mrp_subproduct/i18n/nl.po
+++ b/addons/mrp_subproduct/i18n/nl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:28+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: mrp_subproduct
 #: field:mrp.subproduct,product_id:0
diff --git a/addons/mrp_subproduct/i18n/nl_BE.po b/addons/mrp_subproduct/i18n/nl_BE.po
index 249ba1fcf01..385da851736 100644
--- a/addons/mrp_subproduct/i18n/nl_BE.po
+++ b/addons/mrp_subproduct/i18n/nl_BE.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:29+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: mrp_subproduct
 #: field:mrp.subproduct,product_id:0
diff --git a/addons/mrp_subproduct/i18n/oc.po b/addons/mrp_subproduct/i18n/oc.po
index 7daa94d64b4..8debdddac33 100644
--- a/addons/mrp_subproduct/i18n/oc.po
+++ b/addons/mrp_subproduct/i18n/oc.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:28+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: mrp_subproduct
 #: field:mrp.subproduct,product_id:0
diff --git a/addons/mrp_subproduct/i18n/pl.po b/addons/mrp_subproduct/i18n/pl.po
index 42b23df9897..3a937e7833c 100644
--- a/addons/mrp_subproduct/i18n/pl.po
+++ b/addons/mrp_subproduct/i18n/pl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:29+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: mrp_subproduct
 #: field:mrp.subproduct,product_id:0
diff --git a/addons/mrp_subproduct/i18n/pt.po b/addons/mrp_subproduct/i18n/pt.po
index d8cd66268c0..24d1cb823ba 100644
--- a/addons/mrp_subproduct/i18n/pt.po
+++ b/addons/mrp_subproduct/i18n/pt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:29+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: mrp_subproduct
 #: field:mrp.subproduct,product_id:0
diff --git a/addons/mrp_subproduct/i18n/pt_BR.po b/addons/mrp_subproduct/i18n/pt_BR.po
index 62c5b6baabb..70ad5653b33 100644
--- a/addons/mrp_subproduct/i18n/pt_BR.po
+++ b/addons/mrp_subproduct/i18n/pt_BR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:29+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: mrp_subproduct
 #: field:mrp.subproduct,product_id:0
@@ -50,7 +50,7 @@ msgstr "Ordem de Produção"
 #. module: mrp_subproduct
 #: constraint:mrp.bom:0
 msgid "BoM line product should not be same as BoM product."
-msgstr ""
+msgstr "Produtos de linha BoM não devem ser os mesmo que produtos BoM"
 
 #. module: mrp_subproduct
 #: view:mrp.bom:0
@@ -118,6 +118,13 @@ msgid ""
 "BoM / quantity of manufactured product set on the BoM * quantity of "
 "manufactured product in the production order.)'"
 msgstr ""
+"Definir como a quantidade de subprodutos será definido em ordens de produção "
+"que utilizam este BoM. 'Fixo' retrata uma situação em caso de a quantidade "
+"de subproduto criado é sempre definido igual à quantidade no BOM, "
+"Independentemente de quantos são criados na ordem de saída. Por outro lado, "
+"'Variável' significa que essa será a quantidade calculada como \"(quantidade "
+"de conjunto subproduto no. BoM / quantidade de produto fabricado definido na "
+"quantidade de produto BoM * Fabricado na Ordem de Produção)\""
 
 #. module: mrp_subproduct
 #: constraint:mrp.bom:0
diff --git a/addons/mrp_subproduct/i18n/ro.po b/addons/mrp_subproduct/i18n/ro.po
index 505cce3b657..502e7572e89 100644
--- a/addons/mrp_subproduct/i18n/ro.po
+++ b/addons/mrp_subproduct/i18n/ro.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:29+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: mrp_subproduct
 #: field:mrp.subproduct,product_id:0
diff --git a/addons/mrp_subproduct/i18n/ru.po b/addons/mrp_subproduct/i18n/ru.po
index 62637d8ec47..616c58fe3e7 100644
--- a/addons/mrp_subproduct/i18n/ru.po
+++ b/addons/mrp_subproduct/i18n/ru.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:29+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: mrp_subproduct
 #: field:mrp.subproduct,product_id:0
diff --git a/addons/mrp_subproduct/i18n/sk.po b/addons/mrp_subproduct/i18n/sk.po
index 78990be5ab6..9ab4d509ac4 100644
--- a/addons/mrp_subproduct/i18n/sk.po
+++ b/addons/mrp_subproduct/i18n/sk.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:29+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: mrp_subproduct
 #: field:mrp.subproduct,product_id:0
diff --git a/addons/mrp_subproduct/i18n/sl.po b/addons/mrp_subproduct/i18n/sl.po
index 770dc0187fc..9a9ad696009 100644
--- a/addons/mrp_subproduct/i18n/sl.po
+++ b/addons/mrp_subproduct/i18n/sl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:29+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: mrp_subproduct
 #: field:mrp.subproduct,product_id:0
diff --git a/addons/mrp_subproduct/i18n/sq.po b/addons/mrp_subproduct/i18n/sq.po
index c3c52d5bbe5..02db76097e8 100644
--- a/addons/mrp_subproduct/i18n/sq.po
+++ b/addons/mrp_subproduct/i18n/sq.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:28+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: mrp_subproduct
 #: field:mrp.subproduct,product_id:0
diff --git a/addons/mrp_subproduct/i18n/sr.po b/addons/mrp_subproduct/i18n/sr.po
index 25ba5836ad2..2c32333ea47 100644
--- a/addons/mrp_subproduct/i18n/sr.po
+++ b/addons/mrp_subproduct/i18n/sr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:29+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: mrp_subproduct
 #: field:mrp.subproduct,product_id:0
diff --git a/addons/mrp_subproduct/i18n/sr@latin.po b/addons/mrp_subproduct/i18n/sr@latin.po
index 49a7897f9b3..feb75945058 100644
--- a/addons/mrp_subproduct/i18n/sr@latin.po
+++ b/addons/mrp_subproduct/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:29+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: mrp_subproduct
 #: field:mrp.subproduct,product_id:0
diff --git a/addons/mrp_subproduct/i18n/sv.po b/addons/mrp_subproduct/i18n/sv.po
index 001e3927440..3144eb08bd0 100644
--- a/addons/mrp_subproduct/i18n/sv.po
+++ b/addons/mrp_subproduct/i18n/sv.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:29+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: mrp_subproduct
 #: field:mrp.subproduct,product_id:0
diff --git a/addons/mrp_subproduct/i18n/tlh.po b/addons/mrp_subproduct/i18n/tlh.po
index f06b88e382f..43bd3d0e23b 100644
--- a/addons/mrp_subproduct/i18n/tlh.po
+++ b/addons/mrp_subproduct/i18n/tlh.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:29+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: mrp_subproduct
 #: field:mrp.subproduct,product_id:0
diff --git a/addons/mrp_subproduct/i18n/tr.po b/addons/mrp_subproduct/i18n/tr.po
index 04b0b26e43f..d927ea7f9be 100644
--- a/addons/mrp_subproduct/i18n/tr.po
+++ b/addons/mrp_subproduct/i18n/tr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:29+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: mrp_subproduct
 #: field:mrp.subproduct,product_id:0
@@ -118,6 +118,13 @@ msgid ""
 "BoM / quantity of manufactured product set on the BoM * quantity of "
 "manufactured product in the production order.)'"
 msgstr ""
+"Yanürünlerin miktarının Gereç Listeleri ni kullanarak üretim emirlerinde "
+"nasıl ayarlanacağını tanımlayın. 'Sabit', oluşturulan yanürün miktarının, "
+"sipariş emrinde kaç tane oluşturulduğuna bakılmaksızın,  her zaman Gereç "
+"Listesinde ayarlanan miktara eşit olduğunu belirtir. Buna karşın, 'Değişken' "
+"ise miktarın şu şekilde hesaplanağı anlamına gelir '(Gereç Listesinde "
+"ayarlanan yanürün miktarı / Gereç Listesinde ayarlanan üretim miktarı * "
+"üretim emrindeki üretilen ürün miktarı.)'"
 
 #. module: mrp_subproduct
 #: constraint:mrp.bom:0
diff --git a/addons/mrp_subproduct/i18n/uk.po b/addons/mrp_subproduct/i18n/uk.po
index 4012f41120e..8efd94482df 100644
--- a/addons/mrp_subproduct/i18n/uk.po
+++ b/addons/mrp_subproduct/i18n/uk.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:29+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: mrp_subproduct
 #: field:mrp.subproduct,product_id:0
diff --git a/addons/mrp_subproduct/i18n/vi.po b/addons/mrp_subproduct/i18n/vi.po
index 0070a388064..cfd0641ca1e 100644
--- a/addons/mrp_subproduct/i18n/vi.po
+++ b/addons/mrp_subproduct/i18n/vi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:29+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: mrp_subproduct
 #: field:mrp.subproduct,product_id:0
diff --git a/addons/mrp_subproduct/i18n/zh_CN.po b/addons/mrp_subproduct/i18n/zh_CN.po
index 32002ce7d3f..6da99a82967 100644
--- a/addons/mrp_subproduct/i18n/zh_CN.po
+++ b/addons/mrp_subproduct/i18n/zh_CN.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:29+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: mrp_subproduct
 #: field:mrp.subproduct,product_id:0
diff --git a/addons/mrp_subproduct/i18n/zh_TW.po b/addons/mrp_subproduct/i18n/zh_TW.po
index 30d6072f785..8c0fe2aae87 100644
--- a/addons/mrp_subproduct/i18n/zh_TW.po
+++ b/addons/mrp_subproduct/i18n/zh_TW.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:29+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: mrp_subproduct
 #: field:mrp.subproduct,product_id:0
diff --git a/addons/multi_company/__openerp__.py b/addons/multi_company/__openerp__.py
index 3550e304551..501740188db 100644
--- a/addons/multi_company/__openerp__.py
+++ b/addons/multi_company/__openerp__.py
@@ -37,13 +37,8 @@ This module is the base module for other multi-company modules.
         'sale_stock',
         'project',
     ],
-    'init_xml': [],
-    'update_xml': [
-        'res_company_view.xml'
-    ],
-    'demo_xml': [
-        'multi_company_demo.xml'
-    ],
+    'data': ['res_company_view.xml'],
+    'demo': ['multi_company_demo.xml'],
     'installable': True,
     'auto_install': False,
     'certificate' : '001115526094673097933',
diff --git a/addons/multi_company/i18n/ar.po b/addons/multi_company/i18n/ar.po
index 81134c91186..5b2f0a67998 100644
--- a/addons/multi_company/i18n/ar.po
+++ b/addons/multi_company/i18n/ar.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:30+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: multi_company
 #: model:res.company,overdue_msg:multi_company.res_company_odoo
diff --git a/addons/multi_company/i18n/bg.po b/addons/multi_company/i18n/bg.po
index 062718e18c9..85c000fdc51 100644
--- a/addons/multi_company/i18n/bg.po
+++ b/addons/multi_company/i18n/bg.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:30+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: multi_company
 #: model:res.company,overdue_msg:multi_company.res_company_odoo
diff --git a/addons/multi_company/i18n/bs.po b/addons/multi_company/i18n/bs.po
index b92dc46bcf7..ded2d18be55 100644
--- a/addons/multi_company/i18n/bs.po
+++ b/addons/multi_company/i18n/bs.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:30+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: multi_company
 #: model:res.company,overdue_msg:multi_company.res_company_odoo
diff --git a/addons/multi_company/i18n/ca.po b/addons/multi_company/i18n/ca.po
index ee7d14a004d..b92a2d88d4d 100644
--- a/addons/multi_company/i18n/ca.po
+++ b/addons/multi_company/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:30+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: multi_company
 #: model:res.company,overdue_msg:multi_company.res_company_odoo
diff --git a/addons/multi_company/i18n/cs.po b/addons/multi_company/i18n/cs.po
index 5aeae4eb5b6..919217577ff 100644
--- a/addons/multi_company/i18n/cs.po
+++ b/addons/multi_company/i18n/cs.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:30+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: multi_company
 #: model:res.company,overdue_msg:multi_company.res_company_odoo
diff --git a/addons/multi_company/i18n/da.po b/addons/multi_company/i18n/da.po
index a5bd6b124fa..aeb9589217a 100644
--- a/addons/multi_company/i18n/da.po
+++ b/addons/multi_company/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:30+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: multi_company
 #: model:res.company,overdue_msg:multi_company.res_company_odoo
diff --git a/addons/multi_company/i18n/de.po b/addons/multi_company/i18n/de.po
index 04d2c6fa088..09945427c94 100644
--- a/addons/multi_company/i18n/de.po
+++ b/addons/multi_company/i18n/de.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:30+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: multi_company
 #: model:res.company,overdue_msg:multi_company.res_company_odoo
diff --git a/addons/multi_company/i18n/es.po b/addons/multi_company/i18n/es.po
index fba66ed2567..5a341fa8550 100644
--- a/addons/multi_company/i18n/es.po
+++ b/addons/multi_company/i18n/es.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:30+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: multi_company
 #: model:res.company,overdue_msg:multi_company.res_company_odoo
diff --git a/addons/multi_company/i18n/es_CR.po b/addons/multi_company/i18n/es_CR.po
index 6dc260a577c..7d2384e5991 100644
--- a/addons/multi_company/i18n/es_CR.po
+++ b/addons/multi_company/i18n/es_CR.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:30+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 "Language: es\n"
 
 #. module: multi_company
diff --git a/addons/multi_company/i18n/es_EC.po b/addons/multi_company/i18n/es_EC.po
index fe8948f727b..386d55017f3 100644
--- a/addons/multi_company/i18n/es_EC.po
+++ b/addons/multi_company/i18n/es_EC.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:30+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: multi_company
 #: model:res.company,overdue_msg:multi_company.res_company_odoo
diff --git a/addons/multi_company/i18n/et.po b/addons/multi_company/i18n/et.po
index 07ee60051b7..39602eade5f 100644
--- a/addons/multi_company/i18n/et.po
+++ b/addons/multi_company/i18n/et.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:30+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: multi_company
 #: model:res.company,overdue_msg:multi_company.res_company_odoo
diff --git a/addons/multi_company/i18n/fi.po b/addons/multi_company/i18n/fi.po
index 52147cadd57..70f553bcdc5 100644
--- a/addons/multi_company/i18n/fi.po
+++ b/addons/multi_company/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:30+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: multi_company
 #: model:res.company,overdue_msg:multi_company.res_company_odoo
diff --git a/addons/multi_company/i18n/fr.po b/addons/multi_company/i18n/fr.po
index a7bb785f50c..8e2fff8b2db 100644
--- a/addons/multi_company/i18n/fr.po
+++ b/addons/multi_company/i18n/fr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:30+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: multi_company
 #: model:res.company,overdue_msg:multi_company.res_company_odoo
diff --git a/addons/multi_company/i18n/gl.po b/addons/multi_company/i18n/gl.po
index fc1456ac273..3704540ca7f 100644
--- a/addons/multi_company/i18n/gl.po
+++ b/addons/multi_company/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:30+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: multi_company
 #: model:res.company,overdue_msg:multi_company.res_company_odoo
diff --git a/addons/multi_company/i18n/hr.po b/addons/multi_company/i18n/hr.po
index 9dd2411dc90..1b288668694 100644
--- a/addons/multi_company/i18n/hr.po
+++ b/addons/multi_company/i18n/hr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:30+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: multi_company
 #: model:res.company,overdue_msg:multi_company.res_company_odoo
diff --git a/addons/multi_company/i18n/hu.po b/addons/multi_company/i18n/hu.po
index b4661c223f9..b52a9c7bb88 100644
--- a/addons/multi_company/i18n/hu.po
+++ b/addons/multi_company/i18n/hu.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:30+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: multi_company
 #: model:res.company,overdue_msg:multi_company.res_company_odoo
diff --git a/addons/multi_company/i18n/id.po b/addons/multi_company/i18n/id.po
index 424dba5c066..b05ba22a37b 100644
--- a/addons/multi_company/i18n/id.po
+++ b/addons/multi_company/i18n/id.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:30+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: multi_company
 #: model:res.company,overdue_msg:multi_company.res_company_odoo
diff --git a/addons/multi_company/i18n/it.po b/addons/multi_company/i18n/it.po
index 3a4dd3f3046..339455ed947 100644
--- a/addons/multi_company/i18n/it.po
+++ b/addons/multi_company/i18n/it.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:30+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: multi_company
 #: model:res.company,overdue_msg:multi_company.res_company_odoo
diff --git a/addons/multi_company/i18n/ja.po b/addons/multi_company/i18n/ja.po
index 5e1a9826f35..212199b67d8 100644
--- a/addons/multi_company/i18n/ja.po
+++ b/addons/multi_company/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:30+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: multi_company
 #: model:res.company,overdue_msg:multi_company.res_company_odoo
diff --git a/addons/multi_company/i18n/lo.po b/addons/multi_company/i18n/lo.po
new file mode 100644
index 00000000000..cb6ca8f2ba0
--- /dev/null
+++ b/addons/multi_company/i18n/lo.po
@@ -0,0 +1,83 @@
+# Lao 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-02-08 00:36+0000\n"
+"PO-Revision-Date: 2012-08-20 18:49+0000\n"
+"Last-Translator: Brice Muangkhot ສຸພາ ເມືອງໂຄຕ <bmuangkhot@gmail.com>\n"
+"Language-Team: Lao <lo@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:30+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
+
+#. module: multi_company
+#: model:res.company,overdue_msg:multi_company.res_company_odoo
+#: model:res.company,overdue_msg:multi_company.res_company_oerp_be
+#: model:res.company,overdue_msg:multi_company.res_company_oerp_editor
+#: model:res.company,overdue_msg:multi_company.res_company_oerp_in
+#: model:res.company,overdue_msg:multi_company.res_company_oerp_us
+msgid ""
+"\n"
+"Date: %(date)s\n"
+"\n"
+"Dear %(partner_name)s,\n"
+"\n"
+"Please find in attachment a reminder of all your unpaid invoices, for a "
+"total amount due of:\n"
+"\n"
+"%(followup_amount).2f %(company_currency)s\n"
+"\n"
+"Thanks,\n"
+"--\n"
+"%(user_signature)s\n"
+"%(company_name)s\n"
+"        "
+msgstr ""
+
+#. module: multi_company
+#: model:product.category,name:multi_company.Odoo1
+msgid "Odoo Offers"
+msgstr ""
+
+#. module: multi_company
+#: view:multi_company.default:0
+msgid "Returning"
+msgstr "ສິນຄ້າກັບຄືນ"
+
+#. module: multi_company
+#: model:ir.ui.menu,name:multi_company.menu_custom_multicompany
+msgid "Multi-Companies"
+msgstr "ໝູ່ບໍລິສັດ"
+
+#. module: multi_company
+#: view:multi_company.default:0
+msgid "Multi Company"
+msgstr ""
+
+#. module: multi_company
+#: model:ir.actions.act_window,name:multi_company.action_inventory_form
+#: model:ir.ui.menu,name:multi_company.menu_action_inventory_form
+msgid "Default Company per Object"
+msgstr ""
+
+#. module: multi_company
+#: view:multi_company.default:0
+msgid "Matching"
+msgstr "ຕົງກັບ"
+
+#. module: multi_company
+#: view:multi_company.default:0
+msgid "Condition"
+msgstr "ຂໍ້ຜູກມັດ"
+
+#. module: multi_company
+#: model:product.template,name:multi_company.product_product_odoo1_product_template
+msgid "Odoo Offer"
+msgstr ""
diff --git a/addons/multi_company/i18n/lt.po b/addons/multi_company/i18n/lt.po
index 2a0cb5c352a..71cecee9194 100644
--- a/addons/multi_company/i18n/lt.po
+++ b/addons/multi_company/i18n/lt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:30+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: multi_company
 #: model:res.company,overdue_msg:multi_company.res_company_odoo
diff --git a/addons/multi_company/i18n/lv.po b/addons/multi_company/i18n/lv.po
index d5676163304..0c1d0ab0a11 100644
--- a/addons/multi_company/i18n/lv.po
+++ b/addons/multi_company/i18n/lv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:30+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: multi_company
 #: model:res.company,overdue_msg:multi_company.res_company_odoo
diff --git a/addons/multi_company/i18n/mn.po b/addons/multi_company/i18n/mn.po
index 5b68f6ebb3a..f9e2b571622 100644
--- a/addons/multi_company/i18n/mn.po
+++ b/addons/multi_company/i18n/mn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:30+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: multi_company
 #: model:res.company,overdue_msg:multi_company.res_company_odoo
diff --git a/addons/multi_company/i18n/nb.po b/addons/multi_company/i18n/nb.po
index 032a6fb88da..ce7fc13bdab 100644
--- a/addons/multi_company/i18n/nb.po
+++ b/addons/multi_company/i18n/nb.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:30+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: multi_company
 #: model:res.company,overdue_msg:multi_company.res_company_odoo
diff --git a/addons/multi_company/i18n/nl.po b/addons/multi_company/i18n/nl.po
index e091acb0cef..74f79c7f340 100644
--- a/addons/multi_company/i18n/nl.po
+++ b/addons/multi_company/i18n/nl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:30+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: multi_company
 #: model:res.company,overdue_msg:multi_company.res_company_odoo
diff --git a/addons/multi_company/i18n/oc.po b/addons/multi_company/i18n/oc.po
index d8ca8510844..c17076c7a5a 100644
--- a/addons/multi_company/i18n/oc.po
+++ b/addons/multi_company/i18n/oc.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:30+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: multi_company
 #: model:res.company,overdue_msg:multi_company.res_company_odoo
diff --git a/addons/multi_company/i18n/pl.po b/addons/multi_company/i18n/pl.po
index a59dca7d029..b6cea6c1e52 100644
--- a/addons/multi_company/i18n/pl.po
+++ b/addons/multi_company/i18n/pl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:30+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: multi_company
 #: model:res.company,overdue_msg:multi_company.res_company_odoo
diff --git a/addons/multi_company/i18n/pt.po b/addons/multi_company/i18n/pt.po
index 1b4dc7fb73e..09d50e12e81 100644
--- a/addons/multi_company/i18n/pt.po
+++ b/addons/multi_company/i18n/pt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:30+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: multi_company
 #: model:res.company,overdue_msg:multi_company.res_company_odoo
diff --git a/addons/multi_company/i18n/pt_BR.po b/addons/multi_company/i18n/pt_BR.po
index a5adb881bfb..fcb692f8f5e 100644
--- a/addons/multi_company/i18n/pt_BR.po
+++ b/addons/multi_company/i18n/pt_BR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:30+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: multi_company
 #: model:res.company,overdue_msg:multi_company.res_company_odoo
diff --git a/addons/multi_company/i18n/ro.po b/addons/multi_company/i18n/ro.po
index 9dd70de28c5..03db5e9fdf9 100644
--- a/addons/multi_company/i18n/ro.po
+++ b/addons/multi_company/i18n/ro.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:30+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: multi_company
 #: model:res.company,overdue_msg:multi_company.res_company_odoo
diff --git a/addons/multi_company/i18n/ru.po b/addons/multi_company/i18n/ru.po
index eabfbdeb9a1..ed7a40875a8 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-02-08 00:36+0000\n"
-"PO-Revision-Date: 2010-10-26 08:32+0000\n"
+"PO-Revision-Date: 2012-08-17 11:09+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
 "Language-Team: Russian <ru@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:30+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: multi_company
 #: model:res.company,overdue_msg:multi_company.res_company_odoo
@@ -68,7 +68,7 @@ msgstr "Возвращаемое"
 #. module: multi_company
 #: model:ir.ui.menu,name:multi_company.menu_custom_multicompany
 msgid "Multi-Companies"
-msgstr ""
+msgstr "Холдинги"
 
 #. module: multi_company
 #: view:multi_company.default:0
diff --git a/addons/multi_company/i18n/sl.po b/addons/multi_company/i18n/sl.po
index 159cb8be659..535d7020867 100644
--- a/addons/multi_company/i18n/sl.po
+++ b/addons/multi_company/i18n/sl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:30+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: multi_company
 #: model:res.company,overdue_msg:multi_company.res_company_odoo
diff --git a/addons/multi_company/i18n/sr.po b/addons/multi_company/i18n/sr.po
index 7bf61126074..20557e81c67 100644
--- a/addons/multi_company/i18n/sr.po
+++ b/addons/multi_company/i18n/sr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:30+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: multi_company
 #: model:res.company,overdue_msg:multi_company.res_company_odoo
diff --git a/addons/multi_company/i18n/sr@latin.po b/addons/multi_company/i18n/sr@latin.po
index d2d455d0d40..fa426159bce 100644
--- a/addons/multi_company/i18n/sr@latin.po
+++ b/addons/multi_company/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:30+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: multi_company
 #: model:res.company,overdue_msg:multi_company.res_company_odoo
diff --git a/addons/multi_company/i18n/sv.po b/addons/multi_company/i18n/sv.po
index c29adf1a645..622faabf702 100644
--- a/addons/multi_company/i18n/sv.po
+++ b/addons/multi_company/i18n/sv.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:30+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: multi_company
 #: model:res.company,overdue_msg:multi_company.res_company_odoo
diff --git a/addons/multi_company/i18n/tr.po b/addons/multi_company/i18n/tr.po
index 054b3e59f97..2464ace0e8b 100644
--- a/addons/multi_company/i18n/tr.po
+++ b/addons/multi_company/i18n/tr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:30+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: multi_company
 #: model:res.company,overdue_msg:multi_company.res_company_odoo
diff --git a/addons/multi_company/i18n/uk.po b/addons/multi_company/i18n/uk.po
index c72d2868ef2..324e9d46e80 100644
--- a/addons/multi_company/i18n/uk.po
+++ b/addons/multi_company/i18n/uk.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:30+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: multi_company
 #: model:res.company,overdue_msg:multi_company.res_company_odoo
diff --git a/addons/multi_company/i18n/vi.po b/addons/multi_company/i18n/vi.po
index 8d12d7bcbdb..912200fade9 100644
--- a/addons/multi_company/i18n/vi.po
+++ b/addons/multi_company/i18n/vi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:30+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: multi_company
 #: model:res.company,overdue_msg:multi_company.res_company_odoo
diff --git a/addons/multi_company/i18n/zh_CN.po b/addons/multi_company/i18n/zh_CN.po
index 0b6079319e2..29411fc0e4b 100644
--- a/addons/multi_company/i18n/zh_CN.po
+++ b/addons/multi_company/i18n/zh_CN.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:30+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: multi_company
 #: model:res.company,overdue_msg:multi_company.res_company_odoo
diff --git a/addons/multi_company/i18n/zh_TW.po b/addons/multi_company/i18n/zh_TW.po
index 7af4b289aa8..b0e238901c1 100644
--- a/addons/multi_company/i18n/zh_TW.po
+++ b/addons/multi_company/i18n/zh_TW.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:30+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: multi_company
 #: model:res.company,overdue_msg:multi_company.res_company_odoo
diff --git a/addons/multi_company/multi_company_demo.xml b/addons/multi_company/multi_company_demo.xml
index 462a355e789..d120550e3b9 100644
--- a/addons/multi_company/multi_company_demo.xml
+++ b/addons/multi_company/multi_company_demo.xml
@@ -52,47 +52,12 @@
 
 <!--                      User                        -->
 
-        <record id="res_users_editor_demo" model="res.users">
-            <field name="password">editor_demo</field>
-            <field name="name">OpenERP Editor</field>
-            <field name="login">editor_demo</field>
-            <field name="company_id" ref="res_company_oerp_editor"/>
-            <field name="company_ids" eval="[(4, ref('res_company_oerp_editor'))]"/>
-            <field name="groups_id" eval="[(6,0,[ref('base.group_user'),ref('base.group_sale_manager'),ref('project.group_project_user'),ref('account.group_account_invoice')])]"/>
+        <record id="base.user_root" model="res.users">
+            <field name="company_ids" eval="[(4, ref('res_company_oerp_editor')),(4, ref('res_company_oerp_us')),(4, ref('res_company_oerp_be'))]"/>
         </record>
-        <record id="res_users_sales_demo_us" model="res.users">
-            <field name="password">sales_demo_us</field>
-            <field name="name">OpenERP Salesman US</field>
-            <field name="login">sales_demo_us</field>
-            <field name="company_id" ref="res_company_oerp_us"/>
-            <field name="company_ids" eval="[(4, ref('res_company_oerp_us'))]"/>
-            <field name="groups_id" eval="[(6,0,[ref('base.group_user'),ref('base.group_sale_manager'),ref('project.group_project_user'),ref('account.group_account_invoice')])]"/>
+        <record id="base.user_demo" model="res.users">
+            <field name="company_ids" eval="[(4, ref('res_company_oerp_us')),(4, ref('res_company_oerp_be')),(4, ref('res_company_odoo'))]"/>
         </record>
-        <record id="res_users_sales_demo_be" model="res.users">
-            <field name="password">sales_demo_be</field>
-            <field name="name">OpenERP Salesman BE</field>
-            <field name="login">sales_demo_be</field>
-            <field name="company_id" ref="res_company_oerp_be"/>
-            <field name="company_ids" eval="[(4, ref('res_company_oerp_be'))]"/>
-            <field name="groups_id" eval="[(6,0,[ref('base.group_user'),ref('base.group_sale_manager'),ref('project.group_project_user'),ref('account.group_account_invoice')])]"/>
-        </record>
-        <record id="res_users_sales_demo_in" model="res.users">
-            <field name="password">sales_demo_in</field>
-            <field name="name">OpenERP Salesman IN</field>
-            <field name="login">sales_demo_in</field>
-            <field name="company_id" ref="res_company_oerp_in"/>
-            <field name="company_ids" eval="[(4, ref('res_company_oerp_in'))]"/>
-            <field name="groups_id" eval="[(6,0,[ref('base.group_user'),ref('base.group_sale_manager'),ref('project.group_project_user'),ref('account.group_account_invoice')])]"/>
-        </record>
-        <record id="res_users_odoo_demo" model="res.users">
-            <field name="password">odoo_demo</field>
-            <field name="name">Odoo</field>
-            <field name="login">odoo_demo</field>
-            <field name="company_id" ref="res_company_odoo"/>
-            <field name="company_ids" eval="[(4, ref('res_company_odoo'))]"/>
-            <field name="groups_id" eval="[(6,0,[ref('base.group_user'),ref('base.group_sale_manager'),ref('project.group_project_user'),ref('account.group_account_invoice')])]"/>
-        </record>
-
 
         <!--
     Resource: product.product
diff --git a/addons/analytic_contract_project/__init__.py b/addons/note/__init__.py
similarity index 88%
rename from addons/analytic_contract_project/__init__.py
rename to addons/note/__init__.py
index dd60ac32096..9bf064877b5 100644
--- a/addons/analytic_contract_project/__init__.py
+++ b/addons/note/__init__.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,10 +15,9 @@
 #    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 analytic_contract_project
+import note
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/project_mailgate/__openerp__.py b/addons/note/__openerp__.py
similarity index 54%
rename from addons/project_mailgate/__openerp__.py
rename to addons/note/__openerp__.py
index 656a091d4e8..62d9962634a 100644
--- a/addons/project_mailgate/__openerp__.py
+++ b/addons/note/__openerp__.py
@@ -19,36 +19,45 @@
 #
 ##############################################################################
 
-
 {
-    "name": "Tasks-Mail Integration",
-    "version": "1.1",
-    "author": "OpenERP SA",
-    "website": "http://www.openerp.com",
-    "category": "Project Management",
-    "images": ["images/project_mailgate_task.jpeg"],
-    "depends": ["project", "mail"],
-    "description": """
-This module can automatically create Project Tasks based on incoming emails.
-============================================================================
+    'name': 'Notes',
+    'version': '0.1',
+    'category': 'Tools',
+    'description': """
+This module allows users to create their own notes inside OpenERP
+=================================================================
 
-Allows creating tasks based on new emails arriving at a given mailbox,
-similarly to what the CRM application has for Leads/Opportunities.
+Use notes to write meeting minutes, organize ideas, organize personnal todo
+lists, etc. Each user manages his own personnal notes. Notes are available to
+their authors only, but they can share notes to others users so that several
+people can work on the same note in real time. It's very efficient to share
+meeting minutes.
 
-There are two common alternatives to configure the mailbox integration:
-    * Install the ``fetchmail`` module and configure a new mailbox, then select
-      ``Project Tasks`` as the target for incoming emails.
-    * Set it up manually on your mail server based on the 'mail gateway' script
-      provided in the ``mail`` module - and connect it to the `project.task` model.
-    """,
-    "init_xml": [],
-    "update_xml": [
+Notes can be found in the 'Home' menu.
+""",
+    'author': 'OpenERP SA',
+    'website': 'http://openerp.com',
+    'summary': 'Sticky Notes, Collaborative',
+    'depends': [
+        'base_tools',
+        'mail',
+        'pad',
     ],
-    'demo_xml': [
+    'data': [
+        'security/note_security.xml',
+        'security/ir.model.access.csv',
+        'note_data.xml',
+        'note_view.xml',
+    ],
+    'demo': [
+        'note_demo.xml',
+    ],
+    'css': [
+        'static/src/css/note.css',
     ],
     'installable': True,
+    'application': True,
     'auto_install': False,
-    'certificate': '001075048780413258261',
 }
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/note/note.py b/addons/note/note.py
new file mode 100644
index 00000000000..abc7dca297e
--- /dev/null
+++ b/addons/note/note.py
@@ -0,0 +1,97 @@
+# -*- 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, fields
+from tools.translate import _
+
+class note_stage(osv.osv):
+    """ Category of Note """
+    _name = "note.stage"
+    _description = "Note Stage"
+    _columns = {
+        'name': fields.char('Category Name', size=64, required=True),
+        'sequence': fields.integer('Sequence', help="Used to order the note stages"),
+        'user_id': fields.many2one('res.users', 'Owner', help="Owner of the note stage.", required=True, readonly=True),
+        'fold': fields.boolean('Folded'),
+    }
+    _order = 'sequence asc'
+    _defaults = {
+        'fold': 0,
+        'user_id': lambda self, cr, uid, ctx: uid,
+        'sequence' : 1,
+    }
+
+class note_note(osv.osv):
+    """ Note """
+    _name = 'note.note'
+    _inherit = ['mail.thread','pad.common']
+    _pad_fields = ['note_pad']
+    _description = "Note"
+
+    def _set_note_first_line(self, cr, uid, id, name, value, args, context=None):
+        return self.write(cr, uid, [id], {'note': value}, context=context)
+
+    def _get_note_first_line(self, cr, uid, ids, name, args, context=None):
+        res = {}
+        for note in self.browse(cr, uid, ids, context=context):
+            res[note.id] = (note.note or '').strip().split('\n')[0]
+        return res
+
+    def _get_default_stage_id(self,cr,uid,context=None):
+        ids = self.pool.get('note.stage').search(cr,uid,[('user_id','=',uid)])
+        return ids and ids[0] or False
+
+    def _read_group_stage_ids(self, cr, uid, ids, domain, read_group_order=None, access_rights_uid=None, context=None):
+        access_rights_uid = access_rights_uid or uid
+        stage_obj = self.pool.get('note.stage')
+
+        # only show stage groups not folded and owned by user
+        search_domain = [('user_id', '=', uid)]
+
+        stage_ids = stage_obj._search(cr, uid, search_domain, order=self._order, access_rights_uid=access_rights_uid, context=context)
+        result = stage_obj.name_get(cr, access_rights_uid, stage_ids, context=context)
+
+        fold = {}
+        for stage in stage_obj.browse(cr, access_rights_uid, stage_ids, context=context):
+            fold[stage.id] = stage.fold or False
+        return result, fold
+
+    _columns = {
+        'name': fields.function(_get_note_first_line, fnct_inv=_set_note_first_line, string='Note Summary', type="text"),
+        'note': fields.text('Pad Content'),
+        'note_pad_url': fields.char('Pad Url', size=250),
+        'sequence': fields.integer('Sequence'),
+        'stage_id': fields.many2one('note.stage', 'Stage'),
+        'active': fields.boolean('Active'),
+        'color': fields.integer('Color Index'),
+        # to be replaced by message_follower_ids
+        'follower_ids': fields.many2many('res.users', 'mail_subscription', 'res_id', 'user_id', 'Followers')
+    }
+
+    _defaults = {
+        'active' : 1,
+        'stage_id' : _get_default_stage_id,
+        'note_pad_url': lambda self, cr, uid, context: self.pad_generate_url(cr, uid, context),
+    }
+    _order = 'sequence asc'
+    _group_by_full = {
+        'stage_id' : _read_group_stage_ids,
+    }
diff --git a/addons/note/note_data.xml b/addons/note/note_data.xml
new file mode 100644
index 00000000000..670b4c89269
--- /dev/null
+++ b/addons/note/note_data.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0"?>
+<openerp>
+  <data>
+
+    <record model="note.stage" id="note_stage_01">
+      <field name="name">Todo today</field>
+      <field name="sequence">1</field>
+      <field name="user_id" eval="ref('base.user_root')"/>
+    </record>
+
+    <record model="note.stage" id="note_stage_02">
+      <field name="name">Todo later</field>
+      <field name="sequence">2</field>
+      <field name="user_id" eval="ref('base.user_root')"/>
+    </record>
+
+    <record model="note.stage" id="note_stage_03">
+      <field name="name">For Info</field>
+      <field name="sequence">3</field>
+      <field name="user_id" eval="ref('base.user_root')"/>
+    </record>
+
+  </data>
+</openerp>
diff --git a/addons/note/note_demo.xml b/addons/note/note_demo.xml
new file mode 100644
index 00000000000..e6ab25198a6
--- /dev/null
+++ b/addons/note/note_demo.xml
@@ -0,0 +1,152 @@
+<?xml version="1.0"?>
+<openerp>
+  <data>
+
+    <record id="note_1" model="note.note">
+      <field name="note"><![CDATA[Buying list
+    * coffee
+    * fruits
+    * ice cream
+    * towels
+    ]]>
+      </field>
+      <field name="note_pad"></field>
+      <field name="stage_id" ref="note_stage_01"/>
+      <field name="user_id" ref="base.user_root"/>
+      <field name="color">2</field>
+    </record>
+    <record id="note_2" model="note.note">
+      <field name="note"><![CDATA[Buying list
+    * more coffee
+    * tee
+    * sugar
+    * towels
+    ]]>
+      </field>
+      <field name="note_pad"></field>
+      <field name="stage_id" ref="note_stage_01"/>
+      <field name="user_id" ref="base.user_root"/>
+    </record>
+
+    <record id="note_3" model="note.note">
+      <field name="note"><![CDATA[Idea to develop
+    * Phasellus vel eros lorem, vel tristique risus.
+    * Cras elementum risus ut massa bibendum ac sollicitudin quam feugiat.
+    * Phasellus ullamcorper mauris quis lectus volutpat non dignissim elit lacinia.
+
+    Nulla vitae metus risus, nec placerat diam.
+    Proin quis nunc sodales dolor tempus eleifend.
+    Praesent iaculis libero ut orci egestas a dapibus libero ornare.
+
+    * Proin at nisl sit amet ante feugiat euismod nec at orci.
+    * Nam aliquam massa id neque tincidunt eu pellentesque neque euismod.
+    * Proin eget mi sit amet erat tempus pellentesque.
+
+    * Phasellus congue est lectus, vitae semper arcu.
+    * Suspendisse sodales tortor ut odio volutpat fringilla.
+    * Vestibulum mattis est quis risus dignissim sit amet faucibus nisl mattis.
+    * Pellentesque ullamcorper neque neque, vitae rhoncus massa.
+
+    Ut id magna massa, quis scelerisque sapien.
+
+    ]]>
+      </field>
+      <field name="note_pad"></field>
+      <field name="stage_id" ref="note_stage_01"/>
+      <field name="user_id" ref="base.user_root"/>
+    </record>
+
+    <record id="note_4" model="note.note">
+      <field name="note"><![CDATA[Read some documentation about OpenERP before diving into the code
+      * Open ERP: a modern approach to integrated business management
+      * Open ERP for Retail and Industrial Management
+      ]]>
+      </field>
+      <field name="note_pad"></field>
+      <field name="stage_id" ref="note_stage_02"/>
+      <field name="user_id" ref="base.user_root"/>
+    </record>
+
+    <record id="note_5" model="note.note">
+      <field name="note"><![CDATA[New computer specs
+      * Motherboard
+      according to processor
+      * Processor
+      need to decide
+      * Graphic card
+      with great performance for games !
+      * Hard drive
+      big, for lot of internet backups
+      * Tower
+      silent, better when watching films
+      * Blueray drive ?
+      is it interesting yet ?
+      * Screen
+      a big one, full of pixels, of course !
+      ]]>
+      </field>
+      <field name="note_pad"></field>
+      <field name="stage_id" ref="note_stage_02"/>
+      <field name="user_id" ref="base.user_root"/>
+      <field name="color">3</field>
+    </record>
+
+    <record id="note_6" model="note.note">
+      <field name="note"><![CDATA[Read those books
+      * Open ERP: a modern approach to integrated business management
+      * Open ERP for Retail and Industrial Management
+      ]]>
+      </field>
+      <field name="note_pad"></field>
+      <field name="stage_id" ref="note_stage_02"/>
+      <field name="user_id" ref="base.user_root"/>
+    </record>
+
+    <record id="note_7" model="note.note">
+      <field name="note"><![CDATA[Read some documentation about OpenERP before diving into the code
+      * Open ERP: a modern approach to integrated business management
+      * Open ERP for Retail and Industrial Management
+      ]]>
+      </field>
+      <field name="note_pad"></field>
+      <field name="stage_id" ref="note_stage_03"/>
+      <field name="user_id" ref="base.user_root"/>
+    </record>
+
+    <record id="note_8" model="note.note">
+      <field name="note"><![CDATA[Read those books
+      * Open ERP: a modern approach to integrated business management
+      * Open ERP for Retail and Industrial Management
+      ]]>
+      </field>
+      <field name="note_pad"></field>
+      <field name="stage_id" ref="note_stage_03"/>
+      <field name="user_id" ref="base.user_root"/>
+      <field name="color">5</field>
+    </record>
+
+    <record id="note_9" model="note.note">
+      <field name="note"><![CDATA[Read some documentation about OpenERP before diving into the code
+      * Open ERP: a modern approach to integrated business management
+      * Open ERP for Retail and Industrial Management
+      ]]>
+      </field>
+      <field name="note_pad"></field>
+      <field name="stage_id" ref="note_stage_03"/>
+      <field name="user_id" ref="base.user_root"/>
+      <field name="color">7</field>
+    </record>
+
+    <record id="note_10" model="note.note">
+      <field name="note"><![CDATA[Read those books
+      * Open ERP: a modern approach to integrated business management
+      * Open ERP for Retail and Industrial Management
+      ]]>
+      </field>
+      <field name="note_pad"></field>
+      <field name="stage_id" ref="note_stage_03"/>
+      <field name="user_id" ref="base.user_root"/>
+    </record>
+
+  </data>
+</openerp>
diff --git a/addons/note/note_view.xml b/addons/note/note_view.xml
new file mode 100644
index 00000000000..73636ce1a9a
--- /dev/null
+++ b/addons/note/note_view.xml
@@ -0,0 +1,136 @@
+<?xml version="1.0"?>
+<openerp>
+  <data>
+
+    <menuitem name="Organizer" id="note_my_stuff" parent="mail.mail_feeds_main"/>
+
+    <!-- Note Stage Form View -->
+    <record model="ir.ui.view" id="view_note_stage_form">
+      <field name="name">note.stage.form</field>
+      <field name="model">note.stage</field>
+      <field name="arch" type="xml">
+        <form string="Stage of Notes" version="7.0">
+          <group>
+            <field name="name"/>
+          </group>
+        </form>
+      </field>
+    </record>
+
+    <!-- Note Stage Tree View -->
+    <record model="ir.ui.view" id="view_note_stage_tree">
+      <field name="name">note.stage.tree</field>
+      <field name="model">note.stage</field>
+      <field name="field_parent"></field>
+      <field name="arch" type="xml">
+        <tree string="Stages of notes" editable="bottom">
+              <field name="sequence" widget="handle"/>
+              <field name="name"/>
+              <field name="fold"/>
+        </tree>
+      </field>
+    </record>
+
+    <!-- Note Stage Action -->
+    <record model="ir.actions.act_window" id="action_note_stage">
+      <field name="name">Stages</field>
+      <field name="res_model">note.stage</field>
+      <field name="view_mode">tree,form</field>
+      <field name="domain">[('user_id','=',uid)]</field>
+    </record>
+
+    <menuitem name="Categories"
+      id="menu_notes_stage" parent="note_my_stuff" action="action_note_stage" sequence="40" groups="base.group_no_one"/>
+
+    <!-- New Note Kanban View -->
+    <record model="ir.ui.view" id="view_note_note_kanban">
+      <field name="name">note.note.kanban</field>
+      <field name="model">note.note</field>
+      <field name="arch" type="xml">
+        <kanban default_group_by="stage_id" class="oe_notes" version="7.0">
+          <field name="color"/>
+          <field name="sequence"/>
+          <field name="name"/>
+          <field name="stage_id"/>
+          <field name="active"/>
+          <field name="note"/>
+          <field name="follower_ids"/>
+          <templates>
+            <t t-name="kanban-box">
+              <div t-attf-class="oe_kanban_color_#{kanban_getcolor(record.color.raw_value)} oe_kanban_card oe_kanban_global_click oe_semantic_html_override">
+                <!-- dropdown menu -->
+                <div class="oe_dropdown_toggle oe_dropdown_kanban">
+                  <span class="oe_e">í</span>
+                  <ul class="oe_dropdown_menu">
+                    <li><a type="edit">Edit...</a></li>
+                    <li><a type="delete">Delete</a></li>
+                    <li><ul class="oe_kanban_colorpicker" data-field="color"/></li>
+                  </ul>
+                </div>
+
+                <!-- kanban note -->
+                <div class="oe_kanban_content">
+                  <!-- title -->
+                  <field name="name"/>
+                </div>
+
+                <div class="oe_kanban_project_avatars">
+                  <t t-foreach="record.follower_ids.raw_value" t-as="follower">
+                    <img t-att-src="kanban_image('res.users', 'image_small', follower)" t-att-data-member_id="follower"/>
+                  </t>
+                </div>
+              </div>
+              <div class="oe_clear"></div>
+            </t>
+          </templates>
+        </kanban>
+      </field>
+    </record>
+
+    <!-- New Note Form View -->
+    <record model="ir.ui.view" id="view_note_note_form">
+      <field name="name">note.note.form</field>
+      <field name="model">note.note</field>
+      <field name="arch" type="xml">
+        <form string="Note" version="7.0">
+          <header>
+              <field name="stage_id" domain="[('user_id','=',uid)]" widget="statusbar" clickable="1"/>
+          </header>
+          <field name="note"/>
+          <field name="note_pad_url" invisible="1"/>
+          <div class="oe_chatter">
+              <field name="message_ids" widget="mail_thread"/>
+          </div>
+        </form>
+      </field>
+    </record>
+
+    <!-- Search Note  -->
+    <record model="ir.ui.view" id="view_note_note_filter">
+      <field name="name">note.note.search</field>
+      <field name="model">note.note</field>
+      <field name="arch" type="xml">
+        <search string="Notes">
+          <field name="note" string="Note"/>
+          <field name="stage_id"/>
+          <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="Stage" help="By Note Category" context="{'group_by':'stage_id'}"/>
+          </group>
+        </search>
+      </field>
+    </record>
+
+    <!-- Note Action -->
+    <record model="ir.actions.act_window" id="action_note_note">
+      <field name="name">Notes</field>
+      <field name="res_model">note.note</field>
+      <field name="view_type">form</field>
+      <field name="view_mode">kanban,tree,form</field>
+      <field name="search_view_id" ref="view_note_note_filter"/>
+    </record>
+
+    <menuitem name="Notes" id="note_notes" parent="note_my_stuff" sequence="20" action="action_note_note"/>
+
+  </data>
+</openerp>
diff --git a/addons/note/security/ir.model.access.csv b/addons/note/security/ir.model.access.csv
new file mode 100644
index 00000000000..fdd6030ca51
--- /dev/null
+++ b/addons/note/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_note_stage_user,note.stage user,model_note_stage,base.group_user,1,1,1,1
+access_note_note_user,note.note user,model_note_note,base.group_user,1,1,1,1
diff --git a/addons/note/security/note_security.xml b/addons/note/security/note_security.xml
new file mode 100644
index 00000000000..46eebee629c
--- /dev/null
+++ b/addons/note/security/note_security.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<openerp>
+<data>
+      <record id="note_note_global" model="ir.rule">
+        <field name="name">My notes</field>
+        <field ref="model_note_note" name="model_id"/>
+        <field eval="1" name="global"/>
+        <field name="domain_force">[('follower_ids','=',user.id)]</field>
+      </record>
+</data>
+</openerp>
+
diff --git a/addons/note/static/src/css/Makefile b/addons/note/static/src/css/Makefile
new file mode 100644
index 00000000000..d6019f4ed4a
--- /dev/null
+++ b/addons/note/static/src/css/Makefile
@@ -0,0 +1,3 @@
+note.css: note.sass
+	sass -t expanded note.sass note.css
+
diff --git a/addons/note/static/src/css/note.css b/addons/note/static/src/css/note.css
new file mode 100644
index 00000000000..7e79438b46a
--- /dev/null
+++ b/addons/note/static/src/css/note.css
@@ -0,0 +1,78 @@
+.openerp .oe_notes .oe_fold_column .oe_kanban_card {
+    text-decoration:none;
+    color:#000;
+    display:block;
+    padding:1em;
+    margin-right: 1em;
+    margin-bottom: 1em;
+
+    -moz-box-shadow:5px 5px 7px rgba(33,33,33,1);
+    -webkit-box-shadow: 5px 5px 7px rgba(33,33,33,.7);
+    box-shadow: 5px 5px 7px rgba(33,33,33,.7);
+}
+
+.openerp .oe_notes .oe_kanban_record .oe_kanban_card   {
+    -webkit-transform: rotate(-2deg);
+    -o-transform: rotate(-2deg);
+    -moz-transform:rotate(-2deg);
+}
+
+.openerp .oe_notes .oe_kanban_record:nth-of-type(even) .oe_kanban_card   {
+    -webkit-transform: rotate(1deg);
+    -o-transform: rotate(1deg);
+    -moz-transform:rotate(1deg);
+}
+
+.openerp .oe_notes .oe_kanban_record:nth-of-type(3n) .oe_kanban_card   {
+    -webkit-transform: rotate(4deg);
+    -o-transform: rotate(4deg);
+    -moz-transform:rotate(4deg);
+}
+
+.openerp .oe_notes .oe_kanban_column:nth-of-type(even) .oe_kanban_record .oe_kanban_card   {
+    -webkit-transform: rotate(2deg);
+    -o-transform: rotate(2deg);
+    -moz-transform:rotate(2deg);
+}
+
+.openerp .oe_notes .oe_kanban_column:nth-of-type(even) .oe_kanban_record:nth-of-type(even) .oe_kanban_card   {
+    -webkit-transform: rotate(-3deg);
+    -o-transform: rotate(-3deg);
+    -moz-transform:rotate(-3deg);
+}
+
+.openerp .oe_notes .oe_kanban_column:nth-of-type(even) .oe_kanban_record:nth-of-type(3n) .oe_kanban_card   {
+    -webkit-transform: rotate(1deg);
+    -o-transform: rotate(1deg);
+    -moz-transform:rotate(1deg);
+}
+
+.openerp .oe_notes .oe_kanban_column:nth-of-type(3n) .oe_kanban_record .oe_kanban_card   {
+    -webkit-transform: rotate(-2deg);
+    -o-transform: rotate(-2deg);
+    -moz-transform:rotate(-2deg);
+}
+
+.openerp .oe_notes .oe_kanban_column:nth-of-type(3n) .oe_kanban_record:nth-of-type(even) .oe_kanban_card   {
+    -webkit-transform: rotate(1deg);
+    -o-transform: rotate(1deg);
+    -moz-transform:rotate(1deg);
+}
+
+.openerp .oe_notes .oe_kanban_column:nth-of-type(3n) .oe_kanban_record:nth-of-type(3n) .oe_kanban_card   {
+    -webkit-transform: rotate(-1deg);
+    -o-transform: rotate(-1deg);
+    -moz-transform:rotate(-1deg);
+}
+
+.openerp .oe_notes .oe_kanban_column .oe_fold_column .oe_kanban_card:hover,
+.openerp .oe_notes .oe_kanban_column .oe_fold_column .oe_kanban_card:focus {
+    box-shadow:10px 10px 7px rgba(0,0,0,.7);
+    -moz-box-shadow:10px 10px 7px rgba(0,0,0,.7);
+    -webkit-box-shadow: 10px 10px 7px rgba(0,0,0,.7);
+    -webkit-transform: rotate(0);
+    -moz-transform: rotate(0);
+    -o-transform: rotate(0);
+    position:relative;
+    z-index:5;
+}
diff --git a/addons/note/static/src/css/note.sass b/addons/note/static/src/css/note.sass
new file mode 100644
index 00000000000..cd04015dcbb
--- /dev/null
+++ b/addons/note/static/src/css/note.sass
@@ -0,0 +1,137 @@
+@charset "utf-8"
+
+// Variables {{{
+$section-title-color: #8786b7
+$tag-bg-light: #f0f0fa
+$tag-bg-dark: #8786b7
+$tag-border: #afafb6
+$tag-border-selected: #a6a6fe
+$hover-background: #f0f0fa
+$link-color: #8a89ba
+$sheet-max-width: 860px
+// }}}
+// Mixins {{{
+@font-face
+  font-family: 'mnmliconsRegular'
+  src: url('/web/static/src/font/mnmliconsv21-webfont.eot') format('eot')
+  src: url('/web/static/src/font/mnmliconsv21-webfont.woff') format('woff')
+  src: url('/web/static/src/font/mnmliconsv21-webfont.ttf') format('truetype')
+  src: url('/web/static/src/font/mnmliconsv21-webfont.svg') format('svg') active
+  font-weight: normal
+  font-style: normal
+
+@font-face
+  font-family: 'EntypoRegular'
+  src: url('/web/static/src/font/entypo-webfont.eot') format('eot')
+  src: url('/web/static/src/font/entypo-webfont.eot?#iefix') format('embedded-opentype')
+  src: url('/web/static/src/font/entypo-webfont.woff') format('woff')
+  src: url('/web/static/src/font/entypo-webfont.ttf') format('truetype')
+  src: url('/web/static/src/font/entypo-webfont.svg') format('svg') active
+  font-weight: normal
+  font-style: normal
+
+@mixin reset()
+  border: none
+  padding: 0
+  margin: 0
+  background: none
+  @include radius(none)
+  @include box-shadow(none)
+
+@mixin vertical-gradient($startColor: #555, $endColor: #333)
+  background-color: $startColor
+  background-image: -webkit-gradient(linear, left top, left bottom, from($startColor), to($endColor)) /* Saf4+, Chrome */
+  background-image: -webkit-linear-gradient(top, $startColor, $endColor) /* Chrome 10+, Saf5.1+, iOS 5+ */
+  background-image:    -moz-linear-gradient(top, $startColor, $endColor) /* FF3.6 */
+  background-image:     -ms-linear-gradient(top, $startColor, $endColor) /* IE10 */
+  background-image:      -o-linear-gradient(top, $startColor, $endColor) /* Opera 11.10+ */
+  background-image:         linear-gradient(to bottom, $startColor, $endColor)
+
+@mixin radial-gradient($gradient)
+  background-position: center center
+  background-image: -webkit-radial-gradient(circle, $gradient)
+  background-image: -moz-radial-gradient($gradient)
+  background-image: -ms-radial-gradient($gradient)
+  background-image: radial-gradient($gradient)
+
+@mixin radius($radius: 5px)
+  -moz-border-radius: $radius
+  -webkit-border-radius: $radius
+  border-radius: $radius
+
+@mixin box-shadow($bsval: 0px 1px 4px #777)
+  -moz-box-shadow: $bsval
+  -webkit-box-shadow: $bsval
+  box-shadow: $bsval
+
+@mixin transition($transval: (border linear 0.2s, box-shadow linear 0.2s))
+  -webkit-transition: $transval
+  -moz-transition: $transval
+  -ms-transition: $transval
+  -o-transition: $transval
+  transition: $transval
+
+@mixin opacity($opacity: .5)
+  filter: alpha(opacity=$opacity * 100)
+  opacity: $opacity
+
+@mixin background-clip($clip: padding-box)
+  -webkit-background-clip: $clip
+  -moz-background-clip: $clip
+  background-clip: $clip
+
+@mixin box-sizing($type: content)
+  // type = border || content || padding
+  -webkit-box-sizing: #{$type}-box
+  -moz-box-sizing: #{$type}-box
+  -ms-box-sizing: #{$type}-box
+  box-sizing: #{$type}-box
+
+// Transforms the (readable) text of an inline element into an mmlicons icon,
+// allows for actual readable text in-code (and in readers?) with iconic looks
+@mixin text-to-icon($icon-name, $color: #404040)
+  font-size: 1px
+  letter-spacing: -1px
+  color: transparent
+  &:before
+    font: 21px "mnmliconsRegular"
+    content: $icon-name
+    color: $color
+        
+// }}}
+// CSS animation bounces {{{
+@-moz-keyframes bounce
+  0%
+    -moz-transform: scale(0)
+    opacity: 0
+  50%
+    -moz-transform: scale(1.3)
+    opacity: 0.4
+  75%
+    -moz-transform: scale(0.9)
+    opacity: 0.7
+  100%
+    -moz-transform: scale(1)
+    opacity: 1
+
+@-webkit-keyframes bounce
+  0%
+    -webkit-transform: scale(0)
+    opacity: 0
+  50%
+    -webkit-transform: scale(1.3)
+    opacity: 0.4
+  75%
+    -webkit-transform: scale(0.9)
+    opacity: 0.7
+  100%
+    -webkit-transform: scale(1)
+    opacity: 1
+// }}}
+
+
+.oe_kanban_color_2
+  background-color:red
+				  
+// au BufWritePost,FileWritePost *.sass :!sass --style expanded --line-numbers <afile> > "%:p:r.css"
+
diff --git a/addons/note/static/src/img/icon.png b/addons/note/static/src/img/icon.png
new file mode 100644
index 00000000000..b6ad0548a40
Binary files /dev/null and b/addons/note/static/src/img/icon.png differ
diff --git a/addons/pad/__openerp__.py b/addons/pad/__openerp__.py
index d433f51fc82..50b280d2c32 100644
--- a/addons/pad/__openerp__.py
+++ b/addons/pad/__openerp__.py
@@ -2,7 +2,7 @@
 {
     'name': 'Collaborative Pads',
     'version': '2.0',
-    "category": "Project Management",
+    'category': 'Project Management',
     'description': """
 Adds enhanced support for (Ether)Pad attachments in the web client.
 ===================================================================
@@ -13,19 +13,16 @@ pads (by default, http://ietherpad.com/).
     'author': 'OpenERP SA',
     'website': 'http://openerp.com',
     'depends': ['base'],
-    'data': [
-        'res_company.xml'
-    ],
+    'data': ['res_company.xml'],
+    'demo': ['pad_demo.xml'],
     'installable': True,
     'auto_install': False,
     'web': True,
     'certificate' : '001183545978470526509',
     'js': ['static/src/js/pad.js'],
-    'qweb' : [
-        "static/src/xml/*.xml",
-    ],
+    'qweb' : ['static/src/xml/*.xml'],
     'images': ['static/src/img/pad_link_companies.jpeg'],
-    "css": ['static/src/css/etherpad.css',],
+    'css': ['static/src/css/etherpad.css',],
 }
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/pad/i18n/ar.po b/addons/pad/i18n/ar.po
index 2f5385822c1..e0ef6f6c10b 100644
--- a/addons/pad/i18n/ar.po
+++ b/addons/pad/i18n/ar.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: pad
 #: sql_constraint:res.company:0
diff --git a/addons/pad/i18n/bg.po b/addons/pad/i18n/bg.po
index b8f1e7e41b2..32dc536514a 100644
--- a/addons/pad/i18n/bg.po
+++ b/addons/pad/i18n/bg.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: pad
 #: sql_constraint:res.company:0
diff --git a/addons/pad/i18n/ca.po b/addons/pad/i18n/ca.po
index 395d5aeee6c..b8c93d00f69 100644
--- a/addons/pad/i18n/ca.po
+++ b/addons/pad/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: pad
 #: sql_constraint:res.company:0
diff --git a/addons/pad/i18n/cs.po b/addons/pad/i18n/cs.po
index 071d4735251..8b8808b60a0 100644
--- a/addons/pad/i18n/cs.po
+++ b/addons/pad/i18n/cs.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: pad
 #: sql_constraint:res.company:0
diff --git a/addons/pad/i18n/da.po b/addons/pad/i18n/da.po
index 60967f8cf53..dc6ba5bf13d 100644
--- a/addons/pad/i18n/da.po
+++ b/addons/pad/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: pad
 #: sql_constraint:res.company:0
diff --git a/addons/pad/i18n/de.po b/addons/pad/i18n/de.po
index b775ff9c03d..9056b564dc3 100644
--- a/addons/pad/i18n/de.po
+++ b/addons/pad/i18n/de.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: pad
 #: sql_constraint:res.company:0
diff --git a/addons/pad/i18n/es.po b/addons/pad/i18n/es.po
index 34556563040..3f08fb54547 100644
--- a/addons/pad/i18n/es.po
+++ b/addons/pad/i18n/es.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: pad
 #: sql_constraint:res.company:0
diff --git a/addons/pad/i18n/es_CR.po b/addons/pad/i18n/es_CR.po
index 74d4d8555a3..d7e30ac0abb 100644
--- a/addons/pad/i18n/es_CR.po
+++ b/addons/pad/i18n/es_CR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 "Language: es\n"
 
 #. module: pad
diff --git a/addons/pad/i18n/fi.po b/addons/pad/i18n/fi.po
index ca2686d511c..7573f72adc6 100644
--- a/addons/pad/i18n/fi.po
+++ b/addons/pad/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: pad
 #: sql_constraint:res.company:0
diff --git a/addons/pad/i18n/fr.po b/addons/pad/i18n/fr.po
index ae7745ff46d..9dd9bda5c18 100644
--- a/addons/pad/i18n/fr.po
+++ b/addons/pad/i18n/fr.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: pad
 #: sql_constraint:res.company:0
diff --git a/addons/pad/i18n/gl.po b/addons/pad/i18n/gl.po
index 4383832343b..c73b154fdfd 100644
--- a/addons/pad/i18n/gl.po
+++ b/addons/pad/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: pad
 #: sql_constraint:res.company:0
diff --git a/addons/pad/i18n/hr.po b/addons/pad/i18n/hr.po
index 2d9fa29da66..a82bf5ea4c4 100644
--- a/addons/pad/i18n/hr.po
+++ b/addons/pad/i18n/hr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: pad
 #: sql_constraint:res.company:0
diff --git a/addons/pad/i18n/hu.po b/addons/pad/i18n/hu.po
index dff32608465..ee5d0600fbb 100644
--- a/addons/pad/i18n/hu.po
+++ b/addons/pad/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: pad
 #: sql_constraint:res.company:0
diff --git a/addons/pad/i18n/it.po b/addons/pad/i18n/it.po
index 3fc8dbc3497..e8d5f1d460b 100644
--- a/addons/pad/i18n/it.po
+++ b/addons/pad/i18n/it.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: pad
 #: sql_constraint:res.company:0
diff --git a/addons/pad/i18n/ja.po b/addons/pad/i18n/ja.po
index 210bae2a467..39daf9507c5 100644
--- a/addons/pad/i18n/ja.po
+++ b/addons/pad/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: pad
 #: sql_constraint:res.company:0
diff --git a/addons/pad/i18n/mn.po b/addons/pad/i18n/mn.po
index 2b2d0087b7c..ed58ef667d6 100644
--- a/addons/pad/i18n/mn.po
+++ b/addons/pad/i18n/mn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: pad
 #: sql_constraint:res.company:0
diff --git a/addons/pad/i18n/nl.po b/addons/pad/i18n/nl.po
index 706b00b7c65..afcb0964881 100644
--- a/addons/pad/i18n/nl.po
+++ b/addons/pad/i18n/nl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: pad
 #: sql_constraint:res.company:0
diff --git a/addons/pad/i18n/pt.po b/addons/pad/i18n/pt.po
index 9f0b88c0a87..f292f00a779 100644
--- a/addons/pad/i18n/pt.po
+++ b/addons/pad/i18n/pt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: pad
 #: sql_constraint:res.company:0
diff --git a/addons/pad/i18n/pt_BR.po b/addons/pad/i18n/pt_BR.po
index a64d15703eb..b345bfefe00 100644
--- a/addons/pad/i18n/pt_BR.po
+++ b/addons/pad/i18n/pt_BR.po
@@ -14,18 +14,18 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: pad
 #: sql_constraint:res.company:0
 msgid "The company name must be unique !"
-msgstr ""
+msgstr "O nome da empresa deve ser exclusivo!"
 
 #. module: pad
 #: help:res.company,pad_url_template:0
 msgid "Template used to generate pad URL."
-msgstr ""
+msgstr "Modelo usado para gerar URL pad."
 
 #. module: pad
 #: model:ir.model,name:pad.model_res_company
@@ -35,27 +35,27 @@ msgstr "Empresas"
 #. module: pad
 #: constraint:res.company:0
 msgid "Error! You can not create recursive companies."
-msgstr ""
+msgstr "Erro! Você não pode criar empresas recursivas."
 
 #. module: pad
 #: model:ir.model,name:pad.model_ir_attachment
 msgid "ir.attachment"
-msgstr ""
+msgstr "ir.attachment"
 
 #. module: pad
 #: view:res.company:0
 msgid "Pad"
-msgstr ""
+msgstr "Pad"
 
 #. module: pad
 #: field:res.company,pad_url_template:0
 msgid "Pad URL Template"
-msgstr ""
+msgstr "Modelo de Url de Pad"
 
 #. openerp-web
 #: /home/odo/repositories/addons/trunk/pad/static/src/xml/pad.xml:9
 msgid "Add Pad"
-msgstr ""
+msgstr "Adicionar Pads"
 
 #, python-format
 #~ msgid "Write"
diff --git a/addons/pad/i18n/ro.po b/addons/pad/i18n/ro.po
index e36fc1e1c61..767f3c5021e 100644
--- a/addons/pad/i18n/ro.po
+++ b/addons/pad/i18n/ro.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: pad
 #: sql_constraint:res.company:0
diff --git a/addons/pad/i18n/ru.po b/addons/pad/i18n/ru.po
index f99048fd59e..39f2dd2fac4 100644
--- a/addons/pad/i18n/ru.po
+++ b/addons/pad/i18n/ru.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: pad
 #: sql_constraint:res.company:0
diff --git a/addons/pad/i18n/sl.po b/addons/pad/i18n/sl.po
index 20775bff5dc..8fe38dd0a05 100644
--- a/addons/pad/i18n/sl.po
+++ b/addons/pad/i18n/sl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: pad
 #: sql_constraint:res.company:0
diff --git a/addons/pad/i18n/sr@latin.po b/addons/pad/i18n/sr@latin.po
index b64ad954b87..e369174c942 100644
--- a/addons/pad/i18n/sr@latin.po
+++ b/addons/pad/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: pad
 #: sql_constraint:res.company:0
diff --git a/addons/pad/i18n/sv.po b/addons/pad/i18n/sv.po
index 7ec488e86ed..116f4a95159 100644
--- a/addons/pad/i18n/sv.po
+++ b/addons/pad/i18n/sv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: pad
 #: sql_constraint:res.company:0
diff --git a/addons/pad/i18n/tr.po b/addons/pad/i18n/tr.po
index e3aeeaffed7..eec54f981cb 100644
--- a/addons/pad/i18n/tr.po
+++ b/addons/pad/i18n/tr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: pad
 #: sql_constraint:res.company:0
diff --git a/addons/pad/i18n/zh_CN.po b/addons/pad/i18n/zh_CN.po
index 836756d1443..3dc2d8f135b 100644
--- a/addons/pad/i18n/zh_CN.po
+++ b/addons/pad/i18n/zh_CN.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: pad
 #: sql_constraint:res.company:0
diff --git a/addons/pad/pad.py b/addons/pad/pad.py
index 40569fcd589..d21ccd42d16 100644
--- a/addons/pad/pad.py
+++ b/addons/pad/pad.py
@@ -1,30 +1,64 @@
 # -*- coding: utf-8 -*-
 from osv import fields, osv
 import random
+import re
 import string
 import urllib2
 from tools.translate import _
 
 class pad_common(osv.osv_memory):
     _name = 'pad.common'
-    _pad_fields = []
+
     def pad_generate_url(self, cr, uid, context=None):
-        pad_url_template =  self.pool.get('res.users').browse(cr,uid, uid, context).company_id.pad_url_template
+        pad_server = self.pool.get('res.users').browse(cr, uid, uid, context).company_id.pad_server
+        # make sure pad server in the form of http://hostname
+        if not pad_server:
+            return ''
+        if not pad_server.startswith('http'):
+            pad_server = 'http://' + pad_server
+        pad_server = pad_server.rstrip('/')
+        # generate a salt
         s = string.ascii_uppercase + string.digits
-        salt = ''.join([s[random.randint(0, len(s) - 1)] for i in range(8)])
-        template_vars = {
-            'db' : cr.dbname,
-            'model' : self._name,
-            'salt' : salt,
-        }
-        url = pad_url_template % template_vars
+        salt = ''.join([s[random.randint(0, len(s) - 1)] for i in range(10)])
+        # contruct the url
+        url = '%s/p/%s-%s-%s' % (pad_server, cr.dbname, self._name, salt)
         return url
 
+    def pad_get_content(self, cr, uid, url, context=None):
+        content = ''
+        if url:
+            page = urllib2.urlopen('%s/export/html'%url).read()
+            mo = re.search('<body>(.*)</body>',page)
+            if mo:
+                content = mo.group(1)
+        return content
+
+    # TODO
+    # reverse engineer protocol to be setHtml without using the api key
+    # override read and copy to generate url and store the content if empty
+
+    def default_get(self, cr, uid, fields, context=None):
+        data = super(pad_common, self).default_get(cr, uid, fields, context)
+        for k in fields:
+            field = self._all_columns[k].column
+            if hasattr(field,'pad_content_field'):
+                data[k] = self.pad_generate_url(cr, uid, context=context)
+        return data
+
+    def write(self, cr, uid, ids, vals, context=None):
+        for k,v in vals.items():
+            field = self._all_columns[k].column
+            if hasattr(field,'pad_content_field'):
+                vals[field.pad_content_field] = self.pad_get_content(cr, uid, v, context=context)
+        return super(pad_common, self).write(cr, uid, ids, vals, context=context)
+
     def copy(self, cr, uid, id, default=None, context=None):
         if not default:
             default = {}
-        update = [(field,self.pad_generate_url(cr, uid, context)) for field in self._pad_fields]
-        default.update(update)
+        for k,v in self._all_columns:
+            field = v.column
+            if hasattr(field,'pad_content_field'):
+                default[k] = self.pad_generate_url(cr, uid, context)
         return super(pad_common, self).copy(cr, uid, id, default, context)
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/pad/pad_demo.xml b/addons/pad/pad_demo.xml
new file mode 100644
index 00000000000..407f90e8242
--- /dev/null
+++ b/addons/pad/pad_demo.xml
@@ -0,0 +1,9 @@
+<openerp>
+  <data noupdate="1">
+
+    <record id="base.main_company" model="res.company">
+      <field name="pad_server">pad.openerp.com</field>
+    </record>
+
+  </data>
+</openerp>
diff --git a/addons/pad/res_company.py b/addons/pad/res_company.py
index bd955cd0481..fcf8bc97e91 100644
--- a/addons/pad/res_company.py
+++ b/addons/pad/res_company.py
@@ -1,15 +1,11 @@
 # -*- coding: utf-8 -*-
 from osv import fields, osv
 
-DEFAULT_PAD_TEMPLATE = 'http://beta.etherpad.org/p/%(db)s-%(model)s-%(salt)s'
-
 class company_pad(osv.osv):
     _inherit = 'res.company'
     _columns = {
-        'pad_url_template': fields.char('Pad URL Template', size=128, required=True, help="Template used to generate pad URL."),
-    }
-    _defaults = {
-        'pad_url_template': DEFAULT_PAD_TEMPLATE,
+        'pad_server': fields.char('Pad Server', help="Etherpad lite server. Example: beta.primarypad.com"),
+        'pad_key': fields.char('Pad Api Key', help="Etherpad lite api key."),
     }
 
 
diff --git a/addons/pad/res_company.xml b/addons/pad/res_company.xml
index 017561aaec3..1e2184c61a3 100644
--- a/addons/pad/res_company.xml
+++ b/addons/pad/res_company.xml
@@ -7,10 +7,12 @@
       <field name="arch" type="xml">
         <xpath expr="//group[@name='account_grp']" position="after">
             <group string="Pads">
-                <field name="pad_url_template" placeholder="e.g. http://beta.etherpad.org/p/%%(db)s-%%(model)s-%%(salt)s"/>
+                <field name="pad_server" placeholder="e.g. beta.primarypad.com"/>
+                <field name="pad_key"/>
             </group>
         </xpath>
       </field>
     </record>
+
   </data>
 </openerp>
diff --git a/addons/pad/static/src/css/etherpad.css b/addons/pad/static/src/css/etherpad.css
index a0240afcab7..8ea7972071e 100644
--- a/addons/pad/static/src/css/etherpad.css
+++ b/addons/pad/static/src/css/etherpad.css
@@ -1,52 +1,39 @@
-.oe_etherpad_head{
+.oe_pad_head {
     width: 100%;
     display: block;
-    padding-left:3px;
-    cursor:pointer;
+    padding: 4px;
 }
-.oe_etherpad_fullscreen div.oe_etherpad_head .oe_normal {
-    display: none;
+
+.oe_pad_readonly {
+    border: 1px solid #ddd;
+    padding: 8px;
 }
-.oe_etherpad_normal div.oe_etherpad_head .oe_fullscreen {
-    display: none;
-}
-.oe_etherpad_fullscreen {
+
+.oe_pad_fullscreen {
     position: fixed;
     top: 0px;
     left: 0px;
     width: 100%;
     height: 100%;
     background-color: white;
-    z-index:10001 !important;
-}
-.etherpad_default{  
-    width: 100%;
-    height: 450px;
-}
-.oe_etherpad_fullscreen .etherpad_default{  
-    height: 100%
+    z-index: 1000;
 }
 
-.etherpad_body{
-    overflow:hidden;
+.oe_pad_fullscreen .oe_pad_content {
+    height: 100%;
 }
 
-.etherpad_readonly{
-    width: 100%;
-    height: 450px;
-    overflow:auto;    
+.etherpad_readonly ul, .etherpad_readonly ol {
+    margin-before: 1em;
+    margin-after: 1em;
+    margin-start: 0px;
+    margin-end: 0px;
+    padding-start: 40px !important;
 }
-.etherpad_readonly ul,.etherpad_readonly ol{
-    -webkit-margin-before: 1em;
-    -webkit-margin-after: 1em;
-    -webkit-margin-start: 0px;
-    -webkit-margin-end: 0px;
-    -webkit-padding-start: 40px !important;
-}
-.etherpad_readonly ul li{  
+.etherpad_readonly ul li{
     list-style-type: disc;
 }
-.etherpad_readonly ol li{  
+.etherpad_readonly ol li{
     list-style-type: decimal;
 }
 .etherpad_readonly .indent li{
diff --git a/addons/pad/static/src/js/pad.js b/addons/pad/static/src/js/pad.js
index 6384eb72da8..511400bcede 100644
--- a/addons/pad/static/src/js/pad.js
+++ b/addons/pad/static/src/js/pad.js
@@ -1,32 +1,41 @@
 openerp.pad = function(instance) {
 
-instance.web.form.FieldPad = instance.web.form.AbstractField.extend(instance.web.form.ReinitializeFieldMixin, {
+instance.web.form.FieldPad = instance.web.form.AbstractField.extend({
     template: 'FieldPad',
-    initialize_content: function() {
+    start: function() {
+        this._super();
         var self = this;
-        this.$textarea = undefined;
-        this.$element.find('div.oe_etherpad_head').click(function(ev) {
-            self.$element.toggleClass('oe_etherpad_fullscreen').toggleClass('oe_etherpad_normal');
+        this.$el.find('div.oe_pad_head').click(function(ev) {
+            self.$el.toggleClass('oe_pad_fullscreen');
+        });
+        this.on("change:effective_readonly", this, function() {
+            this.render_value();
         });
     },
-    set_value: function(value_) {
-        this._super(value_);
-        this.render_value();
+    set_value: function(val) {
+        var self = this;
+        var _super = self._super;
+        _super.apply(self,[val]);
+        this._dirty_flag = true;
+        self.render_value();
     },
     render_value: function() {
+        console.log("display");
         var self = this;
         var value = this.get('value');
-        if(value !== false) {
-            var url = value.split('\n')[0];
+
+        if (!_.str.startsWith(value, "http")) {
+            self.$('.oe_pad_content').html(instance.web.qweb.render('FieldPad.unconfigured'));
+        } else {
             if (!this.get("effective_readonly")) {
                 var pad_username = this.session.username;
-                var code = '<iframe width="100%" height="100%" frameborder="0" src="'+url+'?showChat=false&userName='+pad_username+'"></iframe>';
-                this.$element.find('div.oe_etherpad_default').html(code);
+                var code = '<iframe width="100%" height="100%" frameborder="0" src="'+value+'?showChat=false&userName='+pad_username+'"></iframe>';
+                this.$('.oe_pad_content').html(code);
             } else {
-                $.get(url+'/export/html').success(function(data) {
-                    self.$element.html('<div class="etherpad_readonly">'+data+'</div>');
+                $.get(value+'/export/html').success(function(data) {
+                    self.$('.oe_pad_content').html('<div class="oe_pad_readonly">'+data+'</div>');
                 }).error(function() {
-                    self.$element.text('Unable to load pad');
+                    self.$('.oe_pad_content').text('Unable to load pad');
                 });
             }
         }
diff --git a/addons/pad/static/src/xml/pad.xml b/addons/pad/static/src/xml/pad.xml
index e128fb183fb..ce79df52684 100644
--- a/addons/pad/static/src/xml/pad.xml
+++ b/addons/pad/static/src/xml/pad.xml
@@ -2,17 +2,15 @@
 <!-- vim:fdl=1:
 -->
 <templates id="template" xml:space="preserve">
-
 <t t-name="FieldPad">
-    <t t-if="!widget.get('effective_readonly')">
-        <div class="oe_form_field_text oe_etherpad_normal">
-            <div class="oe_etherpad_head">
-                    <span class="oe_normal">Fullscreen</span>
-                    <span class="oe_fullscreen">Return to Record</span>
-            </div>
-            <div class="oe_etherpad_default" ></div>
+    <div class="oe_form_field_text oe_pad">
+        <div class="oe_pad_head">
+            <span class="oe_pad_switch">Fullscreen</span>
         </div>
-    </t>
+        <div class="oe_pad_content"></div>
+    </div>
+</t>
+<t t-name="FieldPad.unconfigured">
+    You must configure the etherpad through the menu Setting > Companies > Companies, in the configuration tab of your company.<br/>
 </t>
-
 </templates>
diff --git a/addons/pad_project/__openerp__.py b/addons/pad_project/__openerp__.py
index 3f4a279800a..6093acebab0 100644
--- a/addons/pad_project/__openerp__.py
+++ b/addons/pad_project/__openerp__.py
@@ -22,16 +22,16 @@
 {
     'name': 'Pad on tasks',
     'version': '1.0',
-    "category": "Project Management",
+    'category': 'Project Management',
     'description': """
 This module adds a PAD in all project kanban views.
+===================================================
     """,
     'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
     'depends': ['project', 'pad'],
-    'init_xml': [],
-    'update_xml': ['project_task.xml'],
-    'demo_xml': [],
+    'data': ['project_task.xml'],
+    'demo': [],
     'installable': True,
     'auto_install': True,
 }
diff --git a/addons/pad_project/i18n/ar.po b/addons/pad_project/i18n/ar.po
index 72643b5c400..7910c251e41 100644
--- a/addons/pad_project/i18n/ar.po
+++ b/addons/pad_project/i18n/ar.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:39+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:43+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: pad_project
 #: constraint:project.task:0
diff --git a/addons/pad_project/i18n/cs.po b/addons/pad_project/i18n/cs.po
index 43863b02028..1ed46a1ac6d 100644
--- a/addons/pad_project/i18n/cs.po
+++ b/addons/pad_project/i18n/cs.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:39+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:43+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: pad_project
 #: constraint:project.task:0
diff --git a/addons/pad_project/i18n/de.po b/addons/pad_project/i18n/de.po
index c612372719c..6aed034d0aa 100644
--- a/addons/pad_project/i18n/de.po
+++ b/addons/pad_project/i18n/de.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:39+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:43+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: pad_project
 #: constraint:project.task:0
diff --git a/addons/pad_project/i18n/es_CR.po b/addons/pad_project/i18n/es_CR.po
index d38a5f1a83d..89325391d59 100644
--- a/addons/pad_project/i18n/es_CR.po
+++ b/addons/pad_project/i18n/es_CR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:39+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:43+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: pad_project
 #: constraint:project.task:0
diff --git a/addons/pad_project/i18n/fi.po b/addons/pad_project/i18n/fi.po
index 5caf8070386..768bf85fc6c 100644
--- a/addons/pad_project/i18n/fi.po
+++ b/addons/pad_project/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:39+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:43+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: pad_project
 #: constraint:project.task:0
diff --git a/addons/pad_project/i18n/fr.po b/addons/pad_project/i18n/fr.po
index da38c1ac637..9e549424e26 100644
--- a/addons/pad_project/i18n/fr.po
+++ b/addons/pad_project/i18n/fr.po
@@ -8,31 +8,32 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-06-22 08:03+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2012-09-03 22:22+0000\n"
+"Last-Translator: Nicolas JEUDY <njeudy@simplee.fr>\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: 2012-08-07 05:39+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-09-04 04:52+0000\n"
+"X-Generator: Launchpad (build 15890)\n"
 
 #. module: pad_project
 #: constraint:project.task:0
 msgid "Error ! Task end-date must be greater then task start-date"
 msgstr ""
+"Erreur ! la date de fin de la tâche doit être supérieure a celle de début"
 
 #. module: pad_project
 #: model:ir.model,name:pad_project.model_project_task
 msgid "Task"
-msgstr ""
+msgstr "Tâche"
 
 #. module: pad_project
 #: view:project.task:0
 msgid "Pad"
-msgstr ""
+msgstr "Pad"
 
 #. module: pad_project
 #: constraint:project.task:0
 msgid "Error ! You cannot create recursive tasks."
-msgstr ""
+msgstr "Erreur ! Vous ne pouvez pas créer de tâches récursives."
diff --git a/addons/pad_project/i18n/ja.po b/addons/pad_project/i18n/ja.po
index d0938b65112..4863505c6d6 100644
--- a/addons/pad_project/i18n/ja.po
+++ b/addons/pad_project/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:39+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:43+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: pad_project
 #: constraint:project.task:0
diff --git a/addons/pad_project/i18n/mn.po b/addons/pad_project/i18n/mn.po
index 66355f65106..02137f4cd57 100644
--- a/addons/pad_project/i18n/mn.po
+++ b/addons/pad_project/i18n/mn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:39+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:43+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: pad_project
 #: constraint:project.task:0
diff --git a/addons/pad_project/i18n/nl.po b/addons/pad_project/i18n/nl.po
index f4b5882ccd7..ddd7541802d 100644
--- a/addons/pad_project/i18n/nl.po
+++ b/addons/pad_project/i18n/nl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:39+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:43+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: pad_project
 #: constraint:project.task:0
diff --git a/addons/pad_project/i18n/pt.po b/addons/pad_project/i18n/pt.po
index 9d52054ef12..4d8d7995eed 100644
--- a/addons/pad_project/i18n/pt.po
+++ b/addons/pad_project/i18n/pt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:39+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:43+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: pad_project
 #: constraint:project.task:0
diff --git a/addons/pad_project/i18n/pt_BR.po b/addons/pad_project/i18n/pt_BR.po
index 8a16433e1f6..729e9cf2a0b 100644
--- a/addons/pad_project/i18n/pt_BR.po
+++ b/addons/pad_project/i18n/pt_BR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-14 04:45+0000\n"
-"X-Generator: Launchpad (build 15791)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:43+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: pad_project
 #: constraint:project.task:0
diff --git a/addons/pad_project/i18n/ro.po b/addons/pad_project/i18n/ro.po
index 95bfe4fbf8f..534547ee15a 100644
--- a/addons/pad_project/i18n/ro.po
+++ b/addons/pad_project/i18n/ro.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:39+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:43+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: pad_project
 #: constraint:project.task:0
diff --git a/addons/pad_project/i18n/sl.po b/addons/pad_project/i18n/sl.po
index 1e53a4a84ea..8ff44d9bfa4 100644
--- a/addons/pad_project/i18n/sl.po
+++ b/addons/pad_project/i18n/sl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:39+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:43+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: pad_project
 #: constraint:project.task:0
diff --git a/addons/pad_project/i18n/sv.po b/addons/pad_project/i18n/sv.po
index b718d817234..f2908a4f81b 100644
--- a/addons/pad_project/i18n/sv.po
+++ b/addons/pad_project/i18n/sv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:39+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:43+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: pad_project
 #: constraint:project.task:0
diff --git a/addons/pad_project/i18n/tr.po b/addons/pad_project/i18n/tr.po
new file mode 100644
index 00000000000..a19889de838
--- /dev/null
+++ b/addons/pad_project/i18n/tr.po
@@ -0,0 +1,38 @@
+# Turkish 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-02-08 00:36+0000\n"
+"PO-Revision-Date: 2012-09-07 20:06+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: 2012-09-08 04:54+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
+
+#. module: pad_project
+#: constraint:project.task:0
+msgid "Error ! Task end-date must be greater then task start-date"
+msgstr "Hata! görev bitiş tarihi başlangıç tarihinden sonra olmalı"
+
+#. module: pad_project
+#: model:ir.model,name:pad_project.model_project_task
+msgid "Task"
+msgstr "Görev"
+
+#. module: pad_project
+#: view:project.task:0
+msgid "Pad"
+msgstr ""
+
+#. module: pad_project
+#: constraint:project.task:0
+msgid "Error ! You cannot create recursive tasks."
+msgstr "Hata ! Yinelenen görevler oluşturamazsınız."
diff --git a/addons/pad_project/i18n/zh_CN.po b/addons/pad_project/i18n/zh_CN.po
index 21f975afe23..05134e0613a 100644
--- a/addons/pad_project/i18n/zh_CN.po
+++ b/addons/pad_project/i18n/zh_CN.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:39+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:43+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: pad_project
 #: constraint:project.task:0
diff --git a/addons/pad_project/project_task.py b/addons/pad_project/project_task.py
index 46c2c54cd46..6ebebae97fd 100644
--- a/addons/pad_project/project_task.py
+++ b/addons/pad_project/project_task.py
@@ -5,10 +5,6 @@ from osv import fields, osv
 class task(osv.osv):
     _name = "project.task"
     _inherit = ["project.task",'pad.common']
-    _pad_fields = ['description_pad']
     _columns = {
-        'description_pad': fields.char('Description PAD', size=250)
-    }
-    _defaults = {
-        'description_pad': lambda self, cr, uid, context: self.pad_generate_url(cr, uid, context),
+        'description_pad': fields.char('Description PAD', pad_content_field='description')
     }
diff --git a/addons/plugin/__openerp__.py b/addons/plugin/__openerp__.py
index 801e0571c58..7af31450a87 100644
--- a/addons/plugin/__openerp__.py
+++ b/addons/plugin/__openerp__.py
@@ -26,12 +26,11 @@
     'category': 'Hidden/Dependency',
     'description': """
 The common interface for plug-in.
+=================================
 """,
     'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
-    'depends': [
-        'base',
-    ],
+    'depends': ['base'],
     'data': [],
     'demo': [],
     'test': [],
diff --git a/addons/plugin/i18n/ar.po b/addons/plugin/i18n/ar.po
index d84383a6e25..b1f7b0493b6 100644
--- a/addons/plugin/i18n/ar.po
+++ b/addons/plugin/i18n/ar.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:39+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:43+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: plugin
 #: model:ir.model,name:plugin.model_plugin_handler
diff --git a/addons/plugin/i18n/cs.po b/addons/plugin/i18n/cs.po
index ccfa49bff6e..f111194587c 100644
--- a/addons/plugin/i18n/cs.po
+++ b/addons/plugin/i18n/cs.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:39+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:43+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: plugin
 #: model:ir.model,name:plugin.model_plugin_handler
diff --git a/addons/plugin/i18n/de.po b/addons/plugin/i18n/de.po
index 83b630139de..5a58bfe4530 100644
--- a/addons/plugin/i18n/de.po
+++ b/addons/plugin/i18n/de.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:39+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:43+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: plugin
 #: model:ir.model,name:plugin.model_plugin_handler
diff --git a/addons/plugin/i18n/es_CR.po b/addons/plugin/i18n/es_CR.po
index 27af6678398..d098e9119a3 100644
--- a/addons/plugin/i18n/es_CR.po
+++ b/addons/plugin/i18n/es_CR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:39+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:43+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: plugin
 #: model:ir.model,name:plugin.model_plugin_handler
diff --git a/addons/plugin/i18n/fi.po b/addons/plugin/i18n/fi.po
index f474abe5cd2..34bfb60ed62 100644
--- a/addons/plugin/i18n/fi.po
+++ b/addons/plugin/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:39+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:43+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: plugin
 #: model:ir.model,name:plugin.model_plugin_handler
diff --git a/addons/plugin/i18n/fr.po b/addons/plugin/i18n/fr.po
index 31cb793f828..6022403f59a 100644
--- a/addons/plugin/i18n/fr.po
+++ b/addons/plugin/i18n/fr.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:39+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:43+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: plugin
 #: model:ir.model,name:plugin.model_plugin_handler
diff --git a/addons/plugin/i18n/ja.po b/addons/plugin/i18n/ja.po
index 7c1222af5ae..0ee81d3bac4 100644
--- a/addons/plugin/i18n/ja.po
+++ b/addons/plugin/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:39+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:43+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: plugin
 #: model:ir.model,name:plugin.model_plugin_handler
diff --git a/addons/plugin/i18n/mn.po b/addons/plugin/i18n/mn.po
new file mode 100644
index 00000000000..39484117214
--- /dev/null
+++ b/addons/plugin/i18n/mn.po
@@ -0,0 +1,23 @@
+# 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-02-08 00:36+0000\n"
+"PO-Revision-Date: 2012-08-24 06:21+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: 2012-08-28 06:43+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
+
+#. module: plugin
+#: model:ir.model,name:plugin.model_plugin_handler
+msgid "plugin.handler"
+msgstr "plugin.handler"
diff --git a/addons/plugin/i18n/nl.po b/addons/plugin/i18n/nl.po
index a287af98767..a8f4531f14b 100644
--- a/addons/plugin/i18n/nl.po
+++ b/addons/plugin/i18n/nl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:39+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:43+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: plugin
 #: model:ir.model,name:plugin.model_plugin_handler
diff --git a/addons/plugin/i18n/pt.po b/addons/plugin/i18n/pt.po
index d158a29d97e..bc63e11c5f0 100644
--- a/addons/plugin/i18n/pt.po
+++ b/addons/plugin/i18n/pt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:39+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:43+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: plugin
 #: model:ir.model,name:plugin.model_plugin_handler
diff --git a/addons/plugin/i18n/pt_BR.po b/addons/plugin/i18n/pt_BR.po
index b24131afbbb..99e046c4de6 100644
--- a/addons/plugin/i18n/pt_BR.po
+++ b/addons/plugin/i18n/pt_BR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:39+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:43+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: plugin
 #: model:ir.model,name:plugin.model_plugin_handler
diff --git a/addons/plugin/i18n/ro.po b/addons/plugin/i18n/ro.po
index d5fc79dc164..8a17e29d6b2 100644
--- a/addons/plugin/i18n/ro.po
+++ b/addons/plugin/i18n/ro.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:39+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:43+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: plugin
 #: model:ir.model,name:plugin.model_plugin_handler
diff --git a/addons/plugin/i18n/sv.po b/addons/plugin/i18n/sv.po
index d76e39976ef..93341a27321 100644
--- a/addons/plugin/i18n/sv.po
+++ b/addons/plugin/i18n/sv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:39+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:43+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: plugin
 #: model:ir.model,name:plugin.model_plugin_handler
diff --git a/addons/plugin/i18n/tr.po b/addons/plugin/i18n/tr.po
new file mode 100644
index 00000000000..d51e6a4acd3
--- /dev/null
+++ b/addons/plugin/i18n/tr.po
@@ -0,0 +1,23 @@
+# Turkish 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-02-08 00:36+0000\n"
+"PO-Revision-Date: 2012-08-21 19:51+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: 2012-08-28 06:43+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
+
+#. module: plugin
+#: model:ir.model,name:plugin.model_plugin_handler
+msgid "plugin.handler"
+msgstr "eklenti.işlemci"
diff --git a/addons/plugin/i18n/zh_CN.po b/addons/plugin/i18n/zh_CN.po
index 04944f01ff9..a874e49b529 100644
--- a/addons/plugin/i18n/zh_CN.po
+++ b/addons/plugin/i18n/zh_CN.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:39+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:43+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: plugin
 #: model:ir.model,name:plugin.model_plugin_handler
diff --git a/addons/plugin/i18n/zh_TW.po b/addons/plugin/i18n/zh_TW.po
new file mode 100644
index 00000000000..7b8f20da8cf
--- /dev/null
+++ b/addons/plugin/i18n/zh_TW.po
@@ -0,0 +1,23 @@
+# Chinese (Traditional) 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-02-08 00:36+0000\n"
+"PO-Revision-Date: 2012-08-21 06:38+0000\n"
+"Last-Translator: Eric Huang <eh@cenoq.com>\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: 2012-08-28 06:43+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
+
+#. module: plugin
+#: model:ir.model,name:plugin.model_plugin_handler
+msgid "plugin.handler"
+msgstr "plugin.handler"
diff --git a/addons/plugin/plugin_handler.py b/addons/plugin/plugin_handler.py
index e497f902dc2..9c582a8e3bf 100644
--- a/addons/plugin/plugin_handler.py
+++ b/addons/plugin/plugin_handler.py
@@ -44,7 +44,7 @@ class plugin_handler(osv.osv_memory):
         res_id = 0
         url = ""
         name = ""
-        msg = mail_message_obj.parse_message(email)
+        msg = self.pool.get('mail.thread').parse_message(cr, uid, email)
         references = [msg.get('message-id')]
         refs =  msg.get('references',False)
         if refs:
@@ -91,7 +91,7 @@ class plugin_handler(osv.osv_memory):
         """
         mail_message = self.pool.get('mail.message')
         model_obj = self.pool.get(model)
-        msg = mail_message.parse_message(email)
+        msg = self.pool.get('mail.thread').parse_message(cr, uid, email)
         message_id = msg.get('message-id')
         mail_ids = mail_message.search(cr, uid, [('message_id','=',message_id),('res_id','=',res_id),('model','=',model)])
         
@@ -101,16 +101,15 @@ class plugin_handler(osv.osv_memory):
             notify = "Email already pushed"
         elif res_id == 0:
             if model == 'res.partner':
-                notify = 'User the button Partner to create a new partner'
+                notify = 'User the Partner button to create a new partner'
             else:
                 res_id = model_obj.message_new(cr, uid, msg)
-                notify = "Mail succefully pushed, a new %s has been created " % model
+                notify = "Mail succesfully pushed, a new %s has been created " % model
         else:
             if model == 'res.partner':
                 model_obj = self.pool.get('mail.thread')
-            res = self.pool.get(model).browse(cr, uid, [res_id])
-            model_obj.message_append_dict(cr, uid, res, msg)
-            notify = "Mail succefully pushed"
+            model_obj.message_post(cr, uid, [res_id], body=msg)
+            notify = "Mail succesfully pushed"
             
         url = self._make_url(cr, uid, res_id, model)
         return (model, res_id, url, notify)
@@ -133,7 +132,7 @@ class plugin_handler(osv.osv_memory):
         return ('res.partner', partner_id, url)
 
     # Specific to outlook rfc822 is not available so we split in arguments headerd,body,attachemnts
-    def push_message_outlook(self, cr, uid, model, headers,res_id=0 ,body_text=False, body_html=False, attachments=False):
+    def push_message_outlook(self, cr, uid, model, headers,res_id=0 ,body=False, body_html=False, attachments=False):
         # ----------------------------------------
         # solution 1
         # construct a fake rfc822 from the separated arguement
@@ -147,7 +146,7 @@ class plugin_handler(osv.osv_memory):
         mail_message = self.pool.get('mail.message')        
         ir_attachment_obj = self.pool.get('ir.attachment')
         attach_ids = []
-        msg = mail_message.parse_message(headers)
+        msg = self.pool.get('mail.thread').parse_message(cr, uid, headers)
         message_id = msg.get('message-id')    
         push_mail = self.push_message(cr, uid, model, headers, res_id)
         res_id = push_mail[1]
@@ -161,6 +160,6 @@ class plugin_handler(osv.osv_memory):
                 attach_ids.append(ir_attachment_obj.create(cr, uid, vals))
         mail_ids = mail_message.search(cr, uid, [('message_id','=',message_id),('res_id','=',res_id),('model','=',model)])
         if mail_ids:
-            ids =  mail_message.write(cr, uid,mail_ids[0],{ 'attachment_ids': [(6, 0, attach_ids)],'body_text':body_text,'body_html':body_html})
+            ids =  mail_message.write(cr, uid,mail_ids[0],{ 'attachment_ids': [(6, 0, attach_ids)],'body':body,'body_html':body_html})
         url = self._make_url(cr, uid, res_id, model)
         return (model, res_id, url)
diff --git a/addons/plugin_outlook/__openerp__.py b/addons/plugin_outlook/__openerp__.py
index 077b0aa6746..3f26399e71f 100644
--- a/addons/plugin_outlook/__openerp__.py
+++ b/addons/plugin_outlook/__openerp__.py
@@ -27,7 +27,7 @@
     'website' : 'http://www.openerp.com/',
     'depends' : ['base', 'mail','plugin'],
     'category' : 'Customer Relationship Management',
-    'description': '''
+    'description': """
 This module provides the Outlook Plug-in.
 =========================================
 
@@ -35,10 +35,9 @@ Outlook plug-in allows you to select an object that you would like to add to
 your email and its attachments from MS Outlook. You can select a partner, a task,
 a project, an analytical account, or any other object and archive selected mail
 into mail.message with attachments.
-      ''',
-    'init_xml' : [],
-    'demo_xml' : [],
-    'update_xml' : ['plugin_outlook.xml'],
+      """,
+    'demo' : [],
+    'data' : ['plugin_outlook.xml'],
     'auto_install': False,
     'installable': True,
     'certificate' : '001278773815818292125',
diff --git a/addons/plugin_outlook/i18n/ar.po b/addons/plugin_outlook/i18n/ar.po
index 3feaf50cb00..c7dc5673edb 100644
--- a/addons/plugin_outlook/i18n/ar.po
+++ b/addons/plugin_outlook/i18n/ar.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:40+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: plugin_outlook
 #: view:outlook.installer:0
diff --git a/addons/plugin_outlook/i18n/bg.po b/addons/plugin_outlook/i18n/bg.po
index 2cda4d0120a..1148afe18b5 100644
--- a/addons/plugin_outlook/i18n/bg.po
+++ b/addons/plugin_outlook/i18n/bg.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:40+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: plugin_outlook
 #: view:outlook.installer:0
diff --git a/addons/plugin_outlook/i18n/ca.po b/addons/plugin_outlook/i18n/ca.po
index 2a41d8d975b..31affdf7c77 100644
--- a/addons/plugin_outlook/i18n/ca.po
+++ b/addons/plugin_outlook/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:40+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: plugin_outlook
 #: view:outlook.installer:0
diff --git a/addons/plugin_outlook/i18n/da.po b/addons/plugin_outlook/i18n/da.po
index 714395a630f..26c50aa9553 100644
--- a/addons/plugin_outlook/i18n/da.po
+++ b/addons/plugin_outlook/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:40+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: plugin_outlook
 #: view:outlook.installer:0
diff --git a/addons/plugin_outlook/i18n/de.po b/addons/plugin_outlook/i18n/de.po
index 1c37fa0e6e0..26e51df8b36 100644
--- a/addons/plugin_outlook/i18n/de.po
+++ b/addons/plugin_outlook/i18n/de.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:40+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: plugin_outlook
 #: view:outlook.installer:0
diff --git a/addons/plugin_outlook/i18n/el.po b/addons/plugin_outlook/i18n/el.po
index 4b0ec7a4dcc..7988b4fb835 100644
--- a/addons/plugin_outlook/i18n/el.po
+++ b/addons/plugin_outlook/i18n/el.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:40+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: plugin_outlook
 #: view:outlook.installer:0
diff --git a/addons/plugin_outlook/i18n/es.po b/addons/plugin_outlook/i18n/es.po
index 3b355db79e9..e7b59cc990e 100644
--- a/addons/plugin_outlook/i18n/es.po
+++ b/addons/plugin_outlook/i18n/es.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:40+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: plugin_outlook
 #: view:outlook.installer:0
diff --git a/addons/plugin_outlook/i18n/es_CR.po b/addons/plugin_outlook/i18n/es_CR.po
index 124b3341cd9..d33e743750a 100644
--- a/addons/plugin_outlook/i18n/es_CR.po
+++ b/addons/plugin_outlook/i18n/es_CR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:40+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 "Language: es\n"
 
 #. module: plugin_outlook
diff --git a/addons/plugin_outlook/i18n/et.po b/addons/plugin_outlook/i18n/et.po
index 0c52188cd10..c8c41e890d9 100644
--- a/addons/plugin_outlook/i18n/et.po
+++ b/addons/plugin_outlook/i18n/et.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:40+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: plugin_outlook
 #: view:outlook.installer:0
diff --git a/addons/plugin_outlook/i18n/fi.po b/addons/plugin_outlook/i18n/fi.po
index c2ccf647cc6..11f0b282e9d 100644
--- a/addons/plugin_outlook/i18n/fi.po
+++ b/addons/plugin_outlook/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:40+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: plugin_outlook
 #: view:outlook.installer:0
diff --git a/addons/plugin_outlook/i18n/fr.po b/addons/plugin_outlook/i18n/fr.po
index 04bd36fb695..725a6e1e7d6 100644
--- a/addons/plugin_outlook/i18n/fr.po
+++ b/addons/plugin_outlook/i18n/fr.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:40+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: plugin_outlook
 #: view:outlook.installer:0
diff --git a/addons/plugin_outlook/i18n/gl.po b/addons/plugin_outlook/i18n/gl.po
index 64b2abf2a41..c050206b472 100644
--- a/addons/plugin_outlook/i18n/gl.po
+++ b/addons/plugin_outlook/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:40+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: plugin_outlook
 #: view:outlook.installer:0
diff --git a/addons/plugin_outlook/i18n/hr.po b/addons/plugin_outlook/i18n/hr.po
index abb70d2ecb2..90cce3bdaf8 100644
--- a/addons/plugin_outlook/i18n/hr.po
+++ b/addons/plugin_outlook/i18n/hr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:40+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: plugin_outlook
 #: view:outlook.installer:0
diff --git a/addons/plugin_outlook/i18n/hu.po b/addons/plugin_outlook/i18n/hu.po
index d60398a0dd8..6e345d752c7 100644
--- a/addons/plugin_outlook/i18n/hu.po
+++ b/addons/plugin_outlook/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:40+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: plugin_outlook
 #: view:outlook.installer:0
diff --git a/addons/plugin_outlook/i18n/id.po b/addons/plugin_outlook/i18n/id.po
index 4d6e3534997..8e7fa51f503 100644
--- a/addons/plugin_outlook/i18n/id.po
+++ b/addons/plugin_outlook/i18n/id.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:40+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: plugin_outlook
 #: view:outlook.installer:0
diff --git a/addons/plugin_outlook/i18n/it.po b/addons/plugin_outlook/i18n/it.po
index 031998173bc..998b2719446 100644
--- a/addons/plugin_outlook/i18n/it.po
+++ b/addons/plugin_outlook/i18n/it.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:40+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: plugin_outlook
 #: view:outlook.installer:0
diff --git a/addons/plugin_outlook/i18n/ja.po b/addons/plugin_outlook/i18n/ja.po
index 26bbd90ecac..7d9cd08e95a 100644
--- a/addons/plugin_outlook/i18n/ja.po
+++ b/addons/plugin_outlook/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:40+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: plugin_outlook
 #: view:outlook.installer:0
diff --git a/addons/plugin_outlook/i18n/mn.po b/addons/plugin_outlook/i18n/mn.po
index 62855696813..6bcdf56826c 100644
--- a/addons/plugin_outlook/i18n/mn.po
+++ b/addons/plugin_outlook/i18n/mn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:40+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: plugin_outlook
 #: view:outlook.installer:0
@@ -23,11 +23,13 @@ msgid ""
 "This plug-in allows you to create and link outlook emails with openerp "
 "objects."
 msgstr ""
+"Энэ залгаас нь outlook-н имэйлүүдийг openerp обьектуудтай холбох, үүсгэх "
+"боломжийг олгоно."
 
 #. module: plugin_outlook
 #: field:outlook.installer,name:0
 msgid "Outlook Plug-in"
-msgstr ""
+msgstr "Outlook залгаас"
 
 #. module: plugin_outlook
 #: model:ir.actions.act_window,name:plugin_outlook.action_outlook_installer
@@ -35,12 +37,12 @@ msgstr ""
 #: model:ir.ui.menu,name:plugin_outlook.menu_base_config_plugins_outlook
 #: view:outlook.installer:0
 msgid "Install Outlook Plug-In"
-msgstr ""
+msgstr "Outlook залгаасыг суулгах"
 
 #. module: plugin_outlook
 #: field:outlook.installer,config_logo:0
 msgid "Image"
-msgstr ""
+msgstr "Зураг"
 
 #. module: plugin_outlook
 #: view:outlook.installer:0
@@ -50,7 +52,7 @@ msgstr "гарчиг"
 #. module: plugin_outlook
 #: model:ir.model,name:plugin_outlook.model_outlook_installer
 msgid "outlook.installer"
-msgstr ""
+msgstr "outlook.installer"
 
 #. module: plugin_outlook
 #: view:outlook.installer:0
@@ -67,6 +69,8 @@ msgstr "Суулгацын ба Тохиргооны Алхамууд"
 msgid ""
 "outlook plug-in file. Save as this file and install this plug-in in outlook."
 msgstr ""
+"outlook залгаас файл. Үүнийг файл болгож хадгалаад outlook-д энэ залгаасыг "
+"суулгана."
 
 #. module: plugin_outlook
 #: field:outlook.installer,description:0
diff --git a/addons/plugin_outlook/i18n/nl.po b/addons/plugin_outlook/i18n/nl.po
index 7cef186e3c7..b81e67db5ed 100644
--- a/addons/plugin_outlook/i18n/nl.po
+++ b/addons/plugin_outlook/i18n/nl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:40+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: plugin_outlook
 #: view:outlook.installer:0
diff --git a/addons/plugin_outlook/i18n/pl.po b/addons/plugin_outlook/i18n/pl.po
index c1d3e41cdc0..512bd096fdc 100644
--- a/addons/plugin_outlook/i18n/pl.po
+++ b/addons/plugin_outlook/i18n/pl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:40+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: plugin_outlook
 #: view:outlook.installer:0
diff --git a/addons/plugin_outlook/i18n/pt.po b/addons/plugin_outlook/i18n/pt.po
index 1fc33e22b71..71b0301f664 100644
--- a/addons/plugin_outlook/i18n/pt.po
+++ b/addons/plugin_outlook/i18n/pt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:40+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: plugin_outlook
 #: view:outlook.installer:0
diff --git a/addons/plugin_outlook/i18n/pt_BR.po b/addons/plugin_outlook/i18n/pt_BR.po
index ec89224aea2..a2065664a56 100644
--- a/addons/plugin_outlook/i18n/pt_BR.po
+++ b/addons/plugin_outlook/i18n/pt_BR.po
@@ -9,13 +9,14 @@ msgstr ""
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-09 00:36+0000\n"
 "PO-Revision-Date: 2012-07-28 20:39+0000\n"
-"Last-Translator: Fábio Martinelli <webmaster@guaru.net>\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: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:40+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: plugin_outlook
 #: view:outlook.installer:0
diff --git a/addons/plugin_outlook/i18n/ro.po b/addons/plugin_outlook/i18n/ro.po
index 46bc204cfbc..0d99f13e799 100644
--- a/addons/plugin_outlook/i18n/ro.po
+++ b/addons/plugin_outlook/i18n/ro.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:40+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: plugin_outlook
 #: view:outlook.installer:0
diff --git a/addons/plugin_outlook/i18n/ru.po b/addons/plugin_outlook/i18n/ru.po
index d9457d77b48..c9931397faa 100644
--- a/addons/plugin_outlook/i18n/ru.po
+++ b/addons/plugin_outlook/i18n/ru.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:40+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: plugin_outlook
 #: view:outlook.installer:0
diff --git a/addons/plugin_outlook/i18n/sl.po b/addons/plugin_outlook/i18n/sl.po
index 26227f9a1dc..a756fdb0f1e 100644
--- a/addons/plugin_outlook/i18n/sl.po
+++ b/addons/plugin_outlook/i18n/sl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:40+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: plugin_outlook
 #: view:outlook.installer:0
diff --git a/addons/plugin_outlook/i18n/sr@latin.po b/addons/plugin_outlook/i18n/sr@latin.po
index 6d46de3a1a7..3f4b139c777 100644
--- a/addons/plugin_outlook/i18n/sr@latin.po
+++ b/addons/plugin_outlook/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:40+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: plugin_outlook
 #: view:outlook.installer:0
diff --git a/addons/plugin_outlook/i18n/sv.po b/addons/plugin_outlook/i18n/sv.po
index 0c986de40ae..1367a27c779 100644
--- a/addons/plugin_outlook/i18n/sv.po
+++ b/addons/plugin_outlook/i18n/sv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:40+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: plugin_outlook
 #: view:outlook.installer:0
diff --git a/addons/plugin_outlook/i18n/tr.po b/addons/plugin_outlook/i18n/tr.po
index 168e8dcee36..a056b01b026 100644
--- a/addons/plugin_outlook/i18n/tr.po
+++ b/addons/plugin_outlook/i18n/tr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:40+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: plugin_outlook
 #: view:outlook.installer:0
diff --git a/addons/plugin_outlook/i18n/zh_CN.po b/addons/plugin_outlook/i18n/zh_CN.po
index 9139d590aa3..ea5f997d362 100644
--- a/addons/plugin_outlook/i18n/zh_CN.po
+++ b/addons/plugin_outlook/i18n/zh_CN.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:40+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: plugin_outlook
 #: view:outlook.installer:0
diff --git a/addons/plugin_thunderbird/__openerp__.py b/addons/plugin_thunderbird/__openerp__.py
index c135491e398..54e05603e53 100644
--- a/addons/plugin_thunderbird/__openerp__.py
+++ b/addons/plugin_thunderbird/__openerp__.py
@@ -20,13 +20,13 @@
 #
 ##############################################################################
 {
-    "name" : "Thunderbird Plug-In",
-    "version" : "1.0",
-    "author" : ['OpenERP SA', 'Axelor'],
-    "website" : "http://www.openerp.com/",
-    "depends" : ["base","mail", "plugin"],
-    "category" : "Customer Relationship Management",
-    "description": """
+    'name' : 'Thunderbird Plug-In',
+    'version' : '1.0',
+    'author' : ['OpenERP SA', 'Axelor'],
+    'website' : 'http://www.openerp.com/',
+    'depends' : ['base','mail', 'plugin'],
+    'category' : 'Customer Relationship Management',
+    'description': """
 This module is required for the Thuderbird Plug-in to work properly.
 ====================================================================
 
@@ -36,11 +36,10 @@ account, or any other object and attach the selected mail as a .eml file in
 the attachment of a selected record. You can create documents for CRM Lead,
 HR Applicant and Project Issue from selected mails.
       """,
-    "init_xml" : [],
-    "demo_xml" : [],
-    "update_xml" : ['plugin_thunderbird.xml'],
-    "auto_install": False,
-    "installable": True,
-    "certificate" : "00899858104035139949",
+    'demo' : [],
+    'data' : ['plugin_thunderbird.xml'],
+    'auto_install': False,
+    'installable': True,
+    'certificate' : '00899858104035139949',
     'images': ['images/config_thunderbird.jpeg','images/config_thunderbird_plugin.jpeg','images/thunderbird_document.jpeg'],
 }
diff --git a/addons/plugin_thunderbird/i18n/ar.po b/addons/plugin_thunderbird/i18n/ar.po
index 53870429088..29f3dfac138 100644
--- a/addons/plugin_thunderbird/i18n/ar.po
+++ b/addons/plugin_thunderbird/i18n/ar.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:30+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: plugin_thunderbird
 #: field:plugin_thunderbird.installer,pdf_file:0
diff --git a/addons/plugin_thunderbird/i18n/bg.po b/addons/plugin_thunderbird/i18n/bg.po
index bf6dc6a6172..d1f932e7ea1 100644
--- a/addons/plugin_thunderbird/i18n/bg.po
+++ b/addons/plugin_thunderbird/i18n/bg.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:30+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: plugin_thunderbird
 #: field:plugin_thunderbird.installer,pdf_file:0
diff --git a/addons/plugin_thunderbird/i18n/ca.po b/addons/plugin_thunderbird/i18n/ca.po
index cfe12ccce59..3373804c352 100644
--- a/addons/plugin_thunderbird/i18n/ca.po
+++ b/addons/plugin_thunderbird/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:30+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: plugin_thunderbird
 #: field:plugin_thunderbird.installer,pdf_file:0
diff --git a/addons/plugin_thunderbird/i18n/cs.po b/addons/plugin_thunderbird/i18n/cs.po
index 6eb7c0ce070..25c95e8eaea 100644
--- a/addons/plugin_thunderbird/i18n/cs.po
+++ b/addons/plugin_thunderbird/i18n/cs.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:30+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: plugin_thunderbird
 #: field:plugin_thunderbird.installer,pdf_file:0
diff --git a/addons/plugin_thunderbird/i18n/da.po b/addons/plugin_thunderbird/i18n/da.po
index f05906a5197..7564b10a00d 100644
--- a/addons/plugin_thunderbird/i18n/da.po
+++ b/addons/plugin_thunderbird/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:30+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: plugin_thunderbird
 #: field:plugin_thunderbird.installer,pdf_file:0
diff --git a/addons/plugin_thunderbird/i18n/de.po b/addons/plugin_thunderbird/i18n/de.po
index 8b5fa86ea51..f6635c0eed8 100644
--- a/addons/plugin_thunderbird/i18n/de.po
+++ b/addons/plugin_thunderbird/i18n/de.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:30+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: plugin_thunderbird
 #: field:plugin_thunderbird.installer,pdf_file:0
diff --git a/addons/plugin_thunderbird/i18n/en_GB.po b/addons/plugin_thunderbird/i18n/en_GB.po
index a4d49b2a2aa..08e8da8ee62 100644
--- a/addons/plugin_thunderbird/i18n/en_GB.po
+++ b/addons/plugin_thunderbird/i18n/en_GB.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:30+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: plugin_thunderbird
 #: field:plugin_thunderbird.installer,pdf_file:0
diff --git a/addons/plugin_thunderbird/i18n/en_US.po b/addons/plugin_thunderbird/i18n/en_US.po
index e3857721c01..f0cc8bdf746 100644
--- a/addons/plugin_thunderbird/i18n/en_US.po
+++ b/addons/plugin_thunderbird/i18n/en_US.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:30+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: plugin_thunderbird
 #: field:plugin_thunderbird.installer,pdf_file:0
diff --git a/addons/plugin_thunderbird/i18n/es.po b/addons/plugin_thunderbird/i18n/es.po
index b55c1a76610..91945b7584d 100644
--- a/addons/plugin_thunderbird/i18n/es.po
+++ b/addons/plugin_thunderbird/i18n/es.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:30+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: plugin_thunderbird
 #: field:plugin_thunderbird.installer,pdf_file:0
diff --git a/addons/plugin_thunderbird/i18n/es_CR.po b/addons/plugin_thunderbird/i18n/es_CR.po
index 783f4c0748c..5df8b9df59d 100644
--- a/addons/plugin_thunderbird/i18n/es_CR.po
+++ b/addons/plugin_thunderbird/i18n/es_CR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:30+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 "Language: es\n"
 
 #. module: plugin_thunderbird
diff --git a/addons/plugin_thunderbird/i18n/et.po b/addons/plugin_thunderbird/i18n/et.po
index 86a77652806..22ce8f4e8c1 100644
--- a/addons/plugin_thunderbird/i18n/et.po
+++ b/addons/plugin_thunderbird/i18n/et.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:30+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: plugin_thunderbird
 #: field:plugin_thunderbird.installer,pdf_file:0
diff --git a/addons/plugin_thunderbird/i18n/eu.po b/addons/plugin_thunderbird/i18n/eu.po
index f2c856cf082..17fd0185027 100644
--- a/addons/plugin_thunderbird/i18n/eu.po
+++ b/addons/plugin_thunderbird/i18n/eu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:30+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: plugin_thunderbird
 #: field:plugin_thunderbird.installer,pdf_file:0
diff --git a/addons/plugin_thunderbird/i18n/fi.po b/addons/plugin_thunderbird/i18n/fi.po
index 8f5f4b29dcc..6a11b96fd66 100644
--- a/addons/plugin_thunderbird/i18n/fi.po
+++ b/addons/plugin_thunderbird/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:30+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: plugin_thunderbird
 #: field:plugin_thunderbird.installer,pdf_file:0
diff --git a/addons/plugin_thunderbird/i18n/fr.po b/addons/plugin_thunderbird/i18n/fr.po
index ff3993c9a37..5ac08ede6b5 100644
--- a/addons/plugin_thunderbird/i18n/fr.po
+++ b/addons/plugin_thunderbird/i18n/fr.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:30+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: plugin_thunderbird
 #: field:plugin_thunderbird.installer,pdf_file:0
diff --git a/addons/plugin_thunderbird/i18n/gl.po b/addons/plugin_thunderbird/i18n/gl.po
index 7e02959b326..e22d3efe297 100644
--- a/addons/plugin_thunderbird/i18n/gl.po
+++ b/addons/plugin_thunderbird/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:30+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: plugin_thunderbird
 #: field:plugin_thunderbird.installer,pdf_file:0
diff --git a/addons/plugin_thunderbird/i18n/hr.po b/addons/plugin_thunderbird/i18n/hr.po
index fe44b1b04a3..eadcf88eda8 100644
--- a/addons/plugin_thunderbird/i18n/hr.po
+++ b/addons/plugin_thunderbird/i18n/hr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:30+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 "Language: hr\n"
 
 #. module: plugin_thunderbird
diff --git a/addons/plugin_thunderbird/i18n/hu.po b/addons/plugin_thunderbird/i18n/hu.po
index 54b81c6efb4..4cc09367f7e 100644
--- a/addons/plugin_thunderbird/i18n/hu.po
+++ b/addons/plugin_thunderbird/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:30+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: plugin_thunderbird
 #: field:plugin_thunderbird.installer,pdf_file:0
diff --git a/addons/plugin_thunderbird/i18n/it.po b/addons/plugin_thunderbird/i18n/it.po
index aaa7fccaeab..c5d88decde1 100644
--- a/addons/plugin_thunderbird/i18n/it.po
+++ b/addons/plugin_thunderbird/i18n/it.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:30+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: plugin_thunderbird
 #: field:plugin_thunderbird.installer,pdf_file:0
diff --git a/addons/plugin_thunderbird/i18n/ja.po b/addons/plugin_thunderbird/i18n/ja.po
index f3483a11fda..0f1d838465a 100644
--- a/addons/plugin_thunderbird/i18n/ja.po
+++ b/addons/plugin_thunderbird/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:30+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: plugin_thunderbird
 #: field:plugin_thunderbird.installer,pdf_file:0
diff --git a/addons/plugin_thunderbird/i18n/mn.po b/addons/plugin_thunderbird/i18n/mn.po
index 8a427563732..e4df912b8a8 100644
--- a/addons/plugin_thunderbird/i18n/mn.po
+++ b/addons/plugin_thunderbird/i18n/mn.po
@@ -14,13 +14,13 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:30+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: plugin_thunderbird
 #: field:plugin_thunderbird.installer,pdf_file:0
 msgid "Installation Manual"
-msgstr ""
+msgstr "Суулгах Гарын авлага"
 
 #. module: plugin_thunderbird
 #: field:plugin_thunderbird.installer,description:0
@@ -30,23 +30,23 @@ msgstr "Тодорхойлолт"
 #. module: plugin_thunderbird
 #: view:plugin_thunderbird.installer:0
 msgid "title"
-msgstr ""
+msgstr "гарчиг"
 
 #. module: plugin_thunderbird
 #: model:ir.model,name:plugin_thunderbird.model_plugin_thunderbird_installer
 msgid "plugin_thunderbird.installer"
-msgstr ""
+msgstr "plugin_thunderbird.installer"
 
 #. module: plugin_thunderbird
 #: field:plugin_thunderbird.installer,config_logo:0
 msgid "Image"
-msgstr ""
+msgstr "Зураг"
 
 #. module: plugin_thunderbird
 #: field:plugin_thunderbird.installer,plugin_file:0
 #: field:plugin_thunderbird.installer,thunderbird:0
 msgid "Thunderbird Plug-in"
-msgstr ""
+msgstr "Thunderbird залгаас"
 
 #. module: plugin_thunderbird
 #: view:plugin_thunderbird.installer:0
@@ -61,27 +61,28 @@ msgid ""
 "Allows you to select an object that you would like to add to your email and "
 "its attachments."
 msgstr ""
+"Имэйлийг хавсралт байдлаар нэмэх обьектийг сонгох боломжоор хангадаг."
 
 #. module: plugin_thunderbird
 #: help:plugin_thunderbird.installer,pdf_file:0
 msgid "The documentation file :- how to install Thunderbird Plug-in."
-msgstr ""
+msgstr "Баримтжуулалтын файл :- Thunderbird залгаасыг хэрхэн суулгах."
 
 #. module: plugin_thunderbird
 #: view:plugin_thunderbird.installer:0
 msgid "_Close"
-msgstr ""
+msgstr "_Хаах"
 
 #. module: plugin_thunderbird
 #: view:plugin_thunderbird.installer:0
 msgid "Installation and Configuration Steps"
-msgstr ""
+msgstr "Суулгалтын болон Тохиргооны Алхамууд"
 
 #. module: plugin_thunderbird
 #: field:plugin_thunderbird.installer,name:0
 #: field:plugin_thunderbird.installer,pdf_name:0
 msgid "File name"
-msgstr ""
+msgstr "Файлын нэр"
 
 #. module: plugin_thunderbird
 #: help:plugin_thunderbird.installer,plugin_file:0
@@ -89,10 +90,20 @@ msgid ""
 "Thunderbird plug-in file. Save as this file and install this plug-in in "
 "thunderbird."
 msgstr ""
+"Thunderbird залгаас файл. Файл болгож хадгалаад thunderbird залгаас болгож "
+"суулгана."
 
 #. module: plugin_thunderbird
 #: model:ir.actions.act_window,name:plugin_thunderbird.action_thunderbird_installer
 #: model:ir.ui.menu,name:plugin_thunderbird.menu_base_config_plugins_thunderbird
 #: view:plugin_thunderbird.installer:0
 msgid "Install Thunderbird Plug-In"
-msgstr ""
+msgstr "Thunderbird залгаас суулгах"
+
+#~ msgid ""
+#~ "This plug-in allows you to link your e-mail to OpenERP's documents. You can "
+#~ "attach it to any existing one in OpenERP or create a new one."
+#~ msgstr ""
+#~ "Энэ залгаас нь OpenERP баримтуудад имэйлийг холбох боломжийг олгоно. Мөн "
+#~ "OpenERP-д байгаа янз бүрийн баримтуудад холбож өгч болно эсвэл шинээр үүсгэж "
+#~ "болно."
diff --git a/addons/plugin_thunderbird/i18n/nl.po b/addons/plugin_thunderbird/i18n/nl.po
index d12b6c8624f..ff9e10eebfb 100644
--- a/addons/plugin_thunderbird/i18n/nl.po
+++ b/addons/plugin_thunderbird/i18n/nl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:30+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: plugin_thunderbird
 #: field:plugin_thunderbird.installer,pdf_file:0
diff --git a/addons/plugin_thunderbird/i18n/pl.po b/addons/plugin_thunderbird/i18n/pl.po
index 318266fcbd1..b7b0f23bfd5 100644
--- a/addons/plugin_thunderbird/i18n/pl.po
+++ b/addons/plugin_thunderbird/i18n/pl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:30+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: plugin_thunderbird
 #: field:plugin_thunderbird.installer,pdf_file:0
diff --git a/addons/plugin_thunderbird/i18n/pt.po b/addons/plugin_thunderbird/i18n/pt.po
index 9f2ae631826..e7521ec2d7c 100644
--- a/addons/plugin_thunderbird/i18n/pt.po
+++ b/addons/plugin_thunderbird/i18n/pt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:30+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: plugin_thunderbird
 #: field:plugin_thunderbird.installer,pdf_file:0
diff --git a/addons/plugin_thunderbird/i18n/pt_BR.po b/addons/plugin_thunderbird/i18n/pt_BR.po
index 81b2993b8a7..02f2ef278fc 100644
--- a/addons/plugin_thunderbird/i18n/pt_BR.po
+++ b/addons/plugin_thunderbird/i18n/pt_BR.po
@@ -9,13 +9,14 @@ msgstr ""
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-09 00:36+0000\n"
 "PO-Revision-Date: 2012-07-28 20:54+0000\n"
-"Last-Translator: Fábio Martinelli <webmaster@guaru.net>\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: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:30+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: plugin_thunderbird
 #: field:plugin_thunderbird.installer,pdf_file:0
diff --git a/addons/plugin_thunderbird/i18n/ro.po b/addons/plugin_thunderbird/i18n/ro.po
index 530bfd9d4d2..aedb89fa9a4 100644
--- a/addons/plugin_thunderbird/i18n/ro.po
+++ b/addons/plugin_thunderbird/i18n/ro.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:30+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: plugin_thunderbird
 #: field:plugin_thunderbird.installer,pdf_file:0
diff --git a/addons/plugin_thunderbird/i18n/ru.po b/addons/plugin_thunderbird/i18n/ru.po
index 297a59e9933..eb6980bf0fa 100644
--- a/addons/plugin_thunderbird/i18n/ru.po
+++ b/addons/plugin_thunderbird/i18n/ru.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:30+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: plugin_thunderbird
 #: field:plugin_thunderbird.installer,pdf_file:0
diff --git a/addons/plugin_thunderbird/i18n/sk.po b/addons/plugin_thunderbird/i18n/sk.po
index 14443183b35..96cff54437f 100644
--- a/addons/plugin_thunderbird/i18n/sk.po
+++ b/addons/plugin_thunderbird/i18n/sk.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:30+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: plugin_thunderbird
 #: field:plugin_thunderbird.installer,pdf_file:0
diff --git a/addons/plugin_thunderbird/i18n/sl.po b/addons/plugin_thunderbird/i18n/sl.po
index dab3f9e09d9..9ea74342ef2 100644
--- a/addons/plugin_thunderbird/i18n/sl.po
+++ b/addons/plugin_thunderbird/i18n/sl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:30+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: plugin_thunderbird
 #: field:plugin_thunderbird.installer,pdf_file:0
diff --git a/addons/plugin_thunderbird/i18n/sr.po b/addons/plugin_thunderbird/i18n/sr.po
index a6dc1a9b3bf..20b7b8dc7b2 100644
--- a/addons/plugin_thunderbird/i18n/sr.po
+++ b/addons/plugin_thunderbird/i18n/sr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:30+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: plugin_thunderbird
 #: field:plugin_thunderbird.installer,pdf_file:0
diff --git a/addons/plugin_thunderbird/i18n/sr@latin.po b/addons/plugin_thunderbird/i18n/sr@latin.po
index 127701835ad..67c8d26e13f 100644
--- a/addons/plugin_thunderbird/i18n/sr@latin.po
+++ b/addons/plugin_thunderbird/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:30+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: plugin_thunderbird
 #: field:plugin_thunderbird.installer,pdf_file:0
diff --git a/addons/plugin_thunderbird/i18n/sv.po b/addons/plugin_thunderbird/i18n/sv.po
index 09353d67238..11d16b4825c 100644
--- a/addons/plugin_thunderbird/i18n/sv.po
+++ b/addons/plugin_thunderbird/i18n/sv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:30+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: plugin_thunderbird
 #: field:plugin_thunderbird.installer,pdf_file:0
diff --git a/addons/plugin_thunderbird/i18n/tr.po b/addons/plugin_thunderbird/i18n/tr.po
index 0337eef86da..9b80b84a6df 100644
--- a/addons/plugin_thunderbird/i18n/tr.po
+++ b/addons/plugin_thunderbird/i18n/tr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:30+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: plugin_thunderbird
 #: field:plugin_thunderbird.installer,pdf_file:0
diff --git a/addons/plugin_thunderbird/i18n/zh_CN.po b/addons/plugin_thunderbird/i18n/zh_CN.po
index c8701eb5f8e..0bfa4f721ac 100644
--- a/addons/plugin_thunderbird/i18n/zh_CN.po
+++ b/addons/plugin_thunderbird/i18n/zh_CN.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:30+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: plugin_thunderbird
 #: field:plugin_thunderbird.installer,pdf_file:0
diff --git a/addons/point_of_sale/__openerp__.py b/addons/point_of_sale/__openerp__.py
index 05dc08fb8d3..5dc26d2f87c 100644
--- a/addons/point_of_sale/__openerp__.py
+++ b/addons/point_of_sale/__openerp__.py
@@ -24,8 +24,8 @@
     'name': 'Point of Sale',
     'version': '1.0.1',
     'category': 'Point Of Sale',
-    "sequence": 6,
-    "summary": "Touchscreen Interface for Shops",
+    'sequence': 6,
+    'summary': 'Touchscreen Interface for Shops',
     'description': """
 This module provides a quick and easy sale process.
 ===================================================
@@ -42,9 +42,7 @@ Main features:
     'author': 'OpenERP SA',
     'images': ['images/cash_registers.jpeg', 'images/pos_analysis.jpeg','images/register_analysis.jpeg','images/sale_order_pos.jpeg','images/product_pos.jpeg'],
     'depends': ['sale_stock'],
-    'init_xml': [],
-
-    'update_xml': [
+    'data': [
         'security/point_of_sale_security.xml',
         'security/ir.model.access.csv',
         'wizard/pos_details.xml',
@@ -69,7 +67,7 @@ Main features:
         'account_statement_report.xml',
         'res_users_view.xml',
     ],
-    'demo_xml': [
+    'demo': [
         'point_of_sale_demo.xml',
         'account_statement_demo.xml',
         'test/00_register_open.yml'
@@ -81,24 +79,25 @@ Main features:
     ],
     'installable': True,
     'application': True,
-    # Web client
     'js': [
-            'static/lib/backbone/backbone-0.9.2.js', 
-            'static/lib/mousewheel/jquery.mousewheel-3.0.6.js',
-            'static/src/js/pos_models.js',
-            'static/src/js/pos_basewidget.js',
-            'static/src/js/pos_keyboard_widget.js',
-            'static/src/js/pos_scrollbar_widget.js',
-            'static/src/js/pos_widgets.js',
-            'static/src/js/pos_devices.js',
-            'static/src/js/pos_screens.js',
-            'static/src/js/pos_main.js'
+        'static/lib/mousewheel/jquery.mousewheel-3.0.6.js',
+        'static/src/js/db.js',
+        'static/src/js/models.js',
+        'static/src/js/widget_base.js',
+        'static/src/js/widget_keyboard.js',
+        'static/src/js/widget_scrollbar.js',
+        'static/src/js/widgets.js',
+        'static/src/js/devices.js',
+        'static/src/js/screens.js',
+        'static/src/js/main.js',
     ],
     'css': [
-        'static/src/css/pos.css',
+        'static/src/css/pos.css', # this is the default css with hover effects
+        #'static/src/css/pos_nohover.css', # this css has no hover effects (for resistive touchscreens)
         'static/src/css/keyboard.css'
     ],
     'qweb': ['static/src/xml/pos.xml'],
     'auto_install': False,
 }
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/point_of_sale/account_bank_statement.py b/addons/point_of_sale/account_bank_statement.py
index 5b989edb53d..06fe1d4a1f8 100644
--- a/addons/point_of_sale/account_bank_statement.py
+++ b/addons/point_of_sale/account_bank_statement.py
@@ -27,15 +27,10 @@ class account_journal(osv.osv):
     _columns = {
         'journal_user': fields.boolean('PoS Payment Method', help="Check this box if this journal define a payment method that can be used in point of sales."),
 
-        'opening_control': fields.boolean('Opening Control', help="If you want the journal should be control at opening, check this option"),
-        'closing_control': fields.boolean('Closing Control', help="If you want the journal should be control at closing, check this option"),
-
         'amount_authorized_diff' : fields.float('Amount Authorized Difference'),
         'self_checkout_payment_method' : fields.boolean('Self Checkout Payment Method'),
     }
     _defaults = {
-        'opening_control' : True,
-        'closing_control' : True,
         'self_checkout_payment_method' : False,
     }
 
@@ -46,6 +41,7 @@ class account_cash_statement(osv.osv):
     _columns = {
         'pos_session_id' : fields.many2one('pos.session'),
     }
+
 account_cash_statement()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/point_of_sale/account_statement_view.xml b/addons/point_of_sale/account_statement_view.xml
index d7f3be2a8d6..86fc8fec164 100644
--- a/addons/point_of_sale/account_statement_view.xml
+++ b/addons/point_of_sale/account_statement_view.xml
@@ -10,8 +10,6 @@
                     <page string="Point of Sale">
                         <group col="4" colspan="4">
                             <field name="journal_user"/>
-                            <field name="opening_control"/>
-                            <field name="closing_control"/>
                             <field name="amount_authorized_diff"/>
                             <field name="self_checkout_payment_method" />
                         </group>
@@ -113,37 +111,5 @@
             <field name="view_id" ref="account.view_bank_statement_form2"/>
             <field name="act_window_id" ref="action_new_bank_statement_all_tree"/>
         </record>
-
-        <!--
-        <menuitem name="Cash Register Management" parent="point_of_sale.menu_point_root"
-            id="menu_point_open_config" sequence="10"/>
-        <menuitem
-            name="Open Cash Registers" parent="menu_point_open_config"
-            string="Open Cash Registers"
-            action="action_pos_open_statement"
-            id="menu_open_statement" sequence="1" />
-
-        <menuitem
-            name="Close Cash Registers" parent="menu_point_open_config"
-            string="Close Cash Registers"
-            action="action_pos_close_statement"
-            id="menu_close_statement" sequence="2" />
-
-        <menuitem
-            parent="menu_point_open_config"
-            action="action_pos_confirm"
-            id="menu_wizard_pos_confirm" sequence="8" />
-
-
-        <menuitem
-            name="List of Cash Registers"
-            parent="menu_point_open_config"
-            action="action_new_bank_statement_all_tree"
-            id="menu_all_menu_all_register"
-            sequence="4"
-        />
-    -->
-
-
     </data>
 </openerp>
diff --git a/addons/point_of_sale/controllers/__init__.py b/addons/point_of_sale/controllers/__init__.py
new file mode 100644
index 00000000000..b5f0bcc9ec6
--- /dev/null
+++ b/addons/point_of_sale/controllers/__init__.py
@@ -0,0 +1,3 @@
+import main
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/point_of_sale/controllers.py b/addons/point_of_sale/controllers/main.py
similarity index 52%
rename from addons/point_of_sale/controllers.py
rename to addons/point_of_sale/controllers/main.py
index 33a96dacf84..425a7e3d7f8 100644
--- a/addons/point_of_sale/controllers.py
+++ b/addons/point_of_sale/controllers/main.py
@@ -1,14 +1,71 @@
 # -*- coding: utf-8 -*-
 import logging
+import simplejson
+import os
+import openerp
 
 try:
     import openerp.addons.web.common.http as openerpweb
+    from openerp.addons.web.controllers.main import manifest_list, module_boot, html_template
 except ImportError:
     import web.common.http as openerpweb
 
 class PointOfSaleController(openerpweb.Controller):
     _cp_path = '/pos'
 
+    @openerpweb.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'))
+
+        cookie = req.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)
+        r = template % {
+            'js': js,
+            'css': css,
+            'modules': simplejson.dumps(module_boot(req)),
+            'init': 'var wc = new s.web.WebClient();wc.appendTo($(document.body));'
+        }
+        return r
+
+    @openerpweb.httprequest
+    def manifest(self, req, **kwargs):
+        """ 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 """
+
+        ml = ["CACHE MANIFEST"]
+
+        # loading all the images in the static/src/img/* directories
+        def load_css_img(srcdir,dstdir):
+            for f in os.listdir(srcdir):
+                path = os.path.join(srcdir,f)
+                dstpath = os.path.join(dstdir,f)
+                if os.path.isdir(path) :
+                    load_css_img(path,dstpath)
+                elif f.endswith(('.png','.PNG','.jpg','.JPG','.jpeg','.JPEG','.gif','.GIF')):
+                    ml.append(dstpath)
+
+        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']):
+            product_id = p['id']
+            url = "/web/binary/image?session_id=%s&model=product.product&field=image&id=%s" % (req.session_id, product_id)
+            ml.append(url)
+        
+        categories = req.session.model('pos.category')
+        for c in categories.search_read([],['name']):
+            category_id = c['id']
+            url = "/web/binary/image?session_id=%s&model=pos.category&field=image&id=%s" % (req.session_id, category_id)
+            ml.append(url)
+
+        ml += ["NETWORK:","*"]
+        m = "\n".join(ml)
+
+        return m
+
     @openerpweb.jsonrequest
     def dispatch(self, request, iface, **kwargs):
         method = 'iface_%s' % iface
@@ -109,3 +166,4 @@ class PointOfSaleController(openerpweb.Controller):
         print 'print_receipt' + str(receipt)
         return
 
+
diff --git a/addons/point_of_sale/doc/barcode_test_sheet2.svg b/addons/point_of_sale/doc/barcode_test_sheet2.svg
new file mode 100644
index 00000000000..11f852bd5c9
--- /dev/null
+++ b/addons/point_of_sale/doc/barcode_test_sheet2.svg
@@ -0,0 +1,1108 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="744.09448819"
+   height="1052.3622047"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.3.1 r9886"
+   sodipodi:docname="barcode_test_sheet2.svg">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="1"
+     inkscape:pageshadow="2"
+     inkscape:zoom="0.86706515"
+     inkscape:cx="632.35885"
+     inkscape:cy="613.16261"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="1855"
+     inkscape:window-height="1056"
+     inkscape:window-x="65"
+     inkscape:window-y="24"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <text
+       xml:space="preserve"
+       style="font-size:43.10883331px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
+       x="167.93207"
+       y="105.20258"
+       id="text2985"
+       sodipodi:linespacing="125%"><tspan
+         sodipodi:role="line"
+         id="tspan2987"
+         x="167.93207"
+         y="105.20258"
+         style="font-style:normal;font-variant:normal;font-weight:500;font-stretch:normal;font-family:Inconsolata;-inkscape-font-specification:Inconsolata Medium">BARCODE TEST SHEET</tspan></text>
+    <g
+       id="g3347"
+       transform="matrix(0.54655779,0,0,0.54655779,40.964737,81.693618)">
+      <image
+         width="163.36363"
+         height="107.96206"
+         xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAOYAAACYCAIAAAB/IAJdAAAAA3NCSVQICAjb4U/gAAADqUlEQVR4 nO3a226jMABFUYjy/7/MPCChDBfHARM4zVpP1dQY4u66JEw/DEO3S9/3XdeNh79+vRwz2hr5OmZr 5JH5t0YuX0X51W0dW3PNNa9xOWf5au8wsrxu9Ud95HHkYPg+yRJGsoSRLGEkSxjJEkayhJEsYSRL GMkSRrKEkSxhJEsYyRJGsoSRLGEkSxjJEkayhJEsYSRLGMkSRrKEkSxhJEsYyRJGsoSRLGEkSxjJ EkayhJEsYSRLGMkSRrKEkSxhJEsYyRJGsoSRLGEkSxjJEkayhJEsYSRLGMkSRrKEkSxhJEsYyRJG soSRLGEkSxjJEkayhJEsYSRLGMkSRrKEkSxhJEsYyRJGsoSRLGEkSxjJEkayhJEsYSRLGMkSRrKE kSxhJEsYyRJGsoSRLGEkSxjJEkayhJEsYSRLGMkSRrKEkSxhJEsYyRJGsoSRLGEkSxjJEkayhJEs YSRLGMkSRrKEkSxhJEsYyRJGsoSRLGEkSxjJEkayhJEsYSRLGMkSRrKEkSxhJEsYyRJGsoSRLGEk SxjJEkayhJEsYSRLGMkSRrKEkSxhJEsYyRJGsoSRLGEkSxjJEkayhJEsYSRLGMkSRrKEkSxh+mEY dh7Z913XjYe/fv3LrMlS8zWxyxJGsjuNGwbf91z911Z/1GY/18oJ689+cOTb7LZmPtJr/ZrcfOTu 1SucseaQlV221f6xnKdm5vqznzHy1Nn6vq9fk5SRrYzzry7RzHyXbd7r9HszXVP9b3bN/EdGlq/k 0y250uu0W2tSv3oXjvxo9d4ahmE6b/mP58ou2/BNbuUr3Hf2M0aOzthRVn8M5QurX71rR87sXr1h GGa/z6tT/Zds2y12+TpfP+nYOqp+/rYjZ4esXvzk0zkLlmtSv3rXjlx1/F3QMtzZgMfse1d9jvi1 t1zND2HScPUK2+2j+cl2uEmvl/Bh2Zat+4TH64gLruvzs599C3vSOqz+Yf1LvZ60estwn93ehdt9 ez5zk1vYJmrW5C9lWqNVJ5OnW4IjR31kudFWvqe5v/NWb/lE47n6jbOvo3xZhbOfMfLL7n97fRNb j9/WH9j+mgtTtsUW5hzNN6PVMx2/iMLO93ba798tfPp6d398tjyqfqFu+I9vv7XD1uY6Ofd/ci0/ o/5ZhR/2lvrVu3ZkK7PPX7ee2px1YzA9Mn77S/Nrlj/+1UdNlat37ciGCncCMyfuslsP/e7mazey y22j8Pi3fvWuHdlq9cYZap6H/wMqFm5yx9XfMwAAAABJRU5ErkJggg== "
+         id="image3083"
+         x="388.17426"
+         y="124.14642" />
+      <rect
+         ry="3.5336394"
+         rx="3.5336394"
+         y="114.51707"
+         x="141.08452"
+         height="126.4052"
+         width="417.54495"
+         id="rect3086"
+         style="fill:none;stroke:#c3c3c3;stroke-width:1.82963264;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+      <text
+         sodipodi:linespacing="125%"
+         id="text3856"
+         y="147.73848"
+         x="201.46712"
+         style="font-size:27.53050041px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
+         xml:space="preserve"><tspan
+           style="font-style:normal;font-variant:normal;font-weight:500;font-stretch:normal;font-family:Inconsolata;-inkscape-font-specification:Inconsolata Medium"
+           y="147.73848"
+           x="201.46712"
+           id="tspan3858"
+           sodipodi:role="line">ADMIN</tspan></text>
+      <text
+         xml:space="preserve"
+         style="font-size:17.41555405px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
+         x="154.5717"
+         y="182.10147"
+         id="text3860"
+         sodipodi:linespacing="125%"><tspan
+           sodipodi:role="line"
+           id="tspan3862"
+           x="154.5717"
+           y="182.10147"
+           style="font-style:normal;font-variant:normal;font-weight:500;font-stretch:normal;font-family:Inconsolata;-inkscape-font-specification:Inconsolata Medium">Prefix: 40</tspan></text>
+      <text
+         sodipodi:linespacing="125%"
+         id="text3149"
+         y="200.85837"
+         x="154.5717"
+         style="font-size:17.41555405px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
+         xml:space="preserve"><tspan
+           style="font-style:normal;font-variant:normal;font-weight:500;font-stretch:normal;font-family:Inconsolata;-inkscape-font-specification:Inconsolata Medium"
+           y="200.85837"
+           x="154.5717"
+           id="tspan3151"
+           sodipodi:role="line">ID: 4447190000</tspan></text>
+    </g>
+    <g
+       id="g3335"
+       transform="matrix(0.54655779,0,0,0.54655779,40.964737,257.20188)">
+      <g
+         transform="translate(0,-3.2620699)"
+         id="g3173">
+        <text
+           xml:space="preserve"
+           style="font-size:17.41555405px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
+           x="154.5717"
+           y="341.12738"
+           id="text3153"
+           sodipodi:linespacing="125%"><tspan
+             sodipodi:role="line"
+             id="tspan3155"
+             x="154.5717"
+             y="341.12738"
+             style="font-style:normal;font-variant:normal;font-weight:500;font-stretch:normal;font-family:Inconsolata;-inkscape-font-specification:Inconsolata Medium">Prefix: 42</tspan></text>
+        <text
+           sodipodi:linespacing="125%"
+           id="text3157"
+           y="359.88428"
+           x="154.5717"
+           style="font-size:17.41555405px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
+           xml:space="preserve"><tspan
+             style="font-style:normal;font-variant:normal;font-weight:500;font-stretch:normal;font-family:Inconsolata;-inkscape-font-specification:Inconsolata Medium"
+             y="359.88428"
+             x="154.5717"
+             id="tspan3159"
+             sodipodi:role="line">ID: 1182180000</tspan></text>
+      </g>
+      <g
+         transform="translate(0,-18.756902)"
+         id="g3954">
+        <rect
+           ry="3.5336394"
+           rx="3.5336394"
+           y="284.96024"
+           x="141.08452"
+           height="126.4052"
+           width="417.54495"
+           id="rect3876"
+           style="fill:none;stroke:#c3c3c3;stroke-width:1.82963264;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+        <text
+           sodipodi:linespacing="125%"
+           id="text3878"
+           y="318.18164"
+           x="151.59334"
+           style="font-size:27.53050041px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
+           xml:space="preserve"><tspan
+             style="font-style:normal;font-variant:normal;font-weight:500;font-stretch:normal;font-family:Inconsolata;-inkscape-font-specification:Inconsolata Medium"
+             y="318.18164"
+             x="151.59334"
+             id="tspan3880"
+             sodipodi:role="line">CLIENT Joe Bloggs</tspan></text>
+        <image
+           y="294.58957"
+           x="388.17426"
+           id="image3951"
+           xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAOYAAACYCAIAAAB/IAJdAAAAA3NCSVQICAjb4U/gAAADyUlEQVR4 nO3a3Y6qShSFUTC+/yvXuSAxbCgQsPiZp8e46mgJq/ETxe6+lNId0vd913XDw8c/z+8d3zIYP2p8 y9LKLbcvbXN8y5Zt/jLn0jHZcnzm29z+m961cmn+vY/a5fXLg+F6kiWMZAkjWcJIljCSJYxkCSNZ wkiWMJIljGQJI1nCSJYwkiWMZAkjWcJIljCSJYxkCSNZwkiWMJIljGQJI1nCSJYwkiWMZAkjWcJI ljCSJYxkCSNZwkiWMJIljGQJI1nCSJYwkiWMZAkjWcJIljCSJYxkCSNZwkiWMJIljGQJI1nCSJYw kiWMZAkjWcJIljCSJYxkCSNZwkiWMJIljGQJI1nCSJYwkiWMZAkjWcJIljCSJYxkCSNZwkiWMJIl jGQJI1nCSJYwkiWMZAkjWcJIljCSJYxkCSNZwkiWMJIljGQJI1nCSJYwkiWMZAkjWcJIljCSJYxk CSNZwkiWMJIljGQJI1nCSJYwkiWMZAkjWcJIljCSJYxkCSNZwkiWMJIljGQJI1nCSJYwkiWMZAkj WcJIljCSJYxkCSNZwkiWMJIljGQJI1nCSJYwkiWMZAkjWcJIljCSJYxkCSNZwkiWMJIljGQJI1nC 9KWUg4/s+67rhoePf/7LHJO55sfEWZYwj0t2eCG2XXmGe/f+l72rt7Z6U5s8r1832LbX+ZqlAc6b 85qpbln59SDs7afvN31MrZxlm5w/+r6fb6d644H9Huu1euOpcx6eqnrj0n7vXdnKsP31Iz+YnmWb TzZ+3Wx/wqoOrJzvfeml3HDO36ear1wa/saV62fovafYUspnv+tv8pWzbMPPA5NNjS8bL1Dd+9gt c36dqnrX+pNy78qJw8etlDJ53VY39U+ybZ+kjb9nGWm1cpfmc/5o6RwzfyHdu3LX8NvNw50seE3u a/J8XPC8bjH5bavXPdfP+XWqXG0TGm92fJTezXf2BJ8PRtsvzy/wzKkea3Je/yT6mqw41e0vjI27 vnjO/0evJx20+eeEd3f0vWnXx/OlC52TVA/f8P6yPsCPc64fk8NTRTt8GbfkffYZ5eJYu9ULiJU+ zp7z2FQpzqtocj4tpbyrdzSZY7zNJz8fKXP+NfNYhx/qf7BtuL+HR5Ay55OdcYpdOY+8Ss1n6Y9z pHTwqDmXvgGdl3HvypNMvtKa7/GU/+S695uB7Qf9yjkPpDD/hn/JvStbmcdaPSxnfTDoVn/PK783 +GXZBdcTS/utfoO7dPV218qGtl9RPO7/ZZuovkBv/5vcrqmqK5c2e+PKVu9Uwxa2PEf/AXnknj+O sxSLAAAAAElFTkSuQmCC "
+           height="107.26709"
+           width="162.31204" />
+      </g>
+    </g>
+    <g
+       id="g3322"
+       transform="matrix(0.54655779,0,0,0.54655779,40.964737,259.54293)">
+      <rect
+         ry="3.5336394"
+         rx="3.5336394"
+         y="419.52063"
+         x="141.08452"
+         height="126.4052"
+         width="417.54495"
+         id="rect3964"
+         style="fill:none;stroke:#c3c3c3;stroke-width:1.82963264;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+      <text
+         sodipodi:linespacing="125%"
+         id="text3966"
+         y="452.74203"
+         x="151.59332"
+         style="font-size:27.53050041px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
+         xml:space="preserve"><tspan
+           style="font-style:normal;font-variant:normal;font-weight:500;font-stretch:normal;font-family:Inconsolata;-inkscape-font-specification:Inconsolata Medium"
+           y="452.74203"
+           x="151.59332"
+           id="tspan3968"
+           sodipodi:role="line">CLIENT Bob Soap</tspan></text>
+      <image
+         y="429.14993"
+         x="387.35876"
+         id="image4065"
+         xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAOYAAACYCAIAAAB/IAJdAAAAA3NCSVQICAjb4U/gAAAERElEQVR4 nO3a0ZKaQBRFUbX8/182D1QZInRzadDxTNZ6mjgNNrhBYHJ9PB6XIdfr9XK5TIvPf57/drJ8/ayR rVdaG9Wfc+Vd+vPc+3N/hv3XK68st2i5Xa09XNnS+sjKthfdjiwMnydZwkiWMJIljGQJI1nCSJYw kiWMZAkjWcJIljCSJYxkCSNZwkiWMJIljGQJI1nCSJYwkiWMZAkjWcJIljCSJYxkCSNZwkiWMJIl jGQJI1nCSJYwkiWMZAkjWcJIljCSJYxkCSNZwkiWMJIljGQJI1nCSJYwkiWMZAkjWcJIljCSJYxk CSNZwkiWMJIljGQJI1nCSJYwkiWMZAkjWcJIljCSJYxkCSNZwkiWMJIljGQJI1nCSJYwkiWMZAkj WcJIljCSJYxkCSNZwkiWMJIljGQJI1nCSJYwkiWMZAkjWcJIljCSJYxkCSNZwkiWMJIljGQJI1nC SJYwkiWMZAkjWcJIljCSJYxkCSNZwkiWMJIljGQJI1nCSJYwkiWMZAkjWcJIljCSJYxkCSNZwkiW MJIljGQJI1nCSJYwkiWMZAkjWcJIljCSJYxkCSNZwkiWMJIljGQJI1nCSJYwkiWMZAkjWcJIljCS Jcz18XgMLnm9Xi6XafH5z/8z+2Tp9H3iLEuYDyU7HV7njuT/dH/+9NLKid9o5/Zan+fYFnW+vFrT 27uv+hPb3AnLt1su0prSO/beWeVcr6XL1Ns0dLnNqy+OzeOskfV5Dm9RZ8BZe2N1YgfXWXlx11u/ Y2TftFTlM7rP/zFv/B378eDIp+I8V89enUO5MpMjXz7P9S/nP59V/3zWOiX317k6/9aw5TqPj9z0 eDyea+vfpd1Wt/ny7y3eN6jP88jX9wdu8Jfzn2wuWD84W1cOm8Navz1rZN/LfmidcW/H36nz9pUP oz7yUs6uuLa5dx+cB5/vvOmRWeuAb52ex0bunVL/W/Se8uDw+Dw3r1MHTnVjs5qvpP6m9QuG7/lu HNa5Trg3F/oVKrfSR05ge5dt3awMH5DPj7b+0KA/n+/xcrZ+7qhmsm/6JjpdfZ6dMZuLd+5yBuxa ydgHsbxsnS4N407Gy3BXkm3d6KyuqzLyTSrzXH5Cex+Cdt5ifoabBlT2SSWmutZGtVb4+UxP7+Sf v34979EGbl8+aWye9RuIuoMnv039Ge66AVruqy//lCcvzw3+XhjsvSH4Ke+YZ+dR/DfvijFBW9S6 071fylcCP644z19T2wc25GsvZzvnpnvrF1/rxHl2rvZWL3lbTxuK77V6ifmZaPpH+8vlZmeeYyPH ptqa8C3lnPTjj5OW6xz7dlr9Q93YrFoP7Vfz6s+kOM+DI/uWl63r095c0VnP8A8+M9/cF8XHN8Xn WfUT6nCvm2uo7Lf6lu6af32eu7aoo36X8jv/i/fqAXrwBrm1zr0rKa6heJzXt3TXE4P6PI/vk/lS lc/oD6RX6TSeNJuDAAAAAElFTkSuQmCC "
+         height="107.14654"
+         width="162.12962" />
+      <g
+         id="g3179"
+         transform="translate(0,140.26901)">
+        <text
+           sodipodi:linespacing="125%"
+           id="text3181"
+           y="341.12738"
+           x="154.5717"
+           style="font-size:17.41555405px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
+           xml:space="preserve"><tspan
+             style="font-style:normal;font-variant:normal;font-weight:500;font-stretch:normal;font-family:Inconsolata;-inkscape-font-specification:Inconsolata Medium"
+             y="341.12738"
+             x="154.5717"
+             id="tspan3183"
+             sodipodi:role="line">Prefix: 21</tspan></text>
+        <text
+           xml:space="preserve"
+           style="font-size:17.41555405px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
+           x="154.5717"
+           y="359.88428"
+           id="text3185"
+           sodipodi:linespacing="125%"><tspan
+             sodipodi:role="line"
+             id="tspan3187"
+             x="154.5717"
+             y="359.88428"
+             style="font-style:normal;font-variant:normal;font-weight:500;font-stretch:normal;font-family:Inconsolata;-inkscape-font-specification:Inconsolata Medium">ID: 12345</tspan></text>
+        <text
+           sodipodi:linespacing="125%"
+           id="text3189"
+           y="379.4567"
+           x="154.5717"
+           style="font-size:17.41555405px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
+           xml:space="preserve"><tspan
+             style="font-style:normal;font-variant:normal;font-weight:500;font-stretch:normal;font-family:Inconsolata;-inkscape-font-specification:Inconsolata Medium"
+             y="379.4567"
+             x="154.5717"
+             id="tspan3191"
+             sodipodi:role="line">Value: 67.89Kg</tspan></text>
+      </g>
+    </g>
+    <g
+       id="g3269"
+       transform="matrix(0.54655779,0,0,0.54655779,306.11765,-335.23001)">
+      <g
+         transform="translate(0,284.6156)"
+         id="g3061">
+        <g
+           transform="translate(0,154.94832)"
+           id="g3063">
+          <rect
+             style="fill:none;stroke:#c3c3c3;stroke-width:1.82963264;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+             id="rect3065"
+             width="417.54495"
+             height="126.4052"
+             x="141.08452"
+             y="438.27753"
+             rx="3.5336394"
+             ry="3.5336394" />
+          <text
+             xml:space="preserve"
+             style="font-size:27.53050041px;font-style:normal;font-weight:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
+             x="272.54657"
+             y="471.49893"
+             id="text3067"
+             sodipodi:linespacing="125%"><tspan
+               id="tspan3083"
+               sodipodi:role="line"
+               x="272.54657"
+               y="471.49893"
+               style="font-style:normal;font-variant:normal;font-weight:500;font-stretch:normal;text-align:center;text-anchor:middle;font-family:Inconsolata;-inkscape-font-specification:Inconsolata Medium">COCA COLA 33CL</tspan></text>
+          <g
+             id="g3071"
+             transform="translate(0,156.57936)" />
+        </g>
+      </g>
+      <image
+         width="163.94308"
+         height="108.34499"
+         xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAOYAAACYCAIAAAB/IAJdAAAAA3NCSVQICAjb4U/gAAADz0lEQVR4 nO3Z0ZKaMACGUdnx/V+ZXjBjGWKyEQjyt+fcdIsBY/ZTgZ3meX7sMk3T4/FYdq/9XI5frB9db18/ Wh6nfJZyr/Yz9s+t/Yp65tw/22+N3Pe6asevhdQ/stPPkZ3hepIljGQJI1nCSJYwkiWMZAkjWcJI ljCSJYxkCSNZwkiWMJIljGQJI1nCSJYwkiWMZAkjWcJIljCSJYxkCSNZwkiWMJIljGQJI1nCSJYw kiWMZAkjWcJIljCSJYxkCSNZwkiWMJIljGQJI1nCSJYwkiWMZAkjWcJIljCSJYxkCSNZwkiWMJIl jGQJI1nCSJYwkiWMZAkjWcJIljCSJYxkCSNZwkiWMJIljGQJI1nCSJYwkiWMZAkjWcJIljCSJYxk CSNZwkiWMJIljGQJI1nCSJYwkiWMZAkjWcJIljCSJYxkCSNZwkiWMJIljGQJI1nCSJYwkiWMZAkj WcJIljCSJYxkCSNZwkiWMJIljGQJI1nCSJYwkiWMZAkjWcJIljCSJYxkCSNZwkiWMJIljGQJI1nC SJYwkiWMZAkjWcJIljCSJYxkCSNZwkiWMJIljGQJI1nCSJYwkiWMZAkjWcJIljCSJYxkCSNZwkzz PO/cc5oej8ey+/rn/5k1KZ2+Jj5lCSNZwjyXf5ZP7NKJ32v9XwrtkZupNg743ZH3nNWgV3p8WZaD 9Oz4Uz7fCP1P0Rg5TVP5aG38d0fWfHFW/av36TofX5bXLm+PtvF8/TTuQuGUXl/W83y9zs3kX8d5 bb9yZM0dZtWzev0jy2f/9bA18zy/jtb+mr3oXLZ/9u3zgc2j7cOuH71+5K1m1b96B9d5+e+isUvt OJv0336EDU/23I/Y0vruyfo45ZJdM7LmnrM6MnLQXbwy3M2AZ+2xU6Zy1iUXN7eO55RfYuM84Vnb 53hD1/R6wbXjP+z4d2Dt2ut4uJvP9ddhf9Zn0LvPQtrPesrIt19heu3Uv3r71nlEPOsjr2fyrF0t /nrd1z7lH3cKe+dMj1+cjTbi91Jefi1XTsv209ekevl1w1OC8k084m39r+pfvY/WefT6b+4bzPNc PZc95clqGzevs3/k2y30O/FUbbTa/YCByV7jzucJ9zf6FuRujVsQb/56sdnnrHfbwbOF2nwag7+1 ccfrGr2xf/XOWudye6dfb7b+vB13eq/HvZ1J+61f3ve+cuStZtW/emet845yytPW95NZ37PdOLfX 49dkH83zst/cR6v0xVn1r96gdW7r/2PE33tYI/76Vc7p+G2ED15b9ysaMfKes9q3emetc1vjjura Hwkp3Xa7HcbMAAAAAElFTkSuQmCC "
+         id="image3146"
+         x="386.54324"
+         y="887.47076" />
+      <g
+         transform="translate(0,598.58983)"
+         id="g3255">
+        <text
+           sodipodi:linespacing="125%"
+           id="text3261"
+           y="351.81107"
+           x="154.5717"
+           style="font-size:17.41555405px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
+           xml:space="preserve"><tspan
+             style="font-style:normal;font-variant:normal;font-weight:500;font-stretch:normal;font-family:Inconsolata;-inkscape-font-specification:Inconsolata Medium"
+             y="351.81107"
+             x="154.5717"
+             id="tspan3263"
+             sodipodi:role="line">ID: 5449000000996</tspan></text>
+      </g>
+    </g>
+    <g
+       id="g4150"
+       transform="matrix(0.92675002,0,0,0.92675002,-450.39648,546.91911)">
+      <text
+         sodipodi:linespacing="125%"
+         id="text3357"
+         y="320.0275"
+         x="618.97778"
+         style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Droid Sans;-inkscape-font-specification:Droid Sans"
+         xml:space="preserve"><tspan
+           y="320.0275"
+           x="618.97778"
+           id="tspan3359"
+           sodipodi:role="line">This is a test sheet intended to help you test the codebar aquisition in OpenERP's Point of Sale module. </tspan><tspan
+           id="tspan3363"
+           y="330.0275"
+           x="618.97778"
+           sodipodi:role="line">The codes provided in this list are randomly chosen and are encoded in the EAN13 format. Their codes</tspan><tspan
+           id="tspan3367"
+           y="340.0275"
+           x="618.97778"
+           sodipodi:role="line">and prefixes are not intended to match any specified standard. </tspan></text>
+      <text
+         xml:space="preserve"
+         style="font-size:6.53564215px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#b3b3b3;fill-opacity:1;stroke:none;font-family:Droid Sans;-inkscape-font-specification:Droid Sans"
+         x="618.99207"
+         y="349.54001"
+         id="text3369"
+         sodipodi:linespacing="125%"><tspan
+           style="fill:#b3b3b3;fill-opacity:1"
+           sodipodi:role="line"
+           x="618.99207"
+           y="349.54001"
+           id="tspan3375">This document is licensed by OpenERP S.A. under the Creative Commons CC BY 3.0 license htttp://www.creativecommons.org</tspan></text>
+    </g>
+    <g
+       transform="matrix(0.54655779,0,0,0.54655779,40.964737,517.95653)"
+       id="g3156">
+      <rect
+         style="fill:none;stroke:#c3c3c3;stroke-width:1.82963264;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         id="rect3158"
+         width="417.54495"
+         height="126.4052"
+         x="141.08452"
+         y="419.52063"
+         rx="3.5336394"
+         ry="3.5336394" />
+      <text
+         xml:space="preserve"
+         style="font-size:27.53050041px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
+         x="184.30057"
+         y="452.74203"
+         id="text3160"
+         sodipodi:linespacing="125%"><tspan
+           sodipodi:role="line"
+           id="tspan3162"
+           x="184.30057"
+           y="452.74203"
+           style="font-style:normal;font-variant:normal;font-weight:500;font-stretch:normal;font-family:Inconsolata;-inkscape-font-specification:Inconsolata Medium">ORANGES: 1.5Kg</tspan></text>
+      <image
+         width="162.12962"
+         height="107.14654"
+         xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAOYAAACYCAIAAAB/IAJdAAAAA3NCSVQICAjb4U/gAAAERElEQVR4 nO3a0ZKaQBRFUbX8/182D1QZInRzadDxTNZ6mjgNNrhBYHJ9PB6XIdfr9XK5TIvPf57/drJ8/ayR rVdaG9Wfc+Vd+vPc+3N/hv3XK68st2i5Xa09XNnS+sjKthfdjiwMnydZwkiWMJIljGQJI1nCSJYw kiWMZAkjWcJIljCSJYxkCSNZwkiWMJIljGQJI1nCSJYwkiWMZAkjWcJIljCSJYxkCSNZwkiWMJIl jGQJI1nCSJYwkiWMZAkjWcJIljCSJYxkCSNZwkiWMJIljGQJI1nCSJYwkiWMZAkjWcJIljCSJYxk CSNZwkiWMJIljGQJI1nCSJYwkiWMZAkjWcJIljCSJYxkCSNZwkiWMJIljGQJI1nCSJYwkiWMZAkj WcJIljCSJYxkCSNZwkiWMJIljGQJI1nCSJYwkiWMZAkjWcJIljCSJYxkCSNZwkiWMJIljGQJI1nC SJYwkiWMZAkjWcJIljCSJYxkCSNZwkiWMJIljGQJI1nCSJYwkiWMZAkjWcJIljCSJYxkCSNZwkiW MJIljGQJI1nCSJYwkiWMZAkjWcJIljCSJYxkCSNZwkiWMJIljGQJI1nCSJYwkiWMZAkjWcJIljCS Jcz18XgMLnm9Xi6XafH5z/8z+2Tp9H3iLEuYDyU7HV7njuT/dH/+9NLKid9o5/Zan+fYFnW+vFrT 27uv+hPb3AnLt1su0prSO/beWeVcr6XL1Ns0dLnNqy+OzeOskfV5Dm9RZ8BZe2N1YgfXWXlx11u/ Y2TftFTlM7rP/zFv/B378eDIp+I8V89enUO5MpMjXz7P9S/nP59V/3zWOiX317k6/9aw5TqPj9z0 eDyea+vfpd1Wt/ny7y3eN6jP88jX9wdu8Jfzn2wuWD84W1cOm8Navz1rZN/LfmidcW/H36nz9pUP oz7yUs6uuLa5dx+cB5/vvOmRWeuAb52ex0bunVL/W/Se8uDw+Dw3r1MHTnVjs5qvpP6m9QuG7/lu HNa5Trg3F/oVKrfSR05ge5dt3awMH5DPj7b+0KA/n+/xcrZ+7qhmsm/6JjpdfZ6dMZuLd+5yBuxa ydgHsbxsnS4N407Gy3BXkm3d6KyuqzLyTSrzXH5Cex+Cdt5ifoabBlT2SSWmutZGtVb4+UxP7+Sf v34979EGbl8+aWye9RuIuoMnv039Ge66AVruqy//lCcvzw3+XhjsvSH4Ke+YZ+dR/DfvijFBW9S6 071fylcCP644z19T2wc25GsvZzvnpnvrF1/rxHl2rvZWL3lbTxuK77V6ifmZaPpH+8vlZmeeYyPH ptqa8C3lnPTjj5OW6xz7dlr9Q93YrFoP7Vfz6s+kOM+DI/uWl63r095c0VnP8A8+M9/cF8XHN8Xn WfUT6nCvm2uo7Lf6lu6af32eu7aoo36X8jv/i/fqAXrwBrm1zr0rKa6heJzXt3TXE4P6PI/vk/lS lc/oD6RX6TSeNJuDAAAAAElFTkSuQmCC "
+         id="image3164"
+         x="387.35876"
+         y="429.14993" />
+      <g
+         transform="translate(0,140.26901)"
+         id="g3166">
+        <text
+           xml:space="preserve"
+           style="font-size:17.41555405px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
+           x="154.5717"
+           y="341.12738"
+           id="text3168"
+           sodipodi:linespacing="125%"><tspan
+             sodipodi:role="line"
+             id="tspan3170"
+             x="154.5717"
+             y="341.12738"
+             style="font-style:normal;font-variant:normal;font-weight:500;font-stretch:normal;font-family:Inconsolata;-inkscape-font-specification:Inconsolata Medium">Prefix: 21</tspan></text>
+        <text
+           sodipodi:linespacing="125%"
+           id="text3172"
+           y="359.88428"
+           x="154.5717"
+           style="font-size:17.41555405px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
+           xml:space="preserve"><tspan
+             style="font-style:normal;font-variant:normal;font-weight:500;font-stretch:normal;font-family:Inconsolata;-inkscape-font-specification:Inconsolata Medium"
+             y="359.88428"
+             x="154.5717"
+             id="tspan3174"
+             sodipodi:role="line">ID: 12345</tspan></text>
+        <text
+           xml:space="preserve"
+           style="font-size:17.41555405px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
+           x="154.5717"
+           y="379.4567"
+           id="text3176"
+           sodipodi:linespacing="125%"><tspan
+             sodipodi:role="line"
+             id="tspan3178"
+             x="154.5717"
+             y="379.4567"
+             style="font-style:normal;font-variant:normal;font-weight:500;font-stretch:normal;font-family:Inconsolata;-inkscape-font-specification:Inconsolata Medium">Value: 67.89Kg</tspan></text>
+      </g>
+    </g>
+    <g
+       transform="matrix(0.54655779,0,0,0.54655779,40.964737,167.83146)"
+       id="g3180">
+      <image
+         y="124.14642"
+         x="388.17426"
+         id="image3182"
+         xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAOYAAACYCAIAAAB/IAJdAAAAA3NCSVQICAjb4U/gAAADqUlEQVR4 nO3a226jMABFUYjy/7/MPCChDBfHARM4zVpP1dQY4u66JEw/DEO3S9/3XdeNh79+vRwz2hr5OmZr 5JH5t0YuX0X51W0dW3PNNa9xOWf5au8wsrxu9Ud95HHkYPg+yRJGsoSRLGEkSxjJEkayhJEsYSRL GMkSRrKEkSxhJEsYyRJGsoSRLGEkSxjJEkayhJEsYSRLGMkSRrKEkSxhJEsYyRJGsoSRLGEkSxjJ EkayhJEsYSRLGMkSRrKEkSxhJEsYyRJGsoSRLGEkSxjJEkayhJEsYSRLGMkSRrKEkSxhJEsYyRJG soSRLGEkSxjJEkayhJEsYSRLGMkSRrKEkSxhJEsYyRJGsoSRLGEkSxjJEkayhJEsYSRLGMkSRrKE kSxhJEsYyRJGsoSRLGEkSxjJEkayhJEsYSRLGMkSRrKEkSxhJEsYyRJGsoSRLGEkSxjJEkayhJEs YSRLGMkSRrKEkSxhJEsYyRJGsoSRLGEkSxjJEkayhJEsYSRLGMkSRrKEkSxhJEsYyRJGsoSRLGEk SxjJEkayhJEsYSRLGMkSRrKEkSxhJEsYyRJGsoSRLGEkSxjJEkayhJEsYSRLGMkSRrKEkSxh+mEY dh7Z913XjYe/fv3LrMlS8zWxyxJGsjuNGwbf91z911Z/1GY/18oJ689+cOTb7LZmPtJr/ZrcfOTu 1SucseaQlV221f6xnKdm5vqznzHy1Nn6vq9fk5SRrYzzry7RzHyXbd7r9HszXVP9b3bN/EdGlq/k 0y250uu0W2tSv3oXjvxo9d4ahmE6b/mP58ou2/BNbuUr3Hf2M0aOzthRVn8M5QurX71rR87sXr1h GGa/z6tT/Zds2y12+TpfP+nYOqp+/rYjZ4esXvzk0zkLlmtSv3rXjlx1/F3QMtzZgMfse1d9jvi1 t1zND2HScPUK2+2j+cl2uEmvl/Bh2Zat+4TH64gLruvzs599C3vSOqz+Yf1LvZ60estwn93ehdt9 ez5zk1vYJmrW5C9lWqNVJ5OnW4IjR31kudFWvqe5v/NWb/lE47n6jbOvo3xZhbOfMfLL7n97fRNb j9/WH9j+mgtTtsUW5hzNN6PVMx2/iMLO93ba798tfPp6d398tjyqfqFu+I9vv7XD1uY6Ofd/ci0/ o/5ZhR/2lvrVu3ZkK7PPX7ee2px1YzA9Mn77S/Nrlj/+1UdNlat37ciGCncCMyfuslsP/e7mazey y22j8Pi3fvWuHdlq9cYZap6H/wMqFm5yx9XfMwAAAABJRU5ErkJggg== "
+         height="107.96206"
+         width="163.36363" />
+      <rect
+         style="fill:none;stroke:#c3c3c3;stroke-width:1.82963264;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         id="rect3184"
+         width="417.54495"
+         height="126.4052"
+         x="141.08452"
+         y="114.51707"
+         rx="3.5336394"
+         ry="3.5336394" />
+      <text
+         xml:space="preserve"
+         style="font-size:27.53050041px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
+         x="155.04395"
+         y="147.73848"
+         id="text3186"
+         sodipodi:linespacing="125%"><tspan
+           sodipodi:role="line"
+           id="tspan3188"
+           x="155.04395"
+           y="147.73848"
+           style="font-style:normal;font-variant:normal;font-weight:500;font-stretch:normal;font-family:Inconsolata;-inkscape-font-specification:Inconsolata Medium">CASHIER J.Smith</tspan></text>
+      <text
+         sodipodi:linespacing="125%"
+         id="text3190"
+         y="182.10147"
+         x="154.5717"
+         style="font-size:17.41555405px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
+         xml:space="preserve"><tspan
+           style="font-style:normal;font-variant:normal;font-weight:500;font-stretch:normal;font-family:Inconsolata;-inkscape-font-specification:Inconsolata Medium"
+           y="182.10147"
+           x="154.5717"
+           id="tspan3192"
+           sodipodi:role="line">Prefix: 40</tspan></text>
+      <text
+         xml:space="preserve"
+         style="font-size:17.41555405px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
+         x="154.5717"
+         y="200.85837"
+         id="text3194"
+         sodipodi:linespacing="125%"><tspan
+           sodipodi:role="line"
+           id="tspan3196"
+           x="154.5717"
+           y="200.85837"
+           style="font-style:normal;font-variant:normal;font-weight:500;font-stretch:normal;font-family:Inconsolata;-inkscape-font-specification:Inconsolata Medium">ID: 4447190000</tspan></text>
+    </g>
+    <g
+       id="g3198"
+       transform="matrix(0.54655779,0,0,0.54655779,40.964737,253.96929)">
+      <image
+         width="163.36363"
+         height="107.96206"
+         xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAOYAAACYCAIAAAB/IAJdAAAAA3NCSVQICAjb4U/gAAADqUlEQVR4 nO3a226jMABFUYjy/7/MPCChDBfHARM4zVpP1dQY4u66JEw/DEO3S9/3XdeNh79+vRwz2hr5OmZr 5JH5t0YuX0X51W0dW3PNNa9xOWf5au8wsrxu9Ud95HHkYPg+yRJGsoSRLGEkSxjJEkayhJEsYSRL GMkSRrKEkSxhJEsYyRJGsoSRLGEkSxjJEkayhJEsYSRLGMkSRrKEkSxhJEsYyRJGsoSRLGEkSxjJ EkayhJEsYSRLGMkSRrKEkSxhJEsYyRJGsoSRLGEkSxjJEkayhJEsYSRLGMkSRrKEkSxhJEsYyRJG soSRLGEkSxjJEkayhJEsYSRLGMkSRrKEkSxhJEsYyRJGsoSRLGEkSxjJEkayhJEsYSRLGMkSRrKE kSxhJEsYyRJGsoSRLGEkSxjJEkayhJEsYSRLGMkSRrKEkSxhJEsYyRJGsoSRLGEkSxjJEkayhJEs YSRLGMkSRrKEkSxhJEsYyRJGsoSRLGEkSxjJEkayhJEsYSRLGMkSRrKEkSxhJEsYyRJGsoSRLGEk SxjJEkayhJEsYSRLGMkSRrKEkSxhJEsYyRJGsoSRLGEkSxjJEkayhJEsYSRLGMkSRrKEkSxh+mEY dh7Z913XjYe/fv3LrMlS8zWxyxJGsjuNGwbf91z911Z/1GY/18oJ689+cOTb7LZmPtJr/ZrcfOTu 1SucseaQlV221f6xnKdm5vqznzHy1Nn6vq9fk5SRrYzzry7RzHyXbd7r9HszXVP9b3bN/EdGlq/k 0y250uu0W2tSv3oXjvxo9d4ahmE6b/mP58ou2/BNbuUr3Hf2M0aOzthRVn8M5QurX71rR87sXr1h GGa/z6tT/Zds2y12+TpfP+nYOqp+/rYjZ4esXvzk0zkLlmtSv3rXjlx1/F3QMtzZgMfse1d9jvi1 t1zND2HScPUK2+2j+cl2uEmvl/Bh2Zat+4TH64gLruvzs599C3vSOqz+Yf1LvZ60estwn93ehdt9 ez5zk1vYJmrW5C9lWqNVJ5OnW4IjR31kudFWvqe5v/NWb/lE47n6jbOvo3xZhbOfMfLL7n97fRNb j9/WH9j+mgtTtsUW5hzNN6PVMx2/iMLO93ba798tfPp6d398tjyqfqFu+I9vv7XD1uY6Ofd/ci0/ o/5ZhR/2lvrVu3ZkK7PPX7ee2px1YzA9Mn77S/Nrlj/+1UdNlat37ciGCncCMyfuslsP/e7mazey y22j8Pi3fvWuHdlq9cYZap6H/wMqFm5yx9XfMwAAAABJRU5ErkJggg== "
+         id="image3200"
+         x="388.17426"
+         y="124.14642" />
+      <rect
+         ry="3.5336394"
+         rx="3.5336394"
+         y="114.51707"
+         x="141.08452"
+         height="126.4052"
+         width="417.54495"
+         id="rect3202"
+         style="fill:none;stroke:#c3c3c3;stroke-width:1.82963264;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+      <text
+         sodipodi:linespacing="125%"
+         id="text3204"
+         y="147.73848"
+         x="153.98886"
+         style="font-size:27.53050041px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
+         xml:space="preserve"><tspan
+           style="font-style:normal;font-variant:normal;font-weight:500;font-stretch:normal;font-family:Inconsolata;-inkscape-font-specification:Inconsolata Medium"
+           y="147.73848"
+           x="153.98886"
+           id="tspan3206"
+           sodipodi:role="line">CASHIER J.Doe</tspan></text>
+      <text
+         xml:space="preserve"
+         style="font-size:17.41555405px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
+         x="154.5717"
+         y="182.10147"
+         id="text3208"
+         sodipodi:linespacing="125%"><tspan
+           sodipodi:role="line"
+           id="tspan3210"
+           x="154.5717"
+           y="182.10147"
+           style="font-style:normal;font-variant:normal;font-weight:500;font-stretch:normal;font-family:Inconsolata;-inkscape-font-specification:Inconsolata Medium">Prefix: 40</tspan></text>
+      <text
+         sodipodi:linespacing="125%"
+         id="text3212"
+         y="200.85837"
+         x="154.5717"
+         style="font-size:17.41555405px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
+         xml:space="preserve"><tspan
+           style="font-style:normal;font-variant:normal;font-weight:500;font-stretch:normal;font-family:Inconsolata;-inkscape-font-specification:Inconsolata Medium"
+           y="200.85837"
+           x="154.5717"
+           id="tspan3214"
+           sodipodi:role="line">ID: 4447190000</tspan></text>
+    </g>
+    <g
+       transform="matrix(0.54655779,0,0,0.54655779,306.11765,-249.11351)"
+       id="g3216">
+      <g
+         id="g3218"
+         transform="translate(0,284.6156)">
+        <g
+           id="g3220"
+           transform="translate(0,154.94832)">
+          <rect
+             ry="3.5336394"
+             rx="3.5336394"
+             y="438.27753"
+             x="141.08452"
+             height="126.4052"
+             width="417.54495"
+             id="rect3222"
+             style="fill:none;stroke:#c3c3c3;stroke-width:1.82963264;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+          <text
+             sodipodi:linespacing="125%"
+             id="text3224"
+             y="471.49893"
+             x="272.54657"
+             style="font-size:27.53050041px;font-style:normal;font-weight:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
+             xml:space="preserve"><tspan
+               style="font-style:normal;font-variant:normal;font-weight:500;font-stretch:normal;text-align:center;text-anchor:middle;font-family:Inconsolata;-inkscape-font-specification:Inconsolata Medium"
+               y="471.49893"
+               x="272.54657"
+               sodipodi:role="line"
+               id="tspan3226">COCA COLA 1.5L</tspan></text>
+          <g
+             transform="translate(0,156.57936)"
+             id="g3228" />
+        </g>
+      </g>
+      <image
+         y="887.47076"
+         x="386.54324"
+         id="image3230"
+         xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAOYAAACYCAIAAAB/IAJdAAAAA3NCSVQICAjb4U/gAAADz0lEQVR4 nO3Z0ZKaMACGUdnx/V+ZXjBjGWKyEQjyt+fcdIsBY/ZTgZ3meX7sMk3T4/FYdq/9XI5frB9db18/ Wh6nfJZyr/Yz9s+t/Yp65tw/22+N3Pe6asevhdQ/stPPkZ3hepIljGQJI1nCSJYwkiWMZAkjWcJI ljCSJYxkCSNZwkiWMJIljGQJI1nCSJYwkiWMZAkjWcJIljCSJYxkCSNZwkiWMJIljGQJI1nCSJYw kiWMZAkjWcJIljCSJYxkCSNZwkiWMJIljGQJI1nCSJYwkiWMZAkjWcJIljCSJYxkCSNZwkiWMJIl jGQJI1nCSJYwkiWMZAkjWcJIljCSJYxkCSNZwkiWMJIljGQJI1nCSJYwkiWMZAkjWcJIljCSJYxk CSNZwkiWMJIljGQJI1nCSJYwkiWMZAkjWcJIljCSJYxkCSNZwkiWMJIljGQJI1nCSJYwkiWMZAkj WcJIljCSJYxkCSNZwkiWMJIljGQJI1nCSJYwkiWMZAkjWcJIljCSJYxkCSNZwkiWMJIljGQJI1nC SJYwkiWMZAkjWcJIljCSJYxkCSNZwkiWMJIljGQJI1nCSJYwkiWMZAkjWcJIljCSJYxkCSNZwkzz PO/cc5oej8ey+/rn/5k1KZ2+Jj5lCSNZwjyXf5ZP7NKJ32v9XwrtkZupNg743ZH3nNWgV3p8WZaD 9Oz4Uz7fCP1P0Rg5TVP5aG38d0fWfHFW/av36TofX5bXLm+PtvF8/TTuQuGUXl/W83y9zs3kX8d5 bb9yZM0dZtWzev0jy2f/9bA18zy/jtb+mr3oXLZ/9u3zgc2j7cOuH71+5K1m1b96B9d5+e+isUvt OJv0336EDU/23I/Y0vruyfo45ZJdM7LmnrM6MnLQXbwy3M2AZ+2xU6Zy1iUXN7eO55RfYuM84Vnb 53hD1/R6wbXjP+z4d2Dt2ut4uJvP9ddhf9Zn0LvPQtrPesrIt19heu3Uv3r71nlEPOsjr2fyrF0t /nrd1z7lH3cKe+dMj1+cjTbi91Jefi1XTsv209ekevl1w1OC8k084m39r+pfvY/WefT6b+4bzPNc PZc95clqGzevs3/k2y30O/FUbbTa/YCByV7jzucJ9zf6FuRujVsQb/56sdnnrHfbwbOF2nwag7+1 ccfrGr2xf/XOWudye6dfb7b+vB13eq/HvZ1J+61f3ve+cuStZtW/emet845yytPW95NZ37PdOLfX 49dkH83zst/cR6v0xVn1r96gdW7r/2PE33tYI/76Vc7p+G2ED15b9ysaMfKes9q3emetc1vjjura Hwkp3Xa7HcbMAAAAAElFTkSuQmCC "
+         height="108.34499"
+         width="163.94308" />
+      <g
+         id="g3232"
+         transform="translate(0,598.58983)">
+        <text
+           xml:space="preserve"
+           style="font-size:17.41555405px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
+           x="154.5717"
+           y="351.81107"
+           id="text3235"
+           sodipodi:linespacing="125%"><tspan
+             sodipodi:role="line"
+             id="tspan3237"
+             x="154.5717"
+             y="351.81107"
+             style="font-style:normal;font-variant:normal;font-weight:500;font-stretch:normal;font-family:Inconsolata;-inkscape-font-specification:Inconsolata Medium">ID: 5449000000996</tspan></text>
+      </g>
+    </g>
+    <g
+       id="g3239"
+       transform="matrix(0.54655779,0,0,0.54655779,306.11765,-162.997)">
+      <g
+         transform="translate(0,284.6156)"
+         id="g3241">
+        <g
+           transform="translate(0,154.94832)"
+           id="g3243">
+          <rect
+             style="fill:none;stroke:#c3c3c3;stroke-width:1.82963264;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+             id="rect3245"
+             width="417.54495"
+             height="126.4052"
+             x="141.08452"
+             y="438.27753"
+             rx="3.5336394"
+             ry="3.5336394" />
+          <text
+             xml:space="preserve"
+             style="font-size:27.53050041px;font-style:normal;font-weight:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
+             x="272.54657"
+             y="471.49893"
+             id="text3247"
+             sodipodi:linespacing="125%"><tspan
+               id="tspan3249"
+               sodipodi:role="line"
+               x="272.54657"
+               y="471.49893"
+               style="font-style:normal;font-variant:normal;font-weight:500;font-stretch:normal;text-align:center;text-anchor:middle;font-family:Inconsolata;-inkscape-font-specification:Inconsolata Medium">CHIMAY BLEUE 33CL</tspan></text>
+          <g
+             id="g3251"
+             transform="translate(0,156.57936)" />
+        </g>
+      </g>
+      <image
+         width="163.94308"
+         height="108.34499"
+         xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAOYAAACYCAIAAAB/IAJdAAAAA3NCSVQICAjb4U/gAAADz0lEQVR4 nO3Z0ZKaMACGUdnx/V+ZXjBjGWKyEQjyt+fcdIsBY/ZTgZ3meX7sMk3T4/FYdq/9XI5frB9db18/ Wh6nfJZyr/Yz9s+t/Yp65tw/22+N3Pe6asevhdQ/stPPkZ3hepIljGQJI1nCSJYwkiWMZAkjWcJI ljCSJYxkCSNZwkiWMJIljGQJI1nCSJYwkiWMZAkjWcJIljCSJYxkCSNZwkiWMJIljGQJI1nCSJYw kiWMZAkjWcJIljCSJYxkCSNZwkiWMJIljGQJI1nCSJYwkiWMZAkjWcJIljCSJYxkCSNZwkiWMJIl jGQJI1nCSJYwkiWMZAkjWcJIljCSJYxkCSNZwkiWMJIljGQJI1nCSJYwkiWMZAkjWcJIljCSJYxk CSNZwkiWMJIljGQJI1nCSJYwkiWMZAkjWcJIljCSJYxkCSNZwkiWMJIljGQJI1nCSJYwkiWMZAkj WcJIljCSJYxkCSNZwkiWMJIljGQJI1nCSJYwkiWMZAkjWcJIljCSJYxkCSNZwkiWMJIljGQJI1nC SJYwkiWMZAkjWcJIljCSJYxkCSNZwkiWMJIljGQJI1nCSJYwkiWMZAkjWcJIljCSJYxkCSNZwkzz PO/cc5oej8ey+/rn/5k1KZ2+Jj5lCSNZwjyXf5ZP7NKJ32v9XwrtkZupNg743ZH3nNWgV3p8WZaD 9Oz4Uz7fCP1P0Rg5TVP5aG38d0fWfHFW/av36TofX5bXLm+PtvF8/TTuQuGUXl/W83y9zs3kX8d5 bb9yZM0dZtWzev0jy2f/9bA18zy/jtb+mr3oXLZ/9u3zgc2j7cOuH71+5K1m1b96B9d5+e+isUvt OJv0336EDU/23I/Y0vruyfo45ZJdM7LmnrM6MnLQXbwy3M2AZ+2xU6Zy1iUXN7eO55RfYuM84Vnb 53hD1/R6wbXjP+z4d2Dt2ut4uJvP9ddhf9Zn0LvPQtrPesrIt19heu3Uv3r71nlEPOsjr2fyrF0t /nrd1z7lH3cKe+dMj1+cjTbi91Jefi1XTsv209ekevl1w1OC8k084m39r+pfvY/WefT6b+4bzPNc PZc95clqGzevs3/k2y30O/FUbbTa/YCByV7jzucJ9zf6FuRujVsQb/56sdnnrHfbwbOF2nwag7+1 ccfrGr2xf/XOWudye6dfb7b+vB13eq/HvZ1J+61f3ve+cuStZtW/emet845yytPW95NZ37PdOLfX 49dkH83zst/cR6v0xVn1r96gdW7r/2PE33tYI/76Vc7p+G2ED15b9ysaMfKes9q3emetc1vjjura Hwkp3Xa7HcbMAAAAAElFTkSuQmCC "
+         id="image3253"
+         x="386.54324"
+         y="887.47076" />
+      <g
+         transform="translate(0,598.58983)"
+         id="g3256">
+        <text
+           sodipodi:linespacing="125%"
+           id="text3258"
+           y="351.81107"
+           x="154.5717"
+           style="font-size:17.41555405px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
+           xml:space="preserve"><tspan
+             style="font-style:normal;font-variant:normal;font-weight:500;font-stretch:normal;font-family:Inconsolata;-inkscape-font-specification:Inconsolata Medium"
+             y="351.81107"
+             x="154.5717"
+             id="tspan3260"
+             sodipodi:role="line">ID: 5449000000996</tspan></text>
+      </g>
+    </g>
+    <g
+       transform="matrix(0.54655779,0,0,0.54655779,306.11765,-76.880434)"
+       id="g3262">
+      <g
+         id="g3264"
+         transform="translate(0,284.6156)">
+        <g
+           id="g3266"
+           transform="translate(0,154.94832)">
+          <rect
+             ry="3.5336394"
+             rx="3.5336394"
+             y="438.27753"
+             x="141.08452"
+             height="126.4052"
+             width="417.54495"
+             id="rect3268"
+             style="fill:none;stroke:#c3c3c3;stroke-width:1.82963264;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+          <text
+             sodipodi:linespacing="125%"
+             id="text3270"
+             y="471.49893"
+             x="272.54657"
+             style="font-size:27.53050041px;font-style:normal;font-weight:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
+             xml:space="preserve"><tspan
+               style="font-style:normal;font-variant:normal;font-weight:500;font-stretch:normal;text-align:center;text-anchor:middle;font-family:Inconsolata;-inkscape-font-specification:Inconsolata Medium"
+               y="471.49893"
+               x="272.54657"
+               sodipodi:role="line"
+               id="tspan3272">PIZZA HAWAII</tspan></text>
+          <g
+             transform="translate(0,156.57936)"
+             id="g3274" />
+        </g>
+      </g>
+      <image
+         y="887.47076"
+         x="386.54324"
+         id="image3276"
+         xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAOYAAACYCAIAAAB/IAJdAAAAA3NCSVQICAjb4U/gAAADz0lEQVR4 nO3Z0ZKaMACGUdnx/V+ZXjBjGWKyEQjyt+fcdIsBY/ZTgZ3meX7sMk3T4/FYdq/9XI5frB9db18/ Wh6nfJZyr/Yz9s+t/Yp65tw/22+N3Pe6asevhdQ/stPPkZ3hepIljGQJI1nCSJYwkiWMZAkjWcJI ljCSJYxkCSNZwkiWMJIljGQJI1nCSJYwkiWMZAkjWcJIljCSJYxkCSNZwkiWMJIljGQJI1nCSJYw kiWMZAkjWcJIljCSJYxkCSNZwkiWMJIljGQJI1nCSJYwkiWMZAkjWcJIljCSJYxkCSNZwkiWMJIl jGQJI1nCSJYwkiWMZAkjWcJIljCSJYxkCSNZwkiWMJIljGQJI1nCSJYwkiWMZAkjWcJIljCSJYxk CSNZwkiWMJIljGQJI1nCSJYwkiWMZAkjWcJIljCSJYxkCSNZwkiWMJIljGQJI1nCSJYwkiWMZAkj WcJIljCSJYxkCSNZwkiWMJIljGQJI1nCSJYwkiWMZAkjWcJIljCSJYxkCSNZwkiWMJIljGQJI1nC SJYwkiWMZAkjWcJIljCSJYxkCSNZwkiWMJIljGQJI1nCSJYwkiWMZAkjWcJIljCSJYxkCSNZwkzz PO/cc5oej8ey+/rn/5k1KZ2+Jj5lCSNZwjyXf5ZP7NKJ32v9XwrtkZupNg743ZH3nNWgV3p8WZaD 9Oz4Uz7fCP1P0Rg5TVP5aG38d0fWfHFW/av36TofX5bXLm+PtvF8/TTuQuGUXl/W83y9zs3kX8d5 bb9yZM0dZtWzev0jy2f/9bA18zy/jtb+mr3oXLZ/9u3zgc2j7cOuH71+5K1m1b96B9d5+e+isUvt OJv0336EDU/23I/Y0vruyfo45ZJdM7LmnrM6MnLQXbwy3M2AZ+2xU6Zy1iUXN7eO55RfYuM84Vnb 53hD1/R6wbXjP+z4d2Dt2ut4uJvP9ddhf9Zn0LvPQtrPesrIt19heu3Uv3r71nlEPOsjr2fyrF0t /nrd1z7lH3cKe+dMj1+cjTbi91Jefi1XTsv209ekevl1w1OC8k084m39r+pfvY/WefT6b+4bzPNc PZc95clqGzevs3/k2y30O/FUbbTa/YCByV7jzucJ9zf6FuRujVsQb/56sdnnrHfbwbOF2nwag7+1 ccfrGr2xf/XOWudye6dfb7b+vB13eq/HvZ1J+61f3ve+cuStZtW/emet845yytPW95NZ37PdOLfX 49dkH83zst/cR6v0xVn1r96gdW7r/2PE33tYI/76Vc7p+G2ED15b9ysaMfKes9q3emetc1vjjura Hwkp3Xa7HcbMAAAAAElFTkSuQmCC "
+         height="108.34499"
+         width="163.94308" />
+      <g
+         id="g3278"
+         transform="translate(0,598.58983)">
+        <text
+           xml:space="preserve"
+           style="font-size:17.41555405px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
+           x="154.5717"
+           y="351.81107"
+           id="text3280"
+           sodipodi:linespacing="125%"><tspan
+             sodipodi:role="line"
+             id="tspan3282"
+             x="154.5717"
+             y="351.81107"
+             style="font-style:normal;font-variant:normal;font-weight:500;font-stretch:normal;font-family:Inconsolata;-inkscape-font-specification:Inconsolata Medium">ID: 5449000000996</tspan></text>
+      </g>
+    </g>
+    <g
+       id="g3284"
+       transform="matrix(0.54655779,0,0,0.54655779,306.11765,9.2360758)">
+      <g
+         transform="translate(0,284.6156)"
+         id="g3286">
+        <g
+           transform="translate(0,154.94832)"
+           id="g3288">
+          <rect
+             style="fill:none;stroke:#c3c3c3;stroke-width:1.82963264;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+             id="rect3290"
+             width="417.54495"
+             height="126.4052"
+             x="141.08452"
+             y="438.27753"
+             rx="3.5336394"
+             ry="3.5336394" />
+          <text
+             xml:space="preserve"
+             style="font-size:27.53050041px;font-style:normal;font-weight:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
+             x="272.54657"
+             y="471.49893"
+             id="text3292"
+             sodipodi:linespacing="125%"><tspan
+               id="tspan3294"
+               sodipodi:role="line"
+               x="272.54657"
+               y="471.49893"
+               style="font-style:normal;font-variant:normal;font-weight:500;font-stretch:normal;text-align:center;text-anchor:middle;font-family:Inconsolata;-inkscape-font-specification:Inconsolata Medium">CROKY PAPRIKA</tspan></text>
+          <g
+             id="g3296"
+             transform="translate(0,156.57936)" />
+        </g>
+      </g>
+      <image
+         width="163.94308"
+         height="108.34499"
+         xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAOYAAACYCAIAAAB/IAJdAAAAA3NCSVQICAjb4U/gAAADz0lEQVR4 nO3Z0ZKaMACGUdnx/V+ZXjBjGWKyEQjyt+fcdIsBY/ZTgZ3meX7sMk3T4/FYdq/9XI5frB9db18/ Wh6nfJZyr/Yz9s+t/Yp65tw/22+N3Pe6asevhdQ/stPPkZ3hepIljGQJI1nCSJYwkiWMZAkjWcJI ljCSJYxkCSNZwkiWMJIljGQJI1nCSJYwkiWMZAkjWcJIljCSJYxkCSNZwkiWMJIljGQJI1nCSJYw kiWMZAkjWcJIljCSJYxkCSNZwkiWMJIljGQJI1nCSJYwkiWMZAkjWcJIljCSJYxkCSNZwkiWMJIl jGQJI1nCSJYwkiWMZAkjWcJIljCSJYxkCSNZwkiWMJIljGQJI1nCSJYwkiWMZAkjWcJIljCSJYxk CSNZwkiWMJIljGQJI1nCSJYwkiWMZAkjWcJIljCSJYxkCSNZwkiWMJIljGQJI1nCSJYwkiWMZAkj WcJIljCSJYxkCSNZwkiWMJIljGQJI1nCSJYwkiWMZAkjWcJIljCSJYxkCSNZwkiWMJIljGQJI1nC SJYwkiWMZAkjWcJIljCSJYxkCSNZwkiWMJIljGQJI1nCSJYwkiWMZAkjWcJIljCSJYxkCSNZwkzz PO/cc5oej8ey+/rn/5k1KZ2+Jj5lCSNZwjyXf5ZP7NKJ32v9XwrtkZupNg743ZH3nNWgV3p8WZaD 9Oz4Uz7fCP1P0Rg5TVP5aG38d0fWfHFW/av36TofX5bXLm+PtvF8/TTuQuGUXl/W83y9zs3kX8d5 bb9yZM0dZtWzev0jy2f/9bA18zy/jtb+mr3oXLZ/9u3zgc2j7cOuH71+5K1m1b96B9d5+e+isUvt OJv0336EDU/23I/Y0vruyfo45ZJdM7LmnrM6MnLQXbwy3M2AZ+2xU6Zy1iUXN7eO55RfYuM84Vnb 53hD1/R6wbXjP+z4d2Dt2ut4uJvP9ddhf9Zn0LvPQtrPesrIt19heu3Uv3r71nlEPOsjr2fyrF0t /nrd1z7lH3cKe+dMj1+cjTbi91Jefi1XTsv209ekevl1w1OC8k084m39r+pfvY/WefT6b+4bzPNc PZc95clqGzevs3/k2y30O/FUbbTa/YCByV7jzucJ9zf6FuRujVsQb/56sdnnrHfbwbOF2nwag7+1 ccfrGr2xf/XOWudye6dfb7b+vB13eq/HvZ1J+61f3ve+cuStZtW/emet845yytPW95NZ37PdOLfX 49dkH83zst/cR6v0xVn1r96gdW7r/2PE33tYI/76Vc7p+G2ED15b9ysaMfKes9q3emetc1vjjura Hwkp3Xa7HcbMAAAAAElFTkSuQmCC "
+         id="image3298"
+         x="386.54324"
+         y="887.47076" />
+      <g
+         transform="translate(0,598.58983)"
+         id="g3300">
+        <text
+           sodipodi:linespacing="125%"
+           id="text3302"
+           y="351.81107"
+           x="154.5717"
+           style="font-size:17.41555405px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
+           xml:space="preserve"><tspan
+             style="font-style:normal;font-variant:normal;font-weight:500;font-stretch:normal;font-family:Inconsolata;-inkscape-font-specification:Inconsolata Medium"
+             y="351.81107"
+             x="154.5717"
+             id="tspan3304"
+             sodipodi:role="line">ID: 5449000000996</tspan></text>
+      </g>
+    </g>
+    <g
+       transform="matrix(0.54655779,0,0,0.54655779,306.11765,95.352583)"
+       id="g3306">
+      <g
+         id="g3308"
+         transform="translate(0,284.6156)">
+        <g
+           id="g3310"
+           transform="translate(0,154.94832)">
+          <rect
+             ry="3.5336394"
+             rx="3.5336394"
+             y="438.27753"
+             x="141.08452"
+             height="126.4052"
+             width="417.54495"
+             id="rect3312"
+             style="fill:none;stroke:#c3c3c3;stroke-width:1.82963264;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+          <text
+             sodipodi:linespacing="125%"
+             id="text3314"
+             y="471.49893"
+             x="272.54657"
+             style="font-size:27.53050041px;font-style:normal;font-weight:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
+             xml:space="preserve"><tspan
+               style="font-style:normal;font-variant:normal;font-weight:500;font-stretch:normal;text-align:center;text-anchor:middle;font-family:Inconsolata;-inkscape-font-specification:Inconsolata Medium"
+               y="471.49893"
+               x="272.54657"
+               sodipodi:role="line"
+               id="tspan3316">MOKA ICE CREAM</tspan></text>
+          <g
+             transform="translate(0,156.57936)"
+             id="g3318" />
+        </g>
+      </g>
+      <image
+         y="887.47076"
+         x="386.54324"
+         id="image3320"
+         xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAOYAAACYCAIAAAB/IAJdAAAAA3NCSVQICAjb4U/gAAADz0lEQVR4 nO3Z0ZKaMACGUdnx/V+ZXjBjGWKyEQjyt+fcdIsBY/ZTgZ3meX7sMk3T4/FYdq/9XI5frB9db18/ Wh6nfJZyr/Yz9s+t/Yp65tw/22+N3Pe6asevhdQ/stPPkZ3hepIljGQJI1nCSJYwkiWMZAkjWcJI ljCSJYxkCSNZwkiWMJIljGQJI1nCSJYwkiWMZAkjWcJIljCSJYxkCSNZwkiWMJIljGQJI1nCSJYw kiWMZAkjWcJIljCSJYxkCSNZwkiWMJIljGQJI1nCSJYwkiWMZAkjWcJIljCSJYxkCSNZwkiWMJIl jGQJI1nCSJYwkiWMZAkjWcJIljCSJYxkCSNZwkiWMJIljGQJI1nCSJYwkiWMZAkjWcJIljCSJYxk CSNZwkiWMJIljGQJI1nCSJYwkiWMZAkjWcJIljCSJYxkCSNZwkiWMJIljGQJI1nCSJYwkiWMZAkj WcJIljCSJYxkCSNZwkiWMJIljGQJI1nCSJYwkiWMZAkjWcJIljCSJYxkCSNZwkiWMJIljGQJI1nC SJYwkiWMZAkjWcJIljCSJYxkCSNZwkiWMJIljGQJI1nCSJYwkiWMZAkjWcJIljCSJYxkCSNZwkzz PO/cc5oej8ey+/rn/5k1KZ2+Jj5lCSNZwjyXf5ZP7NKJ32v9XwrtkZupNg743ZH3nNWgV3p8WZaD 9Oz4Uz7fCP1P0Rg5TVP5aG38d0fWfHFW/av36TofX5bXLm+PtvF8/TTuQuGUXl/W83y9zs3kX8d5 bb9yZM0dZtWzev0jy2f/9bA18zy/jtb+mr3oXLZ/9u3zgc2j7cOuH71+5K1m1b96B9d5+e+isUvt OJv0336EDU/23I/Y0vruyfo45ZJdM7LmnrM6MnLQXbwy3M2AZ+2xU6Zy1iUXN7eO55RfYuM84Vnb 53hD1/R6wbXjP+z4d2Dt2ut4uJvP9ddhf9Zn0LvPQtrPesrIt19heu3Uv3r71nlEPOsjr2fyrF0t /nrd1z7lH3cKe+dMj1+cjTbi91Jefi1XTsv209ekevl1w1OC8k084m39r+pfvY/WefT6b+4bzPNc PZc95clqGzevs3/k2y30O/FUbbTa/YCByV7jzucJ9zf6FuRujVsQb/56sdnnrHfbwbOF2nwag7+1 ccfrGr2xf/XOWudye6dfb7b+vB13eq/HvZ1J+61f3ve+cuStZtW/emet845yytPW95NZ37PdOLfX 49dkH83zst/cR6v0xVn1r96gdW7r/2PE33tYI/76Vc7p+G2ED15b9ysaMfKes9q3emetc1vjjura Hwkp3Xa7HcbMAAAAAElFTkSuQmCC "
+         height="108.34499"
+         width="163.94308" />
+      <g
+         id="g3323"
+         transform="translate(0,598.58983)">
+        <text
+           xml:space="preserve"
+           style="font-size:17.41555405px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
+           x="154.5717"
+           y="351.81107"
+           id="text3325"
+           sodipodi:linespacing="125%"><tspan
+             sodipodi:role="line"
+             id="tspan3327"
+             x="154.5717"
+             y="351.81107"
+             style="font-style:normal;font-variant:normal;font-weight:500;font-stretch:normal;font-family:Inconsolata;-inkscape-font-specification:Inconsolata Medium">ID: 5449000000996</tspan></text>
+      </g>
+    </g>
+    <g
+       id="g3329"
+       transform="matrix(0.54655779,0,0,0.54655779,40.964737,431.81867)">
+      <rect
+         ry="3.5336394"
+         rx="3.5336394"
+         y="419.52063"
+         x="141.08452"
+         height="126.4052"
+         width="417.54495"
+         id="rect3331"
+         style="fill:none;stroke:#c3c3c3;stroke-width:1.82963264;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+      <text
+         sodipodi:linespacing="125%"
+         id="text3333"
+         y="452.74203"
+         x="184.30057"
+         style="font-size:27.53050041px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
+         xml:space="preserve"><tspan
+           style="font-style:normal;font-variant:normal;font-weight:500;font-stretch:normal;font-family:Inconsolata;-inkscape-font-specification:Inconsolata Medium"
+           y="452.74203"
+           x="184.30057"
+           id="tspan3335"
+           sodipodi:role="line">ORANGES: 0.5Kg</tspan></text>
+      <image
+         y="429.14993"
+         x="387.35876"
+         id="image3337"
+         xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAOYAAACYCAIAAAB/IAJdAAAAA3NCSVQICAjb4U/gAAAERElEQVR4 nO3a0ZKaQBRFUbX8/182D1QZInRzadDxTNZ6mjgNNrhBYHJ9PB6XIdfr9XK5TIvPf57/drJ8/ayR rVdaG9Wfc+Vd+vPc+3N/hv3XK68st2i5Xa09XNnS+sjKthfdjiwMnydZwkiWMJIljGQJI1nCSJYw kiWMZAkjWcJIljCSJYxkCSNZwkiWMJIljGQJI1nCSJYwkiWMZAkjWcJIljCSJYxkCSNZwkiWMJIl jGQJI1nCSJYwkiWMZAkjWcJIljCSJYxkCSNZwkiWMJIljGQJI1nCSJYwkiWMZAkjWcJIljCSJYxk CSNZwkiWMJIljGQJI1nCSJYwkiWMZAkjWcJIljCSJYxkCSNZwkiWMJIljGQJI1nCSJYwkiWMZAkj WcJIljCSJYxkCSNZwkiWMJIljGQJI1nCSJYwkiWMZAkjWcJIljCSJYxkCSNZwkiWMJIljGQJI1nC SJYwkiWMZAkjWcJIljCSJYxkCSNZwkiWMJIljGQJI1nCSJYwkiWMZAkjWcJIljCSJYxkCSNZwkiW MJIljGQJI1nCSJYwkiWMZAkjWcJIljCSJYxkCSNZwkiWMJIljGQJI1nCSJYwkiWMZAkjWcJIljCS Jcz18XgMLnm9Xi6XafH5z/8z+2Tp9H3iLEuYDyU7HV7njuT/dH/+9NLKid9o5/Zan+fYFnW+vFrT 27uv+hPb3AnLt1su0prSO/beWeVcr6XL1Ns0dLnNqy+OzeOskfV5Dm9RZ8BZe2N1YgfXWXlx11u/ Y2TftFTlM7rP/zFv/B378eDIp+I8V89enUO5MpMjXz7P9S/nP59V/3zWOiX317k6/9aw5TqPj9z0 eDyea+vfpd1Wt/ny7y3eN6jP88jX9wdu8Jfzn2wuWD84W1cOm8Navz1rZN/LfmidcW/H36nz9pUP oz7yUs6uuLa5dx+cB5/vvOmRWeuAb52ex0bunVL/W/Se8uDw+Dw3r1MHTnVjs5qvpP6m9QuG7/lu HNa5Trg3F/oVKrfSR05ge5dt3awMH5DPj7b+0KA/n+/xcrZ+7qhmsm/6JjpdfZ6dMZuLd+5yBuxa ydgHsbxsnS4N407Gy3BXkm3d6KyuqzLyTSrzXH5Cex+Cdt5ifoabBlT2SSWmutZGtVb4+UxP7+Sf v34979EGbl8+aWye9RuIuoMnv039Ge66AVruqy//lCcvzw3+XhjsvSH4Ke+YZ+dR/DfvijFBW9S6 071fylcCP644z19T2wc25GsvZzvnpnvrF1/rxHl2rvZWL3lbTxuK77V6ifmZaPpH+8vlZmeeYyPH ptqa8C3lnPTjj5OW6xz7dlr9Q93YrFoP7Vfz6s+kOM+DI/uWl63r095c0VnP8A8+M9/cF8XHN8Xn WfUT6nCvm2uo7Lf6lu6af32eu7aoo36X8jv/i/fqAXrwBrm1zr0rKa6heJzXt3TXE4P6PI/vk/lS lc/oD6RX6TSeNJuDAAAAAElFTkSuQmCC "
+         height="107.14654"
+         width="162.12962" />
+      <g
+         id="g3339"
+         transform="translate(0,140.26901)">
+        <text
+           sodipodi:linespacing="125%"
+           id="text3341"
+           y="341.12738"
+           x="154.5717"
+           style="font-size:17.41555405px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
+           xml:space="preserve"><tspan
+             style="font-style:normal;font-variant:normal;font-weight:500;font-stretch:normal;font-family:Inconsolata;-inkscape-font-specification:Inconsolata Medium"
+             y="341.12738"
+             x="154.5717"
+             id="tspan3343"
+             sodipodi:role="line">Prefix: 21</tspan></text>
+        <text
+           xml:space="preserve"
+           style="font-size:17.41555405px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
+           x="154.5717"
+           y="359.88428"
+           id="text3345"
+           sodipodi:linespacing="125%"><tspan
+             sodipodi:role="line"
+             id="tspan3347"
+             x="154.5717"
+             y="359.88428"
+             style="font-style:normal;font-variant:normal;font-weight:500;font-stretch:normal;font-family:Inconsolata;-inkscape-font-specification:Inconsolata Medium">ID: 12345</tspan></text>
+        <text
+           sodipodi:linespacing="125%"
+           id="text3349"
+           y="379.4567"
+           x="154.5717"
+           style="font-size:17.41555405px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
+           xml:space="preserve"><tspan
+             style="font-style:normal;font-variant:normal;font-weight:500;font-stretch:normal;font-family:Inconsolata;-inkscape-font-specification:Inconsolata Medium"
+             y="379.4567"
+             x="154.5717"
+             id="tspan3351"
+             sodipodi:role="line">Value: 67.89Kg</tspan></text>
+      </g>
+    </g>
+    <g
+       transform="matrix(0.54655779,0,0,0.54655779,306.11765,431.96792)"
+       id="g3353">
+      <rect
+         style="fill:none;stroke:#c3c3c3;stroke-width:1.82963264;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         id="rect3355"
+         width="417.54495"
+         height="126.4052"
+         x="141.08452"
+         y="419.52063"
+         rx="3.5336394"
+         ry="3.5336394" />
+      <text
+         xml:space="preserve"
+         style="font-size:27.53050041px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
+         x="184.30057"
+         y="452.74203"
+         id="text3358"
+         sodipodi:linespacing="125%"><tspan
+           sodipodi:role="line"
+           id="tspan3360"
+           x="184.30057"
+           y="452.74203"
+           style="font-style:normal;font-variant:normal;font-weight:500;font-stretch:normal;font-family:Inconsolata;-inkscape-font-specification:Inconsolata Medium">PEACH: 0.89€</tspan></text>
+      <image
+         width="162.12962"
+         height="107.14654"
+         xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAOYAAACYCAIAAAB/IAJdAAAAA3NCSVQICAjb4U/gAAAERElEQVR4 nO3a0ZKaQBRFUbX8/182D1QZInRzadDxTNZ6mjgNNrhBYHJ9PB6XIdfr9XK5TIvPf57/drJ8/ayR rVdaG9Wfc+Vd+vPc+3N/hv3XK68st2i5Xa09XNnS+sjKthfdjiwMnydZwkiWMJIljGQJI1nCSJYw kiWMZAkjWcJIljCSJYxkCSNZwkiWMJIljGQJI1nCSJYwkiWMZAkjWcJIljCSJYxkCSNZwkiWMJIl jGQJI1nCSJYwkiWMZAkjWcJIljCSJYxkCSNZwkiWMJIljGQJI1nCSJYwkiWMZAkjWcJIljCSJYxk CSNZwkiWMJIljGQJI1nCSJYwkiWMZAkjWcJIljCSJYxkCSNZwkiWMJIljGQJI1nCSJYwkiWMZAkj WcJIljCSJYxkCSNZwkiWMJIljGQJI1nCSJYwkiWMZAkjWcJIljCSJYxkCSNZwkiWMJIljGQJI1nC SJYwkiWMZAkjWcJIljCSJYxkCSNZwkiWMJIljGQJI1nCSJYwkiWMZAkjWcJIljCSJYxkCSNZwkiW MJIljGQJI1nCSJYwkiWMZAkjWcJIljCSJYxkCSNZwkiWMJIljGQJI1nCSJYwkiWMZAkjWcJIljCS Jcz18XgMLnm9Xi6XafH5z/8z+2Tp9H3iLEuYDyU7HV7njuT/dH/+9NLKid9o5/Zan+fYFnW+vFrT 27uv+hPb3AnLt1su0prSO/beWeVcr6XL1Ns0dLnNqy+OzeOskfV5Dm9RZ8BZe2N1YgfXWXlx11u/ Y2TftFTlM7rP/zFv/B378eDIp+I8V89enUO5MpMjXz7P9S/nP59V/3zWOiX317k6/9aw5TqPj9z0 eDyea+vfpd1Wt/ny7y3eN6jP88jX9wdu8Jfzn2wuWD84W1cOm8Navz1rZN/LfmidcW/H36nz9pUP oz7yUs6uuLa5dx+cB5/vvOmRWeuAb52ex0bunVL/W/Se8uDw+Dw3r1MHTnVjs5qvpP6m9QuG7/lu HNa5Trg3F/oVKrfSR05ge5dt3awMH5DPj7b+0KA/n+/xcrZ+7qhmsm/6JjpdfZ6dMZuLd+5yBuxa ydgHsbxsnS4N407Gy3BXkm3d6KyuqzLyTSrzXH5Cex+Cdt5ifoabBlT2SSWmutZGtVb4+UxP7+Sf v34979EGbl8+aWye9RuIuoMnv039Ge66AVruqy//lCcvzw3+XhjsvSH4Ke+YZ+dR/DfvijFBW9S6 071fylcCP644z19T2wc25GsvZzvnpnvrF1/rxHl2rvZWL3lbTxuK77V6ifmZaPpH+8vlZmeeYyPH ptqa8C3lnPTjj5OW6xz7dlr9Q93YrFoP7Vfz6s+kOM+DI/uWl63r095c0VnP8A8+M9/cF8XHN8Xn WfUT6nCvm2uo7Lf6lu6af32eu7aoo36X8jv/i/fqAXrwBrm1zr0rKa6heJzXt3TXE4P6PI/vk/lS lc/oD6RX6TSeNJuDAAAAAElFTkSuQmCC "
+         id="image3362"
+         x="387.35876"
+         y="429.14993" />
+      <g
+         transform="translate(0,140.26901)"
+         id="g3364">
+        <text
+           xml:space="preserve"
+           style="font-size:17.41555405px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
+           x="154.5717"
+           y="341.12738"
+           id="text3366"
+           sodipodi:linespacing="125%"><tspan
+             sodipodi:role="line"
+             id="tspan3368"
+             x="154.5717"
+             y="341.12738"
+             style="font-style:normal;font-variant:normal;font-weight:500;font-stretch:normal;font-family:Inconsolata;-inkscape-font-specification:Inconsolata Medium">Prefix: 21</tspan></text>
+        <text
+           sodipodi:linespacing="125%"
+           id="text3370"
+           y="359.88428"
+           x="154.5717"
+           style="font-size:17.41555405px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
+           xml:space="preserve"><tspan
+             style="font-style:normal;font-variant:normal;font-weight:500;font-stretch:normal;font-family:Inconsolata;-inkscape-font-specification:Inconsolata Medium"
+             y="359.88428"
+             x="154.5717"
+             id="tspan3372"
+             sodipodi:role="line">ID: 12345</tspan></text>
+        <text
+           xml:space="preserve"
+           style="font-size:17.41555405px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
+           x="154.5717"
+           y="379.4567"
+           id="text3374"
+           sodipodi:linespacing="125%"><tspan
+             sodipodi:role="line"
+             id="tspan3376"
+             x="154.5717"
+             y="379.4567"
+             style="font-style:normal;font-variant:normal;font-weight:500;font-stretch:normal;font-family:Inconsolata;-inkscape-font-specification:Inconsolata Medium">Value: 67.89Kg</tspan></text>
+      </g>
+    </g>
+    <g
+       id="g3378"
+       transform="matrix(0.54655779,0,0,0.54655779,306.11765,518.08445)">
+      <rect
+         ry="3.5336394"
+         rx="3.5336394"
+         y="419.52063"
+         x="141.08452"
+         height="126.4052"
+         width="417.54495"
+         id="rect3380"
+         style="fill:none;stroke:#c3c3c3;stroke-width:1.82963264;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+      <text
+         sodipodi:linespacing="125%"
+         id="text3382"
+         y="452.74203"
+         x="184.30057"
+         style="font-size:27.53050041px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
+         xml:space="preserve"><tspan
+           style="font-style:normal;font-variant:normal;font-weight:500;font-stretch:normal;font-family:Inconsolata;-inkscape-font-specification:Inconsolata Medium"
+           y="452.74203"
+           x="184.30057"
+           id="tspan3384"
+           sodipodi:role="line">PEACH: 1.56€</tspan></text>
+      <image
+         y="429.14993"
+         x="387.35876"
+         id="image3386"
+         xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAOYAAACYCAIAAAB/IAJdAAAAA3NCSVQICAjb4U/gAAAERElEQVR4 nO3a0ZKaQBRFUbX8/182D1QZInRzadDxTNZ6mjgNNrhBYHJ9PB6XIdfr9XK5TIvPf57/drJ8/ayR rVdaG9Wfc+Vd+vPc+3N/hv3XK68st2i5Xa09XNnS+sjKthfdjiwMnydZwkiWMJIljGQJI1nCSJYw kiWMZAkjWcJIljCSJYxkCSNZwkiWMJIljGQJI1nCSJYwkiWMZAkjWcJIljCSJYxkCSNZwkiWMJIl jGQJI1nCSJYwkiWMZAkjWcJIljCSJYxkCSNZwkiWMJIljGQJI1nCSJYwkiWMZAkjWcJIljCSJYxk CSNZwkiWMJIljGQJI1nCSJYwkiWMZAkjWcJIljCSJYxkCSNZwkiWMJIljGQJI1nCSJYwkiWMZAkj WcJIljCSJYxkCSNZwkiWMJIljGQJI1nCSJYwkiWMZAkjWcJIljCSJYxkCSNZwkiWMJIljGQJI1nC SJYwkiWMZAkjWcJIljCSJYxkCSNZwkiWMJIljGQJI1nCSJYwkiWMZAkjWcJIljCSJYxkCSNZwkiW MJIljGQJI1nCSJYwkiWMZAkjWcJIljCSJYxkCSNZwkiWMJIljGQJI1nCSJYwkiWMZAkjWcJIljCS Jcz18XgMLnm9Xi6XafH5z/8z+2Tp9H3iLEuYDyU7HV7njuT/dH/+9NLKid9o5/Zan+fYFnW+vFrT 27uv+hPb3AnLt1su0prSO/beWeVcr6XL1Ns0dLnNqy+OzeOskfV5Dm9RZ8BZe2N1YgfXWXlx11u/ Y2TftFTlM7rP/zFv/B378eDIp+I8V89enUO5MpMjXz7P9S/nP59V/3zWOiX317k6/9aw5TqPj9z0 eDyea+vfpd1Wt/ny7y3eN6jP88jX9wdu8Jfzn2wuWD84W1cOm8Navz1rZN/LfmidcW/H36nz9pUP oz7yUs6uuLa5dx+cB5/vvOmRWeuAb52ex0bunVL/W/Se8uDw+Dw3r1MHTnVjs5qvpP6m9QuG7/lu HNa5Trg3F/oVKrfSR05ge5dt3awMH5DPj7b+0KA/n+/xcrZ+7qhmsm/6JjpdfZ6dMZuLd+5yBuxa ydgHsbxsnS4N407Gy3BXkm3d6KyuqzLyTSrzXH5Cex+Cdt5ifoabBlT2SSWmutZGtVb4+UxP7+Sf v34979EGbl8+aWye9RuIuoMnv039Ge66AVruqy//lCcvzw3+XhjsvSH4Ke+YZ+dR/DfvijFBW9S6 071fylcCP644z19T2wc25GsvZzvnpnvrF1/rxHl2rvZWL3lbTxuK77V6ifmZaPpH+8vlZmeeYyPH ptqa8C3lnPTjj5OW6xz7dlr9Q93YrFoP7Vfz6s+kOM+DI/uWl63r095c0VnP8A8+M9/cF8XHN8Xn WfUT6nCvm2uo7Lf6lu6af32eu7aoo36X8jv/i/fqAXrwBrm1zr0rKa6heJzXt3TXE4P6PI/vk/lS lc/oD6RX6TSeNJuDAAAAAElFTkSuQmCC "
+         height="107.14654"
+         width="162.12962" />
+      <g
+         id="g3388"
+         transform="translate(0,140.26901)">
+        <text
+           sodipodi:linespacing="125%"
+           id="text3390"
+           y="341.12738"
+           x="154.5717"
+           style="font-size:17.41555405px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
+           xml:space="preserve"><tspan
+             style="font-style:normal;font-variant:normal;font-weight:500;font-stretch:normal;font-family:Inconsolata;-inkscape-font-specification:Inconsolata Medium"
+             y="341.12738"
+             x="154.5717"
+             id="tspan3392"
+             sodipodi:role="line">Prefix: 21</tspan></text>
+        <text
+           xml:space="preserve"
+           style="font-size:17.41555405px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
+           x="154.5717"
+           y="359.88428"
+           id="text3394"
+           sodipodi:linespacing="125%"><tspan
+             sodipodi:role="line"
+             id="tspan3396"
+             x="154.5717"
+             y="359.88428"
+             style="font-style:normal;font-variant:normal;font-weight:500;font-stretch:normal;font-family:Inconsolata;-inkscape-font-specification:Inconsolata Medium">ID: 12345</tspan></text>
+        <text
+           sodipodi:linespacing="125%"
+           id="text3398"
+           y="379.4567"
+           x="154.5717"
+           style="font-size:17.41555405px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
+           xml:space="preserve"><tspan
+             style="font-style:normal;font-variant:normal;font-weight:500;font-stretch:normal;font-family:Inconsolata;-inkscape-font-specification:Inconsolata Medium"
+             y="379.4567"
+             x="154.5717"
+             id="tspan3400"
+             sodipodi:role="line">Value: 67.89Kg</tspan></text>
+      </g>
+    </g>
+    <g
+       transform="matrix(0.54655779,0,0,0.54655779,40.964737,95.182008)"
+       id="g3402">
+      <g
+         id="g3404"
+         transform="translate(0,284.6156)">
+        <g
+           id="g3406"
+           transform="translate(0,154.94832)">
+          <rect
+             ry="3.5336394"
+             rx="3.5336394"
+             y="438.27753"
+             x="141.08452"
+             height="126.4052"
+             width="417.54495"
+             id="rect3408"
+             style="fill:none;stroke:#c3c3c3;stroke-width:1.82963264;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+          <text
+             sodipodi:linespacing="125%"
+             id="text3410"
+             y="471.49893"
+             x="272.54657"
+             style="font-size:27.53050041px;font-style:normal;font-weight:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
+             xml:space="preserve"><tspan
+               style="font-style:normal;font-variant:normal;font-weight:500;font-stretch:normal;text-align:center;text-anchor:middle;font-family:Inconsolata;-inkscape-font-specification:Inconsolata Medium"
+               y="471.49893"
+               x="272.54657"
+               sodipodi:role="line"
+               id="tspan3412">OIGNONS 4Kg</tspan></text>
+          <g
+             transform="translate(0,156.57936)"
+             id="g3414" />
+        </g>
+      </g>
+      <image
+         y="887.47076"
+         x="386.54324"
+         id="image3416"
+         xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAOYAAACYCAIAAAB/IAJdAAAAA3NCSVQICAjb4U/gAAADz0lEQVR4 nO3Z0ZKaMACGUdnx/V+ZXjBjGWKyEQjyt+fcdIsBY/ZTgZ3meX7sMk3T4/FYdq/9XI5frB9db18/ Wh6nfJZyr/Yz9s+t/Yp65tw/22+N3Pe6asevhdQ/stPPkZ3hepIljGQJI1nCSJYwkiWMZAkjWcJI ljCSJYxkCSNZwkiWMJIljGQJI1nCSJYwkiWMZAkjWcJIljCSJYxkCSNZwkiWMJIljGQJI1nCSJYw kiWMZAkjWcJIljCSJYxkCSNZwkiWMJIljGQJI1nCSJYwkiWMZAkjWcJIljCSJYxkCSNZwkiWMJIl jGQJI1nCSJYwkiWMZAkjWcJIljCSJYxkCSNZwkiWMJIljGQJI1nCSJYwkiWMZAkjWcJIljCSJYxk CSNZwkiWMJIljGQJI1nCSJYwkiWMZAkjWcJIljCSJYxkCSNZwkiWMJIljGQJI1nCSJYwkiWMZAkj WcJIljCSJYxkCSNZwkiWMJIljGQJI1nCSJYwkiWMZAkjWcJIljCSJYxkCSNZwkiWMJIljGQJI1nC SJYwkiWMZAkjWcJIljCSJYxkCSNZwkiWMJIljGQJI1nCSJYwkiWMZAkjWcJIljCSJYxkCSNZwkzz PO/cc5oej8ey+/rn/5k1KZ2+Jj5lCSNZwjyXf5ZP7NKJ32v9XwrtkZupNg743ZH3nNWgV3p8WZaD 9Oz4Uz7fCP1P0Rg5TVP5aG38d0fWfHFW/av36TofX5bXLm+PtvF8/TTuQuGUXl/W83y9zs3kX8d5 bb9yZM0dZtWzev0jy2f/9bA18zy/jtb+mr3oXLZ/9u3zgc2j7cOuH71+5K1m1b96B9d5+e+isUvt OJv0336EDU/23I/Y0vruyfo45ZJdM7LmnrM6MnLQXbwy3M2AZ+2xU6Zy1iUXN7eO55RfYuM84Vnb 53hD1/R6wbXjP+z4d2Dt2ut4uJvP9ddhf9Zn0LvPQtrPesrIt19heu3Uv3r71nlEPOsjr2fyrF0t /nrd1z7lH3cKe+dMj1+cjTbi91Jefi1XTsv209ekevl1w1OC8k084m39r+pfvY/WefT6b+4bzPNc PZc95clqGzevs3/k2y30O/FUbbTa/YCByV7jzucJ9zf6FuRujVsQb/56sdnnrHfbwbOF2nwag7+1 ccfrGr2xf/XOWudye6dfb7b+vB13eq/HvZ1J+61f3ve+cuStZtW/emet845yytPW95NZ37PdOLfX 49dkH83zst/cR6v0xVn1r96gdW7r/2PE33tYI/76Vc7p+G2ED15b9ysaMfKes9q3emetc1vjjura Hwkp3Xa7HcbMAAAAAElFTkSuQmCC "
+         height="108.34499"
+         width="163.94308" />
+      <g
+         id="g3418"
+         transform="translate(0,598.58983)">
+        <text
+           xml:space="preserve"
+           style="font-size:17.41555405px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
+           x="154.5717"
+           y="351.81107"
+           id="text3420"
+           sodipodi:linespacing="125%"><tspan
+             sodipodi:role="line"
+             id="tspan3422"
+             x="154.5717"
+             y="351.81107"
+             style="font-style:normal;font-variant:normal;font-weight:500;font-stretch:normal;font-family:Inconsolata;-inkscape-font-specification:Inconsolata Medium">ID: 5449000000996</tspan></text>
+      </g>
+    </g>
+  </g>
+</svg>
diff --git a/addons/point_of_sale/doc/barcode_test_sheet4.pdf b/addons/point_of_sale/doc/barcode_test_sheet4.pdf
new file mode 100644
index 00000000000..aff24aefd9d
Binary files /dev/null and b/addons/point_of_sale/doc/barcode_test_sheet4.pdf differ
diff --git a/addons/point_of_sale/doc/barcode_test_sheet4.svg b/addons/point_of_sale/doc/barcode_test_sheet4.svg
new file mode 100644
index 00000000000..671d862519c
--- /dev/null
+++ b/addons/point_of_sale/doc/barcode_test_sheet4.svg
@@ -0,0 +1,1210 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="297mm"
+   height="210mm"
+   id="svg3298"
+   version="1.1"
+   inkscape:version="0.48.3.1 r9886"
+   sodipodi:docname="New document 5">
+  <defs
+     id="defs3300" />
+  <sodipodi:namedview
+     inkscape:document-units="mm"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="0.61399264"
+     inkscape:cx="476.4606"
+     inkscape:cy="245.10408"
+     inkscape:current-layer="layer1"
+     id="namedview3302"
+     showgrid="false"
+     inkscape:window-width="1312"
+     inkscape:window-height="776"
+     inkscape:window-x="805"
+     inkscape:window-y="268"
+     inkscape:window-maximized="0" />
+  <metadata
+     id="metadata3304">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <image
+       y="550.11414"
+       x="317.29758"
+       id="image3447"
+       xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAWgAAABQCAIAAAC72Xj2AAAAA3NCSVQICAjb4U/gAAAI70lEQVR4
+nO3ca0jT3x8H8PP10prOXMtb2nRI1iptliynqatUFpVGF8MkiR6kohFCT6LLgx5kkAlSJBXlE30Q
+FUUkKIEYIZLRxZCal8oboWglNq+s3O/B+f0Ostn+O/O7yx/er0dfz/l+P+dz9o23m9+RYLFYCAAA
+Dx9PNwAA/38QHADADcEBANwQHADADcEBANwQHADADcEBANxcEhz19fWCIAiCIJFI2GBubi4dLCws
+pCMzMzPCfxoaGuwU3LNnDz0tLS2NHshkMtvTamtr2Syr3NTUZHXaxMQEm33+/LmddbOysuhpGRkZ
+9EChULDZzMxMOlhSUmJ77c6dO62uDQ0NtT3t5s2bdDYsLMxOJyMjI6xnjUZDD06fPk1nh4eH2Wxr
+a6udOqmpqfQ0vV5PD9asWcNmdTodHTxz5gwdGRwcZJXb29vp4LVr1+hITEwMu1ar1dLBHTt20AOl
+UsmuffPmjVUnX79+ZbNv376lg1euXGGV2axaraYH586ds90RezUuXLhAR7q7u9m169ats+pKrVbb
+Frl06RKd3bhxIxvctGmT1bVr165llY1Go1WRzs5ONtvV1UUHL168aNWJIAgqlYoeXL582baZuLg4
+OltRUUFH3r17x6798uULHTx79iwdSUpKsi2yKLZuZWUlHXn9+jWrPDAw4GAdgnccAOAEBAcAcENw
+AAA3BAcAcENwAAA3BAcAcENwAAA3BAcAcENwAAA3BAcAcENwAAA3BAcAcENwAAA3BAcAcENwAAA3
+BAcAcENwAAA3BAcAcENwAAA3BAcAcENwAAA3BAcAcENwAAA3BAcAcENwAAA3BAcAcENwAAA3BAcA
+cENwAAA3BAcAcENwAAA3BAcAcENwAAA3BAcAcENwAAA3BAcAcENwAAA3BAcAcENwAAA3BAcAcENw
+AAA3BAcAcENwAAA3BAcAcENwAAA3BAcAcENwAAA3BAcAcENwAAA3P0+u7edXXl5Oj2NjY+2ceeDA
+gfXr1xNCQkJCtFotIUQikdieFh8fTwv6+/ubzWY6qFKprE6TSCRs3ZiYGDvrHjp0KCEhga6blJRE
+CAkMDGSzhw8f3rx5MyFk+/btttfm5eUlJiYuvFYmk9melpiYSJsJCgqy00lgYCDrOTg4eNeuXYSQ
+jIwMOiKTydhsVFSUnTr5+fnJycmEkNDQ0K1btxJC5HI5mz169GhKSgohRK/X2ymyqIKCgrS0NFp5
+y5YthJCAgIDp6Wk6Gx4ebnW+XC5nPbPZbdu20cHAwMCpqSk6GBQUZDKZCCG0vpXCwsJv376RBXdB
+oVCwyjKZbHJycmFXtp0QQlJSUuglERERbPD48ePDw8MLr2XVCCGrVq2yKhISEsLWVSgU9CA1NZUO
+LryW7Y7eCysnTpwYGxujrwZ7fVhldr/S09Pn5uYIIUql0raIy1lcoK6ujhZftmwZG8zJyaGDx44d
+c8Wi4AoDAwPsn8qrV6/oYGVlJR2Jjo72bHvAhf2avHr1Kh1pb29n97e/v9/xUhwfVRobG5VKpSAI
+vr6+eXl59JeAi4yNjalUKrlc3tfXx3ttV1fXqVOndDqdQqHYt2+f0z0sfb9idSJKM2IV8dS6YjXv
+Pc2ItSOTyVRUVBQQEEBL7d6927k6XBwNjp6enoMHD+bk5IyOjra1tbW1tRUXF7uurbKyMh8fn4mJ
+iT9//vBe+/Hjx46ODp1OFx4ezt4c8hJlv6J0IlYzbr6D4q4rVvPe04xYO5qfn9+/f//Tp09v375t
+NBpbW1sNBoMTdbg5+M6ktLR09erVZrOZ/nj37l1BEAYHBxc9eYkfVR4/fqxUKmtrawkhvb29DnZo
+y2Aw6PV6567l2q9LOxGrGeeKLP2jigeb9+ZmxNpRfX29j49PZ2enIyd74KNKS0tLZmamn9+/f0w1
+GAwWi+XFixdOB9bfjI+Pl5aW1tTU2P9joau5bb9ua8ZTO/Kq5r2nGbF2dP/+/dTU1Pj4eKPR2N3d
+7cQ7dOc4Ghx9fX0LH09ERUX5+fk58QeI/6m8vFyv1y/xLwJL57b9uq0ZT+3Iq5r3nmbE2tGHDx8i
+IiK0Wm1CQsKGDRsiIyOfPXvGW8QJjj6OnZ2dDQgIYD8KgiCVStnDNitxcXEnT54khPj7+7NBg8FA
+n3XpdLq/rdLY2NjQ0GA0Gh3synW49utSFotFlGacKyKTyeitJISEhYXRA41GQwdtH0mKta4rinj2
+lXRFEULIr1+/Hj16VFZW9vLlS7PZXFRUlJ+f/+nTp0W/Z1BQUPD9+3dCiEajoSNhYWHs/nK9x3c0
+OCQSyezs7MKR2dlZqVS66MnJycm2D6jLysrsL2EymYqLi6uqqtg/UA/i2q9LCYIgSjPOFVEoFHfu
+3LEazM7Ozs7Odum6riji2VfSFUUIIcuXL7dYLFVVVRKJRCqV1tTUPHjw4MmTJ+x7HwtVVFRYjahU
+Ktv76whHgyM6OnpwcJD9ODIyYjabo6OjnVjyb9rb24eGhqqrq6urqwkhExMThJDc3NysrKzr16+L
+uJAj3LBfNzfjqR15VfPe04xYO1KpVJOTk+z7kAqFYuXKlUNDQ7x1eDkaHOnp6c3NzfPz8z4+PoSQ
+5uZmOihiK2q1+saNG+zHjo6Oe/fuHTlyhH5V1M3csF83N+OpHXlV897TjFg70uv1t27dmpubo9nx
+48eP8fFx229Li8/Bpy/v37/39fU9f/682Wz+/PlzbGzs3r17HX9444SHDx8Spx7HTk9Pt7S0tLS0
+aLVajUZDj3mLiLLfRTuZmprySDPuv4MiritW897TjFg76u/vl0qlJSUlJpPp58+feXl5crl8eHjY
+iVJcOL5yXldXt2LFCvoASa/Xj46Ouq4tyxKCo7e31+l8XGjp+120E6PR6JFmxCriqXXFat57mhFr
+R42NjREREYIgEEIiIyObmpqcq8NFsFgsjr89mZmZ6enpCQ4Odsd7IS/gVfsVpRlP7cirmveeZsTa
+0e/fv7u6ugRBUKvVvr6+SynlIL7gAAAg+P84AMAJCA4A4IbgAABuCA4A4IbgAABuCA4A4IbgAABu
+/wCMwdtAmXYtOgAAAABJRU5ErkJggg==
+"
+       height="40.830791"
+       width="183.73856" />
+    <image
+       y="485.14542"
+       x="317.29758"
+       id="image3458"
+       xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAWgAAABQCAIAAAC72Xj2AAAAA3NCSVQICAjb4U/gAAAJPElEQVR4
+nO3cfUiTXxsH8HP7NtSZtnQW6TTJMnvZrNRp5iqVQaWQaaW2IigsDZMigso/KrLIlCAIerMHjAiC
+/lEwDFtCSGaaEOFbZVqiqVRi+dK0PX+c5zn422ztrHtuz8P389e969z3da6zMy633SvBaDQSAAAe
+Lo4uAAD+96BxAAA3NA4A4IbGAQDc0DgAgBsaBwBwQ+MAAG52aRx3794VBEEQBIlEwoJpaWk0qNPp
+aGRsbEz4r6qqKgsJN2/eTE9LSEigB1Kp1Py08vJyNsoyP3r0yOS04eFhNlpTU2Nh3uTkZHpaYmIi
+PZDJZGw0KSmJBg8ePGh+7caNG+loXl6e+eiGDRvoqEajoQdyudxCJf39/axmpVJJDwoKCuhoX18f
+G3327JmFPPHx8SbzBgUFsVG1Wk2Dx44do5Genh6WuaGhgQYvX75MIyEhIeza6OhoGmRLCw4OZte+
+fPnSpJL379+z0aamJhq8cOECy8xGIyIi6MHJkyfNV8SejdOnT9NIe3s7u3bJkiUmVUVERJgnOXPm
+DB2NjIxkweXLl5tcu3jxYpa5tbXVJMnr16/ZaFtbGw0WFRWZVCIIQmhoKD04f/68eTHh4eF0tLi4
+mEaam5vZte/evTM5v6mpiY0qFAqTmteuXcvOZPOWlJTQyIsXL9i13d3d5sX8Dt5xAAA3NA4A4IbG
+AQDc0DgAgBsaBwBwQ+MAAG5oHADADY0DALihcQAANzQOAOCGxgEA3NA4AIAbGgcAcEPjAABuaBwA
+wA2NAwC4oXEAADc0DgDghsYBANzQOACAGxoHAHBD4wAAbmgcAMANjQMAuKFxAAA3NA4A4IbGAQDc
+0DgAgBsaBwBwQ+MAAG5oHADADY0DALihcQAANzQOAOCGxgEA3NA4AIAbGgcAcEPjAABuaBwAwA2N
+AwC4oXEAADc0DgDghsYBANzQOACAGxoHAHBD4wAAbmgcAMANjQMAuKFxAAA3N0fO7eZWWFhIj8PC
+wiycuW3btqVLlxJC/P39o6OjCSESicT8tBUrVtCE7u7uBoOBBkNDQ01Ok0gkbN6QkBAL827fvn3l
+ypV03jVr1hBCvL292WhGRsaqVasIIevWrTO/NjMzU6VSEUISEhJmHI2KiqKZV69eTQjx8fGxUIm3
+tzer2dfXd9OmTYSQxMREGpFKpWx04cKFFvLs2rUrNjaWEBIQEEDn9fPzY6NZWVlxcXGEEI1GYyHJ
+jLKzs+lKAwIC6NK8vLxGR0fpaGBgoMn5fn5+rGY2GhMTQ4Pe3t4/fvygQR8fn5GREfKbZ1Kn0/X2
+9pJpuyCTyVhmqVT6/fv36VWZV0IIiYuLo5fMnz+fBffu3dvX1zf9WpaNEDJv3jyTJP7+/mxemUxG
+D+Lj42lw+rVsdXQvTOzbt29wcJA+G+z5YZmn75f5KHvOWc0KhcJ8ChEY7aCiooIm9/DwYMHU1FQa
+3L17tz0mBXvo7u5mL5Xnz5/TYElJCY0oFArHlgdc2J/JS5cu0UhDQwPb3w8fPlifiuOjSnV1dXBw
+sCAIrq6umZmZ9I+AnQwODoaGhvr5+XV1dfFe29bWdvjwYbVaLZPJtm7danMNoqy3rKwsMjJSEARB
+EHx8fE6cODExMeGoYmZzB0WfV6zinacYUZLcu3fP759u3rxpQx5e1jaOjo6O9PT01NTUgYGB+vr6
++vr63Nxc+5WVn5/v4uIyPDw8NTXFe+2bN29aWlrUanVgYCB7c8hLrPXW1NTk5OQ0Nja2t7efO3eu
+tLT06NGjDilmlndQ3HnFKt55ihFrRT9//hwdHf3XNMnJyTbk4WblO5O8vLwFCxYYDAb68NatW4Ig
+9PT0zHjyX35UefjwYXBwcHl5OSGks7PTygrNabVajUZj27Vc67Vgampq+kOdTieTyRxSjG1J/v6j
+igOLd+ZixFrRnTt3JBKJlSc74KOKXq9PSkpyc/vPl6lardZoND59+tTmhvU7X79+zcvLu3btmuUv
+C+1NrPW6uPzjGfb19TWJzFoxs7aD9phXrOKdpxhxt6Orq6uxsXFoaMi2y21g7Yu4q6tr+u2JhQsX
+urm52fAFxB8VFhZqNJq/+W5CFPZY79DQ0P3799PT0x1SzKztoD3mFat45ylGxO2YmJgICwuLiYmR
+y+WZmZnfvn2zIQkva2/Hjo+Pe3l5sYeCIHh6erKbbSbCw8MPHDhACHF3d2dBrVZL73Wp1erfzVJd
+XV1VVdXa2mplVfbDtV5rTExMZGRkSKXSixcvcl1oNBpFKca2JFKplG4lIUQul9MDpVJJg+a3JMWa
+1x5JHPtM2iMJIUSlUj1+/DgqKmpycrKysvLIkSM6na6ysnLGk7Ozs+m7EqVSSSNyuZztL9d7fGsb
+h0QiGR8fnx4ZHx/39PSc8eTY2FjzG9T5+fmWpxgZGcnNzS0tLWUvUAfiWu8fTU5O7ty5s6Ojo66u
+bu7cuVzXCoIgSjG2JZHJZDdu3DAJpqSkpKSk2HVeeyRx7DNpjySEEPpbIWr//v39/f1FRUW9vb0z
+/pynuLjYJBIaGmq+v9aw9qOKQqHo6elhD/v7+w0Gg7i/LWloaPj48eOVK1dUKpVKpTp+/DghJC0t
+raCgQMRZrCTieicnJ7Oysurr62tra8PDwx1VzCzsoP3mFat45ynGTttBf/RFfxFnV9a+41i/fn1t
+be2vX7/od3u1tbU0KGIpERERV69eZQ9bWlpu3769Y8cO+lPRWSbWeqempnJycvR6/ZMnT5YtW+bA
+YmZhB+03r1jFO08xdtqO5uZmQkhQUNBf5vkzK+++vHr1ytXV9dSpUwaD4e3bt2FhYVu2bLH+5o0N
+Hjx4QGy6HTs6OqrX6/V6fXR0tFKppMe8ScRa7549ewRBKCsr00/jkGJmfwdFnFes4p2nGLFWdPbs
+2bq6us+fP/f29l6/ft3T0zM1NdWGPLw4fnJeUVExZ84cegNJo9EMDAzYryzjXzSOzs5Om/vjdKKs
+d8Z/GeGoYmZ5B8WdV6zinacYUZJotVr2unJzczt06NDw8LANeXgJRqPR+rcnY2NjHR0dvr6+5v9y
+7P+SU61XlGIctSKnKt55ihElyZcvXz59+iSRSBYtWuTh4WFzHi58jQMAgOD/4wAAG6BxAAA3NA4A
+4IbGAQDc0DgAgBsaBwBwQ+MAAG7/BoIC7zCPCNNJAAAAAElFTkSuQmCC
+"
+       height="40.830791"
+       width="183.73856" />
+    <image
+       y="420.17667"
+       x="317.29758"
+       id="image3469"
+       xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAWgAAABQCAIAAAC72Xj2AAAAA3NCSVQICAjb4U/gAAAIw0lEQVR4
+nO3cb0hTXRwH8HN1NnTzD3NqsTaHZK1/bhXmNHWViVBpZFYmWfQiDA0RIoisICKlLBCiXkT6IqM3
+Qm8SjECUCMnIEiI0tUxDHLMSNf/EqD0vzvMcxlZ7dua9u3sevp9X19+553d+d8f7c/NagsvlIgAA
+PMLkLgAA/nvQOACAGxoHAHBD4wAAbmgcAMANjQMAuKFxAAA3SRrHgwcPBEEQBEGpVLJgUVERDZaX
+l9PIwsKC8I+2tjYfCXfv3k1Py87Opgdqtdr7tObmZjbKMj958sTjtOnpaTb69OlTH+vu2rWLnpab
+m0sPNBoNG83Ly6PBU6dO0cjXr19ZZovF4jE3Pj6ejXZ1ddEpt2/fppHExEQfldjtdjbXbDbTg+rq
+ajo6MTHBRp8/f+4jT1ZWFj3NZrPRg5UrV7JRq9VKg2fOnKGRsbExlrmnp4cGb9y4QSPJyclsbnp6
+Og1u376dHuj1ejb31atXHpV8/PiRjfb29tJgfX09y8xGTSYTPTh//rz3FbFX48KFCzTy/v17Nnf1
+6tUeVZlMJu8kly9fpqPr1q1jwfXr13vMXbVqFcvc39/vkeTt27dsdGBggAYvXrzoUYkgCEajkR5c
+vXrVu5jU1FQ6WldXRyOvX79mcz98+ECD586do5G1a9eyUYPBQA+uXbvmnZmt29DQQCMvX75kc0dH
+R72n/AnecQAANzQOAOCGxgEA3NA4AIAbGgcAcEPjAABuaBwAwA2NAwC4oXEAADc0DgDghsYBANzQ
+OACAGxoHAHBD4wAAbmgcAMANjQMAuKFxAAA3NA4A4IbGAQDc0DgAgBsaBwBwQ+MAAG5oHADADY0D
+ALihcQAANzQOAOCGxgEA3NA4AIAbGgcAcEPjAABuaBwAwA2NAwC4oXEAADc0DgDghsYBANzQOACA
+GxoHAHBD4wAAbmgcAMANjQMAuKFxAAA3NA4A4IbGAQDc0DgAgBsaBwBwQ+MAAG5oHADADY0DALih
+cQAAN4WcaysUNTU19DglJcXHmfv371+zZg0hRKvVpqenE0KUSqX3aRs2bKAJIyIinE4nDRqNRo/T
+lEolWzc5OdnHugcOHNi4cSNdd8uWLYQQlUrFRktKStLS0ggh27Zto5HIyEiWOS4ubseOHe5zlUrl
+jx8/6Kher6cHFouFTomOjvZRiUqlYpljY2N37txJCMnNzaURtVrNRnU6nY88paWlGRkZhJCEhITN
+mzfTOtnokSNHMjMzCSE2m81Hkt8qKyvLzs6mmTdt2kQIiYqKmp+fp6NJSUke58fFxbGa2ejWrVtp
+UKVSzc3N0WB0dPTs7CwhhOb3UF5ePj4+Ttx2QaPRsMxqtfr79+/uVXlXQgjJzMykU5YvX86Cx48f
+n5iYcJ/LshFC4uPjPZJotVq2rkajoQdZWVk06D6XXR3dCw8nTpyYnJykrwZ7fdy/r+hBTk4O/XaK
+iYmZmZmhQfaa09tEQi4JtLS00OTLli1jwcLCQho8evSoFIuCFEZHR9m3yosXL2iwoaGBRgwGg7zl
+ARf2Y/L69es00tPTw/b306dP/qfi+KjS3t6u1+sFQQgPDz948CD9ISCRyclJo9EYFxc3MjLCO3dg
+YOD06dNWq1Wj0ezduzfgGkS53qamJp1OJwiCIAgKhaKkpIT+EJOlmGDuoOjrilV86BQj7nYs5ZYJ
+gL+NY3BwsLi4uLCw0OFwdHd3d3d3V1RUSFdWVVVVWFjY9PT0z58/eee+e/eur6/ParUmJSWxN4e8
+xLperVZ75cqV3t7eoaGhhw8fPnv2rLS0VJZigryD4q4rVvGhU4zo27GUWyYQfr4zqaysXLFihdPp
+pF/eu3dPEISxsbHfnrzEjyqPHj3S6/XNzc2EkKGhIT8r9FZQUGCz2QKby3W9/quvrxcEQZZiAkuy
+9I8qMhYfysWI+w3m5y0jw0eVzs7OvLw8heLvX6YWFBS4XK6urq5A+9UfTU1NVVZW3rlzx/cvC6Um
+0fWOj49rtVpZignaDkqxrljFh04xIm6HLLeMv41jZGTE/fGETqdTKBRSfJqqqamx2WxL+d2EKMS9
+3sbGxvr6+sOHD7e2tt6/f1+WYoK2g1KsK1bxoVOMiNshyy3j7+PYxcXFqKgo9qUgCJGRkexhm4fU
+1NSTJ08SQiIiIliwoKCAPuuyWq1/WqW9vb2tra2/v9/PqqTDdb3/6vHjxzMzM4ODg2lpaQkJCVxz
+XS6XKMUElkStVtOtJIQkJibSA7PZTIPejyTFWleKJPK+klIkIZy3TFlZ2ZcvXwghZrOZRhITE9n+
+cr1h8bdxKJXKxcVF98ji4mJkZORvT87IyPB+QF1VVeV7idnZ2YqKips3b7JvUBlxXe+/6ujoIITM
+zc0dO3YsPz//27dv/s8VBEGUYgJLotFo7t696xHMz8/Pz8+XdF0pksj7SkqRhPeWqaur84gYjUbv
+/fWHvx9VDAbD2NgY+9JutzudToPBEMCSf9LT0/P58+fGxkaLxWKxWM6ePUsIKSoqqq6uFnEVP0lx
+vSqVqra2dmpqSpZigrCD0q0rVvGhU4woSWS8Zfx9x5GTk9PR0fHr16+wsDDyz4/QnJwcEUsxmUy3
+bt1iX/b19TU1NR06dEjyv4H7HYmul/5FoCzFBGEHpVtXrOJDpxhRksh5y/j59OXNmzfh4eG1tbVO
+p3N4eDglJWXPnj3+P7wJQGtrKwnocez8/HxnZ2dnZ2d6errZbKbHvEnEut5Lly51dXXZ7XaHw9HW
+1paSkmI0GmUpJvg7KOK6YhUfOsVIsR0B3zIB4PiT85aWlpiYGPoAyWazORwO6cpyLeFVGBoaCrg/
+uhPleouLi9kjN0EQ9u3bNzw8LFcxQd5BcdcVq/jQKUb07Qhm4xBcLpf/b08WFhYGBwdjY2O9/+XY
+/5Io1zs3N0f/jCo5Odn938jJUoxcOxhSxYdOMf/dG4qvcQAAEPx/HAAQADQOAOCGxgEA3NA4AIAb
+GgcAcEPjAABuaBwAwO0v1kEBJ9CurYwAAAAASUVORK5CYII=
+"
+       height="40.830791"
+       width="183.73856" />
+    <image
+       y="355.20795"
+       x="317.29758"
+       id="image3480"
+       xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAWgAAABQCAIAAAC72Xj2AAAAA3NCSVQICAjb4U/gAAAIuklEQVR4
+nO3cX0iTXxgH8HN0NnQzZU0tTB2SJf1x9secpi4yESqNTMskiy7C0BAhIsgKIlLIAiHoItKLjG6E
+bhKMwJQIy8gSIjQ1TUMcWojZdDRqv4vz6yCbrp3tvLrfj+/n6t1z3vc5z9lZj5vvjDocDgIAICJg
+uQsAgP8eNA4AEIbGAQDC0DgAQBgaBwAIQ+MAAGFoHAAgTJHG8eDBA0oppVStVvNgfn4+C5aWlrLI
+3Nwc/aOlpcVNwn379rHTMjIy2IFWq3U9rbGxkY/yzE+ePHE6bXp6mo8+ffrUzbx79+5lp2VlZbED
+nU7HR7Ozs1nwzJkzLPLt2zee+dmzZ24y7969m51mNpvZQWRkpJvzLRYLz2w0GtlBZWUlGx0fH+ej
+L168cJMnPT3dad61a9fyUZPJxILnzp1jkdHRUZ65q6uLBW/evMkicXFx/NqUlBQW5EuLiYnh1755
+88apkqGhIT7a3d3NgrW1tTwzH01MTGQHFy9edF0RfzYuXbrEIh8/fuTXrl+/3qmqxMRE1yRXr15l
+oxs3buTBTZs2OV27bt06nrm3t9cpyfv37/loX18fC16+fNmpEkqpwWBgB9evX3ctJiEhgY3W1NSw
+yNu3b/m1nz59cr3E1YULF9j5O3bs4EE+b11dHYu8fv2aZx4ZGfEkM4N3HAAgDI0DAIShcQCAMDQO
+ABCGxgEAwtA4AEAYGgcACEPjAABhaBwAIAyNAwCEoXEAgDA0DgAQhsYBAMLQOABAGBoHAAhD4wAA
+YWgcACAMjQMAhKFxAIAwNA4AEIbGAQDC0DgAQBgaBwAIQ+MAAGFoHAAgDI0DAIShcQCAMDQOABCG
+xgEAwtA4AEAYGgcACEPjAABhaBwAIAyNAwCEoXEAgDA0DgAQhsYBAMLQOABAGBoHAAhD4wAAYWgc
+ACAMjQMAhKFxAIAwNA4AEIbGAQDC0DgAQBgaBwAIQ+MAAGFoHAAgTLWcc6tUVVVV7Dg+Pt7NmYcO
+HdqwYQMhRK/Xp6SkEELUarXraZs3b2YJg4KC7HY7CxoMBqfT1Go1nzcuLs7NvIcPH96yZQubd/v2
+7YQQjUbDRwsLC5OSkgghu3btYpHg4GCeOTY21k3moqKirVu3sszbtm0jhISGhro5X6PR8MxhYWF7
+9uwhhGRlZbGIVqvlo9HR0W7yFBcXp6amEkIiIiLYvOHh4Xz02LFjaWlphBCz2ewmyYJKSkoyMjJY
+Zra0kJCQ2dlZNhoVFeV0fnh4OK+Zj+7cuZMFNRqN1WplwdDQ0JmZGUIIy++ktLR0bGyMzNsFnU7H
+M2u12h8/fsyvyrUSQkhaWhq7ZPXq1Tx48uTJ8fHx+dfybISQVatWOSXR6/V8Xp1Oxw7S09NZcP61
+fHVsL5ycOnVqcnKSPRv8+eGZ5++XG5mZmT9//iR/ex16z6GApqYmlnzFihU8mJeXx4LHjx9XYlJQ
+wsjICH+pvHr1igXr6upYJDY2dnnLAyH8x+SNGzdYpKuri+/v58+fPU8l8FGltbU1JiaGUhoYGFhU
+VMR+CChkcnLSYDCEh4cPDw+LXtvX13f27FmTyaTT6Q4cOOB1DXLX68uKZBWzlDsofV5ZxftPMVKS
+NDQ0REdHU0oppSqVqrCwkL1LUpqnjaO/v7+goCAvL29iYqKzs7Ozs7OsrEy5sioqKgICAqanp3/9
++iV67YcPH3p6ekwmU1RUFH9zKEr6en1ZkZRilngH5c4rq3j/KUbWivR6/bVr17q7uwcGBh4+fPj8
++fPi4mIv8gjz8J1JeXn5mjVr7HY7e3jv3j1K6ejo6IIn+/hR5dGjRzExMY2NjYSQgYEBDyt0lZub
+azabvbtWaL1/5eOKpBTjXRLfP6osY/H+XIzcFxhXW1tLKbVarQuOLsNHlfb29uzsbJXq31+m5ubm
+OhyOjo4Ob/vVoqampsrLy+/cueP+l4VKk7he31ckpZgl20El5pVVvP8Uo9B2jI2N6fX64OBgH/P8
+laeNY3h4eP7tiejoaJVK5d3HdfeqqqrMZrMvv5uQQuJ6fV+RlGKWbAeVmFdW8f5TjNztqK+vr62t
+PXr0aHNz8/379yml3uXxnKe3Y202W0hICH9IKQ0ODuY325wkJCScPn2aEBIUFMSDubm57F6XyWRa
+bJbW1taWlpbe3l4Pq1KO0Hrd8H1FDodDSjHeJdFqtWwrCSGRkZHswGg0sqDrLUlZ8yqRZHmfSSWS
+cI8fP/7+/Xt/f39SUlJERMRip5WUlHz9+pUQYjQaWSQyMpLvr9A7Yk8bh1qtttls8yM2m22xd0Sp
+qamuN6grKircTzEzM1NWVnbr1i3+Al1GQutdjJQVUUqlFONdEp1Od/fuXadgTk5OTk6OovMqkWR5
+n0klknBtbW2EEKvVeuLEiZycnKGhoQW/7lFTU+MUMRgMrvvrCU8/qsTGxo6OjvKHFovFbrfL/W5J
+V1fXly9f6uvrk5OTk5OTz58/TwjJz8+vrKyUOIuHpKxX1oqkFLMEO6jcvLKK959ilNgOjUZTXV09
+NTX18uVLX/J4wtN3HJmZmW1tbb9//w4ICCB/OlxmZqbEUhITE2/fvs0f9vT0NDQ0HDlyhH1VdIlJ
+Wa+sFUkpZgl2ULl5ZRXvP8UotB3sK6cLfq9aMg/vvrx79y4wMLC6utputw8ODsbHx+/fv9/zmzde
+aG5uJl7dvJydnW1vb29vb09JSTEajexYNIkS6/V6RVKKWfodlDivrOL9pxhZK7py5UpHR4fFYpmY
+mGhpaYmPjzcYDDabzYtUQgS+ct7U1LRy5Up2A8lsNk9MTChXlsOHf2YDAwNe98f5pK/X6xXJKmaJ
+d1DuvLKK959ipCQpKCjg93QppQcPHhwcHPQijyjqcDg8f3syNzfX398fFhbm+pdj/0t+tV4pxSzX
+ivyqeP8pRkoSq9XKvqcXFxc3/48wFSXWOAAACP4/DgDwAhoHAAhD4wAAYWgcACAMjQMAhKFxAIAw
+NA4AEPYPxQz1KjysjN4AAAAASUVORK5CYII=
+"
+       height="40.830791"
+       width="183.73856" />
+    <image
+       y="290.23923"
+       x="317.29758"
+       id="image3491"
+       xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAWgAAABQCAIAAAC72Xj2AAAAA3NCSVQICAjb4U/gAAAJVElEQVR4
+nO3cfUiTXxsH8HPny1I3taWzUKdJllm2WfmauUpFqBQyrdQsgsLSMCkiqPyjIotMCaKgMnvAiCDo
+HwXBMBNCMtOECN8q0xJNpRLzrWl7/jjPc/C32dqZ99yeh+/nr3vXuc91rrPbLrfdM0Gn0xEAAB4L
+rF0AAPzvQeMAAG5oHADADY0DALihcQAANzQOAOCGxgEA3CzSOB48eCAIgiAIEomEBZOTk2kwKyuL
+RsbHx4X/qqysNJJw27Zt9LSYmBh6IJVKDU8rKyujozKZzHC0tLSUjrq6urJ1q6urjawbHx9PT4uN
+jaUHcrmcjcbFxdHgkSNHDOdu2bJFb66np6fhaTdv3qSjCoXCSCX9/f2sZpVKRQ/y8vLoaF9fHxt9
+8eKFkTzR0dH0NI1GQw98fHzYaGRkJA2ePHmSRnp6eljmhoYGGrx27RqN+Pn5sblhYWE0uHnzZnrg
+6+vL5r5+/Vqvko8fP7LRpqYmGrx8+TLLzEaDgoLowZkzZwx3xJ6Nc+fO0Uh7ezubu2LFCr2qgoKC
+DJOcP3+ejgYHB7Pg6tWr9eYuX76cZW5tbdVL8vbtWzba1tZGgwUFBXqVCILg7+9PDy5dumRYTGBg
+IB0tLCykkebmZjb3w4cPeuc3NTWxUaVSqVfzhg0b2Jls3aKiIhp59eoVm9vd3W1YzJ/gFQcAcEPj
+AABuaBwAwA2NAwC4oXEAADc0DgDghsYBANzQOACAGxoHAHBD4wAAbmgcAMANjQMAuKFxAAA3NA4A
+4IbGAQDc0DgAgBsaBwBwQ+MAAG5oHADADY0DALihcQAANzQOAOCGxgEA3NA4AIAbGgcAcEPjAABu
+aBwAwA2NAwC4oXEAADc0DgDghsYBANzQOACAGxoHAHBD4wAAbmgcAMANjQMAuKFxAAA3NA4A4IbG
+AQDc0DgAgBsaBwBwQ+MAAG5oHADADY0DALihcQAANzQOAOCGxgEA3NA4AIAbGgcAcLO35tr29vn5
++fQ4ICDAyJk7d+5cuXIlIcTDwyMsLIwQIpFIDE9bs2YNTbhw4ULD0ZCQEDrq4OCg1Wpp0M/Pz8i6
+u3btCgkJoeuuX7+eEOLi4sJGU1NT165dSwjZuHGj4dy0tDS1Wj1zrlQqNTxNrVbTqmQymZFKXFxc
+2HPl5ua2detWQkhsbCyNSKVSNurt7W0kz969eyMiIgghnp6e69atI4S4u7uz0fT09KioKEKIRqMx
+kmRWGRkZMTExNHNoaCghxNnZeWxsjI56eXnpne/u7s5qZqPh4eE06OLiMjo6SoMymWxkZIQQQvPr
+ycrK6u3tJTOuglwuZ5mlUunPnz9nVmVYCSEkKiqKTlmyZAkLHjhwoK+vb+Zclo0QsnjxYr0kHh4e
+bF25XE4PoqOjaXDmXLY7ei30HDx4cHBwkD4b7PlhmWdeL8NR9pyzmpVKpeESItBZQHl5OU3u6OjI
+gklJSTS4b98+SywKltDd3c1+VF6+fEmDRUVFNKJUKq1bHnBhvyavXr1KIw0NDez6fvr0yfRUHG9V
+qqqqfH19BUGws7NLS0ujvwQsZHBw0N/f393dvauri3duSUlJcHCwIAiCIMhkstOnT09OTppRw9z3
+29bWduzYscjISLlcvmPHDjNqELEYsZJYa12xiredYkRJ8vDhQ/d/unv3rhl5eJnaODo6OlJSUpKS
+kgYGBurr6+vr67Ozsy1XVm5u7oIFC4aHh6enp3nnVldXZ2ZmNjY2tre3X7x4sbi4+MSJE7xJRNnv
+u3fvWlpaIiMjvby82MtUM4hSzDxfQXHXFat42ylGrB39+vVrbGzsXzPEx8ebkYebia9McnJyli5d
+qtVq6cPS0lJBEHp6emY9eY5vVZ48eeLr61tWVkYI6ezsNLFCZnp6eubDrKwsuVzOm4Rrv3+VmJio
+0WjMmytWMeYlmftbFSsWb8vFiLWj+/fvSyQSE0+2wluV2trauLg4e/v/fJiamJio0+meP39udsP6
+k+/fv+fk5Ny6dcv4h4VGLFjwj025ubnpRUwxb/udt2KstSObKt52ihH3cnR1dTU2Ng4NDZk33Qym
+/ovq6ury9/dnD729ve3t7c34AOKv8vPzNRrNHD8RYIaGhh49epSSksI7cd72O2/FWGtHNlW87RQj
+4uWYnJwMCAgIDw9XKBRpaWk/fvwwIwkvU2/HTkxMODs7s4eCIDg5ObGbbXoCAwMPHz5MCHFwcGDB
+xMREeq8rMjLyT6tUVVVVVla2traaWJVxk5OTqampUqn0ypUrvHO59mtROp1OlGLMSyKVSumlJIQo
+FAp6oFKpaNDwlqRY61oiiXWfSUskIYSo1eqnT5+GhoZOTU1VVFQcP348KyuroqJi1pMzMjLoqxKV
+SkUjCoWCXV+u1/imNg6JRDIxMTEzMjEx4eTkNOvJERERhjeoc3NzjS8xMjKSnZ1dXFzMfkDnYmpq
+as+ePR0dHXV1dYsWLeKdzrVfixIEQZRizEsil8vv3LmjF0xISEhISLDoupZIYt1n0hJJCCH0u0LU
+oUOH+vv7CwoKent7Z/06T2FhoV7E39/f8PqawtS3Kkqlsqenhz3s7+/XarXifrekoaHh8+fP169f
+V6vVarX61KlThJDk5OS8vDzeVFNTU+np6fX19TU1NYGBgWYUMw/7nedirLUjmyredoqx0OWgX/qi
+34izKFNfcWzatKmmpub379/0g8aamhoaFLGUoKCgGzdusIctLS337t3bvXs3/aqo6aanpzMzM2tr
+a589e7Zq1SrzipmH/c5zMdbakU0VbzvFWOhyNDc3E0J8fHzmmOfvTLz78ubNGzs7u7Nnz2q12vfv
+3wcEBGzfvt30mzdmePz4MTHrduz+/fsFQSgpKamdYWpqiiuJKPsdGxujq4eFhalUKno8OjrKm0eU
+Yub/Coq4rljF204xYu3owoULdXV1X79+7e3tvX37tpOTU1JSkhl5eHF85by8vNzV1ZXeQNJoNAMD
+A5YrSzeHxjHrHyOMjIzw5pn7fjs7Ow0raW1t5c0jSjFiJbHWumIVbzvFiJIkMTGR/WjZ29sfPXp0
+eHjYjDy8BJ1OZ/rLk/Hx8Y6ODjc3t5l3kv6P2dR+RSnGWjuyqeJtpxhRknz79u3Lly8SiWTZsmWO
+jo5m5+HC1zgAAAj+Pw4AMAMaBwBwQ+MAAG5oHADADY0DALihcQAANzQOAOD2bwso61izjY0SAAAA
+AElFTkSuQmCC
+"
+       height="40.830791"
+       width="183.73856" />
+    <image
+       y="225.27045"
+       x="317.29758"
+       id="image3502"
+       xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAWgAAABQCAIAAAC72Xj2AAAAA3NCSVQICAjb4U/gAAAIg0lEQVR4
+nO3cW0hUWxgH8LW9ZDozOk06FeY4SJZaZhfMS+pUKkKlkGmlZtFDGAoh9VB0eYjILqZIQQ9hvthD
+EPQkCIKZEJLdoQfTLuZEKCqEWanM2JyHdc7CM6PDfOPaOufw/z3t+dbsb31rL/en47YUh8PBAAAo
+/Ba7AAD470HjAAAyNA4AIEPjAAAyNA4AIEPjAAAyNA4AIFOlcdy/f19RFEVRgoKCRLCgoIAHy8vL
+eWRiYkL5R0tLi5uEu3fv5m/LyMjgB1qt1vVtTU1NfFSn07mONjY28tHQ0FAxb1tbm5t5c3Jy+Nuy
+srL4gcFgEKPZ2dk8eOLECddzd+7cyUcrKytdR3fs2MFHLRYLPzAajW4qGRoaEjUnJSXxg5MnT/LR
+wcFBMfr06VM3edLT053mXb16tRhNTU3lwdOnT/OI1WoVmbu7u3nw5s2bPBIdHS3OTU5O5kGxtKio
+KHHuy5cvnSr5/PmzGH316hUPXr16VWQWo3Fxcfzg3LlzrisSV+PChQs80tvbK85du3atU1VxcXGu
+SS5dusRHExISRHD9+vVO565Zs0Zk7unpcUry7t07Mfr+/XsevHjxolMliqKYzWZ+cOXKFddiYmNj
++WhNTQ2PvH79Wpz76dMnHjx79iyPxMfHi1GTycQPrl+/7ppZzFtbW8sjz58/F+cODAy4njIX/MQB
+AGRoHABAhsYBAGRoHABAhsYBAGRoHABAhsYBAGRoHABAhsYBAGRoHABAhsYBAGRoHABAhsYBAGRo
+HABAhsYBAGRoHABAhsYBAGRoHABAhsYBAGRoHABAhsYBAGRoHABAhsYBAGRoHABAhsYBAGRoHABA
+hsYBAGRoHABAhsYBAGRoHABAhsYBAGRoHABAhsYBAGRoHABAhsYBAGRoHABAhsYBAGRoHABAhsYB
+AGRoHABAhsYBAGRoHABAhsYBAGRoHABAhsYBAGRoHABAhsYBAGRoHABAhsYBAGQBizl3QEB1dTU/
+jomJcfPOffv2rVu3jjEWHh6enJzMGAsKCnJ924YNG3jCpUuXuo4mJiby0cDAQJvNxoPR0dFu5t2/
+f39iYiKfd+vWrYwxjUYjRouKijZu3MgY2759u+u5xcXFmzZtYoxlZGTMOrp582aeecuWLYwxnU7n
+phKNRiOuVVhY2K5duxhjWVlZPKLVasVoZGSkmzyHDh1KSUlhjEVERPB59Xq9GC0pKUlLS2OMWSwW
+N0lmVVpaylcaERHBlxYSEvL7928+umLFCqf36/V6UbMY3bZtGw9qNJpfv37xoE6nGx8fZ3NcyfLy
+8m/fvrEZu2AwGERmrVb78+fPmVW5VsIYS0tL46esXLlSBI8ePTo4ODjzXJGNMbZ8+XKnJOHh4WJe
+g8HAD9LT03lw5rlidXwvnBw7dmxkZIRfDXF9RGaxX5mZmVNTU4yx0NDQHz9+8KC45vw2UZFDBc3N
+zTz5kiVLRDA/P58HDx8+rMakoIaBgQHxpfLs2TMerK2t5RGTybS45QGJ+DZ548YNHunu7hb7++XL
+F89TET6qtLa2RkVFKYri7+9fXFzMvwmoZGRkxGw26/X6/v5+6rn19fUJCQmKoiiKotPpzpw5wxsz
+lZT1+lQxC7mD0ueVVbzvFCN3O+Zzy3jB08bR19dXWFiYn58/PDzc1dXV1dVVUVGhXllVVVV+fn5j
+Y2PT09PUc9va2srKyl68eNHb23v58uW6urpTp05Rk8har+8Us8A7KHdeWcX7TjHSt2M+t4w3PPzJ
+pLKyctWqVTabjb9sbGxUFMVqtc765nl+VHn06FFUVFRTUxNj7MOHDx5WKExPT898WV5ebjAYqElI
+6/1PFONdkvl/VFnE4n25GFkr4jy8ZRbho0pHR0d2dnZAwN+/TM3Ly3M4HE+ePPG2X83p+/fvlZWV
+d+7ccf/LQjf8/P61qLCwMKeIJ2St13eKWbAdVGNeWcX7TjESt2P+t4wXPP0i7u/vN5vN4mVkZGRA
+QIAan6aqq6stFsvevXulZBsdHX3w4EFhYSH1RDXWu7jFLNgOqjGvrOJ9pxiJ2yH3lvGQp49jJycn
+Q0JCxEtFUYKDg8XDNiexsbHHjx9njAUGBopgXl4ef9aVmpo61yytra0tLS09PT0eVuXe1NRUUVGR
+Vqu9du0a9VzSelUtxuFwSCnGuyRarZZvJWPMaDTyg6SkJB50fSQpa141kizulVQjCSPeMqWlpaOj
+o4yxpKQkHjEajWJ/ST+weNo4goKCJicnZ0YmJyeDg4NnfXNKSorrA+qqqir3U4yPj1dUVNTV1Ykv
+0Pmw2+0HDx7s6+vr7OxctmwZ9XTSelUtRlEUKcV4l8RgMNy9e9cpmJubm5ubq+q8aiRZ3CupRhLq
+LVNTU+MUMZvNrvvrCU8bh8lkslqt4uXQ0JDNZjOZTF5MOZfu7u6vX782NDQ0NDQwxsbGxhhjBQUF
+OTk5t27dIqWy2+0lJSVdXV2dnZ2xsbFeFCNxvT5SzALsoHrzyired4qRkkTiLUPlaePIzMxsb2//
+8+cP/91ee3s7D0osJS4u7vbt2+Ll27dv7927d+DAAerfwE1PT5eVlXV0dDx+/Dg+Pt67YmSt13eK
+WYAdVG9eWcX7TjFSksi6Zbzh4dOXN2/e+Pv7nz9/3mazffz4MSYmZs+ePZ4/vPHCw4cPmVePY48c
+OaIoSn19fccMdrudlETWemcthppESjELv4MS55VVvO8Uo8Z2eH3LeIHwJ+fNzc2hoaH8AZLFYhke
+HlavLMc8rsKs/xhhfHycmkfKemctxos8UopZ4B2UO6+s4n2nGOnbsZCNQ3E4HJ7/eDIxMdHX1xcW
+FjbzSdL/mE+tV0oxi7Uinyred4rxqS8wElrjAABg+P84AMALaBwAQIbGAQBkaBwAQIbGAQBkaBwA
+QIbGAQBkfwGMfBx9p8Zw1QAAAABJRU5ErkJggg==
+"
+       height="40.830791"
+       width="183.73856" />
+    <image
+       y="160.30176"
+       x="317.29758"
+       id="image3513"
+       xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAWgAAABQCAIAAAC72Xj2AAAAA3NCSVQICAjb4U/gAAAIZ0lEQVR4
+nO3aW0hUWxgH8LXVZlJHHUdTSxyHyPBSTRmmlTbdxIdUQrqQZhEUhkZIPRRdHiKyiylSEHR/sIcg
+6CkQBDUhhuwqRHirTCsUNcImTVOb8/B1FnNmp8zS7Zk9w//3tOZbe3+z9hr9O+MeyW63MwAAET7u
+XgAAeB4EBwAIQ3AAgDAEBwAIQ3AAgDAEBwAIQ3AAgLBZCY579+5JkiRJklar5cXc3FwqFhYWyk/J
+zs6m2fT0dBoEBATID7t79y7N6nS6KRZgs9mkf61cuZIG+/fvp9nBwUE+W1tbS8WbN29SRa/Xyxte
+v36dZkNDQ/m5ycnJNDh48CAd9vXrVz5bX1/v1KS/v5/PLl++nAYWi4UGERERU1xRb28vP9dsNtPg
+8OHDNNvT08Nnnzx5QsWqqiqqREVF8Vmr1erU+fPnz3x2yZIlNDh69CjNdnd389mmpiYqXr58mSqx
+sbG8T0pKChXXr19Pg5iYGH7uixcvnJ73w4cPfPbly5dUPH/+PO/MZ+Pj42lw4sQJ+c7w3Th16hRV
+2tra+LmLFy92WlV8fLy8yZkzZ2g2MTGRF5OSkpzOXbRoEe/c0tLi1OTNmzd8trW1lYqnT592Wokk
+SSaTiQbnzp2TLyYuLo5my8rKqPLq1St+7vv376l4/PhxqiQkJPBZo9FIg4sXL8o78+ctLy+nyrNn
+z/i5XV1d8lMmg3ccACAMwQEAwhAcACAMwQEAwhAcACAMwQEAwhAcACAMwQEAwhAcACAMwQEAwhAc
+ACAMwQEAwhAcACAMwQEAwhAcACAMwQEAwhAcACAMwQEAwhAcACAMwQEAwhAcACAMwQEAwhAcACAM
+wQEAwhAcACAMwQEAwhAcACAMwQEAwhAcACAMwQEAwhAcACAMwQEAwhAcACAMwQEAwhAcACAMwQEA
+whAcACAMwQEAwhAcACAMwQEAwhAcACAMwQEAwhAcACAMwQEAwhAcACAMwQEAwhAcACAMwQEAwhAc
+ACDMz90L+GPr1q1xcXGMsbCwsJSUFMaYRqORH5aUlFRaWsoY02q1U3TTaDR0GGNMr9evW7eOMZaW
+lkYVrVbLZ2NjY2mwdOlSKvr7+8sbLlu2jGY1Gs2vX794Z4vFwhhbu3YtVfz9/Xlno9Ho1CQgIMBx
+VRs2bGCMhYeHJycnM8aCgoKmuKLAwEB+bkhIyMaNGxljdF2MMZ1Ox2ejo6NpkJycTMW5c+eOjIxQ
+ccGCBU6dg4KC+LnBwcGZmZmMMbouIfn5+enp6YyxefPmrVixgq53eHiYZiMjI52O1+v1/Hn57KpV
+q6gYGBg4NDTEV2iz2Rhj1N9JYWHhly9fmMOrYDAYeGedTvfjxw/HVclXwhhbvXo1nRIVFcWLe/fu
+7enpcTyXd2OMhYWFOTUJDw/nz2swGGiwZs0aKjqey68uNTVVvph9+/b19/fTbvD9cfzJoUFGRsbo
+6ChjLDg4+Pv371Tke06/RLPIPguqq6upuUaj4cWcnBwq7t69ezaeFGZDV1cX/1F5+vQpFcvLy6li
+NBrduzwQwv9MXrp0iSpNTU389f348aPrrVz9qFJZWZmYmChJkiRJQUFBx44do7RT1qFDh9LS0gwG
+Q3Z29kz61NTUxMTESJLk6+u7fft2+nvluU0U6dPa2qrU9orysp1UVROuv7/fZDLp9frOzs6Z9HGR
+q8FRW1tbUFDw/Pnztra2s2fPVlRUHDlyRPHVNDc3p6WlRUZG8jd109De3p6Xl5eTk9PX12e1Wq1W
+a1FRkec2UarP27dvFdleUd63k+pp4qikpMTHx2dwcHBiYmImfVzl4juTiYkJx4eFhYUGg2Gyg2f4
+USUrK8tisbi4MLni4uL58+ePjY3Rw1u3bkmS1N3d7aFNFOxDhLZ35h9VvG8n1dOEe/jwYUxMzJ07
+dxhjHR0dkx3mho8qPj7/OTIkJMSpoh4NDQ2bNm3y8/vzf9+srCy73f748WMPbaJgH7fwvp1UTxPy
+7du34uLia9euTf3/dWVN55d/YGDg/v37eXl5iq9GEZ2dnSaTiT+Mjo728/MT/eCnniYK9nEL79tJ
+9TQhpaWlFovlf/6/lfDt2NHR0W3btul0ugsXLkx2TFxc3IEDBxhjc+bM4cWsrCy618Vvi84Gu90+
+MjISEBDAK5Ik+fv78/uCLlJPE6WuaHp0Oh29lIyxiIgIGpjNZirKb0nKed9OqqcJY6ympubRo0ct
+LS2uHJyfnz8wMMAYM5vNVImIiOCvr9AbFrHgGB8f37lzZ3t7e2NjY2ho6GSHpaamym9Ql5SUCD3X
+9EiSpNVq+dcWyMjIyF+/nTEF9TRR6oqmx2Aw3Lhxw6mYmZlJX/dwhfftpHqa2Gy2oqKiiooKnulT
+Kysrc6qYTCb56+sKgeAYHx/ftWuX1WptbGykL2upk9Fo7O7u5g97e3vHxsbkX8fylCYK9nEL79tJ
+9TRpamr69OlTVVVVVVUVY2xwcJAxlpubu3nz5itXrgi1EuVqcExMTBQUFDQ0NNTX1yckJMzqmmYo
+IyOjrq7u9+/f9O/buro6KnpoEwX7uIX37aR6msTHx1+9epU/bG5uvn379o4dO2b9a6PM5duxe/bs
+kSSpsrKywcH4+Ljr929cQW1TUlLMZjONh4aGRJu8fv3a19f35MmTY2Nj7969W7hw4ZYtWzy3iVJ9
+hoeHFdleUd63k+pp4uTBgwdsytuxCnI1OP76DX+bzabwamRaWlqm0ae6ujo4OJjudVkslr6+Po9u
+okifjo4OpbZXlJftpKqaOPo/g0Oy/+3X1Qv8/Pmzvb09JCTE8aaX5zZRsI9beN9OqqeJW3htcADA
+7FHptz8BQM0QHAAgDMEBAMIQHAAgDMEBAMIQHAAgDMEBAML+AdQ3y3GMdcKPAAAAAElFTkSuQmCC
+
+"
+       height="40.830791"
+       width="183.73856" />
+    <image
+       y="616.89185"
+       x="756.41528"
+       id="image3524"
+       xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAWgAAABQCAIAAAC72Xj2AAAAA3NCSVQICAjb4U/gAAAKDElEQVR4
+nO3bWUxTWxsG4LWlUIrFlgIFUaCSEBWlDIqgovU4BI2gBiWOaIKIY9DohYlDYjRRImq80QRxOAZi
+jNEY4wWKImJII+I8lcGATAFBVKwgSKH/xTr/Cqf1kK62nJaT97na/dZeX9fepS8teyMYjUYCAMBj
+hKMXAADDD4IDALghOACAG4IDALghOACAG4IDALghOACA25AER35+viAIgiCIxWJWXLJkCS2mpqaa
+T0lMTKSj8fHxdMPDw8N8t0uXLtFRqVQ6yAL0er3wf1OmTKEb6enpdLSjo4ONFhYW0mJubi6tyOVy
+84Y5OTl01MvLi82Njo6mG1u2bKG7tbe3s9EHDx6YNGlra2OjkZGRdEOj0dANpVI5yBG1tLSwuRER
+EXQjMzOTjjY3N7PR0tJSWjx9+jSt+Pv7s1GtVmvSubGxkY1OnjyZbuzZs4eO1tfXs9GysjJaPHHi
+BK0EBwezPjExMbQ4Z84cuhEYGMjmPn361OR5a2pq2OizZ89o8dixY6wzG33x4oXJ3KqqKjY6fvx4
+unHgwAE6WllZyUZfv35tMlen07HR0NBQkzWHhYWxPSdNmkSLhw4dopW3b9+yuTqdbpDXizl48CDd
+X61WD7Lby5cvWefq6mqT0efPn7PRoKAgupGVlWXeJyQkxOSIpk6dykZVKhUtZmdn08qTJ09Y57q6
+OkuOiMInDgDghuAAAG4IDgDghuAAAG4IDgDghuAAAG4IDgDghuAAAG4IDgDghuAAAG4IDgDghuAA
+AG4IDgDghuAAAG4IDgDghuAAAG4IDgDghuAAAG4IDgDghuAAAG4IDgDghuAAAG4IDgDghuAAAG4I
+DgDghuAAAG4IDgDghuAAAG4IDgDghuAAAG4IDgDghuAAAG4IDgDghuAAAG4IDgDghuAAAG4IDgDg
+huAAAG4IDgDghuAAAG4IDgDghuAAAG4IDgDghuAAAG4IDgDghuAAAG4IDgDghuAAAG4IDgDgJnL0
+Av6ybNmy0NBQQoi3t3dMTAwhxM3NzXy3SZMm7dq1ixAiFosH6ebm5kZ3I4TI5fLZs2cTQuLi4mhF
+LBaz0eDgYLoRHh5OixKJxLyhWq2mo25ubr9+/WKdNRoNIWTmzJm0IpFIWOegoCCTJh4eHgNX9ccf
+fxBCfHx8oqOjCSGenp6DHNHIkSPZXJlMNnfuXEIIPS5CiFQqZaNjxoyhG9HR0bTo7u7e3d1NiwEB
+ASadPT092dxRo0YtWLCAEEKPi8uaNWvi4+MJIb6+vlFRUfR4u7q66Kifn5/J/nK5nD0vG502bRot
+jhw5srOzkxaVSqXJXC8vLzbX09NTr9eTAa+CQqFgo76+viZzvb292ahUKv3x48fANfv7+7M9N2zY
+0NzcTAiZPn06rfj4+LC53t7elpyWGTNm0CnmZ34gpVLJOnt5eZmM+vn5sVF2VunbxERaWlp7e/vA
+IzL/ObQP4xDIy8ujzd3c3FgxKSmJFtetWzcUTwpDoa6ujv2oPH78mBazs7NpJSgoyLHLAy7s1+Tx
+48dppaysjL2+Hz9+tLyVpV9VTp06FRYWJgiCIAienp579+7t6emxMbPM7dixIy4uTqFQJCYm2tKn
+oKAgMDBQEAQXF5eUlBT6G2n4NrFLn4qKCnudXl7Os/grV67I/y43N9eKPnq9PiMjw8PDgx7UwoUL
+eTssWrRIbkar1fL2cdTLamlwFBYWrl27try8vLKy8siRIydPnty9e7fdV/Py5cu4uDg/Pz/6AdI6
+VVVVycnJSUlJra2tWq1Wq9Vu3rx5+DaxV593797Z5fTycqrF//r1q6ur688B5s+fz9ukv79/6dKl
+t27dysnJ0el0paWlCQkJvE327ds3cBlqtVokEk2dOpW3j6NeVku/qvT19Q18mJqaqlAo/mlnG7+q
+JCQkaDQaCxdmbtu2baNHj+7t7aUPz58/LwhCfX39MG1ixz4U1+m1/auKAxdv7tKlS2Kx2OrpVH5+
+/ogRI968eWNjH6arq0smk2VmZtrSxJIz44CvKiNG/G1PmUxmUnEexcXF8+bNE4n++rtvQkKC0Wh8
++PDhMG1ixz4O4YSLr62tLS8v//z5s3XTr169OmPGjMmTJ+t0usrKyr6+PhvXc+PGjY6Ojo0bN9rY
+599kzZv/8+fPV69eTU5Otvtq7KK2tlalUrGHY8aMEYlEtbW1w7SJHfs4hLMtvqenJyQkZNq0aUql
+MiUl5du3b7wdXr165e/vHxMTEx4ePnHixICAgNu3b9uypAsXLkyZMkWtVtvS5F/GfTm2p6dnxYoV
+Uqk0Kyvrn/YJDQ3dtGkTIcTV1ZUVExIS6LUudll0KBiNxu7ubg8PD1YRBEEikbDrghZynib2OiLr
+SKVS+lKSAZdFIyIiaNGSS5IOXLy5yMjIe/fuRUVFGQyG27dv79y5MzU1lfdt//379+vXr2/fvv3R
+o0e9vb0ZGRmrVq16//49+yLApaampqSk5MyZM1bM5bVmzRr6OSsiIoJWlEole30HvyHABF9wGAyG
+lStXVlVVlZSUmF9tZmJjY2NjY02K27dv53ou6wiCIBaL2W0LVHd392/vzhiE8zSx1xFZR6FQnDt3
+zqS4YMECeruHJRy4eHORkZFsOz09vaWl5eDBg01NTezmF0u4u7sbjcaTJ0+KxWKJRHL27Nlr167d
+vHmT3WrB5eLFi2KxePXq1VbM5XX06FGTikqlMn99LcHxVcVgMKxevVqr1RYVFdGbtZxTUFBQfX09
+e9jS0tLb28t7G4zzNLFjH4dw5sXTW6Sampq4ZqlUqsDAQHYLokKh8PLyamhosGIB/f39ly9fXr58
+uVwut2K6A1kaHH19fWvXri0uLr5///7EiROHdE02mjVrVnFxcX9/P31YVFREi8O0iR37OIQzL/75
+8+eEkLFjx3LN0mg0DQ0N7D6m9vb2r1+/Dvw7juXu3r3b2NiYlpZmxVwHs/Dqy/r16wVBOHXqVPEA
+BoPB8us3lqBtY2JiIiIi6HZnZydvkxcvXri4uOzfv7+3t/fDhw8hISGLFy8evk3s1aerq8sup5eX
+Uy3+8OHDJSUlnz59ampqysnJkUgkSUlJvE0+fvwokUi2bNmi1+u/fPmSkpIil8ubm5t5+xiNxuXL
+l48bN66/v9+KudRvz4zV3SxnaXCY/68BIUSv19t5NWZ0Op0VffLy8kaNGkUvAWo0mtbW1mHdxC59
+qqur7XV6eTnP4gfeqSUSibZu3drR0cHbxGg0FhQU+Pv7C4JACAkICLhz544VTdra2lxdXQ8fPmzF
+XOa3Z8aWhhYSjL97u/4H/Pz5s6qqSiaTWfcZ0tma2LGPQzjP4r98+dLY2CgWi8eNG/fbf6S0kMFg
+qKioEARhwoQJLi4udlzhsPCfDQ4AGDpOevcnADgzBAcAcENwAAA3BAcAcENwAAA3BAcAcENwAAC3
+/wGl0FVoZvDCKwAAAABJRU5ErkJggg==
+"
+       height="40.830791"
+       width="183.73856" />
+    <image
+       y="95.332993"
+       x="317.29758"
+       id="image3535"
+       xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAWgAAABQCAIAAAC72Xj2AAAAA3NCSVQICAjb4U/gAAAIa0lEQVR4
+nO3aW0hUXRsH8LXVZlJHHcdjyYxDaJRWk5pppY0dxItUQjqQhyIoDI2QuvAiuojIIlOkIOh8YRdB
+0FUgCGpCDNnRiPAUmRYoaoSYpqnNe7Heb+E3O2WecdnMvPx/V3uetfczax/8OzN7K3a7nQEAUPi4
+ewIA4H0QHABAhuAAADIEBwCQITgAgAzBAQBkCA4AIFuS4Hjw4IGiKIqiaLVaUczPz+fFkpIS9Sa5
+ubl8NCMjgy8EBASoV7t//z4f1el0C0xgbGxM+Z+UlBS+cOzYMT46OjoqRhsbG3nx9u3bvKLX69UN
+b968yUdDQ0PFtsnJyXzhxIkTfLVv376J0ebmZocmw8PDYnTjxo18wWq18oXIyMgF9mhwcFBsa7FY
++MKpU6f46MDAgBh99uwZL9bV1fFKdHS0GLXZbA6dv379KkbXrVvHF86cOcNH+/v7xWhbWxsvXr16
+lVdiY2NFn9TUVF7MysriC0ajUWz76tUrh/f99OmTGH39+jUvXrp0iVfi4uLEmklJSQ6dzWaz2Pbd
+u3cOnbu6usTo6tWrHbZds2aN+vCeP3+ejyYkJIhiYmKiw7ZxcXGic0dHh0OT9+/fi9HOzk5ePHfu
+nMNM5s7/4sWL6snEx8fz0aqqKl558+aN2NZkMjnMKiUlRd2ksrKSj27atEkUxftWV1fzyosXL0Tn
+vr4+dZ/54BMHAJAhOACADMEBAGQIDgAgQ3AAABmCAwDIEBwAQIbgAAAyBAcAkCE4AIAMwQEAZAgO
+ACBDcAAAGYIDAMgQHABAhuAAADIEBwCQITgAgAzBAQBkCA4AIENwAAAZggMAyBAcAECG4AAAMgQH
+AJAhOACADMEBAGQIDgAgQ3AAABmCAwDIEBwAQIbgAAAyBAcAkCE4AIAMwQEAZAgOACBDcAAAGYID
+AMgQHABAhuAAADIEBwCQITgAgAzBAQBkCA4AIENwAAAZggMAyBAcAECG4AAAMgQHAJD5uXsC/9q7
+d298fDxjLCwsLDU1lTGm0WjUqyUmJlZUVDDGtFrtAt00Gg1fjTGm1+u3b9/OGEtPT+cVrVYrRmNj
+Y/nC+vXredHf31/dcMOGDXxUo9H8+vVLdLZarYyxbdu28Yq/v7/obDKZHJoEBATMndWOHTsYY+Hh
+4cnJyYyxoKCgBfYoMDBQbBsSErJz507GGN8vxphOpxOjMTExfCE5OZkXly9fPjk5yYsrV6506BwU
+FCS2DQ4Ozs7OZozx/SIpLCzMyMhgjEVERCQlJfH9nZiY4KNRUVEO6+v1evG+YnTz5s28GBERIdYs
+Li7Oysqar/PcNTmDwSA663S6Hz9+zN1WPRPG2JYtW/gm0dHRonjkyJGBgYG524pujLGwsDCHJuHh
+4eJ9DQYDX9i6dSsvzt02MDBwfHycMZaWlqaezNGjR4eHh/nREMdHdBb7LmZlNBrVTTIzM/mFqr4O
+5bAvgfr6et5co9GIYl5eHi8WFxcvxZvCUujr6xOXyvPnz3mxurqaV0wmk3unByTi3+SVK1d4pa2t
+TZzfz58/O9/K2a8qtbW1CQkJiqIoihIUFFRZWTk1NbXIzFI7efJkenq6wWDIzc1dTJ+Ghgaj0ago
+iq+v7/79+8fGxry6iZQ+nZ2dsg4vlayDwBgbHh42m816vb63t9eNk/GcJhL7kDgbHI2NjUVFRS9f
+vuzq6rpw4UJNTc3p06elz6a9vT09PT0qKkp8qHNBd3d3QUFBXl7e0NCQzWaz2WylpaXe20RWnw8f
+Pkg5vFSyDgJXXl7u4+MzOjo6Ozvrrsl4ThOJfcic/GQyOzs792VJSYnBYJhv5UV+VcnJybFarU5O
+TK2srGzFihXT09P85Z07dxRF6e/v99ImEvtwpMO7+K8qEif/+PFjo9F47949xlhPT48LHTzntLrl
+2nDDVxUfn/9bMyQkxKHiOVpaWnbt2uXn9+/vvjk5OXa7/enTp17aRGIft5A1+e/fv5eVld24cWPh
+X5H/wmQ8p4nEPlSu/PGPjIw8fPiwoKBA+myk6O3tNZvN4mVMTIyfnx/1K7HnNJHYxy1kTb6iosJq
+tS7y1xnPOa3efm2Qb8dOTU3t27dPp9Ndvnx5vnXi4+OPHz/OGFu2bJko5uTk8Htd4rboUrDb7ZOT
+kwEBAaKiKIq/v7+4e+ckz2kia49co9Pp+KlkjEVGRvIFi8XCi+pbkmpSJt/Q0PDkyZOOjg7SVg5w
+bRQWFo6MjDDGLBYLr0RGRorzS/ooRwuOmZmZgwcPdnd3t7a2hoaGzrdaWlqa+gZ1eXk56b1coyiK
+VqsVjy1wk5OTf3w6YwGe00TWHrnGYDDcunXLoZidnc0f93CGlMmXlpbW1NSI5HINro2qqiqHitls
+Vp9fZxCCY2Zm5tChQzabrbW1lT+s5ZlMJlN/f794OTg4OD09TX0MxnOaSOzjFlIm/+XLl7q6urq6
+OsbY6OgoYyw/P3/37t3Xrl37+5PxnCYS+1A5Gxyzs7NFRUUtLS3Nzc1r165d0jktUmZmZlNT0+/f
+v/nPt01NTbzopU0k9nELKZO/fv26WG5vb7979+6BAwf4E8Z/fzKe00RiHzIn774cPnxYUZTa2tqW
+OWZmZpy/f+MM3jY1NdVisfDl8fFxapO3b9/6+vqePXt2enr648ePq1at2rNnj/c2kdVnYmJCyuGl
+knUQhEePHjFXb8d6zmn1qGvDBc4Gxx+f8B8bG5M8G5WOjg4X+tTX1wcHB/N7VFardWhoyKubSOnT
+09Mj6/BSyToI3GKCQ9ZkPKeJxD4kiv1Pf67/AT9//uzu7g4JCZl7s8p7m0js4xYeNXnPOa3ee238
+Z4MDAJaOhz79CQCeDMEBAGQIDgAgQ3AAABmCAwDIEBwAQIbgAACyfwCN9r8FuibJ1gAAAABJRU5E
+rkJggg==
+"
+       height="40.830791"
+       width="183.73856" />
+    <image
+       y="551.9231"
+       x="756.41528"
+       id="image3546"
+       xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAWgAAABQCAIAAAC72Xj2AAAAA3NCSVQICAjb4U/gAAAIiUlEQVR4
+nO3ab0hTXRwH8HPSNnTT6ZxaiDokwzRdWaaVa/ZHfJFWDMPSNIKiqIj+vBCygpA0sqS3/SPIiKCX
+BYFkswjLygp6YS7TlERRI8pWM7U9L87zHPbsquzoVe/G9/Pq7nfu/e3ce9bXrXupy+UiAAAi5s31
+BADA9yA4AEAYggMAhCE4AEAYggMAhCE4AEAYggMAhM1IcNy+fZtSSilVq9W8uGXLFlYsLS2VHpKf
+n89Gs7Oz2UZwcLB0t5s3b7JRrVY7yQSGhobof1asWME29u7dy0a/f//OR+vr61nx2rVrrBIWFiZt
+eOXKFTYaHh7Oj01PT2cbBw4cYLt9/fqVjz5+/NijycDAAB9dtmwZ27BYLGwjKipqkjPq6+vjx5pM
+JrZx5MgRNtrb28tHnz175nFsT08PH01NTWUbx44dY6Nfvnzho0uXLmUbJ06cYKPd3d18tLm5mRUv
+XrzIKvHx8fxdMjIyWDEnJ4dtxMbG8mNfv37tMauOjg4+2tLSworV1dW8Mx9NSkpiGydPnpReGX41
+Tp06xSptbW382MWLF3vMKikpSdrk7NmzbDQ5OZkXU1JSPI5dtGgR79za2urR5P3793z0w4cPrHj6
+9GmPmVBKjUYj2zh37px0MomJiWy0qqqKVd68ecOP/fTpk/QQqfLycrb/ypUreZG/b01NDau8fPmS
+d+7q6vKmM4NvHAAgDMEBAMIQHAAgDMEBAMIQHAAgDMEBAMIQHAAgDMEBAMIQHAAgDMEBAMIQHAAg
+DMEBAMIQHAAgDMEBAMIQHAAgDMEBAMIQHAAgDMEBAMIQHAAgDMEBAMIQHAAgDMEBAMIQHAAgDMEB
+AMIQHAAgDMEBAMIQHAAgDMEBAMIQHAAgDMEBAMIQHAAgDMEBAMIQHAAgDMEBAMIQHAAgDMEBAMIQ
+HAAgDMEBAMIQHAAgDMEBAMIQHAAgDMEBAMIQHAAgDMEBAMIQHAAgDMEBAMIQHAAgDMEBAMIQHAAg
+LHCuJ/Cvbdu2JSYmEkIiIiIyMjIIISqVSrpbSkrK0aNHCSFqtXqSbiqViu1GCAkLC1u3bh0hJCsr
+i1XUajUfjY+PZxupqamsGBQUJG2YlpbGRlUq1Z8/f3hni8VCCFm7di2rBAUF8c5xcXEeTYKDg91n
+tX79ekKIwWBIT08nhISEhExyRhqNhh+r0+k2bNhACGHnRQjRarV8NCYmxuNY91GdTrdp0yZCSE5O
+DquEhITw0dDQ0NzcXEIIOy8hxcXF2dnZhJDIyMjly5ez8/316xcbjY6O9tg/LCyMvy8fXbVqFStq
+NBqHw8FnODQ0RAhh/T2Ulpb29PQQt1XQ6/W8s1ar/fnzp/uspDMhhKxevZodsmDBAl7cvXt3b2+v
++7G8GyEkIiLCo4nBYODvq9fr2caaNWtY0f1YfnaZmZnSyezZs2dgYIBdDX593D850kOkzGYz+6BK
+P4fycM2Auro61lylUvFiQUEBK+7atWsm3hRmQldXF/+ovHjxghVrampYJS4ubm6nB0L4n8kLFy6w
+SnNzM1/fz58/e9/K258qtbW1ycnJlFJKaUhISHl5+fDw8DQzS+rw4cNZWVl6vT4/P386fR4+fBgb
+G0spDQgI2L59O/t75btNZOkzOys4Lj+7kopqcuPGjZiYGLasgYGBhYWF7FvSTPM2OOrr60tKSl69
+etXW1lZZWXnp0qXjx4/LPpt3795lZWVFR0fzL3VTYLfbrVZrQUFBf39/U1NTU1PT/v37fbeJXH1m
+ZwWl/O9KKqcJIcRgMFRWVra0tHz8+PHOnTtPnz7dsWPHFPoI8/KbydjYmPvL0tJSvV4/0c7T/KmS
+l5dnsVi8nJjUwYMHFy5cODIywl5ev36dUtrd3e2jTeTqI7SC3PR/qvjflVROE6nq6mpKqcPhGHd0
+Dn6qzJv3vz11Op1HRTlsNtvGjRsDA//9f9+8vDyXy9XY2OijTeTqM1cr6H9XUjlNpHp6egwGw7j/
+wS+vqXx0BgcH7969a7VaZZ+NLDo7O41GI38ZExMTGBjY2dnpo01k7MPN5gr635VUThPu8uXL1dXV
+RUVF9+7du3XrFqV0an28J3w7dnh4uLCwUKvVnj9/fqJ9EhMT9+3bRwiZP38+L+bl5bF7Xfy26Exw
+uVxOpzM4OJhXKKVBQUH8vqCXlNNErjPivFlBTqvVsqUkhERFRbENk8nEitJbklL+dyWV04S7f//+
+jx8/7HZ7WlpaZGTkRLsVFxcPDg4SQkwmE6tERUXx9Z38gQAPYsExOjpaVFRkt9ufPHkSHh4+0W6Z
+mZnSG9SHDh0Seq+poZSq1Wqn0+ledDqdol/elNNErjNivFxBTq/XX7161aOYm5vLHvfwhv9dSeU0
+4RoaGgghDoejrKwsNze3o6Nj3Mc9qqqqPCpGo1G6vt4Q+KkyOjq6c+fOpqamhoYG9rCWMsXFxXV3
+d/OXfX19IyMjoo/BKKeJjH3mZAX970oqp4kHjUZTUVHx7du358+fT6ePN7wNjrGxsZKSEpvN9ujR
+oyVLlszonKbJbDbbbLa/f/+ylyyMzWazjzaRq89craD/XUnlNJFij5xO/ly1PLy8+1JWVkYpra2t
+tbkZHR31/v6NN1jbjIwMk8nEtie6sTSJt2/fBgQEVFRUjIyMtLe3JyQkbN682XebyNVndlZQyv+u
+pHKauFyuM2fONDY29vX19ff3P3jwICEhwWg0Op3OKbQS4m1wjPuE/9DQkMyzkWhtbZ1Cn7q6utDQ
+UHavy2Kx9Pf3+3QTWfrMzgqOy8+upKKaWK1Wfk+XUrp169b29vYp9BFFXeP9c/UDv3//ttvtOp3O
+/aaX7zaRsc+c8L8rqZwmDoeDPacXHx+v0Wim3EeI3wYHAMwchT79CQBKhuAAAGEIDgAQhuAAAGEI
+DgAQhuAAAGEIDgAQ9g8gquH2n03rCAAAAABJRU5ErkJggg==
+"
+       height="40.830791"
+       width="183.73856" />
+    <image
+       y="486.95435"
+       x="756.41528"
+       id="image3557"
+       xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAWgAAABQCAIAAAC72Xj2AAAAA3NCSVQICAjb4U/gAAAJkElEQVR4
+nO3bW0hU2x8H8LVTZxwdb6OOlXktozQbNbxQ1ngsmQe1QrJSmyIw7EYXI4TKiCSLNN/VwD8YFr2F
+D4FlJoTktSjBC3lF0bxUYt7H5jys81/MmTGZZVsdD9/P05611v7NWnvZ1xn3TtDr9QQAgMe61Z4A
+AKw9CA4A4IbgAABuCA4A4IbgAABuCA4A4IbgAABuyxIcT548EQRBEASpVMoaDx48SBu1Wq3pKQkJ
+CbQ3OjqaHtjZ2ZkOKykpob1yuXyRCYyPjwv/t2vXLnqQnp5Oe8fGxlhvRUUFbSwuLqYtzs7OpgUL
+Cwtpr4uLCzs3LCyMHpw9e5YOGx0dZb1v3rwxKjI8PMx6Q0JC6IFaraYHSqVykRUNDg6yc1UqFT24
+dOkS7R0YGGC97969Mzq3v7+f9QYHB9ODq1ev0t6+vj7Wu2PHDnpw7do12tvb28t6a2traWN+fj5t
+8fHxYe8SHh5OG2NiYuiBl5cXO7ehocFoVp2dnay3sbGRNt6/f59VZr3btm2jBzdu3DC9Muxq3Lp1
+i7a0tbWxcz99+mQ0vqWlhfUGBAQYzTkwMJCNDAoKMurdsmULO7elpcWo8ufPn1lva2srbczOzqYt
+W7duZb2+vr704N69e6YrYrPKzc2lLU1NTezcjo4Oo/GNjY2st7Oz07Qgw943Ly+PttTV1bFze3p6
+FjnXCD5xAAA3BAcAcENwAAA3BAcAcENwAAA3BAcAcENwAAA3BAcAcENwAAA3BAcAcENwAAA3BAcA
+cENwAAA3BAcAcENwAAA3BAcAcENwAAA3BAcAcENwAAA3BAcAcENwAAA3BAcAcENwAAA3BAcAcENw
+AAA3BAcAcENwAAA3BAcAcENwAAA3BAcAcENwAAA3BAcAcENwAAA3BAcAcENwAAA3BAcAcENwAAA3
+BAcAcENwAAA3BAcAcENwAAA3BAcAcENwAAA3BAcAcENwAAA3BAcAcENwAAA3BAcAcENwAAA369We
+wD8OHz4cEBBACHF1dQ0PDyeESCQS02FBQUFXrlwhhEil0kWqSSQSOowQ4uzsvG/fPkJIVFQUbZFK
+pazXx8eHHgQHB9NGmUxmWnDnzp20VyKRzM7OsspqtZoQsmfPHtoik8lYZW9vb6MidnZ2hrP666+/
+CCFubm5hYWGEEAcHh0VWZG9vz851cnKKjY0lhNB1EULkcjnr9fT0NDrXsNfJyenAgQOEkJiYGNri
+4ODAeh0dHePi4gghdF1cUlNTo6OjCSHu7u6hoaF0vZOTk7TXw8PDaLyzszN7X9YbERFBG+3t7Scm
+JtgMx8fHCSG0vhGtVtvf308MdkGhULDK7u7uRuNdXV1Zr1wu//nzp+Gc169fz0aeOnVqYGDAsJeN
+p3WMKru5ubHKCoWCHuzevZs2Gp7LVhcZGWm6otOnTw8PD9Orwa6P4U+O0fjFe5eLfhmUlpbS4hKJ
+hDUmJibSxhMnTizHm8Jy6OnpYT8q79+/p415eXm0xdvbe3WnB1zYr8mHDx/SltraWra/3d3d5pcy
+96tKQUFBYGCgIAiCIDg4OGRlZc3MzPxhZpm6ePFiVFSUQqFISEj4kzovX7708vISBMHKyio5OZn+
+vlq7RUSpszI7uCDLuZJlZWXO/1ZcXLxakxGliF6vv337tqOjI93Z8PDwhoaGJdThZW5wVFRUpKWl
+1dfXt7W15eTkPHr0KDMzU/TZfPz4MSoqysPDg32oW4L29vakpKTExMShoaGampqampqMjIy1W0Ss
+Oiuzg6Ys6krOzs5OTk7+zwD94rbykxFrRUVFRTk5Obm5uSMjI83NzTY2NgkJCVNTU0soxcfMTybz
+8/OGL7VarUKh+N3gP/yqotFo1Gq1mRMzdf78+Q0bNszNzdGXjx8/FgSht7d3jRYRqw7XDjJ//lXF
+oq5kSUmJVCrlPWs5JiPWipKTk1UqFXtZUVFBCKmrq1tw8Cp8VVm37l8jnZycjFosR1VV1f79+62t
+//m7r0aj0ev1b9++XaNFxKqzWjtoUVeS6urqqq+vHxkZWdrpFrUiT0/P0dFRnU5HXw4ODq5bt87w
+T7zLZCk/OiMjI8+ePUtKShJ9NqLo6ury9fVlLz09Pa2trbu6utZoERHrMCu5gxZ1JQkhMzMz/v7+
+ERERSqUyOTn5x48fvBUsakVZWVlubm7x8fGFhYU5OTnXr1/Pzc318vLircOL+3bszMzMkSNH5HL5
+gwcPfjcmICDgzJkzhBAbGxvWqNFoaBCy26LLQa/XT09P29nZsRZBEGQyGbsvaCbLKSLWihhzdpCR
+y+V0KwkhSqWSHqhUKtpoekvSlOVcSUJISEjIq1evQkNDdTpdeXn55cuXtVpteXn5yk9GrBW5ubkd
+OnQoPz+/o6Pj+/fvfn5+7Ca9qdTUVPo5S6VS0RalUsn2d/EHAozwBYdOpzt27Fh7e3t1dbWLi8vv
+hkVGRpreoL5w4QLXey2NIAhSqXR6etqwcXp6esGnMxZhOUXEWhFl5g4yCoWiqKjIqDEuLo4+7mEO
+y7mShJCQkBB2nJ6ePjg4mJ2d3d/fb/rwy3JPRqwVZWZmlpWV1dbWBgUFzc/PZ2VlxcbGNjc3b968
+2XRwbm6uUYuvr6/p/pqD46uKTqdLSUmpqamprKykD2tZJm9v797eXvZycHBwbm7O9HGstVJExDqr
+soMWdSWN0Me66PNjKzwZsVb09OnTlJSUoKAgQoiVldWdO3dmZmZevHjBW4eXucExPz+flpZWVVX1
++vXr7du3L+uc/tDevXurqqp+/fpFX1ZWVtLGNVpErDqrtYMWdSWNNDU1EUI2bdq08pMRa0W2traG
+n1ymp6f1er2trS1vHW5m3n05efKkIAgFBQVVBnQ6nfn3b8xBy4aHh6tUKno8MTHBW+TDhw9WVlY3
+b96cm5v78uWLv79/fHz82i0iVp2V2UFTFnUl7969W11d/fXr1/7+/sLCQplMlpiYuCqTEWtFGRkZ
+MpmsvLxcp9MNDw8fPXpUIpG0trYuoRQXc4PD9P8aEELGx8dFno2JlpaWJdQpLS11dHSk97rUavXQ
+0NCaLiJKnZXZwQVZzpXUaDRs7dbW1ufOnRsbG1utyYhSZGxs7Pjx4/TxU0LIxo0bnz9/voQ6vAT9
+Qv9c/wOmpqba29udnJwMb3qt3SIi1lkVlnMlv3371tfXJ5VK/fz8FvyPlCs5GbH2dHx8vLu728HB
+wcvLiybIcvvPBgcALB8LffoTACwZggMAuCE4AIAbggMAuCE4AIAbggMAuCE4AIDb35dk94l+Z3As
+AAAAAElFTkSuQmCC
+"
+       height="40.830791"
+       width="183.73856" />
+    <image
+       y="421.9856"
+       x="756.41528"
+       id="image3568"
+       xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAWgAAABQCAIAAAC72Xj2AAAAA3NCSVQICAjb4U/gAAAJKElEQVR4
+nO3bWUxTTR8G8DmyNIWWQoGiQdaIRhDKEpYoWlxIYwRjQGIA0YgY1+B2YaJygxEXlDsvEJXPYIw3
+XnFhRBFJDBFRMBoDVAUhNCCLkSCVpdDvYr5v0rdV0mkPUN48v6vTmTP/zumMD9RzEEwmEwEA4LFs
+sScAAEsPggMAuCE4AIAbggMAuCE4AIAbggMAuCE4AIDbvATHgwcPBEEQBEEikbDGnTt30saCggLr
+IRkZGbQ3NTWVHnh4eFifVl1dTXtlMtkcExgbGxP+LyEhgR4UFRXR3tHRUdZbV1dHG6uqqmiLt7e3
+dcHKykra6+Pjw8bGx8fTgyNHjtDTRkZGWO+LFy8sigwNDbHe2NhYeqDRaOiBSqWa44oGBgbYWLVa
+TQ+Ki4tpb39/P+t99eqVxVi9Xs96o6Oj6cHp06dpb19fH+tdt24dPTh79izt7e3tZb3Nzc208caN
+G7QlJCSEvUtiYiJtTEtLowdBQUFs7Nu3by1m1dXVxXrfvXtHG69cucIqs962tjaLsTqdjvWuWbOG
+Hly8eJH2dnZ2st4PHz5YjG1vb2e9ERERFnOOjIxkZ0ZFRVn0rlq1io1tb2+3qPzx40fW29HRQRtL
+Skpoy+rVq1lvaGgoPbh8+bL1WrNZlZWV0ZbW1lY29uvXr9ZDmPDwcHratWvXrHvZ+5aXl9OWN2/e
+sMo9PT1zVLaA3zgAgBuCAwC4ITgAgBuCAwC4ITgAgBuCAwC4ITgAgBuCAwC4ITgAgBuCAwC4ITgA
+gBuCAwC4ITgAgBuCAwC4ITgAgBuCAwC4ITgAgBuCAwC4ITgAgBuCAwC4ITgAgBuCAwC4ITgAgBuC
+AwC4ITgAgBuCAwC4ITgAgBuCAwC4ITgAgBuCAwC4ITgAgBuCAwC4ITgAgBuCAwC4ITgAgBuCAwC4
+ITgAgBuCAwC4ITgAgBuCAwC4ITgAgBuCAwC4ITgAgBuCAwC4ITgAgBuCAwC4ITgAgBuCAwC4ITgA
+gJvrYk/gf3bt2hUREUEI8fX1TUxMJIS4u7tbnxYVFXXq1ClCiEQimaOau7s7PY0Q4u3tvWnTJkJI
+SkoKbZFIJKw3JCSEHkRHR9NGqVRqXTAmJob2uru7T01NscoajYYQsmHDBtoilUpZ5eDgYIsiHh4e
+5rPavHkzIcTPzy8+Pp4QIpfL57giT09PNlahUGzZsoUQQq+LECKTyVhvYGCgxVjzXoVCsW3bNkJI
+WloabZHL5azXy8srPT2dEEKvi0teXl5qaiohxN/fPy4ujl6vwWCgvQEBARbne3t7s/dlvUlJSbTR
+09NzfHycNqpUKouxPj4+bKxcLh8bGyNmq6BUKlmvv7+/xVhfX1/WK5PJfv36ZT7n5cuXszP379/f
+399v3svOp3UsKvv5+bHKSqWSHqxfv542mo9lV5ecnEysHDhwYGhoiH4a7PMx3znWQ5jCwsKRkRFC
+CP1HNI9M86CmpoYWd3d3Z42ZmZm0ce/evfPxpjAfenp62FZ5/fo1bSwvL6ctwcHBizs94MJ+TF6/
+fp22NDc3s/X99u2b7aVs/apSUVERGRkpCIIgCHK5/Ny5c5OTkw5mlrUTJ06kpKQolcqMjAxH6jx5
+8iQoKEgQBBcXl5ycHPoTaekWEaXOwqzgHzk++Y6ODlH2xsOHD73/qaqqyo46zrM3tm/f7m3Fjjq8
+bA2Ourq6/Pz8lpaWzs7OS5cu3bx588yZM6LP5v379ykpKQEBAeyXOjvodLqsrKzMzMzBwcGmpqam
+pqbDhw8v3SJi1VmYFbQmyuQ/ffokyt6YmpoyGAz/MUO/uHFxqr1x/vx588uJiYlxdV2Q/3+w8TeT
+mZkZ85cFBQVKpfJvJzv4VUWr1Wo0GhsnZu3YsWMrVqyYnp6mL+/cuSMIQm9v7xItIlYdrhVkHP+q
+ItaHQDm4N6qrqyUSid3DKafaG+YMBoNCoSguLv7bCYvwVWXZsn+cqVAoLFqcR0NDw9atW1nuarVa
+k8n08uXLJVpErDqLtYJifQgi6u7ubmlpGR4etm+4U+0Nc48fPx4dHT148KAjRWxkz9YZHh5+9OhR
+VlaW6LMRRXd3d2hoKHsZGBjo6ura3d29RIuIWIdZyBUUffIOmpycDA8PT0pKUqlUOTk5P3/+5K3g
+VHvD3N27dxMSEmJiYhwpYiPur0OTk5O7d++WyWRXr1792zkRERGHDh0ihLi5ubFGrVZL73Wx26Lz
+wWQyTUxMeHh4sBZBEKRSKbsvaCPnKSLWFTG2rCAjk8noUhKz26JqtZo2Wt+StCbu5B0UGxv77Nmz
+uLg4o9FYW1t78uTJgoKC2tpariLOszfMdXV1NTY23rp1a45z8vLy6O9ZarWatqhUKra+cz8QYIEv
+OIxG4549e3Q6XWNjo4+Pz99OS05Otr5Bffz4ca73so8gCBKJZGJiwrxxYmLij09nzMF5ioh1RZSN
+K8golcrbt29bNKanp9PHPWwh4uQdFxsby46LiooGBgZKSkr0er31wy9zcJ69Ye7evXsSiSQ3N3eO
+c8rKyixaQkNDrdfXFhxfVYxGY25ublNTU319PX1YyzkFBwf39vaylwMDA9PT09aPYy2VIiLWWZQV
+FGvy84E+1qXX67lGOdXeoGZnZ+/fv5+dnb0w92KJ7cExMzOTn5/f0NDw/PnztWvXzuucHLRx48aG
+hobZ2Vn6sr6+njYu0SJi1VmsFRTrQ5gPra2thJCVK1dyjXKqvUE9ffq0r6+vsLDQvuH2sPHuy759
++wRBqKioaDBjNBptv39jC1o2MTFRrVbT4/Hxcd4ibW1tLi4uFy5cmJ6e/vLlS3h4+I4dO5ZuEbHq
+LMwKWhNl8gaDQZS9UVpa2tjY+P37d71eX1lZKZVKMzMzeYs41d6gsrOzw8LCZmdn7a7Ay9bgsP5b
+A0LI2NiYyLOx0t7ebkedmpoaLy8veq9Lo9EMDg4u6SKi1FmYFfwjxyf/+fNnUfaGVqtlw11dXY8e
+PTo6OspbxORke2NoaMjNza20tNS+4fYRTH/65/ov8Pv3b51Op1AozG96Ld0iItZZFM4z+R8/fvT1
+9UkkkrCwsD/+IaWNnGpvLLx/bXAAwPxx0qc/AcCZITgAgBuCAwC4ITgAgBuCAwC4ITgAgBuCAwC4
+/Rd1zqZZsxMHwwAAAABJRU5ErkJggg==
+"
+       height="40.830791"
+       width="183.73856" />
+    <image
+       y="357.01688"
+       x="756.41528"
+       id="image3579"
+       xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAWgAAABQCAIAAAC72Xj2AAAAA3NCSVQICAjb4U/gAAAJh0lEQVR4
+nO3caUhUXx8H8HNdxm3cxnFJGTXLMC2nDJdKmzLEF2qCaG5pBIVREWGEkCXFkEaa+FYrggyLehUW
+gWRahKRpBRnuK4nikpi55dh9XpznOfifKZkz//FxlO/n1Znfuec3Z+7Y1xnvJUEURQIAwMNsrTcA
+AOsPggMAuCE4AIAbggMAuCE4AIAbggMAuCE4AIDbqgTHw4cPBUEQBMHKyooVjxw5QotZWVm0Mjc3
+J/xPWFgYHURGRtKBra0tm33x4gVdcv/+fVqRSqUrbGB6epqt3bNnDx2cPHmSzk5NTbHZmpoaWrxz
+5w6tODk56TYsLy+ns87OzmxtSEgIHZw+fZoeNjExwWZfv36t1WRsbIzN7tq1iw5UKhUduLm5rfCK
+RkZG2FqlUkkH58+fp7PDw8Ns9t27d7RYVlZGKx4eHmy2oaFBq/O3b9/Y7I4dO+jg4sWLdHZwcJDN
+NjY20mJJSQmt+Pj4sD6hoaG0ePDgQTpQKBRsbXNzs9bz9vb2stmWlhZaLCoqYp3ZbEBAAB1cvnxZ
+98yws3HlyhVa6ejoYGu3bdumtauAgADdJtevX6ezgYGBrBgUFKS1duvWraxzW1ubVpMvX76w2fb2
+dlq8evWq1k4EQfD19aWDGzdu6G7G39+fzhYWFtLKx48f2dqenh6t41taWthsb2+vbkOGPW9xcTGt
+NDU1sbUDAwMrrNWCTxwAwA3BAQDcEBwAwA3BAQDcEBwAwA3BAQDcEBwAwA3BAQDcEBwAwA3BAQDc
+EBwAwA3BAQDcEBwAwA3BAQDcEBwAwA3BAQDcEBwAwA3BAQDcEBwAwA3BAQDcEBwAwA3BAQDcEBwA
+wA3BAQDcEBwAwA3BAQDcEBwAwA3BAQDcEBwAwA3BAQDcEBwAwA3BAQDcEBwAwA3BAQDcEBwAwA3B
+AQDcEBwAwA3BAQDcEBwAwA3BAQDcEBwAwA3BAQDcEBwAwA3BAQDcEBwAwA3BAQDcEBwAwA3BAQDc
+EBwAwM1iLZ/bwuLChQt07OzsvH//fkKIi4tLaGgondVoNHTWz8+PDoKCgugSKyurFTpLJBLW2cnJ
+6cCBA4SQiIgIWrGysmKzPj4+dLBz505atLGx0W0YHBxMZyUSya9fv1hnlUpFCKE7p2tZZ29vb60m
+tra2y3d16NAhQohcLg8JCSGE2Nvbr/CK7Ozs2FpHR8fo6GhCCH1dhBCpVMpmvby86CAkJIQWra2t
+5+fnadHT01Ors729PVvr4OAQExNDCKGvi0tGRkZkZCQhxNXVdffu3fT1zs7O0ll3d3et452cnNjz
+stmwsDBatLOzm5mZYTucnp4mhND+WrKysoaGhsiyd0Emk7HOUqn058+fy3eluxNCyN69e+kSDw8P
+Vjx+/Pjw8PDytawbIcTFxUWriVwuZ88rk8noYN++fbS4fC17deHh4bqbOXHixNjYGD0b7Pws/8nR
+On7l2dUiroLKykraXCKRsGJCQgItHjt2bDWeFFbDwMAA+1F5//49LRYXF9OKt7f32m4PuLBfk7du
+3aKVxsZG9v729/fr30rfryqlpaWBgYGCIAiCYG9vn5eXt7Cw8C8zS9e9e/e8vLzos1hYWCQnJ9PI
+5/Xy5UuFQiEIgrm5eUpKCv19tX6bGKVPe3v7uXPnIiIiZDJZfHy8YdswzAY7kybVRBTFgoICBwcH
++q8mNDS0ubnZgD689A2OmpqazMzMDx8+dHR0qNXq27dv5+bmGn03crlcrVa3tLR0dXVVVVW9ffs2
+LS2Nt0lnZ2dSUlJCQsLo6GhDQ0NDQ0NOTs76bWKsPl+/fv38+XNERIS7uzv7zPx/sPHOpOk0IYRU
+VFSo1erCwsLx8fHW1lZLS8v4+Pi5uTkDWvHR85PJ0tLS8odZWVkymexvBxvrq0pRUZEgCHoezJw5
+c2bTpk2Li4v04d27dwVBGBwcXKdNjNiHio2NValUeh7877+qbLwzaTpNRFFMSUlRKpXsYU1NDSGk
+qanpjwevwVcVM7N/HOno6KhVWQ1DQ0NyuZx3VV1d3eHDhy0s/vt339jYWFEU6+vr12kTI/ZZExvv
+TJpOE0KIl5fXxMQEu4wwMjJiZma2/E+8q8SQf/zj4+OPHz9OSkoy+m6osrKyoqKi1NTUp0+fPnjw
+gHd5X1+fr68ve+jl5WVhYdHX17dOmxixz5rYeGfSdJoQQvLy8uRyeVxcXHl5uVqtvnTpUmFhoUKh
+4O3Di/ty7MLCQnJyslQqvXnz5t+O8ff3P3XqFCHE0tKSFWNjY2kQssuif1NdXf3jx4/Ozs7g4GBX
+V1eu7YmiOD8/b2tryyqCINjY2LDrgnoynSbGekWGkUql9K0khLi5udGBUqmkRd1Lkro23pk0nSaE
+ELlcnpiYWFJS0tPTMzk5uXnzZnaRXldGRsb4+DghRKlU0oqbmxt7f1e+IUALX3BoNJrU1NTOzs43
+b944Ozv/7bDw8HDdC9Rnz57V81lqa2sJITMzM9nZ2TExMd+/f9d/h4IgWFlZsdsWqPn5+T/enbEC
+02lirFdkGJlMVlFRoVWMiYmht3voY+OdSdNpQgjJzc2tqqpqbGwMCgpaWlrKy8uLjo5ubW3dsmWL
+7sGFhYVaFV9fX933Vx8cX1U0Gk16enpDQ0Ntba2/v78BT8bFzs4uPz9/cnKSd6G3t/fg4CB7ODIy
+sri4qHs71nppYsQ+a2LjnUnTaUIIefToUXp6elBQECHE3Nz82rVrCwsLz5494+3DS9/gWFpayszM
+rKure/Xq1fbt21d1Twy9f45XVFRUXV3d79+/6UP6+SUqKmqdNjFinzWx8c6k6TQh/7wtmBAyPz8v
+iqK1tTVvH256Xn3Jzs4WBKG0tLRuGY1Go//1G30UFBTU19ePjIyMjo4+f/7cz8/P19eXt8mnT5/M
+zc3z8/MXFxe7u7v9/Pzi4uLWbxNj9ZmdnaXvWmhoqFKppOOZmRkD9sNl451J02kiimJOTo6NjU11
+dbVGoxkbGzt69KhEImlvbzegFRd9g+OPd/hPT08bdzdJSUnsApUgCImJid3d3Qb0qaysdHBwoK1U
+KtXo6Oi6bmKUPl1dXbrvYFtbm2H74bLBzqRJNZmamkpLS6O3nxJCPD09nzx5YkAfXoIoiqvxQcZg
+MzMz9KYjHx8fOzs7g/vMzc11dnY6Ojouv+i1fpsYsc+a2Hhn0nSaEEKmp6f7+/vt7e0VCgVNkNVm
+csEBAKYP/x8HAHBDcAAANwQHAHBDcAAANwQHAHBDcAAANwQHAHD7D6vNDk78iVEhAAAAAElFTkSu
+QmCC
+"
+       height="40.830791"
+       width="183.73856" />
+    <image
+       y="292.04813"
+       x="756.41528"
+       id="image3590"
+       xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAWgAAABQCAIAAAC72Xj2AAAAA3NCSVQICAjb4U/gAAAKoklEQVR4
+nO3cWUwT3x4H8DOCrdCybyphNS5YpYqiqCB/MYQHXBJwQRBNjEajxhhNxLhFJYKRJTzog6jRiFtM
+fHCLCQkCxqAoKA8atSwqYkAKbljWYu/DufeE2yq3vzpcpPl+nqa/M/ObM9PO19KZKJlMJgYAQDFq
+uCcAACMPggMAyBAcAECG4AAAMgQHAJAhOACADMEBAGRDEhyXLl2SJEmSJKVSKYrLli3jxfT0dF7p
+6uqS/mPOnDl8ITo6mi84OzuL0bt37/JNzp8/zytqtXqQCXR0dIhtZ82axRc2btzIR799+yZGi4uL
+efHMmTO84u7ubtnw9OnTfNTDw0NsGxERwRe2bNnCV2tvbxej9+/fN2ui1+vF6IwZM/hCbGwsX/D1
+9R3kiFpaWsS2Wq2WL+zYsYOPNjc3i9GHDx/yYkFBAa+MHTtWjFZUVJh1bmpqEqPTpk3jC7t37+aj
+jY2NYrSyspIXc3NzeSUoKEj0iYyM5MV//vmHLwQEBIhtq6qqzPbb0NAgRqurq3kxOztbdBajU6ZM
+4Qv79u2zPDPibBw4cIBX3rx5I7adNGmS2aymTJli2eTIkSN8dOrUqaKo0Wh48fDhw5abhIWF8dGj
+R49ajgoHDx40m4kkScHBwXzh2LFjfLWamhoxWltba9bk2bNnYrS+vn6Q3QkZGRl8/dmzZ4ui2G9O
+Tg6vPHnyRHR+//69NZ05fOMAADIEBwCQITgAgAzBAQBkCA4AIENwAAAZggMAyBAcAECG4AAAMgQH
+AJAhOACADMEBAGQIDgAgQ3AAABmCAwDIEBwAQIbgAAAyBAcAkCE4AIAMwQEAZAgOACBDcAAAGYID
+AMgQHABAhuAAADIEBwCQITgAgAzBAQBkCA4AIENwAAAZggMAyBAcAECG4AAAMgQHAJAhOACADMEB
+AGQIDgAgQ3AAABmCAwDIEBwAQIbgAAAyBAcAkCE4AIAMwQEAZAgOACBDcAAAGYIDAMgQHABAhuAA
+ADLH4dy3o+POnTv5soeHx4IFCxhjXl5ekZGRfNRoNPLR0NBQvqDRaPgmSqVykM4KhUJ0dnd3X7hw
+IWMsKiqKV5RKpRgNCgriC9OnT+dFJycny4bh4eF8VKFQ9Pb2is6xsbGMMT5zvq3oHBgYaNbE2dl5
+4KwWLVrEGPP29o6IiGCMubi4DHJEKpVKbOvm5hYXF8cY48fFGFOr1WLU39+fL0RERPDimDFjuru7
+eXH8+PFmnV1cXMS2rq6u8fHxjDF+XCSpqanR0dGMMR8fn5kzZ/Lj7ezs5KN+fn5m67u7u4v9itE5
+c+bwokqlMhgMYoYdHR2MMd7fTHp6+sePH9mAd8HT01N0VqvVP378GDgry5kwxubNm8c3GTt2rCiu
+X7++ubmZj1pusn79+k+fPrEBn6tfmj9/Pu8sZjLw6ObOncsrvr6+A68FsyZ+fn4DPzmD7E6IiYnh
+H1TLz6E8TEOgqKiIN1coFKK4dOlSXly7du1Q7BSGwvv378VH5fHjx7yYk5PDK4GBgcM7PSAR/0ye
+OHGCVyorK8X7++7dO+tbWfunSn5+/tSpUyVJkiTJxcUlIyOjp6fnDzPL0rlz5/z9/fleHB0dV6xY
+wSOf6t69ewEBAZIkOTg4rFy5kv97NXKbyNLn9evX27dvj4qK8vT0XLJkiW3TsI2dnUmTyXTo0CFX
+V1f+QY2MjKyqqqI26e/v37t3r0qlkiRJqVRu2bKlr6+P2oTJd8lQWRscxcXFaWlpT58+ffPmTWZm
+Zl5e3q5du2Sfjbe3d2ZmZnV1dW1t7ZUrVx48eJCSkkJtotPpkpKSli5d2traWlFRUVFRsXnz5pHb
+RK4+L1++rKmpiYqK8vPzE9+Z/w/s70wWFhZmZmZmZWW1tbW9ePFi9OjRS5Ys6erqIjUpKCjIy8s7
+efKkXq+/devWjRs39uzZQ50Jk+mSsYWV30z6+/sHvkxPT/f09PzdynL9qZKdnS1JkpUrC1u3bh03
+blxfXx9/efbsWUmSGhsbR2gTGftwCQkJsbGxVq7853+q2N+ZXLlypVarFS+Li4sZY0+ePCE1CQwM
+TEtLEy9zcnIUCsXXr19JTSzxS8ZgMPxydBj+VBk16r/WdHNzM6sMhY8fP3p7e1O3Ki0tXbx4saPj
+v3/3TUhIMJlMZWVlI7SJjH2Ghf2dSX9///b2dvHLfUtLy6hRowb+qmqNxsbGadOmiZcajaa3t/fh
+w4ekJpb4JfPLH/jlZctdlba2tmvXriUlJck+G66goKCrq6umpqa8vPzixYvUzd++fZucnCxe+vv7
+Ozo6vn37doQ2kbHPsLC/M5mRkVFWVpaYmJiUlNTa2nrq1KmsrKyAgABSEy8vrw8fPoiXTU1NjLH6
++npSE8HskpEkybY+1iMHR09Pz4oVK9Rq9fHjx3+3zsSJEzdt2sQYGz16tCgmJCTwVB789hVj7Pbt
+29+/f9fpdOHh4T4+PqTpmUym7u5uZ2dnUZEkycnJSdwXtNLf00SuI7KNWq3mbyVjzNfXly9otVpe
+9PLy+p8d7O9Ment7L1++PDc3t76+/suXLyEhIeK+uPWSk5OLioo2bNgwa9aspqam3NxcxpjN76mV
+l0xqampbWxtjTKvV8oqvr694fwd/IMAMLTiMRuPq1at1Ol15ebnl3WZh7ty54ga1sG3bNiv3UlJS
+whgzGAzr1q2Lj4///Pmz9TPkv1GLxxa47u5u6pe3v6eJXEdkG09Pz8LCQrNifHw8f9zDGvZ3Jnft
+2nXlypXKykqNRtPf35+RkREXF/fixYsJEyZY3+T48eNNTU2zZ8/28/Nrb2/ftm2bTqcjXboDmV0y
+DQ0Nv3zcIysry6wSHBxs+f5ag/A7hdFoXLNmTUVFRUlJycSJE23YGYlKpdq/f/+XL1+oGwYGBjY2
+NoqXLS0tfX191Mdg/p4mMvYZFvZ3Jq9evbpmzRqNRsMYc3BwOHz4cE9Pz82bN0lNPDw87t6929DQ
+cPny5bq6utTUVMYY72kzcck8evToT/pYw9pvHP39/WlpaaWlpffv3w8LCxvSOQl6vd6GrWJiYkpK
+Sn7+/Ml/vuVhHBMTM0KbyNhnWNjfmRz4JC5jrLu722QyjRkzhjoZxlhISEhISAhjLDs7e9y4cb98
+NJaEXzKDP1ctDyvvvqxbt06SpPz8/NIBjEaj9fdvrHHo0KGysrKWlpbW1tY7d+6EhoYGBwdTmzx/
+/tzBwWH//v19fX11dXWhoaGJiYkjt4lcfTo7O/m7FhkZqdVq+fLv7tvJyP7O5ObNm52cnG7fvm00
+GvV6/apVqxQKxevXr0lNampqiouL9Xq9Tqfbs2ePJElXr16lzsT0m0uGZ9mQsjY4fvmEf0dHh7yz
+SUpKErfKJElavnx5XV2dDX2KiopcXV15q9jY2NbW1hHdRJY+tbW1lu/gq1evbJsPiZ2dyW/fvqWk
+pPBnTxlj48ePv379OrXJnTt3xPcCHx+fCxcuUDtwcl0yVJLJZJL3K8wfMhgM/KGjoKAglUplc5+u
+ri6dTufm5hYcHGwHTWTsMyzs70x2dHS8e/fOxcUlICCAJwhVZ2dnQ0ODJEmTJ08WF78N5LpkSP66
+4ACAvx/+Pw4AIENwAAAZggMAyBAcAECG4AAAMgQHAJAhOACA7F84bBzpObR0dgAAAABJRU5ErkJg
+gg==
+"
+       height="40.830791"
+       width="183.73856" />
+    <image
+       y="227.07941"
+       x="756.41528"
+       id="image3601"
+       xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAWgAAABQCAIAAAC72Xj2AAAAA3NCSVQICAjb4U/gAAAKXklEQVR4
+nO3ce0iT3x8H8PPkck1nzmXTNHUJRlpeMrxkl3WTBWWCKF1MI7CrUVF/BJkRSWkXxb8Cs/BHikQF
+ERaFZWrE6GYXorySZg3N1NKlaZvu98f5/Q5+N/O7s2ZOeL/+Ojtn5/Oc5+z7vNt6nr6C0WgkAAA8
+pkz0AgBg8kFwAAA3BAcAcENwAAA3BAcAcENwAAA3BAcAcBuX4CgpKREEQRAEsVjMOjds2EA7U1JS
+aM/Pnz+F/4uMjKSNpUuX0oaTkxMbvXPnDp1SVFREe6RS6RgL0Ol0bO6iRYtoIy0tjY729PSw0fLy
+ctpZWFhIe2QymXnBgoICOurm5sbmhoeH08bu3bvp27q6utjow4cPTYp8/fqVjYaFhdGGSqWiDYVC
+McYZtbe3s7mhoaG0sX//fjra1tbGRh8/fkw78/PzaY+npycb1Wg0JpU/f/7MRhcsWEAbhw8fpqOt
+ra1s9OnTp7Tz/PnztMfPz4/ViYiIoJ0rVqygDR8fHzb3xYsXJsf98OEDG62pqaGd2dnZrDIbnTdv
+Hm0cPXrUfGfYbhw7doz21NfXs7lz586ljczMTPO57HzZmoOCgtjo/PnzaeeJEyfM5wYGBprMDQgI
+YMetq6ujb8vMzKQ9ISEhbC5b1alTp8wrm3v58iWr7OvrSxs5OTl0tKamxnz0zJkz5nWUSiUdPXfu
+HO159uwZm/vx40dLFkPhGwcAcENwAAA3BAcAcENwAAA3BAcAcENwAAA3BAcAcENwAAA3BAcAcENw
+AAA3BAcAcENwAAA3BAcAcENwAAA3BAcAcENwAAA3BAcAcENwAAA3BAcAcENwAAA3BAcAcENwAAA3
+BAcAcENwAAA3BAcAcENwAAA3BAcAcENwAAA3BAcAcENwAAA3BAcAcENwAAA3BAcAcENwAAA3BAcA
+cENwAAA3BAcAcENwAAA3BAcAcENwAAA3BAcAcENwAAA3BAcAcENwAAA3BAcAcENwAAA3BAcAcENw
+AAA3BAcAcBNN5LFFooMHD9K2m5vbkiVLCCEzZsyIiIigowaDgY76+/vTxvz58+kUsVg8RmVHR0dW
+WSaTLV++nBASHR1Ne8RiMRv18/OjjeDgYNopkUjMC4aEhNBRR0fHX79+scoqlYoQQldO57LKvr6+
+JkWcnJxGrmrlypWEEHd39/DwcEKIi4vLGGfk7OzM5rq6uq5atYoQQs+LECKVStmot7c3bYSHh9PO
+adOmDQwM0E4vLy+Tyi4uLmzu9OnTY2NjCSH0vLhs2bJl6dKlhJCZM2cuXLiQnm9/fz8d9fDwMHm/
+TCZjx2WjkZGRtNPZ2bmvr4+tUKfTEUJofRMpKSlarZaM+BTkcjmrLJVKf/z4QQiJiYkxn5uamtrW
+1jZyzZ6enmx027ZtdHTx4sXmc7dt2/bly5eRc9mx6BpoIyYmhi5m5M5v3769o6ODEBIVFWVe2ZyH
+hwc7I7ar9DL519HxYhwHxcXFtLijoyPrjIuLo51bt24dj4PCePj48SP7T+XJkye089y5c7TH19d3
+YpcHXNgfk2fPnqU9T58+ZZ9vS0uL5aUs/amSl5cXFBQkCIIgCC4uLkeOHBkcHPzDzDJ3+fJlb29v
+ehSRSJSYmEgjn9fdu3d9fHwEQXBwcEhKSqJ/Xk3eIjapU1dXt2/fvujoaLlcvn79euuWYR372Umb
+bEJpaansnwoLC62oo9Ppdu7c6eTkRE9q7dq1VhT5OxemOUuDo7y8PDk5+fnz5/X19VlZWbm5uYcO
+HbL5atzd3bOysmpqahobG0tLSx89erRp0ybeIg0NDQkJCXFxcR0dHRqNRqPR7Nq1a/IWsVWdd+/e
+vX79Ojo62sPDg32j/gvsaidtsgm/fv3q7+//zwhr1qzhLTI8PBwfH3/r1q2CgoLa2trHjx+r1Wor
+FvN3LsxRWPjNZGhoaOTLlJQUuVz+uzfb6qdKdna2IAgWvpnZu3fvrFmz9Ho9fXnp0iVBEFpbWydp
+ERvWodRqtUqlsvDNf/5Txa52kuHaBBNFRUVisdjqQ1MlJSVTpkx5+/btH9bhujAn4KfKlCn/eKer
+q6tJz3jQarXu7u68syorK1evXi0S/e/vfdVqtdForKqqmqRFbFhnQtjVTtpQc3Pz8+fPOzs7rZt+
+9erVmJiYBQsW1NbW1tfXDw0NWVdnQi5MYt3t2M7OzqtXryYkJNh8NVR+fn52dvbGjRuvX79+5coV
+3unNzc1KpZK99Pb2FolEzc3Nk7SIDetMCLvaSVsZHBz09/ePjIxUKBRJSUnfv3/nrfDmzRtPT8+I
+iIjg4ODAwEAvL6+ysrI/XNV4X5gjcd+OHRwcTExMlEqlOTk5v3tPQEDAjh07CCFTp05lnWq1mt7r
+YrdFf6esrKy3t7ehoSEkJGTmzJlcyzMajQMDA05OTqxHEASJRMLuC1rIforY6oysI5VK6UdJCFEo
+FLQRGhpKO2fMmPGvFexnJ20lLCzs/v37CxcuNBgMZWVlBw4cSElJ4b3se3t7b9y4kZ6e/ujRI71e
+v3Pnzk2bNr1//579muBlyYW5ZcsW+hUpNDSU9igUCvb5jv1AgAm+4DAYDBs3bmxoaKiurnZzc/vd
+26KiosxvUKenp1t4lIqKCkJIX19fampqbGxsd3e35SsUBEEsFrPHFqiBgYFRn84Yg/0UsdUZWUcu
+l1+8eNGkMzY2lj7uYQn72UlbCQsLY+20tLT29vbMzEytVsueoLHEtGnTjEZjbm6uWCyWSCQXLly4
+du3azZs32RMZXCy8ME+fPm3So1QqzT9fS3D8VDEYDJs3b9ZoNBUVFQEBAVYcjIuzs3NGRsa3b994
+J/r6+ra2trKX7e3ter3e/HGsyVLEhnUmhF3t5HigT3/Rh9Asp1QqfXx82HOMcrnczc3t06dPVizg
+L1+YlKXBMTQ0lJycXFlZ+eDBg8DAwHFdE/P161crZi1btqyysnJ4eJi+pN9fli1bNkmL2LDOhLCr
+nRwPL1++JITMnj2ba5ZKpfr06RN75qKrq+vbt28j/x7HQhNyYRJi8e3Y1NRUQRDy8vIqRzAYDJbf
+v7HE8ePHq6qq2tvbOzo6bt++7e/vr1QqeYu8evXKwcEhIyNDr9c3NTX5+/uvW7du8haxVZ3+/n76
+qUVERISGhtJ2X1+fFevhYlc7Oeom8BY5efJkdXX1ly9ftFptQUGBRCKJi4vjLdLS0iKRSHbv3q3T
+6bq7u5OSkmQyWVtbG2+dUS9M3iJWsDQ4zP+tASFEp9PZdjUJCQnslpsgCPHx8U1NTVbUKS4unj59
+Oi2lUqk6OjomdRGb1GlsbDT/BGtra61bDxf72clRN4G3yMgntUQi0Z49e3p6eqxYzN27dz09PQVB
+IIR4eXndu3fPiiKjXphW1OElGI1G3i8p46qvr48+dOTn5+fs7Gx1nZ8/fzY0NLi6ulrx9c8Oi9iw
+zoSwq538c93d3Z8/fxaLxXPmzHF0dLS6jsFgqKurEwRh3rx5Dg4ONlzheLO74AAA+4f/HwcAcENw
+AAA3BAcAcENwAAA3BAcAcENwAAA3BAcAcPsvM8fJsdB6QeMAAAAASUVORK5CYII=
+"
+       height="40.830791"
+       width="183.73856" />
+    <image
+       y="162.11064"
+       x="756.41528"
+       id="image3612"
+       xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAWgAAABQCAIAAAC72Xj2AAAAA3NCSVQICAjb4U/gAAAKdUlEQVR4
+nO3ceUhUXxsH8Ofq6HXUbNQat9RRKi0tK7O9bMWoDCKMNgmixRJKCCLaoKCFtLIiyRaLjIqK+iPD
+SKKFiGw1gkwrLVO0bNEs0ya7vz/O+x58nV8yZ+ZM4wvfz193nnPv956ZOTzd8V5SNE0jAAARLs6e
+AAD8/0HjAABhaBwAIAyNAwCEoXEAgDA0DgAQhsYBAMIc0jhOnTqlKIqiKKqq8uLMmTNZMTU1lVV+
+/Pih/FdBQUEngdOmTWO7jRkzhm14e3tb7paXl8dHeXJ8fDzbWLJkCdutsbGRj167dq1DSENDAx8t
+KipixdzcXFbx9fXlo0OGDGEbaWlpnUw+JyeH7ebv78+PvXnzJhs9ePAgqxiNxk5C6urq+LFxcXFs
+Y9WqVWy0traWj965c4cVs7OzWSUkJMQycO/evWw0KCiIHxsbG8s21qxZw3arqqrio8XFxayYlZXF
+KuHh4TwwISGBFcePH882QkND+bEPHz7sMIGKigo++ujRI1bcsWMHT+aj0dHRbGP9+vWWb4R/Ghs3
+bmSVsrIyfmzfvn07zCo6OtoyZMuWLWy0f//+vBgTE9Ph2N69e/Pk0tJSttvmzZtZZcCAAZbJmzZt
+6jATRVFMJhPb2LZtG9utpKSEj758+bJDyOPHj/no69evWXHdunWsEh8fb3nef8XPm5mZySr379/n
+yW/fvrUyh3DFAQA2QOMAAGFoHAAgDI0DAIShcQCAMDQOABCGxgEAwtA4AEAYGgcACEPjAABhaBwA
+IAyNAwCEoXEAgDA0DgAQhsYBAMLQOABAGBoHAAhD4wAAYWgcACAMjQMAhKFxAIAwNA4AEIbGAQDC
+0DgAQBgaBwAIQ+MAAGFoHAAgDI0DAIShcQCAMDQOABCGxgEAwtA4AEAYGgcACEPjAABhaBwAIAyN
+AwCEoXEAgDA0DgAQhsYBAMLQOABAGBoHAAhD4wAAYWgcACAMjQMAhKFxAIAwNA4AEIbGAQDC0DgA
+QBgaBwAI0znz3DpdRkYG246MjOxkz1mzZkVFRRFRjx49EhISiEhVVcvdYmNjWaCbm5vZbGZFg8Ew
+btw4IhoxYgSrqKrKzxseHt4hxMPDw3J04MCBrOju7v7z50+enJiYSESjR4/uZPJxcXHsWFVVW1tb
+WTE0NJRtDBo0iI1269atkxAvLy8+q+7du0+cOJGI2PsiIm9vbz4aEhLCNoYMGcKKBoPBMpCPenh4
+tLS0sKKPj8+UKVOIiL0vIfPnzx8zZgwR9ezZc/DgwUTk6enZ3NzMRgMCAjrsbzAY+Jz56LBhw1jR
+y8vr+/fvrNitW7empiYiYvkdpKam1tTUULtvwc/Pjyd7e3t/+/at/awsZ0JEI0eOZIcEBgby4qJF
+i2pra9sfy9OIyN/fn22MGjWKHRscHGyZzEfbH8vf3fDhw1nFaDTyOfv6+nYICQgI4KP82xw7dixb
+Tnwt/VWaA+Tn57Nwd3d3XkxOTmbFhQsXOuKk4Ahv377lS+XevXusmJmZySphYWHOnR4I4f8Q7tq1
+i1WKi4v59/vmzRvro6z9qXL69GnD/zpy5IidPasT9fX1JpPJYDBUVlY6JaStrW3dunVeXl6Koqiq
+mpaWxi9hhBQWFoaGhiqK4urqmpKSwv7ldFaOrMk45bxd55OUsjZkLTAiampqWrZsmaenJ3tTU6dO
+tS1HjJUN5vjx425ubpfaqaio+NPO9l9xpKSkREREENHLly+tnKHckKysLJ1Ol5eXV19ff/Xq1R49
+emRkZIiGlJWVeXh4rFix4sOHD/fu3QsODp43b55oiKwc20Lsv+Jw4uQdlCNlbUgJ0TStra1twoQJ
+RqPx5MmTpaWld+/e3bNnz592lnjFIdA4VFW1cmc7G8fFixdDQ0Pz8vLsaRx2hoSFhS1YsIC/zMzM
+dHd3b2hoEApZuXJlUFCQ2WxmL48ePaooSlVVlehkpOTYFmJ/43Di5B2UI2VtSAnRNO3UqVMuLi7P
+nj2zZmcn/FRhKisrHzx48PHjR6GjhHz58mXlypU5OTmd/7HQ0SFVVVWxsbH8ZUxMzM+fP+/cuSMU
+cuPGjUmTJul0//kLdFJSkqZpN2/eFJ2MlBxZkxHVpSYvJUfK2pASQkRnz54dNWpUbGxsaWlpWVlZ
+W1ubaIJtBBpHa2trZGTksGHDjEZjSkpKQ0ODIyaUkZGRmJg4Y8YM54b4+/u/e/eOv6yuriai169f
+C4VUVlaaTCb+MiQkRKfT2fAHFyk5siYjqktNXkqOlLUhJYSInj59GhgYmJCQMGDAgH79+gUHB1++
+fFk0xAbW3o4dNGhQUVHR4MGDf/36dfny5dWrV6empv5pin369Fm6dCkRubm58WJSUhK718Vvi1oq
+LCwsKCgoLS0VeAeOCZk9e3Z+fv7ixYvj4+Orq6uzsrKIiN9ctFJLS4unpyd/qSiKXq8XDdE0TUqO
+bSHe3t7sqyQio9HINuLi4liR35KUfl5HhMj6JKWsDSkhRPT169cLFy6kp6ffvn3bbDYvW7Zs7ty5
+z58/t3zOgIjmz5/Pfi7ExcWxitFo5N+v0OW5QOPg20uWLKmrq9u0aVNNTQ1/aqC94cOH8xvUXHp6
+euenaGpqWr58+e7du/kCtYGUECLauXNndXX10KFDAwICPn36lJ6eXl5eLvrDR1VV/ogE09LSotfr
+hULYX93tz7EtxM/P7/Dhwx2KU6ZMYY97OO68jgiR9UlKWRtSQojIw8ND07Tdu3erqqrX63Nycs6d
+O3fp0iX+3Ed727dv71AxmUyW3681bHwAjD0P86fGYZvi4uJ3795lZ2dnZ2cTUWNjIxHNnDlz8uTJ
++/fv/5shROTr63vlypXKysqKiorevXu/f/9+3759MTExQu8oLCysqqqKv6yrqzObzWFhYUIhsnJk
+TUZUl5q8lBwpa0NKCBGZTKZv377x5yH9/Px8fX3b/whyEBsbx+PHj4moV69eEqcSHR194MAB/rKk
+pOTYsWNz5sxhj4r+zRAuIiKC3dDdsWNHUFDQvz652ImxY8dev3799+/fLi4uRHT9+nVWFJ2GlBxZ
+kxHVpSYv8UOwc23ICklMTDx06FBrayvrHZ8+ffry5Uv7v+M4ipV3X7Zu3Xrr1q3379/X1NTk5ubq
+9frk5GTrb97Y4Pz582Tfcxz2hJSUlFy7dq2+vr68vHzt2rWKopw5c0Y05MmTJ66urhs2bDCbza9e
+vYqMjJw+fbpoiKwcWZNxynm71CcpZW1ICdE07c2bN3q9Pi0tramp6fPnzykpKQaDoba21oYoIdY2
+jqSkJN5rdDrdihUrGhsbHToz5zaOgoICfvnXs2fPEydO2DaB/Px8Hx8fdv8vMTHxw4cPTsyRNRmn
+nLfrfJJS1oasBaZpWmFhYWBgoKIoRBQcHHz16lWbo6ynaJpm5bXJ58+fq6urVVWNiIhwd3e380qn
+62tubq6oqFAUJSoqit/5t8GPHz/Ky8u7d+9u5wWklBxZk3HKebvOJyllbchaYET069evFy9eKIoS
+HR3t6upqT5SVBBoHAACD/48DAIShcQCAMDQOABCGxgEAwtA4AEAYGgcACEPjAABh/wDX1GYKY/rD
+9gAAAABJRU5ErkJggg==
+"
+       height="40.830791"
+       width="183.73856" />
+    <image
+       y="97.141937"
+       x="756.41528"
+       id="image3623"
+       xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAWgAAABQCAIAAAC72Xj2AAAAA3NCSVQICAjb4U/gAAALmklEQVR4
+nO3cfUxbVR8H8HOhtEARymth2NI2zs2AlA2LOKc1OsOcskUQXVA0ok7cDFtiXIzoXLYomcyMZC8Z
+cWxT5jSZWzLBoFsW2EJQNJv42g0QNlYCUnkfHdCN+sd5nhMeO3n6u1xEk+/nr3vPued7T3vvftzb
+ezPJ6/UyAACKgLmeAAD8+6BwAAAZCgcAkKFwAAAZCgcAkKFwAAAZCgcAkM1K4Th06JAkSZIkaTQa
+0bhy5UreWFBQwFuuXr0q/VdNTc00gStWrOCbLV26lC+EhYX5brZ//37RK5LT09P5wvPPP883Gxoa
+Er0nTpz4U8jg4KDoPXnyJG+sqKjgLZGRkaJ38eLFfKGoqGiaye/Zs4dvFh0dLcbW19fz3t27d/OW
+uLi4aUJ6enrEWKvVyheKi4t5b3d3t+htaGjgjeXl5bwlMTHRN3DHjh28NyEhQYxNSUnhC6+88grf
+rLOzU/Q2NTXxxu3bt/OWpKQkEWiz2XjjfffdxxfMZrPvfrdt28Z7jUajSD579izvLS0t5S233HLL
+NN/GVOLbeOONN3jLhQsXRPIPP/wwzVjxed966y3f3uTkZN67efNm3vLTTz+JZIfD4c/03nzzTb79
+rbfeKsaaTCa+8Pbbb/sOmT9/Pu995513eMu5c+fEWPG9ie85PT1djLVYLLxx27Ztvsliv2VlZbzl
+m2++EcmXLl3y5xNxuOIAADIUDgAgQ+EAADIUDgAgQ+EAADIUDgAgQ+EAADIUDgAgQ+EAADIUDgAg
+Q+EAADIUDgAgQ+EAADIUDgAgQ+EAADIUDgAgQ+EAADIUDgAgQ+EAADIUDgAgQ+EAADIUDgAgQ+EA
+ADIUDgAgQ+EAADIUDgAgQ+EAADIUDgAgQ+EAADIUDgAgQ+EAADIUDgAgQ+EAADIUDgAgQ+EAADIU
+DgAgQ+EAADIUDgAgQ+EAADIUDgAgQ+EAADIUDgAgQ+EAADIUDgAgQ+EAADIUDgAgQ+EAADIUDgAg
+Q+EAADLVXO5bpdqwYQNftlgs02z56KOPLliwgDEWExNjs9kYYxqNxnezlJQUHhgUFOTxeHijTqe7
+9957GWOZmZm8RaPRiP0mJSX9KSQ4ONi3NzU1lTeq1eqJiQmRbLfbGWN33333NJO3Wq18rEajGR8f
+540Gg4EvpKWl8d6bbrppmhCtVitmFRERcf/99zPG+OdijIWFhYnexMREvrB48WLeqNPpfANFb3Bw
+8NjYGG8MDw9/8MEHGWP8c5Hk5+cvXbqUMRYbG7to0SLGWHR0tO9mNpuN7zc0NNTtdvNGvV7PFzIy
+MnhvbGysn/stKCjo6upiU45CVFSU+Damz3n66ae7u7sZY3fddZdv7zPPPPOn3piYGJF8w0/na8mS
+JXxIWFjYlStXeKNWqx0dHWWM3Xnnnb5Dnn32WZfLxRjLyMjgLXq9XuxXfG/iexbnEmOssLCwr6+P
+Mcb/mcwi7yyoqqri4Wq1WjRmZ2fzxqeeemo2dgqz4dKlS+JU+frrr3ljWVkZbzEajXM7PSARfwjf
+ffdd3tLU1CSO78WLF/2P8vdW5fDhw7r/9f7778+wZk3D5XKZTCadTtfR0TEnIdevX3/ttde0Wq0k
+SRqNpqioSFzCkNTW1hoMBkmSAgMD8/LyRkZGZIQolaPUZEjOnz//8ssvZ2ZmRkVFPfLII/JCKisr
+ExMTJUmSJEmlUj322GP8WoDqoYce0vlobGyk5oyMjKxZsyY0NJR/mcuXL5cxGUUOh1InKpW/hWNi
+YsLtdh+cYtmyZbM3rXXr1gUEBAwNDV2/fn1OQsrLy997771du3a5XK7PPvvs6NGjGzdupIa0tLTk
+5ORkZ2f39vY2NjY2Nja++OKL1BClcpSaDNXPP//c3NycmZmp1+vFtTpVTEzM1q1bz54929raevjw
+4TNnzqxevVpGzuuvvz71HE5NTVWpVHfccQcpZHJyctWqVcePH6+oqHA4HA0NDVlZWdSZKHU4FDlR
+5fDzyuTAgQMajcbPjWd4q3Ls2DGDwbB//37GWGtrq587VTbEaDQ++eSTYrWsrEytVg8ODpJC1q5d
+m5CQ4PF4+Oq+ffskSers7KRORpEceSEK3qpkZWXZ7XbSnP9KaWmpJEmjo6MzCXG73REREcXFxdSB
+hw4dCggI+PHHH2eyd6XODdKJOge3KlxHR8e33377+++/y6xSfhgYGFi7du2ePXum/7FwtkM6OztT
+UlLEanJy8sTERENDAymkrq7ugQceUKn+8wt0VlaW1+utr6+nTkaRHKUm80/Q1dUVExMTEhIyk5Cj
+R48ODQ0999xz1IGffPLJkiVLUlJSHA7HhQsX5F0UK3I4JiYmFDlRZSAUjvHxcYvFkpGRERcXl5eX
+Nzg4OBsT2rBhg91ul30zrFRIdHT05cuXxarT6WSM/frrr6SQjo4Ok8kkVhMTE1UqlYwfXBTJUWoy
+c6i8vLy0tPSJJ544cuTIhx9+KEnSTNIqKyvT09NTU1OpA7///vv4+HibzXb77bffdttt8+bNq66u
+poYocjjUarUiJ6oM/j6OTUtLO3ny5KJFi65du1ZdXb1+/fqCgoK/+r7mz5//wgsvMMaCgoJEY1ZW
+Vnx8PJvyWNRXbW1tTU2Nw+EgfILZCcnNza2qqiosLExPT3c6ndu3b2eMiceHfhobGwsNDRWrkiSF
+hIRQQ7xeryI58kLCwsL4oWSMxcXF8QWr1cob/XwkqZTq6urh4eGWlpbU1FT/n9feUHt7++nTp3fv
+3i1j7PDw8Keffrpu3bozZ854PJ41a9asXr36l19+8X20Pw1Fjikjnqj5+fn8dsFqtfKWuLg4cXxp
+l+fUeypu69atjDGn0ylv+A0NDw8bDIYDBw7w1SNHjjD6zxOKhHi93v7+/hUrVjDG9Hq9SqVav349
+Y2zXrl2kEI1Gs2nTpqktQUFBmzdvpk5GkRylJiObUr9xXLlyJScnJzIycmBgQHZISUlJcHCwvAS9
+Xh8eHj42NsZX+/r6JEnasWMHKUSpw6HIiSqDzDdH+Zsn/MUbpTQ1NV2+fLm8vDwtLS0tLe3VV19l
+jK1cubK4uPhvDmGMRUZGfv755+3t7R999FFbW1t+fj5jLDk5mRRiNBo7OzvFak9Pj8fjMRqNpBCl
+cpSazJzTarUlJSUDAwNfffWVvITJyckPPvggNzf3hq/G/V8mk8lgMIhXEKOioiIjI6feL/hDqcOh
+yIkqg8w3R8+dO8cYu/nmmxWcysKFC3fu3ClWm5ubKysrH3/8cdI7cIqECGaz2Ww2M8ZKS0sTEhL4
+m5H+u+eee06dOjU5ORkQEMAYO3XqFG+kTkORHKUm80/AX6y84dvD/vjyyy+dTmdhYaG84Xa7fe/e
+vePj43wCfX19AwMDU3+w8Ieyh2OGJ6ocfl6ZbNmy5fTp07/99ltXV1dFRUVISEh2dvasXgvJvstQ
+JKS5ufnEiRMul6ulpWXjxo2SJH388cfUkO+++y4wMLCkpMTj8bS1tVkslocffpgaolSOUpOhcrvd
+dXV1dXV1NpvNarXyZeqT1E2bNtXX1/f09PT29tbU1FgsFpPJJG4WqHJzc81m8+TkpLzhFy9eDAkJ
+KSoqGhkZ6e/vz8vL0+l03d3dpBClDociJ6oM/haOqa+4qFSql156aWhoaFZnNreFo6amRvxBi42N
+PXjwoLwJVFVVhYeH86dudru9t7d3DnOUmgxJa2ur758rh8NBCsnJyRFPLiVJWrVqVVtbm7z5uFyu
+oKCgLVu2yBvO1dbWxsfH88c68+bN++KLL2SEKHI4lDpRqSSv1+vntUl/f7/T6dRoNGazWa1Wk69t
+/m3cbnd7e7skSQsWLBBnrQxXr15taWmJiIigXs3ORo5Sk/n7jY6O8rfRkpKStFrtXE+HXbt27fz5
+85IkLVy4MDAwUF6IIodDqROVhFA4AAA4/H8cAECGwgEAZCgcAECGwgEAZCgcAECGwgEAZCgcAED2
+B0ILempS29CcAAAAAElFTkSuQmCC
+"
+       height="40.830791"
+       width="183.73856" />
+    <image
+       y="615.08289"
+       x="317.29758"
+       id="image3634"
+       xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAWgAAABQCAIAAAC72Xj2AAAAA3NCSVQICAjb4U/gAAAM20lEQVR4
+nO3bfUxTVx8H8HOxUCrl/U1kCCVhoBjBYRVfsFv8o1NhbAUciszNTWWIL5mLLJKRKclYBqKJY5kv
+6DKMM87tH4hsOFdYjFE3ELMJWORFBoGBgKWAYCl9/jjPc9LBHuy5LY/uyffz173n3PO7p7e3X+69
+LYLZbCYAADwcnvYEAOCfB8EBANwQHADADcEBANwQHADADcEBANwQHADAbUaC4+zZs4IgCIIglUpZ
+4yuvvEIb09PTpw6Jj4+nvVu2bJnau27dOtq7atUquiCXy1nv2rVraWNcXBzrFf4jJiaGLrzzzjt0
+e71ez3orKysn7evhw4es94UXXqALq1evpgteXl5syzVr1tDGjIwM2tLX18fGRkdH04XMzMxpjlVx
+cTHdzM/P7wmH9T/Yy9y9ezdt6erqYvu9evXqpO07OztZ77Vr16apHBsbSzfbt28fbWlvb2djb9y4
+QRsLCwtpS3BwMBurVCpp4/79+6dWXrJkCe3Nzs6eZgL5+fmsMttvREQEXThw4ADdTKfTsd7bt29P
+KnL37l3W+/zzz9OFF198kVWbut+DBw/S3gULFrDGyMjISWMjIyOnjs3NzaW9YWFhbL+NjY2098MP
+P5w0E0EQdDod7c3JyaEt4eHhrLepqWnSLmpra1lvc3PzpN6amhrW29LSMs3hDQkJoZsVFBTQlps3
+b7Kx9+/fn2bsJLjiAABuCA4A4IbgAABuCA4A4IbgAABuCA4A4IbgAABuCA4A4IbgAABuCA4A4Ibg
+AABuCA4A4IbgAABuCA4A4IbgAABuCA4A4IbgAABuCA4A4IbgAABuCA4A4IbgAABuCA4A4IbgAABu
+CA4A4IbgAABuCA4A4IbgAABuCA4A4IbgAABuCA4A4IbgAABuCA4A4IbgAABuCA4A4IbgAABuCA4A
+4IbgAABuCA4A4IbgAABuCA4A4IbgAABuCA4A4IbgAABuCA4A4IbgAABuCA4A4IbgAABuCA4A4Ibg
+AABukqc9gX979dVXw8LCCCFLly6d2vvaa6+Fh4cTQnx8fJRKJSFEKpVa9kZERNDeJUuWEEIcHR2N
+RiPt9fDwWL16NSEkNjaWtkil0r1799Ll4ODgSftydnZmvR4eHiqVilaOiYkhhLi4uLAtk5OTFy1a
+RAhZuXIlbZHJZJZjX3rpJULIqlWrpnnh0dHRdIirq+s0m1l6/fXX6cukr4sQIpfL2X4DAwMnbW/Z
+O3fu3Gkqb9y4cfny5YQQ+qq5bNq0ib7SuLi4qb1paWm0/W97maVLl9Kpuri4DA8P00ZXV1eDwUAs
+jqSnpyd7Rb6+vpOKeHl5sV65XD40NEQ3W7x4MSHE399/6n6XL19Oh8yZM4c1btmypaury3JsQEDA
+1LErVqygY9m+6Bym6fX09KQLK1euZO8+fY2WvYy/v7/lecXVO1PMM6C0tJQWd3JyYo0JCQm0cfPm
+zTOxU5gJ9+/fZ6fK9evXaWNBQQFtmTdv3tOdHnBhfyY//fRT2nLjxg32/ra1tVlfytpblcbGxqys
+rNjYWC8vr/j4eBvT6r8pKipasGCBIAiCILi6umZnZ4+NjfEWKSkpCQwMpEUkEklycjL9uyFOb29v
+SEiIh4dHa2uriOHnzp3z+KuTJ0+KqGMwGLZv3z579mxBEGbNmvXyyy/zVli7dq3HFNeuXRMxGS5m
+szk3N9fNzY2+I0ql8tdff+UtYjKZPvjgAxcXF0EQpFJpRkYGu6LkVVFRERQURA9jSkoK+ztvPXt9
+Fuxyttvl8Ipg7a3KnTt36urqYmNj9Xo9u+Kyu8rKyrS0NLVa7ebmdunSpffff39oaKi4uJiriI+P
+T15eXnR0tJubW21tbVZWVmpqanV1tbgp7dy508HBQa/Xm0wmEcMfP348MjJy4cIF1hIVFcVbZGJi
+IjEx8c6dO8ePH1cqlQMDA9evX+ctcuDAgb6+PrZaVFRUX19Pb3lm1IkTJ/Ly8o4dO7Zx48bu7u5t
+27bFx8e3trbKZDLrixw9evTw4cMnTpxISEioqanZvHmzTCY7cuQI72R0Op1Go3nrrbcOHjzY0tKi
+0Wh27Nhx7tw5riL2+izY5Wy3y+EVg/dqR61Wq1Sq6bcRfatiMpksV9PT0728vHhnOEl+fr4gCMPD
+wyLGfvfdd0FBQadPnyaENDU1iahw5swZqVQqYqCls2fPOjg4/PbbbzbWYUZGRtzd3Xfv3v3ELW2/
+VUlJSYmKimKrlZWVhJCbN29yTXjevHlpaWlstaCgwMnJ6eHDh1xFzGZzZmZmQECA0Wikq6dOnRIE
+ob29nbcOZc1nYRp2Odu5Du9TuFX533Bw+Mt83N3dJ7WI0NnZ6ePjIyKABwYGMjMzP//8c+sfW/43
+ra2tv/zyy4MHD8QNP3/+/IoVKxYuXNjQ0HD37l1x1z6Wvv32W71e//bbb9tYxxqBgYF9fX3j4+N0
+tbu728HBwfIZpDXa29sXLlzIViMjIx8/fnz16lXeyWi12jVr1kgk/77QVqvVZrO5qqqKt45d2OVs
+t8vhFeFZ+VZlqgcPHpw/f16j0YgbfvTo0UePHtXV1VVXV3/11VeCIPBW2Lt3r0qlio+Pv3jxorg5
+UGNjY6GhoYQQQRCSkpJOnjzJ++j79u3by5YtUyqVt27dmpiY8PX1PXXqFLuCE6GkpCQmJoZ+JTTT
+srOzq6qq1q9fr9Foenp6iouLP/7446CgIK4i3t7ef/zxB1vt6OgghDQ3N/NOprW1NSkpia0GBgZK
+JBJxT6/sS/TZbpfDK8KMBEdYWNi2bdsIIY6OjqxRrVbTIGRfi05jbGwsOTlZLpd/8skn4uZQVlY2
+ODio0+kWLVo09Ru7J6qoqCgvL29oaBC3dyY6Ovry5cuLFy8eHx8vKyvbs2dPenp6WVkZV5HBwcGL
+Fy/u3Lnz559/NhqN27dvT01Nra+vn/pdsjVaWlqqq6utvJeWy+X0rSSE+Pn50YWoqCja6O3t/cQK
+Pj4+iYmJhYWFzc3NAwMDCoWCfYtsvaSkpNLS0q1bt8bExHR0dBQWFhJCRkZGuIqYzebR0dHZs2ez
+FkEQZDIZbx27s+Vs5zq8mzZtope97EGbn58fe3/5rqx576lsvK+zhtFoTExMDAgI0Ol0NpYaGhrS
+aDSenp4DAwPWjxocHAwKCjpz5gxd/eabb4jYZxyT5OXliTjm/v7+bm5uo6OjdLWvr08QhCNHjoib
+Q05OjrOzM9cBscWuXbu8vb1///13s9k8Pj6+b98+Z2fne/fucRXp7+9ft24dIcTf318ikezZs4cQ
+8tlnn/FORiqV5ubmWrY4Ojp+9NFHvHUou3wWbDzb7XJ4RXjmgsNoNCYnJ/v6+tbX19ulYE1NDSHk
+0qVL1g+5fPkyTWUqJCSEEDJ//vxdu3bZOJny8nIRwbFs2bLIyEjLFi8vr/fee0/EBEwm03PPPWf5
+oHGm+fj4ZGVlsVWDwSAIwuHDh0WUamlp+fHHH9va2ugjPa1Wy1shLCzszTffZKv0e/rTp0+LmIzZ
+Hp8F2892Ox5eLs/WMw6TyZSWlqbVan/66af58+fbpWZvby/56y9NnygiIuLYsWNsta6urqSkZMOG
+DfRHq7aora0VMUqlUn3xxRdjY2P0VfT19Q0MDNA44/XDDz90dHRs3bpVxFhxnJ2dR0dH2Sq9bnJ2
+dhZRSqFQKBQKQkh+fn5AQMD0P8n9W3FxcVeuXJmYmKCPIa9cuUKe9GPWmWOXs92Oh5ePlQEzMjKi
+1Wq1Wq1SqYyKiqLL4r7jnMYbb7whCEJRUZHWAm+R3Nzcqqqq7u7unp6e8vLy0NDQkJAQdp0vgi23
+KocOHaqurv7zzz87OzuPHz8uk8kSEhJ4i7S1tclksoyMDIPB0N/fn5KS4uHh0dXVJWI+SUlJCoVi
+YmJCxFhxduzYIZPJysrKxsfHe3t7N2zY4OTk1NjYyFWkrq6usrKyt7dXp9Pt379fEISvv/5axGRu
+3bo1a9asnJwco9F479690NDQ9evX8xax12fBLme7XQ6vCNYGR1NT09TQaWhosO9s/vb/CHiLaDQa
+9n2bIAiJiYk23vLZEhxqtZq9EIlE8u677+r1ehF1Kioq5syZQ78bmjt37vfffy+iSG9vr6Oj46FD
+h0SMFU2v16emptJfatLJX7hwgbdIeXk5u2b09fX98ssvRc+ntLTUzc2NniEqlaqnp4e3gr0+C3Y5
+2+1yeEUQzGYz1xXKP8Lw8DD95VJwcLDlv6U9Ff39/R0dHVKpVKFQODk5ia4zPj7e2NgoCEJERAQ9
+S/5BDAZDW1ubq6trUFCQuMmPjIy0tLQIghAeHs7+MIjz6NEjnU7n7u4u7nbvGWT74eX1/xkcADCj
+nq1fjgLAPwKCAwC4ITgAgBuCAwC4ITgAgBuCAwC4ITgAgNu/AAuHr5qD38PCAAAAAElFTkSuQmCC
+
+"
+       height="40.830791"
+       width="183.73856" />
+    <text
+       xml:space="preserve"
+       style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:end;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:end;fill:#000000;fill-opacity:1;stroke:none;font-family:Droid Sans;-inkscape-font-specification:Droid Sans"
+       x="295.97495"
+       y="121.04993"
+       id="text3637"
+       sodipodi:linespacing="125%"><tspan
+         sodipodi:role="line"
+         id="tspan3639"
+         x="295.97495"
+         y="121.04993"
+         style="font-size:20px">Oignons 4Kg</tspan></text>
+    <text
+       sodipodi:linespacing="125%"
+       id="text3641"
+       y="186.69418"
+       x="295.97495"
+       style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:end;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:end;fill:#000000;fill-opacity:1;stroke:none;font-family:Droid Sans;-inkscape-font-specification:Droid Sans"
+       xml:space="preserve"><tspan
+         style="font-size:20px"
+         y="186.69418"
+         x="295.97495"
+         id="tspan3643"
+         sodipodi:role="line">Oignons</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:end;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:end;fill:#000000;fill-opacity:1;stroke:none;font-family:Droid Sans;-inkscape-font-specification:Droid Sans"
+       x="295.97495"
+       y="249.39851"
+       id="text3645"
+       sodipodi:linespacing="125%"><tspan
+         sodipodi:role="line"
+         id="tspan3647"
+         x="295.97495"
+         y="249.39851"
+         style="font-size:20px">Bob Soap (Client)</tspan></text>
+    <text
+       sodipodi:linespacing="125%"
+       id="text3649"
+       y="316.17456"
+       x="295.97495"
+       style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:end;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:end;fill:#000000;fill-opacity:1;stroke:none;font-family:Droid Sans;-inkscape-font-specification:Droid Sans"
+       xml:space="preserve"><tspan
+         style="font-size:20px"
+         y="316.17456"
+         x="295.97495"
+         id="tspan3651"
+         sodipodi:role="line">Joe Bloggs (Client)</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:end;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:end;fill:#000000;fill-opacity:1;stroke:none;font-family:Droid Sans;-inkscape-font-specification:Droid Sans"
+       x="295.97495"
+       y="376.43588"
+       id="text3653"
+       sodipodi:linespacing="125%"><tspan
+         sodipodi:role="line"
+         id="tspan3655"
+         x="295.97495"
+         y="376.43588"
+         style="font-size:20px">J.Doe (Cashier)</tspan></text>
+    <text
+       sodipodi:linespacing="125%"
+       id="text3657"
+       y="441.58325"
+       x="295.97495"
+       style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:end;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:end;fill:#000000;fill-opacity:1;stroke:none;font-family:Droid Sans;-inkscape-font-specification:Droid Sans"
+       xml:space="preserve"><tspan
+         style="font-size:20px"
+         y="441.58325"
+         x="295.97495"
+         id="tspan3659"
+         sodipodi:role="line">J.Smith (Cashier)</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:end;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:end;fill:#000000;fill-opacity:1;stroke:none;font-family:Droid Sans;-inkscape-font-specification:Droid Sans"
+       x="295.97495"
+       y="511.61667"
+       id="text3661"
+       sodipodi:linespacing="125%"><tspan
+         sodipodi:role="line"
+         id="tspan3663"
+         x="295.97495"
+         y="511.61667"
+         style="font-size:20px">Demo User (Cashier)</tspan></text>
+    <text
+       sodipodi:linespacing="125%"
+       id="text3665"
+       y="575.94971"
+       x="295.97495"
+       style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:end;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:end;fill:#000000;fill-opacity:1;stroke:none;font-family:Droid Sans;-inkscape-font-specification:Droid Sans"
+       xml:space="preserve"><tspan
+         style="font-size:20px"
+         y="575.94971"
+         x="295.97495"
+         id="tspan3667"
+         sodipodi:role="line">Admin (Cashier)</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:end;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:end;fill:#000000;fill-opacity:1;stroke:none;font-family:Droid Sans;-inkscape-font-specification:Droid Sans"
+       x="295.97495"
+       y="641.09705"
+       id="text3669"
+       sodipodi:linespacing="125%"><tspan
+         sodipodi:role="line"
+         id="tspan3671"
+         x="295.97495"
+         y="641.09705"
+         style="font-size:20px">Unknown</tspan></text>
+    <text
+       sodipodi:linespacing="125%"
+       id="text3673"
+       y="121.04993"
+       x="735.90662"
+       style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:end;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:end;fill:#000000;fill-opacity:1;stroke:none;font-family:Droid Sans;-inkscape-font-specification:Droid Sans"
+       xml:space="preserve"><tspan
+         style="font-size:20px"
+         y="121.04993"
+         x="735.90662"
+         id="tspan3675"
+         sodipodi:role="line">Coca Cola Zero 1.5l</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:end;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:end;fill:#000000;fill-opacity:1;stroke:none;font-family:Droid Sans;-inkscape-font-specification:Droid Sans"
+       x="735.90662"
+       y="185.54253"
+       id="text3677"
+       sodipodi:linespacing="125%"><tspan
+         sodipodi:role="line"
+         id="tspan3679"
+         x="735.90662"
+         y="185.54253"
+         style="font-size:20px">Coca Cola 33cl</tspan></text>
+    <text
+       sodipodi:linespacing="125%"
+       id="text3681"
+       y="252.33842"
+       x="735.90662"
+       style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:end;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:end;fill:#000000;fill-opacity:1;stroke:none;font-family:Droid Sans;-inkscape-font-specification:Droid Sans"
+       xml:space="preserve"><tspan
+         style="font-size:20px"
+         y="252.33842"
+         x="735.90662"
+         id="tspan3683"
+         sodipodi:role="line">Peaches 1.56€</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:end;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:end;fill:#000000;fill-opacity:1;stroke:none;font-family:Droid Sans;-inkscape-font-specification:Droid Sans"
+       x="735.90662"
+       y="315.67938"
+       id="text3685"
+       sodipodi:linespacing="125%"><tspan
+         sodipodi:role="line"
+         id="tspan3687"
+         x="735.90662"
+         y="315.67938"
+         style="font-size:20px">Peaches 0.89€</tspan></text>
+    <text
+       sodipodi:linespacing="125%"
+       id="text3689"
+       y="383.62695"
+       x="735.90662"
+       style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:end;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:end;fill:#000000;fill-opacity:1;stroke:none;font-family:Droid Sans;-inkscape-font-specification:Droid Sans"
+       xml:space="preserve"><tspan
+         style="font-size:20px"
+         y="383.62695"
+         x="735.90662"
+         id="tspan3691"
+         sodipodi:role="line">Peaches</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:end;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:end;fill:#000000;fill-opacity:1;stroke:none;font-family:Droid Sans;-inkscape-font-specification:Droid Sans"
+       x="735.90662"
+       y="448.11954"
+       id="text3693"
+       sodipodi:linespacing="125%"><tspan
+         sodipodi:role="line"
+         id="tspan3695"
+         x="735.90662"
+         y="448.11954"
+         style="font-size:20px">Oranges 1.5Kg</tspan></text>
+    <text
+       sodipodi:linespacing="125%"
+       id="text3697"
+       y="510.88464"
+       x="735.90662"
+       style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:end;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:end;fill:#000000;fill-opacity:1;stroke:none;font-family:Droid Sans;-inkscape-font-specification:Droid Sans"
+       xml:space="preserve"><tspan
+         style="font-size:20px"
+         y="510.88464"
+         x="735.90662"
+         id="tspan3699"
+         sodipodi:role="line">Oranges 0.5Kg</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:end;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:end;fill:#000000;fill-opacity:1;stroke:none;font-family:Droid Sans;-inkscape-font-specification:Droid Sans"
+       x="735.90662"
+       y="577.10474"
+       id="text3701"
+       sodipodi:linespacing="125%"><tspan
+         sodipodi:role="line"
+         id="tspan3703"
+         x="735.90662"
+         y="577.10474"
+         style="font-size:20px">Oranges</tspan></text>
+    <text
+       sodipodi:linespacing="125%"
+       id="text3705"
+       y="642.17316"
+       x="735.90662"
+       style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:end;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:end;fill:#000000;fill-opacity:1;stroke:none;font-family:Droid Sans;-inkscape-font-specification:Droid Sans"
+       xml:space="preserve"><tspan
+         style="font-size:20px"
+         y="642.17316"
+         x="735.90662"
+         id="tspan3707"
+         sodipodi:role="line">Oignons 1.567Kg</tspan></text>
+  </g>
+</svg>
diff --git a/addons/point_of_sale/doc/barcode_test_sheet_new.svg b/addons/point_of_sale/doc/barcode_test_sheet_new.svg
new file mode 100644
index 00000000000..57dce3dc013
--- /dev/null
+++ b/addons/point_of_sale/doc/barcode_test_sheet_new.svg
@@ -0,0 +1,506 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="744.09448819"
+   height="1052.3622047"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.3.1 r9886"
+   sodipodi:docname="barcode_test_sheet.svg">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="1"
+     inkscape:pageshadow="2"
+     inkscape:zoom="0.86706515"
+     inkscape:cx="381.55817"
+     inkscape:cy="597.57819"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="1301"
+     inkscape:window-height="744"
+     inkscape:window-x="1985"
+     inkscape:window-y="24"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <g
+       id="g4158"
+       transform="matrix(0.92675002,0,0,0.92675002,27.597551,38.360312)">
+      <text
+         sodipodi:linespacing="125%"
+         id="text2985"
+         y="72.12545"
+         x="140.86679"
+         style="font-size:46.51613998px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
+         xml:space="preserve"><tspan
+           style="font-style:normal;font-variant:normal;font-weight:500;font-stretch:normal;font-family:Inconsolata;-inkscape-font-specification:Inconsolata Medium"
+           y="72.12545"
+           x="140.86679"
+           id="tspan2987"
+           sodipodi:role="line">BARCODE TEST SHEET</tspan></text>
+      <g
+         transform="translate(0,-5.3405762e-5)"
+         id="g3347">
+        <image
+           y="124.14642"
+           x="388.17426"
+           id="image3083"
+           xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAOYAAACYCAIAAAB/IAJdAAAAA3NCSVQICAjb4U/gAAADqUlEQVR4 nO3a226jMABFUYjy/7/MPCChDBfHARM4zVpP1dQY4u66JEw/DEO3S9/3XdeNh79+vRwz2hr5OmZr 5JH5t0YuX0X51W0dW3PNNa9xOWf5au8wsrxu9Ud95HHkYPg+yRJGsoSRLGEkSxjJEkayhJEsYSRL GMkSRrKEkSxhJEsYyRJGsoSRLGEkSxjJEkayhJEsYSRLGMkSRrKEkSxhJEsYyRJGsoSRLGEkSxjJ EkayhJEsYSRLGMkSRrKEkSxhJEsYyRJGsoSRLGEkSxjJEkayhJEsYSRLGMkSRrKEkSxhJEsYyRJG soSRLGEkSxjJEkayhJEsYSRLGMkSRrKEkSxhJEsYyRJGsoSRLGEkSxjJEkayhJEsYSRLGMkSRrKE kSxhJEsYyRJGsoSRLGEkSxjJEkayhJEsYSRLGMkSRrKEkSxhJEsYyRJGsoSRLGEkSxjJEkayhJEs YSRLGMkSRrKEkSxhJEsYyRJGsoSRLGEkSxjJEkayhJEsYSRLGMkSRrKEkSxhJEsYyRJGsoSRLGEk SxjJEkayhJEsYSRLGMkSRrKEkSxhJEsYyRJGsoSRLGEkSxjJEkayhJEsYSRLGMkSRrKEkSxh+mEY dh7Z913XjYe/fv3LrMlS8zWxyxJGsjuNGwbf91z911Z/1GY/18oJ689+cOTb7LZmPtJr/ZrcfOTu 1SucseaQlV221f6xnKdm5vqznzHy1Nn6vq9fk5SRrYzzry7RzHyXbd7r9HszXVP9b3bN/EdGlq/k 0y250uu0W2tSv3oXjvxo9d4ahmE6b/mP58ou2/BNbuUr3Hf2M0aOzthRVn8M5QurX71rR87sXr1h GGa/z6tT/Zds2y12+TpfP+nYOqp+/rYjZ4esXvzk0zkLlmtSv3rXjlx1/F3QMtzZgMfse1d9jvi1 t1zND2HScPUK2+2j+cl2uEmvl/Bh2Zat+4TH64gLruvzs599C3vSOqz+Yf1LvZ60estwn93ehdt9 ez5zk1vYJmrW5C9lWqNVJ5OnW4IjR31kudFWvqe5v/NWb/lE47n6jbOvo3xZhbOfMfLL7n97fRNb j9/WH9j+mgtTtsUW5hzNN6PVMx2/iMLO93ba798tfPp6d398tjyqfqFu+I9vv7XD1uY6Ofd/ci0/ o/5ZhR/2lvrVu3ZkK7PPX7ee2px1YzA9Mn77S/Nrlj/+1UdNlat37ciGCncCMyfuslsP/e7mazey y22j8Pi3fvWuHdlq9cYZap6H/wMqFm5yx9XfMwAAAABJRU5ErkJggg== "
+           height="107.96206"
+           width="163.36363" />
+        <rect
+           style="fill:none;stroke:#c3c3c3;stroke-width:1.07903957;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="rect3086"
+           width="417.54495"
+           height="126.4052"
+           x="141.08452"
+           y="114.51707"
+           rx="2.0839903"
+           ry="2.0839903" />
+        <text
+           xml:space="preserve"
+           style="font-size:27.53050041px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
+           x="201.46712"
+           y="147.73848"
+           id="text3856"
+           sodipodi:linespacing="125%"><tspan
+             sodipodi:role="line"
+             id="tspan3858"
+             x="201.46712"
+             y="147.73848"
+             style="font-style:normal;font-variant:normal;font-weight:500;font-stretch:normal;font-family:Inconsolata;-inkscape-font-specification:Inconsolata Medium">CASHIER</tspan></text>
+        <text
+           sodipodi:linespacing="125%"
+           id="text3860"
+           y="182.10147"
+           x="154.5717"
+           style="font-size:17.41555405px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
+           xml:space="preserve"><tspan
+             style="font-style:normal;font-variant:normal;font-weight:500;font-stretch:normal;font-family:Inconsolata;-inkscape-font-specification:Inconsolata Medium"
+             y="182.10147"
+             x="154.5717"
+             id="tspan3862"
+             sodipodi:role="line">Prefix: 40</tspan></text>
+        <text
+           xml:space="preserve"
+           style="font-size:17.41555405px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
+           x="154.5717"
+           y="200.85837"
+           id="text3149"
+           sodipodi:linespacing="125%"><tspan
+             sodipodi:role="line"
+             id="tspan3151"
+             x="154.5717"
+             y="200.85837"
+             style="font-style:normal;font-variant:normal;font-weight:500;font-stretch:normal;font-family:Inconsolata;-inkscape-font-specification:Inconsolata Medium">ID: 4447190000</tspan></text>
+      </g>
+      <g
+         transform="translate(0,0.97855377)"
+         id="g3335">
+        <g
+           id="g3173"
+           transform="translate(0,-3.2620699)">
+          <text
+             sodipodi:linespacing="125%"
+             id="text3153"
+             y="341.12738"
+             x="154.5717"
+             style="font-size:17.41555405px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
+             xml:space="preserve"><tspan
+               style="font-style:normal;font-variant:normal;font-weight:500;font-stretch:normal;font-family:Inconsolata;-inkscape-font-specification:Inconsolata Medium"
+               y="341.12738"
+               x="154.5717"
+               id="tspan3155"
+               sodipodi:role="line">Prefix: 42</tspan></text>
+          <text
+             xml:space="preserve"
+             style="font-size:17.41555405px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
+             x="154.5717"
+             y="359.88428"
+             id="text3157"
+             sodipodi:linespacing="125%"><tspan
+               sodipodi:role="line"
+               id="tspan3159"
+               x="154.5717"
+               y="359.88428"
+               style="font-style:normal;font-variant:normal;font-weight:500;font-stretch:normal;font-family:Inconsolata;-inkscape-font-specification:Inconsolata Medium">ID: 1182180000</tspan></text>
+        </g>
+        <g
+           id="g3954"
+           transform="translate(0,-18.756902)">
+          <rect
+             style="fill:none;stroke:#c3c3c3;stroke-width:1.07903957;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+             id="rect3876"
+             width="417.54495"
+             height="126.4052"
+             x="141.08452"
+             y="284.96024"
+             rx="2.0839903"
+             ry="2.0839903" />
+          <text
+             xml:space="preserve"
+             style="font-size:27.53050041px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
+             x="209.6223"
+             y="318.18164"
+             id="text3878"
+             sodipodi:linespacing="125%"><tspan
+               sodipodi:role="line"
+               id="tspan3880"
+               x="209.6223"
+               y="318.18164"
+               style="font-style:normal;font-variant:normal;font-weight:500;font-stretch:normal;font-family:Inconsolata;-inkscape-font-specification:Inconsolata Medium">CLIENT</tspan></text>
+          <image
+             width="162.31204"
+             height="107.26709"
+             xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAOYAAACYCAIAAAB/IAJdAAAAA3NCSVQICAjb4U/gAAADyUlEQVR4 nO3a3Y6qShSFUTC+/yvXuSAxbCgQsPiZp8e46mgJq/ETxe6+lNId0vd913XDw8c/z+8d3zIYP2p8 y9LKLbcvbXN8y5Zt/jLn0jHZcnzm29z+m961cmn+vY/a5fXLg+F6kiWMZAkjWcJIljCSJYxkCSNZ wkiWMJIljGQJI1nCSJYwkiWMZAkjWcJIljCSJYxkCSNZwkiWMJIljGQJI1nCSJYwkiWMZAkjWcJI ljCSJYxkCSNZwkiWMJIljGQJI1nCSJYwkiWMZAkjWcJIljCSJYxkCSNZwkiWMJIljGQJI1nCSJYw kiWMZAkjWcJIljCSJYxkCSNZwkiWMJIljGQJI1nCSJYwkiWMZAkjWcJIljCSJYxkCSNZwkiWMJIl jGQJI1nCSJYwkiWMZAkjWcJIljCSJYxkCSNZwkiWMJIljGQJI1nCSJYwkiWMZAkjWcJIljCSJYxk CSNZwkiWMJIljGQJI1nCSJYwkiWMZAkjWcJIljCSJYxkCSNZwkiWMJIljGQJI1nCSJYwkiWMZAkj WcJIljCSJYxkCSNZwkiWMJIljGQJI1nCSJYwkiWMZAkjWcJIljCSJYxkCSNZwkiWMJIljGQJI1nC 9KWUg4/s+67rhoePf/7LHJO55sfEWZYwj0t2eCG2XXmGe/f+l72rt7Z6U5s8r1832LbX+ZqlAc6b 85qpbln59SDs7afvN31MrZxlm5w/+r6fb6d644H9Huu1euOpcx6eqnrj0n7vXdnKsP31Iz+YnmWb TzZ+3Wx/wqoOrJzvfeml3HDO36ear1wa/saV62fovafYUspnv+tv8pWzbMPPA5NNjS8bL1Dd+9gt c36dqnrX+pNy78qJw8etlDJ53VY39U+ybZ+kjb9nGWm1cpfmc/5o6RwzfyHdu3LX8NvNw50seE3u a/J8XPC8bjH5bavXPdfP+XWqXG0TGm92fJTezXf2BJ8PRtsvzy/wzKkea3Je/yT6mqw41e0vjI27 vnjO/0evJx20+eeEd3f0vWnXx/OlC52TVA/f8P6yPsCPc64fk8NTRTt8GbfkffYZ5eJYu9ULiJU+ zp7z2FQpzqtocj4tpbyrdzSZY7zNJz8fKXP+NfNYhx/qf7BtuL+HR5Ay55OdcYpdOY+8Ss1n6Y9z pHTwqDmXvgGdl3HvypNMvtKa7/GU/+S695uB7Qf9yjkPpDD/hn/JvStbmcdaPSxnfTDoVn/PK783 +GXZBdcTS/utfoO7dPV218qGtl9RPO7/ZZuovkBv/5vcrqmqK5c2e+PKVu9Uwxa2PEf/AXnknj+O sxSLAAAAAElFTkSuQmCC "
+             id="image3951"
+             x="388.17426"
+             y="294.58957" />
+        </g>
+      </g>
+      <g
+         transform="translate(0,0.3261795)"
+         id="g3322">
+        <rect
+           style="fill:none;stroke:#c3c3c3;stroke-width:1.07903957;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="rect3964"
+           width="417.54495"
+           height="126.4052"
+           x="141.08452"
+           y="419.52063"
+           rx="2.0839903"
+           ry="2.0839903" />
+        <text
+           xml:space="preserve"
+           style="font-size:27.53050041px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
+           x="209.6223"
+           y="452.74203"
+           id="text3966"
+           sodipodi:linespacing="125%"><tspan
+             sodipodi:role="line"
+             id="tspan3968"
+             x="209.6223"
+             y="452.74203"
+             style="font-style:normal;font-variant:normal;font-weight:500;font-stretch:normal;font-family:Inconsolata;-inkscape-font-specification:Inconsolata Medium">WEIGHT</tspan></text>
+        <image
+           width="162.12962"
+           height="107.14654"
+           xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAOYAAACYCAIAAAB/IAJdAAAAA3NCSVQICAjb4U/gAAAERElEQVR4 nO3a0ZKaQBRFUbX8/182D1QZInRzadDxTNZ6mjgNNrhBYHJ9PB6XIdfr9XK5TIvPf57/drJ8/ayR rVdaG9Wfc+Vd+vPc+3N/hv3XK68st2i5Xa09XNnS+sjKthfdjiwMnydZwkiWMJIljGQJI1nCSJYw kiWMZAkjWcJIljCSJYxkCSNZwkiWMJIljGQJI1nCSJYwkiWMZAkjWcJIljCSJYxkCSNZwkiWMJIl jGQJI1nCSJYwkiWMZAkjWcJIljCSJYxkCSNZwkiWMJIljGQJI1nCSJYwkiWMZAkjWcJIljCSJYxk CSNZwkiWMJIljGQJI1nCSJYwkiWMZAkjWcJIljCSJYxkCSNZwkiWMJIljGQJI1nCSJYwkiWMZAkj WcJIljCSJYxkCSNZwkiWMJIljGQJI1nCSJYwkiWMZAkjWcJIljCSJYxkCSNZwkiWMJIljGQJI1nC SJYwkiWMZAkjWcJIljCSJYxkCSNZwkiWMJIljGQJI1nCSJYwkiWMZAkjWcJIljCSJYxkCSNZwkiW MJIljGQJI1nCSJYwkiWMZAkjWcJIljCSJYxkCSNZwkiWMJIljGQJI1nCSJYwkiWMZAkjWcJIljCS Jcz18XgMLnm9Xi6XafH5z/8z+2Tp9H3iLEuYDyU7HV7njuT/dH/+9NLKid9o5/Zan+fYFnW+vFrT 27uv+hPb3AnLt1su0prSO/beWeVcr6XL1Ns0dLnNqy+OzeOskfV5Dm9RZ8BZe2N1YgfXWXlx11u/ Y2TftFTlM7rP/zFv/B378eDIp+I8V89enUO5MpMjXz7P9S/nP59V/3zWOiX317k6/9aw5TqPj9z0 eDyea+vfpd1Wt/ny7y3eN6jP88jX9wdu8Jfzn2wuWD84W1cOm8Navz1rZN/LfmidcW/H36nz9pUP oz7yUs6uuLa5dx+cB5/vvOmRWeuAb52ex0bunVL/W/Se8uDw+Dw3r1MHTnVjs5qvpP6m9QuG7/lu HNa5Trg3F/oVKrfSR05ge5dt3awMH5DPj7b+0KA/n+/xcrZ+7qhmsm/6JjpdfZ6dMZuLd+5yBuxa ydgHsbxsnS4N407Gy3BXkm3d6KyuqzLyTSrzXH5Cex+Cdt5ifoabBlT2SSWmutZGtVb4+UxP7+Sf v34979EGbl8+aWye9RuIuoMnv039Ge66AVruqy//lCcvzw3+XhjsvSH4Ke+YZ+dR/DfvijFBW9S6 071fylcCP644z19T2wc25GsvZzvnpnvrF1/rxHl2rvZWL3lbTxuK77V6ifmZaPpH+8vlZmeeYyPH ptqa8C3lnPTjj5OW6xz7dlr9Q93YrFoP7Vfz6s+kOM+DI/uWl63r095c0VnP8A8+M9/cF8XHN8Xn WfUT6nCvm2uo7Lf6lu6af32eu7aoo36X8jv/i/fqAXrwBrm1zr0rKa6heJzXt3TXE4P6PI/vk/lS lc/oD6RX6TSeNJuDAAAAAElFTkSuQmCC "
+           id="image4065"
+           x="387.35876"
+           y="429.14993" />
+        <g
+           transform="translate(0,140.26901)"
+           id="g3179">
+          <text
+             xml:space="preserve"
+             style="font-size:17.41555405px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
+             x="154.5717"
+             y="341.12738"
+             id="text3181"
+             sodipodi:linespacing="125%"><tspan
+               sodipodi:role="line"
+               id="tspan3183"
+               x="154.5717"
+               y="341.12738"
+               style="font-style:normal;font-variant:normal;font-weight:500;font-stretch:normal;font-family:Inconsolata;-inkscape-font-specification:Inconsolata Medium">Prefix: 21</tspan></text>
+          <text
+             sodipodi:linespacing="125%"
+             id="text3185"
+             y="359.88428"
+             x="154.5717"
+             style="font-size:17.41555405px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
+             xml:space="preserve"><tspan
+               style="font-style:normal;font-variant:normal;font-weight:500;font-stretch:normal;font-family:Inconsolata;-inkscape-font-specification:Inconsolata Medium"
+               y="359.88428"
+               x="154.5717"
+               id="tspan3187"
+               sodipodi:role="line">ID: 12345</tspan></text>
+          <text
+             xml:space="preserve"
+             style="font-size:17.41555405px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
+             x="154.5717"
+             y="379.4567"
+             id="text3189"
+             sodipodi:linespacing="125%"><tspan
+               sodipodi:role="line"
+               id="tspan3191"
+               x="154.5717"
+               y="379.4567"
+               style="font-style:normal;font-variant:normal;font-weight:500;font-stretch:normal;font-family:Inconsolata;-inkscape-font-specification:Inconsolata Medium">Value: 67.89Kg</tspan></text>
+        </g>
+      </g>
+      <g
+         transform="translate(0,-1.9572678)"
+         id="g3308">
+        <rect
+           ry="2.0839903"
+           rx="2.0839903"
+           y="574.46893"
+           x="141.08452"
+           height="126.4052"
+           width="417.54495"
+           id="rect4081"
+           style="fill:none;stroke:#c3c3c3;stroke-width:1.07903957;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+        <g
+           id="g3296">
+          <text
+             xml:space="preserve"
+             style="font-size:27.53050041px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
+             x="195.7585"
+             y="607.69037"
+             id="text4083"
+             sodipodi:linespacing="125%"><tspan
+               sodipodi:role="line"
+               id="tspan4085"
+               x="195.7585"
+               y="607.69037"
+               style="font-style:normal;font-variant:normal;font-weight:500;font-stretch:normal;font-family:Inconsolata;-inkscape-font-specification:Inconsolata Medium">DISCOUNT</tspan></text>
+          <image
+             y="584.09827"
+             x="385.72772"
+             id="image4202"
+             xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAOYAAACYCAIAAAB/IAJdAAAAA3NCSVQICAjb4U/gAAADsElEQVR4 nO3aXXOiMACGUej4//8ye+EMZYHECBF96zlXHTd8iE8jYTtO0zQcMo7jMAz3zUs/b8ffLUcuXymN bHn92ZHtR3l2ZOnnpfazOvauS3toP3rLyPr5tGx1wM+ZjeF6kiWMZAkjWcJIljCSJYxkCSNZwkiW MJIljGQJI1nCSJYwkiWMZAkjWcJIljCSJYxkCSNZwkiWMJIljGQJI1nCSJYwkiWMZAkjWcJIljCS JYxkCSNZwkiWMJIljGQJI1nCSJYwkiWMZAkjWcJIljCSJYxkCSNZwkiWMJIljGQJI1nCSJYwkiWM ZAkjWcJIljCSJYxkCSNZwkiWMJIljGQJI1nCSJYwkiWMZAkjWcJIljCSJYxkCSNZwkiWMJIljGQJ I1nCSJYwkiWMZAkjWcJIljCSJYxkCSNZwkiWMJIljGQJI1nCSJYwkiWMZAkjWcJIljCSJYxkCSNZ wkiWMJIljGQJI1nCSJYwkiWMZAkjWcJIljCSJYxkCSNZwkiWMJIljGQJI1nCSJYwkiWMZAkjWcJI ljCSJYxkCSNZwkiWMJIljGQJI1nCSJYwkiWMZAkjWcJIljCSJYxkCSNZwkiWMJIljGQJI1nCjNM0 HdxyHIdhuG++/PmbuSZb3a+JWZYwH5fs/RfxL42kr9vuq6/4UmvZZ0qFZ3pdbVu5II0jSyezO777 0XdP4Fg549h0m7ozy75i/mjZZ0qFHXst7W0cx92RjZufPPrJkc+e1XKT3fe4sp5lr+81pb/zV2be wzyXzJ9TaXZZvl45gZbJqf3oZ0ZWBtdN0zTvrf6FvDPLvmKRa+E8W16K+nf36l+Xi+7XHf3kyIeD 6/tZpb/7Zv+bZd9yS9A4kQSN3FWaOe6zy3ZOumYhsT36s+fZ3eo3c3vE32TfteRi5cDlal8qvcKq qi4TX+U+4bb7ahd6fZfLrvwcVq+HBts9bMO9rUb0pdeOtiFWVj/v1fFz34Z7G46+yfrt+SdcuOu1 L1meUl+Qbc/h2Jr98IltHyMsD939mvy4Jfhk86p5tZquu+bKVxZqQ785a/Xc4PfGoPJA+OTfzfTd 5/dYfU5vPJN3Ka0p9//Dlvcq3Ql8j8pv7K3yNPvMM+Hu+0xXeq5ZuSwPr1Vp2931e+PRD5xnXw8f 2H3cX3L9ecuPpMu902on9Rn64dHbR5buWQ/Hvb1t3d2JG4PrlJ5itvzJ1e74px6Lth/9qfOsn2q7 9nt3s+ylSuvrMzts32f3kaWjH3hT901atv0Hm+wpnHOLKX0AAAAASUVORK5CYII= "
+             height="108.34499"
+             width="163.94308"
+             inkscape:transform-center-x="-24.4145"
+             inkscape:transform-center-y="6.3942733" />
+          <g
+             transform="translate(0,296.03285)"
+             id="g3210">
+            <text
+               xml:space="preserve"
+               style="font-size:17.41555405px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
+               x="154.5717"
+               y="341.12738"
+               id="text3212"
+               sodipodi:linespacing="125%"><tspan
+                 sodipodi:role="line"
+                 id="tspan3214"
+                 x="154.5717"
+                 y="341.12738"
+                 style="font-style:normal;font-variant:normal;font-weight:500;font-stretch:normal;font-family:Inconsolata;-inkscape-font-specification:Inconsolata Medium">Prefix: 44</tspan></text>
+            <text
+               sodipodi:linespacing="125%"
+               id="text3216"
+               y="359.88428"
+               x="154.5717"
+               style="font-size:17.41555405px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
+               xml:space="preserve"><tspan
+                 style="font-style:normal;font-variant:normal;font-weight:500;font-stretch:normal;font-family:Inconsolata;-inkscape-font-specification:Inconsolata Medium"
+                 y="359.88428"
+                 x="154.5717"
+                 id="tspan3218"
+                 sodipodi:role="line">ID: 11111</tspan></text>
+            <text
+               xml:space="preserve"
+               style="font-size:17.41555405px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
+               x="154.5717"
+               y="379.4567"
+               id="text3220"
+               sodipodi:linespacing="125%"><tspan
+                 sodipodi:role="line"
+                 id="tspan3222"
+                 x="154.5717"
+                 y="379.4567"
+                 style="font-style:normal;font-variant:normal;font-weight:500;font-stretch:normal;font-family:Inconsolata;-inkscape-font-specification:Inconsolata Medium">Value: 25%</tspan></text>
+          </g>
+        </g>
+      </g>
+      <g
+         transform="translate(0,-0.97866058)"
+         id="g3283">
+        <rect
+           style="fill:none;stroke:#c3c3c3;stroke-width:1.07903957;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="rect4115"
+           width="417.54495"
+           height="126.4052"
+           x="141.08452"
+           y="726.15521"
+           rx="2.0839903"
+           ry="2.0839903" />
+        <text
+           xml:space="preserve"
+           style="font-size:27.53050041px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
+           x="212.88437"
+           y="759.37659"
+           id="text4117"
+           sodipodi:linespacing="125%"><tspan
+             sodipodi:role="line"
+             id="tspan4119"
+             x="212.88437"
+             y="759.37659"
+             style="font-style:normal;font-variant:normal;font-weight:500;font-stretch:normal;font-family:Inconsolata;-inkscape-font-specification:Inconsolata Medium">PRICE</tspan></text>
+        <image
+           width="163.36363"
+           height="107.96206"
+           xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAOYAAACYCAIAAAB/IAJdAAAAA3NCSVQICAjb4U/gAAAD70lEQVR4 nO3Z3XKbOhiGUezJ/d8yPfBsbwaB+Phz/aZrHaWukDB+goE8xnEcDnk8HsMwvDaf/tz+7/SVl3bR drbEkWvHZG3O/gytyvxrq6yt265emWfvyMq7K3qe2Rg+T7KEkSxhJEsYyRJGsoSRLGEkSxjJEkay hJEsYSRLGMkSRrKEkSxhJEsYyRJGsoSRLGEkSxjJEkayhJEsYSRLGMkSRrKEkSxhJEsYyRJGsoSR LGEkSxjJEkayhJEsYSRLGMkSRrKEkSxhJEsYyRJGsoSRLGEkSxjJEkayhJEsYSRLGMkSRrKEkSxh JEsYyRJGsoSRLGEkSxjJEkayhJEsYSRLGMkSRrKEkSxhJEsYyRJGsoSRLGEkSxjJEkayhJEsYSRL GMkSRrKEkSxhJEsYyRJGsoSRLGEkSxjJEkayhJEsYSRLGMkSRrKEkSxhJEsYyRJGsoSRLGEkSxjJ EkayhJEsYSRLGMkSRrKEkSxhJEsYyRJGsoSRLGEkSxjJEkayhJEsYSRLGMkSRrKEkSxhJEsYyRJG soSRLGEkSxjJEkayhJEsYSRLGMkSRrKEkSxhJEsYyRJGsoSRLGEkSxjJEkayhJEsYSRLmMc4jge3 fDyGYXhtPv35X+aYtC4/Js6yhJHsX/M65bDXz/un2RG85ButPufvG9lX6fXYWp0v37VFK4M/c0wq 2z4XV118Ze/yi3PWX6zP+W0jN21uVT9Q9Zl37Wr9nV57TCrv8We6xrvx9/bnz7XTGTp70w5bWz1l ZGvvZzmbdnO5yvyVXa33cGE54zi+Z+vfpT2n2yz+fED7Tqb/nB7ZxZ3rfE99/8jzdn19HxhTVO/h qnLGcZydERYPxXOt6DavA3twctv6aeP7Rw7/fSSzD6YzrDLn21U3c/UebiqnDXc24Ge4gYeRd9i8 Tt31pf/ytZ9U5zrhlmTPq/+Opow8pp2/jaze69r83xnu7Gz93tWPPpdtD9Dil8hiBykj79O5Wths bnp3cezC429prxOOn2V3XXSv3ZC1AzZ988gLb2HbSRbPiPXL6MUXL3w0VFn6klVuP8u+7/vWfrPb 19NH3qR+A7R3zm82e24wjuON17KzlfqD68cuZeTHrP3hY/jKva1bu1O8K9nNK4Hi5r9mZN0vqO28 zvnu53VBs/aHjZMH7uQ17uLzuS8f+UmL63YuedeeNszmLPZwUzmbj+Gei0NPnjzqO9056KEjr9JO fv4ksvbEY/Pd9d/pVeW0l63LO7b4+Oa9zeG1+wMWT2Cbq6eMrOj31zmAxS+uk/t/x294X/3O5/+z +oV/F9mVbLvJxh6HjOyrnDKPfSK7fhk6c94xsq/4rO0Pc0/7XuEpWE8AAAAASUVORK5CYII= "
+           id="image4264"
+           x="386.54324"
+           y="734.96906" />
+        <g
+           transform="translate(0,442.82599)"
+           id="g3224">
+          <text
+             xml:space="preserve"
+             style="font-size:17.41555405px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
+             x="154.5717"
+             y="341.12738"
+             id="text3226"
+             sodipodi:linespacing="125%"><tspan
+               sodipodi:role="line"
+               id="tspan3228"
+               x="154.5717"
+               y="341.12738"
+               style="font-style:normal;font-variant:normal;font-weight:500;font-stretch:normal;font-family:Inconsolata;-inkscape-font-specification:Inconsolata Medium">Prefix: 02</tspan></text>
+          <text
+             sodipodi:linespacing="125%"
+             id="text3230"
+             y="359.88428"
+             x="154.5717"
+             style="font-size:17.41555405px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
+             xml:space="preserve"><tspan
+               style="font-style:normal;font-variant:normal;font-weight:500;font-stretch:normal;font-family:Inconsolata;-inkscape-font-specification:Inconsolata Medium"
+               y="359.88428"
+               x="154.5717"
+               id="tspan3232"
+               sodipodi:role="line">ID: 99999</tspan></text>
+          <text
+             xml:space="preserve"
+             style="font-size:17.41555405px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
+             x="154.5717"
+             y="379.4567"
+             id="text3234"
+             sodipodi:linespacing="125%"><tspan
+               sodipodi:role="line"
+               id="tspan3236"
+               x="154.5717"
+               y="379.4567"
+               style="font-style:normal;font-variant:normal;font-weight:500;font-stretch:normal;font-family:Inconsolata;-inkscape-font-specification:Inconsolata Medium">Value: 134.50€</tspan></text>
+        </g>
+      </g>
+      <g
+         id="g3269">
+        <g
+           id="g3061"
+           transform="translate(0,284.6156)">
+          <g
+             id="g3063"
+             transform="translate(0,154.94832)">
+            <rect
+               ry="2.0839903"
+               rx="2.0839903"
+               y="438.27753"
+               x="141.08452"
+               height="126.4052"
+               width="417.54495"
+               id="rect3065"
+               style="fill:none;stroke:#c3c3c3;stroke-width:1.07903957;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+            <text
+               sodipodi:linespacing="125%"
+               id="text3067"
+               y="471.49893"
+               x="216.61778"
+               style="font-size:27.53050041px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
+               xml:space="preserve"><tspan
+                 style="font-style:normal;font-variant:normal;font-weight:500;font-stretch:normal;font-family:Inconsolata;-inkscape-font-specification:Inconsolata Medium"
+                 y="471.49893"
+                 x="216.61778"
+                 sodipodi:role="line"
+                 id="tspan3083">UNIT</tspan></text>
+            <g
+               transform="translate(0,156.57936)"
+               id="g3071" />
+          </g>
+        </g>
+        <image
+           y="887.47076"
+           x="386.54324"
+           id="image3146"
+           xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAOYAAACYCAIAAAB/IAJdAAAAA3NCSVQICAjb4U/gAAADz0lEQVR4 nO3Z0ZKaMACGUdnx/V+ZXjBjGWKyEQjyt+fcdIsBY/ZTgZ3meX7sMk3T4/FYdq/9XI5frB9db18/ Wh6nfJZyr/Yz9s+t/Yp65tw/22+N3Pe6asevhdQ/stPPkZ3hepIljGQJI1nCSJYwkiWMZAkjWcJI ljCSJYxkCSNZwkiWMJIljGQJI1nCSJYwkiWMZAkjWcJIljCSJYxkCSNZwkiWMJIljGQJI1nCSJYw kiWMZAkjWcJIljCSJYxkCSNZwkiWMJIljGQJI1nCSJYwkiWMZAkjWcJIljCSJYxkCSNZwkiWMJIl jGQJI1nCSJYwkiWMZAkjWcJIljCSJYxkCSNZwkiWMJIljGQJI1nCSJYwkiWMZAkjWcJIljCSJYxk CSNZwkiWMJIljGQJI1nCSJYwkiWMZAkjWcJIljCSJYxkCSNZwkiWMJIljGQJI1nCSJYwkiWMZAkj WcJIljCSJYxkCSNZwkiWMJIljGQJI1nCSJYwkiWMZAkjWcJIljCSJYxkCSNZwkiWMJIljGQJI1nC SJYwkiWMZAkjWcJIljCSJYxkCSNZwkiWMJIljGQJI1nCSJYwkiWMZAkjWcJIljCSJYxkCSNZwkzz PO/cc5oej8ey+/rn/5k1KZ2+Jj5lCSNZwjyXf5ZP7NKJ32v9XwrtkZupNg743ZH3nNWgV3p8WZaD 9Oz4Uz7fCP1P0Rg5TVP5aG38d0fWfHFW/av36TofX5bXLm+PtvF8/TTuQuGUXl/W83y9zs3kX8d5 bb9yZM0dZtWzev0jy2f/9bA18zy/jtb+mr3oXLZ/9u3zgc2j7cOuH71+5K1m1b96B9d5+e+isUvt OJv0336EDU/23I/Y0vruyfo45ZJdM7LmnrM6MnLQXbwy3M2AZ+2xU6Zy1iUXN7eO55RfYuM84Vnb 53hD1/R6wbXjP+z4d2Dt2ut4uJvP9ddhf9Zn0LvPQtrPesrIt19heu3Uv3r71nlEPOsjr2fyrF0t /nrd1z7lH3cKe+dMj1+cjTbi91Jefi1XTsv209ekevl1w1OC8k084m39r+pfvY/WefT6b+4bzPNc PZc95clqGzevs3/k2y30O/FUbbTa/YCByV7jzucJ9zf6FuRujVsQb/56sdnnrHfbwbOF2nwag7+1 ccfrGr2xf/XOWudye6dfb7b+vB13eq/HvZ1J+61f3ve+cuStZtW/emet845yytPW95NZ37PdOLfX 49dkH83zst/cR6v0xVn1r96gdW7r/2PE33tYI/76Vc7p+G2ED15b9ysaMfKes9q3emetc1vjjura Hwkp3Xa7HcbMAAAAAElFTkSuQmCC "
+           height="108.34499"
+           width="163.94308" />
+        <g
+           id="g3255"
+           transform="translate(0,598.58983)">
+          <text
+             xml:space="preserve"
+             style="font-size:17.41555405px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
+             x="154.5717"
+             y="351.81107"
+             id="text3261"
+             sodipodi:linespacing="125%"><tspan
+               sodipodi:role="line"
+               id="tspan3263"
+               x="154.5717"
+               y="351.81107"
+               style="font-style:normal;font-variant:normal;font-weight:500;font-stretch:normal;font-family:Inconsolata;-inkscape-font-specification:Inconsolata Medium">ID: 5449000000996</tspan></text>
+        </g>
+      </g>
+      <g
+         transform="matrix(0,-1,1,0,261.82237,1622.2884)"
+         id="g4150">
+        <text
+           xml:space="preserve"
+           style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Droid Sans;-inkscape-font-specification:Droid Sans"
+           x="618.97778"
+           y="320.0275"
+           id="text3357"
+           sodipodi:linespacing="125%"><tspan
+             sodipodi:role="line"
+             id="tspan3359"
+             x="618.97778"
+             y="320.0275">This is a test sheet intended to help you test the codebar aquisition in OpenERP's Point of Sale module. </tspan><tspan
+             sodipodi:role="line"
+             x="618.97778"
+             y="330.0275"
+             id="tspan3363">The codes provided in this list are randomly chosen and are encoded in the EAN13 format. Their codes</tspan><tspan
+             sodipodi:role="line"
+             x="618.97778"
+             y="340.0275"
+             id="tspan3367">and prefixes are not intended to match any specified standard. </tspan></text>
+        <text
+           sodipodi:linespacing="125%"
+           id="text3369"
+           y="349.54001"
+           x="618.99207"
+           style="font-size:6.53564215px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#b3b3b3;fill-opacity:1;stroke:none;font-family:Droid Sans;-inkscape-font-specification:Droid Sans"
+           xml:space="preserve"><tspan
+             id="tspan3375"
+             y="349.54001"
+             x="618.99207"
+             sodipodi:role="line"
+             style="fill:#b3b3b3;fill-opacity:1">This document is licensed by OpenERP S.A. under the Creative Commons CC BY 3.0 license htttp://www.creativecommons.org</tspan></text>
+      </g>
+    </g>
+  </g>
+</svg>
diff --git a/addons/point_of_sale/i18n/ar.po b/addons/point_of_sale/i18n/ar.po
index 4d2038463a8..c6c12d7a02c 100644
--- a/addons/point_of_sale/i18n/ar.po
+++ b/addons/point_of_sale/i18n/ar.po
@@ -13,18 +13,18 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:56+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:03+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: point_of_sale
 #: field:report.transaction.pos,product_nb:0
 msgid "Product Nb."
-msgstr ""
+msgstr "رقم المنتج"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_trans_pos_tree_today
 msgid "Sales by day"
-msgstr ""
+msgstr "المبيعات باليوم"
 
 #. module: point_of_sale
 #: code:addons/point_of_sale/wizard/pos_open_statement.py:49
@@ -56,7 +56,7 @@ msgstr ""
 #. module: point_of_sale
 #: view:pos.confirm:0
 msgid "Post All Orders"
-msgstr ""
+msgstr "ترحيل كل الأوامر"
 
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.spa_2l_product_template
@@ -78,7 +78,7 @@ msgstr ""
 #: 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 ""
+msgstr "تفاصيل المبيعات"
 
 #. module: point_of_sale
 #: view:report.cash.register:0 field:report.cash.register,day:0
@@ -94,7 +94,7 @@ msgstr ""
 #. module: point_of_sale
 #: field:pos.box.out,name:0
 msgid "Description / Reason"
-msgstr ""
+msgstr "وصف / سبب"
 
 #. module: point_of_sale
 #: field:report.sales.by.margin.pos,product_name:0
@@ -121,6 +121,8 @@ msgid ""
 "Configuration error! The currency chosen should be shared by the default "
 "accounts too."
 msgstr ""
+"خطأ في الإعدادات! يجب أن تكون العملة المختارة مشتركة للحسابات الإفتراضية "
+"أيضأً."
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.pos_category_action
@@ -195,7 +197,7 @@ msgstr ""
 #. module: point_of_sale
 #: view:pos.order:0
 msgid "Accounting Information"
-msgstr ""
+msgstr "معلومات محاسبية"
 
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.coca_regular_2l_product_template
@@ -210,13 +212,13 @@ msgstr ""
 #. module: point_of_sale
 #: model:pos.category,name:point_of_sale.soda_orange
 msgid "Orange"
-msgstr ""
+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 ""
+msgstr "المبيعات بالمستخدم"
 
 #. module: point_of_sale
 #: report:pos.invoice:0
@@ -247,7 +249,7 @@ msgstr ""
 #. module: point_of_sale
 #: model:pos.category,name:point_of_sale.beverage
 msgid "Beverages"
-msgstr ""
+msgstr "مشروبات"
 
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.stella_50cl_product_template
@@ -262,7 +264,7 @@ msgstr "تواريخ"
 #. module: point_of_sale
 #: field:pos.category,parent_id:0
 msgid "Parent Category"
-msgstr ""
+msgstr "الفئة الأم"
 
 #. module: point_of_sale
 #: report:pos.details:0 report:pos.lines:0 report:pos.payment.report.user:0
@@ -289,7 +291,7 @@ msgstr ""
 #. module: point_of_sale
 #: view:pos.order.line:0
 msgid "Total qty"
-msgstr ""
+msgstr "إجمالي الكمية"
 
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.fanta_orange_33cl_product_template
@@ -299,7 +301,7 @@ 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 ""
+msgstr "مبيعات المستخدم الشهرية"
 
 #. module: point_of_sale
 #: report:all.closed.cashbox.of.the.day:0
@@ -314,13 +316,13 @@ 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
 #: code:addons/point_of_sale/point_of_sale.py:285
 #, python-format
 msgid "Configuration Error !"
-msgstr ""
+msgstr "خطأ في الإعدادات!"
 
 #. module: point_of_sale
 #: model:pos.category,name:point_of_sale.sparkling_water
@@ -382,7 +384,7 @@ msgstr ""
 #. module: point_of_sale
 #: report:account.statement:0 report:all.closed.cashbox.of.the.day:0
 msgid "Closing Date"
-msgstr ""
+msgstr "تاريخ الاغلاق"
 
 #. module: point_of_sale
 #: selection:report.cash.register,month:0 selection:report.pos.order,month:0
@@ -414,7 +416,7 @@ msgstr "كمية"
 #. module: point_of_sale
 #: field:pos.order.line,name:0
 msgid "Line No"
-msgstr ""
+msgstr "السطر رقم"
 
 #. module: point_of_sale
 #: view:account.bank.statement:0
@@ -440,7 +442,7 @@ msgstr ""
 #. module: point_of_sale
 #: report:pos.details_summary:0
 msgid "Mode of Payment"
-msgstr ""
+msgstr "حالة الدفع"
 
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_pos_confirm
@@ -451,7 +453,7 @@ msgstr ""
 #: code:addons/point_of_sale/point_of_sale.py:408
 #, python-format
 msgid "Customer Invoice"
-msgstr ""
+msgstr "فاتورة العميل"
 
 #. module: point_of_sale
 #: view:pos.box.out:0
@@ -467,7 +469,7 @@ msgstr ""
 #: view:pos.details:0 view:pos.payment.report:0 view:pos.payment.report.user:0
 #: view:pos.sale.user:0
 msgid "Print Report"
-msgstr ""
+msgstr "طباعة التقرير"
 
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.oetker_bolognese_product_template
@@ -490,7 +492,7 @@ msgstr ""
 #: code:addons/point_of_sale/wizard/pos_return.py:240
 #, python-format
 msgid "Add Product"
-msgstr ""
+msgstr "أضف منتج"
 
 #. module: point_of_sale
 #: field:report.transaction.pos,invoice_am:0
@@ -567,13 +569,13 @@ msgstr ""
 #. module: point_of_sale
 #: constraint:product.product:0
 msgid "Error: Invalid ean code"
-msgstr ""
+msgstr "خطأ: كود إين غير صالح"
 
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_pos_open_statement
 #: view:pos.open.statement:0
 msgid "Open Statements"
-msgstr ""
+msgstr "بيانات الفتح"
 
 #. module: point_of_sale
 #: field:pos.details,date_end:0 field:pos.sale.user,date_end:0
@@ -619,7 +621,7 @@ msgstr ""
 #. module: point_of_sale
 #: view:report.pos.order:0
 msgid "Not Invoiced"
-msgstr ""
+msgstr "لم يتم عمل فاتروة لها"
 
 #. module: point_of_sale
 #: selection:report.cash.register,month:0 selection:report.pos.order,month:0
@@ -811,12 +813,12 @@ msgstr "قائمة الأسعار"
 #. module: point_of_sale
 #: report:pos.details:0 report:pos.details_summary:0
 msgid "Total invoiced"
-msgstr ""
+msgstr "الفواتير الكلية"
 
 #. module: point_of_sale
 #: view:report.pos.order:0 field:report.pos.order,product_qty:0
 msgid "# of Qty"
-msgstr ""
+msgstr "# للكمية"
 
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_report_sales_by_margin_pos_month
@@ -851,12 +853,12 @@ msgstr "مسودة للفاتورة"
 msgid ""
 "The amount of the voucher must be the same amount as the one on the "
 "statement line"
-msgstr ""
+msgstr "يجب ان تكون كمية الايصال نفس كمية الايصال في خط البيان"
 
 #. module: point_of_sale
 #: report:pos.invoice:0
 msgid "Fiscal Position Remark :"
-msgstr ""
+msgstr "ملاحظة الوضع المالي :"
 
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.evian_2l_product_template
@@ -1055,7 +1057,7 @@ msgstr "المستخدمون"
 #. module: point_of_sale
 #: model:pos.category,name:point_of_sale.food
 msgid "Food"
-msgstr ""
+msgstr "الطعام"
 
 #. #-#-#-#-#  point_of_sale.pot (OpenERP Server 6.1rc1)  #-#-#-#-#
 #. module: point_of_sale
@@ -1164,7 +1166,7 @@ msgstr "كشف حساب بنك"
 #. module: point_of_sale
 #: sql_constraint:account.journal:0
 msgid "The name of the journal must be unique per company !"
-msgstr ""
+msgstr "يجب ان يكون الاسم لليومية فريد لكل شركة!"
 
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.lays_light_naturel_170g_product_template
@@ -1226,12 +1228,12 @@ msgstr ""
 #: code:addons/point_of_sale/point_of_sale.py:640
 #, python-format
 msgid "No Pricelist !"
-msgstr ""
+msgstr "لا يوجد قائمة اسعار !"
 
 #. module: point_of_sale
 #: view:pos.order:0
 msgid "Update"
-msgstr ""
+msgstr "تحديث"
 
 #. module: point_of_sale
 #: report:pos.invoice:0
@@ -1241,7 +1243,7 @@ msgstr "الأساس"
 #. module: point_of_sale
 #: model:pos.category,name:point_of_sale.categ_others
 msgid "Others"
-msgstr ""
+msgstr "أخرى"
 
 #. module: point_of_sale
 #: view:product.product:0
@@ -1367,7 +1369,7 @@ msgstr ""
 #. module: point_of_sale
 #: field:pos.make.payment,journal:0
 msgid "Payment Mode"
-msgstr ""
+msgstr "طريقة الدفع"
 
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.lays_paprika_45g_product_template
@@ -1389,14 +1391,14 @@ msgstr "الكمية"
 #. module: point_of_sale
 #: view:report.cash.register:0 view:report.pos.order:0
 msgid "Month -1"
-msgstr ""
+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 ""
+msgstr "مبيعات بمستخدم"
 
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.evian_1l_product_template
@@ -1411,7 +1413,7 @@ msgstr ""
 #. module: point_of_sale
 #: model:pos.category,name:point_of_sale.water
 msgid "Water"
-msgstr ""
+msgstr "مياه"
 
 #. module: point_of_sale
 #: view:report.cash.register:0
@@ -1548,7 +1550,7 @@ msgstr "رصيد أول المدة"
 #. module: point_of_sale
 #: view:account.bank.statement:0 selection:report.pos.order,state:0
 msgid "Closed"
-msgstr ""
+msgstr "مغلق"
 
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.oetker_vegetale_product_template
@@ -1578,7 +1580,7 @@ msgstr ""
 #. module: point_of_sale
 #: view:pos.order:0
 msgid "Discount"
-msgstr ""
+msgstr "الخصم"
 
 #. module: point_of_sale
 #: view:report.cash.register:0
@@ -1606,7 +1608,7 @@ msgstr ""
 #. module: point_of_sale
 #: selection:report.cash.register,state:0
 msgid "Quotation"
-msgstr ""
+msgstr "التسعيرة"
 
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.product_product_putmoneyforchange0_product_template
@@ -1709,7 +1711,7 @@ msgstr "فتح"
 #. module: point_of_sale
 #: field:pos.order,name:0 field:pos.order.line,order_id:0
 msgid "Order Ref"
-msgstr ""
+msgstr "مسلسل الأمر"
 
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.timmermans_geuze_37,5cl_product_template
@@ -1808,7 +1810,7 @@ msgstr ""
 #. module: point_of_sale
 #: view:pos.order:0 selection:pos.order,state:0
 msgid "Posted"
-msgstr ""
+msgstr "مرحَلة"
 
 #. module: point_of_sale
 #: field:pos.order,date_order:0
@@ -1861,7 +1863,7 @@ msgstr "المجموع الصافي"
 #. module: point_of_sale
 #: model:res.groups,name:point_of_sale.group_pos_manager
 msgid "Manager"
-msgstr ""
+msgstr "المدير"
 
 #. module: point_of_sale
 #: field:pos.details,date_start:0 field:pos.sale.user,date_start:0
@@ -1940,7 +1942,7 @@ msgstr "تاريخ الفاتورة"
 #. module: point_of_sale
 #: field:pos.box.entries,name:0
 msgid "Reason"
-msgstr ""
+msgstr "السبب"
 
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.orangina_33cl_product_template
@@ -2013,7 +2015,7 @@ msgstr ""
 #. module: point_of_sale
 #: selection:pos.order,state:0 selection:report.pos.order,state:0
 msgid "Cancelled"
-msgstr ""
+msgstr "ملغي"
 
 #. module: point_of_sale
 #: report:pos.user.product:0
@@ -2028,12 +2030,12 @@ msgstr ""
 #. module: point_of_sale
 #: field:pos.order,picking_id:0
 msgid "Picking"
-msgstr ""
+msgstr "اختيار"
 
 #. module: point_of_sale
 #: model:pos.category,name:point_of_sale.ice_cream
 msgid "Ice Cream"
-msgstr ""
+msgstr "أيس كريم"
 
 #. module: point_of_sale
 #: field:pos.order,shop_id:0 field:report.pos.order,shop_id:0
@@ -2043,7 +2045,7 @@ msgstr "المتجر"
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_account_bank_statement_line
 msgid "Bank Statement Line"
-msgstr ""
+msgstr "سطر كشف البنك"
 
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.belle_vue_kriek_25cl_product_template
@@ -2085,7 +2087,7 @@ msgstr ""
 #. module: point_of_sale
 #: view:pos.confirm:0
 msgid "Generate Entries"
-msgstr ""
+msgstr "إنشاء قيود"
 
 #. module: point_of_sale
 #: field:pos.box.entries,product_id:0 field:pos.box.out,product_id:0
@@ -2137,13 +2139,13 @@ msgstr "فاتورة المورد"
 #. module: point_of_sale
 #: constraint:account.bank.statement:0
 msgid "The journal and period chosen have to belong to the same company."
-msgstr ""
+msgstr "يجب أن يكون اليومية و الفترة مرتبطين لشركة واحدة."
 
 #. module: point_of_sale
 #: view:pos.order:0 selection:pos.order,state:0
 #: selection:report.pos.order,state:0
 msgid "New"
-msgstr ""
+msgstr "جديد"
 
 #. module: point_of_sale
 #: code:addons/point_of_sale/point_of_sale.py:238
@@ -2179,7 +2181,7 @@ msgstr ""
 #. module: point_of_sale
 #: sql_constraint:account.journal:0
 msgid "The code of the journal must be unique per company !"
-msgstr ""
+msgstr "يجب ان يكون الكود لليومية فريد لكل شركة !"
 
 #. module: point_of_sale
 #: model:ir.ui.menu,name:point_of_sale.menu_point_config_product
@@ -2231,7 +2233,7 @@ msgstr ""
 #: code:addons/point_of_sale/point_of_sale.py:329 view:pos.order:0
 #, python-format
 msgid "Return Products"
-msgstr ""
+msgstr "منتجات"
 
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.jupiler_33cl_product_template
@@ -2317,7 +2319,7 @@ msgstr ""
 #. module: point_of_sale
 #: report:pos.invoice:0
 msgid "PRO-FORMA"
-msgstr ""
+msgstr "شكلي"
 
 #. module: point_of_sale
 #: code:addons/point_of_sale/point_of_sale.py:358
@@ -2416,7 +2418,7 @@ msgstr ""
 #. module: point_of_sale
 #: report:pos.invoice:0
 msgid "Refund"
-msgstr ""
+msgstr "رد"
 
 #. module: point_of_sale
 #: code:addons/point_of_sale/report/pos_invoice.py:46
@@ -2445,7 +2447,7 @@ msgstr ""
 #. module: point_of_sale
 #: view:pos.order:0
 msgid "General Information"
-msgstr ""
+msgstr "المعلومات العامة"
 
 #. #-#-#-#-#  point_of_sale.pot (OpenERP Server 6.1rc1)  #-#-#-#-#
 #. module: point_of_sale
@@ -2485,12 +2487,12 @@ msgstr ""
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_report_pos_payment
 msgid "Pyament Report"
-msgstr ""
+msgstr "تقرير الدفع"
 
 #. module: point_of_sale
 #: field:report.transaction.pos,jl_id:0
 msgid "Cash Journals"
-msgstr ""
+msgstr "يومية النفدة"
 
 #. module: point_of_sale
 #: report:pos.sales.user.today:0
@@ -2500,7 +2502,7 @@ msgstr ""
 #. module: point_of_sale
 #: report:pos.invoice:0
 msgid "Customer Code"
-msgstr ""
+msgstr "رمز العميل"
 
 #. module: point_of_sale
 #: code:addons/point_of_sale/wizard/pos_box_out.py:86
@@ -2526,7 +2528,7 @@ msgstr ""
 #. module: point_of_sale
 #: view:pos.order:0
 msgid "Yesterday"
-msgstr ""
+msgstr "أمس"
 
 #. module: point_of_sale
 #: field:pos.order,note:0
@@ -2563,7 +2565,7 @@ msgstr "فبراير"
 #. module: point_of_sale
 #: view:report.cash.register:0
 msgid "    Today    "
-msgstr ""
+msgstr "    اليوم    "
 
 #. module: point_of_sale
 #: selection:report.cash.register,month:0 selection:report.pos.order,month:0
@@ -2578,7 +2580,7 @@ msgstr "مدفوعات"
 #. module: point_of_sale
 #: report:pos.invoice:0
 msgid "Supplier Refund"
-msgstr ""
+msgstr "رد للمورد"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_report_sales_by_margin_pos_month
@@ -2600,18 +2602,18 @@ msgstr ""
 #. module: point_of_sale
 #: field:pos.category,sequence:0
 msgid "Sequence"
-msgstr ""
+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 ""
+msgstr "القيام بالدفع"
 
 #. module: point_of_sale
 #: constraint:pos.category:0
 msgid "Error ! You cannot create recursive categories."
-msgstr ""
+msgstr "خطأ ! لا يمكن إنشاء فئات متداخلة."
 
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_pos_sales_user_today
@@ -2637,7 +2639,7 @@ msgstr "سنة"
 #. openerp-web
 #: /home/odo/repositories/addons/trunk/point_of_sale/static/src/xml/pos.xml:31
 msgid "Disc (%)"
-msgstr ""
+msgstr "نسبة الخصم"
 
 #. openerp-web
 #: /home/odo/repositories/addons/trunk/point_of_sale/static/src/xml/pos.xml:41
@@ -2648,22 +2650,22 @@ msgstr ""
 #: /home/odo/repositories/addons/trunk/point_of_sale/static/src/xml/pos.xml:45
 #: /home/odo/repositories/addons/trunk/point_of_sale/static/src/xml/pos.xml:268
 msgid "Tax:"
-msgstr ""
+msgstr "الضريبة:"
 
 #. openerp-web
 #: /home/odo/repositories/addons/trunk/point_of_sale/static/src/xml/pos.xml:64
 msgid "Disc"
-msgstr ""
+msgstr "قرص"
 
 #. openerp-web
 #: /home/odo/repositories/addons/trunk/point_of_sale/static/src/xml/pos.xml:71
 msgid "+/-"
-msgstr ""
+msgstr "+/-"
 
 #. openerp-web
 #: /home/odo/repositories/addons/trunk/point_of_sale/static/src/xml/pos.xml:105
 msgid "Paid:"
-msgstr ""
+msgstr "مدفوع:"
 
 #. openerp-web
 #: /home/odo/repositories/addons/trunk/point_of_sale/static/src/xml/pos.xml:113
@@ -2679,12 +2681,12 @@ msgstr ""
 #. openerp-web
 #: /home/odo/repositories/addons/trunk/point_of_sale/static/src/xml/pos.xml:127
 msgid "Validate"
-msgstr ""
+msgstr "تحقق"
 
 #. openerp-web
 #: /home/odo/repositories/addons/trunk/point_of_sale/static/src/xml/pos.xml:140
 msgid "pending orders"
-msgstr ""
+msgstr "أوامر معلقة"
 
 #. openerp-web
 #: /home/odo/repositories/addons/trunk/point_of_sale/static/src/xml/pos.xml:145
diff --git a/addons/point_of_sale/i18n/bg.po b/addons/point_of_sale/i18n/bg.po
index b532496f577..d21a0b6163f 100644
--- a/addons/point_of_sale/i18n/bg.po
+++ b/addons/point_of_sale/i18n/bg.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:56+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:03+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: point_of_sale
 #: field:report.transaction.pos,product_nb:0
diff --git a/addons/point_of_sale/i18n/bs.po b/addons/point_of_sale/i18n/bs.po
index 447c578a6fd..954b246ab4c 100644
--- a/addons/point_of_sale/i18n/bs.po
+++ b/addons/point_of_sale/i18n/bs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:56+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:03+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: point_of_sale
 #: field:report.transaction.pos,product_nb:0
diff --git a/addons/point_of_sale/i18n/ca.po b/addons/point_of_sale/i18n/ca.po
index ade9af2d22e..9698a82f6dc 100644
--- a/addons/point_of_sale/i18n/ca.po
+++ b/addons/point_of_sale/i18n/ca.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:56+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:03+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: point_of_sale
 #: field:report.transaction.pos,product_nb:0
diff --git a/addons/point_of_sale/i18n/cs.po b/addons/point_of_sale/i18n/cs.po
index e2a6a5bda95..147f3b9762e 100644
--- a/addons/point_of_sale/i18n/cs.po
+++ b/addons/point_of_sale/i18n/cs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:56+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:03+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: point_of_sale
 #: field:report.transaction.pos,product_nb:0
diff --git a/addons/point_of_sale/i18n/da.po b/addons/point_of_sale/i18n/da.po
index 6cc16d97ec8..c29ea000829 100644
--- a/addons/point_of_sale/i18n/da.po
+++ b/addons/point_of_sale/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:56+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:03+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: point_of_sale
 #: field:report.transaction.pos,product_nb:0
diff --git a/addons/point_of_sale/i18n/de.po b/addons/point_of_sale/i18n/de.po
index 25f3620f8dd..02940d3cb12 100644
--- a/addons/point_of_sale/i18n/de.po
+++ b/addons/point_of_sale/i18n/de.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:56+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:03+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: point_of_sale
 #: field:report.transaction.pos,product_nb:0
diff --git a/addons/point_of_sale/i18n/el.po b/addons/point_of_sale/i18n/el.po
index 32389b8561b..3ca69514d6c 100644
--- a/addons/point_of_sale/i18n/el.po
+++ b/addons/point_of_sale/i18n/el.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:56+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:03+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: point_of_sale
 #: field:report.transaction.pos,product_nb:0
diff --git a/addons/point_of_sale/i18n/es.po b/addons/point_of_sale/i18n/es.po
index 2fa206816d7..83e259a1df8 100644
--- a/addons/point_of_sale/i18n/es.po
+++ b/addons/point_of_sale/i18n/es.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:57+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:04+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: point_of_sale
 #: field:report.transaction.pos,product_nb:0
diff --git a/addons/point_of_sale/i18n/es_AR.po b/addons/point_of_sale/i18n/es_AR.po
index 36b25125a5f..e5bb50d273c 100644
--- a/addons/point_of_sale/i18n/es_AR.po
+++ b/addons/point_of_sale/i18n/es_AR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:57+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:04+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: point_of_sale
 #: field:report.transaction.pos,product_nb:0
diff --git a/addons/point_of_sale/i18n/es_CR.po b/addons/point_of_sale/i18n/es_CR.po
index e594d228907..26b8609dc42 100644
--- a/addons/point_of_sale/i18n/es_CR.po
+++ b/addons/point_of_sale/i18n/es_CR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:57+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:04+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 "Language: \n"
 
 #. module: point_of_sale
diff --git a/addons/point_of_sale/i18n/es_EC.po b/addons/point_of_sale/i18n/es_EC.po
index 9ab292745c8..4a4e8342d29 100644
--- a/addons/point_of_sale/i18n/es_EC.po
+++ b/addons/point_of_sale/i18n/es_EC.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:57+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:04+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: point_of_sale
 #: field:report.transaction.pos,product_nb:0
diff --git a/addons/point_of_sale/i18n/et.po b/addons/point_of_sale/i18n/et.po
index 01aa0b03d08..19877bfa6c4 100644
--- a/addons/point_of_sale/i18n/et.po
+++ b/addons/point_of_sale/i18n/et.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:56+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:03+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #, python-format
 #~ msgid "Modify line failed !"
diff --git a/addons/point_of_sale/i18n/fi.po b/addons/point_of_sale/i18n/fi.po
index ea835f06a64..52f6da12dc4 100644
--- a/addons/point_of_sale/i18n/fi.po
+++ b/addons/point_of_sale/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:56+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:03+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: point_of_sale
 #: field:report.transaction.pos,product_nb:0
diff --git a/addons/point_of_sale/i18n/fr.po b/addons/point_of_sale/i18n/fr.po
index db275923bcb..f051d8bbbd5 100644
--- a/addons/point_of_sale/i18n/fr.po
+++ b/addons/point_of_sale/i18n/fr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:56+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:03+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: point_of_sale
 #: field:report.transaction.pos,product_nb:0
diff --git a/addons/point_of_sale/i18n/hi.po b/addons/point_of_sale/i18n/hi.po
index fb912246326..c98104b6d3b 100644
--- a/addons/point_of_sale/i18n/hi.po
+++ b/addons/point_of_sale/i18n/hi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:56+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:03+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: point_of_sale
 #: field:report.transaction.pos,product_nb:0
diff --git a/addons/point_of_sale/i18n/hr.po b/addons/point_of_sale/i18n/hr.po
index 1c273a17c00..38567fa4dd3 100644
--- a/addons/point_of_sale/i18n/hr.po
+++ b/addons/point_of_sale/i18n/hr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:57+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:04+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: point_of_sale
 #: field:report.transaction.pos,product_nb:0
diff --git a/addons/point_of_sale/i18n/hu.po b/addons/point_of_sale/i18n/hu.po
index 173c7e3cd90..bcf6410ca20 100644
--- a/addons/point_of_sale/i18n/hu.po
+++ b/addons/point_of_sale/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:56+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:03+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: point_of_sale
 #: field:report.transaction.pos,product_nb:0
diff --git a/addons/point_of_sale/i18n/id.po b/addons/point_of_sale/i18n/id.po
index 816667d3f12..953a8e3917c 100644
--- a/addons/point_of_sale/i18n/id.po
+++ b/addons/point_of_sale/i18n/id.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:56+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:03+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: point_of_sale
 #: field:report.transaction.pos,product_nb:0
diff --git a/addons/point_of_sale/i18n/it.po b/addons/point_of_sale/i18n/it.po
index f360abce39f..c129e4d1d0d 100644
--- a/addons/point_of_sale/i18n/it.po
+++ b/addons/point_of_sale/i18n/it.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:57+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:03+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: point_of_sale
 #: field:report.transaction.pos,product_nb:0
diff --git a/addons/point_of_sale/i18n/ja.po b/addons/point_of_sale/i18n/ja.po
index efbf326b681..dbe62719440 100644
--- a/addons/point_of_sale/i18n/ja.po
+++ b/addons/point_of_sale/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:57+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:03+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: point_of_sale
 #: field:report.transaction.pos,product_nb:0
diff --git a/addons/point_of_sale/i18n/ko.po b/addons/point_of_sale/i18n/ko.po
index 490197910a0..dc6211689d7 100644
--- a/addons/point_of_sale/i18n/ko.po
+++ b/addons/point_of_sale/i18n/ko.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:57+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:04+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: point_of_sale
 #: field:report.transaction.pos,product_nb:0
diff --git a/addons/point_of_sale/i18n/lt.po b/addons/point_of_sale/i18n/lt.po
index 2caff15ab74..77dab272224 100644
--- a/addons/point_of_sale/i18n/lt.po
+++ b/addons/point_of_sale/i18n/lt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:57+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:04+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: point_of_sale
 #: field:report.transaction.pos,product_nb:0
diff --git a/addons/point_of_sale/i18n/mn.po b/addons/point_of_sale/i18n/mn.po
index 63f141b46e3..b4f7c01ed00 100644
--- a/addons/point_of_sale/i18n/mn.po
+++ b/addons/point_of_sale/i18n/mn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:57+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:04+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: point_of_sale
 #: field:report.transaction.pos,product_nb:0
@@ -2212,7 +2212,7 @@ msgstr "Мөнгө хийх"
 #. module: point_of_sale
 #: sql_constraint:account.journal:0
 msgid "The code of the journal must be unique per company !"
-msgstr "Бүртгэлийн код компанийн хэмжээнд үл давтагдах байх ёстой !"
+msgstr "Журналын код компанийн хэмжээнд үл давтагдах байх ёстой !"
 
 #. module: point_of_sale
 #: model:ir.ui.menu,name:point_of_sale.menu_point_config_product
diff --git a/addons/point_of_sale/i18n/nb.po b/addons/point_of_sale/i18n/nb.po
new file mode 100644
index 00000000000..42e5832b237
--- /dev/null
+++ b/addons/point_of_sale/i18n/nb.po
@@ -0,0 +1,2720 @@
+# Norwegian Bokmal 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-02-08 01:37+0100\n"
+"PO-Revision-Date: 2012-08-31 07:48+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Norwegian Bokmal <nb@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-09-01 04:55+0000\n"
+"X-Generator: Launchpad (build 15890)\n"
+
+#. module: point_of_sale
+#: field:report.transaction.pos,product_nb:0
+msgid "Product Nb."
+msgstr "Produkt Nb"
+
+#. 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
+#: code:addons/point_of_sale/wizard/pos_open_statement.py:49
+#, python-format
+msgid ""
+"You must define which payment method must be available through the point of "
+"sale by reusing existing bank and cash through \"Accounting > Configuration "
+"> Financial Accounting > 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
+#: view:pos.order:0 view:report.pos.order:0
+msgid "Today"
+msgstr "I dag"
+
+#. module: point_of_sale
+#: model:pos.category,name:point_of_sale.plain_water
+msgid "Plain Water"
+msgstr ""
+
+#. module: point_of_sale
+#: view:report.cash.register:0
+msgid "Year from Creation date of cash register"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.confirm:0
+msgid "Post All Orders"
+msgstr "Poster Alle Ordre"
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.spa_2l_product_template
+msgid "Spa Reine 2L"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.model,name:point_of_sale.model_pos_box_out
+msgid "Pos Box Out"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.action_report_cash_register_all
+#: model:ir.ui.menu,name:point_of_sale.menu_report_cash_register_all
+msgid "Register Analysis"
+msgstr ""
+
+#. 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
+#: view:report.cash.register:0 field:report.cash.register,day:0
+#: view:report.pos.order:0 field:report.pos.order,day:0
+msgid "Day"
+msgstr "Dag"
+
+#. module: point_of_sale
+#: view:pos.make.payment:0
+msgid "Add payment :"
+msgstr ""
+
+#. module: point_of_sale
+#: field:pos.box.out,name:0
+msgid "Description / Reason"
+msgstr "Beskrivelse / Årsak"
+
+#. 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 "Produktnavn"
+
+#. module: point_of_sale
+#: view:report.cash.register:0
+msgid "Month from Creation date of cash register"
+msgstr ""
+
+#. module: point_of_sale
+#: report:account.statement:0 field:pos.box.entries,amount:0
+#: field:pos.box.out,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
+#: constraint:account.journal:0
+msgid ""
+"Configuration error! The currency chosen should be shared by the default "
+"accounts too."
+msgstr "Konfigurasjonsfeil ! Valgt valuta må settes opp i kontoplan"
+
+#. 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 view:pos.category:0
+msgid "PoS Categories"
+msgstr "PoS Kategorier"
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.action_box_out
+#: model:ir.ui.menu,name:point_of_sale.menu_wizard_enter_jrnl2
+msgid "Take Money Out"
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.lines:0
+msgid "VAT"
+msgstr "MVA"
+
+#. module: point_of_sale
+#: report:pos.invoice:0
+msgid "Origin"
+msgstr "Opphav"
+
+#. module: point_of_sale
+#: report:pos.invoice:0
+msgid "Tax"
+msgstr "MVA"
+
+#. module: point_of_sale
+#: report:pos.user.product:0
+msgid "Starting Date"
+msgstr "Startdato"
+
+#. 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
+#: report:account.statement:0 field:report.pos.order,partner_id:0
+msgid "Partner"
+msgstr "Partner"
+
+#. 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 "Gjennomsnittspris"
+
+#. module: point_of_sale
+#: report:pos.lines:0
+msgid "Disc. (%)"
+msgstr "Rab. (%)"
+
+#. module: point_of_sale
+#: model:ir.ui.menu,name:point_of_sale.menu_point_open_config
+msgid "Cash Register Management"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.lays_naturel_45g_product_template
+msgid "Lays Naturel 45g"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.order:0
+msgid "Accounting Information"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.coca_regular_2l_product_template
+msgid "Coca-Cola Regular 2L"
+msgstr ""
+
+#. 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 "Rab.(%)"
+
+#. module: point_of_sale
+#: field:pos.box.entries,ref:0
+msgid "Ref"
+msgstr "Ref"
+
+#. module: point_of_sale
+#: view:report.pos.order:0 field:report.pos.order,price_total:0
+msgid "Total Price"
+msgstr "Totalpris"
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.leffe_brune_33cl_product_template
+msgid "Leffe Brune 33cl"
+msgstr ""
+
+#. 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 "Salgsrapport"
+
+#. module: point_of_sale
+#: model:pos.category,name:point_of_sale.beverage
+msgid "Beverages"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.stella_50cl_product_template
+msgid "Stella Artois 50cl"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.details:0
+msgid "Dates"
+msgstr "Datoer"
+
+#. module: point_of_sale
+#: field:pos.category,parent_id:0
+msgid "Parent Category"
+msgstr "Overordnet kategori"
+
+#. module: point_of_sale
+#: report:pos.details:0 report:pos.lines:0 report:pos.payment.report.user:0
+#: report:pos.user.product:0
+msgid "["
+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 "Margin"
+
+#. module: point_of_sale
+#: field:pos.discount,discount:0 field:pos.order.line,discount:0
+msgid "Discount (%)"
+msgstr "Rabatt (%)"
+
+#. 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
+#: view:pos.order.line:0
+msgid "Total qty"
+msgstr "Total ant"
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.fanta_orange_33cl_product_template
+msgid "Fanta Orange 33cl"
+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
+#: report:all.closed.cashbox.of.the.day:0
+msgid "Today's Closed Cashbox"
+msgstr ""
+
+#. module: point_of_sale
+#: view:report.cash.register:0
+msgid "Day from Creation date of cash register"
+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
+#: code:addons/point_of_sale/point_of_sale.py:285
+#, python-format
+msgid "Configuration Error !"
+msgstr "Konfigurasjonsfeil!"
+
+#. module: point_of_sale
+#: model:pos.category,name:point_of_sale.sparkling_water
+msgid "Sparkling Water"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.box.entries:0
+msgid "Fill in this form if you put money in the cash register:"
+msgstr ""
+
+#. module: point_of_sale
+#: view:account.bank.statement:0
+msgid "Search Cash Statements"
+msgstr ""
+
+#. module: point_of_sale
+#: selection:report.cash.register,month:0 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 ""
+
+#. module: point_of_sale
+#: selection:report.cash.register,month:0 selection:report.pos.order,month:0
+msgid "June"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.order.line:0
+msgid "POS Order line"
+msgstr "POS Ordre linje"
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.fanta_orange_50cl_product_template
+msgid "Fanta Orange 50cl"
+msgstr ""
+
+#. module: point_of_sale
+#: field:pos.category,child_id:0
+msgid "Children Categories"
+msgstr "Underordnede Kategorier"
+
+#. module: point_of_sale
+#: field:pos.make.payment,payment_date:0
+msgid "Payment Date"
+msgstr "Betalingsdato"
+
+#. module: point_of_sale
+#: help:product.product,pos_categ_id:0
+msgid ""
+"If you want to sell this product through the point of sale, select the "
+"category it belongs to."
+msgstr ""
+
+#. module: point_of_sale
+#: report:account.statement:0 report:all.closed.cashbox.of.the.day:0
+msgid "Closing Date"
+msgstr ""
+
+#. module: point_of_sale
+#: selection:report.cash.register,month:0 selection:report.pos.order,month:0
+msgid "October"
+msgstr "Oktober"
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.coca_light_1l_product_template
+msgid "Coca-Cola Light 1L"
+msgstr ""
+
+#. 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.chaudfontaine_50cl_product_template
+msgid "Chaudfontaine 50cl"
+msgstr ""
+
+#. 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 "Antall"
+
+#. module: point_of_sale
+#: field:pos.order.line,name:0
+msgid "Line No"
+msgstr ""
+
+#. module: point_of_sale
+#: view:account.bank.statement:0
+msgid "Period"
+msgstr "Periode"
+
+#. 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
+#: report:pos.invoice:0
+msgid "Net Total:"
+msgstr "Netto total:"
+
+#. module: point_of_sale
+#: field:pos.make.payment,payment_name:0
+msgid "Payment Reference"
+msgstr "Betalingsreferanse"
+
+#. 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
+#: code:addons/point_of_sale/point_of_sale.py:408
+#, python-format
+msgid "Customer Invoice"
+msgstr "Kundefaktura"
+
+#. module: point_of_sale
+#: view:pos.box.out:0
+msgid "Output Operation"
+msgstr ""
+
+#. module: point_of_sale
+#: view:report.pos.order:0 field:report.pos.order,total_discount:0
+msgid "Total Discount"
+msgstr "Rabatt totalt"
+
+#. 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 "Skriv ut rapport"
+
+#. 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
+#: code:addons/point_of_sale/wizard/pos_box_entries.py:105
+#, python-format
+msgid "Please check that income account is set to %s"
+msgstr ""
+
+#. module: point_of_sale
+#: model:pos.category,name:point_of_sale.pizza
+msgid "Pizza"
+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 "Legg til produkt"
+
+#. 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
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_confirm
+#: model:ir.ui.menu,name:point_of_sale.menu_wizard_pos_confirm
+msgid "Create Sale Entries"
+msgstr ""
+
+#. #-#-#-#-#  point_of_sale.pot (OpenERP Server 6.1rc1)  #-#-#-#-#
+#. module: point_of_sale
+#. #-#-#-#-#  point_of_sale.pot.web (PROJECT VERSION)  #-#-#-#-#
+#. openerp-web
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_payment
+#: report:pos.details:0 view:pos.order:0
+#: /home/odo/repositories/addons/trunk/point_of_sale/static/src/xml/pos.xml:87
+msgid "Payment"
+msgstr ""
+
+#. module: point_of_sale
+#: view:report.cash.register:0
+msgid "Cash Analysis created in current month"
+msgstr ""
+
+#. module: point_of_sale
+#: report:account.statement:0 report:all.closed.cashbox.of.the.day:0
+msgid "Ending Balance"
+msgstr "Sluttbalanse"
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.pepsi_max_50cl_product_template
+msgid "Pepsi Max 50cl"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.san_pellegrino_1l_product_template
+msgid "San Pellegrino 1L"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.order:0
+msgid "Post Entries"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.spa_1l_product_template
+msgid "Spa Reine 1L"
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.details_summary:0
+msgid "Mode of Taxes"
+msgstr ""
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/wizard/pos_close_statement.py:50
+#, python-format
+msgid "Cash registers are already closed."
+msgstr ""
+
+#. module: point_of_sale
+#: constraint:product.product:0
+msgid "Error: Invalid ean code"
+msgstr "Feil: Ugyldig ean kode"
+
+#. module: point_of_sale
+#: 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 "Sluttdato"
+
+#. module: point_of_sale
+#: view:report.pos.order:0
+msgid "POS ordered created during current year"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_pos_form
+#: model:ir.ui.menu,name:point_of_sale.menu_point_ofsale view:pos.order:0
+msgid "PoS Orders"
+msgstr "POS Ordre"
+
+#. module: point_of_sale
+#: report:pos.details:0
+msgid "Sales total(Revenue)"
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.details:0 report:pos.details_summary:0
+msgid "Total paid"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.ui.menu,name:point_of_sale.menu_all_menu_all_register
+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
+#: model:ir.model,name:point_of_sale.model_report_transaction_pos
+msgid "transaction for the pos"
+msgstr ""
+
+#. module: point_of_sale
+#: view:report.pos.order:0
+msgid "Not Invoiced"
+msgstr "Ikke fakturert"
+
+#. module: point_of_sale
+#: selection:report.cash.register,month:0 selection:report.pos.order,month:0
+msgid "March"
+msgstr "Mars"
+
+#. 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:641
+#, python-format
+msgid ""
+"You have to select a pricelist in the sale form !\n"
+"Please set one before choosing a product."
+msgstr ""
+
+#. 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.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
+#: field:pos.order.line,price_subtotal_incl:0
+msgid "Subtotal"
+msgstr "Subtotal"
+
+#. 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
+#: field:report.cash.register,balance_end_real:0
+msgid "Closing Balance"
+msgstr "Sluttsaldo"
+
+#. 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_close_statement
+msgid "Close Statements"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.croky_naturel_45g_product_template
+msgid "Croky Naturel 45g"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.product_product_putmoneyforchange1_product_template
+msgid "Cash Out"
+msgstr ""
+
+#. module: point_of_sale
+#: report:account.statement:0 report:all.closed.cashbox.of.the.day:0
+msgid "Starting Balance"
+msgstr "Inngående saldo"
+
+#. module: point_of_sale
+#: model:ir.model,name:point_of_sale.model_pos_category
+#: field:product.product,pos_categ_id:0
+msgid "PoS Category"
+msgstr "PoS Kategori"
+
+#. 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
+#: view:report.pos.order:0 field:report.pos.order,nbr:0
+msgid "# of Lines"
+msgstr "# linjer"
+
+#. module: point_of_sale
+#: help:account.journal,check_dtls:0
+msgid ""
+"This field authorize Validation of Cashbox without controlling the closing "
+"balance."
+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:pos.category,name:point_of_sale.pils
+msgid "Pils"
+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
+#: view:pos.order.line:0
+msgid "Sum of subtotals"
+msgstr "Sum av subtotaler"
+
+#. module: point_of_sale
+#: field:pos.order,lines:0
+msgid "Order Lines"
+msgstr "Ordrelinjer"
+
+#. 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
+#: field:pos.order.line,create_date:0
+msgid "Creation Date"
+msgstr "Opprettet, dato:"
+
+#. 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
+#: model:product.template,name:point_of_sale.lays_naturel_300g_product_template
+msgid "Lays Naturel XXL 300g"
+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.cash.register:0 view:report.pos.order:0
+msgid "My Sales"
+msgstr "Mine salg"
+
+#. module: point_of_sale
+#: field:pos.order,pricelist_id:0
+msgid "Pricelist"
+msgstr "Prisliste"
+
+#. module: point_of_sale
+#: report:pos.details:0 report:pos.details_summary:0
+msgid "Total invoiced"
+msgstr ""
+
+#. module: point_of_sale
+#: view:report.pos.order:0 field:report.pos.order,product_qty:0
+msgid "# of Qty"
+msgstr "# av Ant"
+
+#. 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
+#: view:pos.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 "Ordredato"
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.stella_33cl_product_template
+msgid "Stella Artois 33cl"
+msgstr ""
+
+#. module: point_of_sale
+#: view:report.cash.register:0
+msgid "Cash Analysis created during this year"
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.invoice:0
+msgid "Draft Invoice"
+msgstr "Fakturakladd"
+
+#. module: point_of_sale
+#: constraint:account.bank.statement.line:0
+msgid ""
+"The amount of the voucher must be the same amount as the one on the "
+"statement line"
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.invoice:0
+msgid "Fiscal Position Remark :"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.evian_2l_product_template
+msgid "Evian 2L"
+msgstr ""
+
+#. module: point_of_sale
+#: selection:report.cash.register,month:0 selection:report.pos.order,month:0
+msgid "September"
+msgstr "September"
+
+#. module: point_of_sale
+#: report:account.statement:0 report:all.closed.cashbox.of.the.day:0
+msgid "Opening Date"
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.lines:0
+msgid "Taxes :"
+msgstr "Mva"
+
+#. 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
+#: field:report.transaction.pos,disc:0
+msgid "Disc."
+msgstr "Rab."
+
+#. 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
+#: model:product.template,name:point_of_sale.coca_zero_33cl_product_template
+msgid "Coca-Cola Zero 33cl"
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.invoice:0
+msgid "VAT :"
+msgstr "MVA:"
+
+#. module: point_of_sale
+#: view:pos.order.line:0
+msgid "POS Order lines"
+msgstr "POS Ordre linjer"
+
+#. module: point_of_sale
+#: view:pos.receipt:0
+msgid "Receipt :"
+msgstr "Kvittering"
+
+#. module: point_of_sale
+#: field:account.bank.statement.line,pos_statement_id:0
+#: field:pos.order,amount_return:0
+msgid "unknown"
+msgstr "ukjent"
+
+#. module: point_of_sale
+#: report:pos.details:0 field:report.transaction.pos,date_create:0
+msgid "Date"
+msgstr "Dato"
+
+#. 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
+#: view:pos.details:0 report:pos.sales.user:0 report:pos.sales.user.today:0
+#: report:pos.user.product:0 view:report.cash.register:0
+#: field:report.cash.register,user_id: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 "Bruker"
+
+#. 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
+#: model:product.template,name:point_of_sale.perrier_1l_product_template
+msgid "Perrier 1L"
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.details:0 report:pos.details_summary:0
+msgid "Total discount"
+msgstr "Total rabatt"
+
+#. 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
+#: selection:report.cash.register,month:0 selection:report.pos.order,month:0
+msgid "November"
+msgstr "November"
+
+#. module: point_of_sale
+#: field:pos.config.journal,code:0
+msgid "Code"
+msgstr "Engelsk"
+
+#. 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:pos.config.journal,journal_id:0 field:pos.order,sale_journal:0
+#: view:report.cash.register:0 field:report.cash.register,journal_id:0
+#: field:report.pos.order,journal_id:0
+msgid "Journal"
+msgstr "Journal"
+
+#. 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
+#: view:account.bank.statement:0 view:pos.order:0 field:pos.order,state:0
+#: report:pos.sales.user:0 report:pos.sales.user.today:0
+#: field:report.cash.register,state:0 field:report.pos.order,state:0
+msgid "State"
+msgstr ""
+
+#. module: point_of_sale
+#: field:report.transaction.pos,no_trans:0
+msgid "Number of Transaction"
+msgstr "Antall transaksjoner"
+
+#. module: point_of_sale
+#: view:pos.box.entries:0 view:pos.box.out:0 view:pos.confirm:0
+#: view:pos.make.payment:0 view:pos.open.statement:0 view:pos.receipt:0
+msgid "Cancel"
+msgstr "Avbryt"
+
+#. 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.timmermans_kriek_37,5cl_product_template
+msgid "Timmermans Kriek 37.5cl"
+msgstr ""
+
+#. module: point_of_sale
+#: field:account.journal,check_dtls:0
+msgid "Control Balance Before Closing"
+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
+#: model:ir.actions.act_window,name:point_of_sale.action_new_bank_statement_all_tree
+msgid "Cash Registers"
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.details:0
+msgid "Users"
+msgstr ""
+
+#. module: point_of_sale
+#: model:pos.category,name:point_of_sale.food
+msgid "Food"
+msgstr "Mat"
+
+#. #-#-#-#-#  point_of_sale.pot (OpenERP Server 6.1rc1)  #-#-#-#-#
+#. module: point_of_sale
+#. #-#-#-#-#  point_of_sale.pot.web (PROJECT VERSION)  #-#-#-#-#
+#. openerp-web
+#: report:pos.details:0 report:pos.invoice:0 report:pos.lines:0
+#: /home/odo/repositories/addons/trunk/point_of_sale/static/src/xml/pos.xml:30
+#: /home/odo/repositories/addons/trunk/point_of_sale/static/src/xml/pos.xml:69
+msgid "Price"
+msgstr "Pris"
+
+#. 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
+#: field:account.journal,journal_user:0
+msgid "PoS Payment Method"
+msgstr ""
+
+#. module: point_of_sale
+#: help:product.product,expense_pdt:0
+msgid ""
+"This is a product you can use to take cash from a statement for the point of "
+"sale backend, exemple: money lost, transfer to bank, etc."
+msgstr ""
+
+#. module: point_of_sale
+#: field:report.cash.register,date:0
+msgid "Create Date"
+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
+#: code:addons/point_of_sale/point_of_sale.py:65
+#, python-format
+msgid "Unable to Delete !"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.lays_paprika_oven_150g_product_template
+msgid "Lays Paprika Oven Baked 150g"
+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
+#: code:addons/point_of_sale/point_of_sale.py:284
+#, python-format
+msgid ""
+"There is no receivable account defined to make payment for the partner: "
+"\"%s\" (id:%d)"
+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
+#: code:addons/point_of_sale/point_of_sale.py:293
+#: code:addons/point_of_sale/point_of_sale.py:472
+#: code:addons/point_of_sale/report/pos_invoice.py:46
+#: code:addons/point_of_sale/wizard/pos_box_entries.py:46
+#: code:addons/point_of_sale/wizard/pos_box_entries.py:100
+#: code:addons/point_of_sale/wizard/pos_box_entries.py:105
+#: code:addons/point_of_sale/wizard/pos_box_out.py:86
+#: code:addons/point_of_sale/wizard/pos_box_out.py:88
+#, python-format
+msgid "Error !"
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.details:0 report:pos.lines:0 report:pos.payment.report.user:0
+#: report:pos.user.product:0
+msgid "]"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.model,name:point_of_sale.model_account_bank_statement
+msgid "Bank Statement"
+msgstr ""
+
+#. module: point_of_sale
+#: sql_constraint:account.journal:0
+msgid "The name of the journal must be unique per company !"
+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 Light Naturel 170g"
+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
+#: code:addons/point_of_sale/point_of_sale.py:282
+#, python-format
+msgid "There is no receivable account defined to make payment"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.open.statement:0
+msgid "Do you want to open cash registers?"
+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
+#: field:product.product,expense_pdt:0
+msgid "PoS Cash Output"
+msgstr ""
+
+#. module: point_of_sale
+#: model:pos.category,name:point_of_sale.soda
+msgid "Soda"
+msgstr ""
+
+#. module: point_of_sale
+#: view:account.bank.statement:0 view:pos.order:0 view:report.cash.register:0
+#: view:report.pos.order:0
+msgid "Group By..."
+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
+#: code:addons/point_of_sale/point_of_sale.py:640
+#, python-format
+msgid "No Pricelist !"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.order:0
+msgid "Update"
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.invoice:0
+msgid "Base"
+msgstr ""
+
+#. module: point_of_sale
+#: model:pos.category,name:point_of_sale.categ_others
+msgid "Others"
+msgstr ""
+
+#. module: point_of_sale
+#: view:product.product:0
+msgid "Point-of-Sale"
+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
+#: view:pos.order:0
+msgid "Sale Order"
+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
+#: model:product.template,name:point_of_sale.lays_naturel_oven_150g_product_template
+msgid "Lays Naturel Oven Baked 150g"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.coca_light_decaf_33cl_product_template
+msgid "Coca-Cola Light Decaf 33cl"
+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
+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.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: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:ir.actions.act_window,name:point_of_sale.action_product_output
+#: model:ir.ui.menu,name:point_of_sale.products_for_output_operations
+msgid "Products 'Put Money In'"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.croky_bolognaise_250g_product_template
+msgid "Croky Bolognaise 250g"
+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
+#: field:pos.order,user_id:0
+msgid "Connected Salesman"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_sale_all
+#: model:ir.ui.menu,name:point_of_sale.menu_point_ofsale_all
+msgid "All Sales Orders"
+msgstr ""
+
+#. module: point_of_sale
+#: help:product.product,income_pdt:0
+msgid ""
+"This is a product you can use to put cash into a statement for the point of "
+"sale backend."
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.receipt:0
+msgid "Print the Receipt of the Sale"
+msgstr ""
+
+#. module: point_of_sale
+#: field:pos.make.payment,journal: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 ""
+
+#. #-#-#-#-#  point_of_sale.pot (OpenERP Server 6.1rc1)  #-#-#-#-#
+#. module: point_of_sale
+#. #-#-#-#-#  point_of_sale.pot.web (PROJECT VERSION)  #-#-#-#-#
+#. openerp-web
+#: 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
+#: /home/odo/repositories/addons/trunk/point_of_sale/static/src/xml/pos.xml:32
+#: /home/odo/repositories/addons/trunk/point_of_sale/static/src/xml/pos.xml:59
+msgid "Qty"
+msgstr ""
+
+#. module: point_of_sale
+#: view:report.cash.register:0 view:report.pos.order:0
+msgid "Month -1"
+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
+#: model:product.template,name:point_of_sale.evian_1l_product_template
+msgid "Evian 1L"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.ui.menu,name:point_of_sale.menu_open_statement
+msgid "Open Cash Registers"
+msgstr ""
+
+#. module: point_of_sale
+#: model:pos.category,name:point_of_sale.water
+msgid "Water"
+msgstr ""
+
+#. module: point_of_sale
+#: view:report.cash.register:0
+msgid "state"
+msgstr ""
+
+#. module: point_of_sale
+#: selection:report.cash.register,month:0 selection:report.pos.order,month:0
+msgid "July"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.lays_poivre_sel_oven_150g_product_template
+msgid "Lays Sel et Poivre Oven Baked 150g"
+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.chimay_rouge_33cl_product_template
+msgid "Chimay Rouge 33cl"
+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
+#: 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
+#: field:account.journal,auto_cash:0
+msgid "Automatic Opening"
+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
+#: model:product.template,name:point_of_sale.perrier_50cl_product_template
+msgid "Perrier 50cl"
+msgstr ""
+
+#. module: point_of_sale
+#: selection:report.pos.order,state:0
+msgid "Synchronized"
+msgstr ""
+
+#. module: point_of_sale
+#: view:report.cash.register:0 field:report.cash.register,month:0
+#: view:report.pos.order:0 field:report.pos.order,month:0
+msgid "Month"
+msgstr ""
+
+#. module: point_of_sale
+#: report:account.statement:0
+msgid "Statement Name"
+msgstr ""
+
+#. module: point_of_sale
+#: view:report.pos.order:0
+msgid "Year of order date"
+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.box.out,journal_id:0
+msgid "Cash Register"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.close.statement:0
+msgid "Yes"
+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
+#: field:report.transaction.pos,journal_id:0
+msgid "Sales Journal"
+msgstr ""
+
+#. module: point_of_sale
+#: field:report.cash.register,balance_start: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
+#: model:product.template,name:point_of_sale.oetker_vegetale_product_template
+msgid "Dr. Oetker Ristorante Vegetale"
+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
+#: field:pos.order,amount_paid:0 selection:pos.order,state:0
+msgid "Paid"
+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
+#: view:pos.order:0
+msgid "Discount"
+msgstr ""
+
+#. module: point_of_sale
+#: view:report.cash.register:0
+msgid "Cash Analysis created in last month"
+msgstr ""
+
+#. module: point_of_sale
+#: model:pos.category,name:point_of_sale.beers
+msgid "Beers"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.close.statement:0
+msgid ""
+"OpenERP will close all cash registers he can close automatically without "
+"validation. He will also open all cash registers for which you have to "
+"control the ending belance before closing manually."
+msgstr ""
+
+#. module: point_of_sale
+#: view:report.cash.register:0
+msgid "Cash Analysis created by today"
+msgstr ""
+
+#. module: point_of_sale
+#: selection:report.cash.register,state:0
+msgid "Quotation"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.product_product_putmoneyforchange0_product_template
+msgid "Cash In"
+msgstr ""
+
+#. #-#-#-#-#  point_of_sale.pot (OpenERP Server 6.1rc1)  #-#-#-#-#
+#. module: point_of_sale
+#. #-#-#-#-#  point_of_sale.pot.web (PROJECT VERSION)  #-#-#-#-#
+#. openerp-web
+#: report:all.closed.cashbox.of.the.day:0 report:pos.invoice:0
+#: report:pos.lines:0 report:pos.payment.report.user:0
+#: /home/odo/repositories/addons/trunk/point_of_sale/static/src/xml/pos.xml:49
+#: /home/odo/repositories/addons/trunk/point_of_sale/static/src/xml/pos.xml:93
+#: /home/odo/repositories/addons/trunk/point_of_sale/static/src/xml/pos.xml:271
+msgid "Total:"
+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
+#: model:ir.model,name:point_of_sale.model_pos_config_journal
+msgid "Journal Configuration"
+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
+#: help:pos.order,user_id:0
+msgid ""
+"Person who uses the the cash register. It could be a reliever, a student or "
+"an interim employee."
+msgstr ""
+
+#. module: point_of_sale
+#: field:report.transaction.pos,invoice_id:0
+msgid "Nbr Invoice"
+msgstr ""
+
+#. #-#-#-#-#  point_of_sale.pot (OpenERP Server 6.1rc1)  #-#-#-#-#
+#. module: point_of_sale
+#. #-#-#-#-#  point_of_sale.pot.web (PROJECT VERSION)  #-#-#-#-#
+#. openerp-web
+#: model:ir.actions.act_window,name:point_of_sale.action_report_pos_receipt
+#: /home/odo/repositories/addons/trunk/point_of_sale/static/src/xml/pos.xml:231
+msgid "Receipt"
+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
+#: 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
+#: view:pos.order:0
+msgid "Done"
+msgstr ""
+
+#. module: point_of_sale
+#: 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
+msgid "Invoice"
+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 selection:report.cash.register,state: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
+#: model:product.template,name:point_of_sale.timmermans_geuze_37,5cl_product_template
+msgid "Timmermans Geuze 37.5cl"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.lays_pickles_250g_product_template
+msgid "Lays Pickels 250g"
+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
+#: model:ir.model,name:point_of_sale.model_report_sales_by_user_pos_month
+msgid "Sales by user monthly"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.spa_et_fruit_50cl_product_template
+msgid "Spa et Fruit Orange 50cl"
+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
+#: code:addons/point_of_sale/wizard/pos_payment.py:59
+#, python-format
+msgid "Paiement"
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.invoice:0
+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 ""
+
+#. #-#-#-#-#  point_of_sale.pot (OpenERP Server 6.1rc1)  #-#-#-#-#
+#. module: point_of_sale
+#. #-#-#-#-#  point_of_sale.pot.web (PROJECT VERSION)  #-#-#-#-#
+#. openerp-web
+#: 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
+#: /home/odo/repositories/addons/trunk/point_of_sale/static/src/xml/pos.xml:29
+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
+#: model:ir.actions.report.xml,name:point_of_sale.pos_lines_report
+msgid "Pos Lines"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.grisette_cerise_25cl_product_template
+msgid "Grisette Cerise 25cl"
+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
+#: model:ir.ui.menu,name:point_of_sale.menu_point_root
+msgid "PoS Backend"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.order:0 selection:pos.order,state:0
+msgid "Posted"
+msgstr ""
+
+#. module: point_of_sale
+#: field:pos.order,date_order:0
+msgid "Date Ordered"
+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
+#: model:product.template,name:point_of_sale.pepsi_2l_product_template
+msgid "Pepsi 2L"
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.details:0
+msgid "Order"
+msgstr ""
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/point_of_sale.py:472
+#, python-format
+msgid "There is no income account defined for this product: \"%s\" (id:%d)"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.details:0
+msgid "POS Details"
+msgstr ""
+
+#. module: point_of_sale
+#: field:pos.details,user_ids:0
+msgid "Salesmen"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.model,name:point_of_sale.model_report_cash_register
+#: view:report.cash.register:0
+msgid "Point of Sale Cash Register Analysis"
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.lines:0
+msgid "Net Total :"
+msgstr ""
+
+#. module: point_of_sale
+#: model:res.groups,name:point_of_sale.group_pos_manager
+msgid "Manager"
+msgstr ""
+
+#. module: point_of_sale
+#: field:pos.details,date_start:0 field:pos.sale.user,date_start:0
+msgid "Date Start"
+msgstr ""
+
+#. #-#-#-#-#  point_of_sale.pot (OpenERP Server 6.1rc1)  #-#-#-#-#
+#. module: point_of_sale
+#. #-#-#-#-#  point_of_sale.pot.web (PROJECT VERSION)  #-#-#-#-#
+#. openerp-web
+#: field:pos.order,amount_total:0 report:pos.payment.report.user:0
+#: field:report.sales.by.user.pos,amount:0
+#: field:report.sales.by.user.pos.month,amount:0
+#: /home/odo/repositories/addons/trunk/point_of_sale/static/src/xml/pos.xml:33
+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
+#: model:product.template,name:point_of_sale.lindemans_pecheresse_37,5cl_product_template
+msgid "Lindemans Pecheresse 37.5cl"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.pepsi_33cl_product_template
+msgid "Pepsi 33cl"
+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
+#: 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
+#: model:ir.actions.act_window,name:point_of_sale.action_product_input
+#: model:ir.ui.menu,name:point_of_sale.products_for_input_operations
+msgid "Products 'Take Money Out'"
+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
+#: code:addons/point_of_sale/point_of_sale.py:293
+#: code:addons/point_of_sale/wizard/pos_box_entries.py:100
+#: code:addons/point_of_sale/wizard/pos_box_out.py:88
+#, python-format
+msgid "You have to open at least one cashbox"
+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
+#: model:ir.actions.act_window,name:point_of_sale.action_box_entries
+#: model:ir.ui.menu,name:point_of_sale.menu_wizard_enter_jrnl
+msgid "Put Money In"
+msgstr ""
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/point_of_sale.py:238
+#: code:addons/point_of_sale/point_of_sale.py:253
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.lines:0
+msgid "No. Of Articles"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.ijsboerke_vanille_2,5l_product_template
+msgid "ijsboerke Vanille 2.5L"
+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
+#: model:product.template,name:point_of_sale.orangina_1,5l_product_template
+msgid "Orangina 1.5L"
+msgstr ""
+
+#. module: point_of_sale
+#: field:pos.order,picking_id:0
+msgid "Picking"
+msgstr ""
+
+#. module: point_of_sale
+#: model:pos.category,name:point_of_sale.ice_cream
+msgid "Ice Cream"
+msgstr ""
+
+#. module: point_of_sale
+#: field:pos.order,shop_id:0 field:report.pos.order,shop_id:0
+msgid "Shop"
+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
+#: 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
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_close_statement
+msgid "Close Cash Register"
+msgstr ""
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/point_of_sale.py:65
+#, python-format
+msgid "In order to delete a sale, it must be new or cancelled."
+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 field:pos.box.out,product_id:0
+msgid "Operation"
+msgstr ""
+
+#. module: point_of_sale
+#: field:pos.order,account_move:0
+msgid "Journal Entry"
+msgstr ""
+
+#. module: point_of_sale
+#: selection:report.cash.register,state:0
+msgid "Confirmed"
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.invoice:0
+msgid "Cancelled Invoice"
+msgstr ""
+
+#. module: point_of_sale
+#: view:report.cash.register:0
+msgid "Confirm"
+msgstr ""
+
+#. module: point_of_sale
+#: help:account.journal,auto_cash:0
+msgid ""
+"This field authorize the automatic creation of the cashbox, without control "
+"of the initial balance."
+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
+#: constraint:account.bank.statement:0
+msgid "The journal and period chosen have to belong to the same company."
+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
+#: code:addons/point_of_sale/point_of_sale.py:238
+#, python-format
+msgid "In order to set to draft a sale, it must be cancelled."
+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
+#: view:report.pos.order:0
+msgid "Day of order date"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.ui.menu,name:point_of_sale.menu_point_rep
+msgid "Reporting"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.maes_33cl_product_template
+msgid "Maes 33cl"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.box.entries:0
+msgid "Put Money"
+msgstr ""
+
+#. module: point_of_sale
+#: sql_constraint:account.journal:0
+msgid "The code of the journal must be unique per company !"
+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
+#: 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:253
+#, python-format
+msgid "Unable to cancel the picking."
+msgstr ""
+
+#. module: point_of_sale
+#: view:report.pos.order:0
+msgid "POS ordered created during current month"
+msgstr ""
+
+#. module: point_of_sale
+#: view:report.pos.order:0
+msgid "POS ordered created last month"
+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.cash.register,month:0 selection:report.pos.order,month:0
+msgid "December"
+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:329 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
+#: model:product.template,name:point_of_sale.ijsboerke_chocolat_2,5l_product_template
+msgid "ijsboerke Chocolat 2.5L"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.box.out:0
+msgid "Take Money"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.model,name:point_of_sale.model_pos_details
+msgid "Sales Details"
+msgstr ""
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/wizard/pos_close_statement.py:50
+#, python-format
+msgid "Message"
+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_root_touchscreen
+#: view:product.product:0
+msgid "Point of Sale"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.order:0 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 "Salesman"
+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.close.statement:0
+msgid "No"
+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
+#: 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:pos.order:0
+msgid "Re-Print"
+msgstr ""
+
+#. module: point_of_sale
+#: view:report.cash.register:0
+msgid "Draft"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.fanta_zero_orange_1,5l_product_template
+msgid "Fanta Zero Orange 1.5L"
+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:358
+#, 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
+#: model:product.template,name:point_of_sale.ijsboerke_dame_blanche_2,5l_product_template
+msgid "ijsboerke Dame Blanche 2.5L"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.ijsboerke_moka_2,5l_product_template
+msgid "ijsboerke Moka 2.5L"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.order:0
+msgid "Search Sales Order"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,help:point_of_sale.action_account_journal_form
+msgid ""
+"Payment methods are defined by accounting journals having the field Payment "
+"Method checked."
+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
+#: view:pos.receipt:0
+msgid "Print Receipt"
+msgstr ""
+
+#. module: point_of_sale
+#: selection:report.cash.register,month:0 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:ir.actions.act_window,help:point_of_sale.product_normal_action
+msgid ""
+"You must define a Product for everything you buy or sell. Products can be "
+"raw materials, stockable products, consumables or services. The Product form "
+"contains detailed information about your products related to procurement "
+"logistics, sales price, product category, suppliers and so on."
+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
+#: code:addons/point_of_sale/point_of_sale.py:358
+#, python-format
+msgid "Error"
+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
+#: view:pos.close.statement:0
+msgid "Do you want to close your cash registers?"
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.invoice:0
+msgid "Refund"
+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
+#: code:addons/point_of_sale/wizard/pos_close_statement.py:66
+#: model:ir.ui.menu,name:point_of_sale.menu_close_statement
+#: view:pos.close.statement:0
+#, python-format
+msgid "Close Cash Registers"
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.details:0 report:pos.payment.report.user:0
+msgid "Disc(%)"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.order:0
+msgid "General Information"
+msgstr ""
+
+#. #-#-#-#-#  point_of_sale.pot (OpenERP Server 6.1rc1)  #-#-#-#-#
+#. module: point_of_sale
+#. #-#-#-#-#  point_of_sale.pot.web (PROJECT VERSION)  #-#-#-#-#
+#. openerp-web
+#: view:pos.details:0 view:pos.discount:0 view:pos.payment.report:0
+#: view:pos.payment.report.user:0 view:pos.sale.user:0
+#: /home/odo/repositories/addons/trunk/point_of_sale/static/src/xml/pos.xml:13
+msgid "Close"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.order:0
+msgid "Order lines"
+msgstr ""
+
+#. module: point_of_sale
+#: view:account.journal:0
+msgid "Extended Configuration"
+msgstr ""
+
+#. module: point_of_sale
+#: field:pos.order.line,price_subtotal:0
+msgid "Subtotal w/o Tax"
+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.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
+#: 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
+#: code:addons/point_of_sale/wizard/pos_box_out.py:86
+#, python-format
+msgid "please check that account is set to %s"
+msgstr ""
+
+#. module: point_of_sale
+#: field:pos.config.journal,name:0 report:pos.invoice:0 report:pos.lines:0
+msgid "Description"
+msgstr ""
+
+#. module: point_of_sale
+#: selection:report.cash.register,month:0 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
+#: view:pos.order:0
+msgid "Yesterday"
+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.coca_zero_decaf_33cl_product_template
+msgid "Coca-Cola Zero Decaf 33cl"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.box.out:0
+msgid "Describe why you take money from the cash register:"
+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
+#: view:report.pos.order:0
+msgid "Point of Sale Analysis"
+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.cash.register,month:0 selection:report.pos.order,month:0
+msgid "February"
+msgstr ""
+
+#. module: point_of_sale
+#: view:report.cash.register:0
+msgid "    Today    "
+msgstr ""
+
+#. module: point_of_sale
+#: selection:report.cash.register,month:0 selection:report.pos.order,month:0
+msgid "April"
+msgstr ""
+
+#. module: point_of_sale
+#: 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
+#: 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
+#: 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
+#: view:report.pos.order:0
+msgid "Month of order date"
+msgstr ""
+
+#. module: point_of_sale
+#: field:product.product,income_pdt:0
+msgid "PoS Cash Input"
+msgstr ""
+
+#. module: point_of_sale
+#: view:report.cash.register:0 field:report.cash.register,year:0
+#: view:report.pos.order:0 field:report.pos.order,year:0
+msgid "Year"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/point_of_sale/static/src/xml/pos.xml:31
+msgid "Disc (%)"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/point_of_sale/static/src/xml/pos.xml:41
+msgid "Subtotal:"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/point_of_sale/static/src/xml/pos.xml:45
+#: /home/odo/repositories/addons/trunk/point_of_sale/static/src/xml/pos.xml:268
+msgid "Tax:"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/point_of_sale/static/src/xml/pos.xml:64
+msgid "Disc"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/point_of_sale/static/src/xml/pos.xml:71
+msgid "+/-"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/point_of_sale/static/src/xml/pos.xml:105
+msgid "Paid:"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/point_of_sale/static/src/xml/pos.xml:113
+#: /home/odo/repositories/addons/trunk/point_of_sale/static/src/xml/pos.xml:288
+msgid "Change:"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/point_of_sale/static/src/xml/pos.xml:124
+msgid "Back to Products"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/point_of_sale/static/src/xml/pos.xml:127
+msgid "Validate"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/point_of_sale/static/src/xml/pos.xml:140
+msgid "pending orders"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/point_of_sale/static/src/xml/pos.xml:145
+msgid ""
+"There are pending operations that could not be saved into the database, are "
+"you sure you want to exit?"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/point_of_sale/static/src/xml/pos.xml:236
+msgid "Print"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/point_of_sale/static/src/xml/pos.xml:238
+msgid "Next Order"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/point_of_sale/static/src/xml/pos.xml:248
+msgid "Phone:"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/point_of_sale/static/src/xml/pos.xml:249
+msgid "User:"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/point_of_sale/static/src/xml/pos.xml:250
+msgid "Shop:"
+msgstr ""
diff --git a/addons/point_of_sale/i18n/nl.po b/addons/point_of_sale/i18n/nl.po
index b16141722dd..eb34a4ad5e0 100644
--- a/addons/point_of_sale/i18n/nl.po
+++ b/addons/point_of_sale/i18n/nl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:56+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:03+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: point_of_sale
 #: field:report.transaction.pos,product_nb:0
diff --git a/addons/point_of_sale/i18n/nl_BE.po b/addons/point_of_sale/i18n/nl_BE.po
index 17e5fa1bf48..a00b8aea9f8 100644
--- a/addons/point_of_sale/i18n/nl_BE.po
+++ b/addons/point_of_sale/i18n/nl_BE.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:57+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:04+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: point_of_sale
 #: field:report.transaction.pos,product_nb:0
diff --git a/addons/point_of_sale/i18n/pl.po b/addons/point_of_sale/i18n/pl.po
index f5db59d6f43..5720a200259 100644
--- a/addons/point_of_sale/i18n/pl.po
+++ b/addons/point_of_sale/i18n/pl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:57+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:04+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: point_of_sale
 #: field:report.transaction.pos,product_nb:0
diff --git a/addons/point_of_sale/i18n/pt.po b/addons/point_of_sale/i18n/pt.po
index 58137312272..62ea74ac6d8 100644
--- a/addons/point_of_sale/i18n/pt.po
+++ b/addons/point_of_sale/i18n/pt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:57+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:04+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: point_of_sale
 #: field:report.transaction.pos,product_nb:0
diff --git a/addons/point_of_sale/i18n/pt_BR.po b/addons/point_of_sale/i18n/pt_BR.po
index 6eaf57b6b0c..a057ab54d8f 100644
--- a/addons/point_of_sale/i18n/pt_BR.po
+++ b/addons/point_of_sale/i18n/pt_BR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:57+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:04+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: point_of_sale
 #: field:report.transaction.pos,product_nb:0
diff --git a/addons/point_of_sale/i18n/ro.po b/addons/point_of_sale/i18n/ro.po
index e254a6592e6..1e9892604a5 100644
--- a/addons/point_of_sale/i18n/ro.po
+++ b/addons/point_of_sale/i18n/ro.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:57+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:04+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: point_of_sale
 #: field:report.transaction.pos,product_nb:0
diff --git a/addons/point_of_sale/i18n/ru.po b/addons/point_of_sale/i18n/ru.po
index c1822a57afd..91db9883707 100644
--- a/addons/point_of_sale/i18n/ru.po
+++ b/addons/point_of_sale/i18n/ru.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:57+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:04+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: point_of_sale
 #: field:report.transaction.pos,product_nb:0
diff --git a/addons/point_of_sale/i18n/sl.po b/addons/point_of_sale/i18n/sl.po
index bbf0e67adde..b1743827ebd 100644
--- a/addons/point_of_sale/i18n/sl.po
+++ b/addons/point_of_sale/i18n/sl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:57+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:04+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: point_of_sale
 #: field:report.transaction.pos,product_nb:0
diff --git a/addons/point_of_sale/i18n/sq.po b/addons/point_of_sale/i18n/sq.po
index e9d0debc072..88c231dc87e 100644
--- a/addons/point_of_sale/i18n/sq.po
+++ b/addons/point_of_sale/i18n/sq.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:56+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:03+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: point_of_sale
 #: field:report.transaction.pos,product_nb:0
diff --git a/addons/point_of_sale/i18n/sr.po b/addons/point_of_sale/i18n/sr.po
index 463f6b191b9..bfcc2f303de 100644
--- a/addons/point_of_sale/i18n/sr.po
+++ b/addons/point_of_sale/i18n/sr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:57+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:04+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: point_of_sale
 #: field:report.transaction.pos,product_nb:0
diff --git a/addons/point_of_sale/i18n/sr@latin.po b/addons/point_of_sale/i18n/sr@latin.po
index 4ea7a176db3..f36122d8644 100644
--- a/addons/point_of_sale/i18n/sr@latin.po
+++ b/addons/point_of_sale/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:57+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:04+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: point_of_sale
 #: field:report.transaction.pos,product_nb:0
diff --git a/addons/point_of_sale/i18n/sv.po b/addons/point_of_sale/i18n/sv.po
index cb78a2b85e3..50fbf100b84 100644
--- a/addons/point_of_sale/i18n/sv.po
+++ b/addons/point_of_sale/i18n/sv.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:57+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:04+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: point_of_sale
 #: field:report.transaction.pos,product_nb:0
diff --git a/addons/point_of_sale/i18n/tlh.po b/addons/point_of_sale/i18n/tlh.po
index 0c8daf3f2b8..cafd7d02844 100644
--- a/addons/point_of_sale/i18n/tlh.po
+++ b/addons/point_of_sale/i18n/tlh.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:57+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:04+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: point_of_sale
 #: field:report.transaction.pos,product_nb:0
diff --git a/addons/point_of_sale/i18n/tr.po b/addons/point_of_sale/i18n/tr.po
index 41b45961e55..9425092e10e 100644
--- a/addons/point_of_sale/i18n/tr.po
+++ b/addons/point_of_sale/i18n/tr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:57+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:04+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: point_of_sale
 #: field:report.transaction.pos,product_nb:0
diff --git a/addons/point_of_sale/i18n/uk.po b/addons/point_of_sale/i18n/uk.po
index 6eaf003ece3..9ed6e8f72fe 100644
--- a/addons/point_of_sale/i18n/uk.po
+++ b/addons/point_of_sale/i18n/uk.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:57+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:04+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: point_of_sale
 #: field:report.transaction.pos,product_nb:0
diff --git a/addons/point_of_sale/i18n/vi.po b/addons/point_of_sale/i18n/vi.po
index 3fc540de804..2e258a37061 100644
--- a/addons/point_of_sale/i18n/vi.po
+++ b/addons/point_of_sale/i18n/vi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:57+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:04+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: point_of_sale
 #: field:report.transaction.pos,product_nb:0
diff --git a/addons/point_of_sale/i18n/zh_CN.po b/addons/point_of_sale/i18n/zh_CN.po
index 57512251609..17cb3fdad43 100644
--- a/addons/point_of_sale/i18n/zh_CN.po
+++ b/addons/point_of_sale/i18n/zh_CN.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:57+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:04+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: point_of_sale
 #: field:report.transaction.pos,product_nb:0
diff --git a/addons/point_of_sale/i18n/zh_HK.po b/addons/point_of_sale/i18n/zh_HK.po
index b11488f4b79..643f44b0e7e 100644
--- a/addons/point_of_sale/i18n/zh_HK.po
+++ b/addons/point_of_sale/i18n/zh_HK.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:57+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:04+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: point_of_sale
 #: field:report.transaction.pos,product_nb:0
diff --git a/addons/point_of_sale/i18n/zh_TW.po b/addons/point_of_sale/i18n/zh_TW.po
index d656fd763ba..f88333166b1 100644
--- a/addons/point_of_sale/i18n/zh_TW.po
+++ b/addons/point_of_sale/i18n/zh_TW.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:57+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:04+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: point_of_sale
 #: field:report.transaction.pos,product_nb:0
diff --git a/addons/point_of_sale/point_of_sale.py b/addons/point_of_sale/point_of_sale.py
index 690d371e9db..2d6d8b92da1 100644
--- a/addons/point_of_sale/point_of_sale.py
+++ b/addons/point_of_sale/point_of_sale.py
@@ -22,6 +22,7 @@
 import pdb
 import openerp
 import addons
+import openerp.addons.product.product
 
 import time
 from datetime import datetime
@@ -59,16 +60,9 @@ class pos_config(osv.osv):
              help="Accounting journal used to post sales entries."),
         'iface_self_checkout' : fields.boolean('Self Checkout Mode',
              help="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."),
-        'iface_websql' : fields.boolean('WebSQL (Faster but Chrome Only)',
-            help="If have more than 200 products, it's highly suggested to use WebSQL "\
-                "to store the data in the browser, instead of localStore mechanism. "\
-                "It's more efficient but works on the Chrome browser only."
-            ),
-        'iface_led' : fields.boolean('Help Notification'),
         'iface_cashdrawer' : fields.boolean('Cashdrawer Interface'),
         'iface_payment_terminal' : fields.boolean('Payment Terminal Interface'),
         'iface_electronic_scale' : fields.boolean('Electronic Scale Interface'),
-        'iface_barscan' : fields.boolean('BarScan Interface'), 
         'iface_vkeyboard' : fields.boolean('Virtual KeyBoard Interface'),
         'iface_print_via_proxy' : fields.boolean('Print via Proxy'),
 
@@ -77,9 +71,29 @@ class pos_config(osv.osv):
             help="This sequence is automatically created by OpenERP but you can change it "\
                 "to customize the reference numbers of your orders."),
         'session_ids': fields.one2many('pos.session', 'config_id', 'Sessions'),
-        'group_by' : fields.boolean('Group By', help="Check this if you want to group the Journal Items by Product while closing a Session"),
+        'group_by' : fields.boolean('Group Journal Items', help="Check this if you want to group the Journal Items by Product while closing a Session"),
     }
 
+    def _check_cash_control(self, cr, uid, ids, context=None):
+        return all(
+            (sum(int(journal.cash_control) for journal in record.journal_ids) <= 1)
+            for record in self.browse(cr, uid, ids, context=context)
+        )
+
+    _constraints = [
+        (_check_cash_control, "You cannot have two cash controls in one Point Of Sale !", ['journal_ids']),
+    ]
+
+    def copy(self, cr, uid, id, default=None, context=None):
+        if not default:
+            default = {}
+        d = {
+            'sequence_id' : False,
+        }
+        d.update(default)
+        return super(pos_order, self).copy(cr, uid, id, d, context=context)
+
+
     def name_get(self, cr, uid, ids, context=None):
         result = []
         states = {
@@ -93,14 +107,9 @@ class pos_config(osv.osv):
                 result.append((record.id, record.name+' ('+_('not used')+')'))
                 continue
             session = record.session_ids[0]
-            result.append((record.id, record.name + ' ('+session.user_id.name+', '+states[session.state]+')'))
+            result.append((record.id, record.name + ' ('+session.user_id.name+')')) #, '+states[session.state]+')'))
         return result
 
-
-    def _default_payment_journal(self, cr, uid, context=None):
-        res = self.pool.get('account.journal').search(cr, uid, [('type', 'in', ('bank','cash'))], limit=2)
-        return res or []
-
     def _default_sale_journal(self, cr, uid, context=None):
         res = self.pool.get('account.journal').search(cr, uid, [('type', '=', 'sale')], limit=1)
         return res and res[0] or False
@@ -113,7 +122,6 @@ class pos_config(osv.osv):
         'state' : POS_CONFIG_STATE[0][0],
         'shop_id': _default_shop,
         'journal_id': _default_sale_journal,
-        'journal_ids': _default_payment_journal,
         'group_by' : True,
     }
 
@@ -143,8 +151,6 @@ class pos_config(osv.osv):
                 obj.sequence_id.unlink()
         return super(pos_config, self).unlink(cr, uid, ids, context=context)
 
-pos_config()
-
 class pos_session(osv.osv):
     _name = 'pos.session'
     _order = 'id desc'
@@ -156,45 +162,20 @@ class pos_session(osv.osv):
         ('closed', 'Closed & Posted'),
     ]
 
-    def _compute_cash_journal_id(self, cr, uid, ids, fieldnames, args, context=None):
-        result = dict.fromkeys(ids, False)
-        for record in self.browse(cr, uid, ids, context=context):
-            for st in record.statement_ids:
-                if st.journal_id.type == 'cash':
-                    result[record.id] = st.journal_id.id
-                    break
-        return result
-
-    def _compute_cash_register_id(self, cr, uid, ids, fieldnames, args, context=None):
-        result = dict.fromkeys(ids, False)
-        for record in self.browse(cr, uid, ids, context=context):
-            for st in record.statement_ids:
-                if st.journal_id.type == 'cash':
-                    result[record.id] = st.id
-                    break
-        return result
-
-    def _compute_controls(self, cr, uid, ids, fieldnames, args, context=None):
-        result = {}
+    def _compute_cash_all(self, cr, uid, ids, fieldnames, args, context=None):
+        result = dict()
 
         for record in self.browse(cr, uid, ids, context=context):
-            has_opening_control = False
-            has_closing_control = False
-
-            for journal in record.config_id.journal_ids:
-                if journal.opening_control == True:
-                    has_opening_control = True
-                if journal.closing_control == True:
-                    has_closing_control = True
-
-                if has_opening_control and has_closing_control:
-                    break
-
-            values = {
-                'has_opening_control': has_opening_control,
-                'has_closing_control': has_closing_control,
+            result[record.id] = {
+                'cash_journal_id' : False,
+                'cash_register_id' : False,
+                'cash_control' : False,
             }
-            result[record.id] = values
+            for st in record.statement_ids:
+                if st.journal_id.cash_control == True:
+                    result[record.id]['cash_control'] = True
+                    result[record.id]['cash_journal_id'] = st.journal_id.id
+                    result[record.id]['cash_register_id'] = st.id
 
         return result
 
@@ -220,12 +201,17 @@ class pos_session(osv.osv):
                 required=True, readonly=True,
                 select=1),
 
-        'cash_journal_id' : fields.function(_compute_cash_journal_id, method=True, 
-                type='many2one', relation='account.journal',
-                string='Cash Journal', store=True),
-        'cash_register_id' : fields.function(_compute_cash_register_id, method=True, 
-                type='many2one', relation='account.bank.statement',
-                string='Cash Register', store=True),
+        'cash_control' : fields.function(_compute_cash_all,
+                                         multi='cash',
+                                         type='boolean', string='Has Cash Control'),
+        'cash_journal_id' : fields.function(_compute_cash_all,
+                                            multi='cash',
+                                            type='many2one', relation='account.journal',
+                                            string='Cash Journal', store=True),
+        'cash_register_id' : fields.function(_compute_cash_all,
+                                             multi='cash',
+                                             type='many2one', relation='account.bank.statement',
+                                             string='Cash Register', store=True),
 
         'opening_details_ids' : fields.related('cash_register_id', 'opening_details_ids', 
                 type='one2many', relation='account.cashbox.line',
@@ -269,8 +255,6 @@ class pos_session(osv.osv):
         'order_ids' : fields.one2many('pos.order', 'session_id', 'Orders'),
 
         'statement_ids' : fields.one2many('account.bank.statement', 'pos_session_id', 'Bank Statement', readonly=True),
-        'has_opening_control' : fields.function(_compute_controls, string='Has Opening Control', multi='control', type='boolean'),
-        'has_closing_control' : fields.function(_compute_controls, string='Has Closing Control', multi='control', type='boolean'),
     }
 
     _defaults = {
@@ -380,10 +364,8 @@ class pos_session(osv.osv):
     def wkf_action_closing_control(self, cr, uid, ids, context=None):
         for session in self.browse(cr, uid, ids, context=context):
             for statement in session.statement_ids:
-                if statement.id <> session.cash_register_id.id:
-                    if statement.balance_end<>statement.balance_end_real:
-                        self.pool.get('account.bank.statement').write(cr, uid,
-                            [statement.id], {'balance_end_real': statement.balance_end})
+                if statement != session.cash_register_id and statement.balance_end != statement.balance_end_real:
+                    self.pool.get('account.bank.statement').write(cr, uid, [statement.id], {'balance_end_real': statement.balance_end})
         return self.write(cr, uid, ids, {'state' : 'closing_control', 'stop_at' : time.strftime('%Y-%m-%d %H:%M:%S')}, context=context)
 
     def wkf_action_close(self, cr, uid, ids, context=None):
@@ -396,7 +378,7 @@ class pos_session(osv.osv):
                     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))
-                if st.difference:
+                if st.difference and st.journal_id.cash_control == True:
                     if st.difference > 0.0:
                         name= _('Point of Sale Profit')
                         account_id = st.journal_id.profit_account_id.id
@@ -414,6 +396,9 @@ class pos_session(osv.osv):
                         'account_id': account_id
                     }, context=context)
 
+                if st.journal_id.type == 'bank':
+                    st.write({'balance_end_real' : st.balance_end})
+
                 getattr(st, 'button_confirm_%s' % st.journal_id.type)(context=context)
         self._confirm_orders(cr, uid, ids, context=context)
         self.write(cr, uid, ids, {'state' : 'closed'}, context=context)
@@ -437,7 +422,7 @@ class pos_session(osv.osv):
             self.pool.get('pos.order')._create_account_move_line(cr, uid, order_ids, session, move_id, context=context)
 
             for order in session.order_ids:
-                if order.state != 'paid':
+                if order.state not in ('paid', 'invoiced'):
                     raise osv.except_osv(
                         _('Error!'),
                         _("You cannot confirm all orders of this session, because they have not the 'paid' status"))
@@ -459,8 +444,6 @@ class pos_session(osv.osv):
             'context' : context,
         }
 
-pos_session()
-
 class pos_order(osv.osv):
     _name = "pos.order"
     _description = "Point of Sale"
@@ -741,7 +724,7 @@ class pos_order(osv.osv):
             'pos_statement_id' : order_id,
             'journal_id' : journal_id,
             'type' : 'customer',
-            'ref' : order.name,
+            'ref' : order.session_id.name,
         })
 
         statement_line_obj.create(cr, uid, args, context=context)
@@ -1079,8 +1062,6 @@ class pos_order(osv.osv):
         self.create_account_move(cr, uid, ids, context=context)
         return True
 
-pos_order()
-
 class account_bank_statement(osv.osv):
     _inherit = 'account.bank.statement'
     _columns= {
@@ -1096,6 +1077,7 @@ class account_bank_statement_line(osv.osv):
     _columns= {
         'pos_statement_id': fields.many2one('pos.order', ondelete='cascade'),
     }
+
 account_bank_statement_line()
 
 class pos_order_line(osv.osv):
@@ -1179,8 +1161,6 @@ class pos_order_line(osv.osv):
         })
         return super(pos_order_line, self).copy_data(cr, uid, id, default, context=context)
 
-pos_order_line()
-
 class pos_category(osv.osv):
     _name = 'pos.category'
     _description = "Point of Sale Category"
@@ -1230,6 +1210,11 @@ class pos_category(osv.osv):
         'parent_id': fields.many2one('pos.category','Parent Category', select=True),
         'child_id': fields.one2many('pos.category', 'parent_id', string='Children Categories'),
         'sequence': fields.integer('Sequence', help="Gives the sequence order when displaying a list of product categories."),
+        
+        # NOTE:  there is no 'default image', because by default we don't show thumbnails for categories. However if we have a thumbnail
+        # for at least one category, then we display a default image on the other, so that the buttons have consistent styling.
+        # In this case, the default image is set by the js code. 
+
         'image': fields.binary("Image",
             help="This field holds the image used for the category. "\
                  "The image is base64 encoded, and PIL-supported. "\
@@ -1252,21 +1237,40 @@ class pos_category(osv.osv):
                  "Use this field anywhere a small image is required."),
     }
 
-    def _get_default_image(self, cr, uid, context=None):
-        image_path = openerp.modules.get_module_resource('point_of_sale', 'images', 'default_category_photo.png')
-        return tools.image_resize_image_big(open(image_path, 'rb').read().encode('base64'))
-
-    _defaults = {
-        'image': _get_default_image,
-    }
-
-pos_category()
-
 import io, StringIO
 
+class ean_wizard(osv.osv_memory):
+    _name = 'pos.ean_wizard'
+    _columns = {
+        'ean13_pattern': fields.char('Reference', size=32, required=True, translate=True),
+    }
+    def sanitize_ean13(self, cr, uid, ids, context):
+        for r in self.browse(cr,uid,ids):
+            ean13 = openerp.addons.product.product.sanitize_ean13(r.ean13_pattern)
+            m = context.get('active_model')
+            m_id =  context.get('active_id')
+            self.pool.get(m).write(cr,uid,[m_id],{'ean13':ean13})
+        return { 'type' : 'ir.actions.act_window_close' }
+
 class product_product(osv.osv):
     _inherit = 'product.product'
 
+
+    #def _get_small_image(self, cr, uid, ids, prop, unknow_none, context=None):
+    #    result = {}
+    #    for obj in self.browse(cr, uid, ids, context=context):
+    #        if not obj.product_image:
+    #            result[obj.id] = False
+    #            continue
+
+    #        image_stream = io.BytesIO(obj.product_image.decode('base64'))
+    #        img = Image.open(image_stream)
+    #        img.thumbnail((120, 100), Image.ANTIALIAS)
+    #        img_stream = StringIO.StringIO()
+    #        img.save(img_stream, "JPEG")
+    #        result[obj.id] = img_stream.getvalue().encode('base64')
+    #    return result
+
     _columns = {
         'income_pdt': fields.boolean('Point of Sale Cash In', help="This is a product you can use to put cash into a statement for the point of sale backend."),
         'expense_pdt': fields.boolean('Point of Sale Cash Out', help="This is a product you can use to take cash from a statement for the point of sale backend, exemple: money lost, transfer to bank, etc."),
@@ -1274,11 +1278,42 @@ class product_product(osv.osv):
             help="If you want to sell this product through the point of sale, select the category it belongs to."),
         'to_weight' : fields.boolean('To Weight', help="This category contains products that should be weighted, mainly used for the self-checkout interface"),
     }
+
+    def _default_pos_categ_id(self, cr, uid, context=None):
+        proxy = self.pool.get('ir.model.data')
+
+        try:
+            category_id = proxy.get_object_reference(cr, uid, 'point_of_sale', 'categ_others')[1]
+        except ValueError:
+            values = {
+                'name' : 'Others',
+            }
+            category_id = self.pool.get('pos.category').create(cr, uid, values, context=context)
+            values = {
+                'name' : 'categ_others',
+                'model' : 'pos.category',
+                'module' : 'point_of_sale',
+                'res_id' : category_id,
+            }
+            proxy.create(cr, uid, values, context=context)
+
+        return category_id
+
     _defaults = {
         'to_weight' : False,
+        'pos_categ_id' : _default_pos_categ_id,
     }
 
-product_product()
-
+    def edit_ean(self, cr, uid, ids, context):
+        return {
+            'name': _("Assign a Custom EAN"),
+            'type': 'ir.actions.act_window',
+            'view_type': 'form',
+            'view_mode': 'form',
+            'res_model': 'pos.ean_wizard',
+            'target' : 'new',
+            'view_id': False,
+            'context':context,
+        }
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/point_of_sale/point_of_sale_data.xml b/addons/point_of_sale/point_of_sale_data.xml
index dda0b78e952..35a2516da02 100644
--- a/addons/point_of_sale/point_of_sale_data.xml
+++ b/addons/point_of_sale/point_of_sale_data.xml
@@ -24,14 +24,15 @@
 
     <data noupdate="1">
         <!-- notify all employees of module installation -->
-        <function model="mail.group" name="message_append_note">
-            <!-- ids, subject, body, parent_id=False, type='notification', content_subtype='html' -->
-            <value eval="[ref('mail.group_all_employees')]"/>
-            <value>Module Point of Sale has been installed</value>
-            <value>Encode sale orders, register payments, compute money to return, create invoices, and manage refunds of former sales through a specific, web-based, touch-screen user interface.
+        <record model="mail.message" id="module_install_notification">
+            <field name="model">mail.group</field>
+            <field name="res_id" ref="mail.group_all_employees"/>
+            <field name="type">notification</field>
+            <field name="subject">Point of Sale application installed!</field>
+            <field name="body">Record sale orders, register payments, compute change to return, create invoices, and manage refunds through a specific web touch-screen interface.
 
-If you install the PoS proxy, you will be able to interface OpenERP with retail materials; barcode scanners, printers, cash registers, weighing machine, credit card payments.</value>
-        </function>
+If you install the PoS proxy you will be able to interface OpenERP with retail hardware: barcode scanners, printers, cash registers, weighing machines, credit card payment terminals.</field>
+        </record>
 
         <record id="unreferenced_product" model="product.product">
           <field name="list_price">1.00</field>
diff --git a/addons/point_of_sale/point_of_sale_demo.xml b/addons/point_of_sale/point_of_sale_demo.xml
index 6836d0e7c4d..7d80dd493ad 100644
--- a/addons/point_of_sale/point_of_sale_demo.xml
+++ b/addons/point_of_sale/point_of_sale_demo.xml
@@ -1,12 +1,28 @@
 <?xml version="1.0"?>
 <openerp>
     <data>
+        <record id="base.user_root" model="res.users">
+            <field name="ean13">0410100000006</field>
+        </record>
         <record id="base.user_demo" model="res.users">
             <field name="groups_id" eval="[(4,ref('group_pos_user'))]"/>
+            <field name="ean13">0410200000005</field>
         </record>
-    	<record id="account.cash_journal" model="account.journal">
+        <record id="account.cash_journal" model="account.journal">
             <field eval="True" name="journal_user"/>
         </record>
+        <record id="base.user_root" model="res.users">
+            <field name="ean13">0410300000004</field>
+            <field name="groups_id" eval="[(4,ref('group_pos_manager'))]"/>
+        </record>
+        <record id="base.user_demo" model="res.users">
+            <field name="ean13">0410400000003</field>
+            <field name="groups_id" eval="[(4,ref('group_pos_manager'))]"/>
+        </record>
+
+        <record model="pos.config" id="pos_config_main">
+            <field name="journal_ids" eval="[(6, 0, [ref('account.cash_journal'), ref('account.bank_journal')])]" />
+        </record>
 
         <!-- Resource: pos.category -->
 
@@ -154,6 +170,7 @@
           <field name="list_price">1.98</field>
           <field name="name">Boni Oranges</field>
           <field name="to_weight">True</field>
+          <field name="ean13">2100002000003</field>
           <field name="pos_categ_id" ref="oranges"/>
           <field name="uom_id" ref="product.product_uom_kgm" />
           <field name="uom_po_id" ref="product.product_uom_kgm" />
@@ -248,6 +265,7 @@
           <field name="list_price">5.10</field>
           <field name="name">Fishing</field>
           <field name="to_weight">True</field>
+          <field name="ean13">2300001000008</field>
           <field name="pos_categ_id" ref="rouges_noyau_fruits"/>
           <field name="uom_id" ref="product.product_uom_kgm" />
           <field name="uom_po_id" ref="product.product_uom_kgm" />
@@ -316,6 +334,7 @@
           <field name="list_price">1.28</field>
           <field name="name">Onions</field>
           <field name="to_weight">True</field>
+          <field name="ean13">2100001000004</field>
           <field name="pos_categ_id" ref="oignons_ail_echalotes"/>
           <field name="uom_id" ref="product.product_uom_kgm" />
           <field name="uom_po_id" ref="product.product_uom_kgm" />
@@ -389,6 +408,7 @@
         <record id="coca_regular_33cl" model="product.product">
           <field name="list_price">0.51</field>
           <field name="name">Coca-Cola Regular 33cl</field>
+          <field name="ean13">5449000000996</field>
           <field name="pos_categ_id" ref="coke"/>
           <field name="image">/9j/4AAQSkZJRgABAAEBLAEsAAD/2wCEAAoHBwgHBgoICAgLCgoLDhgQDg0NDh0VFhEYIx8lJCIfIiEmKzcvJik0KSEiMEExNDk7Pj4+JS5ESUM8SDc9PjsBCwoKDg0OHBYWHCgoKCgoOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O//AABEIAGQAOAMBEQACEQEDEQH/xAAfAAABBQEBAQEBAQAAAAAAAAAAAQIDBAUGBwgJCgv/xAC1EAACAQMDAgQDBQUEBAAAAX0BAgMABBEFEiExQQYTUWEHInEUMoGRoQgjQrHBFVLR8CQzYnKCCQoWFxgZGiUmJygpKjQ1Njc4OTpDREVGR0hJSlNUVVZXWFlaY2RlZmdoaWpzdHV2d3h5eoOEhYaHiImKkpOUlZaXmJmaoqOkpaanqKmqsrO0tba3uLm6wsPExcbHyMnK0tPU1dbX2Nna4eLj5OXm5+jp6vHy8/T19vf4+fr/xAAfAQADAQEBAQEBAQEBAAAAAAAAAQIDBAUGBwgJCgv/xAC1EQACAQIEBAMEBwUEBAABAncAAQIDEQQFITEGEkFRB2FxEyIygQgUQpGhscEJIzNS8BVictEKFiQ04SXxFxgZGiYnKCkqNTY3ODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZnaGlqc3R1dnd4eXqCg4SFhoeIiYqSk5SVlpeYmZqio6Slpqeoqaqys7S1tre4ubrCw8TFxsfIycrS09TV1tfY2dri4+Tl5ufo6ery8/T19vf4+fr/2gAMAwEAAhEDEQA/APZSQoJJwByTQBCt1HIxVOSOvtQBBe36WkDyySLGqAse5wKB2M1fEqHDYkZCu7ds4xQFi/Zaql7brPCVdGzjBweDjvQFix9ujVgsmULdM9/oelAiwrB1DKcgjINAFTVL6DT9PluLggIqnI9amUlFXZrQoyrTUY7s5OLWpJbINIs1ozjO6ICRfy4IrGOIT3R3VsslGTUJJ/g/8jPkngaXzZ9Wif2nDrn8wRWqq031OZ4LEL7D+Wo0ahp6uP8AiYaf5f8Ac81cflt/pT9pDuifqtf+SX3MVby2kuPMg1aBPRYSzlfYYGKTq0+5SwWJ/kf3WNy4muLTTUkJkvGlQspYCNcYHXqT1/8A1UqlTlV0h4fC+1m1J2szY8NanHquiQTLtWRB5cqD+Fhwf8fxopT543FjsK8PWcenT0OU8dXUlx4gtNK8wJF5aytlsbiWI/p+PHpXPipNySPZyWlGGHnVtd3t+A6bakaqvQDArJhC7d2Ub1AkJ3gcrke4qZaG9F3locBfMr3blVGAalI+joxtBHVeFirWwIUD6CnHc8fMk1I76JkudJj3n/Uttb6dv6V2RtKHofNyTp13bqZWgXMVp4xbT7NgIZomeRAcjI6GppSSqWR242nKpg/aT3TsjG+IJ2+NLY562i/+hNWeJ+M7sj1wUv8AF+iOTGq3trd7VuJDGH5TOQRmsEe08NTnDZXsdHrtzLcaLbm2eJmMzCBVJHmxMMgjnOQwYEZJycdxW9SKcVY8bBJQry5r7a+TWmvk1Zp9vmZFjoNlqGhwXEt6LK7mkdUeUZicg8KT/C1KMFKCd7M66+ZVqOIlFR5opLbdefmixPpuqeH7Ge4VZ4kDKoUhXVSe+7HzAjoeOeo6ZU6TimzOljKOMqRi2np5p/d0f9INK1u9udL1qKe6dybVWUdMfOAcY/3qVOXuy9C8ThKcK1Fxj9r9H/kaPw+H/FXRe1q9PC/GYZ4/9jf+JFj4h/8AI52h/wCnVf8A0JqrE/GjPIv9yn/i/RHGSQNPfCNMbnfaM+5rnWrse4pqFO76I39X1TSdL1A6GbQ3OnQoI5+fmEo6uno3r64ronOMXy20PHw2GxFel7fm5Zt3Xa3Z9127Fy2tZlsprvSpIdas3wZrdx88o/2l7SD+8OuOmetxi7Nx1X9ficdWrH2ihVTpyWz6L0f8r7dPTavqlzYf8Ii8dn/aUQFwgNtOTtgP905/h7jryO1TUcfZO1zbCU6v11OfI/deq6+fr38jn9PJR7he0tuy/lhv/Za5oPf0PZrK6i+0l/l+p1Xw7GfFg9rVv5itsL8Z5We/7p/28S/Ec7PF1m3/AE7L/wChNV4n40TkCvhJr+9+hyDTJFeq8jFVWQEkdRzXNH4j2nFyptLsXte0uOXVJwkPkSPKQGVyyFzyA2c7d2chuhyOnONqsLs4MFipRoxu7pL52XVd7dVuvuvL4UiSVEax2LqFqWeSA5WS4XqArZGPQjp3welOgrrTdGGaScW1P4JWs+i9VZ+qf5Brl/4hutFf7S9wLRZQk0U8IV0bquWAG4e/HPXtkqSqOOuw8DQwdOuuVLmtdNO6a66X0fkZNm25tw/55t/6Ca51uepU0XzX5nWfDZt/it/a1b+a1vhfj+R5Gfq2FX+L/MsfEqPzPFOnrnG63A/8eNaYle+jPh+XLhaj8/0PPrknz5Of4j/Oudn0kPhXodLpUyeIrKKx+1my1i2TZbXAcqJ0/uMR3Hatov2itezPExcHg6jny81OTu1vZ90NstMaCJbGY2+n6rBIzYu0AW4B6bZOoI6cGiELK2zM6+JU5c6vODX2Xt6r/NEGq6vq2paNKj3Mnk28qpc28gBKNztO7GSuR3OQcdampOco7muEwuHo101FXabT799Nr+n4GXo5LX8cQ/jyv5g1lBXaPSxNlSb7HW/C47vFEv8A16v/AOhLW2G+P5HlcR6YVf4v0ZpfEhf+Km0pvWIj/wAerTEfGjkyF/7NV9Tzi5/4+JM/3j/OuZn1EPhXoafhq1mu5b6KGW3jLWpXNwPlyWULhv4WyQQfUVdKLd/Q87M6saag2m/e6b7O+nVW3RuJrerafbNZ+INMj1JIRl0mH7xF/vZIIYe4/E1sqk0rSVzyZYPD1Z8+HqOF+23p3T8vuMzVvEdpe6VJp+kaQllA7LJOwxlsHgce+KzqVU42irHbg8vqU6yqVajk9kUfC8XneI7KPrmT+hqKKvNHdmMuXCzfkdP8K+fFEx7C0b/0JK0w3x/I83iP/do/4v0Zp/EzP9u6QV67G7e4q8T8SOTh+3sK1/L9Tzi9QR3cqhg2G6iuaW59PSleCZo+GEuPt8skLwCOOL9+lxnZIhIBBwOnIOe2M1VK/McGaSh7NJp3b0tunvp/l12Oy0W4t5fM+yalA1rEGVrS+Ic2zYI+V8/Mvb0wetddNp7PTz6HzuMhONueD5nb3o6c3quj/U5e401IfAQvFaJXmvizYP3lG5QF9ccn8a55w/dX8z2KWIcsx5NbKH52eongGEzeLrQ44jDuf++SP5kVOGV6iNs7ny4Kfnb8zc+FA/4qS79rVv8A0Na0wy/efI5OJH/s8P8AF+jND4mNjxBpABx8jc/jV4j4kc+QL9xV+R59er5upugO3e4GW7Z71yvVn0dJ8tFPyNa10uXStUeay1FWktUdnjERMnysEZWjz05z16c1pGDjK6Z5lbExxFFKcNJNa301V00/61NaaDwta3gv5RcWnygSwxLuhcsuSmMZXr0OOlbctNO+x50amPqQ5FaXZvRqz38/VXOYvLoz+HrKGMkRW9xMAp9DtIz+ZrCbvBep69Cny4mbe7jH9U/0Oj+GNsDf318w4ghCA+7HP/staYRe82cHEdT91CHd/l/w5rfC3TZba/kvJAdtzbNs9MB1zVYaOt/Iw4hxMZpQX2WvyY74lRyHxLpUgU7PKOGxnkNk/pijEfGgyGUfq1VeZ57qY238w56965pbn0lB3pI6W1jm1+KLWNIl8vXLJQJ4sj9+AMBxnjJHBHf+eyTn70d0eHWccJJ0aqvSls+3l/kEGseG2upptV0y4srxlZLiGIHy5SeuVPQ559jzmqjOm3qrEVMJjVFKlNSj0b3XzOdtoTNpGpOisIYXikBPY5Kgfkx/KsbXiz1JS5a9NPdpr8L/AKHoHhi0/sXwBc3kg2yTwyTn6bcKP6/jXVQjyUmz57Mav1nMowWyaX46mv4Jkid7ZIoyPL06Pe/GCSE/wP5GrpWtH0OLMIy9rVb61P8AP/gHTappNnrFqba8i3qDlWBwyH1B7GrnBSVmcmHxFShLmgzzTxJ8OprWRri3vg6N084Yx9SOK5pYZ9GfQ4XiNRjacPu/yf8Amc1BpuoaTdJdW9zGssZyro+B/wCPYzUKjUi7o6amc4HEQcZ3s+6/yN3/AISa11CMJ4g0S2uZFGPNhljyfwzkfnW2sviieW1Sou9DEWXZ3/y/QjnuLXVUh0uysU0zS/NEk77wWkx9M/5xSlTcvdSsi6eMp0G6sqvPO1lo7I7prBPEejvp8BNvauFQyDBwoI4XqO2K3lFSjY8nD4mVGsqlrtfmbOi6HYaDZi1sItinlmJyzn1JpU6cYKyFisXVxM+abuaB6mrZziEBhggEHsaAM668PaPekm406Bye+3H8qVkO7M5vAPhlm3HTh9PMb/GiwcxetPDGh2JBt9MgUjoSu4/rmiyC7NQAKAFAAHQCmIUUIAAA/9k=</field>
         </record>
@@ -1022,3 +1042,4 @@
 
     </data>
 </openerp>
+
diff --git a/addons/point_of_sale/point_of_sale_view.xml b/addons/point_of_sale/point_of_sale_view.xml
index 47a41260378..6dffbd82d19 100644
--- a/addons/point_of_sale/point_of_sale_view.xml
+++ b/addons/point_of_sale/point_of_sale_view.xml
@@ -55,10 +55,14 @@
                                     </group>
                                 </form>
                             </field>
-                            <group class="oe_subtotal_footer">
+                            <group class="oe_subtotal_footer oe_right" colspan="2" name="order_total">
                                 <field name="amount_tax"/>
-                                <field name="amount_total"/>
-                                <button name="button_dummy" string="Update" class="oe_link" states="draft"/>
+                                <div class="oe_subtotal_footer_separator oe_inline">
+                                    <label for="amount_total" />
+                                    <button name="button_dummy"
+                                        states="draft" string="(update)" type="object" class="oe_edit_only oe_link"/>
+                                </div>
+                                <field name="amount_total" nolabel="1" class="oe_subtotal_footer_separator"/>
                             </group>
                         </page>
                         <page string="Payments">
@@ -122,7 +126,7 @@
             </field>
         </record>
         <record model="ir.ui.view" id="view_pos_order_tree">
-            <field name="name">Sales</field>
+            <field name="name">Orders</field>
             <field name="model">pos.order</field>
             <field name="arch" type="xml">
                 <tree string="POS Orders" colors="blue:state == 'draft';gray:state in ('done','cancel');black:state not in('done','cancel')">
@@ -134,6 +138,7 @@
                     <field name="amount_total" sum="Amount total"/>
                     <field name="company_id" groups="base.group_multi_company"/>
                     <field name="state"/>
+                    <field name="session_id" />
                 </tree>
             </field>
         </record>
@@ -603,33 +608,22 @@
             <field name="domain">[('date_order','like',time.strftime('%Y-%m'))]</field>
         </record>
 
-        <record id="product_normal_form_pos_view" model="ir.ui.view">
-            <field name="name">product.normal.pos.form.inherit</field>
-            <field name="model">product.product</field>
-            <field name="inherit_id" ref="product.product_normal_form_view"/>
-            <field name="arch" type="xml">
-                  <group name="status" position="after">
-                      <group name="pos" string="Point of Sale">
-                          <field name="pos_categ_id"/>
-                          <field name="to_weight" />
-                      </group>
-                  </group>
-            </field>
-        </record>
-
-
         <record id="product_normal_form_view" model="ir.ui.view">
             <field name="name">product.normal.form.inherit</field>
             <field name="model">product.product</field>
-            <field name="inherit_id" ref="product.product_normal_form_view"/>
+            <field name="inherit_id" ref="stock.view_normal_procurement_locations_form"/>
             <field name="arch" type="xml">
-                <group name="misc" position="after">
-                    <group name="pos" colspan="2" col="2">
-                        <separator string="Point of Sale" colspan="2"/>
+                <group name="sale" position="inside">
+                    <group name="pos" string="Point of Sale">
+                        <field name="pos_categ_id"/>
+                        <field name="to_weight" />
                         <field name="income_pdt"/>
                         <field name="expense_pdt"/>
                     </group>
                 </group>
+                <field name="ean13" position="after">
+                    <button name="edit_ean" type="object" string="Set a Custom EAN" class="oe_link oe_edit_only"/>
+                </field>
             </field>
         </record>
 
@@ -773,10 +767,10 @@
                     <sheet>
                         <group>
                         <field name="name"/>
-                        <field name="shop_id" widget="selection" />
+                        <field name="shop_id" widget="selection" groups="stock.group_locations" />
                         <field name="journal_id" widget="selection" />
-                        <field name="sequence_id" readonly="1"/>
-                        <field name="group_by" />
+                        <field name="sequence_id" readonly="1" groups="base.group_no_one" />
+                        <field name="group_by" groups="account.group_account_user"  />
                         </group>
                         <separator string="Available Payment Methods" colspan="4"/>
                         <field name="journal_ids" colspan="4" nolabel="1">
@@ -784,21 +778,17 @@
                                 <field name="code" />
                                 <field name="name" />
                                 <field name="type" />
-                                <field name="opening_control" />
-                                <field name="closing_control" />
+                                <field name="cash_control" />
                             </tree>
                         </field>
                         <group string="Material Interfaces" >
                             <group>
                                 <field name="iface_self_checkout" />
-                                <field name="iface_websql" />
-                                <field name="iface_led" />
                                 <field name="iface_cashdrawer" />
                                 <field name="iface_payment_terminal" />
                             </group>
                             <group>
                                 <field name="iface_electronic_scale" />
-                                <field name="iface_barscan" />
                                 <field name="iface_vkeyboard" />
                                 <field name="iface_print_via_proxy" />
                             </group>
@@ -873,13 +863,17 @@
                 <form string="Point of Sale Session" version="7.0">
                     <header>
                         <button name="open" type="workflow" string="Validate &amp; Open Session" states="opening_control" class="oe_highlight"/>
-                        <button name="cashbox_control" type="workflow" string="End of Session" states="opened"
-                            class="oe_highlight"/>
+                        <button name="cashbox_control" type="workflow" string="End of Session"
+                            attrs="{'invisible' : ['|', ('cash_control', '=', False),('state', '!=', 'opened')]}" 
+                            class="oe_highlight" />
+                        <button name="close" type="workflow" string="Validate Closing &amp; Post Entries"
+                            attrs="{'invisible' : ['|', ('cash_control', '=', True),('state', '!=', 'opened')]}"
+                            class="oe_highlight" />
                         <button name="close" type="workflow" string="Validate Closing &amp; Post Entries" states="closing_control"
-                            class="oe_highlight"/>
-                        <button name="open_frontend_cb" type="object" string="Start Selling" states="opened"/>
+                            class="oe_highlight" />
+                        <button name="open_frontend_cb" type="object" string="Continue Selling" states="opened"/>
                         <div class="oe_right">
-                            <field name="state" widget="statusbar" statusbar_visible="opening_control,opened,closing_control,closed" nolabel="1"/>
+                            <field name="state" widget="statusbar" statusbar_visible="opening_control,opened,closing_control,closed" nolabel="1" />
                         </div>
                     </header>
                     <sheet>
@@ -888,49 +882,48 @@
                             <button name="%(action_pos_box_out)d" string="Take Money Out" type="action" states="opened,closing_control"/>
                         </div>
                         <h1 class="oe_title">
-                            Point of Sale Session:
+                            Session:
                             <field name="name" attrs="{'invisible': [('name','=','/')]}" class="oe_inline"/>
                         </h1>
-                        <field name="has_opening_control" invisible="1" />
-                        <field name="has_closing_control" invisible="1" />
                         <group>
+                            <field name="cash_control" invisible="1" />
                             <group>
                                 <field name="user_id"/>
                                 <field name="config_id" attrs="{'invisible' : [('config_id', '&lt;&gt;', False)]}"/>
                             </group>
                             <group>
                                 <field name="start_at" attrs="{'invisible' : [('state', '=', 'opening_control')]}"/>
-                                <field name="stop_at" attrs="{'invisible' : [('state', '&lt;&gt;', 'closed')]}"/>
+                                <field name="stop_at" attrs="{'invisible' : [('state', '!=', 'closed')]}"/>
                             </group>
                             <newline/>
 
-                            <group string="Opening Cash Control">
+                            <group string="Opening Cash Control" attrs="{'invisible' : ['|', ('cash_control', '=', False),('state', 'in', ('opened', 'closing_control'))]}">
                                 <field name="opening_details_ids" nolabel="1" colspan="2" attrs="{'readonly' : [('state', 'not in', ('opening_control',))]}">
                                     <tree string="Opening Cashbox Lines" editable="bottom">
                                         <field name="pieces" readonly="1" />
-                                        <field name="number_opening" string="Opening Unit Numbers" on_change="on_change_sub_opening(pieces, number_opening)" />
+                                        <field name="number_opening" on_change="on_change_sub_opening(pieces, number_opening)" />
                                         <field name="subtotal_opening" string="Opening Subtotal" sum="Total"/>
                                     </tree>
                                 </field>
                             </group>
-                            <group string="Closing Cash Control" attrs="{'invisible': [('state', '=', 'opening_control')]}">
+                            <group string="Closing Cash Control" attrs="{'invisible': ['|', ('cash_control', '=', False), ('state', 'in', ('opening_control', 'opened'))]}">
                                 <field name="details_ids" nolabel="1" colspan="2">
                                     <tree string="Cashbox Lines" editable="bottom">
                                         <field name="pieces" readonly="1" />
-                                        <field name="number_closing"/>
+                                        <field name="number_closing" />
                                         <field name="subtotal_closing"/>
                                     </tree>
                                 </field>
                             </group>
 
-                            <div>
+                            <div attrs="{'invisible' : ['|', ('cash_control', '=', False),('state', 'in', ('opened', 'closing_control'))]}">
                                 <group class="oe_subtotal_footer oe_right">
                                     <field name="cash_register_balance_start" readonly="1" string="Opening Balance" class="oe_subtotal_footer_separator"/>
                                     <field name="cash_register_total_entry_encoding"  attrs="{'invisible' : [('state', '=', 'opening_control')]}" string="+ Transactions"/>
                                     <field name="cash_register_balance_end" attrs="{'invisible' : [('state', '=', 'opening_control')]}" string="= Theorical Balance"/>
                                 </group>
                                 <div class="oe_clear"/>
-                                <div attrs="{'invisible' : [('cash_journal_id', '=', False)]}" class="oe_view_nocontent" groups="point_of_sale.group_pos_manager">
+                                <div attrs="{'invisible' : ['|', ('cash_journal_id', '=', False), ('state', '!=', 'opening_control')]}" class="oe_view_nocontent" groups="point_of_sale.group_pos_manager">
                                     <p class="oe_view_nocontent_create">
                                     You can define another list of available currencies on the
                                     <i>Cash Registers</i> tab of the <b><field name="cash_journal_id" class="oe_inline"/></b>
@@ -940,7 +933,7 @@
                             </div>
 
 
-                            <group class="oe_subtotal_footer oe_right" attrs="{'invisible' : [('state', '=', 'opening_control')]}">
+                            <group class="oe_subtotal_footer oe_right" attrs="{'invisible': ['|', ('cash_control', '=', False), ('state', 'in', ('opening_control', 'opened'))]}">
                                 <field name="cash_register_balance_end_real" class="oe_subtotal_footer_separator"/>
                                 <field name="cash_register_difference"  class="oe_subtotal_footer_separator"/>
                             </group>
@@ -1057,5 +1050,28 @@
             parent="menu_point_of_sale"
             id="menu_pos_session_opening" sequence="0"/>
 
+        <record model="ir.ui.view" id="pos_ean13_generator">
+            <field name="name">pos.ean_wizard</field>
+            <field name="model">pos.ean_wizard</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Ean13 Generator" version="7.0">  
+                    <p class="oe_grey">
+                        Enter a reference for this product, it will be converted
+                        automatically to a valid EAN number.
+                    </p>
+                    <group>
+                        <field name="ean13_pattern" class="oe_inline"/>
+                    </group>
+                    <footer>
+                        <button name="sanitize_ean13" type="object" string="Apply" class="oe_highlight"/> or 
+                         <button icon="gtk-stop" special="cancel"
+                            string="Cancel" class="oe_link"/>
+                    </footer>
+                </form>
+            </field>
+        </record>
+
+
     </data>
 </openerp>
diff --git a/addons/point_of_sale/point_of_sale_workflow.xml b/addons/point_of_sale/point_of_sale_workflow.xml
index 87deb7f18fb..601fbae4d23 100644
--- a/addons/point_of_sale/point_of_sale_workflow.xml
+++ b/addons/point_of_sale/point_of_sale_workflow.xml
@@ -126,14 +126,14 @@
       <field name="act_from" ref="act_start" />
       <field name="act_to" ref="act_opening_control" />
       <field name="signal" eval="False" /> <!-- >start_to_opening_control</field> -->
-      <field name="condition">has_opening_control == True</field>
+      <field name="condition">cash_control == True</field>
     </record>
 
     <record model="workflow.transition" id="trans_start_to_open">
       <field name="act_from" ref="act_start" />
       <field name="act_to" ref="act_open" />
       <field name="signal" eval="False" />
-      <field name="condition">has_opening_control == False</field>
+      <field name="condition">cash_control == False</field>
     </record>
     <!-- state:opening_control -> signal:open -> state:opened -> signal:cashbox_control -> state:closing_control -> signal:close -> state:close -->
 
@@ -147,14 +147,14 @@
       <field name="act_from" ref="act_open" />
       <field name="act_to" ref="act_closing_control" />
       <field name="signal">cashbox_control</field>
-      <field name="condition">has_closing_control == True</field>
+      <field name="condition">cash_control == True</field>
     </record>
 
     <record model="workflow.transition" id="trans_open_to_close">
       <field name="act_from" ref="act_open" />
       <field name="act_to" ref="act_close" />
       <field name="signal">close</field>
-      <field name="condition">has_closing_control == False</field>
+      <field name="condition">cash_control == False</field>
     </record>
 
     <record model="workflow.transition" id="trans_closing_control_to_close">
diff --git a/addons/point_of_sale/report/pos_sales_user.py b/addons/point_of_sale/report/pos_sales_user.py
index e49528441b9..6ac2e1892c1 100644
--- a/addons/point_of_sale/report/pos_sales_user.py
+++ b/addons/point_of_sale/report/pos_sales_user.py
@@ -37,14 +37,14 @@ class pos_sales_user(report_sxw.rml_parse):
         dt1 = form['date_start'] + ' 00:00:00'
         dt2 = form['date_end'] + ' 23:59:59'
         data={}
-        self.cr.execute("select po.name as pos,po.date_order,ru.name as user,po.state,rc.name " \
-                        "from pos_order as po,res_users as ru,res_company as rc " \
+        self.cr.execute("select po.name as pos,po.date_order,rp.name as user,po.state,rc.name " \
+                        "from pos_order as po,res_users as ru,res_company as rc, res_partner as rp " \
                         "where po.date_order >= %s and po.date_order <= %s " \
-                        "and po.company_id=rc.id and po.user_id=ru.id and po.user_id IN %s " \
+                        "and po.company_id=rc.id and po.user_id=ru.id and po.user_id IN %s and ru.partner_id = rp.id" \
                     ,(dt1,dt2,tuple(form['user_id'])))
 
         return self.cr.dictfetchall()
 
 report_sxw.report_sxw('report.pos.sales.user', 'pos.order', 'addons/point_of_sale/report/pos_sales_user.rml', parser=pos_sales_user,header='internal')
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/point_of_sale/res_users.py b/addons/point_of_sale/res_users.py
index d64f05d1391..f1c613d5f06 100644
--- a/addons/point_of_sale/res_users.py
+++ b/addons/point_of_sale/res_users.py
@@ -1,38 +1,8 @@
 #!/usr/bin/env python
 from osv import osv, fields
 import math
+import openerp.addons.product.product
 
-def is_pair(x):
-    return not x%2
-# This code is a duplicate of product#check_ean function
-def check_ean(eancode):
-    if not eancode:
-        return True
-    if len(eancode) <> 13:
-        return False
-    try:
-        int(eancode)
-    except:
-        return False
-    oddsum=0
-    evensum=0
-    total=0
-    eanvalue=eancode
-    reversevalue = eanvalue[::-1]
-    finalean=reversevalue[1:]
-
-    for i in range(len(finalean)):
-        if is_pair(i):
-            oddsum += int(finalean[i])
-        else:
-            evensum += int(finalean[i])
-    total=(oddsum * 3) + evensum
-
-    check = int(10 - math.ceil(total % 10.0)) %10
-
-    if check != int(eancode[-1]):
-        return False
-    return True
 
 class res_users(osv.osv):
     _inherit = 'res.users'
@@ -43,10 +13,22 @@ class res_users(osv.osv):
 
     def _check_ean(self, cr, uid, ids, context=None):
         return all(
-            check_ean(user.ean13) == True
+            openerp.addons.product.product.check_ean(user.ean13) == True
             for user in self.browse(cr, uid, ids, context=context)
         )
 
+    def edit_ean(self, cr, uid, ids, context):
+        return {
+            'name': "Edit Ean",
+            'type': 'ir.actions.act_window',
+            'view_type': 'form',
+            'view_mode': 'form',
+            'res_model': 'pos.ean_wizard',
+            'target' : 'new',
+            'view_id': False,
+            'context':context,
+        }
+
     _constraints = [
         (_check_ean, "Error: Invalid ean code", ['ean13'],),
     ]
diff --git a/addons/point_of_sale/res_users_view.xml b/addons/point_of_sale/res_users_view.xml
index f561ccf9b80..2a510b1d575 100644
--- a/addons/point_of_sale/res_users_view.xml
+++ b/addons/point_of_sale/res_users_view.xml
@@ -20,8 +20,11 @@
         <field name="arch" type="xml">
             <notebook position="inside">
                 <page string="Point Of Sale">
-                    <field name="ean13" />
-                    <field name="pos_config" />
+                    <group>
+                        <field name="pos_config" />
+                        <field name="ean13" />
+                        <button name="edit_ean" type="object" string="Edit" />
+                    </group>
                 </page>
             </notebook>
         </field>
diff --git a/addons/point_of_sale/security/ir.model.access.csv b/addons/point_of_sale/security/ir.model.access.csv
index 06673fc3da8..74b4bbf5753 100644
--- a/addons/point_of_sale/security/ir.model.access.csv
+++ b/addons/point_of_sale/security/ir.model.access.csv
@@ -60,7 +60,8 @@ access_product_uom_manager,product.uom manager,product.model_product_uom,group_p
 access_res_partner_manager,res.partner manager,base.model_res_partner,group_pos_manager,1,0,0,0
 access_product_category_manager,product.category manager,product.model_product_category,group_pos_manager,1,1,1,1
 access_product_pricelist_manager,product.pricelist manager,product.model_product_pricelist,group_pos_manager,1,0,0,0
-access_product_category_pos_manager,pos.category manager,model_pos_category,group_pos_manager,1,1,1,"1"""
-access_product_category_pos_user,pos.category user,model_pos_category,group_pos_user,1,0,0,"0"""
+access_product_category_pos_manager,pos.category manager,model_pos_category,group_pos_manager,1,1,1,1
+access_product_category_pos_user,pos.category user,model_pos_category,group_pos_user,1,0,0,0
 access_pos_session_user,pos.session user,model_pos_session,group_pos_user,1,1,1,0
 access_pos_config_user,pos.config user,model_pos_config,group_pos_user,1,1,1,0
+access_ir_sequence_manager,ir.sequence manager,base.model_ir_sequence,group_pos_manager,1,1,1,1
diff --git a/addons/point_of_sale/static/lib/backbone/backbone-0.5.3.js b/addons/point_of_sale/static/lib/backbone/backbone-0.5.3.js
deleted file mode 100644
index 8958c798466..00000000000
--- a/addons/point_of_sale/static/lib/backbone/backbone-0.5.3.js
+++ /dev/null
@@ -1,1158 +0,0 @@
-//     Backbone.js 0.5.3
-//     (c) 2010 Jeremy Ashkenas, DocumentCloud Inc.
-//     Backbone may be freely distributed under the MIT license.
-//     For all details and documentation:
-//     http://documentcloud.github.com/backbone
-
-(function(){
-
-  // Initial Setup
-  // -------------
-
-  // Save a reference to the global object.
-  var root = this;
-
-  // Save the previous value of the `Backbone` variable.
-  var previousBackbone = root.Backbone;
-
-  // The top-level namespace. All public Backbone classes and modules will
-  // be attached to this. Exported for both CommonJS and the browser.
-  var Backbone;
-  if (typeof exports !== 'undefined') {
-    Backbone = exports;
-  } else {
-    Backbone = root.Backbone = {};
-  }
-
-  // Current version of the library. Keep in sync with `package.json`.
-  Backbone.VERSION = '0.5.3';
-
-  // Require Underscore, if we're on the server, and it's not already present.
-  var _ = root._;
-  if (!_ && (typeof require !== 'undefined')) _ = require('underscore')._;
-
-  // For Backbone's purposes, jQuery or Zepto owns the `$` variable.
-  var $ = root.jQuery || root.Zepto;
-
-  // Runs Backbone.js in *noConflict* mode, returning the `Backbone` variable
-  // to its previous owner. Returns a reference to this Backbone object.
-  Backbone.noConflict = function() {
-    root.Backbone = previousBackbone;
-    return this;
-  };
-
-  // Turn on `emulateHTTP` to support legacy HTTP servers. Setting this option will
-  // fake `"PUT"` and `"DELETE"` requests via the `_method` parameter and set a
-  // `X-Http-Method-Override` header.
-  Backbone.emulateHTTP = false;
-
-  // Turn on `emulateJSON` to support legacy servers that can't deal with direct
-  // `application/json` requests ... will encode the body as
-  // `application/x-www-form-urlencoded` instead and will send the model in a
-  // form param named `model`.
-  Backbone.emulateJSON = false;
-
-  // Backbone.Events
-  // -----------------
-
-  // A module that can be mixed in to *any object* in order to provide it with
-  // custom events. You may `bind` or `unbind` a callback function to an event;
-  // `trigger`-ing an event fires all callbacks in succession.
-  //
-  //     var object = {};
-  //     _.extend(object, Backbone.Events);
-  //     object.bind('expand', function(){ alert('expanded'); });
-  //     object.trigger('expand');
-  //
-  Backbone.Events = {
-
-    // Bind an event, specified by a string name, `ev`, to a `callback` function.
-    // Passing `"all"` will bind the callback to all events fired.
-    bind : function(ev, callback, context) {
-      var calls = this._callbacks || (this._callbacks = {});
-      var list  = calls[ev] || (calls[ev] = []);
-      list.push([callback, context]);
-      return this;
-    },
-
-    // Remove one or many callbacks. If `callback` is null, removes all
-    // callbacks for the event. If `ev` is null, removes all bound callbacks
-    // for all events.
-    unbind : function(ev, callback) {
-      var calls;
-      if (!ev) {
-        this._callbacks = {};
-      } else if (calls = this._callbacks) {
-        if (!callback) {
-          calls[ev] = [];
-        } else {
-          var list = calls[ev];
-          if (!list) return this;
-          for (var i = 0, l = list.length; i < l; i++) {
-            if (list[i] && callback === list[i][0]) {
-              list[i] = null;
-              break;
-            }
-          }
-        }
-      }
-      return this;
-    },
-
-    // Trigger an event, firing all bound callbacks. Callbacks are passed the
-    // same arguments as `trigger` is, apart from the event name.
-    // Listening for `"all"` passes the true event name as the first argument.
-    trigger : function(eventName) {
-      var list, calls, ev, callback, args;
-      var both = 2;
-      if (!(calls = this._callbacks)) return this;
-      while (both--) {
-        ev = both ? eventName : 'all';
-        if (list = calls[ev]) {
-          for (var i = 0, l = list.length; i < l; i++) {
-            if (!(callback = list[i])) {
-              list.splice(i, 1); i--; l--;
-            } else {
-              args = both ? Array.prototype.slice.call(arguments, 1) : arguments;
-              callback[0].apply(callback[1] || this, args);
-            }
-          }
-        }
-      }
-      return this;
-    }
-
-  };
-
-  // Backbone.Model
-  // --------------
-
-  // Create a new model, with defined attributes. A client id (`cid`)
-  // is automatically generated and assigned for you.
-  Backbone.Model = function(attributes, options) {
-    var defaults;
-    attributes || (attributes = {});
-    if (defaults = this.defaults) {
-      if (_.isFunction(defaults)) defaults = defaults.call(this);
-      attributes = _.extend({}, defaults, attributes);
-    }
-    this.attributes = {};
-    this._escapedAttributes = {};
-    this.cid = _.uniqueId('c');
-    this.set(attributes, {silent : true});
-    this._changed = false;
-    this._previousAttributes = _.clone(this.attributes);
-    if (options && options.collection) this.collection = options.collection;
-    this.initialize(attributes, options);
-  };
-
-  // Attach all inheritable methods to the Model prototype.
-  _.extend(Backbone.Model.prototype, Backbone.Events, {
-
-    // A snapshot of the model's previous attributes, taken immediately
-    // after the last `"change"` event was fired.
-    _previousAttributes : null,
-
-    // Has the item been changed since the last `"change"` event?
-    _changed : false,
-
-    // The default name for the JSON `id` attribute is `"id"`. MongoDB and
-    // CouchDB users may want to set this to `"_id"`.
-    idAttribute : 'id',
-
-    // Initialize is an empty function by default. Override it with your own
-    // initialization logic.
-    initialize : function(){},
-
-    // Return a copy of the model's `attributes` object.
-    toJSON : function() {
-      return _.clone(this.attributes);
-    },
-
-    // Get the value of an attribute.
-    get : function(attr) {
-      return this.attributes[attr];
-    },
-
-    // Get the HTML-escaped value of an attribute.
-    escape : function(attr) {
-      var html;
-      if (html = this._escapedAttributes[attr]) return html;
-      var val = this.attributes[attr];
-      return this._escapedAttributes[attr] = escapeHTML(val == null ? '' : '' + val);
-    },
-
-    // Returns `true` if the attribute contains a value that is not null
-    // or undefined.
-    has : function(attr) {
-      return this.attributes[attr] != null;
-    },
-
-    // Set a hash of model attributes on the object, firing `"change"` unless you
-    // choose to silence it.
-    set : function(attrs, options) {
-
-      // Extract attributes and options.
-      options || (options = {});
-      if (!attrs) return this;
-      if (attrs.attributes) attrs = attrs.attributes;
-      var now = this.attributes, escaped = this._escapedAttributes;
-
-      // Run validation.
-      if (!options.silent && this.validate && !this._performValidation(attrs, options)) return false;
-
-      // Check for changes of `id`.
-      if (this.idAttribute in attrs) this.id = attrs[this.idAttribute];
-
-      // We're about to start triggering change events.
-      var alreadyChanging = this._changing;
-      this._changing = true;
-
-      // Update attributes.
-      for (var attr in attrs) {
-        var val = attrs[attr];
-        if (!_.isEqual(now[attr], val)) {
-          now[attr] = val;
-          delete escaped[attr];
-          this._changed = true;
-          if (!options.silent) this.trigger('change:' + attr, this, val, options);
-        }
-      }
-
-      // Fire the `"change"` event, if the model has been changed.
-      if (!alreadyChanging && !options.silent && this._changed) this.change(options);
-      this._changing = false;
-      return this;
-    },
-
-    // Remove an attribute from the model, firing `"change"` unless you choose
-    // to silence it. `unset` is a noop if the attribute doesn't exist.
-    unset : function(attr, options) {
-      if (!(attr in this.attributes)) return this;
-      options || (options = {});
-      var value = this.attributes[attr];
-
-      // Run validation.
-      var validObj = {};
-      validObj[attr] = void 0;
-      if (!options.silent && this.validate && !this._performValidation(validObj, options)) return false;
-
-      // Remove the attribute.
-      delete this.attributes[attr];
-      delete this._escapedAttributes[attr];
-      if (attr == this.idAttribute) delete this.id;
-      this._changed = true;
-      if (!options.silent) {
-        this.trigger('change:' + attr, this, void 0, options);
-        this.change(options);
-      }
-      return this;
-    },
-
-    // Clear all attributes on the model, firing `"change"` unless you choose
-    // to silence it.
-    clear : function(options) {
-      options || (options = {});
-      var attr;
-      var old = this.attributes;
-
-      // Run validation.
-      var validObj = {};
-      for (attr in old) validObj[attr] = void 0;
-      if (!options.silent && this.validate && !this._performValidation(validObj, options)) return false;
-
-      this.attributes = {};
-      this._escapedAttributes = {};
-      this._changed = true;
-      if (!options.silent) {
-        for (attr in old) {
-          this.trigger('change:' + attr, this, void 0, options);
-        }
-        this.change(options);
-      }
-      return this;
-    },
-
-    // Fetch the model from the server. If the server's representation of the
-    // model differs from its current attributes, they will be overriden,
-    // triggering a `"change"` event.
-    fetch : function(options) {
-      options || (options = {});
-      var model = this;
-      var success = options.success;
-      options.success = function(resp, status, xhr) {
-        if (!model.set(model.parse(resp, xhr), options)) return false;
-        if (success) success(model, resp);
-      };
-      options.error = wrapError(options.error, model, options);
-      return (this.sync || Backbone.sync).call(this, 'read', this, options);
-    },
-
-    // Set a hash of model attributes, and sync the model to the server.
-    // If the server returns an attributes hash that differs, the model's
-    // state will be `set` again.
-    save : function(attrs, options) {
-      options || (options = {});
-      if (attrs && !this.set(attrs, options)) return false;
-      var model = this;
-      var success = options.success;
-      options.success = function(resp, status, xhr) {
-        if (!model.set(model.parse(resp, xhr), options)) return false;
-        if (success) success(model, resp, xhr);
-      };
-      options.error = wrapError(options.error, model, options);
-      var method = this.isNew() ? 'create' : 'update';
-      return (this.sync || Backbone.sync).call(this, method, this, options);
-    },
-
-    // Destroy this model on the server if it was already persisted. Upon success, the model is removed
-    // from its collection, if it has one.
-    destroy : function(options) {
-      options || (options = {});
-      if (this.isNew()) return this.trigger('destroy', this, this.collection, options);
-      var model = this;
-      var success = options.success;
-      options.success = function(resp) {
-        model.trigger('destroy', model, model.collection, options);
-        if (success) success(model, resp);
-      };
-      options.error = wrapError(options.error, model, options);
-      return (this.sync || Backbone.sync).call(this, 'delete', this, options);
-    },
-
-    // Default URL for the model's representation on the server -- if you're
-    // using Backbone's restful methods, override this to change the endpoint
-    // that will be called.
-    url : function() {
-      var base = getUrl(this.collection) || this.urlRoot || urlError();
-      if (this.isNew()) return base;
-      return base + (base.charAt(base.length - 1) == '/' ? '' : '/') + encodeURIComponent(this.id);
-    },
-
-    // **parse** converts a response into the hash of attributes to be `set` on
-    // the model. The default implementation is just to pass the response along.
-    parse : function(resp, xhr) {
-      return resp;
-    },
-
-    // Create a new model with identical attributes to this one.
-    clone : function() {
-      return new this.constructor(this);
-    },
-
-    // A model is new if it has never been saved to the server, and lacks an id.
-    isNew : function() {
-      return this.id == null;
-    },
-
-    // Call this method to manually fire a `change` event for this model.
-    // Calling this will cause all objects observing the model to update.
-    change : function(options) {
-      this.trigger('change', this, options);
-      this._previousAttributes = _.clone(this.attributes);
-      this._changed = false;
-    },
-
-    // Determine if the model has changed since the last `"change"` event.
-    // If you specify an attribute name, determine if that attribute has changed.
-    hasChanged : function(attr) {
-      if (attr) return this._previousAttributes[attr] != this.attributes[attr];
-      return this._changed;
-    },
-
-    // Return an object containing all the attributes that have changed, or false
-    // if there are no changed attributes. Useful for determining what parts of a
-    // view need to be updated and/or what attributes need to be persisted to
-    // the server.
-    changedAttributes : function(now) {
-      now || (now = this.attributes);
-      var old = this._previousAttributes;
-      var changed = false;
-      for (var attr in now) {
-        if (!_.isEqual(old[attr], now[attr])) {
-          changed = changed || {};
-          changed[attr] = now[attr];
-        }
-      }
-      return changed;
-    },
-
-    // Get the previous value of an attribute, recorded at the time the last
-    // `"change"` event was fired.
-    previous : function(attr) {
-      if (!attr || !this._previousAttributes) return null;
-      return this._previousAttributes[attr];
-    },
-
-    // Get all of the attributes of the model at the time of the previous
-    // `"change"` event.
-    previousAttributes : function() {
-      return _.clone(this._previousAttributes);
-    },
-
-    // Run validation against a set of incoming attributes, returning `true`
-    // if all is well. If a specific `error` callback has been passed,
-    // call that instead of firing the general `"error"` event.
-    _performValidation : function(attrs, options) {
-      var error = this.validate(attrs);
-      if (error) {
-        if (options.error) {
-          options.error(this, error, options);
-        } else {
-          this.trigger('error', this, error, options);
-        }
-        return false;
-      }
-      return true;
-    }
-
-  });
-
-  // Backbone.Collection
-  // -------------------
-
-  // Provides a standard collection class for our sets of models, ordered
-  // or unordered. If a `comparator` is specified, the Collection will maintain
-  // its models in sort order, as they're added and removed.
-  Backbone.Collection = function(models, options) {
-    options || (options = {});
-    if (options.comparator) this.comparator = options.comparator;
-    _.bindAll(this, '_onModelEvent', '_removeReference');
-    this._reset();
-    if (models) this.reset(models, {silent: true});
-    this.initialize.apply(this, arguments);
-  };
-
-  // Define the Collection's inheritable methods.
-  _.extend(Backbone.Collection.prototype, Backbone.Events, {
-
-    // The default model for a collection is just a **Backbone.Model**.
-    // This should be overridden in most cases.
-    model : Backbone.Model,
-
-    // Initialize is an empty function by default. Override it with your own
-    // initialization logic.
-    initialize : function(){},
-
-    // The JSON representation of a Collection is an array of the
-    // models' attributes.
-    toJSON : function() {
-      return this.map(function(model){ return model.toJSON(); });
-    },
-
-    // Add a model, or list of models to the set. Pass **silent** to avoid
-    // firing the `added` event for every new model.
-    add : function(models, options) {
-      if (_.isArray(models)) {
-        for (var i = 0, l = models.length; i < l; i++) {
-          this._add(models[i], options);
-        }
-      } else {
-        this._add(models, options);
-      }
-      return this;
-    },
-
-    // Remove a model, or a list of models from the set. Pass silent to avoid
-    // firing the `removed` event for every model removed.
-    remove : function(models, options) {
-      if (_.isArray(models)) {
-        for (var i = 0, l = models.length; i < l; i++) {
-          this._remove(models[i], options);
-        }
-      } else {
-        this._remove(models, options);
-      }
-      return this;
-    },
-
-    // Get a model from the set by id.
-    get : function(id) {
-      if (id == null) return null;
-      return this._byId[id.id != null ? id.id : id];
-    },
-
-    // Get a model from the set by client id.
-    getByCid : function(cid) {
-      return cid && this._byCid[cid.cid || cid];
-    },
-
-    // Get the model at the given index.
-    at: function(index) {
-      return this.models[index];
-    },
-
-    // Force the collection to re-sort itself. You don't need to call this under normal
-    // circumstances, as the set will maintain sort order as each item is added.
-    sort : function(options) {
-      options || (options = {});
-      if (!this.comparator) throw new Error('Cannot sort a set without a comparator');
-      this.models = this.sortBy(this.comparator);
-      if (!options.silent) this.trigger('reset', this, options);
-      return this;
-    },
-
-    // Pluck an attribute from each model in the collection.
-    pluck : function(attr) {
-      return _.map(this.models, function(model){ return model.get(attr); });
-    },
-
-    // When you have more items than you want to add or remove individually,
-    // you can reset the entire set with a new list of models, without firing
-    // any `added` or `removed` events. Fires `reset` when finished.
-    reset : function(models, options) {
-      models  || (models = []);
-      options || (options = {});
-      this.each(this._removeReference);
-      this._reset();
-      this.add(models, {silent: true});
-      if (!options.silent) this.trigger('reset', this, options);
-      return this;
-    },
-
-    // Fetch the default set of models for this collection, resetting the
-    // collection when they arrive. If `add: true` is passed, appends the
-    // models to the collection instead of resetting.
-    fetch : function(options) {
-      options || (options = {});
-      var collection = this;
-      var success = options.success;
-      options.success = function(resp, status, xhr) {
-        collection[options.add ? 'add' : 'reset'](collection.parse(resp, xhr), options);
-        if (success) success(collection, resp);
-      };
-      options.error = wrapError(options.error, collection, options);
-      return (this.sync || Backbone.sync).call(this, 'read', this, options);
-    },
-
-    // Create a new instance of a model in this collection. After the model
-    // has been created on the server, it will be added to the collection.
-    // Returns the model, or 'false' if validation on a new model fails.
-    create : function(model, options) {
-      var coll = this;
-      options || (options = {});
-      model = this._prepareModel(model, options);
-      if (!model) return false;
-      var success = options.success;
-      options.success = function(nextModel, resp, xhr) {
-        coll.add(nextModel, options);
-        if (success) success(nextModel, resp, xhr);
-      };
-      model.save(null, options);
-      return model;
-    },
-
-    // **parse** converts a response into a list of models to be added to the
-    // collection. The default implementation is just to pass it through.
-    parse : function(resp, xhr) {
-      return resp;
-    },
-
-    // Proxy to _'s chain. Can't be proxied the same way the rest of the
-    // underscore methods are proxied because it relies on the underscore
-    // constructor.
-    chain: function () {
-      return _(this.models).chain();
-    },
-
-    // Reset all internal state. Called when the collection is reset.
-    _reset : function(options) {
-      this.length = 0;
-      this.models = [];
-      this._byId  = {};
-      this._byCid = {};
-    },
-
-    // Prepare a model to be added to this collection
-    _prepareModel: function(model, options) {
-      if (!(model instanceof Backbone.Model)) {
-        var attrs = model;
-        model = new this.model(attrs, {collection: this});
-        if (model.validate && !model._performValidation(attrs, options)) model = false;
-      } else if (!model.collection) {
-        model.collection = this;
-      }
-      return model;
-    },
-
-    // Internal implementation of adding a single model to the set, updating
-    // hash indexes for `id` and `cid` lookups.
-    // Returns the model, or 'false' if validation on a new model fails.
-    _add : function(model, options) {
-      options || (options = {});
-      model = this._prepareModel(model, options);
-      if (!model) return false;
-      var already = this.getByCid(model);
-      if (already) throw new Error(["Can't add the same model to a set twice", already.id]);
-      this._byId[model.id] = model;
-      this._byCid[model.cid] = model;
-      var index = options.at != null ? options.at :
-                  this.comparator ? this.sortedIndex(model, this.comparator) :
-                  this.length;
-      this.models.splice(index, 0, model);
-      model.bind('all', this._onModelEvent);
-      this.length++;
-      if (!options.silent) model.trigger('add', model, this, options);
-      return model;
-    },
-
-    // Internal implementation of removing a single model from the set, updating
-    // hash indexes for `id` and `cid` lookups.
-    _remove : function(model, options) {
-      options || (options = {});
-      model = this.getByCid(model) || this.get(model);
-      if (!model) return null;
-      delete this._byId[model.id];
-      delete this._byCid[model.cid];
-      this.models.splice(this.indexOf(model), 1);
-      this.length--;
-      if (!options.silent) model.trigger('remove', model, this, options);
-      this._removeReference(model);
-      return model;
-    },
-
-    // Internal method to remove a model's ties to a collection.
-    _removeReference : function(model) {
-      if (this == model.collection) {
-        delete model.collection;
-      }
-      model.unbind('all', this._onModelEvent);
-    },
-
-    // Internal method called every time a model in the set fires an event.
-    // Sets need to update their indexes when models change ids. All other
-    // events simply proxy through. "add" and "remove" events that originate
-    // in other collections are ignored.
-    _onModelEvent : function(ev, model, collection, options) {
-      if ((ev == 'add' || ev == 'remove') && collection != this) return;
-      if (ev == 'destroy') {
-        this._remove(model, options);
-      }
-      if (model && ev === 'change:' + model.idAttribute) {
-        delete this._byId[model.previous(model.idAttribute)];
-        this._byId[model.id] = model;
-      }
-      this.trigger.apply(this, arguments);
-    }
-
-  });
-
-  // Underscore methods that we want to implement on the Collection.
-  var methods = ['forEach', 'each', 'map', 'reduce', 'reduceRight', 'find', 'detect',
-    'filter', 'select', 'reject', 'every', 'all', 'some', 'any', 'include',
-    'contains', 'invoke', 'max', 'min', 'sortBy', 'sortedIndex', 'toArray', 'size',
-    'first', 'rest', 'last', 'without', 'indexOf', 'lastIndexOf', 'isEmpty', 'groupBy'];
-
-  // Mix in each Underscore method as a proxy to `Collection#models`.
-  _.each(methods, function(method) {
-    Backbone.Collection.prototype[method] = function() {
-      return _[method].apply(_, [this.models].concat(_.toArray(arguments)));
-    };
-  });
-
-  // Backbone.Router
-  // -------------------
-
-  // Routers map faux-URLs to actions, and fire events when routes are
-  // matched. Creating a new one sets its `routes` hash, if not set statically.
-  Backbone.Router = function(options) {
-    options || (options = {});
-    if (options.routes) this.routes = options.routes;
-    this._bindRoutes();
-    this.initialize.apply(this, arguments);
-  };
-
-  // Cached regular expressions for matching named param parts and splatted
-  // parts of route strings.
-  var namedParam    = /:([\w\d]+)/g;
-  var splatParam    = /\*([\w\d]+)/g;
-  var escapeRegExp  = /[-[\]{}()+?.,\\^$|#\s]/g;
-
-  // Set up all inheritable **Backbone.Router** properties and methods.
-  _.extend(Backbone.Router.prototype, Backbone.Events, {
-
-    // Initialize is an empty function by default. Override it with your own
-    // initialization logic.
-    initialize : function(){},
-
-    // Manually bind a single named route to a callback. For example:
-    //
-    //     this.route('search/:query/p:num', 'search', function(query, num) {
-    //       ...
-    //     });
-    //
-    route : function(route, name, callback) {
-      Backbone.history || (Backbone.history = new Backbone.History);
-      if (!_.isRegExp(route)) route = this._routeToRegExp(route);
-      Backbone.history.route(route, _.bind(function(fragment) {
-        var args = this._extractParameters(route, fragment);
-        callback.apply(this, args);
-        this.trigger.apply(this, ['route:' + name].concat(args));
-      }, this));
-    },
-
-    // Simple proxy to `Backbone.history` to save a fragment into the history.
-    navigate : function(fragment, triggerRoute) {
-      Backbone.history.navigate(fragment, triggerRoute);
-    },
-
-    // Bind all defined routes to `Backbone.history`. We have to reverse the
-    // order of the routes here to support behavior where the most general
-    // routes can be defined at the bottom of the route map.
-    _bindRoutes : function() {
-      if (!this.routes) return;
-      var routes = [];
-      for (var route in this.routes) {
-        routes.unshift([route, this.routes[route]]);
-      }
-      for (var i = 0, l = routes.length; i < l; i++) {
-        this.route(routes[i][0], routes[i][1], this[routes[i][1]]);
-      }
-    },
-
-    // Convert a route string into a regular expression, suitable for matching
-    // against the current location hash.
-    _routeToRegExp : function(route) {
-      route = route.replace(escapeRegExp, "\\$&")
-                   .replace(namedParam, "([^\/]*)")
-                   .replace(splatParam, "(.*?)");
-      return new RegExp('^' + route + '$');
-    },
-
-    // Given a route, and a URL fragment that it matches, return the array of
-    // extracted parameters.
-    _extractParameters : function(route, fragment) {
-      return route.exec(fragment).slice(1);
-    }
-
-  });
-
-  // Backbone.History
-  // ----------------
-
-  // Handles cross-browser history management, based on URL fragments. If the
-  // browser does not support `onhashchange`, falls back to polling.
-  Backbone.History = function() {
-    this.handlers = [];
-    _.bindAll(this, 'checkUrl');
-  };
-
-  // Cached regex for cleaning hashes.
-  var hashStrip = /^#*/;
-
-  // Cached regex for detecting MSIE.
-  var isExplorer = /msie [\w.]+/;
-
-  // Has the history handling already been started?
-  var historyStarted = false;
-
-  // Set up all inheritable **Backbone.History** properties and methods.
-  _.extend(Backbone.History.prototype, {
-
-    // The default interval to poll for hash changes, if necessary, is
-    // twenty times a second.
-    interval: 50,
-
-    // Get the cross-browser normalized URL fragment, either from the URL,
-    // the hash, or the override.
-    getFragment : function(fragment, forcePushState) {
-      if (fragment == null) {
-        if (this._hasPushState || forcePushState) {
-          fragment = window.location.pathname;
-          var search = window.location.search;
-          if (search) fragment += search;
-          if (fragment.indexOf(this.options.root) == 0) fragment = fragment.substr(this.options.root.length);
-        } else {
-          fragment = window.location.hash;
-        }
-      }
-      return decodeURIComponent(fragment.replace(hashStrip, ''));
-    },
-
-    // Start the hash change handling, returning `true` if the current URL matches
-    // an existing route, and `false` otherwise.
-    start : function(options) {
-
-      // Figure out the initial configuration. Do we need an iframe?
-      // Is pushState desired ... is it available?
-      if (historyStarted) throw new Error("Backbone.history has already been started");
-      this.options          = _.extend({}, {root: '/'}, this.options, options);
-      this._wantsPushState  = !!this.options.pushState;
-      this._hasPushState    = !!(this.options.pushState && window.history && window.history.pushState);
-      var fragment          = this.getFragment();
-      var docMode           = document.documentMode;
-      var oldIE             = (isExplorer.exec(navigator.userAgent.toLowerCase()) && (!docMode || docMode <= 7));
-      if (oldIE) {
-        this.iframe = $('<iframe src="javascript:0" tabindex="-1" />').hide().appendTo('body')[0].contentWindow;
-        this.navigate(fragment);
-      }
-
-      // Depending on whether we're using pushState or hashes, and whether
-      // 'onhashchange' is supported, determine how we check the URL state.
-      if (this._hasPushState) {
-        $(window).bind('popstate', this.checkUrl);
-      } else if ('onhashchange' in window && !oldIE) {
-        $(window).bind('hashchange', this.checkUrl);
-      } else {
-        setInterval(this.checkUrl, this.interval);
-      }
-
-      // Determine if we need to change the base url, for a pushState link
-      // opened by a non-pushState browser.
-      this.fragment = fragment;
-      historyStarted = true;
-      var loc = window.location;
-      var atRoot  = loc.pathname == this.options.root;
-      if (this._wantsPushState && !this._hasPushState && !atRoot) {
-        this.fragment = this.getFragment(null, true);
-        window.location.replace(this.options.root + '#' + this.fragment);
-        // Return immediately as browser will do redirect to new url
-        return true;
-      } else if (this._wantsPushState && this._hasPushState && atRoot && loc.hash) {
-        this.fragment = loc.hash.replace(hashStrip, '');
-        window.history.replaceState({}, document.title, loc.protocol + '//' + loc.host + this.options.root + this.fragment);
-      }
-
-      if (!this.options.silent) {
-        return this.loadUrl();
-      }
-    },
-
-    // Add a route to be tested when the fragment changes. Routes added later may
-    // override previous routes.
-    route : function(route, callback) {
-      this.handlers.unshift({route : route, callback : callback});
-    },
-
-    // Checks the current URL to see if it has changed, and if it has,
-    // calls `loadUrl`, normalizing across the hidden iframe.
-    checkUrl : function(e) {
-      var current = this.getFragment();
-      if (current == this.fragment && this.iframe) current = this.getFragment(this.iframe.location.hash);
-      if (current == this.fragment || current == decodeURIComponent(this.fragment)) return false;
-      if (this.iframe) this.navigate(current);
-      this.loadUrl() || this.loadUrl(window.location.hash);
-    },
-
-    // Attempt to load the current URL fragment. If a route succeeds with a
-    // match, returns `true`. If no defined routes matches the fragment,
-    // returns `false`.
-    loadUrl : function(fragmentOverride) {
-      var fragment = this.fragment = this.getFragment(fragmentOverride);
-      var matched = _.any(this.handlers, function(handler) {
-        if (handler.route.test(fragment)) {
-          handler.callback(fragment);
-          return true;
-        }
-      });
-      return matched;
-    },
-
-    // Save a fragment into the hash history. You are responsible for properly
-    // URL-encoding the fragment in advance. This does not trigger
-    // a `hashchange` event.
-    navigate : function(fragment, triggerRoute) {
-      var frag = (fragment || '').replace(hashStrip, '');
-      if (this.fragment == frag || this.fragment == decodeURIComponent(frag)) return;
-      if (this._hasPushState) {
-        var loc = window.location;
-        if (frag.indexOf(this.options.root) != 0) frag = this.options.root + frag;
-        this.fragment = frag;
-        window.history.pushState({}, document.title, loc.protocol + '//' + loc.host + frag);
-      } else {
-        window.location.hash = this.fragment = frag;
-        if (this.iframe && (frag != this.getFragment(this.iframe.location.hash))) {
-          this.iframe.document.open().close();
-          this.iframe.location.hash = frag;
-        }
-      }
-      if (triggerRoute) this.loadUrl(fragment);
-    }
-
-  });
-
-  // Backbone.View
-  // -------------
-
-  // Creating a Backbone.View creates its initial element outside of the DOM,
-  // if an existing element is not provided...
-  Backbone.View = function(options) {
-    this.cid = _.uniqueId('view');
-    this._configure(options || {});
-    this._ensureElement();
-    this.delegateEvents();
-    this.initialize.apply(this, arguments);
-  };
-
-  // Element lookup, scoped to DOM elements within the current view.
-  // This should be prefered to global lookups, if you're dealing with
-  // a specific view.
-  var selectorDelegate = function(selector) {
-    return $(selector, this.el);
-  };
-
-  // Cached regex to split keys for `delegate`.
-  var eventSplitter = /^(\S+)\s*(.*)$/;
-
-  // List of view options to be merged as properties.
-  var viewOptions = ['model', 'collection', 'el', 'id', 'attributes', 'className', 'tagName'];
-
-  // Set up all inheritable **Backbone.View** properties and methods.
-  _.extend(Backbone.View.prototype, Backbone.Events, {
-
-    // The default `tagName` of a View's element is `"div"`.
-    tagName : 'div',
-
-    // Attach the `selectorDelegate` function as the `$` property.
-    $       : selectorDelegate,
-
-    // Initialize is an empty function by default. Override it with your own
-    // initialization logic.
-    initialize : function(){},
-
-    // **render** is the core function that your view should override, in order
-    // to populate its element (`this.el`), with the appropriate HTML. The
-    // convention is for **render** to always return `this`.
-    render : function() {
-      return this;
-    },
-
-    // Remove this view from the DOM. Note that the view isn't present in the
-    // DOM by default, so calling this method may be a no-op.
-    remove : function() {
-      $(this.el).remove();
-      return this;
-    },
-
-    // For small amounts of DOM Elements, where a full-blown template isn't
-    // needed, use **make** to manufacture elements, one at a time.
-    //
-    //     var el = this.make('li', {'class': 'row'}, this.model.escape('title'));
-    //
-    make : function(tagName, attributes, content) {
-      var el = document.createElement(tagName);
-      if (attributes) $(el).attr(attributes);
-      if (content) $(el).html(content);
-      return el;
-    },
-
-    // Set callbacks, where `this.callbacks` is a hash of
-    //
-    // *{"event selector": "callback"}*
-    //
-    //     {
-    //       'mousedown .title':  'edit',
-    //       'click .button':     'save'
-    //     }
-    //
-    // pairs. Callbacks will be bound to the view, with `this` set properly.
-    // Uses event delegation for efficiency.
-    // Omitting the selector binds the event to `this.el`.
-    // This only works for delegate-able events: not `focus`, `blur`, and
-    // not `change`, `submit`, and `reset` in Internet Explorer.
-    delegateEvents : function(events) {
-      if (!(events || (events = this.events))) return;
-      if (_.isFunction(events)) events = events.call(this);
-      $(this.el).unbind('.delegateEvents' + this.cid);
-      for (var key in events) {
-        var method = this[events[key]];
-        if (!method) throw new Error('Event "' + events[key] + '" does not exist');
-        var match = key.match(eventSplitter);
-        var eventName = match[1], selector = match[2];
-        method = _.bind(method, this);
-        eventName += '.delegateEvents' + this.cid;
-        if (selector === '') {
-          $(this.el).bind(eventName, method);
-        } else {
-          $(this.el).delegate(selector, eventName, method);
-        }
-      }
-    },
-
-    // Performs the initial configuration of a View with a set of options.
-    // Keys with special meaning *(model, collection, id, className)*, are
-    // attached directly to the view.
-    _configure : function(options) {
-      if (this.options) options = _.extend({}, this.options, options);
-      for (var i = 0, l = viewOptions.length; i < l; i++) {
-        var attr = viewOptions[i];
-        if (options[attr]) this[attr] = options[attr];
-      }
-      this.options = options;
-    },
-
-    // Ensure that the View has a DOM element to render into.
-    // If `this.el` is a string, pass it through `$()`, take the first
-    // matching element, and re-assign it to `el`. Otherwise, create
-    // an element from the `id`, `className` and `tagName` proeprties.
-    _ensureElement : function() {
-      if (!this.el) {
-        var attrs = this.attributes || {};
-        if (this.id) attrs.id = this.id;
-        if (this.className) attrs['class'] = this.className;
-        this.el = this.make(this.tagName, attrs);
-      } else if (_.isString(this.el)) {
-        this.el = $(this.el).get(0);
-      }
-    }
-
-  });
-
-  // The self-propagating extend function that Backbone classes use.
-  var extend = function (protoProps, classProps) {
-    var child = inherits(this, protoProps, classProps);
-    child.extend = this.extend;
-    return child;
-  };
-
-  // Set up inheritance for the model, collection, and view.
-  Backbone.Model.extend = Backbone.Collection.extend =
-    Backbone.Router.extend = Backbone.View.extend = extend;
-
-  // Map from CRUD to HTTP for our default `Backbone.sync` implementation.
-  var methodMap = {
-    'create': 'POST',
-    'update': 'PUT',
-    'delete': 'DELETE',
-    'read'  : 'GET'
-  };
-
-  // Backbone.sync
-  // -------------
-
-  // Override this function to change the manner in which Backbone persists
-  // models to the server. You will be passed the type of request, and the
-  // model in question. By default, uses makes a RESTful Ajax request
-  // to the model's `url()`. Some possible customizations could be:
-  //
-  // * Use `setTimeout` to batch rapid-fire updates into a single request.
-  // * Send up the models as XML instead of JSON.
-  // * Persist models via WebSockets instead of Ajax.
-  //
-  // Turn on `Backbone.emulateHTTP` in order to send `PUT` and `DELETE` requests
-  // as `POST`, with a `_method` parameter containing the true HTTP method,
-  // as well as all requests with the body as `application/x-www-form-urlencoded` instead of
-  // `application/json` with the model in a param named `model`.
-  // Useful when interfacing with server-side languages like **PHP** that make
-  // it difficult to read the body of `PUT` requests.
-  Backbone.sync = function(method, model, options) {
-    var type = methodMap[method];
-
-    // Default JSON-request options.
-    var params = _.extend({
-      type:         type,
-      dataType:     'json'
-    }, options);
-
-    // Ensure that we have a URL.
-    if (!params.url) {
-      params.url = getUrl(model) || urlError();
-    }
-
-    // Ensure that we have the appropriate request data.
-    if (!params.data && model && (method == 'create' || method == 'update')) {
-      params.contentType = 'application/json';
-      params.data = JSON.stringify(model.toJSON());
-    }
-
-    // For older servers, emulate JSON by encoding the request into an HTML-form.
-    if (Backbone.emulateJSON) {
-      params.contentType = 'application/x-www-form-urlencoded';
-      params.data        = params.data ? {model : params.data} : {};
-    }
-
-    // For older servers, emulate HTTP by mimicking the HTTP method with `_method`
-    // And an `X-HTTP-Method-Override` header.
-    if (Backbone.emulateHTTP) {
-      if (type === 'PUT' || type === 'DELETE') {
-        if (Backbone.emulateJSON) params.data._method = type;
-        params.type = 'POST';
-        params.beforeSend = function(xhr) {
-          xhr.setRequestHeader('X-HTTP-Method-Override', type);
-        };
-      }
-    }
-
-    // Don't process data on a non-GET request.
-    if (params.type !== 'GET' && !Backbone.emulateJSON) {
-      params.processData = false;
-    }
-
-    // Make the request.
-    return $.ajax(params);
-  };
-
-  // Helpers
-  // -------
-
-  // Shared empty constructor function to aid in prototype-chain creation.
-  var ctor = function(){};
-
-  // Helper function to correctly set up the prototype chain, for subclasses.
-  // Similar to `goog.inherits`, but uses a hash of prototype properties and
-  // class properties to be extended.
-  var inherits = function(parent, protoProps, staticProps) {
-    var child;
-
-    // The constructor function for the new subclass is either defined by you
-    // (the "constructor" property in your `extend` definition), or defaulted
-    // by us to simply call `super()`.
-    if (protoProps && protoProps.hasOwnProperty('constructor')) {
-      child = protoProps.constructor;
-    } else {
-      child = function(){ return parent.apply(this, arguments); };
-    }
-
-    // Inherit class (static) properties from parent.
-    _.extend(child, parent);
-
-    // Set the prototype chain to inherit from `parent`, without calling
-    // `parent`'s constructor function.
-    ctor.prototype = parent.prototype;
-    child.prototype = new ctor();
-
-    // Add prototype properties (instance properties) to the subclass,
-    // if supplied.
-    if (protoProps) _.extend(child.prototype, protoProps);
-
-    // Add static properties to the constructor function, if supplied.
-    if (staticProps) _.extend(child, staticProps);
-
-    // Correctly set child's `prototype.constructor`.
-    child.prototype.constructor = child;
-
-    // Set a convenience property in case the parent's prototype is needed later.
-    child.__super__ = parent.prototype;
-
-    return child;
-  };
-
-  // Helper function to get a URL from a Model or Collection as a property
-  // or as a function.
-  var getUrl = function(object) {
-    if (!(object && object.url)) return null;
-    return _.isFunction(object.url) ? object.url() : object.url;
-  };
-
-  // Throw an error when a URL is needed, and none is supplied.
-  var urlError = function() {
-    throw new Error('A "url" property or function must be specified');
-  };
-
-  // Wrap an optional error callback with a fallback error event.
-  var wrapError = function(onError, model, options) {
-    return function(resp) {
-      if (onError) {
-        onError(model, resp, options);
-      } else {
-        model.trigger('error', model, resp, options);
-      }
-    };
-  };
-
-  // Helper function to escape a string for HTML rendering.
-  var escapeHTML = function(string) {
-    return string.replace(/&(?!\w+;|#\d+;|#x[\da-f]+;)/gi, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;').replace(/"/g, '&quot;').replace(/'/g, '&#x27;').replace(/\//g,'&#x2F;');
-  };
-
-}).call(this);
\ No newline at end of file
diff --git a/addons/point_of_sale/static/lib/backbone/backbone-0.9.2.js b/addons/point_of_sale/static/lib/backbone/backbone-0.9.2.js
deleted file mode 100644
index 3373c952bfa..00000000000
--- a/addons/point_of_sale/static/lib/backbone/backbone-0.9.2.js
+++ /dev/null
@@ -1,1431 +0,0 @@
-//     Backbone.js 0.9.2
-
-//     (c) 2010-2012 Jeremy Ashkenas, DocumentCloud Inc.
-//     Backbone may be freely distributed under the MIT license.
-//     For all details and documentation:
-//     http://backbonejs.org
-
-(function(){
-
-  // Initial Setup
-  // -------------
-
-  // Save a reference to the global object (`window` in the browser, `global`
-  // on the server).
-  var root = this;
-
-  // Save the previous value of the `Backbone` variable, so that it can be
-  // restored later on, if `noConflict` is used.
-  var previousBackbone = root.Backbone;
-
-  // Create a local reference to slice/splice.
-  var slice = Array.prototype.slice;
-  var splice = Array.prototype.splice;
-
-  // The top-level namespace. All public Backbone classes and modules will
-  // be attached to this. Exported for both CommonJS and the browser.
-  var Backbone;
-  if (typeof exports !== 'undefined') {
-    Backbone = exports;
-  } else {
-    Backbone = root.Backbone = {};
-  }
-
-  // Current version of the library. Keep in sync with `package.json`.
-  Backbone.VERSION = '0.9.2';
-
-  // Require Underscore, if we're on the server, and it's not already present.
-  var _ = root._;
-  if (!_ && (typeof require !== 'undefined')) _ = require('underscore');
-
-  // For Backbone's purposes, jQuery, Zepto, or Ender owns the `$` variable.
-  var $ = root.jQuery || root.Zepto || root.ender;
-
-  // Set the JavaScript library that will be used for DOM manipulation and
-  // Ajax calls (a.k.a. the `$` variable). By default Backbone will use: jQuery,
-  // Zepto, or Ender; but the `setDomLibrary()` method lets you inject an
-  // alternate JavaScript library (or a mock library for testing your views
-  // outside of a browser).
-  Backbone.setDomLibrary = function(lib) {
-    $ = lib;
-  };
-
-  // Runs Backbone.js in *noConflict* mode, returning the `Backbone` variable
-  // to its previous owner. Returns a reference to this Backbone object.
-  Backbone.noConflict = function() {
-    root.Backbone = previousBackbone;
-    return this;
-  };
-
-  // Turn on `emulateHTTP` to support legacy HTTP servers. Setting this option
-  // will fake `"PUT"` and `"DELETE"` requests via the `_method` parameter and
-  // set a `X-Http-Method-Override` header.
-  Backbone.emulateHTTP = false;
-
-  // Turn on `emulateJSON` to support legacy servers that can't deal with direct
-  // `application/json` requests ... will encode the body as
-  // `application/x-www-form-urlencoded` instead and will send the model in a
-  // form param named `model`.
-  Backbone.emulateJSON = false;
-
-  // Backbone.Events
-  // -----------------
-
-  // Regular expression used to split event strings
-  var eventSplitter = /\s+/;
-
-  // A module that can be mixed in to *any object* in order to provide it with
-  // custom events. You may bind with `on` or remove with `off` callback functions
-  // to an event; trigger`-ing an event fires all callbacks in succession.
-  //
-  //     var object = {};
-  //     _.extend(object, Backbone.Events);
-  //     object.on('expand', function(){ alert('expanded'); });
-  //     object.trigger('expand');
-  //
-  var Events = Backbone.Events = {
-
-    // Bind one or more space separated events, `events`, to a `callback`
-    // function. Passing `"all"` will bind the callback to all events fired.
-    on: function(events, callback, context) {
-
-      var calls, event, node, tail, list;
-      if (!callback) return this;
-      events = events.split(eventSplitter);
-      calls = this._callbacks || (this._callbacks = {});
-
-      // Create an immutable callback list, allowing traversal during
-      // modification.  The tail is an empty object that will always be used
-      // as the next node.
-      while (event = events.shift()) {
-        list = calls[event];
-        node = list ? list.tail : {};
-        node.next = tail = {};
-        node.context = context;
-        node.callback = callback;
-        calls[event] = {tail: tail, next: list ? list.next : node};
-      }
-
-      return this;
-    },
-
-    // Remove one or many callbacks. If `context` is null, removes all callbacks
-    // with that function. If `callback` is null, removes all callbacks for the
-    // event. If `events` is null, removes all bound callbacks for all events.
-    off: function(events, callback, context) {
-      var event, calls, node, tail, cb, ctx;
-
-      // No events, or removing *all* events.
-      if (!(calls = this._callbacks)) return;
-      if (!(events || callback || context)) {
-        delete this._callbacks;
-        return this;
-      }
-
-      // Loop through the listed events and contexts, splicing them out of the
-      // linked list of callbacks if appropriate.
-      events = events ? events.split(eventSplitter) : _.keys(calls);
-      while (event = events.shift()) {
-        node = calls[event];
-        delete calls[event];
-        if (!node || !(callback || context)) continue;
-        // Create a new list, omitting the indicated callbacks.
-        tail = node.tail;
-        while ((node = node.next) !== tail) {
-          cb = node.callback;
-          ctx = node.context;
-          if ((callback && cb !== callback) || (context && ctx !== context)) {
-            this.on(event, cb, ctx);
-          }
-        }
-      }
-
-      return this;
-    },
-
-    // Trigger one or many events, firing all bound callbacks. Callbacks are
-    // passed the same arguments as `trigger` is, apart from the event name
-    // (unless you're listening on `"all"`, which will cause your callback to
-    // receive the true name of the event as the first argument).
-    trigger: function(events) {
-      var event, node, calls, tail, args, all, rest;
-      if (!(calls = this._callbacks)) return this;
-      all = calls.all;
-      events = events.split(eventSplitter);
-      rest = slice.call(arguments, 1);
-
-      // For each event, walk through the linked list of callbacks twice,
-      // first to trigger the event, then to trigger any `"all"` callbacks.
-      while (event = events.shift()) {
-        if (node = calls[event]) {
-          tail = node.tail;
-          while ((node = node.next) !== tail) {
-            node.callback.apply(node.context || this, rest);
-          }
-        }
-        if (node = all) {
-          tail = node.tail;
-          args = [event].concat(rest);
-          while ((node = node.next) !== tail) {
-            node.callback.apply(node.context || this, args);
-          }
-        }
-      }
-
-      return this;
-    }
-
-  };
-
-  // Aliases for backwards compatibility.
-  Events.bind   = Events.on;
-  Events.unbind = Events.off;
-
-  // Backbone.Model
-  // --------------
-
-  // Create a new model, with defined attributes. A client id (`cid`)
-  // is automatically generated and assigned for you.
-  var Model = Backbone.Model = function(attributes, options) {
-    var defaults;
-    attributes || (attributes = {});
-    if (options && options.parse) attributes = this.parse(attributes);
-    if (defaults = getValue(this, 'defaults')) {
-      attributes = _.extend({}, defaults, attributes);
-    }
-    if (options && options.collection) this.collection = options.collection;
-    this.attributes = {};
-    this._escapedAttributes = {};
-    this.cid = _.uniqueId('c');
-    this.changed = {};
-    this._silent = {};
-    this._pending = {};
-    this.set(attributes, {silent: true});
-    // Reset change tracking.
-    this.changed = {};
-    this._silent = {};
-    this._pending = {};
-    this._previousAttributes = _.clone(this.attributes);
-    this.initialize.apply(this, arguments);
-  };
-
-  // Attach all inheritable methods to the Model prototype.
-  _.extend(Model.prototype, Events, {
-
-    // A hash of attributes whose current and previous value differ.
-    changed: null,
-
-    // A hash of attributes that have silently changed since the last time
-    // `change` was called.  Will become pending attributes on the next call.
-    _silent: null,
-
-    // A hash of attributes that have changed since the last `'change'` event
-    // began.
-    _pending: null,
-
-    // The default name for the JSON `id` attribute is `"id"`. MongoDB and
-    // CouchDB users may want to set this to `"_id"`.
-    idAttribute: 'id',
-
-    // Initialize is an empty function by default. Override it with your own
-    // initialization logic.
-    initialize: function(){},
-
-    // Return a copy of the model's `attributes` object.
-    toJSON: function(options) {
-      return _.clone(this.attributes);
-    },
-
-    // Get the value of an attribute.
-    get: function(attr) {
-      return this.attributes[attr];
-    },
-
-    // Get the HTML-escaped value of an attribute.
-    escape: function(attr) {
-      var html;
-      if (html = this._escapedAttributes[attr]) return html;
-      var val = this.get(attr);
-      return this._escapedAttributes[attr] = _.escape(val == null ? '' : '' + val);
-    },
-
-    // Returns `true` if the attribute contains a value that is not null
-    // or undefined.
-    has: function(attr) {
-      return this.get(attr) != null;
-    },
-
-    // Set a hash of model attributes on the object, firing `"change"` unless
-    // you choose to silence it.
-    set: function(key, value, options) {
-      var attrs, attr, val;
-
-      // Handle both `"key", value` and `{key: value}` -style arguments.
-      if (_.isObject(key) || key == null) {
-        attrs = key;
-        options = value;
-      } else {
-        attrs = {};
-        attrs[key] = value;
-      }
-
-      // Extract attributes and options.
-      options || (options = {});
-      if (!attrs) return this;
-      if (attrs instanceof Model) attrs = attrs.attributes;
-      if (options.unset) for (attr in attrs) attrs[attr] = void 0;
-
-      // Run validation.
-      if (!this._validate(attrs, options)) return false;
-
-      // Check for changes of `id`.
-      if (this.idAttribute in attrs) this.id = attrs[this.idAttribute];
-
-      var changes = options.changes = {};
-      var now = this.attributes;
-      var escaped = this._escapedAttributes;
-      var prev = this._previousAttributes || {};
-
-      // For each `set` attribute...
-      for (attr in attrs) {
-        val = attrs[attr];
-
-        // If the new and current value differ, record the change.
-        if (!_.isEqual(now[attr], val) || (options.unset && _.has(now, attr))) {
-          delete escaped[attr];
-          (options.silent ? this._silent : changes)[attr] = true;
-        }
-
-        // Update or delete the current value.
-        options.unset ? delete now[attr] : now[attr] = val;
-
-        // If the new and previous value differ, record the change.  If not,
-        // then remove changes for this attribute.
-        if (!_.isEqual(prev[attr], val) || (_.has(now, attr) != _.has(prev, attr))) {
-          this.changed[attr] = val;
-          if (!options.silent) this._pending[attr] = true;
-        } else {
-          delete this.changed[attr];
-          delete this._pending[attr];
-        }
-      }
-
-      // Fire the `"change"` events.
-      if (!options.silent) this.change(options);
-      return this;
-    },
-
-    // Remove an attribute from the model, firing `"change"` unless you choose
-    // to silence it. `unset` is a noop if the attribute doesn't exist.
-    unset: function(attr, options) {
-      (options || (options = {})).unset = true;
-      return this.set(attr, null, options);
-    },
-
-    // Clear all attributes on the model, firing `"change"` unless you choose
-    // to silence it.
-    clear: function(options) {
-      (options || (options = {})).unset = true;
-      return this.set(_.clone(this.attributes), options);
-    },
-
-    // Fetch the model from the server. If the server's representation of the
-    // model differs from its current attributes, they will be overriden,
-    // triggering a `"change"` event.
-    fetch: function(options) {
-      options = options ? _.clone(options) : {};
-      var model = this;
-      var success = options.success;
-      options.success = function(resp, status, xhr) {
-        if (!model.set(model.parse(resp, xhr), options)) return false;
-        if (success) success(model, resp);
-      };
-      options.error = Backbone.wrapError(options.error, model, options);
-      return (this.sync || Backbone.sync).call(this, 'read', this, options);
-    },
-
-    // Set a hash of model attributes, and sync the model to the server.
-    // If the server returns an attributes hash that differs, the model's
-    // state will be `set` again.
-    save: function(key, value, options) {
-      var attrs, current;
-
-      // Handle both `("key", value)` and `({key: value})` -style calls.
-      if (_.isObject(key) || key == null) {
-        attrs = key;
-        options = value;
-      } else {
-        attrs = {};
-        attrs[key] = value;
-      }
-      options = options ? _.clone(options) : {};
-
-      // If we're "wait"-ing to set changed attributes, validate early.
-      if (options.wait) {
-        if (!this._validate(attrs, options)) return false;
-        current = _.clone(this.attributes);
-      }
-
-      // Regular saves `set` attributes before persisting to the server.
-      var silentOptions = _.extend({}, options, {silent: true});
-      if (attrs && !this.set(attrs, options.wait ? silentOptions : options)) {
-        return false;
-      }
-
-      // After a successful server-side save, the client is (optionally)
-      // updated with the server-side state.
-      var model = this;
-      var success = options.success;
-      options.success = function(resp, status, xhr) {
-        var serverAttrs = model.parse(resp, xhr);
-        if (options.wait) {
-          delete options.wait;
-          serverAttrs = _.extend(attrs || {}, serverAttrs);
-        }
-        if (!model.set(serverAttrs, options)) return false;
-        if (success) {
-          success(model, resp);
-        } else {
-          model.trigger('sync', model, resp, options);
-        }
-      };
-
-      // Finish configuring and sending the Ajax request.
-      options.error = Backbone.wrapError(options.error, model, options);
-      var method = this.isNew() ? 'create' : 'update';
-      var xhr = (this.sync || Backbone.sync).call(this, method, this, options);
-      if (options.wait) this.set(current, silentOptions);
-      return xhr;
-    },
-
-    // Destroy this model on the server if it was already persisted.
-    // Optimistically removes the model from its collection, if it has one.
-    // If `wait: true` is passed, waits for the server to respond before removal.
-    destroy: function(options) {
-      options = options ? _.clone(options) : {};
-      var model = this;
-      var success = options.success;
-
-      var triggerDestroy = function() {
-        model.trigger('destroy', model, model.collection, options);
-      };
-
-      if (this.isNew()) {
-        triggerDestroy();
-        return false;
-      }
-
-      options.success = function(resp) {
-        if (options.wait) triggerDestroy();
-        if (success) {
-          success(model, resp);
-        } else {
-          model.trigger('sync', model, resp, options);
-        }
-      };
-
-      options.error = Backbone.wrapError(options.error, model, options);
-      var xhr = (this.sync || Backbone.sync).call(this, 'delete', this, options);
-      if (!options.wait) triggerDestroy();
-      return xhr;
-    },
-
-    // Default URL for the model's representation on the server -- if you're
-    // using Backbone's restful methods, override this to change the endpoint
-    // that will be called.
-    url: function() {
-      var base = getValue(this, 'urlRoot') || getValue(this.collection, 'url') || urlError();
-      if (this.isNew()) return base;
-      return base + (base.charAt(base.length - 1) == '/' ? '' : '/') + encodeURIComponent(this.id);
-    },
-
-    // **parse** converts a response into the hash of attributes to be `set` on
-    // the model. The default implementation is just to pass the response along.
-    parse: function(resp, xhr) {
-      return resp;
-    },
-
-    // Create a new model with identical attributes to this one.
-    clone: function() {
-      return new this.constructor(this.attributes);
-    },
-
-    // A model is new if it has never been saved to the server, and lacks an id.
-    isNew: function() {
-      return this.id == null;
-    },
-
-    // Call this method to manually fire a `"change"` event for this model and
-    // a `"change:attribute"` event for each changed attribute.
-    // Calling this will cause all objects observing the model to update.
-    change: function(options) {
-      options || (options = {});
-      var changing = this._changing;
-      this._changing = true;
-
-      // Silent changes become pending changes.
-      for (var attr in this._silent) this._pending[attr] = true;
-
-      // Silent changes are triggered.
-      var changes = _.extend({}, options.changes, this._silent);
-      this._silent = {};
-      for (var attr in changes) {
-        this.trigger('change:' + attr, this, this.get(attr), options);
-      }
-      if (changing) return this;
-
-      // Continue firing `"change"` events while there are pending changes.
-      while (!_.isEmpty(this._pending)) {
-        this._pending = {};
-        this.trigger('change', this, options);
-        // Pending and silent changes still remain.
-        for (var attr in this.changed) {
-          if (this._pending[attr] || this._silent[attr]) continue;
-          delete this.changed[attr];
-        }
-        this._previousAttributes = _.clone(this.attributes);
-      }
-
-      this._changing = false;
-      return this;
-    },
-
-    // Determine if the model has changed since the last `"change"` event.
-    // If you specify an attribute name, determine if that attribute has changed.
-    hasChanged: function(attr) {
-      if (!arguments.length) return !_.isEmpty(this.changed);
-      return _.has(this.changed, attr);
-    },
-
-    // Return an object containing all the attributes that have changed, or
-    // false if there are no changed attributes. Useful for determining what
-    // parts of a view need to be updated and/or what attributes need to be
-    // persisted to the server. Unset attributes will be set to undefined.
-    // You can also pass an attributes object to diff against the model,
-    // determining if there *would be* a change.
-    changedAttributes: function(diff) {
-      if (!diff) return this.hasChanged() ? _.clone(this.changed) : false;
-      var val, changed = false, old = this._previousAttributes;
-      for (var attr in diff) {
-        if (_.isEqual(old[attr], (val = diff[attr]))) continue;
-        (changed || (changed = {}))[attr] = val;
-      }
-      return changed;
-    },
-
-    // Get the previous value of an attribute, recorded at the time the last
-    // `"change"` event was fired.
-    previous: function(attr) {
-      if (!arguments.length || !this._previousAttributes) return null;
-      return this._previousAttributes[attr];
-    },
-
-    // Get all of the attributes of the model at the time of the previous
-    // `"change"` event.
-    previousAttributes: function() {
-      return _.clone(this._previousAttributes);
-    },
-
-    // Check if the model is currently in a valid state. It's only possible to
-    // get into an *invalid* state if you're using silent changes.
-    isValid: function() {
-      return !this.validate(this.attributes);
-    },
-
-    // Run validation against the next complete set of model attributes,
-    // returning `true` if all is well. If a specific `error` callback has
-    // been passed, call that instead of firing the general `"error"` event.
-    _validate: function(attrs, options) {
-      if (options.silent || !this.validate) return true;
-      attrs = _.extend({}, this.attributes, attrs);
-      var error = this.validate(attrs, options);
-      if (!error) return true;
-      if (options && options.error) {
-        options.error(this, error, options);
-      } else {
-        this.trigger('error', this, error, options);
-      }
-      return false;
-    }
-
-  });
-
-  // Backbone.Collection
-  // -------------------
-
-  // Provides a standard collection class for our sets of models, ordered
-  // or unordered. If a `comparator` is specified, the Collection will maintain
-  // its models in sort order, as they're added and removed.
-  var Collection = Backbone.Collection = function(models, options) {
-    options || (options = {});
-    if (options.model) this.model = options.model;
-    if (options.comparator) this.comparator = options.comparator;
-    this._reset();
-    this.initialize.apply(this, arguments);
-    if (models) this.reset(models, {silent: true, parse: options.parse});
-  };
-
-  // Define the Collection's inheritable methods.
-  _.extend(Collection.prototype, Events, {
-
-    // The default model for a collection is just a **Backbone.Model**.
-    // This should be overridden in most cases.
-    model: Model,
-
-    // Initialize is an empty function by default. Override it with your own
-    // initialization logic.
-    initialize: function(){},
-
-    // The JSON representation of a Collection is an array of the
-    // models' attributes.
-    toJSON: function(options) {
-      return this.map(function(model){ return model.toJSON(options); });
-    },
-
-    // Add a model, or list of models to the set. Pass **silent** to avoid
-    // firing the `add` event for every new model.
-    add: function(models, options) {
-      var i, index, length, model, cid, id, cids = {}, ids = {}, dups = [];
-      options || (options = {});
-      models = _.isArray(models) ? models.slice() : [models];
-
-      // Begin by turning bare objects into model references, and preventing
-      // invalid models or duplicate models from being added.
-      for (i = 0, length = models.length; i < length; i++) {
-        if (!(model = models[i] = this._prepareModel(models[i], options))) {
-          throw new Error("Can't add an invalid model to a collection");
-        }
-        cid = model.cid;
-        id = model.id;
-        if (cids[cid] || this._byCid[cid] || ((id != null) && (ids[id] || this._byId[id]))) {
-          dups.push(i);
-          continue;
-        }
-        cids[cid] = ids[id] = model;
-      }
-
-      // Remove duplicates.
-      i = dups.length;
-      while (i--) {
-        models.splice(dups[i], 1);
-      }
-
-      // Listen to added models' events, and index models for lookup by
-      // `id` and by `cid`.
-      for (i = 0, length = models.length; i < length; i++) {
-        (model = models[i]).on('all', this._onModelEvent, this);
-        this._byCid[model.cid] = model;
-        if (model.id != null) this._byId[model.id] = model;
-      }
-
-      // Insert models into the collection, re-sorting if needed, and triggering
-      // `add` events unless silenced.
-      this.length += length;
-      index = options.at != null ? options.at : this.models.length;
-      splice.apply(this.models, [index, 0].concat(models));
-      if (this.comparator) this.sort({silent: true});
-      if (options.silent) return this;
-      for (i = 0, length = this.models.length; i < length; i++) {
-        if (!cids[(model = this.models[i]).cid]) continue;
-        options.index = i;
-        model.trigger('add', model, this, options);
-      }
-      return this;
-    },
-
-    // Remove a model, or a list of models from the set. Pass silent to avoid
-    // firing the `remove` event for every model removed.
-    remove: function(models, options) {
-      var i, l, index, model;
-      options || (options = {});
-      models = _.isArray(models) ? models.slice() : [models];
-      for (i = 0, l = models.length; i < l; i++) {
-        model = this.getByCid(models[i]) || this.get(models[i]);
-        if (!model) continue;
-        delete this._byId[model.id];
-        delete this._byCid[model.cid];
-        index = this.indexOf(model);
-        this.models.splice(index, 1);
-        this.length--;
-        if (!options.silent) {
-          options.index = index;
-          model.trigger('remove', model, this, options);
-        }
-        this._removeReference(model);
-      }
-      return this;
-    },
-
-    // Add a model to the end of the collection.
-    push: function(model, options) {
-      model = this._prepareModel(model, options);
-      this.add(model, options);
-      return model;
-    },
-
-    // Remove a model from the end of the collection.
-    pop: function(options) {
-      var model = this.at(this.length - 1);
-      this.remove(model, options);
-      return model;
-    },
-
-    // Add a model to the beginning of the collection.
-    unshift: function(model, options) {
-      model = this._prepareModel(model, options);
-      this.add(model, _.extend({at: 0}, options));
-      return model;
-    },
-
-    // Remove a model from the beginning of the collection.
-    shift: function(options) {
-      var model = this.at(0);
-      this.remove(model, options);
-      return model;
-    },
-
-    // Get a model from the set by id.
-    get: function(id) {
-      if (id == null) return void 0;
-      return this._byId[id.id != null ? id.id : id];
-    },
-
-    // Get a model from the set by client id.
-    getByCid: function(cid) {
-      return cid && this._byCid[cid.cid || cid];
-    },
-
-    // Get the model at the given index.
-    at: function(index) {
-      return this.models[index];
-    },
-
-    // Return models with matching attributes. Useful for simple cases of `filter`.
-    where: function(attrs) {
-      if (_.isEmpty(attrs)) return [];
-      return this.filter(function(model) {
-        for (var key in attrs) {
-          if (attrs[key] !== model.get(key)) return false;
-        }
-        return true;
-      });
-    },
-
-    // Force the collection to re-sort itself. You don't need to call this under
-    // normal circumstances, as the set will maintain sort order as each item
-    // is added.
-    sort: function(options) {
-      options || (options = {});
-      if (!this.comparator) throw new Error('Cannot sort a set without a comparator');
-      var boundComparator = _.bind(this.comparator, this);
-      if (this.comparator.length == 1) {
-        this.models = this.sortBy(boundComparator);
-      } else {
-        this.models.sort(boundComparator);
-      }
-      if (!options.silent) this.trigger('reset', this, options);
-      return this;
-    },
-
-    // Pluck an attribute from each model in the collection.
-    pluck: function(attr) {
-      return _.map(this.models, function(model){ return model.get(attr); });
-    },
-
-    // When you have more items than you want to add or remove individually,
-    // you can reset the entire set with a new list of models, without firing
-    // any `add` or `remove` events. Fires `reset` when finished.
-    reset: function(models, options) {
-      models  || (models = []);
-      options || (options = {});
-      for (var i = 0, l = this.models.length; i < l; i++) {
-        this._removeReference(this.models[i]);
-      }
-      this._reset();
-      this.add(models, _.extend({silent: true}, options));
-      if (!options.silent) this.trigger('reset', this, options);
-      return this;
-    },
-
-    // Fetch the default set of models for this collection, resetting the
-    // collection when they arrive. If `add: true` is passed, appends the
-    // models to the collection instead of resetting.
-    fetch: function(options) {
-      options = options ? _.clone(options) : {};
-      if (options.parse === undefined) options.parse = true;
-      var collection = this;
-      var success = options.success;
-      options.success = function(resp, status, xhr) {
-        collection[options.add ? 'add' : 'reset'](collection.parse(resp, xhr), options);
-        if (success) success(collection, resp);
-      };
-      options.error = Backbone.wrapError(options.error, collection, options);
-      return (this.sync || Backbone.sync).call(this, 'read', this, options);
-    },
-
-    // Create a new instance of a model in this collection. Add the model to the
-    // collection immediately, unless `wait: true` is passed, in which case we
-    // wait for the server to agree.
-    create: function(model, options) {
-      var coll = this;
-      options = options ? _.clone(options) : {};
-      model = this._prepareModel(model, options);
-      if (!model) return false;
-      if (!options.wait) coll.add(model, options);
-      var success = options.success;
-      options.success = function(nextModel, resp, xhr) {
-        if (options.wait) coll.add(nextModel, options);
-        if (success) {
-          success(nextModel, resp);
-        } else {
-          nextModel.trigger('sync', model, resp, options);
-        }
-      };
-      model.save(null, options);
-      return model;
-    },
-
-    // **parse** converts a response into a list of models to be added to the
-    // collection. The default implementation is just to pass it through.
-    parse: function(resp, xhr) {
-      return resp;
-    },
-
-    // Proxy to _'s chain. Can't be proxied the same way the rest of the
-    // underscore methods are proxied because it relies on the underscore
-    // constructor.
-    chain: function () {
-      return _(this.models).chain();
-    },
-
-    // Reset all internal state. Called when the collection is reset.
-    _reset: function(options) {
-      this.length = 0;
-      this.models = [];
-      this._byId  = {};
-      this._byCid = {};
-    },
-
-    // Prepare a model or hash of attributes to be added to this collection.
-    _prepareModel: function(model, options) {
-      options || (options = {});
-      if (!(model instanceof Model)) {
-        var attrs = model;
-        options.collection = this;
-        model = new this.model(attrs, options);
-        if (!model._validate(model.attributes, options)) model = false;
-      } else if (!model.collection) {
-        model.collection = this;
-      }
-      return model;
-    },
-
-    // Internal method to remove a model's ties to a collection.
-    _removeReference: function(model) {
-      if (this == model.collection) {
-        delete model.collection;
-      }
-      model.off('all', this._onModelEvent, this);
-    },
-
-    // Internal method called every time a model in the set fires an event.
-    // Sets need to update their indexes when models change ids. All other
-    // events simply proxy through. "add" and "remove" events that originate
-    // in other collections are ignored.
-    _onModelEvent: function(event, model, collection, options) {
-      if ((event == 'add' || event == 'remove') && collection != this) return;
-      if (event == 'destroy') {
-        this.remove(model, options);
-      }
-      if (model && event === 'change:' + model.idAttribute) {
-        delete this._byId[model.previous(model.idAttribute)];
-        this._byId[model.id] = model;
-      }
-      this.trigger.apply(this, arguments);
-    }
-
-  });
-
-  // Underscore methods that we want to implement on the Collection.
-  var methods = ['forEach', 'each', 'map', 'reduce', 'reduceRight', 'find',
-    'detect', 'filter', 'select', 'reject', 'every', 'all', 'some', 'any',
-    'include', 'contains', 'invoke', 'max', 'min', 'sortBy', 'sortedIndex',
-    'toArray', 'size', 'first', 'initial', 'rest', 'last', 'without', 'indexOf',
-    'shuffle', 'lastIndexOf', 'isEmpty', 'groupBy'];
-
-  // Mix in each Underscore method as a proxy to `Collection#models`.
-  _.each(methods, function(method) {
-    Collection.prototype[method] = function() {
-      return _[method].apply(_, [this.models].concat(_.toArray(arguments)));
-    };
-  });
-
-  // Backbone.Router
-  // -------------------
-
-  // Routers map faux-URLs to actions, and fire events when routes are
-  // matched. Creating a new one sets its `routes` hash, if not set statically.
-  var Router = Backbone.Router = function(options) {
-    options || (options = {});
-    if (options.routes) this.routes = options.routes;
-    this._bindRoutes();
-    this.initialize.apply(this, arguments);
-  };
-
-  // Cached regular expressions for matching named param parts and splatted
-  // parts of route strings.
-  var namedParam    = /:\w+/g;
-  var splatParam    = /\*\w+/g;
-  var escapeRegExp  = /[-[\]{}()+?.,\\^$|#\s]/g;
-
-  // Set up all inheritable **Backbone.Router** properties and methods.
-  _.extend(Router.prototype, Events, {
-
-    // Initialize is an empty function by default. Override it with your own
-    // initialization logic.
-    initialize: function(){},
-
-    // Manually bind a single named route to a callback. For example:
-    //
-    //     this.route('search/:query/p:num', 'search', function(query, num) {
-    //       ...
-    //     });
-    //
-    route: function(route, name, callback) {
-      Backbone.history || (Backbone.history = new History);
-      if (!_.isRegExp(route)) route = this._routeToRegExp(route);
-      if (!callback) callback = this[name];
-      Backbone.history.route(route, _.bind(function(fragment) {
-        var args = this._extractParameters(route, fragment);
-        callback && callback.apply(this, args);
-        this.trigger.apply(this, ['route:' + name].concat(args));
-        Backbone.history.trigger('route', this, name, args);
-      }, this));
-      return this;
-    },
-
-    // Simple proxy to `Backbone.history` to save a fragment into the history.
-    navigate: function(fragment, options) {
-      Backbone.history.navigate(fragment, options);
-    },
-
-    // Bind all defined routes to `Backbone.history`. We have to reverse the
-    // order of the routes here to support behavior where the most general
-    // routes can be defined at the bottom of the route map.
-    _bindRoutes: function() {
-      if (!this.routes) return;
-      var routes = [];
-      for (var route in this.routes) {
-        routes.unshift([route, this.routes[route]]);
-      }
-      for (var i = 0, l = routes.length; i < l; i++) {
-        this.route(routes[i][0], routes[i][1], this[routes[i][1]]);
-      }
-    },
-
-    // Convert a route string into a regular expression, suitable for matching
-    // against the current location hash.
-    _routeToRegExp: function(route) {
-      route = route.replace(escapeRegExp, '\\$&')
-                   .replace(namedParam, '([^\/]+)')
-                   .replace(splatParam, '(.*?)');
-      return new RegExp('^' + route + '$');
-    },
-
-    // Given a route, and a URL fragment that it matches, return the array of
-    // extracted parameters.
-    _extractParameters: function(route, fragment) {
-      return route.exec(fragment).slice(1);
-    }
-
-  });
-
-  // Backbone.History
-  // ----------------
-
-  // Handles cross-browser history management, based on URL fragments. If the
-  // browser does not support `onhashchange`, falls back to polling.
-  var History = Backbone.History = function() {
-    this.handlers = [];
-    _.bindAll(this, 'checkUrl');
-  };
-
-  // Cached regex for cleaning leading hashes and slashes .
-  var routeStripper = /^[#\/]/;
-
-  // Cached regex for detecting MSIE.
-  var isExplorer = /msie [\w.]+/;
-
-  // Has the history handling already been started?
-  History.started = false;
-
-  // Set up all inheritable **Backbone.History** properties and methods.
-  _.extend(History.prototype, Events, {
-
-    // The default interval to poll for hash changes, if necessary, is
-    // twenty times a second.
-    interval: 50,
-
-    // Gets the true hash value. Cannot use location.hash directly due to bug
-    // in Firefox where location.hash will always be decoded.
-    getHash: function(windowOverride) {
-      var loc = windowOverride ? windowOverride.location : window.location;
-      var match = loc.href.match(/#(.*)$/);
-      return match ? match[1] : '';
-    },
-
-    // Get the cross-browser normalized URL fragment, either from the URL,
-    // the hash, or the override.
-    getFragment: function(fragment, forcePushState) {
-      if (fragment == null) {
-        if (this._hasPushState || forcePushState) {
-          fragment = window.location.pathname;
-          var search = window.location.search;
-          if (search) fragment += search;
-        } else {
-          fragment = this.getHash();
-        }
-      }
-      if (!fragment.indexOf(this.options.root)) fragment = fragment.substr(this.options.root.length);
-      return fragment.replace(routeStripper, '');
-    },
-
-    // Start the hash change handling, returning `true` if the current URL matches
-    // an existing route, and `false` otherwise.
-    start: function(options) {
-      if (History.started) throw new Error("Backbone.history has already been started");
-      History.started = true;
-
-      // Figure out the initial configuration. Do we need an iframe?
-      // Is pushState desired ... is it available?
-      this.options          = _.extend({}, {root: '/'}, this.options, options);
-      this._wantsHashChange = this.options.hashChange !== false;
-      this._wantsPushState  = !!this.options.pushState;
-      this._hasPushState    = !!(this.options.pushState && window.history && window.history.pushState);
-      var fragment          = this.getFragment();
-      var docMode           = document.documentMode;
-      var oldIE             = (isExplorer.exec(navigator.userAgent.toLowerCase()) && (!docMode || docMode <= 7));
-
-      if (oldIE) {
-        this.iframe = $('<iframe src="javascript:0" tabindex="-1" />').hide().appendTo('body')[0].contentWindow;
-        this.navigate(fragment);
-      }
-
-      // Depending on whether we're using pushState or hashes, and whether
-      // 'onhashchange' is supported, determine how we check the URL state.
-      if (this._hasPushState) {
-        $(window).bind('popstate', this.checkUrl);
-      } else if (this._wantsHashChange && ('onhashchange' in window) && !oldIE) {
-        $(window).bind('hashchange', this.checkUrl);
-      } else if (this._wantsHashChange) {
-        this._checkUrlInterval = setInterval(this.checkUrl, this.interval);
-      }
-
-      // Determine if we need to change the base url, for a pushState link
-      // opened by a non-pushState browser.
-      this.fragment = fragment;
-      var loc = window.location;
-      var atRoot  = loc.pathname == this.options.root;
-
-      // If we've started off with a route from a `pushState`-enabled browser,
-      // but we're currently in a browser that doesn't support it...
-      if (this._wantsHashChange && this._wantsPushState && !this._hasPushState && !atRoot) {
-        this.fragment = this.getFragment(null, true);
-        window.location.replace(this.options.root + '#' + this.fragment);
-        // Return immediately as browser will do redirect to new url
-        return true;
-
-      // Or if we've started out with a hash-based route, but we're currently
-      // in a browser where it could be `pushState`-based instead...
-      } else if (this._wantsPushState && this._hasPushState && atRoot && loc.hash) {
-        this.fragment = this.getHash().replace(routeStripper, '');
-        window.history.replaceState({}, document.title, loc.protocol + '//' + loc.host + this.options.root + this.fragment);
-      }
-
-      if (!this.options.silent) {
-        return this.loadUrl();
-      }
-    },
-
-    // Disable Backbone.history, perhaps temporarily. Not useful in a real app,
-    // but possibly useful for unit testing Routers.
-    stop: function() {
-      $(window).unbind('popstate', this.checkUrl).unbind('hashchange', this.checkUrl);
-      clearInterval(this._checkUrlInterval);
-      History.started = false;
-    },
-
-    // Add a route to be tested when the fragment changes. Routes added later
-    // may override previous routes.
-    route: function(route, callback) {
-      this.handlers.unshift({route: route, callback: callback});
-    },
-
-    // Checks the current URL to see if it has changed, and if it has,
-    // calls `loadUrl`, normalizing across the hidden iframe.
-    checkUrl: function(e) {
-      var current = this.getFragment();
-      if (current == this.fragment && this.iframe) current = this.getFragment(this.getHash(this.iframe));
-      if (current == this.fragment) return false;
-      if (this.iframe) this.navigate(current);
-      this.loadUrl() || this.loadUrl(this.getHash());
-    },
-
-    // Attempt to load the current URL fragment. If a route succeeds with a
-    // match, returns `true`. If no defined routes matches the fragment,
-    // returns `false`.
-    loadUrl: function(fragmentOverride) {
-      var fragment = this.fragment = this.getFragment(fragmentOverride);
-      var matched = _.any(this.handlers, function(handler) {
-        if (handler.route.test(fragment)) {
-          handler.callback(fragment);
-          return true;
-        }
-      });
-      return matched;
-    },
-
-    // Save a fragment into the hash history, or replace the URL state if the
-    // 'replace' option is passed. You are responsible for properly URL-encoding
-    // the fragment in advance.
-    //
-    // The options object can contain `trigger: true` if you wish to have the
-    // route callback be fired (not usually desirable), or `replace: true`, if
-    // you wish to modify the current URL without adding an entry to the history.
-    navigate: function(fragment, options) {
-      if (!History.started) return false;
-      if (!options || options === true) options = {trigger: options};
-      var frag = (fragment || '').replace(routeStripper, '');
-      if (this.fragment == frag) return;
-
-      // If pushState is available, we use it to set the fragment as a real URL.
-      if (this._hasPushState) {
-        if (frag.indexOf(this.options.root) != 0) frag = this.options.root + frag;
-        this.fragment = frag;
-        window.history[options.replace ? 'replaceState' : 'pushState']({}, document.title, frag);
-
-      // If hash changes haven't been explicitly disabled, update the hash
-      // fragment to store history.
-      } else if (this._wantsHashChange) {
-        this.fragment = frag;
-        this._updateHash(window.location, frag, options.replace);
-        if (this.iframe && (frag != this.getFragment(this.getHash(this.iframe)))) {
-          // Opening and closing the iframe tricks IE7 and earlier to push a history entry on hash-tag change.
-          // When replace is true, we don't want this.
-          if(!options.replace) this.iframe.document.open().close();
-          this._updateHash(this.iframe.location, frag, options.replace);
-        }
-
-      // If you've told us that you explicitly don't want fallback hashchange-
-      // based history, then `navigate` becomes a page refresh.
-      } else {
-        window.location.assign(this.options.root + fragment);
-      }
-      if (options.trigger) this.loadUrl(fragment);
-    },
-
-    // Update the hash location, either replacing the current entry, or adding
-    // a new one to the browser history.
-    _updateHash: function(location, fragment, replace) {
-      if (replace) {
-        location.replace(location.toString().replace(/(javascript:|#).*$/, '') + '#' + fragment);
-      } else {
-        location.hash = fragment;
-      }
-    }
-  });
-
-  // Backbone.View
-  // -------------
-
-  // Creating a Backbone.View creates its initial element outside of the DOM,
-  // if an existing element is not provided...
-  var View = Backbone.View = function(options) {
-    this.cid = _.uniqueId('view');
-    this._configure(options || {});
-    this._ensureElement();
-    this.initialize.apply(this, arguments);
-    this.delegateEvents();
-  };
-
-  // Cached regex to split keys for `delegate`.
-  var delegateEventSplitter = /^(\S+)\s*(.*)$/;
-
-  // List of view options to be merged as properties.
-  var viewOptions = ['model', 'collection', 'el', 'id', 'attributes', 'className', 'tagName'];
-
-  // Set up all inheritable **Backbone.View** properties and methods.
-  _.extend(View.prototype, Events, {
-
-    // The default `tagName` of a View's element is `"div"`.
-    tagName: 'div',
-
-    // jQuery delegate for element lookup, scoped to DOM elements within the
-    // current view. This should be prefered to global lookups where possible.
-    $: function(selector) {
-      return this.$el.find(selector);
-    },
-
-    // Initialize is an empty function by default. Override it with your own
-    // initialization logic.
-    initialize: function(){},
-
-    // **render** is the core function that your view should override, in order
-    // to populate its element (`this.el`), with the appropriate HTML. The
-    // convention is for **render** to always return `this`.
-    render: function() {
-      return this;
-    },
-
-    // Remove this view from the DOM. Note that the view isn't present in the
-    // DOM by default, so calling this method may be a no-op.
-    remove: function() {
-      this.$el.remove();
-      return this;
-    },
-
-    // For small amounts of DOM Elements, where a full-blown template isn't
-    // needed, use **make** to manufacture elements, one at a time.
-    //
-    //     var el = this.make('li', {'class': 'row'}, this.model.escape('title'));
-    //
-    make: function(tagName, attributes, content) {
-      var el = document.createElement(tagName);
-      if (attributes) $(el).attr(attributes);
-      if (content) $(el).html(content);
-      return el;
-    },
-
-    // Change the view's element (`this.el` property), including event
-    // re-delegation.
-    setElement: function(element, delegate) {
-      if (this.$el) this.undelegateEvents();
-      this.$el = (element instanceof $) ? element : $(element);
-      this.el = this.$el[0];
-      if (delegate !== false) this.delegateEvents();
-      return this;
-    },
-
-    // Set callbacks, where `this.events` is a hash of
-    //
-    // *{"event selector": "callback"}*
-    //
-    //     {
-    //       'mousedown .title':  'edit',
-    //       'click .button':     'save'
-    //       'click .open':       function(e) { ... }
-    //     }
-    //
-    // pairs. Callbacks will be bound to the view, with `this` set properly.
-    // Uses event delegation for efficiency.
-    // Omitting the selector binds the event to `this.el`.
-    // This only works for delegate-able events: not `focus`, `blur`, and
-    // not `change`, `submit`, and `reset` in Internet Explorer.
-    delegateEvents: function(events) {
-      if (!(events || (events = getValue(this, 'events')))) return;
-      this.undelegateEvents();
-      for (var key in events) {
-        var method = events[key];
-        if (!_.isFunction(method)) method = this[events[key]];
-        if (!method) throw new Error('Method "' + events[key] + '" does not exist');
-        var match = key.match(delegateEventSplitter);
-        var eventName = match[1], selector = match[2];
-        method = _.bind(method, this);
-        eventName += '.delegateEvents' + this.cid;
-        if (selector === '') {
-          this.$el.bind(eventName, method);
-        } else {
-          this.$el.delegate(selector, eventName, method);
-        }
-      }
-    },
-
-    // Clears all callbacks previously bound to the view with `delegateEvents`.
-    // You usually don't need to use this, but may wish to if you have multiple
-    // Backbone views attached to the same DOM element.
-    undelegateEvents: function() {
-      this.$el.unbind('.delegateEvents' + this.cid);
-    },
-
-    // Performs the initial configuration of a View with a set of options.
-    // Keys with special meaning *(model, collection, id, className)*, are
-    // attached directly to the view.
-    _configure: function(options) {
-      if (this.options) options = _.extend({}, this.options, options);
-      for (var i = 0, l = viewOptions.length; i < l; i++) {
-        var attr = viewOptions[i];
-        if (options[attr]) this[attr] = options[attr];
-      }
-      this.options = options;
-    },
-
-    // Ensure that the View has a DOM element to render into.
-    // If `this.el` is a string, pass it through `$()`, take the first
-    // matching element, and re-assign it to `el`. Otherwise, create
-    // an element from the `id`, `className` and `tagName` properties.
-    _ensureElement: function() {
-      if (!this.el) {
-        var attrs = getValue(this, 'attributes') || {};
-        if (this.id) attrs.id = this.id;
-        if (this.className) attrs['class'] = this.className;
-        this.setElement(this.make(this.tagName, attrs), false);
-      } else {
-        this.setElement(this.el, false);
-      }
-    }
-
-  });
-
-  // The self-propagating extend function that Backbone classes use.
-  var extend = function (protoProps, classProps) {
-    var child = inherits(this, protoProps, classProps);
-    child.extend = this.extend;
-    return child;
-  };
-
-  // Set up inheritance for the model, collection, and view.
-  Model.extend = Collection.extend = Router.extend = View.extend = extend;
-
-  // Backbone.sync
-  // -------------
-
-  // Map from CRUD to HTTP for our default `Backbone.sync` implementation.
-  var methodMap = {
-    'create': 'POST',
-    'update': 'PUT',
-    'delete': 'DELETE',
-    'read':   'GET'
-  };
-
-  // Override this function to change the manner in which Backbone persists
-  // models to the server. You will be passed the type of request, and the
-  // model in question. By default, makes a RESTful Ajax request
-  // to the model's `url()`. Some possible customizations could be:
-  //
-  // * Use `setTimeout` to batch rapid-fire updates into a single request.
-  // * Send up the models as XML instead of JSON.
-  // * Persist models via WebSockets instead of Ajax.
-  //
-  // Turn on `Backbone.emulateHTTP` in order to send `PUT` and `DELETE` requests
-  // as `POST`, with a `_method` parameter containing the true HTTP method,
-  // as well as all requests with the body as `application/x-www-form-urlencoded`
-  // instead of `application/json` with the model in a param named `model`.
-  // Useful when interfacing with server-side languages like **PHP** that make
-  // it difficult to read the body of `PUT` requests.
-  Backbone.sync = function(method, model, options) {
-    var type = methodMap[method];
-
-    // Default options, unless specified.
-    options || (options = {});
-
-    // Default JSON-request options.
-    var params = {type: type, dataType: 'json'};
-
-    // Ensure that we have a URL.
-    if (!options.url) {
-      params.url = getValue(model, 'url') || urlError();
-    }
-
-    // Ensure that we have the appropriate request data.
-    if (!options.data && model && (method == 'create' || method == 'update')) {
-      params.contentType = 'application/json';
-      params.data = JSON.stringify(model.toJSON());
-    }
-
-    // For older servers, emulate JSON by encoding the request into an HTML-form.
-    if (Backbone.emulateJSON) {
-      params.contentType = 'application/x-www-form-urlencoded';
-      params.data = params.data ? {model: params.data} : {};
-    }
-
-    // For older servers, emulate HTTP by mimicking the HTTP method with `_method`
-    // And an `X-HTTP-Method-Override` header.
-    if (Backbone.emulateHTTP) {
-      if (type === 'PUT' || type === 'DELETE') {
-        if (Backbone.emulateJSON) params.data._method = type;
-        params.type = 'POST';
-        params.beforeSend = function(xhr) {
-          xhr.setRequestHeader('X-HTTP-Method-Override', type);
-        };
-      }
-    }
-
-    // Don't process data on a non-GET request.
-    if (params.type !== 'GET' && !Backbone.emulateJSON) {
-      params.processData = false;
-    }
-
-    // Make the request, allowing the user to override any Ajax options.
-    return $.ajax(_.extend(params, options));
-  };
-
-  // Wrap an optional error callback with a fallback error event.
-  Backbone.wrapError = function(onError, originalModel, options) {
-    return function(model, resp) {
-      resp = model === originalModel ? resp : model;
-      if (onError) {
-        onError(originalModel, resp, options);
-      } else {
-        originalModel.trigger('error', originalModel, resp, options);
-      }
-    };
-  };
-
-  // Helpers
-  // -------
-
-  // Shared empty constructor function to aid in prototype-chain creation.
-  var ctor = function(){};
-
-  // Helper function to correctly set up the prototype chain, for subclasses.
-  // Similar to `goog.inherits`, but uses a hash of prototype properties and
-  // class properties to be extended.
-  var inherits = function(parent, protoProps, staticProps) {
-    var child;
-
-    // The constructor function for the new subclass is either defined by you
-    // (the "constructor" property in your `extend` definition), or defaulted
-    // by us to simply call the parent's constructor.
-    if (protoProps && protoProps.hasOwnProperty('constructor')) {
-      child = protoProps.constructor;
-    } else {
-      child = function(){ parent.apply(this, arguments); };
-    }
-
-    // Inherit class (static) properties from parent.
-    _.extend(child, parent);
-
-    // Set the prototype chain to inherit from `parent`, without calling
-    // `parent`'s constructor function.
-    ctor.prototype = parent.prototype;
-    child.prototype = new ctor();
-
-    // Add prototype properties (instance properties) to the subclass,
-    // if supplied.
-    if (protoProps) _.extend(child.prototype, protoProps);
-
-    // Add static properties to the constructor function, if supplied.
-    if (staticProps) _.extend(child, staticProps);
-
-    // Correctly set child's `prototype.constructor`.
-    child.prototype.constructor = child;
-
-    // Set a convenience property in case the parent's prototype is needed later.
-    child.__super__ = parent.prototype;
-
-    return child;
-  };
-
-  // Helper function to get a value from a Backbone object as a property
-  // or as a function.
-  var getValue = function(object, prop) {
-    if (!(object && object[prop])) return null;
-    return _.isFunction(object[prop]) ? object[prop]() : object[prop];
-  };
-
-  // Throw an error when a URL is needed, and none is supplied.
-  var urlError = function() {
-    throw new Error('A "url" property or function must be specified');
-  };
-
-}).call(this);
diff --git a/addons/point_of_sale/static/src/css/pos.css b/addons/point_of_sale/static/src/css/pos.css
index 114e6ccee9e..9ac7d4405d0 100644
--- a/addons/point_of_sale/static/src/css/pos.css
+++ b/addons/point_of_sale/static/src/css/pos.css
@@ -20,6 +20,12 @@
             user-select: none;
 }
 
+.point-of-sale ul, .point-of-sale li  {
+    margin: 0;
+    padding: 0;
+    list-style-type: none;
+}
+
 .point-of-sale .shadow-top{
     position: absolute;
     top:0;
@@ -31,6 +37,7 @@
     background:     -ms-linear-gradient(top,rgba(0,0,0,0.09),rgba(0,0,0,0));
     background:         linear-gradient(top,rgba(0,0,0,0.09),rgba(0,0,0,0));
 }
+
 .point-of-sale .darker-shadow-top{
     position: absolute;
     top:0;
@@ -42,6 +49,7 @@
     background:     -ms-linear-gradient(top,rgba(0,0,0,0.15),rgba(0,0,0,0));
     background:         linear-gradient(top,rgba(0,0,0,0.15),rgba(0,0,0,0));
 }
+
 /*  ********* The black loading screen ********* */
 
 .point-of-sale .loader{
@@ -156,11 +164,11 @@
 }
 
 .point-of-sale #rightheader button {
-    color: black;
-    height:29px;
-    margin:2px;
+    color: #273072;
+    height:27px;
+    margin:3px;
     margin-right:0px;
-    border: 1px solid black;
+    border: 1px solid #353A7E;
     background: #7f82ac;
     background: -webkit-gradient(linear, left top, left bottom, from(#b2b3d7), to(#7f82ac));
     background: -moz-linear-gradient(#b2b3d7, #7f82ac);
@@ -187,6 +195,33 @@
     font-weight: 900;
 }
 
+/*  c) The session buttons */
+
+.point-of-sale #rightheader .header-button{
+    float:right;
+    height:32px;
+    padding-left:10px;
+    padding-right:10px;
+    border-right:  1px solid #3a3a3a;
+    border-left:  1px solid #3a3a3a;
+    color:#DDD;
+    line-height:32px;
+    text-align:center;
+    cursor: pointer;
+
+    -webkit-transition-property: background;
+    -webkit-transition-duration: 0.2s;
+    -webkit-transition-timing-function: ease-out;
+}
+.point-of-sale #rightheader .header-button:last-child{
+    border-left:  1px solid #3a3a3a;
+}
+.point-of-sale #rightheader .header-button:hover{
+    background: rgba(0,0,0,0.2);
+    text-shadow: #000 0px 0px 3px;
+    color:#EEE;
+}
+
 /*  c) The notifications indicator */
 
 .point-of-sale .oe_pos_synch-notification{
@@ -234,7 +269,8 @@
     left:0;
     width:440px;
     top:0px;
-    bottom:105px;
+    /*bottom:105px;*/
+    bottom:0;
     border-right: solid 1px #CECBCB;
     background-color: white;
 }
@@ -318,7 +354,8 @@
 .point-of-sale #rightpane {
     position: absolute;
     top: 0;
-    bottom: 105px;
+    /*bottom: 105px;*/
+    bottom:0;
     left: 440px;
     right: 0;
     vertical-align: top;
@@ -454,6 +491,42 @@
     cursor: pointer;
 }
 
+.point-of-sale .category-simple-button{
+    position: relative;
+    display: inline-block;
+    font-size: 14px;
+    margin-right:10px;
+    padding:5px;
+
+    cursor: pointer;
+    border: 1px solid #cacaca;
+    border-radius: 4px;
+
+    background: #e2e2e2;
+    background: -webkit-linear-gradient(#f0f0f0, #e2e2e2);
+    background:    -moz-linear-gradient(#f0f0f0, #e2e2e2);
+    background:     -ms-linear-gradient(#f0f0f0, #e2e2e2);
+    background:         linear-gradient(#f0f0f0, #e2e2e2);
+    -webkit-box-shadow: 0px 2px 2px rgba(0,0,0, 0.1);
+       -moz-box-shadow: 0px 2px 2px rgba(0,0,0, 0.1);
+            box-shadow: 0px 2px 2px rgba(0,0,0, 0.1);
+}
+.point-of-sale .category-simple-button:hover {
+    color: white;
+    background: #7f82ac;
+    border: 1px solid #7f82ac;
+    background: -webkit-linear-gradient(#9d9fc5, #7f82ac);
+    background:    -moz-linear-gradient(#9d9fc5, #7f82ac);
+    background:     -ms-linear-gradient(#9d9fc5, #7f82ac);
+    background:         linear-gradient(#9d9fc5, #7f82ac);
+
+    -webkit-transition-property: background, border;
+    -webkit-transition-duration: 0.2s;
+    -webkit-transition-timing-function: ease-out;
+}
+
+
+
 .point-of-sale .category-button .category-img {
     position: relative;
     width: 120px;
@@ -463,7 +536,8 @@
 }
 
 .point-of-sale .category-button .category-img img {
-    height: 100px;
+    max-height: 100px;
+    max-width:  120px;
 }
 
 .point-of-sale .category-button .category-name {
@@ -490,6 +564,7 @@
     position:relative;
     vertical-align: top;
     display: inline-block;
+    line-height: 100px;
     font-size: 11px;
     margin: 5px;
     width: 120px;
@@ -497,9 +572,9 @@
     background:#fff;
     border: 1px solid #fff;
     border-radius: 3px;
-    -webkit-box-shadow: 0px 1px 8px rgba(0,0,0,0.2);
-       -moz-box-shadow: 0px 1px 8px rgba(0,0,0,0.2);
-            box-shadow: 0px 1px 8px rgba(0,0,0,0.2);
+    -webkit-box-shadow: 0px 1px 8px rgba(127,130,172,0.4);
+       -moz-box-shadow: 0px 1px 8px rgba(127,130,172,0.4);
+            box-shadow: 0px 1px 8px rgba(127,130,172,0.4);
 }
 
 .point-of-sale .product .product-img {
@@ -511,7 +586,8 @@
 }
 
 .point-of-sale .product .product-img img {
-    height: 100px;
+    max-height: 100px;
+    max-width:  120px;
 }
 
 .point-of-sale .product .price-tag {
@@ -520,6 +596,7 @@
     right: 2px;
     vertical-align: top;
     color: white;
+    line-height: 14px;
     background: #7f82ac;
     padding: 2px 5px;
     border-radius: 3px;
@@ -533,6 +610,7 @@
             box-sizing: border-box;
     bottom:0;
     top:auto;
+    line-height: 14px;
     width:100%;
     background: -webkit-linear-gradient(-90deg,rgba(255,255,255,0),rgba(255,255,255,1), rgba(255,255,255,1));
     background:    -moz-linear-gradient(-90deg,rgba(255,255,255,0),rgba(255,255,255,1), rgba(255,255,255,1));
@@ -598,8 +676,16 @@
     display: inline-block;
     font-size: 1.5em;
 }
+.point-of-sale .greyed-out{
+    color: #AAA;
+}
+.point-of-sale .pos-step-container input{
+    font-size: 1em;
+}
+
 .point-of-sale .pos-payment-container {
     text-align: left;
+    min-width: 500px;
 }
 .point-of-sale .pos-payment-container .left-block{
     display: inline-block;
@@ -648,8 +734,17 @@
     width: 300px;
     background-color: white;
     margin: 20px;
-    padding: 10px;
+    padding: 15px;
+    padding-bottom:30px;
     display: inline-block;
+    font-family: "Inconsolata";
+    -webkit-box-shadow: 0px 5px 16px rgba(0,0,0, 0.3);
+       -moz-box-shadow: 0px 5px 16px rgba(0,0,0, 0.3);
+            box-shadow: 0px 5px 16px rgba(0,0,0, 0.3);
+}
+.point-of-sale .pos-sale-ticket .emph{
+    font-size: 20px;
+    margin:5px;
 }
 .point-of-sale .pos-sale-ticket table {
     width: 100%;
@@ -660,18 +755,18 @@
 }
 
 @media print {
-    #oe_header, #oe_menu, .point-of-sale #topheader, .point-of-sale #leftpane {
-        display: none;
+    .point-of-sale #topheader, .point-of-sale #leftpane {
+        display: none !important;
     }
     .point-of-sale #content {
-        top: 0px;
+        top: 0px !important;
     }
     .point-of-sale #rightpane {
-        left: 0px;
+        left: 0px !important;
         background-color: white;
     }
     #receipt-screen header {
-        display: none;
+        display: none !important;
     }
     #receipt-screen {
         text-align: left;
@@ -761,6 +856,28 @@
     font-family: "Inconsolata";
 }
 
+/* e) The Welcome Screen */
+.point-of-sale .goodbye-message{
+    position: absolute;
+    left:50%;
+    top:30%;
+    width:500px;
+    height:400px;
+    margin-left: -250px;
+    margin-top: -200px;
+    padding:10px;
+    padding-top:20px;
+    text-align:center;
+    font-size:20px;
+    font-weight:bold;
+    background-color: #F0EEEE;
+    border: 1px solid #E0DDDD;
+    -webkit-box-shadow: 0px 10px 20px rgba(0,0,0, 0.3);
+       -moz-box-shadow: 0px 10px 20px rgba(0,0,0, 0.3);
+        -ms-box-shadow: 0px 10px 20px rgba(0,0,0, 0.3);
+    z-index:1150;
+}
+
 /*  ********* The OrderWidget  ********* */
 
 .point-of-sale .order-container{
@@ -846,6 +963,10 @@
        -moz-transition: background 50ms ease-in-out;
             transition: background 50ms ease-in-out;
 }
+.point-of-sale .order .orderline.empty:hover{
+    background: transparent;
+    cursor: default;
+}
 
 .point-of-sale .order .orderline.selected{
     background: rgba(140,143,183,0.2);
@@ -933,9 +1054,9 @@
     background:    -moz-linear-gradient(#f0f0f0, #e2e2e2);
     background:     -ms-linear-gradient(#f0f0f0, #e2e2e2);
     background:         linear-gradient(#f0f0f0, #e2e2e2);
-    -webkit-box-shadow: 0px 2px 2px rgba(0,0,0, 0.3);
-       -moz-box-shadow: 0px 2px 2px rgba(0,0,0, 0.3);
-            box-shadow: 0px 2px 2px rgba(0,0,0, 0.3);
+    -webkit-box-shadow: 0px 2px 2px rgba(0,0,0, 0.1);
+       -moz-box-shadow: 0px 2px 2px rgba(0,0,0, 0.1);
+            box-shadow: 0px 2px 2px rgba(0,0,0, 0.1);
 }
 .point-of-sale .pos-actionbar .button .label{
     margin-top: 37px;
@@ -957,6 +1078,25 @@
     -webkit-transition-timing-function: ease-out;
 }
 
+.point-of-sale .pos-actionbar .button.disabled *{
+    opacity: 0.5;
+}
+.point-of-sale .pos-actionbar .button.disabled:hover{
+    border: 1px solid #cacaca;
+    border-radius: 4px;
+    color: #555;
+    cursor: default;
+
+    background: #e2e2e2;
+    background: -webkit-linear-gradient(#f0f0f0, #e2e2e2);
+    background:    -moz-linear-gradient(#f0f0f0, #e2e2e2);
+    background:     -ms-linear-gradient(#f0f0f0, #e2e2e2);
+    background:         linear-gradient(#f0f0f0, #e2e2e2);
+    -webkit-box-shadow: 0px 2px 2px rgba(0,0,0, 0.1);
+       -moz-box-shadow: 0px 2px 2px rgba(0,0,0, 0.1);
+            box-shadow: 0px 2px 2px rgba(0,0,0, 0.1);
+}
+
 .point-of-sale .pos-actionbar .button.rightalign{
     float:right;
 }
diff --git a/addons/point_of_sale/static/src/css/pos_nohover.css b/addons/point_of_sale/static/src/css/pos_nohover.css
new file mode 100644
index 00000000000..6f24abda53b
--- /dev/null
+++ b/addons/point_of_sale/static/src/css/pos_nohover.css
@@ -0,0 +1,1168 @@
+@font-face{
+    font-family: 'Inconsolata';
+    src: url(../fonts/Inconsolata.otf);
+}
+
+.point-of-sale {
+    padding: 0;
+    margin: 0;
+    background-color: #f0eeee;
+    font-family: "Lucida Grande", Helvetica, Verdana, Arial;
+    color: #555555;
+    font-size: 12px;
+    position: absolute;
+    left: 0;
+    top: 0;
+    width: 100%;
+    height: 100%;
+    -webkit-user-select: none;
+       -moz-user-select: none;
+            user-select: none;
+}
+
+.point-of-sale .shadow-top{
+    position: absolute;
+    top:0;
+    left:0;
+    right:0;
+    height:10px;
+    background: -webkit-linear-gradient(top,rgba(0,0,0,0.09),rgba(0,0,0,0));
+    background:    -moz-linear-gradient(top,rgba(0,0,0,0.09),rgba(0,0,0,0));
+    background:     -ms-linear-gradient(top,rgba(0,0,0,0.09),rgba(0,0,0,0));
+    background:         linear-gradient(top,rgba(0,0,0,0.09),rgba(0,0,0,0));
+}
+
+.point-of-sale .darker-shadow-top{
+    position: absolute;
+    top:0;
+    left:0;
+    right:0;
+    height:10px;
+    background: -webkit-linear-gradient(top,rgba(0,0,0,0.15),rgba(0,0,0,0));
+    background:    -moz-linear-gradient(top,rgba(0,0,0,0.15),rgba(0,0,0,0));
+    background:     -ms-linear-gradient(top,rgba(0,0,0,0.15),rgba(0,0,0,0));
+    background:         linear-gradient(top,rgba(0,0,0,0.15),rgba(0,0,0,0));
+}
+
+/*  ********* The black loading screen ********* */
+
+.point-of-sale .loader{
+    background-color: #222;
+    position:absolute;
+    left:0px;
+    top:0px;
+    width:100%;
+    height:100%;
+    z-index: 999;
+    text-align: center;
+}
+.point-of-sale .loader img{
+    position:absolute;
+    top:50%;
+    left:50%;
+}
+
+/*  ********* Generic element styling  ********* */
+
+.point-of-sale a {
+    text-decoration: none;
+    color: #555555;
+}
+.point-of-sale button, .point-of-sale a.button {
+    display: inline-block;
+    cursor: pointer;
+    padding: 4px 10px;
+    font-size: 11px;
+    border: 1px solid #cacaca;
+    border-radius: 4px;
+    background: #e2e2e2;
+    background: -webkit-gradient(linear, left top, left bottom, from(#f0f0f0), to(#e2e2e2));
+    background: -moz-linear-gradient(#f0f0f0, #e2e2e2);
+    background:  -ms-linear-gradient(#f0f0f0, #e2e2e2);
+    background:      linear-gradient(#f0f0f0, #e2e2e2);
+}
+.point-of-sale ul, .point-of-sale ol {
+    padding: 0;
+    margin: 0;
+}
+.point-of-sale li {
+    list-style-type: none;
+}
+.point-of-sale .pos-right-align {
+    text-align: right;
+}
+.point-of-sale .pos-right-align input {
+    text-align: right;
+    border: 1px solid #cecbcb;
+    border-radius: 4px;
+}
+
+/*  ********* The black header bar ********* */
+
+
+.point-of-sale #topheader {
+    position:absolute;
+    left:0;
+    top:0;
+    width: 100%;
+    height: 33px;
+    margin:0;
+    padding:0;
+    color: gray;
+    border-top: solid 1px #d3d3d3;
+    border-bottom: solid 1px black;
+    background: #393939;
+    background: -moz-linear-gradient(#7b7979, #393939);
+    background: -webkit-gradient(linear, left top, left bottom, from(#7b7979), to(#393939));
+}
+
+/*  a) The left part of the top-bar */
+
+.point-of-sale #branding{
+    position: absolute;
+    display: table-cell;
+    left:0;
+    top:0;
+    width:439px;
+    height:100%;
+    margin:0;
+    padding:0;
+    border-right: 1px solid #373737;
+    text-align:left;
+    line-height:100%;
+    vertical-align: middle;
+}
+.point-of-sale #branding img {
+    height: 32px;
+    width: 116px;
+    margin-left:5px;
+    vertical-align:middle;
+} 
+.point-of-sale #branding .username{
+    float:right;
+    color:#DDD;
+    font-size:16px;
+    margin-right:32px;
+    margin-top:10px;
+    font-style:italic;
+}
+
+/*  b) The right part of the top-bar */
+
+.point-of-sale #rightheader {
+    position: absolute;
+    left:440px;
+    right:0;
+    top:0;
+    height:100%;
+}
+
+.point-of-sale #rightheader button {
+    color: #273072;
+    height:27px;
+    margin:3px;
+    margin-right:0px;
+    border: 1px solid #353A7E;
+    background: #7f82ac;
+    background: -webkit-gradient(linear, left top, left bottom, from(#b2b3d7), to(#7f82ac));
+    background: -moz-linear-gradient(#b2b3d7, #7f82ac);
+    background:  -ms-linear-gradient(#b2b3d7, #7f82ac);
+    background:      linear-gradient(#b2b3d7, #7f82ac);
+}
+
+.point-of-sale #rightheader button.neworder-button {
+    width: 32px;
+    margin-left:4px;
+    margin-right:4px;
+}
+
+.point-of-sale div#order-selector {
+    display: inline;
+}
+.point-of-sale ol#orders {
+    display: inline;
+}
+.point-of-sale li.order-selector-button {
+    display: inline;
+}
+.point-of-sale li.selected-order button {
+    font-weight: 900;
+}
+
+/*  c) The session buttons */
+
+.point-of-sale #rightheader .header-button{
+    float:right;
+    height:32px;
+    padding-left:10px;
+    padding-right:10px;
+    border-right:  1px solid #3a3a3a;
+    border-left:  1px solid #3a3a3a;
+    color:#DDD;
+    line-height:32px;
+    text-align:center;
+    cursor: pointer;
+
+    -webkit-transition-property: background;
+    -webkit-transition-duration: 0.2s;
+    -webkit-transition-timing-function: ease-out;
+}
+.point-of-sale #rightheader .header-button:last-child{
+    border-left:  1px solid #3a3a3a;
+}
+
+/*  c) The notifications indicator */
+
+.point-of-sale .oe_pos_synch-notification{
+    float:right; 
+    color: rgba(255,255,255,0.4);
+    padding: 8px;
+    line-height:16px;
+    font-size:16px;
+    vertical-align:middle;
+    font-style: italic;
+    cursor:pointer;
+}
+
+.point-of-sale .oe_pos_synch-notification .oe_status_red{
+    display:inline-block;
+    cursor:pointer;
+    width:16px; height:16px;
+    background: url("../img/gtk-no.png") no-repeat ;
+}
+
+.point-of-sale .oe_pos_synch-notification .oe_status_green{
+    display:inline-block;
+    width:16px; height:16px;
+    background: url("../img/gtk-yes.png") no-repeat;
+}
+
+/*  ********* Contains everything below the  bar ********* */
+
+.point-of-sale #content {
+    width: 100%;
+    position: absolute;
+    top: 35px;
+    bottom: 0;
+    background: #F0EEEE;
+}
+
+/*  ********* The leftpane contains the order, numpad and paypad ********* */
+
+.point-of-sale #leftpane {
+    -webkit-box-sizing: border-box;
+       -moz-box-sizing: border-box;
+        -ms-box-sizing: border-box;
+            box-sizing: border-box;
+    position:absolute;
+    left:0;
+    width:440px;
+    top:0px;
+    /*bottom:105px;*/
+    bottom:0;
+    border-right: solid 1px #CECBCB;
+    background-color: white;
+}
+.point-of-sale #leftpane footer {
+    position: absolute;
+    bottom: 0;
+    left: 0;
+    width: 100%;
+    background: #F0EEEE;
+    white-space: nowrap;
+}
+
+/*  ********* The paypad contains the payment buttons ********* */
+
+.point-of-sale #paypad {
+    padding: 8px 4px 8px 8px;
+    display: inline-block;
+    text-align: center;
+    vertical-align: top;
+}
+.point-of-sale #paypad button {
+    height: 54px;
+    width: 208px;
+    margin: 0 -3px;
+    font-weight: bold;
+    vertical-align: middle;
+    color: #555555;
+    border-top: 1px solid #efefef;
+    font-size: 14px;
+}
+
+/*  ********* The Numpad ********* */
+
+.point-of-sale #numpad {
+    padding: 8px 8px 8px 4px;
+    display: inline-block;
+    text-align: center;
+}
+.point-of-sale #numpad button {
+    height: 54px;
+    width: 54px;
+    margin: 0 -3px;
+    font-weight: bold;
+    vertical-align: middle;
+    color: #555555;
+    border-top: 1px solid #efefef;
+}
+.point-of-sale #numpad .selected-mode {
+    color: white;
+    background: #7f82ac;
+    background: -webkit-gradient(linear, left top, left bottom, from(#9d9fc5), to(#7f82ac));
+    background: -moz-linear-gradient(#9d9fc5, #7f82ac);
+    background:  -ms-linear-gradient(#9d9fc5, #7f82ac);
+    background:      linear-gradient(#9d9fc5, #7f82ac);
+}
+.point-of-sale .input-button {
+    font-size: 24px;
+}
+.point-of-sale .mode-button, .point-of-sale #numpad-delete, .point-of-sale #numpad-minus {
+    font-size: 14px;
+}
+
+/*  ********* The right pane contains the screens and headers ********* */
+
+.point-of-sale #rightpane {
+    position: absolute;
+    top: 0;
+    /*bottom: 105px;*/
+    bottom:0;
+    left: 440px;
+    right: 0;
+    vertical-align: top;
+}
+
+.point-of-sale #rightpane header {
+    padding: 0;
+    height: 32px;
+    border-bottom: 1px solid #cecbcb;
+    background: #d3d3d3;
+    background: -moz-linear-gradient(white, #d3d3d3);
+    background: -webkit-gradient(linear, left top, left bottom, from(white), to(#d3d3d3));
+}
+
+/*  ********* The product list  ********* */
+
+.point-of-sale .product-list {
+    padding:10px;
+}
+
+.point-of-sale .product-list-scroller{
+    -webkit-box-sizing: border-box;
+       -moz-box-sizing: border-box;
+        -ms-box-sizing: border-box;
+            box-sizing: border-box;
+    width:100%;
+    height:100%;
+    overflow: hidden;
+}
+.point-of-sale .product-list-container {
+    position:absolute;
+    top:0px;
+    bottom:0px;
+    left:0px;
+    right:0px;
+    background: #eeedff;
+}
+
+/*  a) the product list navigation bar */
+
+.point-of-sale .breadcrumb li {
+    float: left;
+    line-height: 32px;
+    height: 32px;
+}
+.point-of-sale .breadcrumb li:last-child {
+    padding-right: 3px;
+    border-right: 1px solid #c5c5c5;
+}
+.point-of-sale .breadcrumb a {
+    display: inline-block;
+    padding: 0 9px;
+    vertical-align: top;
+    text-shadow: #f7f7f7 0 1px 1px;
+    color: #555555;
+    font-weight: bold;
+}
+.point-of-sale .bc-arrow {
+    height: 33px;
+}
+.point-of-sale .homeimg {
+    width: 19px;
+    height: 19px;
+    margin: 6px 0;
+}
+
+/*  b) the search box */
+
+.point-of-sale .searchbox {
+    position: absolute;
+    right: 2px;
+}
+.point-of-sale .searchbox input {
+    width: 130px;
+    border-radius: 11px;
+    border: 1px solid #cecbcb;
+    padding: 3px 19px;
+    margin: 6px;
+    background: url("../img/search.png") no-repeat 5px;
+    background-color: white;
+}
+.point-of-sale .search-clear {
+    position: absolute;
+    top: 11px;
+    right: 11px;
+    cursor: pointer;
+    display: none;
+}
+
+/*  c) the categories list */
+
+.point-of-sale #categories {
+    /*background:#f0f0f0;*/
+    position: relative;
+    background-image: url('../img/bg.png');
+    border-bottom: 1px solid #cecbcb;
+}
+.point-of-sale #categories .white-gradient{
+    position: absolute;
+    top:50%;
+    left:0;
+    right:0;
+    bottom:0;
+    background: -webkit-linear-gradient(bottom,rgba(255,255,255,0.5),rgba(255,255,255,0));
+    background:    -moz-linear-gradient(bottom,rgba(255,255,255,0.5),rgba(255,255,255,0));
+    background:     -ms-linear-gradient(bottom,rgba(255,255,255,0.5),rgba(255,255,255,0));
+    background:         linear-gradient(bottom,rgba(255,255,255,0.5),rgba(255,255,255,0));
+}
+.point-of-sale #categories h4 {
+    display: inline-block;
+    margin: 9px 5px;
+}
+
+.point-of-sale .category-list{
+    padding:10px;
+}
+/*  d) the category button */
+
+.point-of-sale .category-button {
+    position: relative;
+    vertical-align: top;
+    display: inline-block;
+    font-size: 11px;
+    margin: 5px;
+    width: 120px;
+    height:120px;
+    background:#fff;
+    border: 1px solid #fff;
+    border-radius: 3px;
+    -webkit-box-shadow: 0px 1px 8px rgba(0,0,0,0.2);
+       -moz-box-shadow: 0px 1px 8px rgba(0,0,0,0.2);
+            box-shadow: 0px 1px 8px rgba(0,0,0,0.2);
+    cursor: pointer;
+}
+
+.point-of-sale .category-simple-button{
+    position: relative;
+    display: inline-block;
+    font-size: 14px;
+    margin-right:10px;
+    padding:5px;
+
+    cursor: pointer;
+    border: 1px solid #cacaca;
+    border-radius: 4px;
+
+    background: #e2e2e2;
+    background: -webkit-linear-gradient(#f0f0f0, #e2e2e2);
+    background:    -moz-linear-gradient(#f0f0f0, #e2e2e2);
+    background:     -ms-linear-gradient(#f0f0f0, #e2e2e2);
+    background:         linear-gradient(#f0f0f0, #e2e2e2);
+    -webkit-box-shadow: 0px 2px 2px rgba(0,0,0, 0.1);
+       -moz-box-shadow: 0px 2px 2px rgba(0,0,0, 0.1);
+            box-shadow: 0px 2px 2px rgba(0,0,0, 0.1);
+}
+
+.point-of-sale .category-button .category-img {
+    position: relative;
+    width: 120px;
+    height: 100px;
+    text-align: center;
+    cursor: pointer;
+}
+
+.point-of-sale .category-button .category-img img {
+    max-height: 100px;
+    max-width:  120px;
+}
+
+.point-of-sale .category-button .category-name {
+    position: absolute;
+    -webkit-box-sizing: border-box;
+       -moz-box-sizing: border-box;
+        -ms-box-sizing: border-box;
+            box-sizing: border-box;
+    top:auto;
+    left: 2px;
+    right: 2px;
+    bottom: 2px;
+    background: #8a89ba; /*-webkit-linear-gradient(-90deg,rgba(138,137,186,0),rgba(138,137,186,1), rgba(138,137,186,1));*/
+    padding: 3px;
+    /*color:#8a89ba;*/
+    color: #FFF;
+    cursor: pointer;
+    border-radius: 3px;
+}
+
+/*  e) the product */
+
+.point-of-sale .product {
+    position:relative;
+    vertical-align: top;
+    display: inline-block;
+    line-height: 100px;
+    font-size: 11px;
+    margin: 5px;
+    width: 120px;
+    height:120px;
+    background:#fff;
+    border: 1px solid #fff;
+    border-radius: 3px;
+    -webkit-box-shadow: 0px 1px 8px rgba(127,130,172,0.4);
+       -moz-box-shadow: 0px 1px 8px rgba(127,130,172,0.4);
+            box-shadow: 0px 1px 8px rgba(127,130,172,0.4);
+}
+
+.point-of-sale .product .product-img {
+    position: relative;
+    width: 120px;
+    height: 100px;
+    background: white;
+    text-align: center;
+}
+
+.point-of-sale .product .product-img img {
+    max-height: 100px;
+    max-width:  120px;
+}
+
+.point-of-sale .product .price-tag {
+    position: absolute;
+    top: 2px;
+    right: 2px;
+    vertical-align: top;
+    color: white;
+    line-height: 14px;
+    background: #7f82ac;
+    padding: 2px 5px;
+    border-radius: 3px;
+}
+
+.point-of-sale .product .product-name {
+    position: absolute;
+    -webkit-box-sizing: border-box;
+       -moz-box-sizing: border-box;
+        -ms-box-sizing: border-box;
+            box-sizing: border-box;
+    bottom:0;
+    top:auto;
+    line-height: 14px;
+    width:100%;
+    background: -webkit-linear-gradient(-90deg,rgba(255,255,255,0),rgba(255,255,255,1), rgba(255,255,255,1));
+    background:    -moz-linear-gradient(-90deg,rgba(255,255,255,0),rgba(255,255,255,1), rgba(255,255,255,1));
+    background:     -ms-linear-gradient(-90deg,rgba(255,255,255,0),rgba(255,255,255,1), rgba(255,255,255,1));
+    background:         linear-gradient(-90deg,rgba(255,255,255,0),rgba(255,255,255,1), rgba(255,255,255,1));
+    /*background:#FFF;*/
+    padding: 3px;
+    padding-top:15px;
+}
+
+
+/*  ********* The Screens  ********* */
+
+.point-of-sale .screen {
+    position:absolute;
+    text-align: center;
+    top:0px;
+    bottom:0px;
+    width:100%;
+}
+.point-of-sale .screen header h2 {
+    margin-top: 0px;
+    padding-top: 7px;
+}
+.point-of-sale .screen p{
+    font-size: 18px;
+}
+
+/* a) Layout for the Product Screen */
+
+.point-of-sale .screen .layout-table {
+    border:none;
+    width:100%;
+    height:100%;
+}
+
+.point-of-sale .screen .header-row {
+    border:none;
+    width:100%;
+    height:0px;
+}
+
+.point-of-sale .screen .header-cell{
+    border:none;
+    width:100%;
+    height:0px;
+}
+.point-of-sale .screen .content-row {
+    width:100%;
+    height:100%;
+}
+.point-of-sale .screen .content-cell{
+    width:100%;
+}
+.point-of-sale .screen .content-cell .content-container{
+    height:100%;
+    position:relative;
+}
+
+/* b) The payment screen */
+
+.point-of-sale .pos-step-container {
+    display: inline-block;
+    font-size: 1.5em;
+}
+.point-of-sale .greyed-out{
+    color: #AAA;
+}
+.point-of-sale .pos-step-container input{
+    font-size: 1em;
+}
+
+.point-of-sale .pos-payment-container {
+    text-align: left;
+    min-width: 500px;
+}
+.point-of-sale .pos-payment-container .left-block{
+    display: inline-block;
+    width:49%;
+    margin:0;
+    padding:0;
+    text-align:left;
+}
+.point-of-sale .pos-payment-container .header{
+    margin-top: 50px;
+    margin-bottom:20px;
+    font-weight: bold;
+}
+.point-of-sale .pos-payment-container .infoline{
+    margin-top:5px;
+    margin-bottom:5px;
+}
+.point-of-sale .pos-payment-container .right-block{
+    display: inline-block;
+    width:49%;
+    margin:0;
+    padding:0;
+    text-align:right;
+}
+.point-of-sale .pos-payment-container table {
+    width: 100%;
+    margin-bottom: 20px;
+}
+.point-of-sale .pos-payment-container td {
+    vertical-align: middle;
+}
+.point-of-sale .pos-payment-container .paymentline-type {
+    font-size: 1em;
+    font-weight: bold;
+    margin-right:10px;
+}
+
+/* c) The receipt screen */
+
+.point-of-sale .pos-receipt-container {
+    font-size: 0.75em;
+}
+
+.point-of-sale .pos-sale-ticket {
+    text-align: left;
+    width: 300px;
+    background-color: white;
+    margin: 20px;
+    padding: 15px;
+    padding-bottom:30px;
+    display: inline-block;
+    font-family: "Inconsolata";
+    -webkit-box-shadow: 0px 5px 16px rgba(0,0,0, 0.3);
+       -moz-box-shadow: 0px 5px 16px rgba(0,0,0, 0.3);
+            box-shadow: 0px 5px 16px rgba(0,0,0, 0.3);
+}
+.point-of-sale .pos-sale-ticket .emph{
+    font-size: 20px;
+    margin:5px;
+}
+.point-of-sale .pos-sale-ticket table {
+    width: 100%;
+    border: 0;
+}
+.point-of-sale .pos-sale-ticket table td {
+    border: 0;
+}
+
+@media print {
+    .point-of-sale #topheader, .point-of-sale #leftpane {
+        display: none !important;
+    }
+    .point-of-sale #content {
+        top: 0px !important;
+    }
+    .point-of-sale #rightpane {
+        left: 0px !important;
+        background-color: white;
+    }
+    #receipt-screen header {
+        display: none !important;
+    }
+    #receipt-screen {
+        text-align: left;
+    }
+    .pos-sale-ticket {
+        margin: 0;
+    }
+}
+
+/* d) The Scale screen */
+
+.point-of-sale .scale-screen .display{
+    position:relative;
+    width:600px;
+    height:190px;
+    margin-top: 100px;
+    margin-left: auto;
+    margin-right: auto;
+}
+
+.point-of-sale .scale-screen .product-picture {
+    -webkit-box-sizing: border-box;
+       -moz-box-sizing: border-box;
+        -ms-box-sizing: border-box;
+            box-sizing: border-box;
+    display: float;
+    float: right;
+    margin: 5px;
+    width: 180px;
+    height:180px;
+    line-height:180px;
+    cursor:pointer;
+
+    background:#fff;
+    border: 1px solid #fff;
+    border-radius: 3px;
+    -webkit-box-shadow: 0px 1px 8px rgba(0,0,0,0.2);
+       -moz-box-shadow: 0px 1px 8px rgba(0,0,0,0.2);
+            box-shadow: 0px 1px 8px rgba(0,0,0,0.2);
+}
+
+.point-of-sale .scale-screen .product-picture img{
+    vertical-align: middle;
+    cursor:pointer;
+}
+
+.point-of-sale .scale-screen .product-picture .product-price{
+    position: absolute;
+    top:8px;
+    right:8px;
+    width:auto;
+    height:auto;
+    line-height:1;
+    color:white;
+    background: #7f82ac;
+    padding: 2px 5px;
+    border-radius: 3px;
+    cursor:pointer;
+}
+
+.point-of-sale .scale-screen .product-name {
+    position: absolute;
+    left:0;
+    top:20px;
+    height:50px;
+    font-size:40px;
+    line-height:50px;
+    text-align:right;
+    right:225px;
+}
+.point-of-sale .scale-screen .weight{
+    position: absolute;
+    left:0;
+    height:90px;
+    bottom:15px;
+    right:220px;
+    padding:5px;
+}
+.point-of-sale .scale-screen .weight p{
+    display: inline-block;
+    text-align:right;
+    line-height: 90px;
+    font-size: 80px;
+    width:100%;
+    height:100%;
+    margin:0;
+    font-family: "Inconsolata";
+}
+
+/* e) The Welcome Screen */
+.point-of-sale .goodbye-message{
+    position: absolute;
+    left:50%;
+    top:30%;
+    width:500px;
+    height:400px;
+    margin-left: -250px;
+    margin-top: -200px;
+    padding:10px;
+    padding-top:20px;
+    text-align:center;
+    font-size:20px;
+    font-weight:bold;
+    background-color: #F0EEEE;
+    border: 1px solid #E0DDDD;
+    -webkit-box-shadow: 0px 10px 20px rgba(0,0,0, 0.3);
+       -moz-box-shadow: 0px 10px 20px rgba(0,0,0, 0.3);
+        -ms-box-shadow: 0px 10px 20px rgba(0,0,0, 0.3);
+    z-index:1150;
+}
+
+/*  ********* The OrderWidget  ********* */
+
+.point-of-sale .order-container{
+    position: absolute;
+    top: 0px;
+    bottom: 232px;
+    width:100%;
+    background: #F0EEEE;
+}
+
+.point-of-sale .order-scroller{
+    width:100%;
+    height:100%;
+    overflow:hidden;
+}
+
+.point-of-sale .order{
+    background: #F00;
+    background: -webkit-linear-gradient(0deg,rgba(245,245,245,1),rgba(255,255,255,1), rgba(245,245,245,1));
+    background:    -moz-linear-gradient(0deg,rgba(245,245,245,1),rgba(255,255,255,1), rgba(245,245,245,1));
+    background:     -ms-linear-gradient(0deg,rgba(245,245,245,1),rgba(255,255,255,1), rgba(245,245,245,1));
+    background:         linear-gradient(0deg,rgba(245,245,245,1),rgba(255,255,255,1), rgba(245,245,245,1));
+    padding-bottom:15px;
+    padding-top:15px;
+    margin-left:16px;
+    margin-right:16px;
+    margin-top:16px;
+    margin-bottom:16px;
+    font-size:16px;
+    -webkit-box-shadow: 0px 5px 16px rgba(0,0,0, 0.3);
+       -moz-box-shadow: 0px 5px 16px rgba(0,0,0, 0.3);
+            box-shadow: 0px 5px 16px rgba(0,0,0, 0.3);
+
+}
+
+.point-of-sale .order .empty{
+    text-align:center;
+    margin-top: 15px;
+    margin-bottom: 5px;
+    color:#999;
+    font-weight: normal;
+}
+
+.point-of-sale .order .summary{
+    width:100%;
+    text-align:right;
+    font-weight: bold;
+    margin-top:20px;
+    margin-bottom:10px;
+}
+.point-of-sale .order .summary .line{
+    margin-right:15px;
+    padding-top:5px;
+    border-top: solid 2px;
+    border-color:#777;
+}
+.point-of-sale .order .summary .line.empty{
+    border-color:#BBB;
+    color:#999;
+}
+
+/*  ********* The OrderLineWidget  ********* */
+
+.point-of-sale .order .orderline{
+    width:100%;
+    margin:0px;
+    padding-top:3px;
+    padding-bottom:10px;
+    padding-left:15px;
+    padding-right:15px;
+    cursor: pointer;
+    -webkit-box-sizing: border-box;
+       -moz-box-sizing: border-box;
+        -ms-box-sizing: border-box;
+            box-sizing: border-box;
+    -webkit-transition: background 250ms ease-in-out;
+       -moz-transition: background 250ms ease-in-out;
+            transition: background 250ms ease-in-out;
+}
+
+.point-of-sale .order .orderline.selected{
+    background: rgba(140,143,183,0.2);
+    -webkit-transition: background 250ms ease-in-out;
+       -moz-transition: background 250ms ease-in-out;
+            transition: background 250ms ease-in-out;
+    cursor: default;
+}
+.point-of-sale .order .orderline .product-name{
+    padding:0;
+    display:inline-block;
+    font-weight: bold;
+    width:80%;
+    overflow:hidden;
+}
+.point-of-sale .order .orderline .price{
+    padding:0;
+    font-weight: bold;
+    float:right;
+}
+.point-of-sale .order .orderline .info-list{
+    color: #888;
+    margin-left:10px;
+}
+.point-of-sale .order .orderline .info-list em{
+    color: #777;
+    font-weight: bold;
+    font-style:normal;
+}
+
+/*  ********* The ActionBarWidget  ********* */
+
+.point-of-sale .pos-actionbar{
+    position:absolute;
+    left:    0;
+    bottom:  0px;
+    height: 105px;
+    width:  100%;
+    margin: 0;
+    background: #f5f5f5;    /*#ebebeb;*/
+    border-top: solid 1px #afafb6;
+    z-index:900;
+}
+
+.point-of-sale .pos-actionbar ul{
+    list-style:  none;
+}
+
+.point-of-sale .pos-actionbar-left-pane{
+    height: 100%;
+    width:  434px;
+    margin: 0px;
+    padding-left:3px;
+    padding-right:3px;
+    border-right: solid 1px #dfdfdf;
+    float:  left;
+}
+
+.point-of-sale .pos-actionbar-button-list{
+    height: 100%;
+    margin: 0px;
+    padding-left:3px;
+    padding-right:3px;
+    overflow:hidden;
+}
+
+.point-of-sale .pos-actionbar .button{
+    width: 90px;
+    height: 90px;
+    text-align:center;
+    margin:3px;
+    margin-top:6px;
+    float:left;
+
+    font-size:   14px;
+    font-weight: bold;
+
+    cursor: pointer;
+
+    border: 1px solid #cacaca;
+    border-radius: 4px;
+
+    background: #e2e2e2;
+    background: -webkit-linear-gradient(#f0f0f0, #e2e2e2);
+    background:    -moz-linear-gradient(#f0f0f0, #e2e2e2);
+    background:     -ms-linear-gradient(#f0f0f0, #e2e2e2);
+    background:         linear-gradient(#f0f0f0, #e2e2e2);
+    -webkit-box-shadow: 0px 2px 2px rgba(0,0,0, 0.1);
+       -moz-box-shadow: 0px 2px 2px rgba(0,0,0, 0.1);
+            box-shadow: 0px 2px 2px rgba(0,0,0, 0.1);
+}
+.point-of-sale .pos-actionbar .button .label{
+    margin-top: 37px;
+}
+.point-of-sale .pos-actionbar .button .icon{
+    margin-top: 10px;
+}
+
+.point-of-sale .pos-actionbar .button.disabled *{
+    opacity: 0.5;
+}
+
+.point-of-sale .pos-actionbar .button.rightalign{
+    float:right;
+}
+
+/*  ********* The PopupWidgets  ********* */
+
+.point-of-sale .modal-dialog{
+    position: absolute;
+    left: 0;
+    top: 0;
+    width: 100%;
+    height:100%;
+    background-color: rgba(0,0,0,0.5);
+    z-index:1000;
+}
+.point-of-sale .modal-dialog .popup{
+    position: absolute;
+    left:50%;
+    top:50%;
+    width:500px;
+    height:400px;
+    margin-left: -250px;
+    margin-top: -200px;
+    padding:10px;
+    padding-top:20px;
+    text-align:center;
+    font-size:20px;
+    font-weight:bold;
+    background-color: #F0EEEE;
+    border: 1px solid #E0DDDD;
+    -webkit-box-shadow: 0px 10px 20px rgba(0,0,0, 0.3);
+       -moz-box-shadow: 0px 10px 20px rgba(0,0,0, 0.3);
+        -ms-box-shadow: 0px 10px 20px rgba(0,0,0, 0.3);
+    z-index:1200;
+}
+.point-of-sale .popup .footer{
+    position:absolute;
+    bottom:0;
+    left:0;
+    width:100%;
+    height:60px;
+    border-top: 1px solid #E0DDDD;
+}
+.point-of-sale .popup .button{
+    float:right;
+    width: 110px;
+    height: 40px;
+    line-height:40px;
+    text-align:center;
+    margin:3px;
+    margin-top:10px;
+    margin-right:10px;
+
+    font-size:   14px;
+    font-weight: bold;
+
+    cursor: pointer;
+
+    border: 1px solid #cacaca;
+    border-radius: 4px;
+
+    background: #e2e2e2;
+    background: -webkit-linear-gradient(#f0f0f0, #e2e2e2);
+    background:    -moz-linear-gradient(#f0f0f0, #e2e2e2);
+    background:     -ms-linear-gradient(#f0f0f0, #e2e2e2);
+    background:         linear-gradient(#f0f0f0, #e2e2e2);
+    -webkit-box-shadow: 0px 2px 2px rgba(0,0,0, 0.3);
+       -moz-box-shadow: 0px 2px 2px rgba(0,0,0, 0.3);
+            box-shadow: 0px 2px 2px rgba(0,0,0, 0.3);
+}
+
+.point-of-sale .popup .button.big-left{
+    position:absolute;
+    top: 120px;
+    left:40px;
+    width: 180px;
+    height: 180px;
+    line-height:180px;
+}
+
+.point-of-sale .popup .button.big-right{
+    position:absolute;
+    top: 120px;
+    right:40px;
+    width: 180px;
+    height: 180px;
+    line-height:180px;
+}
+
+/*  ********* The ScrollBarWidget  ********* */
+
+.point-of-sale .scrollbar{  
+    position:absolute;
+    top:7px;
+    right:7px;
+    width:48px;
+    bottom:7px;
+    background: rgba(0,0,0,0.1);
+
+}
+.point-of-sale .scrollbar .button{
+    width:100%;
+    height: 48px;
+    line-height: 38px;
+    text-align: center;
+    font-size:48px;
+    border-radius: 4px;
+    cursor: pointer;
+    -webkit-user-select: none;
+       -moz-user-select: none;
+        -ms-user-select: none;
+            user-select: none;
+    transition: all 250ms ease-in-out;
+}
+.point-of-sale .scrollbar .button{
+    color:white;
+    background: rgba(0,0,0,0.6);
+    -webkit-box-shadow: 0px 1px 4px rgba(0,0,0,0.01);
+       -moz-box-shadow: 0px 1px 4px rgba(0,0,0,0.01);
+            box-shadow: 0px 1px 4px rgba(0,0,0,0.01);
+    text-shadow: rgba(255,255,255,0.5) 0px 0px 10px;
+    -webkit-transition: all 250ms ease-in-out;
+       -moz-transition: all 250ms ease-in-out;
+            transition: all 250ms ease-in-out;
+}
+.point-of-sale .scrollbar .button.disabled{
+    background: rgba(0,0,0,0.3);
+    color:rgba(255,255,255,0.5);
+    -webkit-transition: all 250ms ease-in-out;
+       -moz-transition: all 250ms ease-in-out;
+            transition: all 250ms ease-in-out;
+}
+.point-of-sale .scrollbar .down-button{
+    position:absolute;
+    bottom:0px;
+}
+.point-of-sale .scrollbar .up-button{
+    position:absolute;
+    top:0px;
+}
+.point-of-sale .scrollbar .scroller{
+    position:absolute;
+    top:33%;
+    bottom:50%;
+    width:100%;
+    background: rgba(0,0,0,0.1);
+    border-radius: 4px;
+}
+
diff --git a/addons/point_of_sale/static/src/img/default_category_photo.png b/addons/point_of_sale/static/src/img/default_category_photo.png
new file mode 100644
index 00000000000..25af75ee815
Binary files /dev/null and b/addons/point_of_sale/static/src/img/default_category_photo.png differ
diff --git a/addons/point_of_sale/static/src/img/icons/bancontact.svg b/addons/point_of_sale/static/src/img/icons/bancontact.svg
new file mode 100644
index 00000000000..70604078014
--- /dev/null
+++ b/addons/point_of_sale/static/src/img/icons/bancontact.svg
@@ -0,0 +1,1114 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="48"
+   height="48"
+   overflow="visible"
+   enable-background="new 0 0 128 129.396"
+   xml:space="preserve"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.48.3.1 r9886"
+   sodipodi:docname="scan.svg"
+   version="1.0"
+   inkscape:export-filename="/home/fva/Code/openerp/src/addons/trunk-pos-fva/point_of_sale/static/src/img/scan.png"
+   inkscape:export-xdpi="600"
+   inkscape:export-ydpi="600"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"><metadata
+   id="metadata367"><rdf:RDF><cc:Work
+       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><cc:license
+         rdf:resource="http://creativecommons.org/licenses/publicdomain/" /><dc:title></dc:title><dc:creator><cc:Agent><dc:title>Jakub Steiner</dc:title></cc:Agent></dc:creator><dc:source>http://jimmac.musichall.cz</dc:source><dc:subject><rdf:Bag><rdf:li>home</rdf:li><rdf:li>return</rdf:li><rdf:li>go</rdf:li><rdf:li>default</rdf:li><rdf:li>user</rdf:li><rdf:li>directory</rdf:li></rdf:Bag></dc:subject><dc:contributor><cc:Agent><dc:title>Tuomas Kuosmanen</dc:title></cc:Agent></dc:contributor></cc:Work><cc:License
+       rdf:about="http://creativecommons.org/licenses/publicdomain/"><cc:permits
+         rdf:resource="http://creativecommons.org/ns#Reproduction" /><cc:permits
+         rdf:resource="http://creativecommons.org/ns#Distribution" /><cc:permits
+         rdf:resource="http://creativecommons.org/ns#DerivativeWorks" /></cc:License></rdf:RDF></metadata><defs
+   id="defs365"><linearGradient
+     inkscape:collect="always"
+     id="linearGradient4977"><stop
+       style="stop-color:#ff0000;stop-opacity:1;"
+       offset="0"
+       id="stop4979" /><stop
+       style="stop-color:#ff0000;stop-opacity:0"
+       offset="1"
+       id="stop4981" /></linearGradient><inkscape:perspective
+     sodipodi:type="inkscape:persp3d"
+     inkscape:vp_x="0 : 24 : 1"
+     inkscape:vp_y="0 : 1000 : 0"
+     inkscape:vp_z="48 : 24 : 1"
+     inkscape:persp3d-origin="24 : 16 : 1"
+     id="perspective92" /><radialGradient
+     inkscape:collect="always"
+     xlink:href="#linearGradient5060"
+     id="radialGradient5031"
+     gradientUnits="userSpaceOnUse"
+     gradientTransform="matrix(-2.774389,0,0,1.969706,112.7623,-872.8854)"
+     cx="605.71429"
+     cy="486.64789"
+     fx="605.71429"
+     fy="486.64789"
+     r="117.14286" /><linearGradient
+     inkscape:collect="always"
+     id="linearGradient5060"><stop
+       style="stop-color:black;stop-opacity:1;"
+       offset="0"
+       id="stop5062" /><stop
+       style="stop-color:black;stop-opacity:0;"
+       offset="1"
+       id="stop5064" /></linearGradient><radialGradient
+     inkscape:collect="always"
+     xlink:href="#linearGradient5060"
+     id="radialGradient5029"
+     gradientUnits="userSpaceOnUse"
+     gradientTransform="matrix(2.774389,0,0,1.969706,-1891.633,-872.8854)"
+     cx="605.71429"
+     cy="486.64789"
+     fx="605.71429"
+     fy="486.64789"
+     r="117.14286" /><linearGradient
+     id="linearGradient5048"><stop
+       style="stop-color:black;stop-opacity:0;"
+       offset="0"
+       id="stop5050" /><stop
+       id="stop5056"
+       offset="0.5"
+       style="stop-color:black;stop-opacity:1;" /><stop
+       style="stop-color:black;stop-opacity:0;"
+       offset="1"
+       id="stop5052" /></linearGradient><linearGradient
+     inkscape:collect="always"
+     xlink:href="#linearGradient5048"
+     id="linearGradient5027"
+     gradientUnits="userSpaceOnUse"
+     gradientTransform="matrix(2.774389,0,0,1.969706,-1892.179,-872.8854)"
+     x1="302.85715"
+     y1="366.64789"
+     x2="302.85715"
+     y2="609.50507" /><linearGradient
+     id="linearGradient2406"><stop
+       style="stop-color:#7c7e79;stop-opacity:1;"
+       offset="0"
+       id="stop2408" /><stop
+       id="stop2414"
+       offset="0.1724138"
+       style="stop-color:#848681;stop-opacity:1;" /><stop
+       style="stop-color:#898c86;stop-opacity:1;"
+       offset="1"
+       id="stop2410" /></linearGradient><linearGradient
+     inkscape:collect="always"
+     id="linearGradient2390"><stop
+       style="stop-color:#919191;stop-opacity:1;"
+       offset="0"
+       id="stop2392" /><stop
+       style="stop-color:#919191;stop-opacity:0;"
+       offset="1"
+       id="stop2394" /></linearGradient><linearGradient
+     inkscape:collect="always"
+     id="linearGradient2378"><stop
+       style="stop-color:#575757;stop-opacity:1;"
+       offset="0"
+       id="stop2380" /><stop
+       style="stop-color:#575757;stop-opacity:0;"
+       offset="1"
+       id="stop2382" /></linearGradient><linearGradient
+     inkscape:collect="always"
+     id="linearGradient2368"><stop
+       style="stop-color:#ffffff;stop-opacity:1;"
+       offset="0"
+       id="stop2370" /><stop
+       style="stop-color:#ffffff;stop-opacity:0;"
+       offset="1"
+       id="stop2372" /></linearGradient><linearGradient
+     inkscape:collect="always"
+     id="linearGradient2349"><stop
+       style="stop-color:#000000;stop-opacity:1;"
+       offset="0"
+       id="stop2351" /><stop
+       style="stop-color:#000000;stop-opacity:0;"
+       offset="1"
+       id="stop2353" /></linearGradient><linearGradient
+     id="linearGradient2341"><stop
+       id="stop2343"
+       offset="0"
+       style="stop-color:#000000;stop-opacity:1;" /><stop
+       id="stop2345"
+       offset="1"
+       style="stop-color:#000000;stop-opacity:0;" /></linearGradient><linearGradient
+     id="linearGradient2329"><stop
+       style="stop-color:#000000;stop-opacity:0.18556701;"
+       offset="0"
+       id="stop2331" /><stop
+       style="stop-color:#ffffff;stop-opacity:1;"
+       offset="1"
+       id="stop2333" /></linearGradient><linearGradient
+     inkscape:collect="always"
+     id="linearGradient2319"><stop
+       style="stop-color:#000000;stop-opacity:1;"
+       offset="0"
+       id="stop2321" /><stop
+       style="stop-color:#000000;stop-opacity:0;"
+       offset="1"
+       id="stop2323" /></linearGradient><linearGradient
+     id="linearGradient2307"><stop
+       style="stop-color:#edd400;stop-opacity:1;"
+       offset="0"
+       id="stop2309" /><stop
+       style="stop-color:#998800;stop-opacity:1;"
+       offset="1"
+       id="stop2311" /></linearGradient><linearGradient
+     inkscape:collect="always"
+     id="linearGradient2299"><stop
+       style="stop-color:#ffffff;stop-opacity:1;"
+       offset="0"
+       id="stop2301" /><stop
+       style="stop-color:#ffffff;stop-opacity:0;"
+       offset="1"
+       id="stop2303" /></linearGradient><linearGradient
+     id="XMLID_2_"
+     gradientUnits="userSpaceOnUse"
+     x1="80.223602"
+     y1="117.5205"
+     x2="48.046001"
+     y2="59.7995"
+     gradientTransform="matrix(0.314683,0.000000,0.000000,0.314683,4.128264,3.742874)">
+				<stop
+   offset="0"
+   style="stop-color:#CCCCCC"
+   id="stop17" />
+				<stop
+   offset="0.9831"
+   style="stop-color:#FFFFFF"
+   id="stop19" />
+				<midPointStop
+   offset="0"
+   style="stop-color:#CCCCCC"
+   id="midPointStop48" />
+				<midPointStop
+   offset="0.5"
+   style="stop-color:#CCCCCC"
+   id="midPointStop50" />
+				<midPointStop
+   offset="0.9831"
+   style="stop-color:#FFFFFF"
+   id="midPointStop52" />
+			</linearGradient><linearGradient
+     inkscape:collect="always"
+     xlink:href="#XMLID_2_"
+     id="linearGradient1514"
+     gradientUnits="userSpaceOnUse"
+     gradientTransform="matrix(0.336922,0,0,0.166888,209.74433,15.46151)"
+     x1="52.006104"
+     y1="166.1331"
+     x2="14.049017"
+     y2="-42.218513" /><linearGradient
+     id="XMLID_39_"
+     gradientUnits="userSpaceOnUse"
+     x1="64.387703"
+     y1="65.124001"
+     x2="64.387703"
+     y2="35.569"
+     gradientTransform="matrix(0.354101,0,0,0.354101,193.40013,-0.08364921)">
+						<stop
+   offset="0"
+   style="stop-color:#FFFFFF"
+   id="stop336" />
+						<stop
+   offset="0.8539"
+   style="stop-color:#FF6200"
+   id="stop338" />
+						<stop
+   offset="1"
+   style="stop-color:#F25D00"
+   id="stop340" />
+						<midPointStop
+   offset="0"
+   style="stop-color:#FFFFFF"
+   id="midPointStop335" />
+						<midPointStop
+   offset="0.5"
+   style="stop-color:#FFFFFF"
+   id="midPointStop337" />
+						<midPointStop
+   offset="0.8539"
+   style="stop-color:#FF6200"
+   id="midPointStop339" />
+						<midPointStop
+   offset="0.5"
+   style="stop-color:#FF6200"
+   id="midPointStop341" />
+						<midPointStop
+   offset="1"
+   style="stop-color:#F25D00"
+   id="midPointStop343" />
+					</linearGradient><radialGradient
+     inkscape:collect="always"
+     xlink:href="#linearGradient2299"
+     id="radialGradient2305"
+     cx="7.5326638"
+     cy="24.202574"
+     fx="7.5326638"
+     fy="24.202574"
+     r="8.2452128"
+     gradientTransform="matrix(4.100086,0,0,4.201322,166.34639,-78.53967)"
+     gradientUnits="userSpaceOnUse" /><radialGradient
+     inkscape:collect="always"
+     xlink:href="#linearGradient2307"
+     id="radialGradient2313"
+     cx="19.985598"
+     cy="36.77816"
+     fx="19.985598"
+     fy="36.77816"
+     r="1.0821035"
+     gradientTransform="matrix(1.125263,0,0,0.982744,188.33278,0.565787)"
+     gradientUnits="userSpaceOnUse" /><radialGradient
+     inkscape:collect="always"
+     xlink:href="#linearGradient2319"
+     id="radialGradient2325"
+     cx="20.443665"
+     cy="37.425829"
+     fx="20.443665"
+     fy="37.425829"
+     r="1.0821035"
+     gradientTransform="matrix(1.125263,0,0,0.982744,188.33278,0.731106)"
+     gradientUnits="userSpaceOnUse" /><linearGradient
+     inkscape:collect="always"
+     xlink:href="#linearGradient2329"
+     id="linearGradient2335"
+     x1="17.602522"
+     y1="26.057423"
+     x2="17.682528"
+     y2="32.654099"
+     gradientUnits="userSpaceOnUse"
+     gradientTransform="matrix(0.898789,0,0,1.071914,192.23948,-2.080838)" /><radialGradient
+     inkscape:collect="always"
+     xlink:href="#linearGradient2341"
+     id="radialGradient2339"
+     gradientUnits="userSpaceOnUse"
+     gradientTransform="matrix(4.100086,0,0,-4.201322,186.56334,105.3535)"
+     cx="11.68129"
+     cy="19.554111"
+     fx="11.68129"
+     fy="19.554111"
+     r="8.2452126" /><radialGradient
+     inkscape:collect="always"
+     xlink:href="#linearGradient2349"
+     id="radialGradient2355"
+     cx="24.023088"
+     cy="40.56913"
+     fx="24.023088"
+     fy="40.56913"
+     r="16.28684"
+     gradientTransform="matrix(1.000000,0.000000,0.000000,0.431250,1.157278e-15,23.07369)"
+     gradientUnits="userSpaceOnUse" /><radialGradient
+     inkscape:collect="always"
+     xlink:href="#linearGradient2368"
+     id="radialGradient2374"
+     cx="29.913452"
+     cy="30.442923"
+     fx="29.913452"
+     fy="30.442923"
+     r="4.0018832"
+     gradientTransform="matrix(3.751495,0,0,3.147818,109.75238,-65.70704)"
+     gradientUnits="userSpaceOnUse" /><radialGradient
+     inkscape:collect="always"
+     xlink:href="#linearGradient2378"
+     id="radialGradient2384"
+     cx="24.195112"
+     cy="10.577631"
+     fx="24.195112"
+     fy="10.577631"
+     r="15.242914"
+     gradientTransform="matrix(1.125263,-3.585417e-8,4.269819e-8,1.340059,188.75475,1.355395)"
+     gradientUnits="userSpaceOnUse" /><linearGradient
+     inkscape:collect="always"
+     xlink:href="#linearGradient2390"
+     id="linearGradient2396"
+     x1="30.603519"
+     y1="37.337803"
+     x2="30.603519"
+     y2="36.112415"
+     gradientUnits="userSpaceOnUse"
+     gradientTransform="matrix(1.263867,0,0,0.859794,-6.499556,8.390924)" /><linearGradient
+     inkscape:collect="always"
+     xlink:href="#linearGradient2406"
+     id="linearGradient2412"
+     x1="17.850183"
+     y1="28.939463"
+     x2="19.040216"
+     y2="41.03223"
+     gradientUnits="userSpaceOnUse"
+     gradientTransform="matrix(0.888785,0,0,1.08932,194.17244,-1.524336)" /><linearGradient
+     inkscape:collect="always"
+     xlink:href="#linearGradient5048"
+     id="linearGradient4689"
+     gradientUnits="userSpaceOnUse"
+     gradientTransform="matrix(2.774389,0,0,1.969706,-1892.179,-872.8854)"
+     x1="302.85715"
+     y1="366.64789"
+     x2="302.85715"
+     y2="609.50507" /><radialGradient
+     inkscape:collect="always"
+     xlink:href="#linearGradient5060"
+     id="radialGradient4691"
+     gradientUnits="userSpaceOnUse"
+     gradientTransform="matrix(2.774389,0,0,1.969706,-1891.633,-872.8854)"
+     cx="605.71429"
+     cy="486.64789"
+     fx="605.71429"
+     fy="486.64789"
+     r="117.14286" /><radialGradient
+     inkscape:collect="always"
+     xlink:href="#linearGradient5060"
+     id="radialGradient4693"
+     gradientUnits="userSpaceOnUse"
+     gradientTransform="matrix(-2.774389,0,0,1.969706,112.7623,-872.8854)"
+     cx="605.71429"
+     cy="486.64789"
+     fx="605.71429"
+     fy="486.64789"
+     r="117.14286" /><linearGradient
+     inkscape:collect="always"
+     xlink:href="#linearGradient5048"
+     id="linearGradient4894"
+     gradientUnits="userSpaceOnUse"
+     gradientTransform="matrix(2.774389,0,0,1.969706,-1892.179,-872.8854)"
+     x1="302.85715"
+     y1="366.64789"
+     x2="302.85715"
+     y2="609.50507" /><radialGradient
+     inkscape:collect="always"
+     xlink:href="#linearGradient5060"
+     id="radialGradient4896"
+     gradientUnits="userSpaceOnUse"
+     gradientTransform="matrix(2.774389,0,0,1.969706,-1891.633,-872.8854)"
+     cx="605.71429"
+     cy="486.64789"
+     fx="605.71429"
+     fy="486.64789"
+     r="117.14286" /><radialGradient
+     inkscape:collect="always"
+     xlink:href="#linearGradient5060"
+     id="radialGradient4898"
+     gradientUnits="userSpaceOnUse"
+     gradientTransform="matrix(-2.774389,0,0,1.969706,112.7623,-872.8854)"
+     cx="605.71429"
+     cy="486.64789"
+     fx="605.71429"
+     fy="486.64789"
+     r="117.14286" /><filter
+     inkscape:collect="always"
+     id="filter4971"
+     x="-0.064853556"
+     width="1.1297071"
+     y="-1.9456067"
+     height="4.8912134"><feGaussianBlur
+       inkscape:collect="always"
+       stdDeviation="0.81066946"
+       id="feGaussianBlur4973" /></filter><linearGradient
+     inkscape:collect="always"
+     xlink:href="#linearGradient5048"
+     id="linearGradient5083"
+     gradientUnits="userSpaceOnUse"
+     gradientTransform="matrix(2.774389,0,0,1.969706,-1892.179,-872.8854)"
+     x1="302.85715"
+     y1="366.64789"
+     x2="302.85715"
+     y2="609.50507" /><radialGradient
+     inkscape:collect="always"
+     xlink:href="#linearGradient5060"
+     id="radialGradient5085"
+     gradientUnits="userSpaceOnUse"
+     gradientTransform="matrix(2.774389,0,0,1.969706,-1891.633,-872.8854)"
+     cx="605.71429"
+     cy="486.64789"
+     fx="605.71429"
+     fy="486.64789"
+     r="117.14286" /><radialGradient
+     inkscape:collect="always"
+     xlink:href="#linearGradient5060"
+     id="radialGradient5087"
+     gradientUnits="userSpaceOnUse"
+     gradientTransform="matrix(-2.774389,0,0,1.969706,112.7623,-872.8854)"
+     cx="605.71429"
+     cy="486.64789"
+     fx="605.71429"
+     fy="486.64789"
+     r="117.14286" /><linearGradient
+     inkscape:collect="always"
+     xlink:href="#linearGradient4977"
+     id="linearGradient5089"
+     gradientUnits="userSpaceOnUse"
+     x1="23.6875"
+     y1="32"
+     x2="23.75"
+     y2="45.25" /><filter
+     inkscape:collect="always"
+     id="filter5243"><feGaussianBlur
+       inkscape:collect="always"
+       stdDeviation="0.6535853"
+       id="feGaussianBlur5245" /></filter></defs><sodipodi:namedview
+   inkscape:cy="24.435456"
+   inkscape:cx="20.268092"
+   inkscape:zoom="8"
+   inkscape:window-height="1176"
+   inkscape:window-width="1855"
+   inkscape:pageshadow="2"
+   inkscape:pageopacity="0.0"
+   borderopacity="0.21568627"
+   bordercolor="#666666"
+   pagecolor="#ffffff"
+   id="base"
+   inkscape:showpageshadow="false"
+   inkscape:window-x="65"
+   inkscape:window-y="24"
+   inkscape:current-layer="svg2"
+   fill="#555753"
+   showgrid="true"
+   stroke="#a40000"
+   showguides="true"
+   inkscape:guide-bbox="true"
+   inkscape:snap-global="false"
+   inkscape:window-maximized="1"><inkscape:grid
+     type="xygrid"
+     id="grid3818" /></sodipodi:namedview>
+	<g
+   style="display:inline"
+   id="g5022"
+   transform="matrix(0.02158196,0,0,0.01859457,234.88396,41.63767)"><rect
+     y="-150.69685"
+     x="-1559.2523"
+     height="478.35718"
+     width="1339.6335"
+     id="rect4173"
+     style="opacity:0.40206185;color:#000000;fill:url(#linearGradient5027);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible" /><path
+     sodipodi:nodetypes="cccc"
+     id="path5058"
+     d="m -219.61876,-150.68038 c 0,0 0,478.33079 0,478.33079 142.874166,0.90045 345.40022,-107.16966 345.40014,-239.196175 0,-132.026537 -159.436816,-239.134595 -345.40014,-239.134615 z"
+     style="opacity:0.40206185;color:#000000;fill:url(#radialGradient5029);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible"
+     inkscape:connector-curvature="0" /><path
+     style="opacity:0.40206185;color:#000000;fill:url(#radialGradient5031);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible"
+     d="m -1559.2523,-150.68038 c 0,0 0,478.33079 0,478.33079 -142.8742,0.90045 -345.4002,-107.16966 -345.4002,-239.196175 0,-132.026537 159.4368,-239.134595 345.4002,-239.134615 z"
+     id="path5018"
+     sodipodi:nodetypes="cccc"
+     inkscape:connector-curvature="0" /></g><path
+   style="color:#000000;fill:url(#linearGradient1514);fill-opacity:1;fill-rule:nonzero;stroke:#757575;stroke-width:1.0000006;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible"
+   d="m 213.38103,8.1833733 5.95746,0 c 0.83973,0 13.88647,15.4353277 13.88647,16.3406587 l -0.44352,18.496745 c 0,0.905333 -0.67603,1.634177 -1.51576,1.634177 l -31.45728,0 c -0.83973,0 -1.51576,-0.728844 -1.51576,-1.634177 l 0.0565,-18.496745 c 0,-0.905331 14.19218,-16.3406587 15.03191,-16.3406587 z"
+   id="rect1512"
+   sodipodi:nodetypes="ccccccccc"
+   inkscape:connector-curvature="0" /><path
+   style="fill:none"
+   id="path5"
+   d="m 238.72503,45.735573 -45.3249,0 0,-45.32489746 45.3249,0 0,45.32489746 z"
+   inkscape:connector-curvature="0" /><path
+   style="fill:url(#linearGradient2335);fill-opacity:1;fill-rule:evenodd"
+   id="path2327"
+   d="m 214.76145,29 -0.0457,15.090942 -11.84279,0 L 202.76145,29 l 12,0 z"
+   clip-rule="evenodd"
+   sodipodi:nodetypes="ccccc"
+   inkscape:connector-curvature="0" /><path
+   sodipodi:nodetypes="ccccccccc"
+   id="path2357"
+   d="m 213.54191,9.405584 5.5591,0 c 0.78358,0 13.00087,14.399588 13.00087,15.244172 l -0.34716,18.212311 c 0,0.459259 -0.14374,0.653465 -0.51237,0.653465 l -31.38721,0.01428 c -0.36863,0 -0.58396,-0.07992 -0.58396,-0.45355 l 0.21534,-18.426506 c 0,-0.844584 13.27181,-15.244172 14.05539,-15.244172 z"
+   style="opacity:0.3125;color:#000000;fill:none;stroke:#ffffff;stroke-width:1.00000012;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible"
+   inkscape:connector-curvature="0" /><path
+   clip-rule="evenodd"
+   d="m 198.96898,27.943053 -0.0543,2.595194 18.36817,-13.179254 15.28639,11.154428 0.0713,-0.311714 -16.37045,-15.904131 -17.30116,15.645477 z"
+   id="path23"
+   style="opacity:0.2;fill:url(#radialGradient2384);fill-opacity:1;fill-rule:evenodd"
+   sodipodi:nodetypes="ccccccc"
+   inkscape:connector-curvature="0" /><path
+   clip-rule="evenodd"
+   d="m 213.76145,30 0,14.090942 -9.81103,0 L 203.76145,30 l 10,0 z"
+   id="path188"
+   style="fill:url(#linearGradient2412);fill-opacity:1;fill-rule:evenodd"
+   sodipodi:nodetypes="ccccc"
+   inkscape:connector-curvature="0" /><path
+   style="opacity:0.40909089;fill:url(#radialGradient2325);fill-opacity:1;fill-rule:evenodd"
+   id="path2315"
+   d="m 211.33831,36.44767 c 0.67279,0 1.21662,0.474605 1.21662,1.058507 0,0.589811 -0.54383,1.068355 -1.21662,1.068355 -0.67227,0 -1.21869,-0.478544 -1.21869,-1.068355 5.2e-4,-0.583902 0.54642,-1.058507 1.21869,-1.058507 z"
+   clip-rule="evenodd"
+   inkscape:connector-curvature="0" /><path
+   clip-rule="evenodd"
+   d="m 211.22377,35.932229 c 0.67279,0 1.21661,0.474605 1.21661,1.058507 0,0.589809 -0.54382,1.068353 -1.21661,1.068353 -0.67228,0 -1.21869,-0.478544 -1.21869,-1.068353 5.2e-4,-0.583902 0.54641,-1.058507 1.21869,-1.058507 z"
+   id="path217"
+   style="fill:url(#radialGradient2313);fill-opacity:1;fill-rule:evenodd"
+   inkscape:connector-curvature="0" /><path
+   d="m 216.2092,11.559337 18.92706,17.169868 0.49468,0.391991 0.40368,-0.171385 -0.37287,-0.761673 -0.27762,-0.223436 -19.17493,-15.572306 -19.38951,15.743335 -0.23761,0.14412 -0.21671,0.706786 0.43342,0.129248 0.38456,-0.308423 19.02585,-17.248125 z"
+   id="path342"
+   style="fill:url(#XMLID_39_)"
+   sodipodi:nodetypes="ccccccccccccc"
+   inkscape:connector-curvature="0" /><path
+   style="fill:#ef2929;stroke:#a40000"
+   id="path362"
+   d="m 216.09162,2.2713382 -21.88174,18.1013368 -0.62473,7.165928 1.99994,2.064323 c 0,0 20.40738,-17.157285 20.62409,-17.327963 l 19.63254,17.54326 1.89843,-2.323997 -1.61579,-7.111374 -19.91518,-18.2159732 -0.11756,0.1044594 z"
+   sodipodi:nodetypes="cccccccccc"
+   inkscape:connector-curvature="0" />
+<path
+   style="opacity:0.40909089;color:#000000;fill:url(#radialGradient2305);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible"
+   d="M 194.6028,20.613129 194.31124,27.236494 216.13067,8.980075 216.06034,3.0867443 194.6028,20.613129 z"
+   id="path1536"
+   sodipodi:nodetypes="ccccc"
+   inkscape:connector-curvature="0" /><path
+   sodipodi:nodetypes="ccccc"
+   id="path2337"
+   d="m 216.24522,8.7509884 0.0995,-5.8411017 19.32896,17.6519533 1.49181,6.500812 -20.92023,-18.3116636 z"
+   style="opacity:0.13636367;color:#000000;fill:url(#radialGradient2339);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible"
+   inkscape:connector-curvature="0" /><path
+   style="opacity:0.31818183;color:#000000;fill:none;stroke:#ffffff;stroke-width:0.99999934;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible"
+   d="m 218.86368,27.719824 9.04,0 c 0.77059,0 1.39096,0.62037 1.39096,1.390967 l -0.008,9.079221 c 0,0.770596 -0.59632,1.265969 -1.36691,1.265969 l -9.05609,0 c -0.77059,0 -1.39096,-0.620373 -1.39096,-1.390969 l 0,-8.954221 c 0,-0.770597 0.62037,-1.390967 1.39096,-1.390967 z"
+   id="rect2361"
+   sodipodi:nodetypes="ccccccccc"
+   inkscape:connector-curvature="0" /><rect
+   style="color:#000000;fill:#3465a4;fill-opacity:1;fill-rule:nonzero;stroke:#757575;stroke-width:0.9999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible"
+   id="rect3263"
+   width="10.001333"
+   height="9.9624557"
+   x="218.26923"
+   y="28.514256"
+   rx="0.38128215"
+   ry="0.38128215" /><path
+   style="opacity:0.39772728;color:#000000;fill:url(#radialGradient2374);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.99999958;marker:none;visibility:visible;display:inline;overflow:visible"
+   d="m 218.86857,34.408261 c 3.61798,0.331177 5.52773,-1.445704 8.86815,-1.55274 l 0.0247,-3.849491 -8.91161,-0.006 0.0187,5.408261 z"
+   id="rect2363"
+   sodipodi:nodetypes="ccccc"
+   inkscape:connector-curvature="0" /><g
+   transform="translate(132.18771,2.0108349)"
+   id="g4739"><path
+     sodipodi:type="arc"
+     style="fill:#6adb4d;fill-opacity:1;stroke:#34781d;stroke-width:1.05264175;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+     id="path4741"
+     sodipodi:cx="25.367456"
+     sodipodi:cy="8.2694378"
+     sodipodi:rx="5.3033009"
+     sodipodi:ry="5.3033009"
+     d="m 30.670757,8.2694378 c 0,2.9289322 -2.374368,5.3033012 -5.303301,5.3033012 -2.928932,0 -5.3033,-2.374369 -5.3033,-5.3033012 0,-2.9289322 2.374368,-5.3033009 5.3033,-5.3033009 2.928933,0 5.303301,2.3743687 5.303301,5.3033009 z"
+     transform="matrix(0.95416667,0,0,0.94583333,1.405743,0.73519001)" /><path
+     transform="matrix(0.77083333,0,0,0.77916666,6.0564434,2.1576238)"
+     d="m 30.670757,8.2694378 c 0,2.9289322 -2.374368,5.3033012 -5.303301,5.3033012 -2.928932,0 -5.3033,-2.374369 -5.3033,-5.3033012 0,-2.9289322 2.374368,-5.3033009 5.3033,-5.3033009 2.928933,0 5.303301,2.3743687 5.303301,5.3033009 z"
+     sodipodi:ry="5.3033009"
+     sodipodi:rx="5.3033009"
+     sodipodi:cy="8.2694378"
+     sodipodi:cx="25.367456"
+     id="path4743"
+     style="fill:none;stroke:#b3ff9a;stroke-width:1.29034114;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+     sodipodi:type="arc" /></g><g
+   id="g4733"
+   transform="translate(143.14786,5.0160386)"><path
+     transform="matrix(0.95416667,0,0,0.94583333,1.405743,0.73519001)"
+     d="m 30.670757,8.2694378 c 0,2.9289322 -2.374368,5.3033012 -5.303301,5.3033012 -2.928932,0 -5.3033,-2.374369 -5.3033,-5.3033012 0,-2.9289322 2.374368,-5.3033009 5.3033,-5.3033009 2.928933,0 5.303301,2.3743687 5.303301,5.3033009 z"
+     sodipodi:ry="5.3033009"
+     sodipodi:rx="5.3033009"
+     sodipodi:cy="8.2694378"
+     sodipodi:cx="25.367456"
+     id="path4735"
+     style="fill:#6adb4d;fill-opacity:1;stroke:#34781d;stroke-width:1.05264175;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+     sodipodi:type="arc" /><path
+     sodipodi:type="arc"
+     style="fill:none;stroke:#b3ff9a;stroke-width:1.29034114;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+     id="path4737"
+     sodipodi:cx="25.367456"
+     sodipodi:cy="8.2694378"
+     sodipodi:rx="5.3033009"
+     sodipodi:ry="5.3033009"
+     d="m 30.670757,8.2694378 c 0,2.9289322 -2.374368,5.3033012 -5.303301,5.3033012 -2.928932,0 -5.3033,-2.374369 -5.3033,-5.3033012 0,-2.9289322 2.374368,-5.3033009 5.3033,-5.3033009 2.928933,0 5.303301,2.3743687 5.303301,5.3033009 z"
+     transform="matrix(0.77083333,0,0,0.77916666,6.0564434,2.1576238)" /></g><g
+   transform="translate(137.13746,7.0268736)"
+   id="g4727"><path
+     sodipodi:type="arc"
+     style="fill:#6adb4d;fill-opacity:1;stroke:#34781d;stroke-width:1.05264175;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+     id="path4729"
+     sodipodi:cx="25.367456"
+     sodipodi:cy="8.2694378"
+     sodipodi:rx="5.3033009"
+     sodipodi:ry="5.3033009"
+     d="m 30.670757,8.2694378 c 0,2.9289322 -2.374368,5.3033012 -5.303301,5.3033012 -2.928932,0 -5.3033,-2.374369 -5.3033,-5.3033012 0,-2.9289322 2.374368,-5.3033009 5.3033,-5.3033009 2.928933,0 5.303301,2.3743687 5.303301,5.3033009 z"
+     transform="matrix(0.95416667,0,0,0.94583333,1.405743,0.73519001)" /><path
+     transform="matrix(0.77083333,0,0,0.77916666,6.0564434,2.1576238)"
+     d="m 30.670757,8.2694378 c 0,2.9289322 -2.374368,5.3033012 -5.303301,5.3033012 -2.928932,0 -5.3033,-2.374369 -5.3033,-5.3033012 0,-2.9289322 2.374368,-5.3033009 5.3033,-5.3033009 2.928933,0 5.303301,2.3743687 5.303301,5.3033009 z"
+     sodipodi:ry="5.3033009"
+     sodipodi:rx="5.3033009"
+     sodipodi:cy="8.2694378"
+     sodipodi:cx="25.367456"
+     id="path4731"
+     style="fill:none;stroke:#b3ff9a;stroke-width:1.29034114;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+     sodipodi:type="arc" /></g><g
+   id="g4723"
+   transform="translate(125.91213,5.9662134)"><path
+     transform="matrix(0.95416667,0,0,0.94583333,1.405743,0.73519001)"
+     d="m 30.670757,8.2694378 c 0,2.9289322 -2.374368,5.3033012 -5.303301,5.3033012 -2.928932,0 -5.3033,-2.374369 -5.3033,-5.3033012 0,-2.9289322 2.374368,-5.3033009 5.3033,-5.3033009 2.928933,0 5.303301,2.3743687 5.303301,5.3033009 z"
+     sodipodi:ry="5.3033009"
+     sodipodi:rx="5.3033009"
+     sodipodi:cy="8.2694378"
+     sodipodi:cx="25.367456"
+     id="path4719"
+     style="fill:#6adb4d;fill-opacity:1;stroke:#34781d;stroke-width:1.05264175;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+     sodipodi:type="arc" /><path
+     sodipodi:type="arc"
+     style="fill:none;stroke:#b3ff9a;stroke-width:1.29034114;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+     id="path4721"
+     sodipodi:cx="25.367456"
+     sodipodi:cy="8.2694378"
+     sodipodi:rx="5.3033009"
+     sodipodi:ry="5.3033009"
+     d="m 30.670757,8.2694378 c 0,2.9289322 -2.374368,5.3033012 -5.303301,5.3033012 -2.928932,0 -5.3033,-2.374369 -5.3033,-5.3033012 0,-2.9289322 2.374368,-5.3033009 5.3033,-5.3033009 2.928933,0 5.303301,2.3743687 5.303301,5.3033009 z"
+     transform="matrix(0.77083333,0,0,0.77916666,6.0564434,2.1576238)" /></g><g
+   id="g4695"
+   transform="matrix(1.1326331,0,0,0.44340824,131.83019,2.4215088)"><rect
+     style="fill:#8a8a8a;fill-opacity:1;stroke:none"
+     id="rect4697"
+     width="29.256544"
+     height="18.119614"
+     x="10.297243"
+     y="27.449707"
+     rx="1.7190553"
+     ry="4.3911204" /><g
+     id="g4699"><g
+       id="g4701"><rect
+         rx="1.7051755"
+         y="27.517153"
+         x="10.510214"
+         height="17.982044"
+         width="29.020325"
+         id="rect4703"
+         style="fill:none;stroke:#646464;stroke-width:1.41005611;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         ry="4.3556657" /></g><rect
+       rx="0.88575488"
+       y="29.624025"
+       x="11.337327"
+       height="13.83156"
+       width="27.319036"
+       id="rect4705"
+       style="fill:none;stroke:#b3b3b3;stroke-width:1.40048993;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       ry="2.2625546" /></g></g><g
+   transform="matrix(0.01936185,0,0,0.01859457,177.66659,40.621203)"
+   id="g4681"
+   style="display:inline"><rect
+     style="opacity:0.40206185;color:#000000;fill:url(#linearGradient4689);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible"
+     id="rect4683"
+     width="1339.6335"
+     height="478.35718"
+     x="-1559.2523"
+     y="-150.69685" /><path
+     inkscape:connector-curvature="0"
+     style="opacity:0.40206185;color:#000000;fill:url(#radialGradient4691);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible"
+     d="m -219.61876,-150.68038 c 0,0 0,478.33079 0,478.33079 142.874166,0.90045 345.40022,-107.16966 345.40014,-239.196175 0,-132.026537 -159.436816,-239.134595 -345.40014,-239.134615 z"
+     id="path4685"
+     sodipodi:nodetypes="cccc" /><path
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="cccc"
+     id="path4687"
+     d="m -1559.2523,-150.68038 c 0,0 0,478.33079 0,478.33079 -142.8742,0.90045 -345.4002,-107.16966 -345.4002,-239.196175 0,-132.026537 159.4368,-239.134595 345.4002,-239.134615 z"
+     style="opacity:0.40206185;color:#000000;fill:url(#radialGradient4693);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible" /></g><g
+   id="g4672"
+   transform="translate(135.19291,-2.9168155)"><rect
+     ry="1.9470588"
+     rx="1.9470588"
+     y="27.449707"
+     x="10.297243"
+     height="18.119614"
+     width="29.256544"
+     id="rect4658"
+     style="fill:#dddddd;fill-opacity:1;stroke:none" /><g
+     id="g4667"><g
+       id="g4664"><rect
+         ry="1.9313381"
+         style="fill:none;stroke:#646464;stroke-width:0.99927008;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         id="rect4660"
+         width="29.020325"
+         height="17.982044"
+         x="10.510214"
+         y="27.517153"
+         rx="1.9313381" /></g><rect
+       ry="1.0032353"
+       style="fill:none;stroke:#f6f6f6;stroke-width:0.99249077;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       id="rect4662"
+       width="26.967867"
+       height="16.005489"
+       x="11.532422"
+       y="28.489801"
+       rx="1.0032353" /></g></g><path
+   transform="matrix(1.0023678,0,0,0.95596394,135.13372,-0.0273148)"
+   d="m 35,33 a 10,10 0 1 1 -20,0 10,10 0 1 1 20,0 z"
+   sodipodi:ry="10"
+   sodipodi:rx="10"
+   sodipodi:cy="33"
+   sodipodi:cx="25"
+   id="path4679"
+   style="fill:#b8b8b8;fill-opacity:1;fill-rule:evenodd;stroke:none"
+   sodipodi:type="arc" /><path
+   sodipodi:type="arc"
+   style="fill:#b8b8b8;fill-opacity:1;fill-rule:evenodd;stroke:#646464;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+   id="path3820"
+   sodipodi:cx="25"
+   sodipodi:cy="33"
+   sodipodi:rx="10"
+   sodipodi:ry="10"
+   d="m 35,33 a 10,10 0 1 1 -20,0 10,10 0 1 1 20,0 z"
+   transform="matrix(0.94933484,0,0,0.95596394,136.45954,-1.4857225)" /><path
+   transform="matrix(0.6928006,0,0,0.69727163,142.8508,8.0344445)"
+   d="m 35,33 a 10,10 0 1 1 -20,0 10,10 0 1 1 20,0 z"
+   sodipodi:ry="10"
+   sodipodi:rx="10"
+   sodipodi:cy="33"
+   sodipodi:cx="25"
+   id="path4590"
+   style="fill:#f4f4f4;fill-opacity:1;fill-rule:evenodd;stroke:none"
+   sodipodi:type="arc" /><g
+   id="g4644"
+   transform="matrix(0.70710678,0.70710678,-0.70710678,0.70710678,165.84459,-10.924363)"><rect
+     style="fill:#232323;fill-opacity:1;stroke:none"
+     id="rect4646"
+     width="0.68500972"
+     height="1.1490486"
+     x="24.638252"
+     y="26.853086" /><rect
+     y="37.990021"
+     x="24.660349"
+     height="1.1490486"
+     width="0.68500972"
+     id="rect4648"
+     style="fill:#232323;fill-opacity:1;stroke:none" /></g><g
+   id="g4600"
+   style="fill:#a2a2a2;fill-opacity:1"
+   transform="translate(135.2592,-2.3643883)"><rect
+     style="fill:#a2a2a2;fill-opacity:1;stroke:none"
+     id="rect4602"
+     width="1"
+     height="5.9375"
+     x="40.742825"
+     y="-1.6325631"
+     transform="matrix(0.67898035,0.73415645,-0.73415645,0.67898035,0,0)" /><path
+     sodipodi:type="arc"
+     style="fill:#a2a2a2;fill-opacity:1;stroke:none"
+     id="path4604"
+     sodipodi:cx="25.03125"
+     sodipodi:cy="33.03125"
+     sodipodi:rx="1.03125"
+     sodipodi:ry="0.96875"
+     d="M 26.0625,33.03125 C 26.0625,33.566276 25.600794,34 25.03125,34 24.461706,34 24,33.566276 24,33.03125 c 0,-0.535026 0.461706,-0.96875 1.03125,-0.96875 0.569544,0 1.03125,0.433724 1.03125,0.96875 z"
+     transform="matrix(0.95714504,0,0,1.0228099,1.028519,-0.77553647)" /></g><g
+   id="g4596"
+   transform="translate(135.19291,-2.9168155)"><rect
+     transform="matrix(0.67898035,0.73415645,-0.73415645,0.67898035,0,0)"
+     y="-1.6325631"
+     x="40.742825"
+     height="5.9375"
+     width="1"
+     id="rect4592"
+     style="fill:#ff2121;fill-opacity:1;stroke:none" /><path
+     transform="matrix(0.95714504,0,0,1.0228099,1.028519,-0.77553647)"
+     d="M 26.0625,33.03125 C 26.0625,33.566276 25.600794,34 25.03125,34 24.461706,34 24,33.566276 24,33.03125 c 0,-0.535026 0.461706,-0.96875 1.03125,-0.96875 0.569544,0 1.03125,0.433724 1.03125,0.96875 z"
+     sodipodi:ry="0.96875"
+     sodipodi:rx="1.03125"
+     sodipodi:cy="33.03125"
+     sodipodi:cx="25.03125"
+     id="path4594"
+     style="fill:#ff2121;fill-opacity:1;stroke:none"
+     sodipodi:type="arc" /></g><path
+   sodipodi:type="arc"
+   style="fill:none;stroke:#646464;stroke-width:1.37966764;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+   id="path4608"
+   sodipodi:cx="25"
+   sodipodi:cy="33"
+   sodipodi:rx="10"
+   sodipodi:ry="10"
+   d="m 35,33 a 10,10 0 1 1 -20,0 10,10 0 1 1 20,0 z"
+   transform="matrix(0.74693846,0,0,0.74919978,141.5084,5.3595919)" /><g
+   id="g4628"
+   transform="translate(135.19291,-2.9168155)"><rect
+     y="26.853086"
+     x="24.638252"
+     height="1.1490486"
+     width="0.68500972"
+     id="rect4624"
+     style="fill:#232323;fill-opacity:1;stroke:none" /><rect
+     style="fill:#232323;fill-opacity:1;stroke:none"
+     id="rect4626"
+     width="0.68500972"
+     height="1.1490486"
+     x="24.660349"
+     y="37.990021" /></g><g
+   id="g4632"
+   transform="matrix(0,1,-1,0,193.18079,5.087457)"><rect
+     style="fill:#232323;fill-opacity:1;stroke:none"
+     id="rect4634"
+     width="0.68500972"
+     height="1.1490486"
+     x="24.638252"
+     y="26.853086" /><rect
+     y="37.990021"
+     x="24.660349"
+     height="1.1490486"
+     width="0.68500972"
+     id="rect4636"
+     style="fill:#232323;fill-opacity:1;stroke:none" /></g><rect
+   style="fill:#232323;fill-opacity:1;stroke:none"
+   id="rect4640"
+   width="0.68500972"
+   height="1.1490486"
+   x="-92.352005"
+   y="-140.67993"
+   transform="matrix(-0.70710678,0.70710678,-0.70710678,-0.70710678,0,0)" /><rect
+   y="-129.543"
+   x="-92.329903"
+   height="1.1490486"
+   width="0.68500972"
+   id="rect4642"
+   style="fill:#232323;fill-opacity:1;stroke:none"
+   transform="matrix(-0.70710678,0.70710678,-0.70710678,-0.70710678,0,0)" /><g
+   transform="matrix(1.2021267,0,0,0.11694557,130.11353,11.401153)"
+   id="g4707"><rect
+     ry="16.649275"
+     rx="1.6196786"
+     y="27.449707"
+     x="10.297243"
+     height="18.119614"
+     width="29.256544"
+     id="rect4709"
+     style="fill:#d4d4d4;fill-opacity:1;stroke:none" /><g
+     id="g4711"><g
+       id="g4713"><rect
+         ry="16.514845"
+         style="fill:none;stroke:#646464;stroke-width:2.66511464;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         id="rect4715"
+         width="29.020325"
+         height="17.982044"
+         x="10.510214"
+         y="27.517153"
+         rx="1" /></g></g></g><g
+   style="display:inline"
+   id="g4874"
+   transform="matrix(0.01936185,0,0,0.01859457,41.505849,29.496203)"><rect
+     y="-150.69685"
+     x="-1559.2523"
+     height="478.35718"
+     width="1339.6335"
+     id="rect4876"
+     style="opacity:0.40206185;color:#000000;fill:url(#linearGradient4894);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible" /><path
+     sodipodi:nodetypes="cccc"
+     id="path4878"
+     d="m -219.61876,-150.68038 c 0,0 0,478.33079 0,478.33079 142.874166,0.90045 345.40022,-107.16966 345.40014,-239.196175 0,-132.026537 -159.436816,-239.134595 -345.40014,-239.134615 z"
+     style="opacity:0.40206185;color:#000000;fill:url(#radialGradient4896);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible"
+     inkscape:connector-curvature="0" /><path
+     style="opacity:0.40206185;color:#000000;fill:url(#radialGradient4898);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible"
+     d="m -1559.2523,-150.68038 c 0,0 0,478.33079 0,478.33079 -142.8742,0.90045 -345.4002,-107.16966 -345.4002,-239.196175 0,-132.026537 159.4368,-239.134595 345.4002,-239.134615 z"
+     id="path4880"
+     sodipodi:nodetypes="cccc"
+     inkscape:connector-curvature="0" /></g><g
+   transform="translate(89,-11.125)"
+   id="g5031"><g
+     style="display:inline"
+     id="g5033"
+     transform="matrix(0.01936185,0,0,0.01859457,41.505849,40.621203)"><rect
+       y="-150.69685"
+       x="-1559.2523"
+       height="478.35718"
+       width="1339.6335"
+       id="rect5035"
+       style="opacity:0.40206185;color:#000000;fill:url(#linearGradient5083);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible" /><path
+       sodipodi:nodetypes="cccc"
+       id="path5037"
+       d="m -219.61876,-150.68038 c 0,0 0,478.33079 0,478.33079 142.874166,0.90045 345.40022,-107.16966 345.40014,-239.196175 0,-132.026537 -159.436816,-239.134595 -345.40014,-239.134615 z"
+       style="opacity:0.40206185;color:#000000;fill:url(#radialGradient5085);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible"
+       inkscape:connector-curvature="0" /><path
+       style="opacity:0.40206185;color:#000000;fill:url(#radialGradient5087);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible"
+       d="m -1559.2523,-150.68038 c 0,0 0,478.33079 0,478.33079 -142.8742,0.90045 -345.4002,-107.16966 -345.4002,-239.196175 0,-132.026537 159.4368,-239.134595 345.4002,-239.134615 z"
+       id="path5039"
+       sodipodi:nodetypes="cccc"
+       inkscape:connector-curvature="0" /></g><g
+     transform="translate(-0.96783034,-2.9168155)"
+     id="g5041"><rect
+       style="fill:#eaeaea;fill-opacity:1;stroke:none"
+       id="rect5043"
+       width="29.256544"
+       height="18.119614"
+       x="10.297243"
+       y="27.449707"
+       rx="1.9470588"
+       ry="1.9470588" /><g
+       id="g5045"><g
+         id="g5047"><rect
+           rx="1.9313381"
+           y="27.517153"
+           x="10.510214"
+           height="17.982044"
+           width="29.020325"
+           id="rect5049"
+           style="fill:none;stroke:#646464;stroke-width:0.99927008;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           ry="1.9313381" /></g><rect
+         rx="1.0032353"
+         y="28.489801"
+         x="11.532422"
+         height="16.005489"
+         width="26.967867"
+         id="rect5051"
+         style="fill:none;stroke:#ffffff;stroke-width:0.99249077;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         ry="1.0032353" /></g></g><g
+     id="g5053"
+     transform="matrix(1,0,0,0.9039548,0,2.5932203)"><rect
+       y="27"
+       x="13.0625"
+       height="11.0625"
+       width="1"
+       id="rect5055"
+       style="fill:#000000;fill-opacity:1;stroke:none" /><rect
+       style="fill:#000000;fill-opacity:1;stroke:none"
+       id="rect5057"
+       width="1"
+       height="11.0625"
+       x="15.0625"
+       y="27" /><rect
+       y="27"
+       x="18"
+       height="11.0625"
+       width="1"
+       id="rect5059"
+       style="fill:#000000;fill-opacity:1;stroke:none" /><rect
+       style="fill:#000000;fill-opacity:1;stroke:none"
+       id="rect5061"
+       width="2"
+       height="11.0625"
+       x="19.9375"
+       y="27" /><rect
+       style="fill:#000000;fill-opacity:1;stroke:none"
+       id="rect5063"
+       width="1"
+       height="11.0625"
+       x="22.9375"
+       y="27" /><rect
+       y="27"
+       x="25.9375"
+       height="11.0625"
+       width="2.0625"
+       id="rect5065"
+       style="fill:#000000;fill-opacity:1;stroke:none" /><rect
+       style="fill:#000000;fill-opacity:1;stroke:none"
+       id="rect5067"
+       width="1.125"
+       height="11.0625"
+       x="28.9375"
+       y="27" /><rect
+       y="27"
+       x="30.9375"
+       height="11.0625"
+       width="1.125"
+       id="rect5069"
+       style="fill:#000000;fill-opacity:1;stroke:none" /><rect
+       style="fill:#000000;fill-opacity:1;stroke:none"
+       id="rect5071"
+       width="1.125"
+       height="11.0625"
+       x="33.9375"
+       y="27" /></g><text
+     xml:space="preserve"
+     style="font-size:36.59571838px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
+     x="12.981453"
+     y="40.195068"
+     id="text5073"
+     sodipodi:linespacing="125%"><tspan
+       sodipodi:role="line"
+       id="tspan5075"
+       x="12.981453"
+       y="40.195068"
+       style="font-size:3.65957189px;font-style:normal;font-variant:normal;font-weight:500;font-stretch:normal;font-family:Inconsolata;-inkscape-font-specification:Inconsolata Medium">5 92102431 8</tspan></text>
+<rect
+     style="fill:#ff0000;fill-opacity:1;stroke:none"
+     id="rect5077"
+     width="30"
+     height="1"
+     x="9.0625"
+     y="31.0625" /><rect
+     y="31.0625"
+     x="9.0625"
+     height="1"
+     width="30"
+     id="rect5079"
+     style="fill:#ff0000;fill-opacity:1;stroke:none;filter:url(#filter4971)" /><path
+     style="opacity:0.29787233;fill:url(#linearGradient5089);fill-opacity:1;stroke:none"
+     d="M 9.0625,32.0625 20,47.875 28.9375,47.9375 39,32.0625 z"
+     id="path5081"
+     inkscape:connector-curvature="0" /></g><g
+   id="g5153"
+   transform="translate(-0.375,0.125)"><rect
+     style="fill:#eaeaea;fill-opacity:1;stroke:none"
+     id="rect4884"
+     width="29.256544"
+     height="18.119614"
+     x="9.3294125"
+     y="13.407891"
+     rx="1.9470588"
+     ry="1.9470588" /><rect
+     rx="1.9313381"
+     y="12.503065"
+     x="9.5423832"
+     height="18.954315"
+     width="29.020325"
+     id="rect4890"
+     style="fill:none;stroke:#2055a8;stroke-width:0.99927008;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+     ry="1.9313381" /><rect
+     ry="1.0032355"
+     style="fill:none;stroke:#ffffff;stroke-width:0.99249083;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+     id="rect4892"
+     width="26.967867"
+     height="16.933567"
+     x="10.564591"
+     y="13.519909"
+     rx="1.0032353" /><text
+     sodipodi:linespacing="125%"
+     id="text5127"
+     y="17.738876"
+     x="12.598053"
+     style="font-size:4.47580385px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#2055a8;fill-opacity:1;stroke:none;font-family:Sans"
+     xml:space="preserve"><tspan
+       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;fill:#2055a8;fill-opacity:1;font-family:Umpush;-inkscape-font-specification:Umpush Bold"
+       y="17.738876"
+       x="12.598053"
+       id="tspan5129"
+       sodipodi:role="line">Bancontact</tspan></text>
+<text
+     xml:space="preserve"
+     style="font-size:4.67030001px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#2055a8;fill-opacity:1;stroke:none;font-family:Sans"
+     x="12.626733"
+     y="29.062328"
+     id="text5131"
+     sodipodi:linespacing="125%"><tspan
+       sodipodi:role="line"
+       id="tspan5133"
+       x="12.626733"
+       y="29.062328"
+       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;fill:#2055a8;fill-opacity:1;font-family:Umpush;-inkscape-font-specification:Umpush Bold">Mistercash</tspan></text>
+<rect
+     y="21.973692"
+     x="13.037281"
+     height="2.032932"
+     width="12.241786"
+     id="rect5135"
+     style="fill:#2055a8;fill-opacity:1;stroke:none" /><rect
+     transform="scale(-1,-1)"
+     style="fill:#ffd91c;fill-opacity:1;stroke:none"
+     id="rect5145"
+     width="12.330174"
+     height="2.032932"
+     x="-35.045982"
+     y="-22.058022" /><rect
+     y="-27.366743"
+     x="-38.048687"
+     height="3.6166389"
+     width="2.9610093"
+     id="rect5147"
+     style="fill:#ffd91c;fill-opacity:1;stroke:none"
+     transform="matrix(-1,0,0.53766595,-0.84315795,0,0)" /><rect
+     transform="matrix(1,0,-0.53766595,0.84315795,0,0)"
+     style="fill:#2055a8;fill-opacity:1;stroke:none"
+     id="rect5137"
+     width="2.9610093"
+     height="3.6166389"
+     x="37.977596"
+     y="24.850821" /></g></svg>
\ No newline at end of file
diff --git a/addons/point_of_sale/static/src/img/icons/scan.svg b/addons/point_of_sale/static/src/img/icons/scan.svg
new file mode 100644
index 00000000000..4d753acf638
--- /dev/null
+++ b/addons/point_of_sale/static/src/img/icons/scan.svg
@@ -0,0 +1,984 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="48"
+   height="48"
+   overflow="visible"
+   enable-background="new 0 0 128 129.396"
+   xml:space="preserve"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.48.3.1 r9886"
+   sodipodi:docname="scale.svg"
+   version="1.0"
+   inkscape:export-filename="/home/fva/Code/openerp/src/addons/trunk-pos-fva/point_of_sale/static/src/img/scale.png"
+   inkscape:export-xdpi="600"
+   inkscape:export-ydpi="600"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"><metadata
+   id="metadata367"><rdf:RDF><cc:Work
+       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><cc:license
+         rdf:resource="http://creativecommons.org/licenses/publicdomain/" /><dc:title></dc:title><dc:creator><cc:Agent><dc:title>Jakub Steiner</dc:title></cc:Agent></dc:creator><dc:source>http://jimmac.musichall.cz</dc:source><dc:subject><rdf:Bag><rdf:li>home</rdf:li><rdf:li>return</rdf:li><rdf:li>go</rdf:li><rdf:li>default</rdf:li><rdf:li>user</rdf:li><rdf:li>directory</rdf:li></rdf:Bag></dc:subject><dc:contributor><cc:Agent><dc:title>Tuomas Kuosmanen</dc:title></cc:Agent></dc:contributor></cc:Work><cc:License
+       rdf:about="http://creativecommons.org/licenses/publicdomain/"><cc:permits
+         rdf:resource="http://creativecommons.org/ns#Reproduction" /><cc:permits
+         rdf:resource="http://creativecommons.org/ns#Distribution" /><cc:permits
+         rdf:resource="http://creativecommons.org/ns#DerivativeWorks" /></cc:License></rdf:RDF></metadata><defs
+   id="defs365"><linearGradient
+     inkscape:collect="always"
+     id="linearGradient4977"><stop
+       style="stop-color:#ff0000;stop-opacity:1;"
+       offset="0"
+       id="stop4979" /><stop
+       style="stop-color:#ff0000;stop-opacity:0"
+       offset="1"
+       id="stop4981" /></linearGradient><inkscape:perspective
+     sodipodi:type="inkscape:persp3d"
+     inkscape:vp_x="0 : 24 : 1"
+     inkscape:vp_y="0 : 1000 : 0"
+     inkscape:vp_z="48 : 24 : 1"
+     inkscape:persp3d-origin="24 : 16 : 1"
+     id="perspective92" /><radialGradient
+     inkscape:collect="always"
+     xlink:href="#linearGradient5060"
+     id="radialGradient5031"
+     gradientUnits="userSpaceOnUse"
+     gradientTransform="matrix(-2.774389,0,0,1.969706,112.7623,-872.8854)"
+     cx="605.71429"
+     cy="486.64789"
+     fx="605.71429"
+     fy="486.64789"
+     r="117.14286" /><linearGradient
+     inkscape:collect="always"
+     id="linearGradient5060"><stop
+       style="stop-color:black;stop-opacity:1;"
+       offset="0"
+       id="stop5062" /><stop
+       style="stop-color:black;stop-opacity:0;"
+       offset="1"
+       id="stop5064" /></linearGradient><radialGradient
+     inkscape:collect="always"
+     xlink:href="#linearGradient5060"
+     id="radialGradient5029"
+     gradientUnits="userSpaceOnUse"
+     gradientTransform="matrix(2.774389,0,0,1.969706,-1891.633,-872.8854)"
+     cx="605.71429"
+     cy="486.64789"
+     fx="605.71429"
+     fy="486.64789"
+     r="117.14286" /><linearGradient
+     id="linearGradient5048"><stop
+       style="stop-color:black;stop-opacity:0;"
+       offset="0"
+       id="stop5050" /><stop
+       id="stop5056"
+       offset="0.5"
+       style="stop-color:black;stop-opacity:1;" /><stop
+       style="stop-color:black;stop-opacity:0;"
+       offset="1"
+       id="stop5052" /></linearGradient><linearGradient
+     inkscape:collect="always"
+     xlink:href="#linearGradient5048"
+     id="linearGradient5027"
+     gradientUnits="userSpaceOnUse"
+     gradientTransform="matrix(2.774389,0,0,1.969706,-1892.179,-872.8854)"
+     x1="302.85715"
+     y1="366.64789"
+     x2="302.85715"
+     y2="609.50507" /><linearGradient
+     id="linearGradient2406"><stop
+       style="stop-color:#7c7e79;stop-opacity:1;"
+       offset="0"
+       id="stop2408" /><stop
+       id="stop2414"
+       offset="0.1724138"
+       style="stop-color:#848681;stop-opacity:1;" /><stop
+       style="stop-color:#898c86;stop-opacity:1;"
+       offset="1"
+       id="stop2410" /></linearGradient><linearGradient
+     inkscape:collect="always"
+     id="linearGradient2390"><stop
+       style="stop-color:#919191;stop-opacity:1;"
+       offset="0"
+       id="stop2392" /><stop
+       style="stop-color:#919191;stop-opacity:0;"
+       offset="1"
+       id="stop2394" /></linearGradient><linearGradient
+     inkscape:collect="always"
+     id="linearGradient2378"><stop
+       style="stop-color:#575757;stop-opacity:1;"
+       offset="0"
+       id="stop2380" /><stop
+       style="stop-color:#575757;stop-opacity:0;"
+       offset="1"
+       id="stop2382" /></linearGradient><linearGradient
+     inkscape:collect="always"
+     id="linearGradient2368"><stop
+       style="stop-color:#ffffff;stop-opacity:1;"
+       offset="0"
+       id="stop2370" /><stop
+       style="stop-color:#ffffff;stop-opacity:0;"
+       offset="1"
+       id="stop2372" /></linearGradient><linearGradient
+     inkscape:collect="always"
+     id="linearGradient2349"><stop
+       style="stop-color:#000000;stop-opacity:1;"
+       offset="0"
+       id="stop2351" /><stop
+       style="stop-color:#000000;stop-opacity:0;"
+       offset="1"
+       id="stop2353" /></linearGradient><linearGradient
+     id="linearGradient2341"><stop
+       id="stop2343"
+       offset="0"
+       style="stop-color:#000000;stop-opacity:1;" /><stop
+       id="stop2345"
+       offset="1"
+       style="stop-color:#000000;stop-opacity:0;" /></linearGradient><linearGradient
+     id="linearGradient2329"><stop
+       style="stop-color:#000000;stop-opacity:0.18556701;"
+       offset="0"
+       id="stop2331" /><stop
+       style="stop-color:#ffffff;stop-opacity:1;"
+       offset="1"
+       id="stop2333" /></linearGradient><linearGradient
+     inkscape:collect="always"
+     id="linearGradient2319"><stop
+       style="stop-color:#000000;stop-opacity:1;"
+       offset="0"
+       id="stop2321" /><stop
+       style="stop-color:#000000;stop-opacity:0;"
+       offset="1"
+       id="stop2323" /></linearGradient><linearGradient
+     id="linearGradient2307"><stop
+       style="stop-color:#edd400;stop-opacity:1;"
+       offset="0"
+       id="stop2309" /><stop
+       style="stop-color:#998800;stop-opacity:1;"
+       offset="1"
+       id="stop2311" /></linearGradient><linearGradient
+     inkscape:collect="always"
+     id="linearGradient2299"><stop
+       style="stop-color:#ffffff;stop-opacity:1;"
+       offset="0"
+       id="stop2301" /><stop
+       style="stop-color:#ffffff;stop-opacity:0;"
+       offset="1"
+       id="stop2303" /></linearGradient><linearGradient
+     id="XMLID_2_"
+     gradientUnits="userSpaceOnUse"
+     x1="80.223602"
+     y1="117.5205"
+     x2="48.046001"
+     y2="59.7995"
+     gradientTransform="matrix(0.314683,0.000000,0.000000,0.314683,4.128264,3.742874)">
+				<stop
+   offset="0"
+   style="stop-color:#CCCCCC"
+   id="stop17" />
+				<stop
+   offset="0.9831"
+   style="stop-color:#FFFFFF"
+   id="stop19" />
+				<midPointStop
+   offset="0"
+   style="stop-color:#CCCCCC"
+   id="midPointStop48" />
+				<midPointStop
+   offset="0.5"
+   style="stop-color:#CCCCCC"
+   id="midPointStop50" />
+				<midPointStop
+   offset="0.9831"
+   style="stop-color:#FFFFFF"
+   id="midPointStop52" />
+			</linearGradient><linearGradient
+     inkscape:collect="always"
+     xlink:href="#XMLID_2_"
+     id="linearGradient1514"
+     gradientUnits="userSpaceOnUse"
+     gradientTransform="matrix(0.336922,0,0,0.166888,143.49433,15.46151)"
+     x1="52.006104"
+     y1="166.1331"
+     x2="14.049017"
+     y2="-42.218513" /><linearGradient
+     id="XMLID_39_"
+     gradientUnits="userSpaceOnUse"
+     x1="64.387703"
+     y1="65.124001"
+     x2="64.387703"
+     y2="35.569"
+     gradientTransform="matrix(0.354101,0,0,0.354101,127.15013,-0.08364921)">
+						<stop
+   offset="0"
+   style="stop-color:#FFFFFF"
+   id="stop336" />
+						<stop
+   offset="0.8539"
+   style="stop-color:#FF6200"
+   id="stop338" />
+						<stop
+   offset="1"
+   style="stop-color:#F25D00"
+   id="stop340" />
+						<midPointStop
+   offset="0"
+   style="stop-color:#FFFFFF"
+   id="midPointStop335" />
+						<midPointStop
+   offset="0.5"
+   style="stop-color:#FFFFFF"
+   id="midPointStop337" />
+						<midPointStop
+   offset="0.8539"
+   style="stop-color:#FF6200"
+   id="midPointStop339" />
+						<midPointStop
+   offset="0.5"
+   style="stop-color:#FF6200"
+   id="midPointStop341" />
+						<midPointStop
+   offset="1"
+   style="stop-color:#F25D00"
+   id="midPointStop343" />
+					</linearGradient><radialGradient
+     inkscape:collect="always"
+     xlink:href="#linearGradient2299"
+     id="radialGradient2305"
+     cx="7.5326638"
+     cy="24.202574"
+     fx="7.5326638"
+     fy="24.202574"
+     r="8.2452128"
+     gradientTransform="matrix(4.100086,0,0,4.201322,100.09639,-78.53967)"
+     gradientUnits="userSpaceOnUse" /><radialGradient
+     inkscape:collect="always"
+     xlink:href="#linearGradient2307"
+     id="radialGradient2313"
+     cx="19.985598"
+     cy="36.77816"
+     fx="19.985598"
+     fy="36.77816"
+     r="1.0821035"
+     gradientTransform="matrix(1.125263,0,0,0.982744,122.08278,0.565787)"
+     gradientUnits="userSpaceOnUse" /><radialGradient
+     inkscape:collect="always"
+     xlink:href="#linearGradient2319"
+     id="radialGradient2325"
+     cx="20.443665"
+     cy="37.425829"
+     fx="20.443665"
+     fy="37.425829"
+     r="1.0821035"
+     gradientTransform="matrix(1.125263,0,0,0.982744,122.08278,0.731106)"
+     gradientUnits="userSpaceOnUse" /><linearGradient
+     inkscape:collect="always"
+     xlink:href="#linearGradient2329"
+     id="linearGradient2335"
+     x1="17.602522"
+     y1="26.057423"
+     x2="17.682528"
+     y2="32.654099"
+     gradientUnits="userSpaceOnUse"
+     gradientTransform="matrix(0.898789,0,0,1.071914,125.98948,-2.080838)" /><radialGradient
+     inkscape:collect="always"
+     xlink:href="#linearGradient2341"
+     id="radialGradient2339"
+     gradientUnits="userSpaceOnUse"
+     gradientTransform="matrix(4.100086,0,0,-4.201322,120.31334,105.3535)"
+     cx="11.68129"
+     cy="19.554111"
+     fx="11.68129"
+     fy="19.554111"
+     r="8.2452126" /><radialGradient
+     inkscape:collect="always"
+     xlink:href="#linearGradient2349"
+     id="radialGradient2355"
+     cx="24.023088"
+     cy="40.56913"
+     fx="24.023088"
+     fy="40.56913"
+     r="16.28684"
+     gradientTransform="matrix(1.000000,0.000000,0.000000,0.431250,1.157278e-15,23.07369)"
+     gradientUnits="userSpaceOnUse" /><radialGradient
+     inkscape:collect="always"
+     xlink:href="#linearGradient2368"
+     id="radialGradient2374"
+     cx="29.913452"
+     cy="30.442923"
+     fx="29.913452"
+     fy="30.442923"
+     r="4.0018832"
+     gradientTransform="matrix(3.751495,0,0,3.147818,43.502383,-65.70704)"
+     gradientUnits="userSpaceOnUse" /><radialGradient
+     inkscape:collect="always"
+     xlink:href="#linearGradient2378"
+     id="radialGradient2384"
+     cx="24.195112"
+     cy="10.577631"
+     fx="24.195112"
+     fy="10.577631"
+     r="15.242914"
+     gradientTransform="matrix(1.125263,-3.585417e-8,4.269819e-8,1.340059,122.50475,1.355395)"
+     gradientUnits="userSpaceOnUse" /><linearGradient
+     inkscape:collect="always"
+     xlink:href="#linearGradient2390"
+     id="linearGradient2396"
+     x1="30.603519"
+     y1="37.337803"
+     x2="30.603519"
+     y2="36.112415"
+     gradientUnits="userSpaceOnUse"
+     gradientTransform="matrix(1.263867,0,0,0.859794,-6.499556,8.390924)" /><linearGradient
+     inkscape:collect="always"
+     xlink:href="#linearGradient2406"
+     id="linearGradient2412"
+     x1="17.850183"
+     y1="28.939463"
+     x2="19.040216"
+     y2="41.03223"
+     gradientUnits="userSpaceOnUse"
+     gradientTransform="matrix(0.888785,0,0,1.08932,127.92244,-1.524336)" /><linearGradient
+     inkscape:collect="always"
+     xlink:href="#linearGradient5048"
+     id="linearGradient4689"
+     gradientUnits="userSpaceOnUse"
+     gradientTransform="matrix(2.774389,0,0,1.969706,-1892.179,-872.8854)"
+     x1="302.85715"
+     y1="366.64789"
+     x2="302.85715"
+     y2="609.50507" /><radialGradient
+     inkscape:collect="always"
+     xlink:href="#linearGradient5060"
+     id="radialGradient4691"
+     gradientUnits="userSpaceOnUse"
+     gradientTransform="matrix(2.774389,0,0,1.969706,-1891.633,-872.8854)"
+     cx="605.71429"
+     cy="486.64789"
+     fx="605.71429"
+     fy="486.64789"
+     r="117.14286" /><radialGradient
+     inkscape:collect="always"
+     xlink:href="#linearGradient5060"
+     id="radialGradient4693"
+     gradientUnits="userSpaceOnUse"
+     gradientTransform="matrix(-2.774389,0,0,1.969706,112.7623,-872.8854)"
+     cx="605.71429"
+     cy="486.64789"
+     fx="605.71429"
+     fy="486.64789"
+     r="117.14286" /><linearGradient
+     inkscape:collect="always"
+     xlink:href="#linearGradient5048"
+     id="linearGradient4894"
+     gradientUnits="userSpaceOnUse"
+     gradientTransform="matrix(2.774389,0,0,1.969706,-1892.179,-872.8854)"
+     x1="302.85715"
+     y1="366.64789"
+     x2="302.85715"
+     y2="609.50507" /><radialGradient
+     inkscape:collect="always"
+     xlink:href="#linearGradient5060"
+     id="radialGradient4896"
+     gradientUnits="userSpaceOnUse"
+     gradientTransform="matrix(2.774389,0,0,1.969706,-1891.633,-872.8854)"
+     cx="605.71429"
+     cy="486.64789"
+     fx="605.71429"
+     fy="486.64789"
+     r="117.14286" /><radialGradient
+     inkscape:collect="always"
+     xlink:href="#linearGradient5060"
+     id="radialGradient4898"
+     gradientUnits="userSpaceOnUse"
+     gradientTransform="matrix(-2.774389,0,0,1.969706,112.7623,-872.8854)"
+     cx="605.71429"
+     cy="486.64789"
+     fx="605.71429"
+     fy="486.64789"
+     r="117.14286" /><filter
+     inkscape:collect="always"
+     id="filter4971"
+     x="-0.064853556"
+     width="1.1297071"
+     y="-1.9456067"
+     height="4.8912134"><feGaussianBlur
+       inkscape:collect="always"
+       stdDeviation="0.81066946"
+       id="feGaussianBlur4973" /></filter><linearGradient
+     inkscape:collect="always"
+     xlink:href="#linearGradient4977"
+     id="linearGradient4983"
+     x1="23.6875"
+     y1="32"
+     x2="23.75"
+     y2="45.25"
+     gradientUnits="userSpaceOnUse" /></defs><sodipodi:namedview
+   inkscape:cy="-2.746436"
+   inkscape:cx="31.130127"
+   inkscape:zoom="8"
+   inkscape:window-height="1176"
+   inkscape:window-width="1855"
+   inkscape:pageshadow="2"
+   inkscape:pageopacity="0.0"
+   borderopacity="0.21568627"
+   bordercolor="#666666"
+   pagecolor="#ffffff"
+   id="base"
+   inkscape:showpageshadow="false"
+   inkscape:window-x="65"
+   inkscape:window-y="24"
+   inkscape:current-layer="svg2"
+   fill="#555753"
+   showgrid="true"
+   stroke="#a40000"
+   showguides="true"
+   inkscape:guide-bbox="true"
+   inkscape:snap-global="false"
+   inkscape:window-maximized="1"><inkscape:grid
+     type="xygrid"
+     id="grid3818" /></sodipodi:namedview>
+	<g
+   style="display:inline"
+   id="g5022"
+   transform="matrix(0.02158196,0,0,0.01859457,168.63396,41.63767)"><rect
+     y="-150.69685"
+     x="-1559.2523"
+     height="478.35718"
+     width="1339.6335"
+     id="rect4173"
+     style="opacity:0.40206185;color:#000000;fill:url(#linearGradient5027);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible" /><path
+     sodipodi:nodetypes="cccc"
+     id="path5058"
+     d="m -219.61876,-150.68038 c 0,0 0,478.33079 0,478.33079 142.874166,0.90045 345.40022,-107.16966 345.40014,-239.196175 0,-132.026537 -159.436816,-239.134595 -345.40014,-239.134615 z"
+     style="opacity:0.40206185;color:#000000;fill:url(#radialGradient5029);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible"
+     inkscape:connector-curvature="0" /><path
+     style="opacity:0.40206185;color:#000000;fill:url(#radialGradient5031);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible"
+     d="m -1559.2523,-150.68038 c 0,0 0,478.33079 0,478.33079 -142.8742,0.90045 -345.4002,-107.16966 -345.4002,-239.196175 0,-132.026537 159.4368,-239.134595 345.4002,-239.134615 z"
+     id="path5018"
+     sodipodi:nodetypes="cccc"
+     inkscape:connector-curvature="0" /></g><path
+   style="color:#000000;fill:url(#linearGradient1514);fill-opacity:1;fill-rule:nonzero;stroke:#757575;stroke-width:1.0000006;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible"
+   d="m 147.13103,8.1833733 5.95746,0 c 0.83973,0 13.88647,15.4353277 13.88647,16.3406587 l -0.44352,18.496745 c 0,0.905333 -0.67603,1.634177 -1.51576,1.634177 l -31.45728,0 c -0.83973,0 -1.51576,-0.728844 -1.51576,-1.634177 l 0.0565,-18.496745 c 0,-0.905331 14.19218,-16.3406587 15.03191,-16.3406587 z"
+   id="rect1512"
+   sodipodi:nodetypes="ccccccccc"
+   inkscape:connector-curvature="0" /><path
+   style="fill:none"
+   id="path5"
+   d="m 172.47503,45.735573 -45.3249,0 0,-45.32489746 45.3249,0 0,45.32489746 z"
+   inkscape:connector-curvature="0" /><path
+   style="fill:url(#linearGradient2335);fill-opacity:1;fill-rule:evenodd"
+   id="path2327"
+   d="m 148.51145,29 -0.0457,15.090942 -11.84279,0 L 136.51145,29 l 12,0 z"
+   clip-rule="evenodd"
+   sodipodi:nodetypes="ccccc"
+   inkscape:connector-curvature="0" /><path
+   sodipodi:nodetypes="ccccccccc"
+   id="path2357"
+   d="m 147.29191,9.405584 5.5591,0 c 0.78358,0 13.00087,14.399588 13.00087,15.244172 l -0.34716,18.212311 c 0,0.459259 -0.14374,0.653465 -0.51237,0.653465 l -31.38721,0.01428 c -0.36863,0 -0.58396,-0.07992 -0.58396,-0.45355 l 0.21534,-18.426506 c 0,-0.844584 13.27181,-15.244172 14.05539,-15.244172 z"
+   style="opacity:0.3125;color:#000000;fill:none;stroke:#ffffff;stroke-width:1.00000012;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible"
+   inkscape:connector-curvature="0" /><path
+   clip-rule="evenodd"
+   d="m 132.71898,27.943053 -0.0543,2.595194 18.36817,-13.179254 15.28639,11.154428 0.0713,-0.311714 -16.37045,-15.904131 -17.30116,15.645477 z"
+   id="path23"
+   style="opacity:0.2;fill:url(#radialGradient2384);fill-opacity:1;fill-rule:evenodd"
+   sodipodi:nodetypes="ccccccc"
+   inkscape:connector-curvature="0" /><path
+   clip-rule="evenodd"
+   d="m 147.51145,30 0,14.090942 -9.81103,0 L 137.51145,30 l 10,0 z"
+   id="path188"
+   style="fill:url(#linearGradient2412);fill-opacity:1;fill-rule:evenodd"
+   sodipodi:nodetypes="ccccc"
+   inkscape:connector-curvature="0" /><path
+   style="opacity:0.40909089;fill:url(#radialGradient2325);fill-opacity:1;fill-rule:evenodd"
+   id="path2315"
+   d="m 145.08831,36.44767 c 0.67279,0 1.21662,0.474605 1.21662,1.058507 0,0.589811 -0.54383,1.068355 -1.21662,1.068355 -0.67227,0 -1.21869,-0.478544 -1.21869,-1.068355 5.2e-4,-0.583902 0.54642,-1.058507 1.21869,-1.058507 z"
+   clip-rule="evenodd"
+   inkscape:connector-curvature="0" /><path
+   clip-rule="evenodd"
+   d="m 144.97377,35.932229 c 0.67279,0 1.21661,0.474605 1.21661,1.058507 0,0.589809 -0.54382,1.068353 -1.21661,1.068353 -0.67228,0 -1.21869,-0.478544 -1.21869,-1.068353 5.2e-4,-0.583902 0.54641,-1.058507 1.21869,-1.058507 z"
+   id="path217"
+   style="fill:url(#radialGradient2313);fill-opacity:1;fill-rule:evenodd"
+   inkscape:connector-curvature="0" /><path
+   d="m 149.9592,11.559337 18.92706,17.169868 0.49468,0.391991 0.40368,-0.171385 -0.37287,-0.761673 -0.27762,-0.223436 -19.17493,-15.572306 -19.38951,15.743335 -0.23761,0.14412 -0.21671,0.706786 0.43342,0.129248 0.38456,-0.308423 19.02585,-17.248125 z"
+   id="path342"
+   style="fill:url(#XMLID_39_)"
+   sodipodi:nodetypes="ccccccccccccc"
+   inkscape:connector-curvature="0" /><path
+   style="fill:#ef2929;stroke:#a40000"
+   id="path362"
+   d="m 149.84162,2.2713382 -21.88174,18.1013368 -0.62473,7.165928 1.99994,2.064323 c 0,0 20.40738,-17.157285 20.62409,-17.327963 l 19.63254,17.54326 1.89843,-2.323997 -1.61579,-7.111374 -19.91518,-18.2159732 -0.11756,0.1044594 z"
+   sodipodi:nodetypes="cccccccccc"
+   inkscape:connector-curvature="0" />
+<path
+   style="opacity:0.40909089;color:#000000;fill:url(#radialGradient2305);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible"
+   d="M 128.3528,20.613129 128.06124,27.236494 149.88067,8.980075 149.81034,3.0867443 128.3528,20.613129 z"
+   id="path1536"
+   sodipodi:nodetypes="ccccc"
+   inkscape:connector-curvature="0" /><path
+   sodipodi:nodetypes="ccccc"
+   id="path2337"
+   d="m 149.99522,8.7509884 0.0995,-5.8411017 19.32896,17.6519533 1.49181,6.500812 -20.92023,-18.3116636 z"
+   style="opacity:0.13636367;color:#000000;fill:url(#radialGradient2339);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible"
+   inkscape:connector-curvature="0" /><path
+   style="opacity:0.31818183;color:#000000;fill:none;stroke:#ffffff;stroke-width:0.99999934;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible"
+   d="m 152.61368,27.719824 9.04,0 c 0.77059,0 1.39096,0.62037 1.39096,1.390967 l -0.008,9.079221 c 0,0.770596 -0.59632,1.265969 -1.36691,1.265969 l -9.05609,0 c -0.77059,0 -1.39096,-0.620373 -1.39096,-1.390969 l 0,-8.954221 c 0,-0.770597 0.62037,-1.390967 1.39096,-1.390967 z"
+   id="rect2361"
+   sodipodi:nodetypes="ccccccccc"
+   inkscape:connector-curvature="0" /><rect
+   style="color:#000000;fill:#3465a4;fill-opacity:1;fill-rule:nonzero;stroke:#757575;stroke-width:0.9999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible"
+   id="rect3263"
+   width="10.001333"
+   height="9.9624557"
+   x="152.01923"
+   y="28.514256"
+   rx="0.38128215"
+   ry="0.38128215" /><path
+   style="opacity:0.39772728;color:#000000;fill:url(#radialGradient2374);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.99999958;marker:none;visibility:visible;display:inline;overflow:visible"
+   d="m 152.61857,34.408261 c 3.61798,0.331177 5.52773,-1.445704 8.86815,-1.55274 l 0.0247,-3.849491 -8.91161,-0.006 0.0187,5.408261 z"
+   id="rect2363"
+   sodipodi:nodetypes="ccccc"
+   inkscape:connector-curvature="0" /><g
+   transform="translate(65.937707,2.0108349)"
+   id="g4739"><path
+     sodipodi:type="arc"
+     style="fill:#6adb4d;fill-opacity:1;stroke:#34781d;stroke-width:1.05264175;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+     id="path4741"
+     sodipodi:cx="25.367456"
+     sodipodi:cy="8.2694378"
+     sodipodi:rx="5.3033009"
+     sodipodi:ry="5.3033009"
+     d="m 30.670757,8.2694378 c 0,2.9289322 -2.374368,5.3033012 -5.303301,5.3033012 -2.928932,0 -5.3033,-2.374369 -5.3033,-5.3033012 0,-2.9289322 2.374368,-5.3033009 5.3033,-5.3033009 2.928933,0 5.303301,2.3743687 5.303301,5.3033009 z"
+     transform="matrix(0.95416667,0,0,0.94583333,1.405743,0.73519001)" /><path
+     transform="matrix(0.77083333,0,0,0.77916666,6.0564434,2.1576238)"
+     d="m 30.670757,8.2694378 c 0,2.9289322 -2.374368,5.3033012 -5.303301,5.3033012 -2.928932,0 -5.3033,-2.374369 -5.3033,-5.3033012 0,-2.9289322 2.374368,-5.3033009 5.3033,-5.3033009 2.928933,0 5.303301,2.3743687 5.303301,5.3033009 z"
+     sodipodi:ry="5.3033009"
+     sodipodi:rx="5.3033009"
+     sodipodi:cy="8.2694378"
+     sodipodi:cx="25.367456"
+     id="path4743"
+     style="fill:none;stroke:#b3ff9a;stroke-width:1.29034114;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+     sodipodi:type="arc" /></g><g
+   id="g4733"
+   transform="translate(76.897863,5.0160386)"><path
+     transform="matrix(0.95416667,0,0,0.94583333,1.405743,0.73519001)"
+     d="m 30.670757,8.2694378 c 0,2.9289322 -2.374368,5.3033012 -5.303301,5.3033012 -2.928932,0 -5.3033,-2.374369 -5.3033,-5.3033012 0,-2.9289322 2.374368,-5.3033009 5.3033,-5.3033009 2.928933,0 5.303301,2.3743687 5.303301,5.3033009 z"
+     sodipodi:ry="5.3033009"
+     sodipodi:rx="5.3033009"
+     sodipodi:cy="8.2694378"
+     sodipodi:cx="25.367456"
+     id="path4735"
+     style="fill:#6adb4d;fill-opacity:1;stroke:#34781d;stroke-width:1.05264175;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+     sodipodi:type="arc" /><path
+     sodipodi:type="arc"
+     style="fill:none;stroke:#b3ff9a;stroke-width:1.29034114;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+     id="path4737"
+     sodipodi:cx="25.367456"
+     sodipodi:cy="8.2694378"
+     sodipodi:rx="5.3033009"
+     sodipodi:ry="5.3033009"
+     d="m 30.670757,8.2694378 c 0,2.9289322 -2.374368,5.3033012 -5.303301,5.3033012 -2.928932,0 -5.3033,-2.374369 -5.3033,-5.3033012 0,-2.9289322 2.374368,-5.3033009 5.3033,-5.3033009 2.928933,0 5.303301,2.3743687 5.303301,5.3033009 z"
+     transform="matrix(0.77083333,0,0,0.77916666,6.0564434,2.1576238)" /></g><g
+   transform="translate(70.887455,7.0268736)"
+   id="g4727"><path
+     sodipodi:type="arc"
+     style="fill:#6adb4d;fill-opacity:1;stroke:#34781d;stroke-width:1.05264175;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+     id="path4729"
+     sodipodi:cx="25.367456"
+     sodipodi:cy="8.2694378"
+     sodipodi:rx="5.3033009"
+     sodipodi:ry="5.3033009"
+     d="m 30.670757,8.2694378 c 0,2.9289322 -2.374368,5.3033012 -5.303301,5.3033012 -2.928932,0 -5.3033,-2.374369 -5.3033,-5.3033012 0,-2.9289322 2.374368,-5.3033009 5.3033,-5.3033009 2.928933,0 5.303301,2.3743687 5.303301,5.3033009 z"
+     transform="matrix(0.95416667,0,0,0.94583333,1.405743,0.73519001)" /><path
+     transform="matrix(0.77083333,0,0,0.77916666,6.0564434,2.1576238)"
+     d="m 30.670757,8.2694378 c 0,2.9289322 -2.374368,5.3033012 -5.303301,5.3033012 -2.928932,0 -5.3033,-2.374369 -5.3033,-5.3033012 0,-2.9289322 2.374368,-5.3033009 5.3033,-5.3033009 2.928933,0 5.303301,2.3743687 5.303301,5.3033009 z"
+     sodipodi:ry="5.3033009"
+     sodipodi:rx="5.3033009"
+     sodipodi:cy="8.2694378"
+     sodipodi:cx="25.367456"
+     id="path4731"
+     style="fill:none;stroke:#b3ff9a;stroke-width:1.29034114;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+     sodipodi:type="arc" /></g><g
+   id="g4723"
+   transform="translate(59.662134,5.9662134)"><path
+     transform="matrix(0.95416667,0,0,0.94583333,1.405743,0.73519001)"
+     d="m 30.670757,8.2694378 c 0,2.9289322 -2.374368,5.3033012 -5.303301,5.3033012 -2.928932,0 -5.3033,-2.374369 -5.3033,-5.3033012 0,-2.9289322 2.374368,-5.3033009 5.3033,-5.3033009 2.928933,0 5.303301,2.3743687 5.303301,5.3033009 z"
+     sodipodi:ry="5.3033009"
+     sodipodi:rx="5.3033009"
+     sodipodi:cy="8.2694378"
+     sodipodi:cx="25.367456"
+     id="path4719"
+     style="fill:#6adb4d;fill-opacity:1;stroke:#34781d;stroke-width:1.05264175;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+     sodipodi:type="arc" /><path
+     sodipodi:type="arc"
+     style="fill:none;stroke:#b3ff9a;stroke-width:1.29034114;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+     id="path4721"
+     sodipodi:cx="25.367456"
+     sodipodi:cy="8.2694378"
+     sodipodi:rx="5.3033009"
+     sodipodi:ry="5.3033009"
+     d="m 30.670757,8.2694378 c 0,2.9289322 -2.374368,5.3033012 -5.303301,5.3033012 -2.928932,0 -5.3033,-2.374369 -5.3033,-5.3033012 0,-2.9289322 2.374368,-5.3033009 5.3033,-5.3033009 2.928933,0 5.303301,2.3743687 5.303301,5.3033009 z"
+     transform="matrix(0.77083333,0,0,0.77916666,6.0564434,2.1576238)" /></g><g
+   id="g4695"
+   transform="matrix(1.1326331,0,0,0.44340824,65.580189,2.4215088)"><rect
+     style="fill:#8a8a8a;fill-opacity:1;stroke:none"
+     id="rect4697"
+     width="29.256544"
+     height="18.119614"
+     x="10.297243"
+     y="27.449707"
+     rx="1.7190553"
+     ry="4.3911204" /><g
+     id="g4699"><g
+       id="g4701"><rect
+         rx="1.7051755"
+         y="27.517153"
+         x="10.510214"
+         height="17.982044"
+         width="29.020325"
+         id="rect4703"
+         style="fill:none;stroke:#646464;stroke-width:1.41005611;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         ry="4.3556657" /></g><rect
+       rx="0.88575488"
+       y="29.624025"
+       x="11.337327"
+       height="13.83156"
+       width="27.319036"
+       id="rect4705"
+       style="fill:none;stroke:#b3b3b3;stroke-width:1.40048993;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       ry="2.2625546" /></g></g><g
+   transform="matrix(0.01936185,0,0,0.01859457,111.41659,40.621203)"
+   id="g4681"
+   style="display:inline"><rect
+     style="opacity:0.40206185;color:#000000;fill:url(#linearGradient4689);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible"
+     id="rect4683"
+     width="1339.6335"
+     height="478.35718"
+     x="-1559.2523"
+     y="-150.69685" /><path
+     inkscape:connector-curvature="0"
+     style="opacity:0.40206185;color:#000000;fill:url(#radialGradient4691);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible"
+     d="m -219.61876,-150.68038 c 0,0 0,478.33079 0,478.33079 142.874166,0.90045 345.40022,-107.16966 345.40014,-239.196175 0,-132.026537 -159.436816,-239.134595 -345.40014,-239.134615 z"
+     id="path4685"
+     sodipodi:nodetypes="cccc" /><path
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="cccc"
+     id="path4687"
+     d="m -1559.2523,-150.68038 c 0,0 0,478.33079 0,478.33079 -142.8742,0.90045 -345.4002,-107.16966 -345.4002,-239.196175 0,-132.026537 159.4368,-239.134595 345.4002,-239.134615 z"
+     style="opacity:0.40206185;color:#000000;fill:url(#radialGradient4693);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible" /></g><g
+   id="g4672"
+   transform="translate(68.942911,-2.9168155)"><rect
+     ry="1.9470588"
+     rx="1.9470588"
+     y="27.449707"
+     x="10.297243"
+     height="18.119614"
+     width="29.256544"
+     id="rect4658"
+     style="fill:#dddddd;fill-opacity:1;stroke:none" /><g
+     id="g4667"><g
+       id="g4664"><rect
+         ry="1.9313381"
+         style="fill:none;stroke:#646464;stroke-width:0.99927008;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         id="rect4660"
+         width="29.020325"
+         height="17.982044"
+         x="10.510214"
+         y="27.517153"
+         rx="1.9313381" /></g><rect
+       ry="1.0032353"
+       style="fill:none;stroke:#f6f6f6;stroke-width:0.99249077;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       id="rect4662"
+       width="26.967867"
+       height="16.005489"
+       x="11.532422"
+       y="28.489801"
+       rx="1.0032353" /></g></g><path
+   transform="matrix(1.0023678,0,0,0.95596394,68.883716,-0.0273148)"
+   d="m 35,33 a 10,10 0 1 1 -20,0 10,10 0 1 1 20,0 z"
+   sodipodi:ry="10"
+   sodipodi:rx="10"
+   sodipodi:cy="33"
+   sodipodi:cx="25"
+   id="path4679"
+   style="fill:#b8b8b8;fill-opacity:1;fill-rule:evenodd;stroke:none"
+   sodipodi:type="arc" /><path
+   sodipodi:type="arc"
+   style="fill:#b8b8b8;fill-opacity:1;fill-rule:evenodd;stroke:#646464;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+   id="path3820"
+   sodipodi:cx="25"
+   sodipodi:cy="33"
+   sodipodi:rx="10"
+   sodipodi:ry="10"
+   d="m 35,33 a 10,10 0 1 1 -20,0 10,10 0 1 1 20,0 z"
+   transform="matrix(0.94933484,0,0,0.95596394,70.209541,-1.4857225)" /><path
+   transform="matrix(0.6928006,0,0,0.69727163,76.6008,8.0344445)"
+   d="m 35,33 a 10,10 0 1 1 -20,0 10,10 0 1 1 20,0 z"
+   sodipodi:ry="10"
+   sodipodi:rx="10"
+   sodipodi:cy="33"
+   sodipodi:cx="25"
+   id="path4590"
+   style="fill:#f4f4f4;fill-opacity:1;fill-rule:evenodd;stroke:none"
+   sodipodi:type="arc" /><g
+   id="g4644"
+   transform="matrix(0.70710678,0.70710678,-0.70710678,0.70710678,99.594592,-10.924363)"><rect
+     style="fill:#232323;fill-opacity:1;stroke:none"
+     id="rect4646"
+     width="0.68500972"
+     height="1.1490486"
+     x="24.638252"
+     y="26.853086" /><rect
+     y="37.990021"
+     x="24.660349"
+     height="1.1490486"
+     width="0.68500972"
+     id="rect4648"
+     style="fill:#232323;fill-opacity:1;stroke:none" /></g><g
+   id="g4600"
+   style="fill:#a2a2a2;fill-opacity:1"
+   transform="translate(69.009202,-2.3643883)"><rect
+     style="fill:#a2a2a2;fill-opacity:1;stroke:none"
+     id="rect4602"
+     width="1"
+     height="5.9375"
+     x="40.742825"
+     y="-1.6325631"
+     transform="matrix(0.67898035,0.73415645,-0.73415645,0.67898035,0,0)" /><path
+     sodipodi:type="arc"
+     style="fill:#a2a2a2;fill-opacity:1;stroke:none"
+     id="path4604"
+     sodipodi:cx="25.03125"
+     sodipodi:cy="33.03125"
+     sodipodi:rx="1.03125"
+     sodipodi:ry="0.96875"
+     d="M 26.0625,33.03125 C 26.0625,33.566276 25.600794,34 25.03125,34 24.461706,34 24,33.566276 24,33.03125 c 0,-0.535026 0.461706,-0.96875 1.03125,-0.96875 0.569544,0 1.03125,0.433724 1.03125,0.96875 z"
+     transform="matrix(0.95714504,0,0,1.0228099,1.028519,-0.77553647)" /></g><g
+   id="g4596"
+   transform="translate(68.942911,-2.9168155)"><rect
+     transform="matrix(0.67898035,0.73415645,-0.73415645,0.67898035,0,0)"
+     y="-1.6325631"
+     x="40.742825"
+     height="5.9375"
+     width="1"
+     id="rect4592"
+     style="fill:#ff2121;fill-opacity:1;stroke:none" /><path
+     transform="matrix(0.95714504,0,0,1.0228099,1.028519,-0.77553647)"
+     d="M 26.0625,33.03125 C 26.0625,33.566276 25.600794,34 25.03125,34 24.461706,34 24,33.566276 24,33.03125 c 0,-0.535026 0.461706,-0.96875 1.03125,-0.96875 0.569544,0 1.03125,0.433724 1.03125,0.96875 z"
+     sodipodi:ry="0.96875"
+     sodipodi:rx="1.03125"
+     sodipodi:cy="33.03125"
+     sodipodi:cx="25.03125"
+     id="path4594"
+     style="fill:#ff2121;fill-opacity:1;stroke:none"
+     sodipodi:type="arc" /></g><path
+   sodipodi:type="arc"
+   style="fill:none;stroke:#646464;stroke-width:1.37966764;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+   id="path4608"
+   sodipodi:cx="25"
+   sodipodi:cy="33"
+   sodipodi:rx="10"
+   sodipodi:ry="10"
+   d="m 35,33 a 10,10 0 1 1 -20,0 10,10 0 1 1 20,0 z"
+   transform="matrix(0.74693846,0,0,0.74919978,75.258402,5.3595919)" /><g
+   id="g4628"
+   transform="translate(68.942911,-2.9168155)"><rect
+     y="26.853086"
+     x="24.638252"
+     height="1.1490486"
+     width="0.68500972"
+     id="rect4624"
+     style="fill:#232323;fill-opacity:1;stroke:none" /><rect
+     style="fill:#232323;fill-opacity:1;stroke:none"
+     id="rect4626"
+     width="0.68500972"
+     height="1.1490486"
+     x="24.660349"
+     y="37.990021" /></g><g
+   id="g4632"
+   transform="matrix(0,1,-1,0,126.93079,5.087457)"><rect
+     style="fill:#232323;fill-opacity:1;stroke:none"
+     id="rect4634"
+     width="0.68500972"
+     height="1.1490486"
+     x="24.638252"
+     y="26.853086" /><rect
+     y="37.990021"
+     x="24.660349"
+     height="1.1490486"
+     width="0.68500972"
+     id="rect4636"
+     style="fill:#232323;fill-opacity:1;stroke:none" /></g><rect
+   style="fill:#232323;fill-opacity:1;stroke:none"
+   id="rect4640"
+   width="0.68500972"
+   height="1.1490486"
+   x="-45.50618"
+   y="-93.834114"
+   transform="matrix(-0.70710678,0.70710678,-0.70710678,-0.70710678,0,0)" /><rect
+   y="-82.697182"
+   x="-45.484081"
+   height="1.1490486"
+   width="0.68500972"
+   id="rect4642"
+   style="fill:#232323;fill-opacity:1;stroke:none"
+   transform="matrix(-0.70710678,0.70710678,-0.70710678,-0.70710678,0,0)" /><g
+   transform="matrix(1.2021267,0,0,0.11694557,63.863529,11.401153)"
+   id="g4707"><rect
+     ry="16.649275"
+     rx="1.6196786"
+     y="27.449707"
+     x="10.297243"
+     height="18.119614"
+     width="29.256544"
+     id="rect4709"
+     style="fill:#d4d4d4;fill-opacity:1;stroke:none" /><g
+     id="g4711"><g
+       id="g4713"><rect
+         ry="16.514845"
+         style="fill:none;stroke:#646464;stroke-width:2.66511464;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         id="rect4715"
+         width="29.020325"
+         height="17.982044"
+         x="10.510214"
+         y="27.517153"
+         rx="1" /></g></g></g><g
+   id="g4985"
+   transform="translate(0,-11.125)"><g
+     transform="matrix(0.01936185,0,0,0.01859457,41.505849,40.621203)"
+     id="g4874"
+     style="display:inline"><rect
+       style="opacity:0.40206185;color:#000000;fill:url(#linearGradient4894);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible"
+       id="rect4876"
+       width="1339.6335"
+       height="478.35718"
+       x="-1559.2523"
+       y="-150.69685" /><path
+       inkscape:connector-curvature="0"
+       style="opacity:0.40206185;color:#000000;fill:url(#radialGradient4896);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible"
+       d="m -219.61876,-150.68038 c 0,0 0,478.33079 0,478.33079 142.874166,0.90045 345.40022,-107.16966 345.40014,-239.196175 0,-132.026537 -159.436816,-239.134595 -345.40014,-239.134615 z"
+       id="path4878"
+       sodipodi:nodetypes="cccc" /><path
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccc"
+       id="path4880"
+       d="m -1559.2523,-150.68038 c 0,0 0,478.33079 0,478.33079 -142.8742,0.90045 -345.4002,-107.16966 -345.4002,-239.196175 0,-132.026537 159.4368,-239.134595 345.4002,-239.134615 z"
+       style="opacity:0.40206185;color:#000000;fill:url(#radialGradient4898);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible" /></g><g
+     id="g4882"
+     transform="translate(-0.96783034,-2.9168155)"><rect
+       ry="1.9470588"
+       rx="1.9470588"
+       y="27.449707"
+       x="10.297243"
+       height="18.119614"
+       width="29.256544"
+       id="rect4884"
+       style="fill:#eaeaea;fill-opacity:1;stroke:none" /><g
+       id="g4886"><g
+         id="g4888"><rect
+           ry="1.9313381"
+           style="fill:none;stroke:#646464;stroke-width:0.99927008;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="rect4890"
+           width="29.020325"
+           height="17.982044"
+           x="10.510214"
+           y="27.517153"
+           rx="1.9313381" /></g><rect
+         ry="1.0032353"
+         style="fill:none;stroke:#ffffff;stroke-width:0.99249077;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         id="rect4892"
+         width="26.967867"
+         height="16.005489"
+         x="11.532422"
+         y="28.489801"
+         rx="1.0032353" /></g></g><g
+     transform="matrix(1,0,0,0.9039548,0,2.5932203)"
+     id="g4922"><rect
+       style="fill:#000000;fill-opacity:1;stroke:none"
+       id="rect4900"
+       width="1"
+       height="11.0625"
+       x="13.0625"
+       y="27" /><rect
+       y="27"
+       x="15.0625"
+       height="11.0625"
+       width="1"
+       id="rect4902"
+       style="fill:#000000;fill-opacity:1;stroke:none" /><rect
+       style="fill:#000000;fill-opacity:1;stroke:none"
+       id="rect4904"
+       width="1"
+       height="11.0625"
+       x="18"
+       y="27" /><rect
+       y="27"
+       x="19.9375"
+       height="11.0625"
+       width="2"
+       id="rect4906"
+       style="fill:#000000;fill-opacity:1;stroke:none" /><rect
+       y="27"
+       x="22.9375"
+       height="11.0625"
+       width="1"
+       id="rect4908"
+       style="fill:#000000;fill-opacity:1;stroke:none" /><rect
+       style="fill:#000000;fill-opacity:1;stroke:none"
+       id="rect4910"
+       width="2.0625"
+       height="11.0625"
+       x="25.9375"
+       y="27" /><rect
+       y="27"
+       x="28.9375"
+       height="11.0625"
+       width="1.125"
+       id="rect4912"
+       style="fill:#000000;fill-opacity:1;stroke:none" /><rect
+       style="fill:#000000;fill-opacity:1;stroke:none"
+       id="rect4914"
+       width="1.125"
+       height="11.0625"
+       x="30.9375"
+       y="27" /><rect
+       y="27"
+       x="33.9375"
+       height="11.0625"
+       width="1.125"
+       id="rect4916"
+       style="fill:#000000;fill-opacity:1;stroke:none" /></g><text
+     sodipodi:linespacing="125%"
+     id="text4918"
+     y="40.195068"
+     x="12.981453"
+     style="font-size:36.59571838px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
+     xml:space="preserve"><tspan
+       style="font-size:3.65957189px;font-style:normal;font-variant:normal;font-weight:500;font-stretch:normal;font-family:Inconsolata;-inkscape-font-specification:Inconsolata Medium"
+       y="40.195068"
+       x="12.981453"
+       id="tspan4920"
+       sodipodi:role="line">5 92102431 8</tspan></text>
+<rect
+     y="31.0625"
+     x="9.0625"
+     height="1"
+     width="30"
+     id="rect4933"
+     style="fill:#ff0000;fill-opacity:1;stroke:none" /><rect
+     style="fill:#ff0000;fill-opacity:1;stroke:none;filter:url(#filter4971)"
+     id="rect4957"
+     width="30"
+     height="1"
+     x="9.0625"
+     y="31.0625" /><path
+     inkscape:connector-curvature="0"
+     id="path4975"
+     d="M 9.0625,32.0625 20,47.875 28.9375,47.9375 39,32.0625 z"
+     style="opacity:0.29787233;fill:url(#linearGradient4983);fill-opacity:1;stroke:none" /></g></svg>
\ No newline at end of file
diff --git a/addons/point_of_sale/static/src/js/TODO.txt b/addons/point_of_sale/static/src/js/TODO.txt
new file mode 100644
index 00000000000..1696f0b117d
--- /dev/null
+++ b/addons/point_of_sale/static/src/js/TODO.txt
@@ -0,0 +1,63 @@
+v Affichage Catégories doivent respecter le poids
+v Affichage Catégories par poids doivent avoir une hiérarchie plate
+v Le Onscreen keyboard ne fonctionne plus
+v Scrolling dans la sélection produit et dans 
+  la liste de courses
+v Réductions
+v Redesign liste de courses
+v bugs scans produits par prix par poids
+v si pas photo photo par defaut
+v WebSQL
+v Redesign header, bouton retour aux backend en mode caissière
+v bouton exit en mode caissière doit retourner au backend.
+v posting orders
+v bug ajout ligne payment à zero + curseur dedans + suppression + design plus grand
+v si case print via proxy cochée, alors on skip l'ecran receipt
+v bouton exit self checkout
+v demarrage en mode self-checkout si self-checkout
+v produits poid code barre non reconnus
+v activer popup client aux écrans self-checkout
+v discount pas plus grand que 100
+v numpad dans l'écran payment pour pouvoir entrer le montant
+v différence de total. Methode d'arrondis
+
+- login alternatif
+- user preferences : désactiver la balance etc.
+- numpad state parfois sans state
+- numpad state en mode pesée ?? le cacher ? 
+- Redesign du receipt
+- retirer le  receipt screen
+- le numpad en mode paymenet marche pas
+- l'écran de payement est hyper laid
+- l'écran de pesée    est hyper laid
+x générer les données de printing
+x popups d'erreur certainement buggés
+
+TODO AUG 20
+-----------
+
+* GREEN STATUS
+    - make it green !
+
+* TRUNK
+    - Connection status tooltip
+    v Remove receipt screen
+    - Finish the receipt JSON generation
+        - Modifie le widget de liste course
+        v supprimer l'écran
+        v bloquer sur l'impression
+        v L'impression est foireuse
+        - description_sales
+
+* CLIENT
+    v create a new branch
+    - Self-checkout welcome screen
+        ~ removal of products for the root category
+    - Terminal de payement
+    - Code à barres
+    - Vidanges
+    - Design
+    - Backport
+    - CSS pour écran résistif
+    - Test sur matos
+
diff --git a/addons/point_of_sale/static/src/js/db.js b/addons/point_of_sale/static/src/js/db.js
new file mode 100644
index 00000000000..77f7307b48f
--- /dev/null
+++ b/addons/point_of_sale/static/src/js/db.js
@@ -0,0 +1,235 @@
+function openerp_pos_db(instance, module){ 
+
+    /* PosLS is a LocalStorage based implementation of the point of sale database,
+       it performs better for few products, but does not scale beyond 500 products. 
+       */
+    module.PosLS = instance.web.Class.extend({
+        name: 'openerp_pos_ls', //the prefix of the localstorage data
+        limit: 100,  // the maximum number of results returned by a search
+        init: function(options){
+            options = options || {};
+            this.name = options.name || this.name;
+            this.limit = options.limit || this.limit;
+
+            //cache the data in memory to avoid roundtrips to the localstorage
+            this.cache = {};
+
+            this.category_by_id = {};
+            this.root_category_id  = 0;
+            this.category_products = {};
+            this.category_ancestors = {};
+            this.category_childs = {};
+            this.category_parent    = {};
+            this.category_search_string = {};
+        },
+        /* returns the category object from its id. If you pass a list of id as parameters, you get
+         * a list of category objects. 
+         */  
+        get_category_by_id: function(categ_id){
+            if(categ_id instanceof Array){
+                var list = [];
+                for(var i = 0, len = categ_id.length; i < len; i++){
+                    var cat = this.category_by_id[categ_id[i]];
+                    if(cat){
+                        list.push(cat);
+                    }else{
+                        console.error("get_category_by_id: no category has id:",categ_id[i]);
+                    }
+                }
+                return list;
+            }else{
+                return this.category_by_id[categ_id];
+            }
+        },
+        /* returns a list of the category's child categories ids, or an empty list 
+         * if a category has no childs */
+        get_category_childs_ids: function(categ_id){
+            return this.category_childs[categ_id] || [];
+        },
+        /* returns a list of all ancestors (parent, grand-parent, etc) categories ids
+         * starting from the root category to the direct parent */
+        get_category_ancestors_ids: function(categ_id){
+            return this.category_ancestors[categ_id] || [];
+        },
+        /* returns the parent category's id of a category, or the root_category_id if no parent.
+         * the root category is parent of itself. */
+        get_category_parent_id: function(categ_id){
+            return this.category_parent[categ_id] || this.root_category_id;
+        },
+        /* adds categories definitions to the database. categories is a list of categories objects as
+         * returned by the openerp server. Categories must be inserted before the products or the 
+         * product/ categories association may (will) not work properly */
+        add_categories: function(categories){
+            var self = this;
+            if(!this.category_by_id[this.root_category_id]){
+                this.category_by_id[this.root_category_id] = {
+                    id : this.root_category_id,
+                    name : 'Root',
+                };
+            }
+            for(var i=0, len = categories.length; i < len; i++){
+                this.category_by_id[categories[i].id] = categories[i];
+            }
+            for(var i=0, len = categories.length; i < len; i++){
+                var cat = categories[i];
+                var parent_id = cat.parent_id[0] || this.root_category_id;
+                this.category_parent[cat.id] = cat.parent_id[0];
+                if(!this.category_childs[parent_id]){
+                    this.category_childs[parent_id] = [];
+                }
+                this.category_childs[parent_id].push(cat.id);
+            }
+            function make_ancestors(cat_id, ancestors){
+                self.category_ancestors[cat_id] = ancestors;
+
+                ancestors = ancestors.slice(0);
+                ancestors.push(cat_id);
+
+                var childs = self.category_childs[cat_id] || [];
+                for(var i=0, len = childs.length; i < len; i++){
+                    make_ancestors(childs[i], ancestors);
+                }
+            }
+            make_ancestors(this.root_category_id, []);
+        },
+        /* loads a record store from the database. returns default if nothing is found */
+        load: function(store,deft){
+            if(this.cache[store] !== undefined){
+                return this.cache[store];
+            }
+            var data = localStorage[this.name + '_' + store];
+            if(data !== undefined){
+                data = JSON.parse(data);
+                this.cache[store] = data;
+                return data;
+            }else{
+                return deft;
+            }
+        },
+        /* saves a record store to the database */
+        save: function(store,data){
+            localStorage[this.name + '_' + store] = JSON.stringify(data);
+            this.cache[store] = data;
+        },
+        _product_search_string: function(product){
+            var str = '' + product.id + ':' + product.name;
+            if(product.ean13){
+                str += '|' + product.ean13;
+            }
+            return str + '\n';
+        },
+        add_products: function(products){
+            var stored_products = this.load('products',{}); 
+            var stored_categories = this.load('categories',{});
+
+            if(!products instanceof Array){
+                products = [products];
+            }
+            for(var i = 0, len = products.length; i < len; i++){
+                var product = products[i];
+                var search_string = this._product_search_string(product);
+                var categ_id = product.pos_categ_id[0];
+                if(!stored_categories[categ_id]){
+                    stored_categories[categ_id] = [];
+                }
+                stored_categories[categ_id].push(product.id);
+
+                if(this.category_search_string[categ_id] === undefined){
+                    this.category_search_string[categ_id] = '';
+                }
+                this.category_search_string[categ_id] += search_string;
+
+                var ancestors = this.get_category_ancestors_ids(categ_id) || [];
+
+                for(var j = 0; j < ancestors.length; j++){
+                    var ancestor = ancestors[j];
+                    if(! stored_categories[ancestor]){
+                        stored_categories[ancestor] = [];
+                    }
+                    stored_categories[ancestor].push(product.id);
+
+                    if( this.category_search_string[ancestor] === undefined){
+                        this.category_search_string[ancestor] = '';
+                    }
+                    this.category_search_string[ancestor] += search_string; 
+                }
+                stored_products[product.id] = product;
+            }
+            this.save('products',stored_products);
+            this.save('categories',stored_categories);
+        },
+        /* removes all the data from the database. TODO : being able to selectively remove data */
+        clear: function(stores){
+            for(var i = 0, len = arguments.length; i < len; i++){
+                localStorage.removeItem(this.name + '_' + arguments[i]);
+            }
+        },
+        /* this internal methods returns the count of properties in an object. */
+        _count_props : function(obj){
+            var count = 0;
+            for(var prop in obj){
+                if(obj.hasOwnProperty(prop)){
+                    count++;
+                }
+            }
+            return count;
+        },
+        get_product_by_id: function(id){
+            return this.load('products',{})[id];
+        },
+        get_product_by_ean13: function(ean13){
+            var products = this.load('products',{});
+            for(var i in products){
+                if( products[i] && products[i].ean13 === ean13){
+                    return products[i];
+                }
+            }
+            return undefined;
+        },
+        get_product_by_category: function(category_id){
+            var stored_categories = this.load('categories',{});
+            var stored_products   = this.load('products',{});
+            var product_ids  = stored_categories[category_id];
+            var list = [];
+            for(var i = 0, len = Math.min(product_ids.length,this.limit); i < len; i++){
+                list.push(stored_products[product_ids[i]]);
+            }
+            return list;
+        },
+        /* returns a list of products with :
+         * - a category that is or is a child of category_id,
+         * - a name, package or ean13 containing the query (case insensitive) 
+         */
+        search_product_in_category: function(category_id, query){
+            var re = RegExp("([0-9]+):.*?"+query,"gi");
+            var results = [];
+            for(var i = 0; i < this.limit; i++){
+                r = re.exec(this.category_search_string[category_id]);
+                if(r){
+                    var id = Number(r[1]);
+                    results.push(this.get_product_by_id(id));
+                }else{
+                    break;
+                }
+            }
+            return results;
+        },
+        add_order: function(order){
+            var last_id = this.load('last_order_id',0);
+            var orders  = this.load('orders',[]);
+            orders.push({id: last_id + 1, data: order});
+            this.save('last_order_id',last_id+1);
+            this.save('orders',orders);
+        },
+        remove_order: function(order_id){
+            var orders = this.load('orders',[]);
+            orders = _.filter(orders, function(order){
+                return order.id !== order_id;
+            });
+            this.save('orders',orders);
+        },
+        get_orders: function(){
+            return this.load('orders',[]);
+        },
+    });
+}
diff --git a/addons/point_of_sale/static/src/js/pos_devices.js b/addons/point_of_sale/static/src/js/devices.js
similarity index 81%
rename from addons/point_of_sale/static/src/js/pos_devices.js
rename to addons/point_of_sale/static/src/js/devices.js
index 2857fc39937..e36070414b6 100644
--- a/addons/point_of_sale/static/src/js/pos_devices.js
+++ b/addons/point_of_sale/static/src/js/devices.js
@@ -17,7 +17,9 @@ function openerp_pos_devices(instance,module){ //module is instance.point_of_sal
         delay_payment:  function(){ this.activate(); this.payment_status = 'waiting_for_payment'; },
     }))();
 
-    //window.debug_devices = debug_devices;
+    if(jQuery.deparam(jQuery.param.querystring()).debug !== undefined){
+        window.debug_devices = debug_devices;
+    }
 
     // this object interfaces with the local proxy to communicate to the various hardware devices
     // connected to the Point of Sale. As the communication only goes from the POS to the proxy,
@@ -42,21 +44,26 @@ function openerp_pos_devices(instance,module){ //module is instance.point_of_sal
             success_callback = success_callback || function(){}; 
             error_callback   =  error_callback  || function(){};    
 
-            if(debug_devices && debug_devices.active){
+            
+            if(jQuery.deparam(jQuery.param.querystring()).debug !== undefined){
                 console.log('PROXY:',name,params);
-            }else{
+            }
+
+            if(!(debug_devices && debug_devices.active)){
                 this.connection.rpc('/pos/'+name, params || {}, success_callback, error_callback);
             }
         },
         
         //a product has been scanned and recognized with success
-        scan_item_success: function(){
-            this.message('scan_item_success');
+        // ean is a parsed ean object
+        scan_item_success: function(ean){
+            this.message('scan_item_success',ean);
         },
 
-        //a product has been scanned but not recognized
-        scan_item_error_unrecognized: function(){
-            this.message('scan_item_error_unrecognized');
+        // a product has been scanned but not recognized
+        // ean is a parsed ean object
+        scan_item_error_unrecognized: function(ean){
+            this.message('scan_item_error_unrecognized',ean);
         },
 
         //the client is asking for help
@@ -177,6 +184,8 @@ function openerp_pos_devices(instance,module){ //module is instance.point_of_sal
          *          price_with_tax:     (number) the price paid for this orderline, tax included
          *          price_without_tax:  (number) the price paid for this orderline, without taxes
          *          tax:                (number) the price paid in taxes on this orderline
+         *          product_description:         (string) generic description of the product
+         *          product_description_sale:    (string) sales related information of the product
          *     }
          *  - paymentlines : list of paymentlines :
          *     {
@@ -222,11 +231,11 @@ function openerp_pos_devices(instance,module){ //module is instance.point_of_sal
 
             this.action_callback_stack = [];
 
-            this.price_prefix_set = attributes.price_prefix_set     ||  {'02':'', '22':'', '24':'', '26':'', '28':''};
-            this.weight_prefix_set = attributes.weight_prefix_set   ||  {'21':'','23':'','27':'','29':'','25':''};
-            this.client_prefix_set = attributes.weight_prefix_set   ||  {'42':''};
-            this.cashier_prefix_set = attributes.weight_prefix_set  ||  {'40':''};
-            this.discount_prefix_set = attributes.weight_prefix_set ||  {'44':''};
+            this.weight_prefix_set   = attributes.weight_prefix_set   ||  {'21':''};
+            this.discount_prefix_set = attributes.discount_prefix_set ||  {'22':''};
+            this.price_prefix_set    = attributes.price_prefix_set    ||  {'23':''};
+            this.cashier_prefix_set  = attributes.cashier_prefix_set  ||  {'041':''};
+            this.client_prefix_set   = attributes.client_prefix_set   ||  {'042':''};
         },
         save_callbacks: function(){
             var callbacks = {};
@@ -270,41 +279,37 @@ function openerp_pos_devices(instance,module){ //module is instance.point_of_sal
                 this.action_callback[action] = undefined;
             }
         },
-
-
+        // returns the checksum of the ean, or -1 if the ean has not the correct length, ean must be a string
+        ean_checksum: function(ean){
+            var code = ean.split('');
+            if(code.length !== 13){
+                return -1;
+            }
+            var oddsum = 0, evensum = 0, total = 0;
+            code = code.reverse().splice(1);
+            for(var i = 0; i < code.length; i++){
+                if(i % 2 == 0){
+                    oddsum += Number(code[i]);
+                }else{
+                    evensum += Number(code[i]);
+                }
+            }
+            total = oddsum * 3 + evensum;
+            return Number((10 - total % 10) % 10);
+        },
         // returns true if the ean is a valid EAN codebar number by checking the control digit.
         // ean must be a string
         check_ean: function(ean){
-            var code = ean.split('');
-            for(var i = 0; i < code.length; i++){
-                code[i] = Number(code[i]);
+            return this.ean_checksum(ean) === Number(ean[ean.length-1]);
+        },
+        // returns a valid zero padded ean13 from an ean prefix. the ean prefix must be a string.
+        sanitize_ean:function(ean){
+            ean = ean.substr(0,13);
+
+            for(var n = 0, count = (13 - ean.length); n < count; n++){
+                ean = ean + '0';
             }
-            var st1 = code.slice();
-            var st2 = st1.slice(0,st1.length-1).reverse();
-            // some EAN13 barcodes have a length of 12, as they start by 0
-            while (st2.length < 12) {
-                st2.push(0);
-            }
-            var countSt3 = 1;
-            var st3 = 0;
-            $.each(st2, function() {
-                if (countSt3%2 === 1) {
-                    st3 +=  this;
-                }
-                countSt3 ++;
-            });
-            st3 *= 3;
-            var st4 = 0;
-            var countSt4 = 1;
-            $.each(st2, function() {
-                if (countSt4%2 === 0) {
-                    st4 += this;
-                }
-                countSt4 ++;
-            });
-            var st5 = st3 + st4;
-            var cd = (10 - (st5%10)) % 10;
-            return code[code.length-1] === cd;
+            return ean.substr(0,12) + this.ean_checksum(ean);
         },
         
         // attempts to interpret an ean (string encoding an ean)
@@ -327,41 +332,47 @@ function openerp_pos_devices(instance,module){ //module is instance.point_of_sal
                 type:'unknown', // 
                 prefix:'',
                 ean:ean,
+                base_ean: ean,
                 id:'',
                 value: 0,
                 unit: 'none',
             };
-            var prefix2 = ean.substring(0,2);
+            console.log('ean',ean);
 
-            if(!this.check_ean(ean)){
+            function match_prefix(prefix_set, type){
+                for(prefix in prefix_set){
+                    if(ean.substring(0,prefix.length) === prefix){
+                        parse_result.prefix = prefix;
+                        parse_result.type = type;
+                        return true;
+                    }
+                }
+                return false;
+            }
+
+            if (!this.check_ean(ean)){
                 parse_result.type = 'error';
-            }else if (prefix2 in this.price_prefix_set){
-                parse_result.type = 'price';
-                parse_result.prefix = prefix2;
+            } else if( match_prefix(this.price_prefix_set,'price')){
                 parse_result.id = ean.substring(0,7);
+                parse_result.base_ean = this.sanitize_ean(ean.substring(0,7));
                 parse_result.value = Number(ean.substring(7,12))/100.0;
                 parse_result.unit  = 'euro';
-            } else if (prefix2 in this.weight_prefix_set){
-                parse_result.type = 'weight';
-                parse_result.prefix = prefix2;
+            } else if( match_prefix(this.weight_prefix_set,'weight')){
                 parse_result.id = ean.substring(0,7);
                 parse_result.value = Number(ean.substring(7,12))/1000.0;
+                parse_result.base_ean = this.sanitize_ean(ean.substring(0,7));
                 parse_result.unit = 'Kg';
-            }else if (prefix2 in this.client_prefix_set){
-                parse_result.type = 'client';
-                parse_result.prefix = prefix2;
+            } else if( match_prefix(this.client_prefix_set,'client')){
                 parse_result.id = ean.substring(0,7);
-            }else if (prefix2 in this.cashier_prefix_set){
-                parse_result.type = 'cashier';
-                parse_result.prefix = prefix2;
+                parse_result.unit = 'Kg';
+            } else if( match_prefix(this.cashier_prefix_set,'cashier')){
                 parse_result.id = ean.substring(0,7);
-            }else if (prefix2 in this.discount_prefix_set){
-                parse_result.type  = 'discount';
-                parse_result.prefix = prefix2;
+            } else if( match_prefix(this.discount_prefix_set,'discount')){
                 parse_result.id    = ean.substring(0,7);
+                parse_result.base_ean = this.sanitize_ean(ean.substring(0,7));
                 parse_result.value = Number(ean.substring(7,12))/100.0;
                 parse_result.unit  = '%';
-            }else{
+            } else {
                 parse_result.type = 'unit';
                 parse_result.prefix = '';
                 parse_result.id = ean;
@@ -402,7 +413,7 @@ function openerp_pos_devices(instance,module){ //module is instance.point_of_sal
                         var parse_result = self.parse_ean(codeNumbers.join(''));
 
                         if (parse_result.type === 'error') {    //most likely a checksum error, raise warning
-                            console.error('ERROR: barcode checksum error:',parse_result);
+                            console.warn('WARNING: barcode checksum error:',parse_result);
                         }else if(parse_result.type in {'unit':'', 'weight':'', 'price':''}){    //ean is associated to a product
                             if(self.action_callback['product']){
                                 self.action_callback['product'](parse_result);
diff --git a/addons/point_of_sale/static/src/js/pos_main.js b/addons/point_of_sale/static/src/js/main.js
similarity index 92%
rename from addons/point_of_sale/static/src/js/pos_main.js
rename to addons/point_of_sale/static/src/js/main.js
index 71ac69c6067..b9263b91314 100644
--- a/addons/point_of_sale/static/src/js/pos_main.js
+++ b/addons/point_of_sale/static/src/js/main.js
@@ -5,6 +5,8 @@ openerp.point_of_sale = function(instance) {
 
     var module = instance.point_of_sale;
 
+    openerp_pos_db(instance,module);         // import db.js
+
     openerp_pos_models(instance,module);     // import pos_models.js
 
     openerp_pos_basewidget(instance,module); // import pos_basewidget.js
diff --git a/addons/point_of_sale/static/src/js/pos_models.js b/addons/point_of_sale/static/src/js/models.js
similarity index 58%
rename from addons/point_of_sale/static/src/js/pos_models.js
rename to addons/point_of_sale/static/src/js/models.js
index 8a1506769bd..93860697492 100644
--- a/addons/point_of_sale/static/src/js/pos_models.js
+++ b/addons/point_of_sale/static/src/js/models.js
@@ -1,51 +1,6 @@
 function openerp_pos_models(instance, module){ //module is instance.point_of_sale
     var QWeb = instance.web.qweb;
 
-    module.LocalStorageDAO = instance.web.Class.extend({
-        add_operation: function(operation) {
-            var self = this;
-            return $.async_when().pipe(function() {
-                var tmp = self._get('oe_pos_operations', []);
-                var last_id = self._get('oe_pos_operations_sequence', 1);
-                tmp.push({'id': last_id, 'data': operation});
-                self._set('oe_pos_operations', tmp);
-                self._set('oe_pos_operations_sequence', last_id + 1);
-            });
-        },
-        remove_operation: function(id) {
-            var self = this;
-            return $.async_when().pipe(function() {
-                var tmp = self._get('oe_pos_operations', []);
-                tmp = _.filter(tmp, function(el) {
-                    return el.id !== id;
-                });
-                self._set('oe_pos_operations', tmp);
-            });
-        },
-        get_operations: function() {
-            var self = this;
-            return $.async_when().pipe(function() {
-                return self._get('oe_pos_operations', []);
-            });
-        },
-        _get: function(key, default_) {
-            var txt = localStorage['oe_pos_dao_'+key];
-            if (! txt)
-                return default_;
-            return JSON.parse(txt);
-        },
-        _set: function(key, value) {
-            localStorage['oe_pos_dao_'+key] = JSON.stringify(value);
-        },
-        reset_stored_data: function(){
-            for(key in localStorage){
-                if(key.indexOf('oe_pos_dao_') === 0){
-                    delete localStorage[key];
-                }
-            }
-        },
-    });
-
     var fetch = function(model, fields, domain, ctx){
         return new instance.web.Model(model).query(fields).filter(domain).context(ctx).all()
     };
@@ -58,29 +13,20 @@ function openerp_pos_models(instance, module){ //module is instance.point_of_sal
     // this is done asynchronously, a ready deferred alows the GUI to wait interactively 
     // for the loading to be completed 
     // There is a single instance of the PosModel for each Front-End instance, it is usually called
-    // 'pos' and is available to almost all widgets.
+    // 'pos' and is available to all widgets extending PosWidget.
 
     module.PosModel = Backbone.Model.extend({
         initialize: function(session, attributes) {
             Backbone.Model.prototype.initialize.call(this, attributes);
             var  self = this;
-            this.dao = new module.LocalStorageDAO();            // used to store the order's data on the Hard Drive
+            this.session = session;                 
             this.ready = $.Deferred();                          // used to notify the GUI that the PosModel has loaded all resources
             this.flush_mutex = new $.Mutex();                   // used to make sure the orders are sent to the server once at time
-            //this.build_tree = _.bind(this.build_tree, this);    // ???
-            this.session = session;                 
-            this.categories = {};
-            this.root_category = null;
-            this.weightable_categories = [];                    // a flat list of all categories that directly contain weightable products
-            this.barcode_reader = new module.BarcodeReader({'pos': this});  // used to read barcodes
-            this.proxy = new module.ProxyDevice();             // used to communicate to the hardware devices via a local proxy
 
-            // pos settings
-            this.use_scale              = false;
-            this.use_proxy_printer      = false;
-            this.use_virtual_keyboard   = false;
-            this.use_websql             = false;
-            this.use_barcode_scanner    = false;
+            this.barcode_reader = new module.BarcodeReader({'pos': this});  // used to read barcodes
+            this.proxy = new module.ProxyDevice();              // used to communicate to the hardware devices via a local proxy
+            this.db = new module.PosLS();                       // a database used to store the products and categories
+            this.db.clear('products','categories');
 
             // default attributes values. If null, it will be loaded below.
             this.set({
@@ -98,12 +44,12 @@ function openerp_pos_models(instance, module){ //module is instance.point_of_sal
                 'products':         new module.ProductCollection(), 
                 'cashRegisters':    null, 
 
-                'product_list':     null,   // the list of all products, does not change. 
                 'bank_statements':  null,
                 'taxes':            null,
                 'pos_session':      null,
                 'pos_config':       null,
-                'categories':       null,
+                'units':            null,
+                'units_by_id':      null,
 
                 'selectedOrder':    undefined,
             });
@@ -112,183 +58,9 @@ function openerp_pos_models(instance, module){ //module is instance.point_of_sal
             
             // We fetch the backend data on the server asynchronously. this is done only when the pos user interface is launched,
             // Any change on this data made on the server is thus not reflected on the point of sale until it is relaunched. 
-
-            var user_def = fetch('res.users',['name','company_id'],[['id','=',this.session.uid]]) 
-                .pipe(function(users){
-                    var user = users[0];
-                    self.set('user',user);
-
-                    return fetch('res.company',
-                    [
-                        'currency_id',
-                        'email',
-                        'website',
-                        'company_registry',
-                        //TODO contact_address
-                        'vat',
-                        'name',
-                        'phone'
-                    ],
-                    [['id','=',user.company_id[0]]])
-                }).pipe(function(companies){
-                    var company = companies[0];
-                    self.set('company',company);
-
-                    return fetch('res.currency',['symbol','position'],[['id','=',company.currency_id[0]]]);
-                }).pipe(function (currencies){
-                    self.set('currency',currencies[0]);
-                });
-
-            var cat_def = fetch('pos.category', ['id','name', 'parent_id', 'child_id', 'image_medium'])
-                .pipe(function(result){
-                    return self.set({'categories': result});
-                });
-
-            var uom_def = fetch(    //unit of measure
-                'product.uom',
-                null,
-                null
-                ).then(function(result){
-                    self.set({'units': result});
-                    var units_by_id = {};
-                    for(var i = 0, len = result.length; i < len; i++){
-                        units_by_id[result[i].id] = result[i];
-                    }
-                    self.set({'units_by_id':units_by_id});
-                });
-
-            var pack_def = fetch(
-                'product.packaging',
-                null,
-                null
-                ).then(function(packaging){
-                    self.set('product.packaging',packaging);
-                });
-
-            var users_def = fetch(
-                'res.users',
-                ['name','ean13'],
-                [['ean13', '!=', false]]
-                ).then(function(result){
-                    self.set({'user_list':result});
-                });
-
-            var tax_def = fetch('account.tax', ['amount','price_include','type'])
-                .then(function(result){
-                    self.set({'taxes': result});
-                });
-
-            var session_def = fetch(    // loading the PoS Session.
-                    'pos.session',
-                    ['id', 'journal_ids','name','user_id','config_id','start_at','stop_at'],
-                    [['state', '=', 'opened'], ['user_id', '=', this.session.uid]]
-                ).pipe(function(result) {
-
-                    // some data are associated with the pos session, like the pos config and bank statements.
-                    // we must have a valid session before we can read those. 
-                    
-                    var session_data_def = new $.Deferred();
-
-                    if( result.length !== 0 ) {
-                        var pos_session = result[0];
-
-                        self.set({'pos_session': pos_session});
-
-                        var pos_config_def = fetch(
-                                'pos.config',
-                                ['name','journal_ids','shop_id','journal_id',
-                                 'iface_self_checkout', 'iface_websql', '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'],
-                                [['id','=', pos_session.config_id[0]]]
-                            ).pipe(function(result){
-                                var pos_config = result[0]
-                                
-                                self.set({'pos_config': pos_config});
-                                self.use_scale              = pos_config.iface_electronic_scale  || false;
-                                self.use_proxy_printer      = pos_config.iface_print_via_proxy   || false;
-                                self.use_virtual_keyboard   = pos_config.iface_vkeyboard         || false;
-                                self.use_websql             = pos_config.iface_websql            || false;
-                                self.use_barcode_scanner    = pos_config.iface_barscan           || false;
-                                self.use_selfcheckout       = pos_config.iface_self_checkout     || false;
-                                self.use_cashbox            = pos_config.iface_cashdrawer        || false;
-
-                                return shop_def = fetch('sale.shop',[], [['id','=',pos_config.shop_id[0]]])
-                            }).pipe(function(shops){
-                                self.set('shop',shops[0]);
-                                return fetch( 
-                                    'product.product', 
-                                    //context {pricelist: shop.pricelist_id[0]} 
-                                    ['name', 'list_price','price','pos_categ_id', 'taxes_id','image_medium', 'ean13', 'to_weight', 'uom_id', 'uos_id', 'uos_coeff', 'mes_type'],
-                                    [['pos_categ_id','!=', false]],
-                                    {pricelist: shops[0].pricelist_id[0]} // context for price
-                                    );
-                            }).pipe( function(product_list){
-                                self.set({'product_list': product_list});
-                            });
-
-                        var bank_def = fetch(
-                            'account.bank.statement',
-                            ['account_id','currency','journal_id','state','name','user_id','pos_session_id'],
-                            [['state','=','open'],['pos_session_id', '=', pos_session.id]]
-                            ).then(function(result){
-                                self.set({'bank_statements':result});
-                            });
-
-                        var journal_def = fetch(
-                            'account.journal',
-                            undefined,
-                            [['user_id','=',pos_session.user_id[0]]]
-                            ).then(function(result){
-                                self.set({'journals':result});
-                            });
-
-                        // associate the bank statements with their journals. 
-                        var bank_process_def = $.when(bank_def, journal_def)
-                            .then(function(){
-                                var bank_statements = self.get('bank_statements');
-                                var journals = self.get('journals');
-                                for(var i = 0, ilen = bank_statements.length; i < ilen; i++){
-                                    for(var j = 0, jlen = journals.length; j < jlen; j++){
-                                        if(bank_statements[i].journal_id[0] === journals[j].id){
-                                            bank_statements[i].journal = journals[j];
-                                            bank_statements[i].self_checkout_payment_method = journals[j].self_checkout_payment_method;
-                                        }
-                                    }
-                                }
-                            });
-
-                        session_data_def = $.when(pos_config_def,bank_def,journal_def,bank_process_def);
-
-                    }else{
-                        session_data_def.reject();
-                    }
-                    return session_data_def;
-                });
-
-            // associate the products with their categories
-            var prod_process_def = $.when(cat_def, session_def)
-                .pipe(function(){
-                    var product_list = self.get('product_list');
-                    var categories = self.get('categories');
-                    var cat_by_id = {};
-                    for(var i = 0; i < categories.length; i++){
-                        cat_by_id[categories[i].id] = categories[i];
-                    }
-                    //set the parent in the category
-                    for(var i = 0; i < categories.length; i++){
-                        categories[i].parent_category = cat_by_id[categories[i].parent_id[0]];
-                    }
-                    for(var i = 0; i < product_list.length; i++){
-                        product_list[i].pos_category = cat_by_id[product_list[i].pos_categ_id[0]];
-                    }
-                });
-
             // when all the data has loaded, we compute some stuff, and declare the Pos ready to be used. 
-            $.when(pack_def, cat_def, user_def, users_def, uom_def, session_def, tax_def, prod_process_def, user_def, this.flush())
+            $.when(this.load_server_data())
                 .then(function(){ 
-                    self.build_categories(); 
-                    self.set({'cashRegisters' : new module.CashRegisterCollection(self.get('bank_statements'))});
                     //self.log_loaded_data(); //Uncomment if you want to log the data to the console for easier debugging
                     self.ready.resolve();
                 },function(){
@@ -298,11 +70,133 @@ function openerp_pos_models(instance, module){ //module is instance.point_of_sal
                 });
         },
 
+        // loads all the needed data on the sever. returns a deferred indicating when all the data has loaded. 
+        load_server_data: function(){
+            var self = this;
+
+            var loaded = fetch('res.users',['name','company_id'],[['id','=',this.session.uid]]) 
+                .pipe(function(users){
+                    self.set('user',users[0]);
+
+                    return fetch('res.company',
+                    [
+                        'currency_id',
+                        'email',
+                        'website',
+                        'company_registry',
+                        'vat',
+                        'name',
+                        'phone',
+                        'partner_id',
+                    ],
+                    [['id','=',users[0].company_id[0]]]);
+                }).pipe(function(companies){
+                    self.set('company',companies[0]);
+
+                    return fetch('res.partner',['contact_address'],[['id','=',companies[0].partner_id[0]]]);
+                }).pipe(function(company_partners){
+                    self.get('company').contact_address = company_partners[0].contact_address;
+
+                    return fetch('res.currency',['symbol','position'],[['id','=',self.get('company').currency_id[0]]]);
+                }).pipe(function(currencies){
+                    self.set('currency',currencies[0]);
+
+                    return fetch('product.uom', null, null);
+                }).pipe(function(units){
+                    self.set('units',units);
+                    var units_by_id = {};
+                    for(var i = 0, len = units.length; i < len; i++){
+                        units_by_id[units[i].id] = units[i];
+                    }
+                    self.set('units_by_id',units_by_id);
+                    
+                    return fetch('product.packaging', null, null);
+                }).pipe(function(packagings){
+                    self.set('product.packaging',packagings);
+
+                    return fetch('res.users', ['name','ean13'], [['ean13', '!=', false]]);
+                }).pipe(function(users){
+                    self.set('user_list',users);
+
+                    return fetch('account.tax', ['amount', 'price_include', 'type']);
+                }).pipe(function(taxes){
+                    self.set('taxes', taxes);
+
+                    return fetch(
+                        'pos.session', 
+                        ['id', 'journal_ids','name','user_id','config_id','start_at','stop_at'],
+                        [['state', '=', 'opened'], ['user_id', '=', self.session.uid]]
+                    );
+                }).pipe(function(sessions){
+                    self.set('pos_session', sessions[0]);
+
+                    return fetch(
+                        'pos.config',
+                        ['name','journal_ids','shop_id','journal_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'],
+                        [['id','=', self.get('pos_session').config_id[0]]]
+                    );
+                }).pipe(function(configs){
+                    var pos_config = configs[0];
+                    self.set('pos_config', pos_config);
+                    self.iface_electronic_scale    =  !!pos_config.iface_electronic_scale;  
+                    self.iface_print_via_proxy     =  !!pos_config.iface_print_via_proxy;
+                    self.iface_vkeyboard           =  !!pos_config.iface_vkeyboard; 
+                    self.iface_self_checkout       =  !!pos_config.iface_self_checkout;
+                    self.iface_cashdrawer          =  !!pos_config.iface_cashdrawer;
+
+                    return fetch('sale.shop',[],[['id','=',pos_config.shop_id[0]]]);
+                }).pipe(function(shops){
+                    self.set('shop',shops[0]);
+
+                    return fetch('pos.category', ['id','name','parent_id','child_id','image'])
+                }).pipe(function(categories){
+                    self.db.add_categories(categories);
+
+                    return fetch(
+                        'product.product', 
+                        ['name', 'list_price','price','pos_categ_id', 'taxes_id', 'ean13', 
+                         'to_weight', 'uom_id', 'uos_id', 'uos_coeff', 'mes_type', 'description_sale', 'description'],
+                        [['pos_categ_id','!=', false],['sale_ok','=',true]],
+                        {pricelist: self.get('shop').pricelist_id[0]} // context for price
+                    );
+                }).pipe(function(products){
+                    self.db.add_products(products);
+
+                    return fetch(
+                        'account.bank.statement',
+                        ['account_id','currency','journal_id','state','name','user_id','pos_session_id'],
+                        [['state','=','open'],['pos_session_id', '=', self.get('pos_session').id]]
+                    );
+                }).pipe(function(bank_statements){
+                    self.set('bank_statements', bank_statements);
+
+                    return fetch('account.journal', undefined, [['user_id','=', self.get('pos_session').user_id[0]]]);
+                }).pipe(function(journals){
+                    self.set('journals',journals);
+
+                    // associate the bank statements with their journals. 
+                    var bank_statements = self.get('bank_statements');
+                    for(var i = 0, ilen = bank_statements.length; i < ilen; i++){
+                        for(var j = 0, jlen = journals.length; j < jlen; j++){
+                            if(bank_statements[i].journal_id[0] === journals[j].id){
+                                bank_statements[i].journal = journals[j];
+                                bank_statements[i].self_checkout_payment_method = journals[j].self_checkout_payment_method;
+                            }
+                        }
+                    }
+                    self.set({'cashRegisters' : new module.CashRegisterCollection(self.get('bank_statements'))});
+                });
+        
+            return loaded;
+        },
+
         // logs the usefull posmodel data to the console for debug purposes
         log_loaded_data: function(){
             console.log('PosModel data has been loaded:');
             console.log('PosModel: categories:',this.get('categories'));
-            console.log('PosModel: product_list:',this.get('product_list'));
             console.log('PosModel: units:',this.get('units'));
             console.log('PosModel: bank_statements:',this.get('bank_statements'));
             console.log('PosModel: journals:',this.get('journals'));
@@ -316,7 +210,6 @@ function openerp_pos_models(instance, module){ //module is instance.point_of_sal
             console.log('PosModel: user_list:',this.get('user_list'));
             console.log('PosModel: user:',this.get('user'));
             console.log('PosModel.session:',this.session);
-            console.log('PosModel.categories:',this.categories);
             console.log('PosModel end of data log.');
         },
         
@@ -324,7 +217,7 @@ function openerp_pos_models(instance, module){ //module is instance.point_of_sal
         // order and a valid selected order
         on_removed_order: function(removed_order){
             if( this.get('orders').isEmpty()){
-                this.add_and_select_order(new module.Order({ pos: this }));
+                this.add_new_order();
             }
             if( this.get('selectedOrder') === removed_order){
                 this.set({ selectedOrder: this.get('orders').last() });
@@ -333,175 +226,70 @@ function openerp_pos_models(instance, module){ //module is instance.point_of_sal
 
         // 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) {
-            var self = this;
-            return this.dao.add_operation(record).pipe(function(){
-                return self.flush();
-            });
+            this.db.add_order(record);
+            this.flush();
         },
 
-        add_and_select_order: function(newOrder) {
-            (this.get('orders')).add(newOrder);
-            return this.set({
-                selectedOrder: newOrder
-            });
+        //creates a new empty order and sets it as the current order
+        add_new_order: function(){
+            var order = new module.Order({pos:this});
+            this.get('orders').add(order);
+            this.set('selectedOrder', order);
         },
-        
-        // attemps to send all pending orders ( stored in the DAO ) to the server.
-        // it will do it one by one, and remove the successfully sent ones from the DAO once
-        // it has been confirmed that they have been received.
+
+        // 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() {
             //this makes sure only one _int_flush is called at the same time
             return this.flush_mutex.exec(_.bind(function() {
-                return this._int_flush();
+                return this._flush(0);
             }, this));
         },
-        _int_flush : function() {
+        // 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){
             var self = this;
+            var orders = this.db.get_orders();
+            self.set('nbr_pending_operations',orders.length);
 
-            this.dao.get_operations().pipe(function(operations) {
-                // operations are really Orders that are converted to json.
-                // they are saved to disk and then we attempt to send them to the backend so that they can
-                // be applied. 
-                // since the network is not reliable we potentially have many 'pending operations' that have not been sent.
-                self.set( {'nbr_pending_operations':operations.length} );
-                if(operations.length === 0){
-                    return $.when();
-                }
-                var order = operations[0];
-
-                 // we prevent the default error handler and assume errors
-                 // are a normal use case, except we stop the current iteration
-
-                 return (new instance.web.Model('pos.order')).get_func('create_from_ui')([order])
-                            .fail(function(unused, event){
-                                // wtf ask niv
-                                event.preventDefault();
-                            })
-                            .pipe(function(){
-                                // success: remove the successfully sent operation, and try to send the next one 
-                                self.dao.remove_operation(operations[0].id).pipe(function(){
-                                    return self._int_flush();
-                                });
-                            }, function(){
-                                // in case of error we just sit there and do nothing. wtf ask niv
-                                return $.when();
-                            });
-            });
+            var order  = orders[index];
+            if(!order){
+                return;
+            }
+            //try to push an order to the server
+            (new instance.web.Model('pos.order')).get_func('create_from_ui')([order])
+                .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);
+                });
         },
 
-        // this adds several properties to the categories in order to make it easier to diplay them
-        // fields added include the list of product relevant to each category, list of child categories,
-        // list of ancestors, etc.
-        build_categories : function(){
-            var categories = this.get('categories');
-            var products   = this.get('product_list');
+        scan_product: function(parsed_ean){
+            var self = this;
+            var product = this.db.get_product_by_ean13(parsed_ean.base_ean);
+            var selectedOrder = this.get('selectedOrder');
 
-            //append the content of array2 into array1
-            function append(array1, array2){
-                for(var i = 0, len = array2.length; i < len; i++){
-                    array1.push(array2[i]);
-                }
+            if(!product){
+                return false;
             }
 
-            function appendSet(set1, set2){
-                for(key in set2){
-                    set1[key] = set2[key];
-                }
+            if(parsed_ean.type === 'price'){
+                selectedOrder.addProduct(new module.Product(product), {price:parsed_ean.value});
+            }else if(parsed_ean.type === 'weight'){
+                selectedOrder.addProduct(new module.Product(product), {quantity:parsed_ean.value, merge:false});
+            }else{
+                selectedOrder.addProduct(new module.Product(product));
             }
-
-            var categories_by_id = {};
-            for(var i = 0; i < categories.length; i++){
-                categories_by_id[categories[i].id] = categories[i];
-            }
-            this.categories_by_id = categories_by_id;
-
-            var root_category = {
-                name      : 'Root',
-                id        : 0,
-                parent    : null,
-                childrens : [],
-            };
-
-            // add parent and childrens field to categories, find root_categories
-            for(var i = 0; i < categories.length; i++){
-                var cat = categories[i];
-                
-                cat.parent = categories_by_id[cat.parent_id[0]];
-                if(!cat.parent){
-                    root_category.childrens.push(cat);
-                    cat.parent = root_category;
-                }
-                
-                cat.childrens = [];
-                for(var j = 0; j < cat.child_id.length; j++){
-                    cat.childrens.push(categories_by_id[ cat.child_id[j] ]);
-                }
-            }
-
-            categories.push(root_category);
-
-            // set some default fields for next steps
-            for(var i = 0; i < categories.length; i++){
-                var cat = categories[i];
-
-                cat.product_list = [];  //list of all products in the category
-                cat.product_set = {};   // [product.id] === true if product is in category
-                cat.weightable_product_list = [];
-                cat.weightable_product_set = {};
-                cat.weightable = false; //true if directly contains weightable products
-            }
-
-            this.root_category = root_category;
-            
-            //we add the products to the categories. 
-            for(var i = 0, len = products.length; i < len; i++){
-                var product = products[i];
-                var cat = categories_by_id[product.pos_categ_id[0]];
-                if(cat){
-                    cat.product_list.push(product);
-                    cat.product_set[product.id] = true;
-                    if(product.to_weight){
-                        cat.weightable_product_list.push(product);
-                        cat.weightable_product_set[product.id] = true;
-                        cat.weightable = true;
-                    }
-                }
-            }
-
-            // we build a flat list of all categories that directly contains weightable products
-            this.weightable_categories = [];
-            for(var i = 0, len = categories.length; i < len; i++){
-                var cat = categories[i];
-                if(cat.weightable){
-                    this.weightable_categories.push(cat);
-                }
-            }
-            
-            // add ancestor field to categories, contains the list of parents of parents, from root to parent
-            function make_ancestors(cat, ancestors){
-                cat.ancestors = ancestors.slice(0);
-                ancestors.push(cat);
-
-                for(var i = 0; i < cat.childrens.length; i++){
-                    make_ancestors(cat.childrens[i], ancestors.slice(0));
-                }
-            }
-            
-            //add the products of the subcategories to the parent categories
-            function make_products(cat){
-                for(var i = 0; i < cat.childrens.length; i++){
-                    make_products(cat.childrens[i]);
-
-                    append(cat.product_list, cat.childrens[i].product_list);
-                    append(cat.weightable_product_list, cat.childrens[i].weightable_product_list);
-
-                    appendSet(cat.product_set, cat.childrens[i].product_set);
-                    appendSet(cat.weightable_product_set, cat.childrens[i].weightable_product_set);
-                }
-            }
-
-            make_ancestors(root_category,[]);
-            make_products(root_category);
+            return true;
         },
     });
 
@@ -608,15 +396,10 @@ function openerp_pos_models(instance, module){ //module is instance.point_of_sal
                 return false;
             }else if(this.get_discount() > 0){             // we don't merge discounted orderlines
                 return false;
-            }else if(this.get_product_type() === 'unit'){ 
-                return true;
-            }else if(this.get_product_type() === 'weight'){
-                return true;
-            }else if(this.get_product_type() === 'price'){
-                return this.get_product().get('list_price') === orderline.get_product().get('list_price');
-            }else{
-                console.error('point_of_sale/pos_models.js/Orderline.can_be_merged_with() : unknown product type:',this.get('product_type'));
+            }else if(this.price !== orderline.price){
                 return false;
+            }else{ 
+                return true;
             }
         },
         merge: function(orderline){
@@ -641,6 +424,8 @@ function openerp_pos_models(instance, module){ //module is instance.point_of_sal
                 price_with_tax :    this.get_price_with_tax(),
                 price_without_tax:  this.get_price_without_tax(),
                 tax:                this.get_tax(),
+                product_description:      this.get_product().get('description'),
+                product_description_sale: this.get_product().get('description_sale'),
             };
         },
         get_price_without_tax: function(){
@@ -882,6 +667,7 @@ function openerp_pos_models(instance, module){ //module is instance.point_of_sal
                 change: this.getChange(),
                 name : this.getName(),
                 client: client ? client.name : null ,
+                invoice_id: null,   //TODO
                 cashier: cashier ? cashier.name : null,
                 date: { 
                     year: date.getFullYear(), 
@@ -895,7 +681,7 @@ function openerp_pos_models(instance, module){ //module is instance.point_of_sal
                     email: company.email,
                     website: company.website,
                     company_registry: company.company_registry,
-                    contact_address: null,  //TODO
+                    contact_address: company.contact_address, 
                     vat: company.vat,
                     name: company.name,
                     phone: company.phone,
diff --git a/addons/point_of_sale/static/src/js/pos_screens.js b/addons/point_of_sale/static/src/js/screens.js
similarity index 82%
rename from addons/point_of_sale/static/src/js/pos_screens.js
rename to addons/point_of_sale/static/src/js/screens.js
index 0515eb9807b..9a2071c6335 100644
--- a/addons/point_of_sale/static/src/js/pos_screens.js
+++ b/addons/point_of_sale/static/src/js/screens.js
@@ -152,14 +152,6 @@ function openerp_pos_screens(instance, module){ //module is instance.point_of_sa
             this.pos_widget.screen_selector.show_popup('help');
         },
 
-        logout_button_action: function(){
-            this.pos_widget.screen_selector.set_user_mode('client');
-        },
-
-        close_button_action: function(){
-            this.pos_widget.try_close();
-        },
-
         barcode_product_screen:         'products',     //if defined, this screen will be loaded when a product is scanned
         barcode_product_error_popup:    'error',    //if defined, this popup will be loaded when there's an error in the popup
 
@@ -167,14 +159,16 @@ function openerp_pos_screens(instance, module){ //module is instance.point_of_sa
         // it will add the product to the order and go to barcode_product_screen. Or show barcode_product_error_popup if 
         // there's an error.
         barcode_product_action: function(ean){
-            if(this.pos_widget.scan_product(ean)){
-                this.pos.proxy.scan_item_success();
-                if(this.barcode_product_screen){ 
-                    this.pos_widget.screen_selector.set_current_screen(this.barcode_product_screen);
+            var self = this;
+            if(self.pos.scan_product(ean)){
+                self.pos.proxy.scan_item_success(ean);
+                if(self.barcode_product_screen){ 
+                    self.pos_widget.screen_selector.set_current_screen(self.barcode_product_screen);
                 }
             }else{
-                if(this.barcode_product_error_popup){
-                    this.pos_widget.screen_selector.show_popup(this.barcode_product_error_popup);
+                self.pos.proxy.scan_item_error_unrecognized(ean);
+                if(self.barcode_product_error_popup && self.pos_widget.screen_selector.get_user_mode() !== 'cashier'){
+                    self.pos_widget.screen_selector.show_popup(self.barcode_product_error_popup);
                 }
             }
         },
@@ -194,6 +188,7 @@ function openerp_pos_screens(instance, module){ //module is instance.point_of_sa
                     return true;
                 }
             }
+            this.pos.proxy.scan_item_unrecognized(ean);
             return false;
         },
         
@@ -207,9 +202,11 @@ function openerp_pos_screens(instance, module){ //module is instance.point_of_sa
                 if(users[i].ean13 === ean.ean){
                     this.pos.get('selectedOrder').set_client(users[i]);
                     this.pos_widget.username.refresh();
+                    this.pos.proxy.scan_item_success(ean);
                     return true;
                 }
             }
+            this.pos.proxy.scan_item_unrecognized(ean);
             return false;
             //TODO start the transaction
         },
@@ -217,29 +214,78 @@ function openerp_pos_screens(instance, module){ //module is instance.point_of_sa
         // what happens when a discount barcode is scanned : the default behavior
         // is to set the discount on the last order.
         barcode_discount_action: function(ean){
+            this.pos.proxy.scan_item_success(ean);
             var last_orderline = this.pos.get('selectedOrder').getLastOrderline();
             if(last_orderline){
                 last_orderline.set_discount(ean.value)
             }
         },
 
+        // shows an action bar on the screen. The actionbar is automatically shown when you add a button
+        // with add_action_button()
+        show_action_bar: function(){
+            this.pos_widget.action_bar.show();
+            this.$el.css({'bottom':'105px'});
+        },
+
+        // hides the action bar. The actionbar is automatically hidden when it is empty
+        hide_action_bar: function(){
+            this.pos_widget.action_bar.hide();
+            this.$el.css({'bottom':'0px'});
+        },
+
+        // adds a new button to the action bar. The button definition takes three parameters, all optional :
+        // - label: the text below the button
+        // - icon:  a small icon that will be shown
+        // - click: a callback that will be executed when the button is clicked.
+        // the method returns a reference to the button widget, and automatically show the actionbar.
+        add_action_button: function(button_def){
+            this.show_action_bar();
+            return this.pos_widget.action_bar.add_new_button(button_def);
+        },
+
         // this method shows the screen and sets up all the widget related to this screen. Extend this method
         // if you want to alter the behavior of the screen.
         show: function(){
+            var self = this;
+
             this.hidden = false;
-            if(this.$element){
-                this.$element.show();
+            if(this.$el){
+                this.$el.show();
             }
 
+            if(this.pos_widget.action_bar.get_button_count() > 0){
+                this.show_action_bar();
+            }else{
+                this.hide_action_bar();
+            }
+            
+            // 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',
+                    icon: '/point_of_sale/static/src/img/icons/png48/help.png',
+                    click: function(){ self.help_button_action(); },
+                });
+
             var self = this;
             var cashier_mode = this.pos_widget.screen_selector.get_user_mode() === 'cashier';
 
             this.pos_widget.set_numpad_visible(this.show_numpad && cashier_mode);
             this.pos_widget.set_leftpane_visible(this.show_leftpane);
+            this.pos_widget.set_left_action_bar_visible(this.show_leftpane && !cashier_mode);
             this.pos_widget.set_cashier_controls_visible(cashier_mode);
-            this.pos_widget.action_bar.set_element_visible('help-button',  !cashier_mode, function(){ self.help_button_action(); });
-            this.pos_widget.action_bar.set_element_visible('logout-button', cashier_mode && this.pos.use_selfcheckout, function(){ self.logout_button_action(); });
-            this.pos_widget.action_bar.set_element_visible('close-button', cashier_mode, function(){ self.close_button_action(); });
+
+            if(cashier_mode && this.pos.iface_self_checkout){
+                this.pos_widget.client_button.show();
+            }else{
+                this.pos_widget.client_button.hide();
+            }
+            if(cashier_mode){
+                this.pos_widget.close_button.show();
+            }else{
+                this.pos_widget.close_button.hide();
+            }
             
             this.pos_widget.username.set_user_mode(this.pos_widget.screen_selector.get_user_mode());
 
@@ -251,24 +297,22 @@ function openerp_pos_screens(instance, module){ //module is instance.point_of_sa
             });
         },
 
-
         // this method is called when the screen is closed to make place for a new screen. this is a good place
         // to put your cleanup stuff as it is guaranteed that for each show() there is one and only one close()
         close: function(){
             if(this.pos.barcode_reader){
                 this.pos.barcode_reader.reset_action_callbacks();
             }
-            if(this.pos_widget.action_bar){
-                this.pos_widget.action_bar.destroy_buttons();
-            }
+            this.pos_widget.action_bar.destroy_buttons();
+            this.pos_widget.left_action_bar.destroy_buttons();
         },
 
         // this methods hides the screen. It's not a good place to put your cleanup stuff as it is called on the
         // POS initialization.
         hide: function(){
             this.hidden = true;
-            if(this.$element){
-                this.$element.hide();
+            if(this.$el){
+                this.$el.hide();
             }
         },
 
@@ -279,8 +323,8 @@ function openerp_pos_screens(instance, module){ //module is instance.point_of_sa
         renderElement: function(){
             this._super();
             if(this.hidden){
-                if(this.$element){
-                    this.$element.hide();
+                if(this.$el){
+                    this.$el.hide();
                 }
             }
         },
@@ -288,13 +332,13 @@ function openerp_pos_screens(instance, module){ //module is instance.point_of_sa
 
     module.PopUpWidget = module.PosBaseWidget.extend({
         show: function(){
-            if(this.$element){
-                this.$element.show();
+            if(this.$el){
+                this.$el.show();
             }
         },
         hide: function(){
-            if(this.$element){
-                this.$element.hide();
+            if(this.$el){
+                this.$el.hide();
             }
         },
     });
@@ -306,7 +350,7 @@ function openerp_pos_screens(instance, module){ //module is instance.point_of_sa
             this.pos.proxy.help_needed();
             var self = this;
             
-            this.$element.find('.button').off('click').click(function(){
+            this.$el.find('.button').off('click').click(function(){
                 self.pos_widget.screen_selector.close_popup();
                 self.pos.proxy.help_canceled();
             });
@@ -349,6 +393,9 @@ function openerp_pos_screens(instance, module){ //module is instance.point_of_sa
     module.ScaleInviteScreenWidget = module.ScreenWidget.extend({
         template:'ScaleInviteScreenWidget',
 
+        next_screen:'scale',
+        previous_screen:'products',
+
         show: function(){
             this._super();
             var self = this;
@@ -359,21 +406,19 @@ function openerp_pos_screens(instance, module){ //module is instance.point_of_sa
                 var weight = self.pos.proxy.weighting_read_kg();
                 if(weight > 0.001){
                     clearInterval(this.intervalID);
-                    self.pos_widget.screen_selector.set_current_screen('scale');
+                    self.pos_widget.screen_selector.set_current_screen(self.next_screen);
                 }
             },500);
 
-            this.pos_widget.action_bar.add_new_button(
-                {
+            this.add_action_button({
                     label: '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('products');
+                        self.pos_widget.screen_selector.set_current_screen(self.previous_screen);
                     }
-                }
-            );
+                });
         },
         close: function(){
             this._super();
@@ -383,25 +428,30 @@ function openerp_pos_screens(instance, module){ //module is instance.point_of_sa
 
     module.ScaleScreenWidget = module.ScreenWidget.extend({
         template:'ScaleScreenWidget',
+
+        next_screen: 'products',
+        previous_screen: 'products',
+
         show: function(){
             this._super();
             this.renderElement();
             var self = this;
 
-            this.pos_widget.action_bar.add_new_button({
+
+            this.add_action_button({
                     label: 'back',
                     icon: '/point_of_sale/static/src/img/icons/png48/go-previous.png',
                     click: function(){
-                        self.pos_widget.screen_selector.set_current_screen('products');
+                        self.pos_widget.screen_selector.set_current_screen(self.previous_screen);
                     }
                 });
 
-            this.validate_button = this.pos_widget.action_bar.add_new_button({
+            this.validate_button = this.add_action_button({
                     label: 'Validate',
                     icon: '/point_of_sale/static/src/img/icons/png48/validate.png',
                     click: function(){
                         self.order_product();
-                        self.pos_widget.screen_selector.set_current_screen('products');
+                        self.pos_widget.screen_selector.set_current_screen(self.next_screen);
                     },
                 });
             
@@ -419,7 +469,7 @@ function openerp_pos_screens(instance, module){ //module is instance.point_of_sa
             this._super();
             this.$('.product-picture').click(function(){
                 self.order_product();
-                self.pos_widget.screen_selector.set_current_screen('products');
+                self.pos_widget.screen_selector.set_current_screen(self.next_screen);
             });
         },
         get_product: function(){
@@ -444,7 +494,7 @@ function openerp_pos_screens(instance, module){ //module is instance.point_of_sa
         },
         get_product_image: function(){
             var product = this.get_product();
-            return product ? product.get('image_medium') : undefined;
+            return product ? product.get('image') : undefined;
         },
         get_product_weight: function(){
             return this.weight || 0;
@@ -458,6 +508,10 @@ function openerp_pos_screens(instance, module){ //module is instance.point_of_sa
 
     module.ClientPaymentScreenWidget =  module.ScreenWidget.extend({
         template:'ClientPaymentScreenWidget',
+
+        next_screen: 'welcome',
+        previous_screen: 'products',
+
         show: function(){
             this._super();
             var self = this;
@@ -486,7 +540,7 @@ function openerp_pos_screens(instance, module){ //module is instance.point_of_sa
                     self.pos.push_order(currentOrder.exportAsJSON()).then(function() {
                         currentOrder.destroy();
                         self.pos.proxy.transaction_end();
-                        self.pos_widget.screen_selector.set_current_screen('welcome');
+                        self.pos_widget.screen_selector.set_current_screen(self.next_screen);
                     });
                 }else if(payment === 'payment_rejected'){
                     clearInterval(this.intervalID);
@@ -494,17 +548,15 @@ function openerp_pos_screens(instance, module){ //module is instance.point_of_sa
                 }
             },500);
 
-            this.pos_widget.action_bar.add_new_button(
-                {
+            this.add_action_button({
                     label: 'back',
                     icon: '/point_of_sale/static/src/img/icons/png48/go-previous.png',
-                    click: function(){  //TODO Go to ask for weighting screen
+                    click: function(){  
                         clearInterval(this.intervalID);
                         self.pos.proxy.payment_canceled();
-                        self.pos_widget.screen_selector.set_current_screen('products');
+                        self.pos_widget.screen_selector.set_current_screen(self.previous_screen);
                     }
-                }
-            );
+                });
         },
         close: function(){
             this._super();
@@ -515,23 +567,32 @@ function openerp_pos_screens(instance, module){ //module is instance.point_of_sa
     module.WelcomeScreenWidget = module.ScreenWidget.extend({
         template:'WelcomeScreenWidget',
 
+        next_screen: 'products',
+
         show_numpad:     false,
         show_leftpane:   false,
 
         barcode_client_action: function(ean){
             this._super(ean);
-            this.pos_widget.screen_selector.set_current_screen('products');
+            this.pos_widget.screen_selector.set_current_screen(this.next_screen);
         },
         
         show: function(){
             this._super();
             var self = this;
+            $('.goodbye-message').css({opacity:1}).show();
+            setTimeout(function(){
+                $('.goodbye-message').animate({opacity:0},500,'swing',function(){$('.goodbye-message').hide();});
+            },3000);
         },
     });
     
     module.ProductScreenWidget = module.ScreenWidget.extend({
         template:'ProductScreenWidget',
 
+        scale_screen: 'scale_invite',
+        client_next_screen:  'client_payment',
+
         show_numpad:     true,
         show_leftpane:   true,
 
@@ -542,8 +603,8 @@ function openerp_pos_screens(instance, module){ //module is instance.point_of_sa
 
             this.product_list_widget = new module.ProductListWidget(this,{
                 click_product_action: function(product){
-                    if(product.get('to_weight') && self.pos.use_scale){
-                        self.pos_widget.screen_selector.set_current_screen('scale_invite', {product: product});
+                    if(product.get('to_weight') && self.pos.iface_electronic_scale){
+                        self.pos_widget.screen_selector.set_current_screen(self.scale_screen, {product: product});
                     }else{
                         self.pos.get('selectedOrder').addProduct(product);
                     }
@@ -559,16 +620,16 @@ function openerp_pos_screens(instance, module){ //module is instance.point_of_sa
             this.product_categories_widget.reset_category();
 
             this.pos_widget.order_widget.set_numpad_state(this.pos_widget.numpad.state);
-            if(this.pos.use_virtual_keyboard){
+            if(this.pos.iface_vkeyboard){
                 this.pos_widget.onscreen_keyboard.connect();
             }
 
             if(this.pos_widget.screen_selector.current_mode === 'client'){ 
-                this.pos_widget.action_bar.add_new_button({
+                this.add_action_button({
                         label: 'pay',
                         icon: '/point_of_sale/static/src/img/icons/png48/go-next.png',
                         click: function(){  
-                            self.pos_widget.screen_selector.set_current_screen('client_payment');
+                            self.pos_widget.screen_selector.set_current_screen(self.client_next_screen);
                         }
                     });
             }
@@ -604,17 +665,19 @@ function openerp_pos_screens(instance, module){ //module is instance.point_of_sa
             this._super();
             var self = this;
 
-            this.pos_widget.action_bar.add_new_button({
+            this.add_action_button({
                     label: 'Print',
                     icon: '/point_of_sale/static/src/img/icons/png48/printer.png',
                     click: function(){ self.print(); },
                 });
 
-            this.pos_widget.action_bar.add_new_button({
+            this.add_action_button({
                     label: 'Next Order',
                     icon: '/point_of_sale/static/src/img/icons/png48/go-next.png',
                     click: function() { self.finishOrder(); },
                 });
+
+            window.print();
         },
         print: function() {
             window.print();
@@ -637,12 +700,14 @@ function openerp_pos_screens(instance, module){ //module is instance.point_of_sa
         },
         refresh: function() {
             this.currentOrder = this.pos.get('selectedOrder');
-            $('.pos-receipt-container', this.$element).html(QWeb.render('PosTicket',{widget:this}));
+            $('.pos-receipt-container', this.$el).html(QWeb.render('PosTicket',{widget:this}));
         },
     });
 
     module.PaymentScreenWidget = module.ScreenWidget.extend({
         template: 'PaymentScreenWidget',
+        back_screen: 'products',
+        next_screen: 'receipt',
         init: function(parent, options) {
             this._super(parent,options);
             this.model = options.model;
@@ -654,27 +719,30 @@ function openerp_pos_screens(instance, module){ //module is instance.point_of_sa
             this._super();
             var self = this;
 
-            if(this.pos.use_cashbox){
+            if(this.pos.iface_cashdrawer){
                 this.pos.proxy.open_cashbox();
             }
 
             this.set_numpad_state(this.pos_widget.numpad.state);
             
-            this.back_button = this.pos_widget.action_bar.add_new_button({
+            this.back_button = this.add_action_button({
                     label: 'Back',
                     icon: '/point_of_sale/static/src/img/icons/png48/go-previous.png',
                     click: function(){  
-                        self.pos_widget.screen_selector.set_current_screen('products');
+                        self.pos_widget.screen_selector.set_current_screen(self.back_screen);
                     },
                 });
             
-            this.validate_button = this.pos_widget.action_bar.add_new_button({
+            this.validate_button = this.add_action_button({
                     label: 'Validate',
+                    name: 'validation',
                     icon: '/point_of_sale/static/src/img/icons/png48/validate.png',
                     click: function(){
                         self.validateCurrentOrder();
                     },
                 });
+
+            this.updatePaymentSummary();
         },
         close: function(){
             this._super();
@@ -682,24 +750,18 @@ function openerp_pos_screens(instance, module){ //module is instance.point_of_sa
             this.pos_widget.payment_screen.set_numpad_state(null);
         },
         back: function() {
-            this.pos_widget.screen_selector.set_current_screen('products');
+            this.pos_widget.screen_selector.set_current_screen(self.back_screen);
         },
         validateCurrentOrder: function() {
-            var self = this;
             var currentOrder = this.pos.get('selectedOrder');
 
-            this.validate_button.$element.attr('disabled','disabled');  //FIXME is the css actually using this attr ? 
-
             this.pos.push_order(currentOrder.exportAsJSON()) 
-                .then(function() {
-                    self.validate_button.$element.removeAttr('disabled');
-                    if(self.pos.use_proxy_printer){
-                        self.pos.proxy.print_receipt(currentOrder.export_for_printing());
-                        self.pos.get('selectedOrder').destroy();    //finish order and go back to scan screen
-                    }else{
-                        self.pos_widget.screen_selector.set_current_screen('receipt');
-                    }
-                });
+            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() {
             this.currentPaymentLines = (this.pos.get('selectedOrder')).get('paymentLines');
@@ -747,6 +809,9 @@ function openerp_pos_screens(instance, module){ //module is instance.point_of_sa
             this.$('#payment-paid-total').html(paidTotal.toFixed(2));
             this.$('#payment-remaining').html(remaining.toFixed(2));
             this.$('#payment-change').html(change.toFixed(2));
+            if(this.pos_widget.action_bar){
+                this.pos_widget.action_bar.set_button_disabled('validation', remaining > 0);
+            }
         },
         set_numpad_state: function(numpadState) {
         	if (this.numpadState) {
diff --git a/addons/point_of_sale/static/src/js/pos_basewidget.js b/addons/point_of_sale/static/src/js/widget_base.js
similarity index 96%
rename from addons/point_of_sale/static/src/js/pos_basewidget.js
rename to addons/point_of_sale/static/src/js/widget_base.js
index 62097f39db3..0aa0a44e7e7 100644
--- a/addons/point_of_sale/static/src/js/pos_basewidget.js
+++ b/addons/point_of_sale/static/src/js/widget_base.js
@@ -35,10 +35,10 @@ function openerp_pos_basewidget(instance, module){ //module is instance.point_of
 
         },
         show: function(){
-            this.$element.show();
+            this.$el.show();
         },
         hide: function(){
-            this.$element.hide();
+            this.$el.hide();
         },
     });
 
diff --git a/addons/point_of_sale/static/src/js/pos_keyboard_widget.js b/addons/point_of_sale/static/src/js/widget_keyboard.js
similarity index 100%
rename from addons/point_of_sale/static/src/js/pos_keyboard_widget.js
rename to addons/point_of_sale/static/src/js/widget_keyboard.js
diff --git a/addons/point_of_sale/static/src/js/pos_scrollbar_widget.js b/addons/point_of_sale/static/src/js/widget_scrollbar.js
similarity index 94%
rename from addons/point_of_sale/static/src/js/pos_scrollbar_widget.js
rename to addons/point_of_sale/static/src/js/widget_scrollbar.js
index d4f6903c435..e4660a9c458 100644
--- a/addons/point_of_sale/static/src/js/pos_scrollbar_widget.js
+++ b/addons/point_of_sale/static/src/js/widget_scrollbar.js
@@ -63,11 +63,12 @@ function openerp_pos_scrollbar(instance, module){ //module is instance.point_of_
             this.update_scroller_dimensions(false);
             this.update_button_status();
             this.auto_hide(false);
-            this.$element.bind('mousewheel',function(event,delta){
+            this.$el.bind('mousewheel',function(event,delta){
                 self.scroll(delta*self.wheel_step);
+                return false;
             });
-            this.$element.bind('click',function(event){
-                var vpos = event.pageY - self.$element.offset().top;
+            this.$el.bind('click',function(event){
+                var vpos = event.pageY - self.$el.offset().top;
                 var spos = self.scroller_dimensions();
                 if(vpos > spos.bar_pos && vpos < spos.pos){
                     self.page_up();
@@ -105,9 +106,9 @@ function openerp_pos_scrollbar(instance, module){ //module is instance.point_of_
         // shows the scrollbar. if animated is true, it will do it in an animated fashion
         show: function(animated){   //FIXME: animated show and hide don't work ... ? 
             if(animated){
-                this.$element.show().animate({'width':'48px'}, 500, 'swing');
+                this.$el.show().animate({'width':'48px'}, 500, 'swing');
             }else{
-                this.$element.show().css('width','48px');
+                this.$el.show().css('width','48px');
             }
             this.on_show(this);
         },
@@ -116,9 +117,9 @@ function openerp_pos_scrollbar(instance, module){ //module is instance.point_of_
         hide: function(animated){
             var self = this;
             if(animated){
-                this.$element.animate({'width':'0px'}, 500, 'swing', function(){ self.$element.hide();});
+                this.$el.animate({'width':'0px'}, 500, 'swing', function(){ self.$el.hide();});
             }else{
-                this.$element.hide().css('width','0px');
+                this.$el.hide().css('width','0px');
             }
             this.on_hide(this);
         },
@@ -135,7 +136,7 @@ function openerp_pos_scrollbar(instance, module){ //module is instance.point_of_
             var button_up_height = this.$('.up-button')[0].offsetHeight || 48;
             var button_down_height = this.$('.down-button')[0].offsetHeight || 48;
             
-            var bar_height = this.$element[0].offsetHeight || 96;
+            var bar_height = this.$el[0].offsetHeight || 96;
             var scrollbar_height = bar_height - button_up_height - button_down_height;
             
             scroller_pos = scroller_pos * scrollbar_height + button_up_height;
@@ -204,7 +205,7 @@ function openerp_pos_scrollbar(instance, module){ //module is instance.point_of_
                 if(this.target_selector){
                     return this.target_widget.$(this.target_selector);
                 }else{
-                    return this.target_widget.$element;
+                    return this.target_widget.$el;
                 }
             }else if(this.target_selector){
                 return $(this.target_selector);
diff --git a/addons/point_of_sale/static/src/js/pos_widgets.js b/addons/point_of_sale/static/src/js/widgets.js
similarity index 71%
rename from addons/point_of_sale/static/src/js/pos_widgets.js
rename to addons/point_of_sale/static/src/js/widgets.js
index 9a27be29381..6de31c88dfd 100644
--- a/addons/point_of_sale/static/src/js/pos_widgets.js
+++ b/addons/point_of_sale/static/src/js/widgets.js
@@ -1,6 +1,57 @@
 function openerp_pos_widgets(instance, module){ //module is instance.point_of_sale
     var QWeb = instance.web.qweb;
 
+    // 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
+    // the application cache involves such latency is beyond me, hopefully one day this can be
+    // removed.
+    module.ImageCache   = instance.web.Class.extend({
+        init: function(options){
+            options = options || {};
+            this.max_size = options.max_size || 500;
+
+            this.cache = {};
+            this.access_time = {};
+            this.size = 0;
+        },
+        get_image_uncached: function(url){
+            var img =  new Image();
+            img.src = url;
+            return img;
+        },
+        // returns a DOM Image object from an url, and cache the last 500 (by default) results
+        get_image: function(url){
+            var cached = this.cache[url];
+            if(cached){
+                this.access_time[url] = (new Date()).getTime();
+                return cached;
+            }else{
+                var img = new Image();
+                img.src = url;
+                while(this.size >= this.max_size){
+                    var oldestUrl = null;
+                    var oldestTime = (new Date()).getTime();
+                    for(var url in this.cache){
+                        var time = this.access_time[url];
+                        if(time <= oldestTime){
+                            oldestTime = time;
+                            oldestUrl  = url;
+                        }
+                    }
+                    if(oldestUrl){
+                        delete this.cache[oldestUrl];
+                        delete this.access_time[oldestUrl];
+                    }
+                    this.size--;
+                }
+                this.cache[url] = img;
+                this.access_time[url] = (new Date()).getTime();
+                this.size++;
+                return img;
+            }
+        },
+    });
+
     module.NumpadWidget = module.PosBaseWidget.extend({
         template:'NumpadWidget',
         init: function(parent, options) {
@@ -10,10 +61,10 @@ function openerp_pos_widgets(instance, module){ //module is instance.point_of_sa
         start: function() {
             this.state.bind('change:mode', this.changedMode, this);
             this.changedMode();
-            this.$element.find('button#numpad-backspace').click(_.bind(this.clickDeleteLastChar, this));
-            this.$element.find('button#numpad-minus').click(_.bind(this.clickSwitchSign, this));
-            this.$element.find('button.number-char').click(_.bind(this.clickAppendNewChar, this));
-            this.$element.find('button.mode-button').click(_.bind(this.clickChangeMode, this));
+            this.$el.find('button#numpad-backspace').click(_.bind(this.clickDeleteLastChar, this));
+            this.$el.find('button#numpad-minus').click(_.bind(this.clickSwitchSign, this));
+            this.$el.find('button.number-char').click(_.bind(this.clickAppendNewChar, this));
+            this.$el.find('button.mode-button').click(_.bind(this.clickChangeMode, this));
         },
         clickDeleteLastChar: function() {
             return this.state.deleteLastChar();
@@ -33,7 +84,7 @@ function openerp_pos_widgets(instance, module){ //module is instance.point_of_sa
         changedMode: function() {
             var mode = this.state.get('mode');
             $('.selected-mode').removeClass('selected-mode');
-            $(_.str.sprintf('.mode-button[data-mode="%s"]', mode), this.$element).addClass('selected-mode');
+            $(_.str.sprintf('.mode-button[data-mode="%s"]', mode), this.$el).addClass('selected-mode');
         },
     });
 
@@ -51,7 +102,7 @@ function openerp_pos_widgets(instance, module){ //module is instance.point_of_sa
                     pos_widget : self.pos_widget,
                     cashRegister: cashRegister,
                 });
-                button.appendTo(self.$element);
+                button.appendTo(self.$el);
             });
         }
     });
@@ -66,7 +117,7 @@ function openerp_pos_widgets(instance, module){ //module is instance.point_of_sa
             var self = this;
             this._super();
 
-            this.$element.click(function(){
+            this.$el.click(function(){
                 if (self.pos.get('selectedOrder').get('screen') === 'receipt'){  //TODO Why ?
                     console.warn('TODO should not get there...?');
                     return;
@@ -95,9 +146,9 @@ function openerp_pos_widgets(instance, module){ //module is instance.point_of_sa
         },
         renderElement: function() {
             this._super();
-            this.$element.click(_.bind(this.click_handler, this));
+            this.$el.click(_.bind(this.click_handler, this));
             if(this.model.is_selected()){
-                this.$element.addClass('selected');
+                this.$el.addClass('selected');
             }
         },
         refresh: function(){
@@ -112,7 +163,7 @@ function openerp_pos_widgets(instance, module){ //module is instance.point_of_sa
         template:'OrderWidget',
         init: function(parent, options) {
             this._super(parent,options);
-            this.compact = false;   
+            this.display_mode = options.display_mode || 'numpad';   // 'maximized' | 'actionbar' | 'numpad'
             this.set_numpad_state(options.numpadState);
             this.pos.bind('change:selectedOrder', this.change_selected_order, this);
             this.bind_orderline_events();
@@ -165,8 +216,12 @@ function openerp_pos_widgets(instance, module){ //module is instance.point_of_sa
             var self = this;
             this._super();
 
-            if(!this.compact){
+            if(this.display_mode === 'maximized'){
                 $('.point-of-sale .order-container').css({'bottom':'0px'});
+            }else if(this.display_mode === 'actionbar'){
+                $('.point-of-sale .order-container').css({'bottom':'105px'});
+            }else if(this.display_mode !== 'numpad'){
+                console.error('ERROR: OrderWidget renderElement(): wrong display_mode:',this.display_mode);
             }
 
             var $content = this.$('.orderlines');
@@ -211,9 +266,9 @@ function openerp_pos_widgets(instance, module){ //module is instance.point_of_sa
             var total = order ? order.getTotal() : 0;
             this.$('.summary .value.total').html(this.format_currency(total));
         },
-        set_compact: function(compact){
-            if(this.compact !== compact){
-                this.compact = compact;
+        set_display_mode: function(mode){
+            if(this.display_mode !== mode){
+                this.display_mode = mode;
                 this.renderElement();
             }
         },
@@ -225,22 +280,18 @@ function openerp_pos_widgets(instance, module){ //module is instance.point_of_sa
             this._super(parent,options);
             this.model = options.model;
             this.model.attributes.weight = options.weight;
-            this.next_screen = options.next_screen;
-            this.click_product_action = options.click_product_action;
+            this.next_screen = options.next_screen; //when a product is clicked, this screen is set
+            this.click_product_action = options.click_product_action; 
         },
-        add_to_order: function(event) {
-            /* Preserve the category URL */
-            event.preventDefault();
-            return (this.pos.get('selectedOrder')).addProduct(this.model);
-        },
-        set_weight: function(weight){
-            this.model.attributes.weight = weight;
-            this.renderElement();
+        // returns the url of the product thumbnail
+        get_image_url: function() {
+            return '/web/binary/image?session_id='+instance.session.session_id+'&model=product.product&field=image&id='+this.model.get('id');
         },
         renderElement: function() {
             this._super();
+            this.$('img').replaceWith(this.pos_widget.image_cache.get_image(this.get_image_url()));
             var self = this;
-            $("a", this.$element).click(function(e){
+            $("a", this.$el).click(function(e){
                 if(self.click_product_action){
                     self.click_product_action(self.model);
                 }
@@ -304,7 +355,7 @@ function openerp_pos_widgets(instance, module){ //module is instance.point_of_sa
         },
         setButtonSelected: function() {
             $('.selected-order').removeClass('selected-order');
-            this.$element.addClass('selected-order');
+            this.$el.addClass('selected-order');
         },
         closeOrder: function(event) {
             this.order.destroy();
@@ -313,20 +364,28 @@ function openerp_pos_widgets(instance, module){ //module is instance.point_of_sa
 
     module.ActionButtonWidget = instance.web.Widget.extend({
         template:'ActionButtonWidget',
+        icon_template:'ActionButtonWidgetWithIcon',
         init: function(parent, options){
             this._super(parent, options);
             this.label = options.label || 'button';
             this.rightalign = options.rightalign || false;
             this.click_action = options.click;
+            this.disabled = options.disabled || false;
             if(options.icon){
                 this.icon = options.icon;
-                this.template = 'ActionButtonWidgetWithIcon';
+                this.template = this.icon_template;
+            }
+        },
+        set_disabled: function(disabled){
+            if(this.disabled != disabled){
+                this.disabled = !!disabled;
+                this.renderElement();
             }
         },
         renderElement: function(){
             this._super();
-            if(this.click_action){
-                this.$element.click(_.bind(this.click_action, this));
+            if(this.click_action && !this.disabled){
+                this.$el.click(_.bind(this.click_action, this));
             }
         },
     });
@@ -336,12 +395,12 @@ function openerp_pos_widgets(instance, module){ //module is instance.point_of_sa
         init: function(parent, options){
             this._super(parent,options);
             this.button_list = [];
-            this.fake_buttons  = {};
+            this.buttons = {};
             this.visibility = {};
         },
         set_element_visible: function(element, visible, action){
             if(visible != this.visibility[element]){
-                this.visibility[element] = visible;
+                this.visibility[element] = !!visible;
                 if(visible){
                     this.$('.'+element).show();
                 }else{
@@ -349,31 +408,46 @@ function openerp_pos_widgets(instance, module){ //module is instance.point_of_sa
                 }
             }
             if(visible && action){
+                this.action[element] = action;
                 this.$('.'+element).off('click').click(action);
             }
         },
+        set_button_disabled: function(name, disabled){
+            var b = this.buttons[name];
+            if(b){
+                b.set_disabled(disabled);
+            }
+        },
         destroy_buttons:function(){
             for(var i = 0; i < this.button_list.length; i++){
                 this.button_list[i].destroy();
             }
             this.button_list = [];
+            this.buttons = {};
             return this;
         },
+        get_button_count: function(){
+            return this.button_list.length;
+        },
         add_new_button: function(button_options){
-            if(arguments.length == 1){
-                var button = new module.ActionButtonWidget(this,button_options);
-                this.button_list.push(button);
-                button.appendTo($('.pos-actionbar-button-list'));
-                return button;
-            }else{
-                for(var i = 0; i < arguments.length; i++){
-                    this.add_new_button(arguments[i]);
-                }
+            var button = new module.ActionButtonWidget(this,button_options);
+            this.button_list.push(button);
+            if(button_options.name){
+                this.buttons[button_options.name] = button;
             }
-            return undefined;
+            button.appendTo(this.$('.pos-actionbar-button-list'));
+            return button;
+        },
+        show:function(){
+            this.$el.show();
+        },
+        hide:function(){
+            this.$el.hide();
         },
     });
 
+    module.CategoryButton = module.PosBaseWidget.extend({
+    });
     module.ProductCategoriesWidget = module.PosBaseWidget.extend({
         template: 'ProductCategoriesWidget',
         init: function(parent, options){
@@ -389,41 +463,53 @@ function openerp_pos_widgets(instance, module){ //module is instance.point_of_sa
 
         // changes the category. if undefined, sets to root category
         set_category : function(category){
+            var db = this.pos.db;
             if(!category){
-                this.category = this.pos.root_category;
+                this.category = db.get_category_by_id(db.root_category_id);
             }else{
                 this.category = category;
             }
-
             this.breadcrumb = [];
-            for(var i = 1; i < this.category.ancestors.length; i++){
-                this.breadcrumb.push(this.category.ancestors[i]);
+            var ancestors_ids = db.get_category_ancestors_ids(this.category.id);
+            for(var i = 1; i < ancestors_ids.length; i++){
+                this.breadcrumb.push(db.get_category_by_id(ancestors_ids[i]));
             }
-            if(this.category !== this.pos.root_category){
+            if(this.category.id !== db.root_category_id){
                 this.breadcrumb.push(this.category);
             }
-            if(this.product_type === 'weightable'){
-                this.subcategories = [];
-                for(var i = 0; i < this.category.childrens.length; i++){
-                    if(this.category.childrens[i].weightable_product_list.length > 0){
-                        this.subcategories.push( this.category.childrens[i]);
-                    }
-                }
-            }else{
-                this.subcategories = this.category.childrens || [];
-            }
+            this.subcategories = db.get_category_by_id(db.get_category_childs_ids(this.category.id));
+        },
+
+        get_image_url: function(category){
+            return '/web/binary/image?session_id='+instance.session.session_id+'&model=pos.category&field=image&id='+category.id;
         },
 
         renderElement: function(){
             var self = this;
             this._super();
-            _.each(this.subcategories, function(category){
-                var button = QWeb.render('CategoryButton',{category:category});
-                button = _.str.trim(button);
 
-                $(button).appendTo(this.$('.category-list')).click(function(event){
+            var hasimages = false;  //if none of the subcategories have images, we don't display buttons with icons
+            _.each(this.subcategories, function(category){
+                if(category.image){
+                    hasimages = true;
+                }
+            });
+
+            _.each(this.subcategories, function(category){
+                if(hasimages){
+                    var button = QWeb.render('CategoryButton',{category:category});
+                    var button = _.str.trim(button);
+                    var button = $(button);
+                    button.find('img').replaceWith(self.pos_widget.image_cache.get_image(self.get_image_url(category)));
+                }else{
+                    var button = QWeb.render('CategorySimpleButton',{category:category});
+                    button = _.str.trim(button);    // we remove whitespace between buttons to fix spacing
+                    var button = $(button);
+                }
+
+                button.appendTo(this.$('.category-list')).click(function(event){
                     var id = category.id;
-                    var cat = self.pos.categories_by_id[id];
+                    var cat = self.pos.db.get_category_by_id(id);
                     self.set_category(cat);
                     self.renderElement();
                     self.search_and_categories(cat);
@@ -432,7 +518,7 @@ function openerp_pos_widgets(instance, module){ //module is instance.point_of_sa
             // breadcrumb click actions
             this.$(".oe-pos-categories-list a").click(function(event){
                 var id = $(event.target).data("category-id");
-                var category = self.pos.categories_by_id[id];
+                var category = self.pos.db.get_category_by_id(id);
                 self.set_category(category);
                 self.renderElement();
                 self.search_and_categories(category);
@@ -455,47 +541,30 @@ function openerp_pos_widgets(instance, module){ //module is instance.point_of_sa
         // filters the products, and sets up the search callbacks
         search_and_categories: function(category){
             var self = this;
-            
-            var all_products = this.pos.get('product_list');
-            var all_packages = this.pos.get('product.packaging');
 
             // find all products belonging to the current category
-            var products = [];
-            if(this.product_type === 'weightable'){
-                products = all_products.filter( function(product){
-                    return self.category.weightable_product_set[product.id];
-                });
-            }else{
-                products = all_products.filter( function(product){
-                    return self.category.product_set[product.id];
-                });
-            }
+            var products = this.pos.db.get_product_by_category(this.category.id);
+            self.pos.get('products').reset(products);
 
-            // product lists watch for reset events on 'products' to re-render. 
-            // FIXME that means all productlist widget re-render... even the hidden ones ! 
-            this.pos.get('products').reset(products);
-            
-            // find all the products whose name match the query in the searchbox
+            // filter the products according to the search string
             this.$('.searchbox input').keyup(function(){
-                var results, search_str;
-                search_str = $(this).val().toLowerCase();
-                if(search_str){
-                    results = products.filter( function(p){
-                        return p.name.toLowerCase().indexOf(search_str) != -1 || 
-                               (p.ean13 && p.ean13.indexOf(search_str) != -1);
-                    });
-                    self.$element.find('.search-clear').fadeIn();
+                query = $(this).val().toLowerCase();
+                if(query){
+                    var products = self.pos.db.search_product_in_category(self.category.id, query);
+                    self.pos.get('products').reset(products);
+                    self.$('.search-clear').fadeIn();
                 }else{
-                    results = products;
-                    self.$element.find('.search-clear').fadeOut();
+                    var products = self.pos.db.get_product_by_category(self.category.id);
+                    self.pos.get('products').reset(products);
+                    self.$('.search-clear').fadeOut();
                 }
-                self.pos.get('products').reset(results);
-            });
-            this.$('.searchbox input').click(function(){
             });
 
+            this.$('.searchbox input').click(function(){}); //Why ???
+
             //reset the search when clicking on reset
             this.$('.search-clear').click(function(){
+                var products = self.pos.db.get_product_by_category(self.category.id);
                 self.pos.get('products').reset(products);
                 self.$('.searchbox input').val('').focus();
                 self.$('.search-clear').fadeOut();
@@ -519,11 +588,6 @@ function openerp_pos_widgets(instance, module){ //module is instance.point_of_sa
                 self.renderElement();
             });
         },
-        set_weight: function(weight){
-            for(var i = 0; i < this.product_list.length; i++){
-                this.product_list[i].set_weight(weight);
-            }
-        },
         renderElement: function() {
             var self = this;
             this._super();
@@ -586,14 +650,35 @@ function openerp_pos_widgets(instance, module){ //module is instance.point_of_sa
         },
     });
 
+    module.HeaderButtonWidget = module.PosBaseWidget.extend({
+        template: 'HeaderButtonWidget',
+        init: function(parent, options){
+            options = options || {};
+            this._super(parent, options);
+            this.action = options.action;
+            this.label   = options.label;
+        },
+        renderElement: function(){
+            var self = this;
+            this._super();
+            if(this.action){
+                this.$el.click(function(){ self.action(); });
+            }
+        },
+        show: function(){ this.$el.show(); },
+        hide: function(){ this.$el.hide(); },
+
+    });
+
+
 // ---------- Main Point of Sale Widget ----------
 
     // this is used to notify the user that data is being synchronized on the network
     module.SynchNotificationWidget = module.PosBaseWidget.extend({
         template: "SynchNotificationWidget",
-        init: function(parent,options) {
+        init: function(parent, options){
             options = options || {};
-            this._super(parent,options);
+            this._super(parent, options);
         },
         renderElement: function() {
             var self = this;
@@ -632,9 +717,19 @@ function openerp_pos_widgets(instance, module){ //module is instance.point_of_sa
             this.pos_widget = this; //So that pos_widget's childs have pos_widget set automatically
 
             this.numpad_visible = true;
+            this.left_action_bar_visible = true;
             this.leftpane_visible = true;
             this.leftpane_width   = '440px';
             this.cashier_controls_visible = true;
+            this.image_cache = new module.ImageCache(); // for faster products image display
+
+            /*
+             //Epileptic mode
+            setInterval(function(){ 
+                $('body').css({'-webkit-filter':'hue-rotate('+Math.random()*360+'deg)' });
+            },100);
+            */
+            
         },
       
         start: function() {
@@ -643,7 +738,9 @@ function openerp_pos_widgets(instance, module){ //module is instance.point_of_sa
                 self.build_currency_template();
                 self.renderElement();
                 
-                self.$('.neworder-button').click(_.bind(self.create_new_order, self));
+                self.$('.neworder-button').click(function(){
+                    self.pos.add_new_order();
+                });
                 
                 //when a new order is created, add an order button widget
                 self.pos.get('orders').bind('add', function(new_order){
@@ -659,6 +756,10 @@ function openerp_pos_widgets(instance, module){ //module is instance.point_of_sa
 
                 self.build_widgets();
 
+                self.screen_selector.set_default_screen();
+
+                self.pos.barcode_reader.connect();
+
                 instance.webclient.set_content_full_screen(true);
 
                 if (!self.pos.get('pos_session')) {
@@ -667,9 +768,14 @@ function openerp_pos_widgets(instance, module){ //module is instance.point_of_sa
                     self.screen_selector.show_popup('error', 'Sorry, we could not find any PoS Configuration for this session');
                 }
             
-                self.$('.loader').animate({opacity:0},3000,'swing',function(){$('.loader').hide();});
+                self.$('.loader').animate({opacity:0},1500,'swing',function(){self.$('.loader').hide();});
                 self.$('.loader img').hide();
 
+                if(jQuery.deparam(jQuery.param.querystring()).debug !== undefined){
+                    window.pos = self.pos;
+                    window.pos_widget = self.pos_widget;
+                }
+
             },function(){   // error when loading models data from the backend
                 self.$('.loader img').hide();
                 return new instance.web.Model("ir.model.data").get_func("search_read")([['name', '=', 'action_pos_session_opening']], ['res_id'])
@@ -682,8 +788,11 @@ function openerp_pos_widgets(instance, module){ //module is instance.point_of_sa
                     }, self));
             });
         },
-
+        
+        // This method instantiates all the screens, widgets, etc. If you want to add new screens change the
+        // startup screen, etc, override this method.
         build_widgets: function() {
+            var self = this;
 
             // --------  Screens ---------
 
@@ -725,13 +834,16 @@ function openerp_pos_widgets(instance, module){ //module is instance.point_of_sa
             // --------  Misc ---------
 
             this.notification = new module.SynchNotificationWidget(this,{});
-            this.notification.replace(this.$('.placeholder-SynchNotificationWidget'));
+            this.notification.appendTo(this.$('#rightheader'));
 
             this.username   = new module.UsernameWidget(this,{});
             this.username.replace(this.$('.placeholder-UsernameWidget'));
 
             this.action_bar = new module.ActionBarWidget(this);
-            this.action_bar.appendTo($(".point-of-sale #content"));
+            this.action_bar.appendTo($(".point-of-sale #rightpane"));
+
+            this.left_action_bar = new module.ActionBarWidget(this);
+            this.left_action_bar.appendTo($(".point-of-sale #leftpane"));
 
             this.paypad = new module.PaypadWidget(this, {});
             this.paypad.replace($('#placeholder-PaypadWidget'));
@@ -746,6 +858,19 @@ function openerp_pos_widgets(instance, module){ //module is instance.point_of_sa
                 'keyboard_model': 'simple'
             });
             this.onscreen_keyboard.appendTo($(".point-of-sale #content")); 
+
+            this.close_button = new module.HeaderButtonWidget(this,{
+                label:'Close',
+                action: function(){ self.try_close(); },
+            });
+            this.close_button.appendTo(this.$('#rightheader'));
+
+            this.client_button = new module.HeaderButtonWidget(this,{
+                label:'Self-Checkout',
+                action: function(){ self.screen_selector.set_user_mode('client'); },
+            });
+            this.client_button.appendTo(this.$('#rightheader'));
+
             
             // --------  Screen Selector ---------
 
@@ -768,59 +893,11 @@ function openerp_pos_widgets(instance, module){ //module is instance.point_of_sa
                 },
                 default_client_screen: 'welcome',
                 default_cashier_screen: 'products',
-                default_mode: this.pos.use_selfcheckout ?  'client' : 'cashier',
+                default_mode: this.pos.iface_self_checkout ?  'client' : 'cashier',
             });
 
-            this.screen_selector.set_default_screen();
-
-            this.pos.barcode_reader.connect();
         },
 
-        //FIXME this method is probably not at the right place ... 
-        scan_product: function(parsed_ean){
-            var selectedOrder = this.pos.get('selectedOrder');
-            var scannedProductModel = this.get_product_by_ean(parsed_ean);
-            if (!scannedProductModel){
-                return false;
-            } else {
-                if(parsed_ean.type === 'price'){
-                    selectedOrder.addProduct(new module.Product(scannedProductModel), { price:parsed_ean.value});
-                }else if(parsed_ean.type === 'weight'){
-                    selectedOrder.addProduct(new module.Product(scannedProductModel), { quantity:parsed_ean.value, merge:false});
-                }else{
-                    selectedOrder.addProduct(new module.Product(scannedProductModel));
-                }
-                return true;
-            }
-        },
-
-        get_product_by_ean: function(parsed_ean) {
-            var allProducts = this.pos.get('product_list');
-            var allPackages = this.pos.get('product.packaging');
-            var scannedProductModel = undefined;
-
-            if (parsed_ean.type === 'price' || parsed_ean.type === 'weight') {
-                var itemCode = parsed_ean.id;
-                var scannedPackaging = _.detect(allPackages, function(pack) { 
-                    return pack.ean && pack.ean.substring(0,7) === itemCode;
-                });
-                if (scannedPackaging) {
-                    scannedProductModel = _.detect(allProducts, function(pc) { return pc.id === scannedPackaging.product_id[0];});
-                }else{
-                    scannedProductModel = _.detect(allProducts, function(pc) { return pc.ean13  && (pc.ean13.substring(0,7) === parsed_ean.id);});   
-                }
-            } else if(parsed_ean.type === 'unit'){
-                scannedProductModel = _.detect(allProducts, function(pc) { return pc.ean13 === parsed_ean.ean;});   //TODO DOES NOT SCALE
-            }
-            return scannedProductModel;
-        },
-        // creates a new order, and add it to the list of orders.
-        create_new_order: function() {
-            var new_order;
-            new_order = new module.Order({ pos: this.pos });
-            this.pos.get('orders').add(new_order);
-            this.pos.set({ selectedOrder: new_order });
-        },
         changed_pending_operations: function () {
             var self = this;
             this.synch_notification.on_change_nbr_pending(self.pos.get('nbr_pending_operations').length);
@@ -830,16 +907,35 @@ function openerp_pos_widgets(instance, module){ //module is instance.point_of_sa
             if(visible !== this.numpad_visible){
                 this.numpad_visible = visible;
                 if(visible){
+                    this.set_left_action_bar_visible(false);
                     this.numpad.show();
                     this.paypad.show();
-                    this.order_widget.set_compact(true);
+                    this.order_widget.set_display_mode('numpad');
                 }else{
                     this.numpad.hide();
                     this.paypad.hide();
-                    this.order_widget.set_compact(false);
+                    if(this.order_widget.display_mode === 'numpad'){
+                        this.order_widget.set_display_mode('maximized');
+                    }
                 }
             }
         },
+        set_left_action_bar_visible: function(visible){
+            if(visible !== this.left_action_bar_visible){
+                this.left_action_bar_visible = visible;
+                if(visible){
+                    this.set_numpad_visible(false);
+                    this.left_action_bar.show();
+                    this.order_widget.set_display_mode('actionbar');
+                }else{
+                    this.left_action_bar.hide();
+                    if(this.order_widget.display_mode === 'actionbar'){
+                        this.order_widget.set_display_mode('maximized');
+                    }
+                }
+            }
+        },
+
         //shows or hide the leftpane (contains the list of orderlines, the numpad, the paypad, etc.)
         set_leftpane_visible: function(visible){
             if(visible !== this.leftpane_visible){
@@ -874,12 +970,14 @@ function openerp_pos_widgets(instance, module){ //module is instance.point_of_sa
             });
         },
         close: function() {
+            var self = this;
             this.pos.barcode_reader.disconnect();
             return new instance.web.Model("ir.model.data").get_func("search_read")([['name', '=', 'action_client_pos_menu']], ['res_id']).pipe(
                     _.bind(function(res) {
                 return this.rpc('/web/action/load', {'action_id': res[0]['res_id']}).pipe(_.bind(function(result) {
                     var action = result.result;
                     action.context = _.extend(action.context || {}, {'cancel_action': {type: 'ir.actions.client', tag: 'reload'}});
+                    //self.destroy();
                     this.do_action(action);
                 }, this));
             }, this));
diff --git a/addons/point_of_sale/static/src/xml/pos.xml b/addons/point_of_sale/static/src/xml/pos.xml
index 9bdac93d990..bbe278758d5 100644
--- a/addons/point_of_sale/static/src/xml/pos.xml
+++ b/addons/point_of_sale/static/src/xml/pos.xml
@@ -15,7 +15,7 @@
                         <button class="neworder-button">+</button>
                         <ol id="orders"></ol>
                     </div>
-                    <span class="placeholder-SynchNotificationWidget"></span>
+                    <!-- here goes header buttons -->
                 </div>
             </div>
             <div id="content">
@@ -44,6 +44,12 @@
         </div>
     </t>
 
+    <t t-name="HeaderButtonWidget">
+        <div class="header-button">
+            <t t-esc="widget.label" />
+        </div>
+    </t>
+
     <t t-name="PosCloseWarning">
         <div>There are pending operations that could not be saved into the database, are you sure you want to exit?</div>
     </t>
@@ -83,7 +89,7 @@
     <t t-name="CategoryButton">
         <li class='category-button'>
             <div class="category-img">
-                <img t-att-src="'data:image/gif;base64,'+ category.image_medium" />
+                <img src="" />
             </div>
             <div class="category-name">
                 <t t-esc="category.name"/>
@@ -91,6 +97,12 @@
         </li>
     </t>
 
+    <t t-name="CategorySimpleButton">
+        <li class='category-simple-button'>
+            <t t-esc="category.name"/>
+        </li>
+    </t>
+
     <t t-name="ProductCategoriesWidget">
         <header>
             <ol class="breadcrumb">
@@ -220,7 +232,7 @@
                                 <t t-if="widget.currency.position == 'after'" t-esc="widget.currency.symbol"/>
                             </span>
                         </div>
-                        <div class="infoline">
+                        <div class="infoline" >
                             <span class='left-block'>
                                 Change:
                             </span>
@@ -252,6 +264,9 @@
             <img src="/point_of_sale/static/src/img/scan.png" />
             <p> Please scan an item or your member card </p>
         </div>
+        <div class="goodbye-message">
+            <p>Thank you for shopping with us.</p>
+        </div>
     </t>
 
 
@@ -342,7 +357,7 @@
         <li class='product'>
             <a href="#">
                 <div class="product-img">
-                    <img t-att-src="'data:image/gif;base64,'+ widget.model.get('image_medium')" />
+                    <img src='' /> <!-- the product thumbnail -->
                     <t t-if="!widget.model.get('to_weight')">
                         <span class="price-tag">
                             <t t-esc="widget.format_currency(widget.model.get('list_price'))"/>
@@ -493,7 +508,7 @@
                 <tr><td>Tax:</td><td class="pos-right-align">
                     <t t-esc="widget.format_currency(widget.currentOrder.getTax().toFixed(2))"/>
                     </td></tr>
-                <tr><td>Total:</td><td class="pos-right-align">
+                <tr class="emph"><td>Total:</td><td class="pos-right-align">
                     <t t-esc="widget.format_currency(widget.currentOrder.getTotal().toFixed(2))"/>
                     </td></tr>
             </table>
@@ -519,36 +534,13 @@
 
     <t t-name="ActionBarWidget">
         <div class="pos-actionbar">
-            <div class="pos-actionbar-left-pane">
-                <div class="button help-button">
-                    <div class='icon'>
-                        <img src="/point_of_sale/static/src/img/icons/png48/help.png" />
-                        <div class='iconlabel'>Help</div>
-                    </div>
-                </div>
-                <div class="button close-button">
-                    <div class='icon'>
-                        <img src="/point_of_sale/static/src/img/icons/png48/shut-down.png" />
-                        <div class='iconlabel'>Close</div>
-                    </div>
-                </div>
-                <div class="button logout-button">
-                    <div class='icon'>
-                        <img src="/point_of_sale/static/src/img/icons/png48/system-log-out.png" />
-                        <div class='iconlabel'>Client Mode</div>
-                    </div>
-                </div>
-            </div>
             <ul class="pos-actionbar-button-list">
-                <!-- <li class="button">BUTTOOON</li>
-                <li class="button">JEEENKIINS</li>
-                <li class="button rightalign">ARGH</li> -->
             </ul>
         </div>
     </t>
 
     <t t-name="ActionButtonWidget">
-        <li t-att-class=" 'button '+ (widget.rightalign  ? 'rightalign ' : '')">
+        <li t-att-class=" 'button '+ (widget.rightalign  ? 'rightalign ' : '') + (widget.disabled ? 'disabled ' : '')">
             <div class='label'>
                 <t t-esc="widget.label" />
             </div>
@@ -556,7 +548,7 @@
     </t>
 
     <t t-name="ActionButtonWidgetWithIcon">
-        <li t-att-class=" 'button '+ (widget.rightalign  ? 'rightalign ' : '')">
+        <li t-att-class=" 'button '+ (widget.rightalign  ? 'rightalign ' : '') + (widget.disabled ? 'disabled ' : '')">
             <div class='icon'>
                 <img t-att-src="widget.icon" />
                 <div class='iconlabel'><t t-esc="widget.label" /></div>
diff --git a/addons/point_of_sale/static/test.html b/addons/point_of_sale/static/test.html
deleted file mode 100644
index d1d58e208c0..00000000000
--- a/addons/point_of_sale/static/test.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!doctype html>
-<html>
-    <head>
-        <title>JSON</title>
-
-        <script type="text/javascript" src="http://localhost:8069/web/webclient/js"></script>
-    </head>
-
-    <body>
-        <h1>JSON</h1>
-
-        <p id="response"></p>
-
-        <script type="text/javascript">
-            var c = new openerp.init(['web', 'point_of_sale']);
-            c.connection.session_bind('http://localhost:8069').then(function() {
-                var w = new c.point_of_sale.test();
-                w.appendTo($("#response"));
-            });
-        </script>
-    </body>
-</html>
diff --git a/addons/point_of_sale/test/00_register_open.yml b/addons/point_of_sale/test/00_register_open.yml
index 7d5aabbcdc3..ce13f3c0f26 100644
--- a/addons/point_of_sale/test/00_register_open.yml
+++ b/addons/point_of_sale/test/00_register_open.yml
@@ -9,9 +9,3 @@
 - 
   !python {model: pos.open.statement}: |
     self.open_statement(cr, uid, [ref('new_statement_open')], context={})
-- 
-  I check that I have some bank statements open for the admin user
-- 
-  !python {model: account.bank.statement}: |
-    ids = self.search(cr, uid, [('state', 'in', ('open','new')), ('user_id', '=', 1)])
-    assert (len(ids)>0), 'No statement open for the admin user!'
diff --git a/addons/point_of_sale/test/01_order_to_payment.yml b/addons/point_of_sale/test/01_order_to_payment.yml
index 3265a4b133c..9534e79095f 100644
--- a/addons/point_of_sale/test/01_order_to_payment.yml
+++ b/addons/point_of_sale/test/01_order_to_payment.yml
@@ -12,7 +12,7 @@
     account_collected_id: account.iva
     price_include: 1
 -
-  I assign this 10 percent tax on the PC1 product as a sale tax
+  I assign this 10 percent tax on the [PCSC234] PC Assemble SC234 product as a sale tax
 -
   !record {model: product.product, id: product.product_product_3}:
     taxes_id: [account_tax_10_incl]
@@ -27,7 +27,7 @@
     account_collected_id: account.iva
     price_include: 0
 -
-  I assign this 5 percent tax on the PC2 product as a sale tax
+  I assign this 5 percent tax on the PCSC349 product as a sale tax
 -
   !record {model: product.product, id: product.product_product_4}:
     taxes_id: [account_tax_05_incl]
@@ -52,7 +52,7 @@
 - 
   !workflow {model: pos.session, action: open, ref: pos_order_session0}
 -
-  I create a PoS order with 2 units of PC1 at 450 EUR (Tax Incl) and 3 units of PC2 at 300 EUR. (Tax Excl)
+  I create a PoS order with 2 units of PCSC234 at 450 EUR (Tax Incl) and 3 units of PCSC349 at 300 EUR. (Tax Excl)
 -
   !record {model: pos.order, id: pos_order_pos0}:
     company_id: base.main_company
diff --git a/addons/point_of_sale/test/02_order_to_invoice.yml b/addons/point_of_sale/test/02_order_to_invoice.yml
index 2280f15ca48..bd76eb08a9c 100644
--- a/addons/point_of_sale/test/02_order_to_invoice.yml
+++ b/addons/point_of_sale/test/02_order_to_invoice.yml
@@ -1,5 +1,5 @@
 -
-  I create a new PoS order with 2 units of PC1 at 450 EUR (Tax Incl) and 3 units of PC2 at 300 EUR. (Tax Excl)
+  I create a new PoS order with 2 units of PC1 at 450 EUR (Tax Incl) and 3 units of PCSC349 at 300 EUR. (Tax Excl)
 -
   !record {model: pos.order, id: pos_order_pos1}:
     company_id: base.main_company
diff --git a/addons/point_of_sale/tools/eanmaker b/addons/point_of_sale/tools/eanmaker
new file mode 100755
index 00000000000..463bd3dedfd
--- /dev/null
+++ b/addons/point_of_sale/tools/eanmaker
@@ -0,0 +1,56 @@
+#!/usr/bin/python
+
+import sys
+import re
+import math
+
+def ean_checksum(eancode):
+    """returns the checksum of an ean string of length 13, returns -1 if the string has the wrong length"""
+    if len(eancode) <> 13:
+        return -1
+    oddsum=0
+    evensum=0
+    total=0
+    eanvalue=eancode
+    reversevalue = eanvalue[::-1]
+    finalean=reversevalue[1:]
+
+    for i in range(len(finalean)):
+        if i % 2 == 0:
+            oddsum += int(finalean[i])
+        else:
+            evensum += int(finalean[i])
+    total=(oddsum * 3) + evensum
+
+    check = int(10 - math.ceil(total % 10.0)) %10
+    return check
+
+def check_ean(eancode):
+    """returns True if eancode is a valid ean13 string, or null"""
+    if not eancode:
+        return True
+    if len(eancode) <> 13:
+        return False
+    try:
+        int(eancode)
+    except:
+        return False
+    return ean_checksum(eancode) == int(eancode[-1])
+
+def sanitize_ean13(ean13):
+    """Creates and returns a valid ean13 from an invalid one"""
+    if not ean13:
+        return "0000000000000"
+    ean13 = re.sub("[A-Za-z]","0",ean13);
+    ean13 = re.sub("[^0-9]","",ean13);
+    ean13 = ean13[:13]
+    if len(ean13) < 13:
+        ean13 = ean13 + '0' * (13-len(ean13))
+    return ean13[:-1] + str(ean_checksum(ean13))
+
+def main():
+    for arg in sys.argv[1:]:
+        print sanitize_ean13(arg)
+
+if __name__ == '__main__':
+    main()
diff --git a/addons/point_of_sale/wizard/pos_box.py b/addons/point_of_sale/wizard/pos_box.py
index 8c3b0aa4607..2d1c1a8e0cf 100644
--- a/addons/point_of_sale/wizard/pos_box.py
+++ b/addons/point_of_sale/wizard/pos_box.py
@@ -15,8 +15,7 @@ class PosBox(CashBox):
         active_ids = context.get('active_ids', []) or []
 
         if active_model == 'pos.session':
-            records = self.pool.get(active_model).browse(cr, uid, context.get('active_ids', []) or [], context=context)
-
+            records = self.pool.get(active_model).browse(cr, uid, active_ids, context=context)
             bank_statements = [record.cash_register_id for record in records if record.cash_register_id]
 
             if not bank_statements:
@@ -30,6 +29,30 @@ class PosBox(CashBox):
 class PosBoxIn(PosBox):
     _inherit = 'cash.box.in'
 
+    def _compute_values_for_statement_line(self, cr, uid, box, record, context=None):
+        values = super(PosBoxIn, self)._compute_values_for_statement_line(cr, uid, box, record, context=context)
+
+        active_model = context.get('active_model', False) or False
+        active_ids = context.get('active_ids', []) or []
+
+        if active_model == 'pos.session':
+            session = self.pool.get(active_model).browse(cr, uid, active_ids, context=context)[0]
+            values['ref'] = session.name
+
+        return values
+
+
 class PosBoxOut(PosBox):
     _inherit = 'cash.box.out'
 
+    def _compute_values_for_statement_line(self, cr, uid, box, record, context=None):
+        values = super(PosBoxOut, self)._compute_values_for_statement_line(cr, uid, box, record, context=context)
+
+        active_model = context.get('active_model', False) or False
+        active_ids = context.get('active_ids', []) or []
+
+        if active_model == 'pos.session':
+            session = self.pool.get(active_model).browse(cr, uid, active_ids, context=context)[0]
+            values['ref'] = session.name
+
+        return values
diff --git a/addons/point_of_sale/wizard/pos_open_statement.py b/addons/point_of_sale/wizard/pos_open_statement.py
index 572f6470c34..2219f711b93 100644
--- a/addons/point_of_sale/wizard/pos_open_statement.py
+++ b/addons/point_of_sale/wizard/pos_open_statement.py
@@ -65,7 +65,7 @@ class pos_open_statement(osv.osv_memory):
             statement_id = statement_obj.create(cr, uid, data, context=context)
             st_ids.append(int(statement_id))
 
-            if journal.opening_control:
+            if journal.cash_control:
                 statement_obj.button_open(cr, uid, [statement_id], context)
 
         tree_res = mod_obj.get_object_reference(cr, uid, 'point_of_sale', 'view_cash_statement_pos_tree')
diff --git a/addons/point_of_sale/wizard/pos_session_opening.py b/addons/point_of_sale/wizard/pos_session_opening.py
index f7f231b3aa0..d6f95cbb7fc 100644
--- a/addons/point_of_sale/wizard/pos_session_opening.py
+++ b/addons/point_of_sale/wizard/pos_session_opening.py
@@ -4,13 +4,25 @@ from osv import osv, fields
 from tools.translate import _
 import netsvc
 
+from openerp.addons.point_of_sale.point_of_sale import pos_session
+
+
 class pos_session_opening(osv.osv_memory):
     _name = 'pos.session.opening'
 
     _columns = {
         'pos_config_id' : fields.many2one('pos.config', 'Point of Sale', required=True),
         'pos_session_id' : fields.many2one('pos.session', 'PoS Session'),
-        'pos_state' : fields.char('Session State'),
+        'pos_state' : fields.related('pos_session_id', 'state',
+                                     type='selection',
+                                     selection=pos_session.POS_SESSION_STATE,
+                                     string='Session State', readonly=True),
+        'pos_state_str' : fields.char('State', 32, readonly=True),
+        'show_config' : fields.boolean('Show Config', readonly=True),
+        'pos_session_name' : fields.related('pos_session_id', 'name',
+                                            type='char', size=64, readonly=True),
+        'pos_session_username' : fields.related('pos_session_id', 'user_id', 'name',
+                                                type='char', size=64, readonly=True)
     }
 
     def open_ui(self, cr, uid, ids, context=None):
@@ -19,7 +31,7 @@ class pos_session_opening(osv.osv_memory):
         context['active_id'] = data.pos_session_id.id
         return {
             'type' : 'ir.actions.client',
-            'name' : 'Start Point Of Sale',
+            'name' : _('Start Point Of Sale'),
             'tag' : 'pos.ui',
             'context' : context
         }
@@ -62,18 +74,26 @@ class pos_session_opening(osv.osv_memory):
     def on_change_config(self, cr, uid, ids, config_id, context=None):
         result = {
             'pos_session_id': False,
-            'pos_state': False
+            'pos_state': False,
+            'pos_state_str' : '',
+            'pos_session_username' : False,
+            'pos_session_name' : False,
         }
         if not config_id:
-            return {'value': result}
+            return {'value' : result}
         proxy = self.pool.get('pos.session')
         session_ids = proxy.search(cr, uid, [
-            ('state', '<>', 'closed'),
+            ('state', '!=', 'closed'),
             ('config_id', '=', config_id),
         ], context=context)
         if session_ids:
-            result['pos_state'] = proxy.browse(cr, uid, session_ids[0], context=context).state
-            result['pos_session_id'] = session_ids[0]
+            session = proxy.browse(cr, uid, session_ids[0], context=context)
+            result['pos_state'] = str(session.state)
+            result['pos_state_str'] = dict(pos_session.POS_SESSION_STATE).get(session.state, '')
+            result['pos_session_id'] = session.id
+            result['pos_session_name'] = session.name
+            result['pos_session_username'] = session.user_id.name
+
         return {'value' : result}
 
     def default_get(self, cr, uid, fieldnames, context=None):
@@ -87,7 +107,11 @@ class pos_session_opening(osv.osv_memory):
         if not result:
             r = self.pool.get('pos.config').search(cr, uid, [], context=context)
             result = r and r[0] or False
+
+        count = self.pool.get('pos.config').search_count(cr, uid, [('state', '=', 'active')], context=context)
+        show_config = bool(count > 1)
         return {
-            'pos_config_id' : result
+            'pos_config_id' : result,
+            'show_config' : show_config,
         }
 pos_session_opening()
diff --git a/addons/point_of_sale/wizard/pos_session_opening.xml b/addons/point_of_sale/wizard/pos_session_opening.xml
index 38f8932bd56..6e44030e582 100644
--- a/addons/point_of_sale/wizard/pos_session_opening.xml
+++ b/addons/point_of_sale/wizard/pos_session_opening.xml
@@ -6,14 +6,15 @@
             <field name="model">pos.session.opening</field>
             <field name="arch" type="xml">
                 <form string="PoS Session Opening" version="7.0">
-                    <separator string="Select your Point of Sale" colspan="4" />
-                    <group>
+                    <field name="show_config" invisible="1" />
+                    <separator string="Select your Point of Sale" colspan="4" attrs="{'invisible' : [('show_config', '=', False)]}" />
+                    <group attrs="{'invisible' : [('show_config', '=', False)]}">
                         <field name="pos_config_id" on_change="on_change_config(pos_config_id)"
                             widget="selection" domain="[('state','=','active')]"
                             class="oe_inline"/>
+                        <field name="pos_state" invisible="1" />
                     </group>
                     <field name="pos_session_id" invisible="1"/>
-                    <field name="pos_state" invisible="1"/>
                     <button name="open_ui" type="object" string="Start Selling" 
                         attrs="{'invisible' : [('pos_state', 'not in', ('opened',))]}" 
                         class="oe_highlight"
@@ -43,6 +44,15 @@
                           interface.
                         </p>
                     </div>
+                    <div attrs="{'invisible' : [('pos_state', '!=', 'opened')]}" class="oe_view_nocontent">
+                        <p class="oe_view_nocontent_create">
+                            Click to continue the session.
+                        </p>
+                        <p>
+                            The session <field name="pos_session_name" class="oe_inline" /> (<field name="pos_session_username" class="oe_inline" />) is "<b><field name="pos_state_str" class="oe_inline" /></b>"<br/>
+                            You can continue sales from the touchscreen interface by clicking on "<b>Sellings</b>" or close the cash register session ?
+                        </p>
+                    </div>
 
                 </form>
             </field>
diff --git a/addons/portal/__openerp__.py b/addons/portal/__openerp__.py
index 6669efbcf77..d7356fc9ce5 100644
--- a/addons/portal/__openerp__.py
+++ b/addons/portal/__openerp__.py
@@ -20,14 +20,19 @@
 ##############################################################################
 
 {
-    'name' : "Portal",
-    'version' : "1.0",
-    'depends' : ["base", "share", "auth_anonymous"],
-    'author' : "OpenERP SA",
+    'name' : 'Portal',
+    'version': '1.0',
+    'depends': [
+        'base',
+        'share',
+        'auth_anonymous',
+        'auth_signup',
+    ],
+    'author': 'OpenERP SA',
     'category': 'Portal',
     'description': """
 Customize access to your OpenERP database to external users by creating portals.
-
+================================================================================
 A portal defines a specific user menu and access rights for its members.  This
 menu can ben seen by portal members, anonymous users and any other user that
 have the access to technical features (e.g. the administrator).
@@ -41,14 +46,12 @@ very handy when used in combination with the module 'share'.
     'data': [
         'security/portal_security.xml',
         'security/ir.model.access.csv',
-        'portal_view.xml',
         'portal_data.xml',
+        'portal_view.xml',
         'wizard/portal_wizard_view.xml',
         'wizard/share_wizard_view.xml',
     ],
-    'demo': [
-        'portal_demo.xml',
-    ],
+    'demo': ['portal_demo.xml'],
     'installable': True,
 }
 
diff --git a/addons/portal/i18n/ar.po b/addons/portal/i18n/ar.po
index b6bb24e04bb..8b4f3bb8ff1 100644
--- a/addons/portal/i18n/ar.po
+++ b/addons/portal/i18n/ar.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: portal
 #: code:addons/portal/wizard/share_wizard.py:51
diff --git a/addons/portal/i18n/bg.po b/addons/portal/i18n/bg.po
index 708914adc70..66b0d95082c 100644
--- a/addons/portal/i18n/bg.po
+++ b/addons/portal/i18n/bg.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: portal
 #: code:addons/portal/wizard/share_wizard.py:51
diff --git a/addons/portal/i18n/bs.po b/addons/portal/i18n/bs.po
index 52ae8a5bdaf..bc8b48d2a28 100644
--- a/addons/portal/i18n/bs.po
+++ b/addons/portal/i18n/bs.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: portal
 #: code:addons/portal/wizard/share_wizard.py:51
diff --git a/addons/portal/i18n/ca.po b/addons/portal/i18n/ca.po
index 4613b5ef098..7f9840d98c4 100644
--- a/addons/portal/i18n/ca.po
+++ b/addons/portal/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: portal
 #: code:addons/portal/wizard/share_wizard.py:51
diff --git a/addons/portal/i18n/cs.po b/addons/portal/i18n/cs.po
index c1eecbdee26..c4d25ba1cba 100644
--- a/addons/portal/i18n/cs.po
+++ b/addons/portal/i18n/cs.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 "X-Poedit-Language: Czech\n"
 
 #. module: portal
diff --git a/addons/portal/i18n/da.po b/addons/portal/i18n/da.po
index cd85e4edf4c..8f167ce4995 100644
--- a/addons/portal/i18n/da.po
+++ b/addons/portal/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: portal
 #: code:addons/portal/wizard/share_wizard.py:51
diff --git a/addons/portal/i18n/de.po b/addons/portal/i18n/de.po
index ea345ae0aad..f104e770a8f 100644
--- a/addons/portal/i18n/de.po
+++ b/addons/portal/i18n/de.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: portal
 #: code:addons/portal/wizard/share_wizard.py:51
diff --git a/addons/portal/i18n/es.po b/addons/portal/i18n/es.po
index 00a2343909a..0988e57c790 100644
--- a/addons/portal/i18n/es.po
+++ b/addons/portal/i18n/es.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: portal
 #: code:addons/portal/wizard/share_wizard.py:51
diff --git a/addons/portal/i18n/es_CR.po b/addons/portal/i18n/es_CR.po
index e62cb6316ff..7be7f0f4168 100644
--- a/addons/portal/i18n/es_CR.po
+++ b/addons/portal/i18n/es_CR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 "Language: es\n"
 
 #. module: portal
diff --git a/addons/portal/i18n/et.po b/addons/portal/i18n/et.po
index fc780fe1d2f..d23a0d87a07 100644
--- a/addons/portal/i18n/et.po
+++ b/addons/portal/i18n/et.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: portal
 #: code:addons/portal/wizard/share_wizard.py:51
diff --git a/addons/portal/i18n/fi.po b/addons/portal/i18n/fi.po
index afbe45c4d81..3653d430bdb 100644
--- a/addons/portal/i18n/fi.po
+++ b/addons/portal/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: portal
 #: code:addons/portal/wizard/share_wizard.py:51
diff --git a/addons/portal/i18n/fr.po b/addons/portal/i18n/fr.po
index 2dc5b896cc9..62c9f36796a 100644
--- a/addons/portal/i18n/fr.po
+++ b/addons/portal/i18n/fr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: portal
 #: code:addons/portal/wizard/share_wizard.py:51
diff --git a/addons/portal/i18n/hr.po b/addons/portal/i18n/hr.po
index 9e3b3c867c0..ebdcaec94a8 100644
--- a/addons/portal/i18n/hr.po
+++ b/addons/portal/i18n/hr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: portal
 #: code:addons/portal/wizard/share_wizard.py:51
diff --git a/addons/portal/i18n/hu.po b/addons/portal/i18n/hu.po
index 69020661ffe..8d18dbb8750 100644
--- a/addons/portal/i18n/hu.po
+++ b/addons/portal/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: portal
 #: code:addons/portal/wizard/share_wizard.py:51
diff --git a/addons/portal/i18n/id.po b/addons/portal/i18n/id.po
index 432abed753a..fa6ac3c84ae 100644
--- a/addons/portal/i18n/id.po
+++ b/addons/portal/i18n/id.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: portal
 #: code:addons/portal/wizard/share_wizard.py:51
diff --git a/addons/portal/i18n/it.po b/addons/portal/i18n/it.po
index 8d3944cd13c..907f6d626b9 100644
--- a/addons/portal/i18n/it.po
+++ b/addons/portal/i18n/it.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: portal
 #: code:addons/portal/wizard/share_wizard.py:51
diff --git a/addons/portal/i18n/ja.po b/addons/portal/i18n/ja.po
index 7a3a1fe6896..6233f0372a3 100644
--- a/addons/portal/i18n/ja.po
+++ b/addons/portal/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: portal
 #: code:addons/portal/wizard/share_wizard.py:51
diff --git a/addons/portal/i18n/lo.po b/addons/portal/i18n/lo.po
new file mode 100644
index 00000000000..58cead658cd
--- /dev/null
+++ b/addons/portal/i18n/lo.po
@@ -0,0 +1,388 @@
+# Lao 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-02-08 00:36+0000\n"
+"PO-Revision-Date: 2012-08-20 18:55+0000\n"
+"Last-Translator: Brice Muangkhot ສຸພາ ເມືອງໂຄຕ <bmuangkhot@gmail.com>\n"
+"Language-Team: Lao <lo@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
+
+#. module: portal
+#: code:addons/portal/wizard/share_wizard.py:51
+#, python-format
+msgid "Please select at least one user to share with"
+msgstr "ກະລຸນາເລອືກຢ້າງນ້ອຍຄົນຜູ້ນຶ່ງເພື່ອແບ່ງປັນນກັບ"
+
+#. module: portal
+#: code:addons/portal/wizard/share_wizard.py:55
+#, python-format
+msgid "Please select at least one group to share with"
+msgstr "ກະລຸນາເລືອກຢ້າງນ້ອຍໝວດນຶ່ງເພື່ອແບ່ງປັນນກັບ"
+
+#. module: portal
+#: field:res.portal,group_id:0
+msgid "Group"
+msgstr ""
+
+#. module: portal
+#: view:share.wizard:0
+#: field:share.wizard,group_ids:0
+msgid "Existing groups"
+msgstr ""
+
+#. module: portal
+#: model:ir.model,name:portal.model_res_portal_wizard_user
+msgid "Portal User Config"
+msgstr ""
+
+#. module: portal
+#: view:res.portal.wizard.user:0
+msgid "Portal User"
+msgstr ""
+
+#. module: portal
+#: model:res.groups,comment:portal.group_portal_manager
+msgid ""
+"Portal managers have access to the portal definitions, and can easily "
+"configure the users, access rights and menus of portal users."
+msgstr ""
+
+#. module: portal
+#: help:res.portal,override_menu:0
+msgid "Enable this option to override the Menu Action of portal users"
+msgstr ""
+
+#. module: portal
+#: field:res.portal.wizard.user,user_email:0
+msgid "Email"
+msgstr ""
+
+#. module: portal
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr ""
+
+#. module: portal
+#: view:res.portal:0
+#: field:res.portal,widget_ids:0
+msgid "Widgets"
+msgstr ""
+
+#. module: portal
+#: view:res.portal.wizard:0
+msgid "Send Invitations"
+msgstr ""
+
+#. module: portal
+#: view:res.portal:0
+msgid "Widgets Assigned to Users"
+msgstr ""
+
+#. module: portal
+#: help:res.portal,url:0
+msgid "The url where portal users can connect to the server"
+msgstr ""
+
+#. module: portal
+#: model:res.groups,comment:portal.group_portal_officer
+msgid "Portal officers can create new portal users with the portal wizard."
+msgstr ""
+
+#. module: portal
+#: help:res.portal.wizard,message:0
+msgid "This text is included in the welcome email sent to the users"
+msgstr ""
+
+#. module: portal
+#: help:res.portal,menu_action_id:0
+msgid "If set, replaces the standard menu for the portal's users"
+msgstr ""
+
+#. module: portal
+#: field:res.portal.wizard.user,lang:0
+msgid "Language"
+msgstr ""
+
+#. module: portal
+#: view:res.portal:0
+msgid "Portal Name"
+msgstr ""
+
+#. module: portal
+#: view:res.portal.wizard.user:0
+msgid "Portal Users"
+msgstr ""
+
+#. module: portal
+#: field:res.portal,override_menu:0
+msgid "Override Menu Action of Users"
+msgstr ""
+
+#. module: portal
+#: field:res.portal,menu_action_id:0
+msgid "Menu Action"
+msgstr ""
+
+#. module: portal
+#: field:res.portal.wizard.user,name:0
+msgid "User Name"
+msgstr "ຊື່ຜູ້ໃຊ້"
+
+#. module: portal
+#: help:res.portal,group_id:0
+msgid "The group corresponding to this portal"
+msgstr ""
+
+#. module: portal
+#: model:ir.model,name:portal.model_res_portal_widget
+msgid "Portal Widgets"
+msgstr ""
+
+#. module: portal
+#: model:ir.model,name:portal.model_res_portal
+#: model:ir.module.category,name:portal.module_category_portal
+#: view:res.portal:0
+#: field:res.portal.widget,portal_id:0
+#: field:res.portal.wizard,portal_id:0
+msgid "Portal"
+msgstr "ປະຕູ"
+
+#. module: portal
+#: code:addons/portal/wizard/portal_wizard.py:35
+#, python-format
+msgid "Your OpenERP account at %(company)s"
+msgstr ""
+
+#. module: portal
+#: code:addons/portal/portal.py:107
+#: code:addons/portal/portal.py:184
+#, python-format
+msgid "%s Menu"
+msgstr ""
+
+#. module: portal
+#: help:res.portal.wizard,portal_id:0
+msgid "The portal in which new users must be added"
+msgstr ""
+
+#. module: portal
+#: model:ir.model,name:portal.model_res_portal_wizard
+msgid "Portal Wizard"
+msgstr ""
+
+#. module: portal
+#: help:res.portal,widget_ids:0
+msgid "Widgets assigned to portal users"
+msgstr ""
+
+#. module: portal
+#: code:addons/portal/wizard/portal_wizard.py:163
+#, python-format
+msgid "(missing url)"
+msgstr ""
+
+#. module: portal
+#: view:share.wizard:0
+#: field:share.wizard,user_ids:0
+msgid "Existing users"
+msgstr ""
+
+#. module: portal
+#: field:res.portal.wizard.user,wizard_id:0
+msgid "Wizard"
+msgstr ""
+
+#. module: portal
+#: help:res.portal.wizard.user,user_email:0
+msgid ""
+"Will be used as user login.  Also necessary to send the account information "
+"to new users"
+msgstr ""
+
+#. module: portal
+#: field:res.portal,parent_menu_id:0
+msgid "Parent Menu"
+msgstr ""
+
+#. module: portal
+#: field:res.portal,url:0
+msgid "URL"
+msgstr ""
+
+#. module: portal
+#: field:res.portal.widget,widget_id:0
+msgid "Widget"
+msgstr ""
+
+#. module: portal
+#: help:res.portal.wizard.user,lang:0
+msgid "The language for the user's user interface"
+msgstr ""
+
+#. module: portal
+#: view:res.portal.wizard:0
+msgid "Cancel"
+msgstr ""
+
+#. module: portal
+#: view:res.portal:0
+msgid "Website"
+msgstr ""
+
+#. module: portal
+#: view:res.portal:0
+msgid "Create Parent Menu"
+msgstr ""
+
+#. module: portal
+#: view:res.portal.wizard:0
+msgid ""
+"The following text will be included in the welcome email sent to users."
+msgstr ""
+
+#. module: portal
+#: code:addons/portal/wizard/portal_wizard.py:135
+#, python-format
+msgid "Email required"
+msgstr ""
+
+#. module: portal
+#: model:ir.model,name:portal.model_res_users
+msgid "res.users"
+msgstr ""
+
+#. module: portal
+#: constraint:res.portal.wizard.user:0
+msgid "Invalid email address"
+msgstr ""
+
+#. module: portal
+#: code:addons/portal/wizard/portal_wizard.py:136
+#, python-format
+msgid ""
+"You must have an email address in your User Preferences to send emails."
+msgstr ""
+
+#. module: portal
+#: model:ir.model,name:portal.model_ir_ui_menu
+msgid "ir.ui.menu"
+msgstr ""
+
+#. module: portal
+#: view:res.portal:0
+#: view:res.portal.wizard:0
+#: field:res.portal.wizard,user_ids:0
+msgid "Users"
+msgstr ""
+
+#. module: portal
+#: model:ir.actions.act_window,name:portal.portal_list_action
+#: model:ir.ui.menu,name:portal.portal_list_menu
+#: model:ir.ui.menu,name:portal.portal_menu
+#: view:res.portal:0
+msgid "Portals"
+msgstr ""
+
+#. module: portal
+#: help:res.portal,parent_menu_id:0
+msgid "The menu action opens the submenus of this menu item"
+msgstr ""
+
+#. module: portal
+#: field:res.portal.widget,sequence:0
+msgid "Sequence"
+msgstr ""
+
+#. module: portal
+#: field:res.users,partner_id:0
+msgid "Related Partner"
+msgstr ""
+
+#. module: portal
+#: view:res.portal:0
+msgid "Portal Menu"
+msgstr ""
+
+#. module: portal
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr ""
+
+#. module: portal
+#: view:res.portal.wizard:0
+#: field:res.portal.wizard,message:0
+msgid "Invitation message"
+msgstr ""
+
+#. module: portal
+#: code:addons/portal/wizard/portal_wizard.py:36
+#, python-format
+msgid ""
+"Dear %(name)s,\n"
+"\n"
+"You have been created an OpenERP account at %(url)s.\n"
+"\n"
+"Your login account data is:\n"
+"Database: %(db)s\n"
+"User:     %(login)s\n"
+"Password: %(password)s\n"
+"\n"
+"%(message)s\n"
+"\n"
+"--\n"
+"OpenERP - Open Source Business Applications\n"
+"http://www.openerp.com\n"
+msgstr ""
+
+#. module: portal
+#: model:res.groups,name:portal.group_portal_manager
+msgid "Manager"
+msgstr ""
+
+#. module: portal
+#: help:res.portal.wizard.user,name:0
+msgid "The user's real name"
+msgstr ""
+
+#. module: portal
+#: model:ir.actions.act_window,name:portal.address_wizard_action
+#: model:ir.actions.act_window,name:portal.partner_wizard_action
+#: view:res.portal.wizard:0
+msgid "Add Portal Access"
+msgstr ""
+
+#. module: portal
+#: field:res.portal.wizard.user,partner_id:0
+msgid "Partner"
+msgstr ""
+
+#. module: portal
+#: model:ir.actions.act_window,help:portal.portal_list_action
+msgid ""
+"\n"
+"A portal helps defining specific views and rules for a group of users (the\n"
+"portal group).  A portal menu, widgets and specific groups may be assigned "
+"to\n"
+"the portal's users.\n"
+"            "
+msgstr ""
+
+#. module: portal
+#: model:ir.model,name:portal.model_share_wizard
+msgid "Share Wizard"
+msgstr ""
+
+#. module: portal
+#: model:res.groups,name:portal.group_portal_officer
+msgid "Officer"
+msgstr ""
diff --git a/addons/portal/i18n/lt.po b/addons/portal/i18n/lt.po
index 8f97153996e..b0125ee5113 100644
--- a/addons/portal/i18n/lt.po
+++ b/addons/portal/i18n/lt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: portal
 #: code:addons/portal/wizard/share_wizard.py:51
diff --git a/addons/portal/i18n/nl.po b/addons/portal/i18n/nl.po
index e6c2239597c..3897d8b6481 100644
--- a/addons/portal/i18n/nl.po
+++ b/addons/portal/i18n/nl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: portal
 #: code:addons/portal/wizard/share_wizard.py:51
diff --git a/addons/portal/i18n/pl.po b/addons/portal/i18n/pl.po
index fea84cbc1db..75d92c73ed8 100644
--- a/addons/portal/i18n/pl.po
+++ b/addons/portal/i18n/pl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: portal
 #: code:addons/portal/wizard/share_wizard.py:51
diff --git a/addons/portal/i18n/pt.po b/addons/portal/i18n/pt.po
index ccbeb45e2c6..e0f87b762d1 100644
--- a/addons/portal/i18n/pt.po
+++ b/addons/portal/i18n/pt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: portal
 #: code:addons/portal/wizard/share_wizard.py:51
diff --git a/addons/portal/i18n/pt_BR.po b/addons/portal/i18n/pt_BR.po
index 9977b146ba2..0dc27932198 100644
--- a/addons/portal/i18n/pt_BR.po
+++ b/addons/portal/i18n/pt_BR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: portal
 #: code:addons/portal/wizard/share_wizard.py:51
diff --git a/addons/portal/i18n/ro.po b/addons/portal/i18n/ro.po
index e490934556d..de853edc3aa 100644
--- a/addons/portal/i18n/ro.po
+++ b/addons/portal/i18n/ro.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: portal
 #: code:addons/portal/wizard/share_wizard.py:51
diff --git a/addons/portal/i18n/ru.po b/addons/portal/i18n/ru.po
index 14719d308d9..43ddcc2798c 100644
--- a/addons/portal/i18n/ru.po
+++ b/addons/portal/i18n/ru.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: portal
 #: code:addons/portal/wizard/share_wizard.py:51
diff --git a/addons/portal/i18n/sl.po b/addons/portal/i18n/sl.po
index c034d0694b3..352b786731b 100644
--- a/addons/portal/i18n/sl.po
+++ b/addons/portal/i18n/sl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: portal
 #: code:addons/portal/wizard/share_wizard.py:51
diff --git a/addons/portal/i18n/sv.po b/addons/portal/i18n/sv.po
index f60fd5c350b..6011c53b4bf 100644
--- a/addons/portal/i18n/sv.po
+++ b/addons/portal/i18n/sv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: portal
 #: code:addons/portal/wizard/share_wizard.py:51
diff --git a/addons/portal/i18n/tr.po b/addons/portal/i18n/tr.po
index cf82b1c067e..826eb0ee8af 100644
--- a/addons/portal/i18n/tr.po
+++ b/addons/portal/i18n/tr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: portal
 #: code:addons/portal/wizard/share_wizard.py:51
diff --git a/addons/portal/i18n/uk.po b/addons/portal/i18n/uk.po
index 6b8a8a16418..b5ded833672 100644
--- a/addons/portal/i18n/uk.po
+++ b/addons/portal/i18n/uk.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: portal
 #: code:addons/portal/wizard/share_wizard.py:51
diff --git a/addons/portal/i18n/zh_CN.po b/addons/portal/i18n/zh_CN.po
index 11432d0744f..aa0193fdde3 100644
--- a/addons/portal/i18n/zh_CN.po
+++ b/addons/portal/i18n/zh_CN.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: portal
 #: code:addons/portal/wizard/share_wizard.py:51
diff --git a/addons/portal/i18n/zh_TW.po b/addons/portal/i18n/zh_TW.po
index 912e3a3ce04..6503dda92de 100644
--- a/addons/portal/i18n/zh_TW.po
+++ b/addons/portal/i18n/zh_TW.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: portal
 #: code:addons/portal/wizard/share_wizard.py:51
diff --git a/addons/portal/portal_data.xml b/addons/portal/portal_data.xml
index 58f2fc3e9d4..eb06ca656d6 100644
--- a/addons/portal/portal_data.xml
+++ b/addons/portal/portal_data.xml
@@ -1,16 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-    <data>
+    <data noupdate="1">
 
         <record id="portal" model="res.portal">
             <field name="name">Portal</field>
             <field name="group_id" ref="group_portal_member"/>
             <field name="override_menu" eval="False"/>
+            <!-- Insert the template user from auth_signup in the portal members group -->
+            <field name="users" eval="[(4,ref('auth_signup.default_template_user'))]"/>
         </record>
 
         <!-- Mail group for the company's news -->
         <record id="company_news_feed" model="mail.group">
-            <field name="name">Company's news feed</field>
+            <field name="name">Company's news</field>
         </record>
 
         <record id="action_news" model="ir.actions.act_window">
@@ -32,24 +34,5 @@
             <field name="view_mode">form</field>
         </record>
 
-        <!-- Top menu item -->
-        <menuitem name="Portal"
-            id="portal_menu"
-            groups="base.group_no_one,portal.group_portal_member,auth_anonymous.group_anonymous"
-            sequence="20"/>
-
-            <menuitem name="Our company" id="portal_company" parent="portal_menu" sequence="10"/>
-                <menuitem name="News" id="portal_company_news" parent="portal_company" sequence="10" action="action_news"/>
-                <menuitem name="Jobs" id="portal_jobs" parent="portal_company" sequence="20" action="action_jobs"/>
-
-            <!--
-                Create menu items that we'll leave empty for now - they'll be
-                filled up by other portal modules.
-            -->
-            <menuitem name="Orders" id="portal_orders" parent="portal_menu" sequence="20"/>
-            <menuitem name="Invoices and Payments" id="portal_invoices_payements" parent="portal_menu" sequence="30"/>
-            <menuitem name="Projects" id="portal_projects" parent="portal_menu" sequence="40"/>
-            <menuitem name="After Sale Services" id="portal_after_sales" parent="portal_menu" sequence="50"/>
-
     </data>
 </openerp>
diff --git a/addons/portal/portal_demo.xml b/addons/portal/portal_demo.xml
index ab2cf22ffb7..1ace02f3d7d 100644
--- a/addons/portal/portal_demo.xml
+++ b/addons/portal/portal_demo.xml
@@ -7,7 +7,6 @@
             <field name="name">Demo Portal User</field>
             <field name="login">portal</field>
             <field name="password">portal</field>
-            <field name="image">/9j/4AAQSkZJRgABAQEASABIAAD/4RJ/RXhpZgAATU0AKgAAAAgABwESAAMAAAABAAEAAAEaAAUAAAABAAAAYgEbAAUAAAABAAAAagEoAAMAAAABAAIAAAExAAIAAAAMAAAAcgEyAAIAAAAUAAAAfodpAAQAAAABAAAAkgAAANQAAABIAAAAAQAAAEgAAAABR0lNUCAyLjYuMTIAMjAxMjowNToyOSAxMjoxMjoyNgAABZAAAAcAAAAEMDIxMKAAAAcAAAAEMDEwMKABAAMAAAABAAEAAKACAAQAAAABAAAAlqADAAQAAAABAAAAlgAAAAAABgEDAAMAAAABAAYAAAEaAAUAAAABAAABIgEbAAUAAAABAAABKgEoAAMAAAABAAIAAAIBAAQAAAABAAABMgICAAQAAAABAAARRQAAAAAAAABIAAAAAQAAAEgAAAAB/9j/4AAQSkZJRgABAQAAAQABAAD/2wBDAAgGBgcGBQgHBwcJCQgKDBQNDAsLDBkSEw8UHRofHh0aHBwgJC4nICIsIxwcKDcpLDAxNDQ0Hyc5PTgyPC4zNDL/2wBDAQkJCQwLDBgNDRgyIRwhMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjL/wAARCACWAJYDASIAAhEBAxEB/8QAHwAAAQUBAQEBAQEAAAAAAAAAAAECAwQFBgcICQoL/8QAtRAAAgEDAwIEAwUFBAQAAAF9AQIDAAQRBRIhMUEGE1FhByJxFDKBkaEII0KxwRVS0fAkM2JyggkKFhcYGRolJicoKSo0NTY3ODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZnaGlqc3R1dnd4eXqDhIWGh4iJipKTlJWWl5iZmqKjpKWmp6ipqrKztLW2t7i5usLDxMXGx8jJytLT1NXW19jZ2uHi4+Tl5ufo6erx8vP09fb3+Pn6/8QAHwEAAwEBAQEBAQEBAQAAAAAAAAECAwQFBgcICQoL/8QAtREAAgECBAQDBAcFBAQAAQJ3AAECAxEEBSExBhJBUQdhcRMiMoEIFEKRobHBCSMzUvAVYnLRChYkNOEl8RcYGRomJygpKjU2Nzg5OkNERUZHSElKU1RVVldYWVpjZGVmZ2hpanN0dXZ3eHl6goOEhYaHiImKkpOUlZaXmJmaoqOkpaanqKmqsrO0tba3uLm6wsPExcbHyMnK0tPU1dbX2Nna4uPk5ebn6Onq8vP09fb3+Pn6/9oADAMBAAIRAxEAPwCp9tT/AJ9lpftUROfs6j8BVEkggAZzXN+JtXeAmyiO3gGQ9zntXOlc2LGt+IlmLW2nW6LyQ85Ayf8Ad/xrlXTc5LyAtnLHr/OqjSlzy7Y9zShGznIxjuau1hXuXAQowkig46VXYgMffqaQDy17EnvinpGXDYXJCknHakMhDlicD6CnfcA+XFdf4I8Ow6v9rnm5WLau33OTn9K7FPCOnxEbYR05JwSaynWjF2ZrChKaujx7d6/qKsW975LLvBKKe3avUL/wRpV0rYjMbnowPINeda74futDuNkvzwv9yQdD7expwqxnognRlDUsrL55LLkgdqnsVR3PmDjNYum3fkvsY9Tge4rSSXYj4+8TV9TI2/Jsdy43deOa9fb7x+teH2ZJnijkkOXcAE9smvbyeTUTEx1A5pM8UqH+dZiJF4OPUUpOTmmKQGPrTu/FUgFD7Rk0UjEA4opiPNWU7cDrXmWsXZutSuJt2QznHbgcD9BXpsZDY9a8juQ3mtwSFJA/CtYFS2HpIoONuSenrU0Qd5ACAoHOAar26HfuatGBQASABVMSEK9T6Vu+GrQXtrrEITdL9iZ4/wDgDoxH5VkzQMtlFPg7ZHYfXGK3vB0hstQllP3fs8gI9cqT/wCy1nN+7oawXvJM3fhfOqrqsG4Bj5TAeo+YH+n5135IIryfwjLLpPipLeQECfMTD68j9cV6r0UCuOuvfudlB+5Yjk71ha5p8Wp2EtrKMBh8rd1bsa3D19ap3KrtLMwCjqT2rKLs7o2aurM8LuYZLO7khlXbJG5Vh7g1rQN5yCTHXk1d8b21t9tjvLSWORZQVl2MDhh0J+o/lWTo04dXtnbB/h969KL5o3PLnHlk0bVuUkvbQjAxKn8xXtp5NeJ2Vk5vrUZ585MD8RXtneokQHSlUkGk70Z54rMBwJ3/AI1JnmowpLufQZp8BBlwRnIqkDF6mik6Eiii4jzKKAQAnex57mvMb1JYr+eIRk7JXXdj0YivUQ28EVwWtJ5eq3Azwzlh+PNbR0LZkIkhPOEHp1JrVsbWS7mSCJSzMQOKzywBznjtXe+A7aPM1w4+ZRgE9hU1JcquVThzSsVNY09IoooI2UpasIgo/icqCx/M4/A1Qglm3tFZoSW6tnG5cFcD67sVcvrmO4SParOgLEKuSXdySf5kfifSq1lLdQaiLa2tzNqkpysZYBYxz1PT/JqVexo9zS1PQ9ditkvdtuZ4G879wDvXpx7gYHHtW9oPia+1Qobm3jVHHEiHv9Kxpp9Vt7j7OdRtnugceUqNjIbb97I/i4/XFR6FO8d0yiIx+ZIf3eOEkHVfy/lWdSL5feNac4uXunoEkyrGWrkdTs5NXuybq8ZLRTxEp6/h61015FI2lsU++FzXGXVrPdStGxdbZEEjYBxKcj5M/TNYUtzeo7Iq60fD/wDZk1haxQJOqbkZWBfcOefriuMsUJvAynBUhvwzg/zrtJrCO+09bRoofOWSNonhgK7MMdxyegK7eO5GfeuXubMad4jmtuQkb8f7pGR+hFdsbL3bnBNuS5mrG9pd3u1SzD9fPjA/76Fez5OTXjWnRRvfWDIMYuYz/wCPCvZCfmNKZkLSg9aTPNKCd341kMQkl8etTQ584D0qF1xJTlY7simIex+c+lFNH0opDPMGkYMF2nHrTP7I0a7ZJ7+zurmVkK4jkKoqg9cKQSev59KlfcnJGc1b0XUQI5/MhbfGjBffOP8A69VUbSujooKMpWkchr/hiws0S+0u5d7dn2tE5BK/Q/nwea29IhlstOKtuQHLNjqQKr6qklxeW8kwVUmcCOJVCgcjnjvyefet64yJDj7pI/LNQ5PlVzdU0puxqaHodlaWdu0kQN0EG5jztOOQPSlvtCtriYTwBobhekkZ2n86gS/IxzWhBeB8e9YOTvc2UFaxhtolyLnzZLqZzu3gAADd64A68DmtXTdNjtdrsgO05BPJz61qLIr9ajuJkiQbjtBIGfTNS6kpbgqcY7I0ktftNs0mAFx0J61zRtCs8kBxlTke4NT3viOxs0S2jnyOp3Nzj1+lUF1eK41a3jiy7tkNjnApuLWwJ9y4tiqDkAY9K4HxPbwp4tD4HMClj74I/kK9GupdqV5r4kIm18licCNRwf8Ae/xrXD35jHEq0CTSbmN9Y05BjBuoh7ffFeykZ+teGaQg/wCEh00g8fa4eP8AgYr3INk101EeeLjBNKx5FA5zTWrMBW+/7UJ1NIfvD3py9CaXUB2cDiikzkUUAeYfaVfKqckHnilhufKuFdecHnHpTBGquWHeo1i2E7epNatX0LTtqjodRnhvtEWGIxyygbgRCsbDBB28cZyo/wAmqihbiEOpyDyP8/XNZYfBwCQw9DSaJOzS3qu/76KXEgz95Typx69R/OsZ07I64VlJ2e5ohWjbB6VaglxiopMEgigDHIrBnQma8E+cc1adY54mjcAqwwQaxYZCD1ovdUmtYwILZ5XboR0B9z2FTy3ZbZof2XplnbsHZVD8FnPzH8aqltLsRAsU0auOQFOQM+9YMEV9qUplup4UPQB2yfoAOPzNPvtLaK28z7ZDkDBURk/1FacndjUFY2by7zEcnmvPNXJl1OZyTg42/gAP5g109pFJFpWZJvMOTgYxtHp1rm7ho5L5st8qELz9P8a1oqz0OLEO6sS6Rahdb0lhkFryEHJz/Gtez7gDzXkukyIdd0wZBP2uH/0MV6yRk1tM4iUdM0jE8e9N3HbQx4BrIY7kkU/imA8ZpwoEKSBRR+FFOwHkE9+QV8vBBFJb3U5yWUsp5zStarNHlOMcVPxCiRjGTWpRFHd+bKVC4amwyfYPEVrPnMd0PIk/3v4T/SrDR5dWAHFUNVEkkIjiBEoIeNh/Cw5Boeug07O5uzzeRLj+HtUkdyrjrTZFW9s4pwABLGrgD3Gf61jyLNbP8pyK5bJnbdo6FGyetXUClNvr1rl4dVMfDgj61q22sQtjLCpcWUpl+fS2uMYlMY9VHNVW0KBCGaaZyP7z5q8upQlcl1qtc6rbIjEyqPqaFcbaKGqSJaWrkH5QOlcSSHZmb7xOc+9aWsal9umCocRL09z61mooZhuPBrqpxsrnDVnzOyNLw4pOvaeQM4u4T/4+K9nA4rx/w5GU8R2WPu/aE/nXr6mie5kOOQOlHVaU9OPSmjmoYIcQOPenjtTCeQKdnmgBCeaKQmigDyzeiZ/hFJsVpA5bJxxSSoJDt6il8pQPfFalCs2DjNMYgEcZoTHJbrU1pZ3OoXIgtoy7n8h7k9hQxo0LOORNGtPNQo+04BOfl3HafxXB/GongE3bmtzVIVjkEcZOyMBFz6AYqjCnzc1xXu7nelZWMo6ej/KwqJ9AJOUcjNbhiHmdKkwR2p8zDlTMAaOIIy0ssjnoFDECoNStVi050RBk46dzmuglTc659azdRj8y3fjPNUpO+pLirHGOSX5BGPWmjcrDb09a65tCh1KNZA5ikIG5lGc/UVc0r4em+uzBFqkSu0bGISwkBmAztJBOOO/P0rojVi3bqck6Uopy6HPeHbrPiHTYyPma5jGf+BCvYwhzXnVr4Yv9D8Saabu0HltcLtljIdDzxyOnTvjpXpLxyQtskRkbGcMMGnNGN09hnPzfSkGSwNBPTHpSK1ZsaHMDuFO5yKQnLCn9xQAzoeaKG+9RTCx5foeh+IPEnm/2RYG4EJAkcyIgUnpyxGfwzXSXnwy1620yO5W7tZ71pNptI2wFHr5jEDPtj6EnivSbee301UhsbOK1tlYEpEgXPufU47mtOaJJUeMcpIv8+h/z7VdOUZp2Kqc0HqcbafDjSNN0qX+0S2pXzp/rA7RpGf8AZAIzzjk9cdBkiqkDW9pbmG1hjhjJyQgxk+/rXYtIzwBZDzjY31HBrg5sx3EqHgq7KcexqMXGyTQ8DUcpSjLcqagN7596oqNrc960ZkLjiqU0ZTtXKegNI5BNDcClAqGYkcChbldAbmoDF5sTjvVkL8nuabbr+9K+tAmNsEMfy4roNLU/2lbBTg78j8OazRb7GBArb0JN2pbv7iE/0qoLmqIxrS5aUn5DvEnmJoN9LG7I0a+ajKeQVYkVIklxdadoxEjbngVnJ5z8oz+pqPxnL9n8L3QBwZgsP4Hj+prVtbcLaWS4x5dqB+i/4V3T+I8qjpD5mbHKG+U8OGKke44qRfvGo71FTUbhB2bP5gH+tEe8dQSK4nWtJpnf7C8VKJYHIB9KUnBGKQEYyDxSZ5rVSTWhjKLjuBOTjvRQvPXrRTEW5L5mTY4zWppd01zZxNn5lZomz27j9QK5bzwWya2NDuA8E6j+CRWP5/8A1q58LJ89jqxcFyXNacATtg8OA4H6H+lcfq9uI9alx0kCyAemRj+Y/WutuOXRh1V2T8M5/oKwtdh23UFx/DsKN+B4/ma7qyvTZ5+Hly115lCK1BXpVbULddvFXEul7cVXuX83vXnHsIxmTbiqznmtKWHg1RK5JpovcauSAKt2kGZc4pkEG4Z960YFCGhiZKYBtrS0K32faZec8IP5/wBRWc0uK39HUDTw+fvuT/T+lb4ZXqHDjZWpNdznPHrf6BYxdnuufwVj/QV1Cj5EA/hgx/KuW8aAy3OmQry3mFgPc8f+zV1eMHA9Y1/8erpl8bOOC/dx+ZiXrA6tdEc/MB+goW4cDAqvdHGo3PP/AC0P86Fcd68ufxs9imvcXoiVpXDA9ifypJXkjw6DPqvr9KN4I6Ch/mWkm07ocoqSsyS3uY51LRtnHBU8FfqKKxLkSLLvjdo26bl64orpVZW1OSWHd9C990E1veF1ElnO2BzMB/Kiipw3xmmL/h/M0r5iiSEfwzx/kxUH+ZrP1UebpcmeoXdn6DP9KKK9H7LPJ2qRaOVSYt2p5cmiivMPcQMcrzUHlDIooqS0SRqEBAqYcAmiimSyJ3bBrq9OyulQ+uzP6UUV14X4mefj/hRzmoL9q8cafC33YlL/AFx0/lXYBQvPrIf0BH9BRRW32mc0fgj6fqzjJJN08sn952P607NFFeW9z2o7IlQ9BUmTj3ooqRlK5XkE/pRRRVok/9n/4Ql7aHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLwA8P3hwYWNrZXQgYmVnaW49J++7vycgaWQ9J1c1TTBNcENlaGlIenJlU3pOVGN6a2M5ZCc/Pgo8eDp4bXBtZXRhIHhtbG5zOng9J2Fkb2JlOm5zOm1ldGEvJz4KPHJkZjpSREYgeG1sbnM6cmRmPSdodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjJz4KCiA8cmRmOkRlc2NyaXB0aW9uIHhtbG5zOnhtcD0naHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyc+CiAgPHhtcDpDcmVhdG9yVG9vbD5BZG9iZSBQaG90b3Nob3AgQ1M0IFdpbmRvd3M8L3htcDpDcmVhdG9yVG9vbD4KICA8eG1wOk1ldGFkYXRhRGF0ZT4yMDExLTA1LTExVDAxOjMxOjI1KzAyOjAwPC94bXA6TWV0YWRhdGFEYXRlPgogIDx4bXA6TW9kaWZ5RGF0ZT4yMDExLTA1LTExVDAxOjMxOjI1KzAyOjAwPC94bXA6TW9kaWZ5RGF0ZT4KICA8eG1wOkNyZWF0ZURhdGU+MjAxMS0wNC0yN1QwMTozNzo0OCswMjowMDwveG1wOkNyZWF0ZURhdGU+CiA8L3JkZjpEZXNjcmlwdGlvbj4KCiA8cmRmOkRlc2NyaXB0aW9uIHhtbG5zOnhtcE1NPSdodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvbW0vJz4KICA8eG1wTU06SW5zdGFuY2VJRD54bXAuaWlkOjlGNDk1OTlGNUQ3QkUwMTE4M0E2RkQ1MjM3ODdBREI1PC94bXBNTTpJbnN0YW5jZUlEPgogIDx4bXBNTTpEb2N1bWVudElEIHJkZjpyZXNvdXJjZT0neG1wLmRpZDoyMTUxMUFDRjU4NzBFMDExQjE4OEJBMDcwREM1NDg5MicgLz4KICA8eG1wTU06T3JpZ2luYWxEb2N1bWVudElEPnhtcC5kaWQ6MjE1MTFBQ0Y1ODcwRTAxMUIxODhCQTA3MERDNTQ4OTI8L3htcE1NOk9yaWdpbmFsRG9jdW1lbnRJRD4KICA8eG1wTU06SGlzdG9yeT4KICAgPHJkZjpTZXE+CiAgIDwvcmRmOlNlcT4KICA8L3htcE1NOkhpc3Rvcnk+CiA8L3JkZjpEZXNjcmlwdGlvbj4KCiA8cmRmOkRlc2NyaXB0aW9uIHhtbG5zOmRjPSdodHRwOi8vcHVybC5vcmcvZGMvZWxlbWVudHMvMS4xLyc+CiAgPGRjOmZvcm1hdD5pbWFnZS9qcGVnPC9kYzpmb3JtYXQ+CiA8L3JkZjpEZXNjcmlwdGlvbj4KCiA8cmRmOkRlc2NyaXB0aW9uIHhtbG5zOnBob3Rvc2hvcD0naHR0cDovL25zLmFkb2JlLmNvbS9waG90b3Nob3AvMS4wLyc+CiAgPHBob3Rvc2hvcDpDb2xvck1vZGU+MzwvcGhvdG9zaG9wOkNvbG9yTW9kZT4KICA8cGhvdG9zaG9wOklDQ1Byb2ZpbGU+c1JHQiBJRUM2MTk2Ni0yLjE8L3Bob3Rvc2hvcDpJQ0NQcm9maWxlPgogPC9yZGY6RGVzY3JpcHRpb24+CgogPHJkZjpEZXNjcmlwdGlvbiB4bWxuczp0aWZmPSdodHRwOi8vbnMuYWRvYmUuY29tL3RpZmYvMS4wLyc+CiAgPHRpZmY6T3JpZW50YXRpb24+MTwvdGlmZjpPcmllbnRhdGlvbj4KICA8dGlmZjpYUmVzb2x1dGlvbj43MjAwMDAvMTAwMDA8L3RpZmY6WFJlc29sdXRpb24+CiAgPHRpZmY6WVJlc29sdXRpb24+NzIwMDAwLzEwMDAwPC90aWZmOllSZXNvbHV0aW9uPgogIDx0aWZmOlJlc29sdXRpb25Vbml0PjI8L3RpZmY6UmVzb2x1dGlvblVuaXQ+CiAgPHRpZmY6TmF0aXZlRGlnZXN0PjI1NiwyNTcsMjU4LDI1OSwyNjIsMjc0LDI3NywyODQsNTMwLDUzMSwyODIsMjgzLDI5NiwzMDEsMzE4LDMxOSw1MjksNTMyLDMwNiwyNzAsMjcxLDI3MiwzMDUsMzE1LDMzNDMyO0Q1MDVBNEM2MDlBQzIyNUVGMzcwM0UwMTE0NkQ4RTYzPC90aWZmOk5hdGl2ZURpZ2VzdD4KIDwvcmRmOkRlc2NyaXB0aW9uPgoKIDxyZGY6RGVzY3JpcHRpb24geG1sbnM6ZXhpZj0naHR0cDovL25zLmFkb2JlLmNvbS9leGlmLzEuMC8nPgogIDxleGlmOlBpeGVsWERpbWVuc2lvbj4yNTA8L2V4aWY6UGl4ZWxYRGltZW5zaW9uPgogIDxleGlmOlBpeGVsWURpbWVuc2lvbj4zNzA8L2V4aWY6UGl4ZWxZRGltZW5zaW9uPgogIDxleGlmOkNvbG9yU3BhY2U+MTwvZXhpZjpDb2xvclNwYWNlPgogIDxleGlmOk5hdGl2ZURpZ2VzdD4zNjg2NCw0MDk2MCw0MDk2MSwzNzEyMSwzNzEyMiw0MDk2Miw0MDk2MywzNzUxMCw0MDk2NCwzNjg2NywzNjg2OCwzMzQzNCwzMzQzNywzNDg1MCwzNDg1MiwzNDg1NSwzNDg1NiwzNzM3NywzNzM3OCwzNzM3OSwzNzM4MCwzNzM4MSwzNzM4MiwzNzM4MywzNzM4NCwzNzM4NSwzNzM4NiwzNzM5Niw0MTQ4Myw0MTQ4NCw0MTQ4Niw0MTQ4Nyw0MTQ4OCw0MTQ5Miw0MTQ5Myw0MTQ5NSw0MTcyOCw0MTcyOSw0MTczMCw0MTk4NSw0MTk4Niw0MTk4Nyw0MTk4OCw0MTk4OSw0MTk5MCw0MTk5MSw0MTk5Miw0MTk5Myw0MTk5NCw0MTk5NSw0MTk5Niw0MjAxNiwwLDIsNCw1LDYsNyw4LDksMTAsMTEsMTIsMTMsMTQsMTUsMTYsMTcsMTgsMjAsMjIsMjMsMjQsMjUsMjYsMjcsMjgsMzA7MTM3NUU3MDc1MjVBMTE0RjBBRkNBNzg4RTM2QzAyN0I8L2V4aWY6TmF0aXZlRGlnZXN0PgogPC9yZGY6RGVzY3JpcHRpb24+Cgo8L3JkZjpSREY+CjwveDp4bXBtZXRhPgo8P3hwYWNrZXQgZW5kPSdyJz8+Cv/iDFhJQ0NfUFJPRklMRQABAQAADEhMaW5vAhAAAG1udHJSR0IgWFlaIAfOAAIACQAGADEAAGFjc3BNU0ZUAAAAAElFQyBzUkdCAAAAAAAAAAAAAAABAAD21gABAAAAANMtSFAgIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEWNwcnQAAAFQAAAAM2Rlc2MAAAGEAAAAbHd0cHQAAAHwAAAAFGJrcHQAAAIEAAAAFHJYWVoAAAIYAAAAFGdYWVoAAAIsAAAAFGJYWVoAAAJAAAAAFGRtbmQAAAJUAAAAcGRtZGQAAALEAAAAiHZ1ZWQAAANMAAAAhnZpZXcAAAPUAAAAJGx1bWkAAAP4AAAAFG1lYXMAAAQMAAAAJHRlY2gAAAQwAAAADHJUUkMAAAQ8AAAIDGdUUkMAAAQ8AAAIDGJUUkMAAAQ8AAAIDHRleHQAAAAAQ29weXJpZ2h0IChjKSAxOTk4IEhld2xldHQtUGFja2FyZCBDb21wYW55AABkZXNjAAAAAAAAABJzUkdCIElFQzYxOTY2LTIuMQAAAAAAAAAAAAAAEnNSR0IgSUVDNjE5NjYtMi4xAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABYWVogAAAAAAAA81EAAQAAAAEWzFhZWiAAAAAAAAAAAAAAAAAAAAAAWFlaIAAAAAAAAG+iAAA49QAAA5BYWVogAAAAAAAAYpkAALeFAAAY2lhZWiAAAAAAAAAkoAAAD4QAALbPZGVzYwAAAAAAAAAWSUVDIGh0dHA6Ly93d3cuaWVjLmNoAAAAAAAAAAAAAAAWSUVDIGh0dHA6Ly93d3cuaWVjLmNoAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGRlc2MAAAAAAAAALklFQyA2MTk2Ni0yLjEgRGVmYXVsdCBSR0IgY29sb3VyIHNwYWNlIC0gc1JHQgAAAAAAAAAAAAAALklFQyA2MTk2Ni0yLjEgRGVmYXVsdCBSR0IgY29sb3VyIHNwYWNlIC0gc1JHQgAAAAAAAAAAAAAAAAAAAAAAAAAAAABkZXNjAAAAAAAAACxSZWZlcmVuY2UgVmlld2luZyBDb25kaXRpb24gaW4gSUVDNjE5NjYtMi4xAAAAAAAAAAAAAAAsUmVmZXJlbmNlIFZpZXdpbmcgQ29uZGl0aW9uIGluIElFQzYxOTY2LTIuMQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAdmlldwAAAAAAE6T+ABRfLgAQzxQAA+3MAAQTCwADXJ4AAAABWFlaIAAAAAAATAlWAFAAAABXH+dtZWFzAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAACjwAAAAJzaWcgAAAAAENSVCBjdXJ2AAAAAAAABAAAAAAFAAoADwAUABkAHgAjACgALQAyADcAOwBAAEUASgBPAFQAWQBeAGMAaABtAHIAdwB8AIEAhgCLAJAAlQCaAJ8ApACpAK4AsgC3ALwAwQDGAMsA0ADVANsA4ADlAOsA8AD2APsBAQEHAQ0BEwEZAR8BJQErATIBOAE+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////bAEMAAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAf/bAEMBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAf/AABEIAJYAlgMBEQACEQEDEQH/xAAeAAAABwEBAQEAAAAAAAAAAAAEBQYHCAkKAwIBAP/EADQQAAICAgIBAwMCBQQBBQEAAAECAwQFEQYSIQcTMQAIIhRBCRUjMlEWQmFxMxgkQ1KRcv/EAB0BAAEFAQEBAQAAAAAAAAAAAAQCAwUGBwgBAAn/xABBEQACAgEDAwMCBQEGAgoBBQABAgMRIQQSMQAFQRMiUQZhBxQycYFCFSNSkaGxJMEIFjNDcoLR4fDxF1NiY5LC/9oADAMBAAIRAxEAPwBpl9TsR2bvwLGOQdkD9H8f481CAQD8gqCAAQRs/WYxwspJMrLigy3ZNk5ojNc8jxWB1cfTJ4d7yGJNcfJHnji/4rruOfcZndZX4LjYmQeGMGO2uyQ39QVYyqlWbZ+Co8ka6lbxSNe2Zq20TbfqJFHkkkDHFfvyHoQIwd6iTKkFzubBJxWcVkHkUOK6qt+6H7yqnIpLvAvQbhWBxMZnuY3kXqRbo0Hv30i92F6fDkhjCQY6K0Gn/n8xn/mnVDj6sGPLXsg/p9IFctOwdhwmZL+7bmLvQOEZgi1fIUdeVMXdo3YAfpQu6IgPjaBuYf8A7azglrUXVpksWbN2eTMZ+rdyT2ZbOSmlMeQmmsSS+/KblzIyzkTq7+57U0Lk+4ZC3bsjyvrSbBsjKjaQtAxjNIDSAchaCK1ZvLEkj+jGxAllQuLuzbcGxZY7BRAA2n25JWzQyvJDRRocbmsfFLHW96GvIa3eWLr2JWGSvai6KfasQTQJCyzFBAsccxkZDgmi6F1BBuyQprdW725NcEkjOFPRQZUG1WU4BsFTtHAJGWIBrgH7XmkDclrR27B7fjZlVrVjbIolRHjdKik/0WMS2JbE5Kyujg+51KIPmcsbHA27Q15DsCSSBxaoeAdoahYy06i2VRd1uNEKCcWoxtokbj/WBQBGSQx5Ge29ha0DP7T9akMatplEjpIxK/1CzddovZezL2UsAe3t0QCbJNudx/Tiqsg0psHyCR00ypYpSKW2YDz8Ei7wCbBqqySSFG9hj4o1FE1UkVA4EQrv7hHUDTOzAMxI0Z3CJvxINsPXDvncSSDjcNu0HAObo3uFih/UR5bt46XaqAk4yCxNY9wUk/IFk5q6HQZ75Ud5HVVIKqLFeNVkOiYxsO6skqA+04kQF42Idu3REKKwQWJDAjPtzkgUT480CTQvNPUQAKY7qLEMeBd1YH70t+POOnG4b6mf6bs41crBLNhqE6shrntPVjaEwqldhIq/pYCQ705w6x9A0AjYmGx4yh9yhqamC7r+OVNGifm75sdPRSRxMrbbAItTfg5zVC75F4s11J6lnRyeSfI45p7MVcL2ru0paBWjLxH5Oz0O4HClJWH4E6/EDZJF7JArYJBINXySKF8cA0P2s9PTOJpGkVnVMbUUgqATXPJqhubk4JF9Lj0tp4jJZC2mZhEleO52lYkJKo89lDkNIGUsRpf7SfP76+07KFkFqhJY0QMsQRd3WV5sg+AOmVBUMdoJuxuyciwQaI+9efGcdSZbjXo81uj7JvmSO1X/AE6tZufhJ+pUqV7b12dtEa6ks2jrx9LtixoKQENkDdkquQbFAV8gDnk30wu8Kd9CxbVf7Z+Pi7q6HGetfNpmFq5tgdWJGiI3sKrygkAb3+XXyCfG/C9SfqmSggMBgCgrEGsngkXm/jyM9COF9NqW/a33Fk1fzZsZqweLwD9DMPbGhox77H/b/wBgefyB/wCdA/OtD6YmP34LA/GCfP8Asfj4469W9qULO1RXzY/3H3xX369xI8nhdN2lEX5EAB2JIYjbaGnU/J1seP2P21pVtBuWyCfFryD/AKVzefg9KLBSL5yQD8j7WP8A4PFdKKoRDMsIZJGlgd5RH/8AE6SGEpJ4/tLAMmgRphrR+X9Mm1wNwIkU2AaIK82a8f8ApkdNMdoJ2mwwNnzZJIBv4O3jj7kV3klM0sku12ZCP2ABCxgBf30Pj4GwCfG/D5hKzKxIbe24gWCBgXzxYN5zwLo24JVeNlogKKB/8pqsk34+M/IrromQNGBJJEZ/dboo8AKUG32B5DsSHIOvnegCB9PRptdpFa9wrkggXYHH/wAsdBuqlI/UABAYE+WN2MYwoIW+bx9zmenmkrz14ooWmMx20oZeignsCw8b8DWgNEAjYB2Jv1AyHNAeCDk3VCqP8ngWPt1PutELf6lB3YzkA/H/ANY/et374/uKy3F5bHpJx+wMUDUqX+X5COXd3JVclE0lPB1IgCI6bQ+1ayPfubqPHSkgECyJcktBCJow5olnZUWiFpFJdm8+VFA8cDkhidzAdi3vIUe1SSFYhVO6z7hRsnAU5N56qSt5+1kpusuSyqQSnax3bEUkbrKGQbhhljgUExtGIUFgH30iEdlZX9uYVViBAWJn3ZMYqvF025ybPttqqhYZsxxMs5a3faGUBSyMGUn3WLAUfCi1W1sVZAyLHXGeSRZ6wgihCtLdsMIolYRf+3Cr+nqJcIfu0Sri0AliIVgS/wBCNN7tuWN4CCrK0dzMxsoKpKJasnbYUFxwgKzoy2KslmO2wFCqrWqvgWoERDEkiQOpJrBGuHrSdvalmmchpo4PbDl5Nn2xGGl/pf8Axjuzf+MhkH4qxM7SOM+1QQFB80DZoAFuf2BA6XGpQbkFSG1DbVFHybGCQCckHBObsA4xeHtZCHItXpvYmp4a9fuSQxFxUqxVlhaeaRR0jh/WWqsBXsFmtWoIQxmswoUuyxqm6gztsU58MAwJIrPIJ4AOKB6fVHclU3OES3YH9Cx5s5wAzRAgf4hi2PVrf8LX7M+K/cSPVbmHKyLlHhMnF+PrjovdhJt8rq5zISZYTJ2VZIjhkqRrI34w2ZkiCPJ3Wj/WX1DqOxnRQ6ZFMmrEkpkZlIQRvGFiAx+oSWWvFDjb1e/of6Z0ffDrdVrSPT0hhh9Mkr6jzRtI72owY9oU4IoE1ZN3F47+HT6GYGaP9FxaJlEPWzbtJj7d23MyQdy7W6U08WjBGIvYdFEZHho2YnLtb9c/UGoaRXcxoz2FS1VRHdEEPmuaOCQWYUca9pfof6fhRWj06KwH6XCylt65YTNGdrb/AAK24/TjpsvVz+Fp9tvPalw1cFa43lbMc4hzFCxL+tr2pVX+vLKHjjsVTMpmlpWIpYejlqa05x7jP9v/ABB7/pGVWkTWQqob03VUQg3agKBWCfd7R4KupHUd3D8POwa0SCOKWCVrYTQsQyObFbG3A0wYkFdpUGyMbs7P3YfZ56jfatydMRyJ487xHNy2Rxbl9CMw0sq1VBJLRuVS08uLzEdfdh6c8rR2KwmnpWLsVS5NDs3079S6H6h07SQJ6Oph2nU6WU3IoNKrRsKSSJmG0uCXVqEiR7k3Yx9TfSeu+mp0TVBZdJqCfyuvjsRykG2jZATsmRCpKWRglS21kRsPRP1Abjl8Yi5O7JPNHXhjSITmzRncRpFGYkDxtj53inEkolRKLWfaWtBC2prVRtt37Sa9wyfcKJXyP1hXUWRRU0LG3qrJasUN80aJoA+f4r+bNA9SOoZ446jlP0zOly3bf2wjlWiHaQs7SDY0rkDqpDMG2DpQwjNGqushdRtLk5HN2KPHBv7DH8FTyqmOLBFeLUAE+Bir+Meckuh6cSySci4rgM7mZhY5FyPA4+vPNHLYasMlmKVD3FjBUSGESvIE9yIya6e7GOzKWDt9UjaQFYKOP6ML8VfnN+OOht4UMXa/a3OeMgfH+1c11t3sSKZZ9nTvK6rttlSzsSdE/l4Y7Oxsk+R4Ip70yKCdqvgYPIyOMiyOfsfPQUTWKAoDcQOf6hQz58gmv44PcSgQsV05ITz41/YB8bO1AOyDs/JP+DHsCCQxuyT/AP2z8DBNkCvPSwbRCLFKAKObFnGLHNXef9xuNkYhDsa/UxiQt8jfVR5bwAfk9RrY+Tr6KgDpG4qtpJarsGgTxVCybyDZ8Z68BDFGJNqKWwSPGf8AXzwa+3RhVliisWvz9yyJrAdepVRC06iPTKx7EhCzeAFChhve/p2BlUPm2omgo9tsOKF2R+33+Ok6gURmwW+2KFGvizePOPjoWGBkb2lPtmU9A/zrQ0CNEfJXR1sAn4J39PMrOqykkOgpQpG0++9xr9RwBt/2oW1GwVjGopWJJYmmAAs8EAeDzRocV18uzRwOYHX3FVy2gFJDMAP3VlA0ujr/AIG9qR9PSggew7aNHxmv2/38V19FKJK3KCKJAK2VyMWT9/jIHjrNjaqyGoK8DssoZY45FYB104XYZtBd+fJHkbI0R4mwoDEgX5Px4N8f6ngjiupygwCsRQs8ZJAb+KyTyDiq89Zl/uR9QLXPfVnn/J/1vvV8vynIfy+WKSGtJBgsUThsCZJIo4JJHgwtCoPds+xKXkMa/qHkb3bNooBHDGpUKVX3XZBDDfWDfLVtUFjtsgEAdQutJDuSwO81SgBlVeLKkELhTZxXnhS0eOzVJHSstQyySv1gMTma9KCvSKOB5GUKHTfuRsKtEmazGwi9+NHekiclmDbbv3G1Cg5ANYBJ4YW4NAY3dJikiIAI3MSpWssRZahRBCj9RrYBRrbnersHHlslkq0EsUOOrQf+7eCpPAZUEP8A4YGZKbwyREv7jCNq8kbtOys7O7WGTGgT9YZqVS7Koo4BO1TuQggckgkbioLUCEeWRxCFCKTuYKwa6sqT7BuBBLXutAaUsoJZfz1Afcld+kdPu/ZNsiykxuWVgSGYBKyjqT1mVTJ19tl+o0g76IOLGD973H7/APM/x1Ioli/CigMEFic7avijYNUxwDyJ2/ZB6fQeqHDPvB4tWxYv8qP2v8t5VxFwSJza9NPUn0d5lnsRFF7qLI+TxUSUa6D3HtItmFF8NHLW+/ar8rP2OWVysA7zDBMSMbdZou4RRu1E/wDZvTXwNqtd1Vk+nNKNdF9QQogbUf2RLqIeN7DR6nt88kIBwTKoUrndsL8AkGyf+BDyylRqfdRw97cMWTmf0kz9eo7MTZo0j6i4nI2aoO+xqS28THb2Aq/zCiNhu4jpv4nesR2mVVJRjrYGIGA+3SlFLC6HtlZaDYVjjF3T8L2V37vAzAGIaKZaH/aCtQsj2RYCvs5A/WuB4vzlmjkjb8VLOrCPYCaBILAsDvrrqBs9htAuvxByJY5HUszVuLCrLBtqYIJC48/a8/HWwCQK4RaDKBu2mwQvkEZJPPFc+T0hsqocSKoUMpYq3VVXt2A7DqxDbIBYHRUvsaZvobZRIXIrJW7vNWDgA0aomzjHPRyVtsth7zuI5/pJxRx4JwDZABPUGfun9IuO+unppyn065JGsUOUqe7isrGim3gM/UVpcPmqo0W7Y+97TSQArHeom1Smf9NZkVrH9O9xn7RrtPrICxMbASxsxCzxMdsyMeRuSyCSwWQrIoRkVuoX6h7Rpu9dr1HbdVSpOKhmpS+n1KAnT6mPcTukjlAIVtqshaI7UZw+N7mvHc56dc1z3E+Q1P5dn+J567ictWV0lWC9jbrwSSQTOjxzV5vbjlo2xF+ns1GrzvDJHN0bp3Szw6zTQ6qBy8OoiWVG4LJIik7l4UrZQqf0FCopRXXKWt0s+h1M+l1KmPU6aaSGdCbUSROUbbhbj3AtGQtFCpAo0JacVsvyTHQ5pYvbW1Gt26ihQsLSdJHVFEk/SNzIrIGlmKowDOzhtALEYfVUsMyMVI5q6C+Dj5+P8umpCZmU0R6aWSCCtnO7gED4F3+4A6kLxGzjcz6h+lFqu0Vc1/UHhkSPINSOp5Hi9VyIwfx7MOgOgrnyT8lG0gOSQcFjXgC7/wBOLq8A1z0MwKq5JsU3+Xu44+Kz/HW2qQiSd2JBIcn/ALVZG3o/kN70x/c+BrXxVGCsqst0pK1QBrjOcVXH+XPSUSgwBreWu7vK7fOOcCwPNjx1+VghZGBI6NvyQPOwDoHqW6kg+PGwQ37/AEK4J9Q4ULZBzncB+rPH3F0QTnjr1K2Gh5JB5yDRvND3D+OOeu1SeRHKdSVIMh/zskdvAI1tlXXwSW/4P0yjsG9p85skXRXBxVkHwTwRz0tUG0AmhgC+OfOR5APnF3XBERzyfriWADtPLLKvx4ZI+qkA/BK9gCfx2Tskn6WrEMKNH2iqN4AGDX+V/ufull3Ag1VDHBOQcHA8Dn9/HR8kweQgEgBCw8gsG7DWuu/nZ2d/A89m+pUkb/TrlN1BhdhlGLPABujnA4IyCylaa6Iuvkc85ocfN/er69hQ8rMfLdFBLnY+WPgKNk7JO9n5/wAn6QrMHZFyReLF17aLWQLu6rgEfcBQ2hbYlWO3N/q/UDWOPaB444x1m+xNiK+0BZgJDIheNXLMV9wL11tSu9gg7UnYP/BsFMGYm9lDI45yQT4/evFWeJxWUD2glrItixBwTdXxgWABi+L6yR83r33zV9Pamlgx+SuUoImeR4oY8fZ/RLE7ydbLmOOsqbtEyAxBYWid2U3aN1HkAlFAJrmgxAu9lsSTt24oHgDqt6mKV9rHcw3MVU0UwSpsWDgirIxWB5AniOKl/WtkMiXZolk6RJG8E00axtI6yM8ZRYUCsf6sb+2qsW7xoIgJq5rTZHYBos5IIAurAByNxGQxskqAbPRei07bt8i+8AhVoIwXBDWQuBjFHkG8ZkDxapAkEtqOtFX7lE/JITYlWPse08yRrO5WaRykczzlAeiSSKfcEdliFdnIOVJ9qMSVACLhQBliwIySCQBXUpEFLDaKX2hmNbmBFk7iM2bN3kC8AZWvJOJX6XAOKcvWvKtDlHIeS0oZVVilifDnHRRLEGd2lKM90t10rWEaLyYwAIZ1m1UsO4B4Y4XcAV7ZFJFYGao/NUaINmQk0kseig1TB1jnknQNzRVkQEAeVJlNVTMCM7aE8v4a2atemPqlyfkEvYU19G/VPG5GsymSO1Hf4fkeUSR+yxMUryRenTooZBo168bvFELBep/WEY1Xb4oY2/vT3DRMGWgw26mLSlmyDROsWgvtIDVTAnq2/RLx6TuE0ri1/s/XKylmG4mGScqBYBv8kyryQwXcVWj0f/w7c9yD7ffvSwvCMzFPBB6kSXPT/LwIW/Ts2ary5XAETiNUnFTM1MajSxq0ErGYwBlkjsRDfWGmh7t9NPqlIP5StZDuw4VG9KTmipdHdtrLYJUV+non6Nnk7N9Trp3Ubdbu08gBsD1R6kXA2tucKq7aTawKWSCNUquIa0UZLR9/x6lfyIUAr8KejlWKgE68yHf7/WAuArOMlQWA8ZJraSxNHhas5oDPW+RbpXZgOTQbK5JJBN1zzQAJ+BjpM2dF2Vis0fypVtqjEtvZQHyAFDAoQey/jo+fVkIQIRRG7ahu6OOeTjGcHokxttySSMnaxoDxZwAACaz58WB0zvOatBa1m7cuVadGukn6uxZmSvBXjRmklaSaZ0jQJEG8kLvpryV39G6feXWOFGlYgCo1LnIFgDBP6vcLIArIWiG9QAsTPKRCgKsHkICjbe1y5KlVNFrLAVZJI9oy7fxSeE8Bb1D456remvJOO8mpcwpWsBzf/TmaxuTOJ5Xxz24sbfytarcnlqnkGHkiq1WhijrS2OM27Fpo7uSWW5vn4f6nXfkpe36/Tz6dtM6TaUamJ0EmnnILrAWC7hFKGLKw3KdQu1dkZA59/EjQ6P8AtHT9z0U0E6a6N4dU2nkWX0tTAQsMjqCSonipQRYYQOWKSyKzRS+2zk9bIVszwLJX2q2ZFeXDjYY2Krsnv04y4b86zr70ehuSEzNsrXIF018WypgoNim20QGGCaPjNePOCesxindVmTHu3CqH6M8YBIsGj8jGb6mp6X+mWTn9SPS2A2la4/qLwd6dZWSNJpf9T4o14w8oSNTNKEi3LJGiMS7uiKfqOLj05QRkxP4GBTXiquwASRjixd9elAVOWyjUDXGR8Eg/v+4zxtjIRZHVW0WYkkgn/wAjswBA+PwCLr5J2QfP1TJmKjaoxuZmNgUbBXnixVfPjNnpIxwDyT+xOSbPgE8eMAAY65a7O6+NsygHxvXjRA/yCG/Hx5bxvWw0ztgsPaSCwBGQBtI8ZIYmgQcXdZ68G1Vc0QBdCycmjQyfJOM/PFdfWkPvP7eixYxhdAdQBvR0OpBBI2Pgjx5I0Mw2yVdYXHyWRbJ+bs0eBWCOOlgExirznIugM+fg5zRJ6NYqsst/K2u+v0lWOx7YI3IoMcUhVdaJLSqAD4HVv7SDqTEStvkUC4o1lIz71AQGj4INg8V56b9QBYxXuZirEjJIJ8YrjkYOTVVZtxSWOfNx17URlWeCyF7BeitHDKwLdyTpG8L87OvnZ+vICZNQL5ZHo22CVYLVHkGseRkDA6bnX2WCqhaJ5o5o+DRzk0KAJ4oj2ziCaWJ9gxu0ZPbe2jPU6/bXjxrx438n6HjLrI1tWGFsMmmA81fHP+Xnr4xhvb5WsihisDybsk/z8V1mV49xSHiUNmdMpkLjSWFmeS1aknAQDbonukkKWAOt9T42Trza0LybwzMfYSMFbxjJ++fPk31NbFT9IGWsXWCDuoWattoUVm2PWZD1OxfJMH6mc54zBhprSYTn3NMWciabRpJJiOT5jGlY5NtKq94HaZDI0Zk6942VFP1bYnhMSyNKoLRpcd5Fopz5BF1jAJ+buG9aYOYooL9NnTc1KoCuyg15LgbmNgWSRnomxWNzssimz+kxFcSIJoIg9q1ZSORG/TyWWREqpIyqXKTSyKyKDE3iP6akeACqeVqtGchY1u13BAx3NVgAgA7snHSwmoYguY4l/VSe8vtP6aIG0E8nPFVZB6lT6VcAzvqJn8Jw/jdK5kL2ZyNPGqldYllY2ZtswaT2K6M7pI0KSSJG61zG/wCRXUPrtbDooJdTNIqLHGzKZCWHtF5Qe4gteALIFgc9WDtmgk108WnhjZi0iCkAG0PbWN1KLAcJeCV2miQDYh9x/pDjMFhuK8Nwt/H2cV6P5qhwSri6SRxwZfm2S4xjc/yzktq6A1228WfzsGEFedYocbDxnKWFMT2cs1mndm7lJqHk1U0bLJr1bV7pLLRwLM8cERGFUFIjKGvJmiTAWJRbO/aERRw6OFlMPbZE0Y/wSaiTTq+pmumdmjkcwKoLKiad6q5N7DcU5BylMhe476UYie1LknKXMrLYfGQ5njs+MyPDZcBiBHRsZG4/KpecWcQUo1hNcqtfSoYYqFrJ0Z2WKBohJrSxKANsFOY5d8eojllQlQEgOmMpDsFDiMk/3i7ofSTTLIyaUbTISrFbQyxGGTTCJSoLD8wmoZDtB3Bto2bWYSq9c/tY+8jAcTwvqwuP9N5ea+n2cn9S4k9N6uVXmWHkmGEtyYOi0cpx+QxXCocHQlxeJxqqlI4+5Fg3yKXBBbquj+ofp19TL29vzkel1sSaINrGjGlmAMyLISW3xPqjOQXcAvvRmCemSly7h9Od+/s+HusUmgk12inbXlNGs35qyVdooQy+lNHpY41KLEbLJUXqOwXqdv2mffF6w+uz4efn3B+NUcJmqc8lXk/HL0sNebJUzNBej/QSZC+8Xa5WlRopFrNERE0QnhsROaR9S/THbO1CRNHrdU08Mqo2m1CeoQsg3C5AiKQqEOpZySoNjcpHV/8Apj6h13dYIp9To4IIJoxs1OnkXa7Rkoysu9hXqBxiiTtI9rKTY3luR06WKs3ySAsUkqL5G9KW0FQbAJXwyqzbBBUD8hTFhJoFwWwQTW6waWuLAs4I8gmxzannZVBIpTmh/UBwTge0eaIBsDPVRHrj6dZr7h+cXLHqT6qX8P6TYy0j1eGYSxcmjs1UZ/bjOOjkSp/MbSyPWjtTRXbftGIsoZWi+tC7F3GPtcKw9v7dE/cHX+81sipYAw4MjsW2Dml2ogutxoCm980M/c39TW6todAsigaSLLMzfqcqhVSxKlbcu6ncCqgV1E77m5vsgPpFzL0W9N+O8EwPNsZgbOW43lMZmcNe5hHyfjdeTMxw5WdbM120+cXGPjMvDLLaeCvavFYY70MZq3Psy/Urdwg7rrNRqdRppHVNRG6TDTvFNtjLKrqEG0ESRuAEbYp3GNs0L6i/6vSdu1XbdANHHqY4mk04jdWnGoiUyWxDFt0u305AD/3jbaIs0x+leKkn51Uu1JRFNh7mDyrhpREz4x8xBh8j7Y0FeeNMtXtvHIR0pV7uttqF9K1Eh9HYQrb7jNg+2TYWNWTxtoWTnN+eshUb3Y4I2Rm+CQH2kgcm7TNnBOc31an6C+oC3PWL0fq5I9bMnqx6bVKzr5T+tzbAQRsux2Ll3XahW0GJAI+orUaYpFJIhsejISCcmgzMLFk+bJP7fAQzsQ+01SGgADi2NAn7Ch985xezQTye9Ku26l+utDQ6syrvwCP9p8j5HyfqkSkEAkbd1Ekj74v7jxya8fCYXJLEmwHoVXBFkUfFADHN4GCR10V8nyS2/kjzsDY1oDwNnWtb/wA62OzAE5BFNxxbIVGBYvIPPjBNGiEwWWuTZNjnjg3dgYxxfxjtC/UydkLOVX2yNjTb7ed72Py1rf8Ayf2+m4z7rYBjtoFhZNFfJrNCz+3npuUG9oJUbgbH3BBr4+L/AIvoJPZmsXUhUtHJYmjib8ugQF1U9ySoAIOwCSAQCQNb+nLZnIv9RIJAx+xr+mgCRXP+fXgXYoJs1lSQefkXxWbJoDPHHSw46sq52vAHUiBLMPudh1MixSAabR7Lrrt9bKjud7P0TpQxmVFKkjcAQALIwTu+ALaifF18NzMPRcsOaJFZrcAQB9754ujVY6DXJHa7KGIaI92jddsH1IQ5U/uoYnRHz2HkkfQ8jOGNreWAI/8AGxv9jyDQ/wBunRycVnOQf9gPFeBz831nBgt/zCOzGzMVjP8ASiD/AIsf2c7HkdlBADeBs6IKn6uwZTfqEAD2qfmzx4HAOc0M11Jkg0oyRxd3+pc5A48V8Y6ob+5zHphfWv1CrvIiRZHP2s9W9yRndq+cp18i0jNL2X2mtWbYRY2JiaFogsYQBS4GBiXYwIrZe0m9poDB5AA4s+bIz0I9xtltpzV3ZJJq6okHgXf2Gb6jhJaq15El96NY5PMMndAZO5ZkUEeJJD1aP20QKJAuvjsCArEFQGNCiADSkHddVyKOWHll+3XpkUhG3+4tgE0Lo0tGslgt1n7EXd8P8JjheCV+W85ykcaZTG1461S3dVD+go2YrLWp4llj61ppIddZEZ5FqkjavK6rlX1xqZZZoNKrXG7ElVzvdTe3Fltha9oDAE5XFdbN9AaCOLTza2VTvRUAJUbliIa2UkWjE5IsbkK83ZZP1X5nhuZ0sGaeOvZnE1r3IshXx2Ke7cyHJ+aepeby3JsxEYKEbW7c6RckyvFcdRrTQXP1WcykdeaJ+MWY4Z7RaeXQvIzssUhhiV5JCgWDS6OKOEMC5xR06zM7q22NF3KzTjqv6/URaqOMRo8sKtqGURMTJqNTrpnnlUhB6hJ9Y6eJFKvukkMZQ6ckNl6XZ71I4v6p1uBcB4TNzL7n+aW57mB4pPlKWFwXAsbBDkkaxfzFy7XxdA4nHS2Wec3MbRoJYzEVG3DcuxU70hPBpe4aUTTaiOLtEYWNpQheXXTO6FQoWt6u4QsshZ2CoWG3cBE6XUT9r1ex9M8vdnBdIWPpxaGKNGuWZ/cCQoJVVfYvvVASw9SXPJeUfcjw7kz8Hn9ePS7O+qEFwVDw3Ecb5O2PnuY3mTem15KvMbuYw8kVSL1Cg/kctyxiqeRGHf8A1fc4nRwX62ao7/1P7ZPom1ixTJG8Mmo9MvHlSjuoksP7xHuZFO42VRXVKDi//knXDuX5MgiFNQkP5jZQR1ZTSadJFkLqHAPpmO1J9qkbQnvtR5Tl8RzTIUYOO2ONrynmGZjfi4hQ1eHepeMUtyfiVdooQ0S5LGV2yGLx1qvUnrLhJqqCRLMcdagfU8EeqhGyUSz6OBI3ZgVln0ZkZIZpboBoZFaJypbc0wDi1DHU/pedtLKyzRelpe4udRptiMYItY0QkmijJSMhNTAvqwK4Qp6BUUqkC8T1H49m7PozlJ8axbNxYmWyIow3eV1hb3IQe4EW+pi7kH25QOyMAfrJ9NKkXcoBIzGJpFViwA9MWQWAvJJIIPG2ybrGnTRepoZWiSp44meNbYF9qmTaosgEgMBZySAMAjqmPnXBOY85zF7A5Gzm8b6dYLjVLl+VFKlfr0PUfJWstj5bHpw2cryVJMfFc4vHnJBaW3QhsZFcbisllsZVy0lyjsn01qOy6bVRtq5NPCWleFXkkAMSRAn1QpopI8jISzMCVUrGTKQwyr600v1BrO1yjtUM00voRyqkcahpjP6m4B2tJGjjRFWJVdQ8ymVDGrAt/wAn9JMB6qel2P8ATXI8b4SvLcVzX03y3BOQennphluPWeH1cFzDlKc6y65zOpPLiMVyDhX+k62Z4qJ4jyPlmJxvIrGOy1+lPyeO/d5+oe1aWMy6TXaeYR6bVIYI9RGyappIdsUbJA8irsb1ihZgUVkjIHtUZH9NfS/1PrNQ0Xde36zSxyaiB/U1ySpqYW9RJJXi9RVBIYDcsausqIjB2l9WNavec+msXoz913L/AE+RJoMTxXlVk0A25bEnE81STNYAKdAymTDZXGt3ZlkEaSe4zyBllJ7Zrz3LsOj1xYFp4BvYV7dRC5hnaxQJ9ZHBwBm1ChWHTH1B27+yO+a3t4Vh+X1BSLcBY071PAGJJJ3QyRuxBOWRbxRn/wCjPH8BkPUj0HyOLrPWEXrP6U5GJ37d5HHPONu/ul3f8HSJUP7IGcqOxIZTk/lnskkQyXtLEG4yaB3HBJJF48YA6hJAyK+7FALQUEihbXgmjeSTgKeKPWyGR2S1abwR3m/IhegJLgBSPx+PjW/+x8/VJ1JBxXNA+K9woVWCP/sdJhA38YDOOObCgAG81V4J/c569h2LoQQdRn8Qf/zeiQSfJAH/AD43r6DY5OPsTV/ypODxg/bxnotcbicC7sivn5rHQmCWVLCoyk+5NCkZ/ZC4VdAk78sPOv2Gtgb39tOAFs0bGbyfI8CiCDj9+OkOQRYJODkeR84+M+Obuq645Kq0WScjYZ5EdmA30f3HYr4GwV6r/wAAEEHX0okoHVgQwBrxkffHyf8Annr7fagZ+BWPb+1i/Pxj78jaludbayw7QgyAuF66DKwPx+531dtqNeGB87908hDq6NRUOAQCeQQ1eDznFg1RvhJCgVJQQ1f7A4r+RirsfvXQ6MlCXEbyAqoXxsKGAYhVIOvgdiPgjz8j6+c7ACd1YA2gsQAMA4PA8nJFXfJUQWO7FNlSSosXV5r7fH7DrMPbzFuC1XpLRuPATqSeKIlYw/ks/wCSAlSQGBI66IYg7+rhJMaArhlAIprvbbEe04Uk/qzgcZEhHGu9tzAE3V2ATfFjANA1uoE0MA30Sn7dvtS9RLmE5p60elXq76p8ryGAzeJaHiXL8hxrh/HeP4HOX7q37ON4flMHy/Ncpp1/5jK7T5iTDwYfIrFLg7N2rjrCUzu/1V3bRaqbtvbNRpNGIRDMxmgSfUOZowDZnhngj05YhWpBKTHuMiROwOufSf4f9r7p2mLvnd9LqdfHqZtRpI4E1kuk0aNC+1GYaaeCaXUSIxO5p/QEMiL6bsN3UCfu7+xf0V9OKGJ9Zfty55mcv6f5Lk82Jy3DOQ5DGZXJ4Oxcr2bdKvic9Djcbkr9fGT0sjHkMNn6t3P0Korm7lbklWeaSV+mPrDX90mm7X3bTRx6qOASx6mISIkqKVSRniZ2RGkBXZJCVgdlKhU3AmJ+r/oTtvZxH3btE7rp21O2Xt2pAMumnljaRUjlKRyukTxyhknVpREUcvIqnbNj7duM8k9MvSmepdfI4KKWG5n8q8KTQ5KzRoRQx2LTrGhyFWqIKMpo/wBOOeYmQ05Kth62Rq1rXamDVdwVqjlJZYow7exXkY0qkAW11vyFP/eArGF6u3btDqNH2plkDwRlDqJmp1leCMV6pA2Oiemr7Ar+rvBCMjMsy2n/AGs/az6TenfAeBX87xqnN6nVeOUGyuTv/prk/HsheoM2QweARVWniqtR7NinavU4f5hmZFlu5i/kb1iWdq33vvWs7jqNUsU8i6QyOUjjJVZFRj6c0ovc7MoRgrFkQqEVQE29S/Z/pvTdr02kkl06/mhCm9iqu2meVLmihKgLEELMnqRhZJWJkmZ2s9CfVX7UOActz0HNOHw5DhPPccqxVOV8PvWMJmpYmZ2apcv0Ja81uhMJO1ihY/UVJ5I0aaBnDdovtv1N3XtqNDHKDpgblhlVZIyAFb9DqaWwSFBI3BTftFF9y+me0dy2yanSqJRe3UIWil2Hd6iErbbXBojNAFlHurqNFz7W/UCvy08gz/qTzfMWmzcHJIYK8GAxWMkz1daMUPIp8dgcRjaX+pK0mLx9ityA0lzKXqdLJPaa7WisrZP/AMjd1n0p0qyxQx7WXEaNi922PehIB4cHBUFK9N3Q1eP8MfphNYdaNIdTO+12lmaQ7pFFIzlZQJDGATGWVQDTVY2iUvoh6I4TgbUsnkMPXtR42ylqG5kIY72RkyG5ZIshZs21muWLlexYmmivTvJMk09hxKvd2en6rukmonWQSyFyrlirMVZSu1kZQcoTTFBgMoauruvb9PHF6OxRt2FAUQhRGQV24HuQBgjAKQrMo9uerDqHAX5rxLIZ32qlPGiq+oZ50iayJYz2Zu3VCC5RVjjfszHRAbqWC1Hb9RPC/cUCwrEF80Gs7WZQQducgE+44A5p2DXxafUDQlpJGf2j2kqpN0CbJAK7hYuq8DArVsenlipyPOcMsJXWfHzTz1EL9obWEycrPDZhk6lZIXkSapMh7GGWpMqn2iGK11ojii1JJkST2OhGRMqqGsmrui+QFyABdUQIPSZ4iWwRJEOQ0T3tKXfH6SCQRRsAZKmo+ldLHQkyQV4Vi1LFHCiiId1b3XduquSzEr16uSGbbaA+vU1zSFTlVNgFtpvjwCRY+5GeD02dCilpVBLEgkAnx80c/bgeKOeqD/vp4lxfF/fFUyyVYT+s9KOPXMpO2o45MpDj+VYNLUuwEZxheN0aEfvtIQViljaOQRL9bn9BSzaj6fbT7iyx6vULGtkgIzQTMKzQMmodsX+og0K65/8AxPhhg+pF1LKFaTQaB5GANu5XUQhmzViHTRx1RJCfIs8ft65rgb/rv9vOHrew0Uvrx6M0mjKpJTkST1L4zH7EgYGKaOwCY3jkAR1JDABihuGpilTSzq0YG2CW6IAoRtlaB4xXOaH36zGWeJjIVZzuBAG2gLBFg/vVCs1jNdbK7MAn9xVCpISpI0AVaQEnZ1+Xg/J2O2/jQH1R5lZ1AFDJN8iqv4/evOL6+iYIctgkj5zTe7nN0LHAsGz16WuUkk00bCN1XqdgbdPx2dHfl/28j4GwNkPY6NHYHuINXYoGjYHnOMjGQfPTizLIpHuII5POBeQP445BrwB11tysJIHBKsr1mC615WdW2dEnf4sQANfkd60QHGba7MRtp8mvspFg+AATVi8fyhACmwjjdn9mdeL/AG/5ffxccjIqwBaNyJerbP8AUeMCbZ8eAO5UbGu2ydefpGpIDF6wRv8Ai2KqSP8AOwSARdYz0tB7VxVgWDyKFUf2FZ8/vfXzH9e8vQ6PuO2guiEBCsV+AN6B15BI8+QB9N6RgSCg2gszCuQKN1gDkjH3PxhLW6svwQM/amwfv/pzno2M6woBGP8A6hmHhmPX99Hz4Hn/AAdjZ19ETTIiAL7QGpmIIJYA2LBz/i/dj8W3savgMQQFoAWdoHjAPPOf+ecw+R/mOOPvSw/qFn2yiMNuMnRZToEbLAMVY67a/bX1awCWIr2FRijeMZoZx+5/e+pH1VYWqsSpAIFCxRs0M/Y+Pjx07X2y+slWtiebLneJZCPK8UwHLKeJi9r3K2WTkzYuCOU1HiikiNGjDmTMSskEhs0QLaz3Iqj5r9W9vfSd6XuRcPp+4dsfSItBfS1cDHBPDiXTs0gFoXEEigARlpOjPwu7zp+4/S2t+mQBHru2d1h7qbcMZtDrHihMqlY2eP8ALamNIZRTKF1EO0u8xGmg96+Y7N8t51wLNcrhoYzB845BSx3DuE4jF4vjeJoQ0c1jKVXL3YMZQoSz5mvHyO8cnlskt/K3ZcpXhtXJEjSIH9imhg02pjjb1ZdJo39TVE7zsMU8hhTaCFjLQBnUbN0imVt7MZFT9b9tdpO36jUu1avXPFp9Mx2sdkulX8y9gvvRNWFAmIKpqY40SJUYGd3Lmkr5ORqvtinet49fDExjHR36stuqyOyI8XsrYUo6gGMFGhZp5kapgqqq4fcypKbqgZGjcWCazbNkUd1HBwJ+KdpE2n27pId4AIuESIDGaokAK1q2NpyKBAfTF+rNiv7DpOw3pQkZJJVWU9fkxshJQDqdNoKQRsmFeJ2+w+3xXGMj+ceQOerAJYXYEgbjyWxk5o3zknNnn9rf7i3qVFfWIOwLSqF6jejoHx/tYODtSHJ6667VQdQ2rUrvKrShaYGgFBxuofyB7h87GN2+umSYKpO1gSRtxfnB/wAjtHP2sdPFTy1PIlRKsbN10H8HtvTEhv71KgjZDKfyOuygfQDLYCqQVFmr27qAsq2aIJAOMj4HTg0u00ABVAgDxnORRJz4sUP2BJzLkeJwVGD9dYOPrXL1HGtejjMyUhkbUVd7TRe9VE4qrMbCQNPD77r0E8OxIrmijkn1EUG4IHcKSQcKWouOS5ofpIzVX0maFBpppFCs6xyMochB7FP/AHlEICcGwa8DlSz/AKn/AHo+j/ptSxfAcFzR5qoWK/ebK5SF83+jaX2Y71ynUISri47KvCLc0MdOSZpYVld4mX6vOq0U+s07abt8M76QMP79wyeq6iwtlVUA3vCAlqIoCi3Vbgl02k1A1PcNRp0kACBIyHKLlWdgSXBNBWJobgfcxaumKp/cZx7mHrh6fYDjvu5zK5aPKY3KvXjnt16GEsyUnV7FuBBTSxXu162QjR2msw4uK9L/AEYbYd4V+0Saft+rl1LKgiMcyA0hlkW1O1GG4oyu4HklkBA27VPk7jBqdbpo9GDOWMkTsqnZESpZd7gEK5ZQSDyiMw/ViTvPM9+goMiMsewexAAYAEkgM3ldAlGPyDoft9Rel04cqVJYDN5oCwBdecWc4NnOD1J6i1R2O0EClUUKJ8/cg4oUOKByOs133sSQ8k+5mea9alStR4ZxeufZnCNIkI5s9mtMq9ZHDSZ6k6ElUUROpDCRfroT8P4/R7QzhQAdRqRZJ9pYaZENHFEadiP3BOeuaPxSZdV3hI2at2l0llQBiFtc5BINhidSoAJsov8Ak2P27Yyt/wCqT7bZq8/WnH9wfoaUgSbSmaP1U4s8bPoglAxBYabfQr47fV81b/8AB6o+2/y2oO8USB+XbAXyTX8nF4HWYHSkBqkG2rAPOLNeKsGryR1uLr2w8sgLbIMYbY/tZeoH5EjfwR5Otk+CT9ZzbMUBUBTu25ycgixVfcZNfvwgqBe0m9xrFDIxR++Fq+TddGcTrIbQXe2jJ1rZ2APG/wDIPn4+fGgQfoUyZDsgoEqDfABBujyPHOLsGjhaBvaCaCsCwGDk+c/GP3vovtsVBDEoyKiHsuwwHYggHQAIXt4O/HnwQPrzUKQoJ/qZmo+PHnnBx9j0SAGplohiar97o/Hz/nfXuwwNiFv7klVIkYEk9mKRkn/Hzs7O9/8A79Mzi1Cg1aE2b8ngnj5+Mf6oUkoVaw6EhvFbsgmj9h9hxY6G0QixzzFuoUSMoIGpHDhQuwSV6/mdtsH4PnWk6RVjX9VFVZlsXvYsBsNkVYLZHFXdZCWY+0rRyQfAqib5+Qo5zd8DoSr+5Ej6KF+rMh34PXQP7DwNft5B3+5+lsd1lVGTZyGF5BNn7beQDz46UpsfNDB+3xwKIxYOeswX+t8dlWlqUZTNLBZjitIIJo/bYoxRj2HVl/yV/EjW2Gh9W+N5Q4wDuBKnFgVYu7rjir+D8GwRKzkMwBYFiwsAUCaJxWRV2SMEdCuM81fBcox2Ux4/VCnbU5Ja8sUNl6Z2lmGKaaOxCtkxljUezVt1Enjha1TuVhNXkC7toU7tpX003sLrujdwCFdSCGZVolVZQrhWVjFJIgYb93Vj7D3ST6d7ppe5xKziEyetEHI9aCZBFJEWJKIzEI8AeNkTUxxyuG2mMzQ9Z+WcW9U/t2x/FeM2uMcx5XRrNmMdYg9OeJemfLMU+Gz2A5KvFJIePPPib2SyuW4fxrIyZS9bae41S1VpZTEQZm3NFm0aa3s2v9DWQLpoP+z3RxqIGil082l9dX06r+YgkSSVncK0ivIWeN5YNp3WTXab6l7Y2s0esl7hK+1gkkzGdJopYdYsW3VGQaHUAx6dXRTHG6RK0Z9ICTpracOP5lx+HMY6ytqvcijuVABYglhM7yw269mndgr36Fqjkq+Rx96hk6lS/TuULVWzUgtRywLCyo0XqQvlomKkmnsFQ6urI3plHRkZWjd43Vg6SOrBujopI5UjkQ7vXG9Gb+5aiSrRvG2145I5FkjkidQ8ToyMo2tSZgq3sRZeKR+8bsV0VIMTEb0GYaAJXqPOmb+/ZHYsgoVAuiBkZ9383isk1j9hjosyslbkohhRLVf2BY0aoZJXiiQR06vGM8IGhDv1aMaI02+3bt2LKxYDseo6HxsHYC6AU8KuCwI5prH6lNCs/wCEUcg5xwb6mNNqrUA2rKT7cWv8qSCCKzu4/kCRXE+Uo7Rkz/iOoC+SSQVKka2DvbL1Cg9iPAHxESpSkKmLsnFi7NVXgD+fgVmWTVeqqjcLAAo8GvnN5J4Ix+2Q6WTqYTlWHuYLMQwXaGRgapZrzBgrxTbVgWQxvGVPX25UaKSGRUlSRWRWViLekiSqGVozuRtpb3Kysp2lKIFGwdytZBsY6Dn1CR2CUvJwV2shwwIYMCCCc7WzmiL6a8ehX2++m3GLlXL5DE4uDNJJXtZLkWQglzuRlYSmlWmzduN8lJHA7yxVICzQ1oWD+07Rh1lpu5dw1bAKX3RlXKoGUoQBRAiIRd/6qAXfdG8nqK0uk1GsYw6DQyTIAyfoknG2QhZQ7yGmURhUJd94AUEmwobGxe+3b0rg4Jj+Ocr4xQy1N5rePoYu02Sq058hFPTjt2c1DF+jgs2I7tmCae3IosQXJGaR/wAiHHj7vrl1LSJqJlkG6feCjBlkDbQXILLSqwRB7Nm05Dbyouya3RR74tAUXT2Y4yBHILDAlNOzBw5tqbB2NICCXJ6LPUX1AWbDTvNJHJLJDIyyRspEjFwA8ZDeOxP5bOt9mGh5JWi0bxlA9UaJrgLgnJo2o/g3XPUfqO4LqY5PTDArQcPimyKIJtWBGR44rz1np+4qSzm/V7lmYnntmvdkxUeKVXZY5a+NxWPwVwjqQY1GbxeYrqgXbNAZNGGSOWXb/p6RtP2uCNAA4L+oRYILM8qbs5PoSRGyOGKWCCeucPrdjL3ydnBKskJiAND2RLFJVf8A88MwBJyQSKGOnC+3PgNep9w32l3q63K0mS+5T0Bq3TatT2yjXfVrhKGRYJnXSQB2f21ZVcHqCoBIn5ZpX0+pBK50soBC17WjYWebs5o0f4x1THRU3sATSGhusGuQN188jjmqvPWzhbccMxMiqpZo9ft2YSBlJ14+f7f3Ojrwx+qa52+1DZUGrFn55xX71WTd46ZVVNF0IJYYBPPivHR3XZxG0hUo7uSVV/IHwNsNLvyPnZ6+PGvoWQ0p93JsqQCb3WRYIx9vNGzd9LQAFmu7ayCLyD8X+5++Pt1yuyyMYg2mMz6bYAJVPIUeSVGhoHY8fJK/TbSM6kNftII8/qFmyaP+4vgi8uooKGsbSKzijmvvkDjjnr6jyPNCN/gsq6QrsFBIrFlGxolV323ogjXgbCCxYjccChj4/YWLAP7/ADfSX4bjcAc4N/uMcFvP7Ek2ejncSdkAVV/NQDosCx7n51obI35B3+RPU/TyrGHcIaQXtDkbh7qBvHF1xknxXQm59gG3PJIFCrONtkg4Hmh+nkiuck8cOlUglQqsC2tEA68aUf50fn5J8n681DGJIzXkqOAT5u2/jA+3O3pzTgybkF+33CqH6iSRk5AJ8HyBWMZgq+Jx9XI2LtZI1Flf6zKmhIUj0jk612QDqrDe1GwNjQuTooY7TYAFAUADd8ciqrFDOfvJDCg1tYijdEH55wL/AHvx89JungTintvUdDNemMrsys2gQSQSpUhioGifj/P+UQxyDcTIzG+SzHaMAAXZAwBihgfw8ZGNB/cAPaAABSgAYNi6sWPA8AV0Zx5H2XFeCzZrXYgHWWpPNBMjCPQYPGydlBbsEcMnuFWZS0asqtRp9JrIfy+rgXUKCSpcAFXYEEo9h0ZgArMpG4KFbcuOidF3HW9tmGo0Opl00m2m9M3HIi2VWWM+yRAT7Q4IRm3KN1WG+1vlNy5m/WSnmMmzcz4dzuzV5dTWzK0Oe4fmHtZXgHJnxszmpSyq1bGVxdjKYmOD+Z1aEUnI0u5RamUSgfVXbYNA+lXTw1pJYW9BgQxhlj2x6jTmR7eSE7oZESQkxM0iQbUFdaj9Hd8m7jHqm1MwOsjmInICRpLHKGfT6gRoEWGTeJYXeMKJliT1Q7kMJZ5Zq1iWOWuyOHVGOivbe/DfI2dEdhrY6lCWCFfqhvGyMQRRJsjJA+L55HxjJ4z1pSToyiSldiArgnJAsbhR+aJv3DGLz18giWNUljIViQrBiP7o/OgQ6lewYAHYHU9wd7AZku6Zdwwd10QDhsEePvfAoDjovST7FO0AENxzYZji+fcOeAbyfhdcZzFms6lZlO/mI6CqSQSOwLHt2A0T/neyfBE1CD3MVraVB2jJFHaa/pIF2Rk46PE6F9pXaTZu6FnwaHyPPijjr96m+uvKeC4urV4dwLOcuzWQ96GtPRhIwuPuNH2r2uQZlzDQw+Jg/J5bGRuU4H9p4EnjLMUM7XoF1s5iaaDTxqFYvqXETMPIj9VkRmIY3TBloFq9vTMum9UqXE0oZtoGniaZs+3a5jDkDiiRS/qA5uHfFsH6x+tebs8k9ReZ8FwNgR+xUr8kzwyGSEk/9GGjhOK8Wo5Xj1PH1kE5ydnLcqxmTf3K5goWJjZnguI0nbdFHQkZ2c7Aumi9VncFSA0shhQRFTQ/vJaKn01ANNcNAncIY4dPotLHpNLh5JJ5QHZCSxISH83JLNVXFK0OwGtwG4A69UvQq3x/ikedT1W4SbNWlHVt4SjwvK5mSaXu4Ye6/JcRHO7AqZ5Dj1hG29uGJihDMDRBlAilJYEsHmRCBQva3ourYsgBlwaK3dE6qLXVJNNMIo4VLFzpzs27fazP+YVwzE2RTKjDAO1SxP6d4HO8f9GBLneUvySU3Mg2OrS46apDhaiXLEq0BJLlcpNchdJhLBILAjEBigjCrAT9Nalope5MsUBiUIqkliVYEKNyhUjAFY2gEmj5I6yTuWoQGWaOdZjNPIzEIY7MZIJVTIxdWVgTJ7CxwwDbQK4OX2cNl/UfILavRvT49NQxSiZo/caSlj4RcaeYALJKuVnuPKwH/mMihEUCNdQ7Pp2Xt8bGMhphLMfaaIkZglWOCgQgfpraQTWOf/qXUrN3LUAMCkSxQKWK2CkQdtwIHuMhcWaOSpq6Mjvt5zOIf7k/tprGeC1LH9xHoS8aRyRTLHKvqrxNonR1JUOsgBB2OpVSda39SupZV001L7hp5iKB8I2CQD/AJrNAZA6rBDMWYuu1UKlQwybJugSeBRIFfbArWQ8a2JXJ2G6iSMjWw0fbr8bAPdN/Ojrx5+KbKbRWW9xdg1Vmw1EWQPI+OBYxXTKklmsgrYK5GCDVAE1jzVjnnoy/VyfpWbztAHIA0xX8l+d7DeFK9gCPAO/oeaNUY+4kVQv5wbq/4r5FnHK43tsgA77+zDdzeBRo3x58UevtyQ+1FKoACHRI12Hxrf8A0BoefxOiP3H0NkbgQctu4J280PJ84OPjzkkYBojlSfsAp+/+V/J+ehNaXUPvu7BtQRovwNOwQk/HySCdnXx/kkOoAUchbZCBkGua4oD7fcj9+mJAdygD2tZNg5o8fzR5Garz0bRlWUMfHbuCfx7EfABGvjw3cj51s9jr6UoX0lBwSaDeSwBoms0DYHNYPk9NSAgHixRGQAF9u5T9+CMYrJHPXpeoG2jQnZ/u3vRJAJ1+RJ6kknx8aHn6c2CYlZQGK0RtF+AD9h/Bv5AJPTYZkt4yRftIF+M/Y0Lxd4oXjrIXyj1blrPR/khisQy1+0sjufLhV2AFJDdC2mO18/IC+TcFjYglibGLIOcknBPjHxQ8c9S8hbDAEAADI8+QfuPHHPHXDhvOuYStNNfo2MrQlimnSzqM9B36hQVeHaLvoPhvHga12cQrGbBBPkH7V8Dnx5/bHTTb3A8gWLz5v4z/AKED96s1xXqCvIMzPRioCpdU9VaUMGSPYV/cCyMgJkBZQgYlR5PXY+m5Nhtw6m/dtByDxkD4BN3XxR8rQuPaY/aDhjheDjFkfPPjAz0Xccy6+kn3U+mPLxI82D9aMbZ9H+ZaeRfZ5E7xX/T/ACtivErw3JZsjUgwUbTIho4sZGVZSQIpIvv2kXW9l1IRiZ9EF1sQIJqNbGoTNbQImklr3EyLDYz7bD9L699B3vTh9wi1qnQyUWC7pTuixjPqBVBHup5PdVq0seWcjbiWYaBnIxkryNTZl2sCsxAru/Xa+0wCVztWNdUVmkKdmzaOBNUhI/VRvOW2ivHIHnkDrXpNU+mkUf0kA5HHH2vjxxYOfHSiw/OMfkIl1YRWAVt9gobsBsgMerbAAOgz6VSOjEfUbqNC6mkG8Ek0AAy+LPyOWNcHwej9L3IWCGCnhieME1g/Ask+CK810ucXbWd9pISjuAxVjo7PUNvfYOp6/uSAxHyQDGzxkVYYEACqrIPx/Lf6EVRBk4tSJaJbCkYBzZAN/wDm+fgWbz09eNr05aUdPS9LCoJhI3ue4zMy/ksi+Rt9a6/0xvQCsR9MJuR1YhrX9JyQtkEFRZCngk1nFiujhqZSpjRyoBBwSTd2LANXxisZAA6T3KPQW3zARPHyazxqsVLmfGVYZcgf6gLCu8zwwwzP3Co7JN0k0/VjH4kotZHFuZ9P+YkI4llZFteNxAJYCzV8AtXnoUv3YSg6XucmjUCiU2SsVoih6xZUNMaBJOTQ6a639qPDcdPBfyPKec5m3CHLDLclsZGF9kkI0EiGOHs/ZXWFkHWRge4AEZKd1I3JFotHGTRLrCN3NgAnPn7MQD5x0JqtLrJhI2p7z3OYLtWSKTUBYnDkk/3MaolncQ2DV4Oemq9es3ivT3h+YkikjjxlWCMw12ljh96dENStXTopCz2ysNaMIj9pnTqFVvM32vSy67UwRKoDzyUWANKCQzMRX6UCtIxvG0jJYdVPvWri7bpJpXbbDpoZH2s27eKFgXkOzhAoGXfgHqlGzPHkbOQv5FkfIXrE1uWb2gqz3LEjWLL9Y9KolmkdiuwqhyPGtjY4wsMaRKWVI0SOJSbKxKNgF/A4x9+QesGlf8xJPLIwMkrPI9WR6ju0jYUtQ3NgXgcGgepIfZXSmsfcv6BSx1vdNT7gfQ2zII0914q9f1O4xaszCNQ0ntV68Ek80gHWKGFnkZUQsGdYwEE43Nf5eYDGb9M18ACxxjis5HQ8aGMTM6/qjKjINj3/AMcfzZJ4odbOa8CuhcknSR68gdvhmI+QANDe/Gtn/unRtcQJr9TWQM+B/qSLOcDgnpkgs7LgsCAALABb3cHyCD81446EziREZfbATTkk+d+ToHfwdk6B8bGgfJJHk2mUG+HC/wDmIuzZND9ufjz0VkeoFFqRYNiq2qKs4AsePJzZ65t+dcqf96DQJ3ptKfG9AAHyexP0I4BLDGSc38jArFAcHH8eOiIxQDWa2gH5/UF+3j5/y8DvMkaGBAD/AFf06No7VWhaRnbfYDyUXYGuv+Na06ERYzQpigVuSAyNk3dm8eOfnpCsTITd0xOa4bwRd4vgEf79HcRYGL4JGwEJPwoJ34YAHRJ1v9/3BI+vqJI5tRQXIBHu2k2byCbuqsGhnoZiDvWiAaJYg/1FVIF+eD8fY56CSzf1XR2CgdXVvOyJOxC+PkADQ1vRUj9x9LkL+0ICrVbbTX+o5s2c/wD17GilbIBByPH2Njwf9fJyT1kYtcFocnxkc2KMdaSmZq0W9Kxeu5jZZFOwquyHTa11AI3sbt8cheypHv5JFmji65rxnjHF9Skgf+uhZBNEnJBOTnnnOb6XRavxyli8BAYv1k8aRRKSumZwBK5BG2jWVjskNtj534+kOWVqJBDXVVurGcZu/wDnnN9eoNynaMKPcaIv9yQL+R/oBx11s4d5b9C7XjrIsCf1WRFjdjtm+UTz2B8bI2PnQGx5sYkMKC3YrHGeMci7P+/HSWvFeOfjJAF/PPGTXiumN+4CHN5jAQ4HjMFqLkte5jeS8VzFMItnD8s47dXJcfvUZJlkhW5XvVoSPdieIQTTAr3IKO6ZY/d6pDRSb4ZVfcFeGVWSUMR7gDGSjAHdtJqvDju6GOSNikse2SOZctHJGd0bC8e1huo2DVEV1PTNUqXqfwLi/Ma9eKvDzbh/HeW1YIFZY4a/JMLSztaOD3JrD+3GLwii9yxZ8J1ad2DOuMs8nb9bqNOXLHT6qfTuL2srRTPGSxFL7wAwCkkAAMFsA79HGnctBp9YgAE+mg1A9xNLOiybVyWADMwXm1H6mANRDzVblfCr2qE5uVOzFYpCVY9fy69lDdHJOgrI6HZ7FFIH1OxNDqFAf2t7fepFEHBOcmj/AIQeDVeImSGWFq2k/a/GDdjBJ8Zxiz0sONevcuJKRZetYqdfw/rKwVZAw2yyqXjKMQSdv2HgnYDbHn7QJ2LRsrDm1wTVYYVdgj+DZqyKIi7g8RpgRWDdVS4Fbl8XWD9+SOpS8I+5DjFn9Otq5CrqUCsWQgFiSD22rD/cPB0f3GtAQs3aNQl0hNXgX98kkBTfxeRnHUlp+7LQJtGAydoK3Yqq+x5HjPPUlqXrfxZ6aSSZWiymIFZfeVWAYHsrgspI2SwB6+QVA0N/QLaDUO1GNrvgWBkWLoFTxxZPJo+Thr4VLOkgtlN025sZI2ZIWjVEEYvHHTd83+4DgOOoXZ7HIMZAI4XZmmtqkcSoNDtI/QKo/u2i+QECdW0Afpe1ap3WoXJODtQvbGgRgY93tpiNtmwKPQer7zpY4nLTRqALJLhVBX20WI9oABoYAIrAsimj7j/Wt/VXP16ONlki4rinszVUcSRy5G326DIzxFlKQsjsKVbrsIv6idDNMqQ6x9M9qj0Ss86VqnjvG1hCl2VBzbkYcqao0DeTiP1b3qbubbNPIV0qSZJBDTSbgtkA7Ag5Qb7N7if6TG3F0Yrlisb1jUM0rRhIwRIQqbIDDsBs9dEr42B1A2fqxSmmtqKhfaMg+fNHir83XJIHVXhjQA7F9MHBs7rarsV424sAfPkdTF+yzEy437r/AEXWL86A9W+Ae2zq3uH3ORUfZTbaLFANPpf7ip2p6kiapg8E9AioTtzyAGY5/wDDZ5yBRu669kXbG5bPtHGM+7P848cgDPHWvipMfyD7KCKNkHhSGUhTseN72PkbHTyBsbqKHcgQXasbyKPuBzz4o1nnOb6HclH9SxtcA1ROAc82QauvgDAJvo3sMzxhY1LBoEmkIBIADEb7ADXZh1+BvYHx5DboWkjCj9aqW8DdVE5rNqauz8cjpRcASj9RQ0MYojis8cWaAxY8AJEzSe2rkq/bWvgqGIGzvr878jXggEeDv6HmTaxwaxX3NA1zYx818HnouJjtyM7RjzmqPNfOPGLqr6GWJAs8Fdh1ZpCdjbdSEfuvYDYLAA6/5+PA16rqwIJPvayTYxfjFkHORdnJxfTe0qbq8Ys8gZ+f5zX/AC6HrIwkXQbyq6B15VANnfnz/k78+fkgfSnIVwTlGUAHItRQBxkHwAaJyDg315sR0NgDNmrobs1kYyeKzV4vAeWdFA2CzMexY/BGteNDWh4AGvH+f2+lMGkr0yQVsMQDZ3GwORigDzVk4568tVFWoHAFjFeL85s3x4HFDLIMjisWJielGKV2cu4VIjIT+RVW0PyYgnRG2860ARbA6oCy8nHjGbwKFfcknHAuupMI8mMrYs5BJAoeaF55qvsQa64Lj8fcytfJWLyy2o67LUUuoURsY3DKgYg/lo/2nsdH9vpaKs2Wcqy3WLwfgiv2oZ+fnposYVIJDKcmsWcY8/bz8/v12uWXjl9tJwhIIUKVZnJ8A/kCQRo/Gj/k+NfX1hPaylqI92aAonwwJyfjxZ5BCgu8WHZQx/TtBFih5OP3NnNH5BVbsRxPEzwNK0ZV1ZYhIFKeAA7LpT4A0Suzs7H7shj9yDftrNEm65GL8k1k5rL/ADXt3Hg2B/qOSD9jwT1K701w2dxvoB6UnkeMmw+VXC52KClZnjtSHjFfnHKq3Bbyy10EaQ5fg1XjeYq1zuajTyEFK1LPcrTSnI+/SxSd/wC6CF1aMalWZguBO2ngOrjDe7MWr9aMlrOLAqut3+lVm/6udrWVSsjaQbULbmbT/mNR+VaxyG0phdFAHpxuqGmFFM5DidfkIYGsPcA7AdQwLIFAEhKtpiNAMF/yxGz+IcWpaCVmLEoNygCgTfBviheRgbuOj5Iw5NgEk87Tuq8ge6rPGQReDi+kK/pDjMmzUL1dFb3Gj79W9xTs6KgR+NovjsSpI6jX7m/2k8QDxsCGr2ngAWODeKzzYP8Ahuile3xTBYirFtoQtS2LPk1QNYvacXjm0tlftIkkdpcXlJ4PefcTbeN0JP4qohaIdvj8+pOyTvQCkuDv4ohkDEGicVV82bH3K5J8YyI2f6fJJ2SNdEYLNkXml2/xhbA8E2Osf22QcVxc13knJuSZmzI5r0cNXzF6lVaRwRCj/pJUtHrIy9/atKhKhfyZmCuP315pBFBFBEB+uQxIxCDkgvYBIHkcVWemU7BCiNJPJLKFql3sq7qG26CsfduNFjir87kT608Gpcf9Ks3icZjayW5kpGRoYYxPZvDI0LQV7DIHdpJK6xxLM4VUCqZAF2pfZda03dYZppH9PcwUsxIRPRaNiExXtJJoUAP0nA6E7/oFj7HrUghT1WRaCqiu8iyLIiB6H6mQD3GrosfIrZyk8st0CSOxA0AMUqzArNDLGAkqTIVEkUiMjRyLIoZXVgfKsBp+lCWGU2rLvVrBVkYBlKkFhRBBw1fYCrxDUO7MyOjIUIUpIDvV1ABD3RLA3YKoQRRFjovjNupZgWmWaEbm94/kyyHyXAUqdHqpJ3pdEj5JWQEULoWJbcCPIyLAIuiKq8A2QKweo19TKrAbVAFhuQcXkDd7gaoH4AzzUxvs150Z/um+3HAzQFruR9bPTmr+sCMEIscrxnV5G2Q2lUjZ+SW2RsaC1MH/AA07Ajb6Mlhv/A9n73ur4FDByenTJvSm3bmUGqxX9JNC8E/IGBjrYzXxcqzEOQR7RKdfjQKly522z2IP4gAKGOvy39VHYqsdtAEfuePHj/fplzIaVlqyWWiCfuD9h44qsnHXdDKTfKtsJSKxA9d7ZijeBvfhi40CO66BB2QhY9rbgx8+2hVEkjNc5P8A7X16W/VgKf6hRzZHB+TjJFcdBoPdlsw2AP8AySRsRvXTbDY2RoADYOh+xG9kEizqS5FgAE1m7/Sv3N2eft8cPwMFVhkmkv4FgcC6x588+OBlqCT9VXJLMwl93sdkEfmreSd6A8gE62f7j514IHV0HtzQsAgCqIuzjx55+xy8JFYHHFi7wDxRwTkkcc/bHQ1lnLxdfIVZGBOwNFeut6352SDo+ASdFfpckcjER0GABKk0KG4fbnA8/eh0kMgVib920A0LuxfxmhXFV4vaOuZYQSdZFj2Y10CUJGmIbewT/wDXXhT5O9+Pr3TKRvFsDYBPK4sY8fA+RRx0POcgAA8nzYFkZ4x8ZPnrKrn6FXLTmkUE0IfcY/BSZQOw/JlGuvUAed7/AAIXevq1SpGXKKofzbHCuCRi74s5+PnkTEZZFDE0SDd0RRPAGTzk1xnm667jA46GFCzgTpCPbHu/kAigMqkAKSdDwTsjYC/RKRgJQb34AoAkfPOc/Jxz5Bth2LMBRoki8cmrwT4+Of8APAHGiMe7LkAFsI7JGoDABAx6lUJLeV69z5JJ860SUDY+71GBAYCywAIFgsDdUCQDR8mx56WCwVdpYWMkgKecfq20LBAOLqheLWHp76a899YOWRcN9PcDbzmZt9ELos5x+JhlL9s1yG/HDNHhcDTSKaa5kbSqgiqypWSxZMVeULW63t/bYDq9bKungQEqHJEkxBsR6eNyjTSm/wDs1HtB3SenGrODtDpdd3HULpdFE88zMoYC9kKuDUmocArFFSsQz5egsQeR0R7NPXbjdPCZOvgcJJO2D43j8ZxrCm0GaRsXg6UeOoh5Fb2/e/TVlLSKW9xnkP7s31g8EsszS6iYJvnkkmkKDaN8j73IRQF5ZRYFnLE2SOujoUXSQ6eCJCkcEK6dcKDti/ugSSA7EhLYt5NUoCgsnx3GA23SZEBIAMTAdfCkkEgEDQ0QQfOxonW/pxyDivdZzecC8k/azkijz0qTazKY8g0pajktgAX8Hmv3rwRljBQLlO5rxo6OVZU223OtOrOzL1Y68ADrrYHgfSWZglBsUDZ/pGbANH4/yHHHTkFqxCqNyge8g7gTYNDwaFG/jFeFN0kRUUxxkfOyGQjrGWHkuQSOzMNMNH4AB2fIRSKQb3MSbIwCSeD/ACR5GeiJ32OxJBHp7dwWzuwaJ422RZObtukZm6AtXcY8iA9Zy0ngyosYTuzKCejMrAHRKqS5UEDx9P7mXfRA3gKMc5F3/mftijmrDlVjFGR7l5CnGclj82L+3HFiuo4+s+IGW4xmFSs8v/uEJPkOkkcqSRMB0baJ1LnajrretMfqW7VIY54gWrFVixhgSAcWCxGSQR/pC9zVpNHIgXeGKmhe61O6xRB3Up22avJ46Qdr7T+KetOLpZytlrnFM9drVEzOSxlOpfr32r11q/qcniZnqM9xOkQS9BepSPB7guQ3pWryVZLTfVmv7I00DRRanTB2MUbu0UkQclgkU6hyIrJJidJBZsMp3boHW/R2h736er3yafUyrGZ3SOOSOQou1Xk08hiUy7ceojRg0N4ZiskTxfb/APwc5vVbnNzhnHfuP4ji81lOJ8kyPA6/O/TjOY7Hcg5Zh8dYy1XiOZyWB5NyKfA0MhjK1yWzyfH4rkt6u1Qw0eFZF5AhuX0j9XQfU3dD2eaE9v1csE82mB1DamDUPpY21EiA+lA8Tfl4ppQAs9rE1KSQRnv159LH6N7Q/wBRK/8Aa/btPqdHBro0g/K6vRQavUJBHME3zxTEamSDThTJCjST1viTaeiLgP2MetX2r/dr9uFr1Q9NIP5Bf9XeKNg+d8Ut0OY8Gt2f5nfXGSpmMaHs4Gzbt4q3NhqfLcZxvMXmx1izRoyNTmevde5aTU6TSzGVWZDGW9VCrIQfDHlCwwPUCNQ4FUc30Pfuz92haPRalROyqfy0qtDql3kLQVrikUNVtp3kjjG0XtKM+kvIYfN8dsPjc9iclh8gteC2amTpWKNyKtcrxWIZZa1uOKaNZa5jkUSRgqQ0bKsqMi02aN4GZJFZHJU7SjA0wJWweALo3QFVgggE+oH9wIKq7FgM04PpspIH+RBogkgkC+iGaVP6bRsQjVVkbW9sVMhKkkgaPXe9eSf+QCycA45OfsDyf/fi+Qc36wqqxuAahnNtX+RH+xroNSupsDye3Tw2wVHx5+NEsOx//ltkj4Af2udxZVLkjgUScqBkZ55INDoyOOlX/EQu/gUfH74P3/8AU4lcS265dm2ok0OoLFdflG37gMSNEDwCpGiR9P8AqM0kY2lR4s1djkCqyMgfF/z68dxvRwu3I+5Ygiro+xvnIrz0admV4SNP+OlXsCTsnQOz4IBAII2CB+2/p+q23RNgWLFk455q6weTXFdN3aEBqKgEtXNDNV45vkYxddF93v8AqiGLKFQqSSC4YMNKT+XgAtvwB4H02P7pmjYMCpuhfJsmqJwCSDnwDwR0oxmRVK7T+48fNWKs3g5/16y+fav9rH3u/ex/qdfte9GLvqJV4JdxMHLuSZDmPp1wLCYG3mEt2sfTkyvqRzPiEWYuyQU57NnGcXGbyeMrPTuZOlSq5DHy2rbD22actLBb1QO54kUEg37ncBiKJpbJUEcAnqR1XcNJotizyRxs9lFZWbeoFsSFUiMA2F3n3iyAACOrHvUr+Bf96fBvR7j/AKhY71M9JvUH1kzHL4MDd9COL51cJRxGGux1RHmh6zc/yvEOIW+R1b1l1vcQlwmNxj4yNLPGub8qz13HcXtPanSjSxwu86FpZo4jtdQqNIyxx75D7beRlQkA00iA4LuoEXdI9Tq30q6cgx6eXUKaLNIIkMzqIkRttQpJLZk3bVCCMSOim1P0/wD4K32ueiHopyoevE+T+6H1zzXHvbl5PT5Dzr0x4JwDKiq0taH07wHEOVYfJ5oUuRPjZMjyrnN3KT8lw2IWOrxjiOLzfI+N5Wxar6eEXaO6CBmfuz9v1f5OcFv7jWjSynSmNGtHqdUBM6SKLojZujagJ9fxyfUnZd6CPsY7t24dzjCi5e3vqIItcZXRUn2jTvNIRA0KEJ6mz1kjeNpuK3eCenvF7HFfTfi/HuG8fszrduwYCjXqG/bZEia5kpgps5S10jggFzKWLFpa0VeCKaKtGIRx7J3PUa2cTaqefWTMqrv1Ds7RRqv6IgT/AHSUxb01CqWO8ruJPXccHbINCno6TS6fSxKXYx6aMxB3sgs+za0j0oO9yxLKoO5Qo6iV6u1lyd2Swn5o9ydmIB0AzkhgD0D6LMNhG2QA7N3DGU07KEYAg8KDgbcC7xkkgElra7rAoe2SbPuJjSryTVg35o0LF/JABOWSq1lo2dyMCJh+DdgHjO/bPcgggsG6A6KhQmwFcsfWAJFfq2k/FNfgE2cEeMn/AFdSW2UsChF4IpSa22BihjdecljhcAdMgeeKSVVdQBHNJ2CqV2SrkbGip0p2CdFlAOyQO0gd3hJK5VjQzZZVI80KN8fJJ6MhJYlg21qyKwbRTYIu1O4qTgncM9dLpWCIdnHUd3Xbdz4Kgr7nhux7b8l/IPnSgEnTjfZClQaAB8ADJxY8Z4//ANH3VR7UULTAsbIyeAtNzQtc3R5wOekxb1MzsPhUmO10XUlSqnYKqVA0wCgHSk6b8SPSKbDbsljYsjFkVgg0DsGCSKoeESe1CtgbAqn4DVTMpsWCCRZugDVHhAzYAcgwuYgCh5w0yOpT82RgVkXX922ViAANuGYbP5aJikEcyMCaDBvOEv55Nj5OfkXRBlBeF0vkEDAoXnJsc5Gfmv2VHpJjpMIRSaNoxFMqyAkL3/Ng/wCIXQJ34B2eiMCTtth90YSbnWhdsCACAosK2R4AAxVk556Ro1KLtY7aBAF3Q9pBO4GwxrA81fjqwP0EqTN6uenFelK9S03I6tyCWJpQ8UWOgs5KYr7RR1Vq9KdH+V6djKDCsmy/w8hfU/XX0yqEho9ZJOze4MYtFotVrZ13KQR6kUEiN/QUZg4277p34rzpo/wx+s5ZVBR+2rpFsizqe463Rdv0zgNaF4tTqInj9pO9VEdSlGV3fvYOax/21+unJsLksngcjxnFj1E45k8PZnr2qWZ4jzjlfJuO2qtqtapWaAoWatuWKetZjnpCzWlpSt7SVn6n7qvr9s1sDi2l0rKA6oUKldY8ZZD7Tt2o0YIIUqDRBscJfSmofSfU3YdRGWVo+76BSYXMLbHniRwJ4yHVnWVlNEFtzk/razrG5jnHPPSv7N7UecvfzDkXpPw3LclmnkNxsnVn4JxkZGvaNmFkMjZTOVry2URZYjDKsVhfcnLZ5oIGn7b25NRI0rrooT6jAMWdkhUsZaGZGbJJIJLElsySbp3eWMfUf1GVQQwp3TXxJDD+hUj1U8aCiSKHpDa1gDfe1AdnXDFchgsgUrRSrl6mTyGIuVJOsQFrFWbWNnkrq09gNUsz12sUozPJN+nmr++onDqK6O7dvfXantv5qJdZppWhaCU+kzMGXYYy5p1kDrsKBmLH9Aptsoexd2h7fpu6nRySaHVaePUJqoNuojijeyfW9O3gMQDbzIgQMACQCpJ9T6fqrSuvhjEw8nSDtoAeSd91O/OvyK78eUS2Xeyf14vnBAz96ujzVDoeMDYhHlFJvk0oAP8Alz0pox7qVZmVQ8UZHuaH5FliZSRr9j5I878aA8/RUduwLH9DN9uBj/TH/wAoNk4fItwmBf8ASXFmjz7ibP8AkeuskrRSQPHvav3cE/iwUN8+NrvQ8b35H7efpySVoyrAD2sCR85Yf8hx8n+G1o71OABtAHm6JPzdX/F889AJ5VknMbMDIFMhDHQVC2lKnak9iTvZOyp8/wCGBI25rG58ELuyEYsQbya4AvOP3HToJVQAABYAN3wOCK5x8AfYX1O7iHKeC+itTEcY9G/SziHpP6d4nMVMnf43wbj2OwMd1I6dahdyeQkqQV2ymflw9etUsZ/MW8jlb0ECJbyEmhLFSuz/AIi6mL6g7edTIdL2qWT8trFcs8MUE6r/AMRJLbEHTyLDPK5YsYoyGIO4NpvfPoWHWfT/AHCLT1qO7rANRoVRRvfUwkSLCqYB9aL1dPHCVVBJKjja1bJLclwWJ5Dj81gY2eXE8nxMgWQEyKIsistrFZKJXkV4Z6sht1TPGnVYf5BF21GI16Imhj1ME2nZQKiZCGAZgkpCKCM/9i5ZWBH+FbslTzwNXOp0+t08xin08sbRFSpIkiKsjowH6kqNwQbpXYe6iWiuZXI5Pj1fH5mR/wBWtWzx3MN2lQvcxrtgchZiZo42c2LFdLtadUTaMsyARzAratBqnl00EkhBkSOP1KIBE8YO9lsblUMszEEWWCsCKW8l7xp44ddrYY4ysDTzpArHcywSPcKsSDuIidFd6ALgnKHd1Q5yET4fk/KcPKkcUuM5JnsTMK6fpq4/l2Xu0p1rQr+MNcmuRBCmhHEUjB6oCeMfqftMXa/qbvOhgRI4NP3HUnTwjCx6aZzqtGi+0Ui6aZFj4fYBa7q6/Rr6G71L9Q/Rn0v3XUy+tqtX2TQ/m5XIYy6/TxHR62WR8e99dpdQXoH3/Ng9ILkWOlyCF4kMi6YPvzpS2wybGoyx2Wbem+GLN1YMRuQjkH2iitjKmqII+A11jjOLrqwMhLhFUAn2kHCscmx4rn4o+Oma5LiLWPMZaFgHWMr2AJALaG9AFdEs3Yj8kI6kMNhcU4e0YKSikHmmJFUt88ZwBjyCenCjMEEh2sFJB8kUD4zYB4rkEfboFBGdqrqAvTQLsVUSdSSq7/E9gCVPkhgNuD1Ban2l0UEg4FqDfH7g1XJon9WOjtOhRGNXdBEJNDaoUhbFgWNxJ2n3YHSN5HZsRkwwCRmVnIj8jqo6u0aKFHVWZhqTfk/jsr1H1IaZlK+9iwwoKgFseTZFDyM3ef2H1LtuKu1gKSBdkF7sE4B+ME4NkDnoxjp6oDv5msESSglj27k7HbsQdKH6jxoKWIUMOo7uVY17huKJWQTVAeRXN83YAtj0+GJgJX43LZwQNoo1fAYFsAXQBJJov4bUdcxapMp1LI0etFgNv28b/IAsy/3Agg+dj5XLlVZaVh8giqAWift5zVYF8dCKVDVv9rBme6XBFqRRJyM8V4O3p4K/EWx1qGzHFoSOQzdPP4HsGJP77b5K+CPOtLsaRy6bFC2Rb5IARs0Lyb4Axmjm+hlZBIQpsWdtn4Hkea/iqsfHU2vtQxgt+rAtsxMeE4tmrpICuPckFLHq5kYERe21twAo7nRG+gIk0L8I9EifUur1J/Xpu0az0Rt9wl1Eumi2mxgHTvqAAvuZiWJWMNuwv/pCa51+h9DoVO4dx+odCmoBc0NPo9NrtcpVQ1EjVwaUncrKEb2qHqQDv4mec/0j9mvqlXhnapb5zS456boUZWknq8puUMZcjCMPb/pUeU5m04I2yQmbs3RBDuX1Pqxou0dzmIUyRaTUgGrVZRpV0kQo4J9dHagDZLKMkVzT+HXbm7r9c/SehIZkPd9HqZVAPuh0Uo7hMNwN+6HT5thSmjt34lPwTh1anwn0VqLGKycY9B8NTij200cKHE8GikcyMWDBBjjDGzf1HEkmm6Suz1PQQxppYIkz+X08sKnbsG1JCiijRDGOOIEEAl93tBUXf5tS2p1vctS9mTVdz1c7YFh5dVqJaoEf/qSCxwMhWACiOHqhjaOP9VeeYeIkvUzUNlyiBFMuUxWNyzr0LlgzNfJPUKQ/khewI5y+v1/L/V3e0QgAvoJSLwHm7Zop5LXNkmU3ZKkfAO0dT/hsX1P0L9OzSZBh7hHeLC6bvHcdJEAwC0iJp1XABUhh7iCT6w/8zhUvJXsz1mKAShTJKiIwb+5fyYeGbsvZlDaCFuy/QPbPq/u3bwFeQayGxceqLzFQtYWQsZVBBY1vaNWK2jFL6X3n6I7J3Il1QaLUkNU2kAh3M4oepBsMLhSBfsVyLAnQuSHASeN445I5F9ti0hGyCgKLpRGwjfQ8MSqa6jbBSev1ova/rHtPcZAry/2dIyp/dahxsZrt9sw9p22SDIsLG/avgZf3X6H712xTJHD/AGjAoJMmkBaVQuVaTTks5aslIWmVL22BTtyM6l+6Ojq+m7AghQwBVdgaJ/u6+T4K+daP1aiVkJZHDgqrrR3LTAjFfIurrABGDmlshUyIyMGDspVgUa0IVrDAEEHBBAINA56501VyzSJ7kxVSX1siIH+mhJPnqDvYOtkn99loe1iEBLEAknyB4oA5Fi8c3/KlW75Aux5Gef8A5/yrp2sx6r27ePOMycUcw9px7oHR2JU67FuyKpOhv2069SQCpIfnKbWyTIUlJYHcCyAAm6UUij3WWFbQw3tYFMQOpoO1JDLviLjdwu7eAVPIBN38C+L8V1KP0F5/e5rwPil0WCt3G5bkXp9lVsSEPWsRTSX8FZYh555FTJ0MTFAzkWJak0kj9JJnT66z+je8t336e7Nr2VxM2m/Ja0OQ3/Fw79NqZqse2ebSjVx+9nTT6pVJ3gg8lfWnYl7B9V987WQo07zpr9EEUBV0OuQamGLxTQRTtpZDSr62nLKu1lPSn5RHWr8jyArSloM7Ux/JK0DSN2FmzBXwuQMUbE+zWilqcdmswxrEq27k0sgE1iT3b/2uWMNqVYspdkmjA3EmgwlPtulVTHuv2f3j0DbgYx9S6crLpyEH6Hhks17i5MZsjO4llOSaQKSFx1T59xfEI8L9wfKv0wLVeWUeO8ygg/p+zXfKY9sHcjjKdvwtZLjlzJyOAS1nIWXXfbf1h/4taOOH6i0uujjRU1vboiSo2tLLpZZEcnAV29Bo4QWAKRxxKNoVb6i/6Pfc5p/o3uHbpJS57R3vUppod4b0tJ3CDT6rYgq1V9S2tlFkgySTEEHd13wXAobNaPtF2DKryhxoSPvr+TkaO+uwpJH7keNHL3JYbdtKKYDAxeb+a8X9gaHW6BvevJYkNuBr+LwAeOfPm+G29XeG0VqKYUBCdF9xvBQr+BTYGgob8TGxG2GiVdQPodCqDfHZsv5GHIJUfJFFa/fGepONTKTuxIKA+dpA9wHgAUSMg0COTUWb+N/SGMupKh2DFSR2XoSgjB3+Mb6Ib57bOjoEPEl7Y8qoAXyoOST8Ej45Hnx0XoyzHaws+47myTQPijlvOeRzzbc5Rz7zEg7ZdliD2Kx+4nzoEkdfkdgZCCVbWvo6IiOPIGSAMAnIxx+4JNYJ/cdCTwf3zYIBJZVuxiNS1mrouxJ+3HmjCiss8cEXzoaHkb+DH8EkBl0wZixX8gnk7P0MctliArMa4r2gis1zdm/t0+i0IgKUA1RBPtqgKAxdHdd+4EDOS6fp5xJZM2srw7dujbdCG2wBDDY/2p3J35Y+FACjbDSuzsN3sRjV37hjnOdw88+RV101KFFuy+5gFJINLjcQLPmxQAvi8UepQWOKV2runRRI0YHVepk0Ao91Nedr4B1pj/b5B+ko5oYrYcmzlR7aNGq3BjfNUPFmJkAVrU83QHCji9x4/wAs+R1I77UOINQX1F5CwlaUy47jlZCojSMVK8+QuuX7bd53v41de3H+nWBD3m/VkQ73+D+h3aTvevYgHVavQaCNSKUJpYtRPOd7GyXXWw7gtFBGKLB39PlX/pHdy/4z6V7YoUDT6Pu3dpWBJZvzMuk0mmGw0qhDodawayZfUYUgjHqxV/i33mb0z9EuNd3apyP1yRbq+3DKZYcLw/nmWjV9tHJsXcNihGigxyNX6SHRLC0fiDIkXYIhd/ntf2+BkGTs1OobUFWyCLN2xuwORRHVT/AnRif64k1YVTJ2X6e773GJjY96aeLQkjahAoasC7BBcYzfVodKADHYiKsU6Y70ulqq3URQq9l8dBUjC9wNk05I440JkZvxVgzAMOlbGIHtEZyBeDbqMg8qeMAkm7zbmkHqNI90GkEhVmAoe2RycVf96bxwSCKx1DH1PvVbHrb6nT1/6rJnaVaQiEqP1NHj2FrWUCqGI9u1FNECUPdoiwZ+oX65k/ERSfrPveRRft5ALE2f7H7dZGaNfpvjB89de/him36A+nAynK93YMTZpvqLvBLXki73ZO488VXSpy/LVo1jgZApXYCL0I/uIc9eshBGxoN4IBbvp/qnpIVAAsGypFqfnOfBPj5Pm76t8mnikJLpjcRZN84FE/sLIAIyKsjoiv57JV7dWw69qs9gxNKnbpXmKsV94KA5Q/0gRv8Ap9mZihIRlmRDtX9LYAtUsAHFEkZYkrfIHAArp6PTuRIEWwEsxkKS+BZHO4gkkBSKWibK31w5BlMziFjyeKhS1pVOQwzTGBLkagP7uNclhUyClkAZhJXsDvBYiMpimq2rsH1Rqe1SLDOzajSswR4mc3GCw90TEMY3AskgOrjBQtTpRvqb6O0He42m06pptcV9SPURqC0jZuPVKF9TUQnbYKt6qH3pJsV45FHw/nOE5TTmuYa2J3gk/TZDG2ENXLYeynxUy2ODPPSmKgtAxD1bUQM1OzZrhJW1vQ6+LWRDU6ZlkVxWbBUXYDgcP5OSCCCCRnrCO6dr1nadQ2l1cTQyAgh6LRTLRqSCQqoeNjYGQ6bdsiK4ZVTg5XFLZ92Ry7FZCVCBkDMA2t99+B0YMEBkbrrX5BucREu7cQbILWcAgZwBdkc5Nkiyc111oYhF+peFULTE4GDjFbuCb4JA4HUwPtX5bHk+O81pVwobCc04fyCf2w6IsiZSnahZNNE4mWOhIxCrJHIPZEnfcqN0h+FeoL/TLoTaaXvOpQli1FlXQavjAG71DuokbQAaZj1yx+MUH5f600jEkjWdkgnN1dq2s0oFmrW9MFpzuCoCoKgDqT3MH93IYfIxM6yY/P8ALeOlG7RKuNlvNyeEGNSEZkPF8YK8ZDLFBasRp1DSdtg0LFdbGR+p21UMhUn3JNAzFipWiQ8cYs+4bnAzg4B9SKHgdj+pfy7IxWyrP6e4lx7lVi5JAIBYqRfiCP3YcYalzDg3NkQLSGAyvG81KTG3V8TlK1zj8bKSQFEWSzahiz9S6bbtKHelfi1ovzHau1a4D26PWSaUsQuE7hpw7WSu5S0mk0ygmlJBT9W0nSf+jx3Q6b6h+oOzMQB3PtUOs9xJZp+zap4l2CwCh0/c5WYFR+kFsA7mjxvPaaKVjT2leIKPz2B7ZDP+BCKRpW2PhuqroAj6waSNBEx9wI9vtIrBya5HOfHg3kDrFcPk7rsndY4quCSK4+4sWBkN7zfKjPEp7ikM6gopBbuoPwp/FYyCHJ+D/d419DRq8pYN/hIyfKn2mhwduAfdZ5B56lIZNlUbJJJY4sUuMfcULNAAfNBgs3xztDKziNVTtJGVYNJ31shQDoofx7psq34eAOw+lxqVqwTtvcMWVogggkX42gHHkgEWdFLbB4wQ15s0psgWtk8WSccX+/TG2KBkeXv17EvtkA2SpJ+Ou/lifyZgA3wWOvpaahVWsFjQC/4RXNeCf6lwozk8dHhL95oUpOa91iqB5sHjyeMdK3inFzaQ2EOpI5wCpYgsi9mbTBCCEPYgAiPZUtsqOi69RCeFP6hQG4DcCq3zwOaG3J/UegZHWPagLGmJ3D3Mt5psYu/8WaJI6kVxOjHi5O/QhiiqApUaZOwLOe3YbIUADYLMCdAHQhjWiATZJBFDG26qiLAqhdEjNnoCeYEYK4BvcSTnFKKOQbrdRHnPS0vcheAIVbswDdkCFvwUuzMEBcn+wAj4PnSkeSSsarGSUF7QS1k1eQCp2gjNi6zk+OowM7OwNEe3buIAPPkizVf8scie3241a8fpbDk1kdzyDk2WyTh4+nSKu9LGhQQ8jlCcE8wkMSPuZkClfzl6X/DHRDT/AEjo9QxI/PavuGrAChdqwSTdvRQorcrHSlt7GyzOi2gEh4t/HTWDWfiFqtKoTb2rtXaO2vtcMS+oU95Ja6PqIO4iMohNIAWZf09VufxN45s/yz7Z+J49DZyEXK8xyCvVXZ9+1lLEHGaKqArRtZL8uheEFuz+5MAAm9D/AIiyGfTdm0kZAkk772tdpsWmkhKTEvdbQ9AAbizXjqV/AQpou9fWXcZnUafSfRHeFmfaKT81qINTH/S1bl0MxYlSoCgsCPabXTCYpDBGWcyT+m+KcRlEISXl9a1drtLGWYhMdaV5a7u3vVZUEp1NtvIkZonZuA8VgVR2UxqjZwwN4XIIogjoXReyKXeCCul1ZAOc/l2VQGIPutKUUTvrHA6rj51M8Xqp6jMs7SN/q/Myr2lDNr9dMpVdHQ9qNfbTqxZVVUdyE0eXfrRt/wBU98e/aurWMjDbPS08UIBwoxsAJUZzYs9di/h8gj+ivpqDaFb8i8hIJAIn1M+p3ZJORMCWwPNKOulHKQFVaXQIGvbeMMGV1c6OxplLsR0HgjRZQWANWVd0gwLQsFAJoBxS4IGCQAM0KyMHq3upJbYKOCaO0jaykkEcHkggH44PSgGSjkjVDHC4jIKRydHKGGNAjRq7MB/tePaM34ICyn8meKxgAZJFCqJAznhuB+3ij02sbx7gS49RSWIYhveSMlSAST+ogBWU1kYHzIk3K7gJr24igbqCCdhSwI1tiR1lRW6qg/ZfLKRAXLFroFwoAJVbUVtGDWSxJsfGCQLKAgOwMADi8UTYsci/NE8sfgkxH5xHmaOZOSwOYyPHcoBLQlyeLMcN6ehK6TPSnlkSYS13sVoZ1UjcbwgBvL7sHau4ajQMz6dyu6PYVu1BDAt7TYBtVogf4uL90N3Ps+h7rCkOtgGoWKX1FOQwfay4IKkCm93uIZiL/SOns7ipBZk/MhY5pG6v52schbQIA2WcDsfJUeQCBqsC7UXX9I8+dp+Bm/vXjPVsnYvYs0NqgYwCKP3vN3d9Tw+w6tHmOCc5tmOKNpvUXH1n7CQl460fHbTIxSRWVJA8oAVvxeRn8rpB0l+FunVfpg4B9Xueqle79wB0UZDXYvbEVAoqAQ1Bg27k78YXeT62hjZi35fsmijXdVEPJrZBwOA01m7JthYG2pKeqtuehjuR2YCpfF+rPppFCHB1DU5dkeCYHMJBo7WR6nKcvNESVUTz9WJi2DpiSGLUCRSw26mEkAi/eyXRrGCykUAwJJyT1ineNOH0rIxstoZZjgUTB+ZKggV5gAwKChCBuBPUfvX+Ns76NchawUE9LGJm45+oZ4ZsdSkzj/p+4kAa3LgzSn31L071rb95PBH1xok1n0t3mBiFOn07yxOFFxv22Ya1NpGT6iQrp3Jr+6eRc3u6G/CvuUvbPr/6Z1UVt+a17dt1CFiqyw92gn7cSwTbfoyTpq0S9nraeE1tDI1VuN5JYtKoWIBtFezNobUFe3VVPk+C2iASDoKST9cuEspokNZrjFMM/wDt8HPXe5Rbs88/Izng/ANfP+/RvZvzyNGe3VgHkPUnywPU6+NbJYgkE6Yjx+7SgIwIAtnF3nCtnzzmx4voyNCCwJBAsAUD5NeB/wDPB682pffqOZRv3G6b8bAYHZBI3/t0F31KgBtknQbzKsjHa3tZgKIBwCRn7ECvBzuvo+JRQIwSCcYo7iDQ4ojkVWLFHpEtx+uZIthSHLE7B2OpBGiQTtgT5/2nzp/oetzgbmAwxzZNsLB4vJHPI+PJ/rAK/tvaAfgEkAjAOAMfNm7B6UmHqw49J4Y12JSAN66poNpgpB2yjfUnQ8LseD9FiYEJGAckrk/povkHyT9xx+3QUg9Vkdgo2jc1DJJFUPFAChfyT9ulXWZoYZJezfB8g/ntELMx/ZifJ/bZ1saJ+kqCWXdXjgnPzeRz4qv456j9UqbjQIBonPgkivgeaoDx4wEzlMlb9qUBx1C9m2AG2RslSAP9vZepJUg+R/h9jmiWNyKh4UFbA4Gbo83d5u+mkhSwRdFbF/c1kGx48H+erWPRlpKPotw8hy8kfFmu+6dszTDGQTlishkUdpJS3UDooPVAoX8us/pWMaf6W7DAtEf2R26UkggltV6E75tjQknYrRXaCVFgAD88vxBnOr+ufq3UOKZvqHucSAUNq6OaXRxYAC36OmRSQATlj7iSa7PWCmOffxF/QHiV49aHDcVk+WqjuTFYkwj17eOiEaptiMjx2nNKHZUEMksQLeD9Vr6rhMnd/pqJtrJu12rKsLojVQIu1v1blEhok4smyaq5fhvIdN9GfiJqV/VrdX9L9jBBIZYJ5O4NqTfCiSI7bUFixpqVV6t5gow1FjsKCHu8syMkwDB+/wDKsXkMdXXsyqVT2uO0ZAmnEcgbRbZZiWi9mnBY/wB5MwJoWNrOErHACIp4wvz04D/wknn2rz5JeMEn/MnA+3HVNuYyzWeRckzZQu+Y5LyHIH3fylCz5CZ0jdux6lFZEAV2VQCpL9VY8md6dp+996mahv7p3EjFkomrlRd+4t7vaTg1njrtv6ahbR/TX0/AWDGHsXaA5AABdtDC8rLQX9UrOwJAOQcHAHfqGICITGH9sAjy2vgbIKkHTjyD/wBDwCYwQgAHg5JIAvIBJGOcGhYA8V4moJ2LBiMlWYVgUHqiDZJ4ySbz+3Soxzs7RwBmDRKXDkk/I2AB5+V7FgNKzHqV6kkN7d5bJAGCBV2DyCQebzVf7kvsWr1MHcaokijdiubq8XePmh0fLNK8Z0esnZlT8j7fRYkOioUBSAwIIDaYdRpPA9Ql+LUe0Br95JHmgALrJHxwfA0kYViCFIoXyTZz5ORis8DHHTN83oqs0M85UNI2u0IIJ3GHPZHPVfLFdIddUT53oHaMXvjBNpyWJPkjBBBzVm//AFJBmJ3ApjcLIOBdsCRXyAL+/X//2Q==</field>
             <!-- Avoid auto-including this user in any default group -->
             <field name="groups_id" eval="[(5,)]"/>
             <field name="partner_id" eval="ref('base.res_partner_1')"/>
@@ -23,8 +22,7 @@
             <field name="subject">Our first company's blogpost !</field>
             <field name="model">mail.group</field>
             <field name="res_id" ref="company_news_feed"/>
-            <field name="content_subtype">html</field>
-            <field name="body_html"><![CDATA[Hello, and welcome to our company's portal !
+            <field name="body"><![CDATA[Hello, and welcome to our company's portal !
 
 Lorem ipsum <b>sit amet</b>, consectetur <em>adipiscing elit</em>. Pellentesque et quam sapien, in sagittis tellus.
 Praesent vel massa sed massa consequat egestas in tristique orci. Praesent iaculis libero et neque vehicula iaculis. Vivamus placerat tincidunt orci ac ornare. Proin ut dolor fringilla velit ultricies consequat. Maecenas sit amet ipsum non leo interdum imperdiet. Donec sapien mi.
@@ -33,27 +31,25 @@ Fusce tempus elit volutpat mi auctor adipiscing. Nam congue luctus suscipit. Sed
 
 Nulla turpis leo, rhoncus ut egestas sit amet, consectetur vitae urna. Mauris in dolor in sapien tempus vehicula.]]></field>
             <field name="type">comment</field>
-            <field name="user_id" ref="base.user_root"/>
+            <field name="author_id" ref="base.partner_root"/>
         </record>
 
         <record id="message_company_news0_comment0" model="mail.message">
             <field name="model">mail.group</field>
             <field name="res_id" ref="company_news_feed"/>
-            <field name="content_subtype">html</field>
-            <field name="body_html"><![CDATA[Great first blogpost !  (first comment)]]></field>
+            <field name="body"><![CDATA[Great first blogpost !  (first comment)]]></field>
             <field name="parent_id" ref="message_company_news0"/>
             <field name="type">comment</field>
-            <field name="user_id" ref="base.user_demo"/>
+            <field name="author_id" ref="base.res_partner_1"/>
         </record>
 
         <record id="message_company_news0_comment1" model="mail.message">
             <field name="model">mail.group</field>
             <field name="res_id" ref="company_news_feed"/>
-            <field name="content_subtype">html</field>
-            <field name="body_html"><![CDATA[Thanks !  (second comment)]]></field>
+            <field name="body"><![CDATA[Thanks !  (second comment)]]></field>
             <field name="parent_id" ref="message_company_news0"/>
             <field name="type">comment</field>
-            <field name="user_id" ref="base.user_root"/>
+            <field name="author_id" ref="base.partner_demo"/>
         </record>
 
     </data>
diff --git a/addons/portal/portal_view.xml b/addons/portal/portal_view.xml
index 831db25e26a..dd720d448ef 100644
--- a/addons/portal/portal_view.xml
+++ b/addons/portal/portal_view.xml
@@ -2,6 +2,25 @@
 <openerp>
     <data>
 
+        <!-- Top menu item -->
+        <menuitem name="Portal"
+            id="portal_menu"
+            groups="base.group_no_one,portal.group_portal_member,auth_anonymous.group_anonymous"
+            sequence="20"/>
+
+            <menuitem name="Our company" id="portal_company" parent="portal_menu" sequence="10"/>
+                <menuitem name="News" id="portal_company_news" parent="portal_company" sequence="10" action="action_news"/>
+                <menuitem name="Jobs" id="portal_jobs" parent="portal_company" sequence="20" action="action_jobs"/>
+
+            <!--
+                Create menu items that we'll leave empty for now - they'll be
+                filled up by other portal modules.
+            -->
+            <menuitem name="Orders" id="portal_orders" parent="portal_menu" sequence="20"/>
+            <menuitem name="Invoices and Payments" id="portal_invoices_payements" parent="portal_menu" sequence="30"/>
+            <menuitem name="Projects" id="portal_projects" parent="portal_menu" sequence="40"/>
+            <menuitem name="After Sale Services" id="portal_after_sales" parent="portal_menu" sequence="50"/>
+
         <!-- portal tree view -->
         <record id="portal_list_view" model="ir.ui.view">
             <field name="name">Portal List</field>
diff --git a/addons/portal/wizard/portal_wizard.py b/addons/portal/wizard/portal_wizard.py
index 0260ce338fc..85f6566eba6 100644
--- a/addons/portal/wizard/portal_wizard.py
+++ b/addons/portal/wizard/portal_wizard.py
@@ -171,7 +171,7 @@ class wizard(osv.osv_memory):
                 'url': wiz.portal_id.url or _("(missing url)"),
                 'db': cr.dbname,
             }
-            mail_message_obj = self.pool.get('mail.message')
+            mail_mail_obj = self.pool.get('mail.mail')
             dest_uids = user_obj.search(cr, ROOT_UID, login_cond)
             dest_users = user_obj.browse(cr, ROOT_UID, dest_uids)
             for dest_user in dest_users:
@@ -184,10 +184,12 @@ class wizard(osv.osv_memory):
                 email_to = dest_user.email
                 subject = _(WELCOME_EMAIL_SUBJECT) % data
                 body = _(WELCOME_EMAIL_BODY) % data
-                res = mail_message_obj.schedule_with_attach(cr, uid, email_from , [email_to], subject, body, context=context)
-                if not res:
-                    _logger.warning(
-                        'Failed to send email from %s to %s', email_from, email_to)
+                mail_id = mail_mail_obj.create(cr, uid, {
+                            'email_from': email_from ,
+                            'email_to': email_to,
+                            'subject': subject,
+                            'state': 'outgoing',
+                            'body_html': '<pre>%s</pre>' % body}, context=context)
         
         return {'type': 'ir.actions.act_window_close'}
 
diff --git a/addons/portal_claim/__openerp__.py b/addons/portal_claim/__openerp__.py
index 197227cc45f..df9f7a65c96 100644
--- a/addons/portal_claim/__openerp__.py
+++ b/addons/portal_claim/__openerp__.py
@@ -24,10 +24,10 @@
     'name': 'Portal Claim',
     'version': '0.1',
     'category': 'Tools',
-    'complexity': "easy",
+    'complexity': 'easy',
     'description': """
-This module adds claim menu and features to your portal if claim and portal are
-installed.
+This module adds claim menu and features to your portal if claim and portal are installed.
+==========================================================================================
     """,
     'author': 'OpenERP SA',
     'depends': ['crm_claim','portal'],
@@ -37,7 +37,7 @@ installed.
         'security/portal_security.xml',
     ],
     'installable': True,
-    'auto_install':True,
-    'category':'Hidden',
+    'auto_install': True,
+    'category': 'Hidden',
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/portal_crm/__openerp__.py b/addons/portal_crm/__openerp__.py
index 4fe023ccb48..81b6815b942 100644
--- a/addons/portal_crm/__openerp__.py
+++ b/addons/portal_crm/__openerp__.py
@@ -24,22 +24,17 @@
     'name': 'Portal CRM',
     'version': '0.1',
     'category': 'Tools',
-    'complexity': "easy",
+    'complexity': 'easy',
     'description': """
-This module adds a contact page (with a contact form creating a lead when
-submitted) to your portal if crm and portal are installed.
+This module adds a contact page (with a contact form creating a lead when submitted) to your portal if crm and portal are installed.
+====================================================================================================================================    
     """,
     'author': 'OpenERP SA',
     'depends': ['crm','portal'],
-    'data': [
-        'wizard/contact_view.xml',
-    ],
-    'installable': True
-,    'auto_install':True,
-    'category':'Hidden',
-    'css': [
-        'static/src/css/portal_crm.css',
-    ],
-
+    'data': ['wizard/contact_view.xml'],
+    'installable': True,
+    'auto_install': True,
+    'category': 'Hidden',
+    'css': ['static/src/css/portal_crm.css'],
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/portal_event/__openerp__.py b/addons/portal_event/__openerp__.py
index 2f5220c9f36..f97ad81efd9 100644
--- a/addons/portal_event/__openerp__.py
+++ b/addons/portal_event/__openerp__.py
@@ -24,10 +24,10 @@
     'name': 'Portal Event',
     'version': '0.1',
     'category': 'Tools',
-    'complexity': "easy",
+    'complexity': 'easy',
     'description': """
-This module adds event menu and features to your portal if event and portal are
-installed.
+This module adds event menu and features to your portal if event and portal are installed.
+==========================================================================================
     """,
     'author': 'OpenERP SA',
     'depends': ['event','portal'],
@@ -38,7 +38,7 @@ installed.
         'security/ir.model.access.csv',
     ],
     'installable': True,
-    'auto_install':True,
-    'category':'Hidden',
+    'auto_install': True,
+    'category': 'Hidden',
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/portal_event/event_view.xml b/addons/portal_event/event_view.xml
index 1dd9fee7181..675bddbc42e 100644
--- a/addons/portal_event/event_view.xml
+++ b/addons/portal_event/event_view.xml
@@ -3,7 +3,7 @@
     <data>
 
         <!-- add visibility field to the event form view -->
-        <record id="view_employee_form" model="ir.ui.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"/>
@@ -17,6 +17,5 @@
                 </xpath>
             </field>
         </record>
-
     </data>
 </openerp>
diff --git a/addons/portal_event/portal_event_view.xml b/addons/portal_event/portal_event_view.xml
old mode 100644
new mode 100755
index 8b1f21bbef0..1e046bc9e7f
--- a/addons/portal_event/portal_event_view.xml
+++ b/addons/portal_event/portal_event_view.xml
@@ -2,8 +2,22 @@
 <openerp>
     <data>
 
+        <!--
+            Override the original action to set another help field and/or
+            another context field, more suited for portal members
+        -->
+        <record model="ir.actions.act_window" id="action_event_view">
+            <field name="name">Events</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">event.event</field>
+            <field name="view_mode">kanban,calendar,tree,form,graph</field>
+            <field name="context">{"search_default_upcoming":1}</field>
+            <field name="search_view_id" ref="event.view_event_search"/>
+            <field name="help">No public events.</field>
+        </record>
+
         <menuitem name="Events" id="portal_company_events" parent="portal.portal_company"
-            action="event.action_event_view" sequence="40"/>
+            action="action_event_view" sequence="40"/>
 
     </data>
 </openerp>
diff --git a/addons/portal_hr_employees/__openerp__.py b/addons/portal_hr_employees/__openerp__.py
index ec883e78acf..7dacfa6688b 100644
--- a/addons/portal_hr_employees/__openerp__.py
+++ b/addons/portal_hr_employees/__openerp__.py
@@ -24,10 +24,10 @@
     'name': 'Portal HR employees',
     'version': '0.1',
     'category': 'Tools',
-    'complexity': "easy",
+    'complexity': 'easy',
     'description': """
-This module adds a list of employees to your portal's contact page if hr and
-portal_crm (which creates the contact page) are installed.
+This module adds a list of employees to your portal's contact page if hr and portal_crm (which creates the contact page) are installed.
+=======================================================================================================================================
     """,
     'author': 'OpenERP SA',
     'depends': ['hr','portal_crm'],
@@ -36,11 +36,8 @@ portal_crm (which creates the contact page) are installed.
         'security/ir.model.access.csv',
     ],
     'installable': True,
-    'auto_install':True,
-    'category':'Hidden',
-    'css': [
-        'static/src/css/portal_hr_employees.css',
-    ],
-
+    'auto_install': True,
+    'category': 'Hidden',
+    'css': ['static/src/css/portal_hr_employees.css'],
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/portal_hr_employees/hr_employee_view.xml b/addons/portal_hr_employees/hr_employee_view.xml
index f36e2a4d2d8..4e133061da6 100644
--- a/addons/portal_hr_employees/hr_employee_view.xml
+++ b/addons/portal_hr_employees/hr_employee_view.xml
@@ -8,12 +8,8 @@
             <field name="model">hr.employee</field>
             <field name="inherit_id" ref="hr.view_employee_form"/>
             <field name="arch" type="xml">
-                <xpath expr="//page[last()]" position="after">
-                    <page string="Portal Settings">
-                        <group>
-                            <field name="visibility"/>
-                        </group>
-                    </page>
+                <xpath expr="//field[@name='active']" position="before">
+                    <field name="visibility"/>
                 </xpath>
             </field>
         </record>
@@ -38,7 +34,7 @@
                                         </div>
                                         <div class="oe_employee_details">
                                             <h4>
-                                                <a type="edit"><field name="name"/><t t-if="record.login.raw_value"> (<field name="login"/>)</t></a>
+                                                <a type="open"><field name="name"/><t t-if="record.login.raw_value"> (<field name="login"/>)</t></a>
                                             </h4>
                                             <ul>
                                                 <li t-if="record.job_id.raw_value"><field name="job_id"/></li>
diff --git a/addons/portal_hr_employees/static/src/css/portal_hr_employees.css b/addons/portal_hr_employees/static/src/css/portal_hr_employees.css
index 351fd442f20..5fa658de8c1 100644
--- a/addons/portal_hr_employees/static/src/css/portal_hr_employees.css
+++ b/addons/portal_hr_employees/static/src/css/portal_hr_employees.css
@@ -12,3 +12,9 @@
     width: 65px;
     height: 65px;
 }
+
+.openerp .oe_employee_vignette ul, .openerp .oe_employee_vignette li {
+  margin: 0;
+  padding: 0;
+  list-style: none;
+}
diff --git a/addons/portal_project/__openerp__.py b/addons/portal_project/__openerp__.py
index 4f8774bf99e..d502d278c38 100644
--- a/addons/portal_project/__openerp__.py
+++ b/addons/portal_project/__openerp__.py
@@ -24,10 +24,10 @@
     'name': 'Portal Project',
     'version': '0.1',
     'category': 'Tools',
-    'complexity': "easy",
+    'complexity': 'easy',
     'description': """
-This module adds project menu and features (tasks) to your portal if project
-and portal are installed.
+This module adds project menu and features (tasks) to your portal if project and portal are installed.
+======================================================================================================
     """,
     'author': 'OpenERP SA',
     'depends': ['project','portal'],
@@ -37,7 +37,7 @@ and portal are installed.
         'portal_project_view.xml',
     ],
     'installable': True,
-    'auto_install':True,
-    'category':'Hidden',
+    'auto_install': True,
+    'category': 'Hidden',
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/portal_project_issue/__openerp__.py b/addons/portal_project_issue/__openerp__.py
index 17ba4b0d5aa..cef01c52364 100644
--- a/addons/portal_project_issue/__openerp__.py
+++ b/addons/portal_project_issue/__openerp__.py
@@ -24,10 +24,10 @@
     'name': 'Portal Issue',
     'version': '0.1',
     'category': 'Tools',
-    'complexity': "easy",
+    'complexity': 'easy',
     'description': """
-This module adds issue menu and features to your portal if project_issue and
-portal are installed.
+This module adds issue menu and features to your portal if project_issue and portal are installed.
+==================================================================================================
     """,
     'author': 'OpenERP SA',
     'depends': ['project_issue','portal'],
@@ -37,10 +37,8 @@ portal are installed.
         'portal_project_issue_view.xml',
     ],
     'installable': True,
-    'auto_install':True,
-    'category':'Hidden',
-    'css': [
-        'static/src/css/portal_project_issue.css',
-    ],
+    'auto_install': True,
+    'category': 'Hidden',
+    'css': ['static/src/css/portal_project_issue.css'],
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/portal_project_issue/portal_project_issue_view.xml b/addons/portal_project_issue/portal_project_issue_view.xml
index 14e944ab32e..5d0b4ce081e 100644
--- a/addons/portal_project_issue/portal_project_issue_view.xml
+++ b/addons/portal_project_issue/portal_project_issue_view.xml
@@ -18,7 +18,7 @@
                             <div class="oe_kanban_card oe_kanban_global_click">
                                 <div class="oe_kanban_content">
                                     <div>
-                                        <h1><a type="edit"><field name="name"/></a></h1>
+                                        <h1><a type="open"><field name="name"/></a></h1>
                                         <field name="partner_id"/> <br/>
                                         <field name="version_id"/>
                                     </div>
diff --git a/addons/portal_sale/__openerp__.py b/addons/portal_sale/__openerp__.py
index c6a35d7c9e6..8d7cd8b3935 100644
--- a/addons/portal_sale/__openerp__.py
+++ b/addons/portal_sale/__openerp__.py
@@ -24,20 +24,20 @@
     'name': 'Portal Sale',
     'version': '0.1',
     'category': 'Tools',
-    'complexity': "easy",
+    'complexity': 'easy',
     'description': """
-This module adds sale menu and features to your portal if sale and portal are 
-installed.
+This module adds sale menu and features to your portal if sale and portal are installed.
+========================================================================================
     """,
     'author': 'OpenERP SA',
     'depends': ['sale_stock','portal'],
     'data': [
         'security/portal_security.xml',
         'portal_sale_view.xml',
-        "security/ir.model.access.csv",
+        'security/ir.model.access.csv',
     ],
     'installable': True,
-    'auto_install':True,
-    'category':'Hidden',
+    'auto_install': True,
+    'category': 'Hidden',
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/portal_sale/portal_sale_view.xml b/addons/portal_sale/portal_sale_view.xml
index 2db0a7a4d96..5786fbc52ad 100644
--- a/addons/portal_sale/portal_sale_view.xml
+++ b/addons/portal_sale/portal_sale_view.xml
@@ -2,16 +2,39 @@
 <openerp>
     <data>
 
+        <!--
+            Override the original action to set another help field and/or
+            another context field, more suited for portal members
+        -->
+        <record id="action_order_tree5" model="ir.actions.act_window">
+            <field name="name">Quotations</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">sale.order</field>
+            <field name="view_mode">tree,form,calendar,graph</field>
+            <field name="context">{"search_default_draft":1}</field>
+            <field name="search_view_id" ref="sale.view_sales_order_filter"/>
+            <field name="help">You dont have any quotation.</field>
+        </record>
+
+        <record id="action_order_form" model="ir.actions.act_window">
+            <field name="name">Sales Orders</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">sale.order</field>
+            <field name="view_mode">tree,form,calendar,graph</field>
+            <field name="search_view_id" ref="sale.view_sales_order_filter"/>
+            <field name="context">{"search_default_sales":1}</field>
+            <field name="help">You dont have any sale order.</field>
+        </record>
+
         <record id="action_picking_tree" model="ir.actions.act_window">
             <field name="name">Delivery Orders</field>
             <field name="res_model">stock.picking.out</field>
             <field name="type">ir.actions.act_window</field>
-            <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="domain">[('type','=','out')]</field>
             <field name="context">{'default_type': 'out', 'contact_display': 'partner_address'}</field>
             <field name="search_view_id" ref="stock.view_picking_out_search"/>
-            <field name="help">This is the list of all delivery orders that have to be prepared, according to your different orders.</field>
+            <field name="help">You dont have any delivery order.</field>
         </record>
 
         <record id="product_normal_action" model="ir.actions.act_window">
@@ -22,21 +45,42 @@
             <field name="view_mode">kanban,tree,form</field>
             <field name="view_id" ref="product.product_kanban_view"/>
             <field name="search_view_id" ref="product.product_search_form_view"/>
+            <field name="help">No public products.</field>
+        </record>
+
+        <record id="action_invoice_tree1" model="ir.actions.act_window">
+            <field name="name">Customer Invoices</field>
+            <field name="res_model">account.invoice</field>
+            <field name="view_mode">tree,form,calendar,graph</field>
+            <field name="domain">[('type','=','out_invoice')]</field>
+            <field name="context">{'default_type':'out_invoice', 'type':'out_invoice', 'journal_type': 'sale'}</field>
+            <field name="search_view_id" ref="account.view_account_invoice_filter"/>
+            <field name="help">You dont have any invoice.</field>
+        </record>
+
+        <record id="action_vendor_receipt" model="ir.actions.act_window">
+            <field name="name">Customer Payment</field>
+            <field name="res_model">account.voucher</field>
+            <field name="domain">[('journal_id.type', 'in', ['bank', 'cash']), ('type','=','receipt')]</field>
+            <field name="context">{'type':'receipt'}</field>
+            <field name="search_view_id" ref="account_voucher.view_voucher_filter_customer_pay"/>
+            <field name="target">current</field>
+            <field name="help">You dont have any payment.</field>
         </record>
 
         <menuitem name="Quotations" id="portal_quotations" parent="portal.portal_orders"
-            action="sale.action_order_tree5" sequence="10"/>
+            action="action_order_tree5" sequence="10"/>
         <menuitem name="Sales Orders" id="portal_sales_orders" parent="portal.portal_orders"
-            action="sale.action_order_form" sequence="20"/>
+            action="action_order_form" sequence="20"/>
         <menuitem name="Delivery Orders" id="portal_delivery" parent="portal.portal_orders"
             action="action_picking_tree" sequence="30"/>
         <menuitem name="Products" id="portal_products" parent="portal.portal_orders"
             action="product_normal_action" sequence="40"/>
 
         <menuitem name="Invoice" id="portal_invoices" parent="portal.portal_invoices_payements"
-            action="account.action_invoice_tree1" sequence="10"/>
+            action="action_invoice_tree1" sequence="10"/>
         <menuitem name="Refund/Payments" id="portal_payments" parent="portal.portal_invoices_payements"
-            action="account_voucher.action_vendor_receipt" sequence="20"/>
+            action="action_vendor_receipt" sequence="20"/>
 
     </data>
 </openerp>
diff --git a/addons/process/__openerp__.py b/addons/process/__openerp__.py
index 657aee868b2..f0ece3704dc 100644
--- a/addons/process/__openerp__.py
+++ b/addons/process/__openerp__.py
@@ -28,22 +28,32 @@
 This module shows the basic processes involved in the selected modules and in the sequence they occur.
 ======================================================================================================
 
-Note: This applies to the modules containing modulename_process.xml.
-e.g product/process/product_process.xml.
+**Note:** This applies to the modules containing modulename_process.xml.
+
+**e.g.** product/process/product_process.xml.
 
     """,
     'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
     'depends': ['base'],
-    'init_xml': [],
-    'update_xml': [
-       'security/ir.model.access.csv',
-       'process_view.xml'
+    'data': [
+        'security/ir.model.access.csv',
+        'process_view.xml'
     ],
-    'demo_xml': [],
+    'demo': [],
     'installable': True,
     'auto_install': False,
     'certificate': '0055447636669',
     'images': ['images/process_nodes.jpeg','images/process_transitions.jpeg', 'images/processes.jpeg'],
+    'js': [
+        'static/src/js/process.js'
+    ],
+    'css': [
+        'static/src/css/process.css'
+    ],
+    'qweb': [
+        'static/src/xml/*.xml'
+    ],
+    'auto_install': True
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/process/i18n/ar.po b/addons/process/i18n/ar.po
index e5134d74525..1f8a418420e 100644
--- a/addons/process/i18n/ar.po
+++ b/addons/process/i18n/ar.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: process
 #: model:ir.model,name:process.model_process_node
diff --git a/addons/process/i18n/bg.po b/addons/process/i18n/bg.po
index 9e6f8f21bda..b4b61b81513 100644
--- a/addons/process/i18n/bg.po
+++ b/addons/process/i18n/bg.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: process
 #: model:ir.model,name:process.model_process_node
diff --git a/addons/process/i18n/bs.po b/addons/process/i18n/bs.po
index 6439f37092d..79d02bcd13a 100644
--- a/addons/process/i18n/bs.po
+++ b/addons/process/i18n/bs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: process
 #: model:ir.model,name:process.model_process_node
diff --git a/addons/process/i18n/ca.po b/addons/process/i18n/ca.po
index a1019113dab..e489bdeb340 100644
--- a/addons/process/i18n/ca.po
+++ b/addons/process/i18n/ca.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: process
 #: model:ir.model,name:process.model_process_node
diff --git a/addons/process/i18n/cs.po b/addons/process/i18n/cs.po
index 02537171919..e18003598ba 100644
--- a/addons/process/i18n/cs.po
+++ b/addons/process/i18n/cs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 "X-Poedit-Language: Czech\n"
 
 #. module: process
diff --git a/addons/process/i18n/da.po b/addons/process/i18n/da.po
index 04fd54cc0ed..445c28cef8a 100644
--- a/addons/process/i18n/da.po
+++ b/addons/process/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: process
 #: model:ir.model,name:process.model_process_node
diff --git a/addons/process/i18n/de.po b/addons/process/i18n/de.po
index 3fa40ce32a1..e4d8ab46e0a 100644
--- a/addons/process/i18n/de.po
+++ b/addons/process/i18n/de.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: process
 #: model:ir.model,name:process.model_process_node
diff --git a/addons/process/i18n/el.po b/addons/process/i18n/el.po
index 9b90b69d62f..dbb11c959a5 100644
--- a/addons/process/i18n/el.po
+++ b/addons/process/i18n/el.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
 "X-Poedit-SourceCharset: utf-8\n"
diff --git a/addons/process/i18n/es.po b/addons/process/i18n/es.po
index 9cf7d6609fa..0e650a8d320 100644
--- a/addons/process/i18n/es.po
+++ b/addons/process/i18n/es.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: process
 #: model:ir.model,name:process.model_process_node
diff --git a/addons/process/i18n/es_AR.po b/addons/process/i18n/es_AR.po
index 7eb543cb150..b7e548dea15 100644
--- a/addons/process/i18n/es_AR.po
+++ b/addons/process/i18n/es_AR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: process
 #: model:ir.model,name:process.model_process_node
diff --git a/addons/process/i18n/es_CL.po b/addons/process/i18n/es_CL.po
index 663b00ddbd1..4ce8d0c8ec6 100644
--- a/addons/process/i18n/es_CL.po
+++ b/addons/process/i18n/es_CL.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: process
 #: model:ir.model,name:process.model_process_node
diff --git a/addons/process/i18n/es_CR.po b/addons/process/i18n/es_CR.po
index 10264055135..e84b52af219 100644
--- a/addons/process/i18n/es_CR.po
+++ b/addons/process/i18n/es_CR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 "Language: \n"
 
 #. module: process
diff --git a/addons/process/i18n/et.po b/addons/process/i18n/et.po
index f6ee54d9661..a007f19e9a1 100644
--- a/addons/process/i18n/et.po
+++ b/addons/process/i18n/et.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: process
 #: model:ir.model,name:process.model_process_node
diff --git a/addons/process/i18n/fi.po b/addons/process/i18n/fi.po
index a07415f418a..4e5966a4ca3 100644
--- a/addons/process/i18n/fi.po
+++ b/addons/process/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: process
 #: model:ir.model,name:process.model_process_node
diff --git a/addons/process/i18n/fr.po b/addons/process/i18n/fr.po
index 8e0fec604dd..d79fa3c1c1e 100644
--- a/addons/process/i18n/fr.po
+++ b/addons/process/i18n/fr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: process
 #: model:ir.model,name:process.model_process_node
diff --git a/addons/process/i18n/gl.po b/addons/process/i18n/gl.po
index 14f15708157..48c75307d90 100644
--- a/addons/process/i18n/gl.po
+++ b/addons/process/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: process
 #: model:ir.model,name:process.model_process_node
diff --git a/addons/process/i18n/hi.po b/addons/process/i18n/hi.po
index 1537f6c998d..bd42d103519 100644
--- a/addons/process/i18n/hi.po
+++ b/addons/process/i18n/hi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: process
 #: model:ir.model,name:process.model_process_node
diff --git a/addons/process/i18n/hr.po b/addons/process/i18n/hr.po
index 43fb55ea5aa..5581507896f 100644
--- a/addons/process/i18n/hr.po
+++ b/addons/process/i18n/hr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 "Language: hr\n"
 
 #. module: process
diff --git a/addons/process/i18n/hu.po b/addons/process/i18n/hu.po
index a1cbed92925..5ac5b8a5401 100644
--- a/addons/process/i18n/hu.po
+++ b/addons/process/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: process
 #: model:ir.model,name:process.model_process_node
diff --git a/addons/process/i18n/id.po b/addons/process/i18n/id.po
index d66aa3321aa..f16c9616f18 100644
--- a/addons/process/i18n/id.po
+++ b/addons/process/i18n/id.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: process
 #: model:ir.model,name:process.model_process_node
diff --git a/addons/process/i18n/it.po b/addons/process/i18n/it.po
index 9d8fa80c621..9235db05af0 100644
--- a/addons/process/i18n/it.po
+++ b/addons/process/i18n/it.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: process
 #: model:ir.model,name:process.model_process_node
diff --git a/addons/process/i18n/ja.po b/addons/process/i18n/ja.po
index 7580ef72dad..24adcdc7825 100644
--- a/addons/process/i18n/ja.po
+++ b/addons/process/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: process
 #: model:ir.model,name:process.model_process_node
diff --git a/addons/process/i18n/ko.po b/addons/process/i18n/ko.po
index 6977dfef44d..2ede3cc39dc 100644
--- a/addons/process/i18n/ko.po
+++ b/addons/process/i18n/ko.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: process
 #: model:ir.model,name:process.model_process_node
diff --git a/addons/process/i18n/lt.po b/addons/process/i18n/lt.po
index 3cf0cf45f22..49cf211691e 100644
--- a/addons/process/i18n/lt.po
+++ b/addons/process/i18n/lt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: process
 #: model:ir.model,name:process.model_process_node
diff --git a/addons/process/i18n/mn.po b/addons/process/i18n/mn.po
index 57c091066a3..344b8aaa667 100644
--- a/addons/process/i18n/mn.po
+++ b/addons/process/i18n/mn.po
@@ -20,8 +20,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: process
 #: model:ir.model,name:process.model_process_node
diff --git a/addons/process/i18n/nl.po b/addons/process/i18n/nl.po
index 2e9ef121465..51ddebd5d17 100644
--- a/addons/process/i18n/nl.po
+++ b/addons/process/i18n/nl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: process
 #: model:ir.model,name:process.model_process_node
diff --git a/addons/process/i18n/nl_BE.po b/addons/process/i18n/nl_BE.po
index 950e905b553..c73996c9b6d 100644
--- a/addons/process/i18n/nl_BE.po
+++ b/addons/process/i18n/nl_BE.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: process
 #: model:ir.model,name:process.model_process_node
diff --git a/addons/process/i18n/pl.po b/addons/process/i18n/pl.po
index eb555b337f3..88700b7d88a 100644
--- a/addons/process/i18n/pl.po
+++ b/addons/process/i18n/pl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: process
 #: model:ir.model,name:process.model_process_node
diff --git a/addons/process/i18n/pt.po b/addons/process/i18n/pt.po
index b06ba6cdd9d..723c4b5e3fe 100644
--- a/addons/process/i18n/pt.po
+++ b/addons/process/i18n/pt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: process
 #: model:ir.model,name:process.model_process_node
diff --git a/addons/process/i18n/pt_BR.po b/addons/process/i18n/pt_BR.po
index b810a37bc4a..2541f6cf928 100644
--- a/addons/process/i18n/pt_BR.po
+++ b/addons/process/i18n/pt_BR.po
@@ -8,13 +8,14 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 00:36+0000\n"
 "PO-Revision-Date: 2012-07-28 19:10+0000\n"
-"Last-Translator: Fábio Martinelli <webmaster@guaru.net>\n"
+"Last-Translator: Fábio Martinelli - http://zupy.com.br "
+"<webmaster@guaru.net>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: process
 #: model:ir.model,name:process.model_process_node
diff --git a/addons/process/i18n/ro.po b/addons/process/i18n/ro.po
index 0afb72c73eb..2f9a0f1b5c5 100644
--- a/addons/process/i18n/ro.po
+++ b/addons/process/i18n/ro.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: process
 #: model:ir.model,name:process.model_process_node
diff --git a/addons/process/i18n/ru.po b/addons/process/i18n/ru.po
index 82937f99254..3aed803c6df 100644
--- a/addons/process/i18n/ru.po
+++ b/addons/process/i18n/ru.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: process
 #: model:ir.model,name:process.model_process_node
diff --git a/addons/process/i18n/sk.po b/addons/process/i18n/sk.po
index 04b090d5016..d8ecdac5172 100644
--- a/addons/process/i18n/sk.po
+++ b/addons/process/i18n/sk.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: process
 #: model:ir.model,name:process.model_process_node
diff --git a/addons/process/i18n/sl.po b/addons/process/i18n/sl.po
index 1a589329811..35cf18b30f6 100644
--- a/addons/process/i18n/sl.po
+++ b/addons/process/i18n/sl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: process
 #: model:ir.model,name:process.model_process_node
diff --git a/addons/process/i18n/sq.po b/addons/process/i18n/sq.po
index bbae821f8b3..b73768d1916 100644
--- a/addons/process/i18n/sq.po
+++ b/addons/process/i18n/sq.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: process
 #: model:ir.model,name:process.model_process_node
diff --git a/addons/process/i18n/sr.po b/addons/process/i18n/sr.po
index 7c0ab34f95a..d46e50844f2 100644
--- a/addons/process/i18n/sr.po
+++ b/addons/process/i18n/sr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: process
 #: model:ir.model,name:process.model_process_node
diff --git a/addons/process/i18n/sr@latin.po b/addons/process/i18n/sr@latin.po
index 4a784c621ca..0ad6f4d252d 100644
--- a/addons/process/i18n/sr@latin.po
+++ b/addons/process/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: process
 #: model:ir.model,name:process.model_process_node
diff --git a/addons/process/i18n/sv.po b/addons/process/i18n/sv.po
index 4f2c253edd2..b1bf7a9d00e 100644
--- a/addons/process/i18n/sv.po
+++ b/addons/process/i18n/sv.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: process
 #: model:ir.model,name:process.model_process_node
diff --git a/addons/process/i18n/tlh.po b/addons/process/i18n/tlh.po
index aba9dcc3307..e63a1c1a5e7 100644
--- a/addons/process/i18n/tlh.po
+++ b/addons/process/i18n/tlh.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: process
 #: model:ir.model,name:process.model_process_node
diff --git a/addons/process/i18n/tr.po b/addons/process/i18n/tr.po
index 8bd19a14eda..a7e5bb3ac6e 100644
--- a/addons/process/i18n/tr.po
+++ b/addons/process/i18n/tr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: process
 #: model:ir.model,name:process.model_process_node
diff --git a/addons/process/i18n/uk.po b/addons/process/i18n/uk.po
index eec6a0a0608..d33d881d50d 100644
--- a/addons/process/i18n/uk.po
+++ b/addons/process/i18n/uk.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: process
 #: model:ir.model,name:process.model_process_node
diff --git a/addons/process/i18n/vi.po b/addons/process/i18n/vi.po
index 4ec121fac7d..e3c3bff2a60 100644
--- a/addons/process/i18n/vi.po
+++ b/addons/process/i18n/vi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: process
 #: model:ir.model,name:process.model_process_node
diff --git a/addons/process/i18n/zh_CN.po b/addons/process/i18n/zh_CN.po
index c1b6faa96fd..fca3f4035ac 100644
--- a/addons/process/i18n/zh_CN.po
+++ b/addons/process/i18n/zh_CN.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: process
 #: model:ir.model,name:process.model_process_node
diff --git a/addons/process/i18n/zh_TW.po b/addons/process/i18n/zh_TW.po
index 598fc6dd252..7d875e7a464 100644
--- a/addons/process/i18n/zh_TW.po
+++ b/addons/process/i18n/zh_TW.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: process
 #: model:ir.model,name:process.model_process_node
diff --git a/addons/process/process.py b/addons/process/process.py
index f9744608c50..fa7596287a3 100644
--- a/addons/process/process.py
+++ b/addons/process/process.py
@@ -195,8 +195,8 @@ class process_process(osv.osv):
             if nodes[nid].get('directory_id', False):
                 resource['directory'] = self.pool.get('document.directory').get_resource_path(cr, uid, nodes[nid]['directory_id'], ref_model, ref_id)
 
-            resource['name'] = refobj.name_get(context)[0][1]
-            resource['perm'] = pool.get(ref_model).perm_read(cr, uid, [ref_id], context)[0]
+            resource['name'] = pool.get(ref_model).name_get(cr, uid, [ref_id], context=context)[0][1]
+            resource['perm'] = pool.get(ref_model).perm_read(cr, uid, [ref_id], context=context)[0]
 
             for r in relatives:
                 node = nodes[r]
diff --git a/addons/process/static/src/css/process.css b/addons/process/static/src/css/process.css
new file mode 100644
index 00000000000..7442db9bc4a
--- /dev/null
+++ b/addons/process/static/src/css/process.css
@@ -0,0 +1,70 @@
+
+a.cta-a {
+    float: left;
+    padding: 5px 10px;
+    border: 1px solid #ccc;
+    border-radius: 5px;
+    -moz-border-radius: 5px;
+    -webkit-border-radius: 5px;
+    background: #eeeded url(/process/static/src/img/cta-a.gif) repeat-x;
+    box-shadow: 0 1px 0 #fff;
+    -moz-box-shadow: 0 1px 0 #fff;
+    -webkit-box-shadow: 0 1px 0 #fff;
+    color: #8c8c8c;
+    font-size: 0.9em;
+    text-transform: uppercase;
+    font-weight: bold;
+    text-shadow: #fff 0 1px 0;
+    margin: 2px;
+}
+
+a.cta-a span {
+    float: left;
+    padding: 7px 0 5px 5px;
+    background-position: 0 50%;
+    background-repeat: no-repeat;
+    cursor: pointer;
+}
+
+a.cta-a strong {
+    display: block;
+    color: #393939;
+}
+.process-links {
+    padding: 5px 10px;
+    text-align: center;
+    display: table;
+    margin: auto;
+}
+.process-links a.cta-a {
+    display: table-cell;
+}
+.process_canvas{
+    border: 1px solid #aaa;
+    background-color:#FFF;
+}
+.process_canvas svg{
+    height:500px;!important;
+    padding:15px;
+}
+.oe_process {
+    height: 20px;
+    margin-top:3px;
+    padding: 0;
+    width: 24px;
+    cursor: pointer;
+    display: block;
+    background: url(/web/static/src/img/iconset-a-help.png) no-repeat  center center;
+    float: left;
+}
+
+.process-help-text {
+    float: left;
+    padding:5px 10px;
+    min-height:56px;
+    font-size: 120%;
+}
+
+td.process_fields,button.toggle_fields span:last-child {
+    display: none;
+}
diff --git a/addons/process/static/src/img/button-a-a.png b/addons/process/static/src/img/button-a-a.png
new file mode 100644
index 00000000000..bd046bbbef7
Binary files /dev/null and b/addons/process/static/src/img/button-a-a.png differ
diff --git a/addons/process/static/src/img/cta-a.gif b/addons/process/static/src/img/cta-a.gif
new file mode 100644
index 00000000000..daa561e29f5
Binary files /dev/null and b/addons/process/static/src/img/cta-a.gif differ
diff --git a/addons/process/static/src/img/iconset-a-help.gif b/addons/process/static/src/img/iconset-a-help.gif
new file mode 100644
index 00000000000..5400acec57b
Binary files /dev/null and b/addons/process/static/src/img/iconset-a-help.gif differ
diff --git a/addons/process/static/src/img/node-current.png b/addons/process/static/src/img/node-current.png
new file mode 100644
index 00000000000..51f86b04c78
Binary files /dev/null and b/addons/process/static/src/img/node-current.png differ
diff --git a/addons/process/static/src/img/node-gray.png b/addons/process/static/src/img/node-gray.png
new file mode 100644
index 00000000000..972013540cf
Binary files /dev/null and b/addons/process/static/src/img/node-gray.png differ
diff --git a/addons/process/static/src/img/node-subflow-gray.png b/addons/process/static/src/img/node-subflow-gray.png
new file mode 100644
index 00000000000..ffafe1bd681
Binary files /dev/null and b/addons/process/static/src/img/node-subflow-gray.png differ
diff --git a/addons/process/static/src/img/node-subflow.png b/addons/process/static/src/img/node-subflow.png
new file mode 100644
index 00000000000..fd2a480204d
Binary files /dev/null and b/addons/process/static/src/img/node-subflow.png differ
diff --git a/addons/process/static/src/img/node.png b/addons/process/static/src/img/node.png
new file mode 100644
index 00000000000..853ac85cd56
Binary files /dev/null and b/addons/process/static/src/img/node.png differ
diff --git a/addons/process/static/src/js/process.js b/addons/process/static/src/js/process.js
new file mode 100644
index 00000000000..bbf9080de95
--- /dev/null
+++ b/addons/process/static/src/js/process.js
@@ -0,0 +1,249 @@
+openerp.process = function (instance) {
+var QWeb = instance.web.qweb,
+      _t = instance.web._t;
+instance.web.ViewManager.include({
+    start: function() {
+        var self = this;
+        var _super = this._super();
+        this.process_help = this.action ? this.action.help : '';
+        self.process_help = $(this.process_help).text();
+        if(this.action) {
+            this.process_model = this.action.res_model;
+        } else {
+            this.process_model = this.dataset.model;
+        }
+        this.$el.on('click', '.oe_process', function(ev) { self.initialize_process_view(ev);});
+        return _super;
+    },
+    initialize_process_view: function(ev) {
+        var self = this;
+        this.record_id = false;
+        if(this.active_view == 'form') {
+            this.record_id = this.views[this.active_view].controller.datarecord.id;
+        }
+        this.process_get_object().pipe(function(process) {
+            if(process && process.length) {
+                if(process.length > 1) {
+                    self.process_selection = process;
+                } else {
+                    self.process_id = process[0][0],
+                    self.process_title = process[0][1];
+                }
+            }
+            return $.Deferred().resolve();
+        }).pipe(function() {
+            var def = $.Deferred();
+            if(self.process_id) {
+                $.when(self.process_graph_get()).done(function(res) {
+                    self.process_notes = res.notes;
+                    self.process_title = res.name;
+                    self.process_subflows = _(res.nodes).chain()
+                          .filter(function (node) { return node['subflow'] !== false; })
+                          .uniq(false, function (node) { return node['subflow'][0]; }).value();
+                    self.process_related = res.related;
+                    def.resolve(res);
+                });
+            } else def.resolve();
+            return def.promise();
+        }).done(function(res) {
+            $.when(self.process_render_view()).done(function() {
+                if(res) {
+                    self.process_draw_graph(res);
+                }
+            });
+        });
+    },
+    process_graph_get: function() {
+        var self = this;
+        var def = $.Deferred();
+        this.process_id = parseInt(this.process_id, 10);
+        this.process_dataset
+        .call("graph_get",[self.process_id, self.model || self.dataset.model, self.record_id, [80,80,150,100], self.session.user_context])
+        .done(function(res) {
+            self.process_dataset
+                .call("search_by_model",[self.model || self.dataset.model, self.session.user_context])
+                .done(
+                function(r) {
+                    res['related'] = r;
+                    def.resolve(res);
+                });
+        });
+        return def.promise();
+    },
+    process_get_object : function() {
+        var self = this,
+            def = $.Deferred();
+        if(this.process_id)
+            return def.resolve().promise();
+        this.process_dataset = new instance.web.DataSet(self, "process.process", self.session.user_context);
+        this.process_dataset
+        .call("search_by_model", [self.process_model,self.session.user_context])
+        .done(function(res) {
+            if (!res.length) {
+                self.process_model = false;
+                self.process_get_object().done(def.resolve);
+            }
+            else {
+                def.resolve(res);
+            }
+        })
+        .fail(def.reject);
+        return def.promise();
+    },
+    process_render_view : function() {
+        var self = this;
+        this.$el.html(QWeb.render("process.ProcessView", this));
+        this.$el.addClass('oe_view_process').css({'background-color':'#F0EEEE'});
+        this.$el.find('#edit_process').click(function() {
+            self.process_edit_view();
+        });
+        var $parent = this.getParent().$el;
+        $parent.find('#change_process').click(function() {
+            self.process_selection = false,
+            self.process_id = $parent.find('#select_process').val(),
+            self.process_title = $.trim($parent.find('#select_process option:selected').text());
+            self.initialize_process_view();
+        });
+        this.$el.find(".process_subflow").click(function() {
+            self.process_id = this.id;
+            self.initialize_process_view();
+        });
+    },
+    process_draw_graph : function(result) {
+        var self = this;
+        var res_nodes = result['nodes'];
+        var res_edges = result['transitions'];
+        var id_to_node = {};
+        var canvas = $('div.process_canvas').empty().get(0);
+        var style = {
+            edge_color: "#A0A0A0",
+            edge_label_font_size: 10,
+            edge_width: 2,
+            edge_spacing: 40,
+            edge_loop_radius: 200,
+
+            node_label_color: "#333",
+            node_label_font_size: 12,
+            node_outline_color: "#333",
+            node_outline_width: 1,
+            node_outline_color: "#F5F5F5",
+            node_outline_width: 0,
+            node_selected_width: 0,
+            node_size_x: 150,
+            node_size_y: 100,
+
+            gray: "#DCDCDC",
+            white: "#FFF",
+            viewport_margin: 50
+        };
+        var r  = new Raphael(canvas,'100%','100%');
+        var graph  = new CuteGraph(r,style,canvas.parentNode);
+        var render_process = function(r,nodes){
+            //For Image 
+            var image_node = nodes.kind == "subflow" ? "node-subflow" : "node";
+            image_node = nodes.gray ? image_node + "-gray" : image_node;
+            image_node = nodes.active ? 'node-current': image_node;
+            var img_src = '/web_process/static/src/img/'+ image_node + '.png';
+            var image = r['image'](img_src, nodes.x-25, nodes.y,150, 100).attr({"cursor": "default"}) .mousedown(function() { return false; });
+            //For Node
+            var process_node = r['rect'](nodes.x, nodes.y, 150, 150).attr({stroke: "none"});
+            // Node text
+            if(nodes.name.length > 18){
+               var text = nodes.name.substr(0,16) + '...'
+            }
+            var node_text =  r.text(nodes.x+60, nodes.y+10,(text || nodes.name.substr(0,18))).attr({"fill": "#fff","font-weight": "bold", "cursor": "default","title":nodes.name});
+            //Node Description
+            var new_notes = nodes.notes;
+            if(nodes.notes.length > 25) {
+               var to;
+               var temp_str = new_notes = '';
+               var from = to = 0;
+               while (1) {
+                 from = 25;
+                 temp_str = nodes.notes.substr(to, 25);
+                 if (temp_str.lastIndexOf(" ") < 25 && temp_str.length >= 25) {
+                      from = temp_str.lastIndexOf(" ");
+                 }
+                 new_notes += "\n" + nodes.notes.substr(to, from);
+                 if (new_notes.length > 80){
+                     break;
+                 }
+                 to += from;
+              }
+            }
+            if(nodes.res)
+                 new_notes = nodes.res.name + '\n' + new_notes;
+            if(nodes.notes.length > 60){
+                var notes = new_notes.substring(0,60) +'..';
+            }
+            r.text(nodes.x+60, nodes.y+30, (notes || new_notes)).attr({"title":nodes.notes,"cursor": "default"});
+            if(nodes.menu) {
+                 r['image']('/web/static/src/img/icons/gtk-jump-to.png', nodes.x+100, nodes.y+75, 16, 16)
+                    .attr({"cursor": "pointer", "title": nodes.menu.name})
+                    .click(function() {
+                        self.process_jump_to_view(nodes.res_model, nodes.menu.id);
+                 });
+            }
+            var process_set =r.set().push(process_node);
+            process_set.mousedown(function() {
+                    return false;
+            });
+            return process_set;
+        }
+        _.each(res_nodes, function(node,id) {
+            node['res_model'] = self.model,
+            node['res_id'] = false,
+            node['color'] = 'gray'
+            var n = new CuteNode(
+                graph,
+                node.x + 50,  //FIXME the +50 should be in the layout algorithm
+                node.y + 50,
+                CuteGraph.wordwrap("", 14));
+            n.id = id;
+            id_to_node[id] = n;
+            return render_process(r,node);
+        });
+        _.each(res_edges, function(edge) {
+            var e =  new CuteEdge(
+                graph,
+                CuteGraph.wordwrap(" ",0),
+                id_to_node[edge.source],
+                id_to_node[edge.target] || id_to_node[edge.source]);
+            e.id = edge.id;
+        });
+    },
+    process_jump_to_view: function(model,id) {
+        var self = this;
+        var dataset = new instance.web.DataSet(this, 'ir.values', this.session.user_context);
+        var action_manager = new instance.web.ActionManager(self);
+        dataset.call('get',
+            ['action', 'tree_but_open',[['ir.ui.menu', id]], dataset.context],
+            function(res) {
+                var action = res[0][res[0].length - 1];
+                self.rpc("/web/action/load", {
+                    action_id: action.id,
+                    context: dataset.context
+                    }, function(result) {
+                        action_manager.replace(self.$el);
+                        action_manager.do_action(result.result);
+                    })
+            });
+    },
+    process_edit_view: function() {
+        var self = this;
+        var pop = new instance.web.form.FormOpenPopup(self);
+        pop.show_element(
+            self.process_dataset.model,
+            self.process_id,
+            self.context || self.dataset.context,
+            {
+                title: _t('Process')
+            });
+        var form_controller = pop.view_form;
+        pop.on_write_completed.add_last(function() {
+                self.initialize_process_view();
+        });
+    }
+});
+};
+// vim:et fdc=0 fdl=0 foldnestmax=3 fdm=syntax:
diff --git a/addons/process/static/src/xml/process.xml b/addons/process/static/src/xml/process.xml
new file mode 100644
index 00000000000..b1a39aa6ce8
--- /dev/null
+++ b/addons/process/static/src/xml/process.xml
@@ -0,0 +1,93 @@
+<template>
+<!-- vim:fdl=1:
+-->
+<t t-extend="ViewManagerAction">
+    <t t-jquery="h2.oe_view_title" t-operation="after">
+        <t t-if="widget.session.debug &amp;&amp; widget.flags.display_title !== false">
+            <a class="oe_process" title="Process View" href="javascript: void(0)"></a>
+        </t>
+    </t>
+</t>
+<t t-name="process.ProcessView">
+    <table class="view" border="0" width="auto" height="auto" cellpadding="0" cellspacing="0">
+        <tr>
+            <td width="70%" valign="top" class="fields collapsed">
+                <div class="oe_view_manager oe_view_manager_current">
+                   <div class="oe_view_manager_header" style="padding: 8px;">
+                       <div class="oe_header_row">
+                            <h2 class="oe_view_title">
+                                <span class="oe_view_title_text oe_breadcrumb_title"><t t-esc="action.name"/> (<t t-esc="action.res_model"/>)</span>
+                            </h2>
+                       </div>
+                    </div>
+                </div>
+            </td>
+        </tr>
+        <tr>
+            <td style="padding-left:10px;">
+                <p><t t-esc="process_help"/></p>
+            </td>
+        </tr>
+        <tr>
+            <td style="padding-left:10px;">
+                <h2> <t t-esc="process_title"/> Process </h2>
+                <t t-if="process_notes">
+                    <p>
+                        <strong>Notes:</strong> <t t-esc="process_notes"/>
+                    </p>
+                    <p>
+                        <strong>Last modified by:</strong> N/A
+                    </p>
+                    <t t-if="process_subflows.length">
+                        <strong>Subflows:</strong>
+                        <t t-foreach="process_subflows" t-as="subflow">
+                            <t t-if="subflow.subflow[0] != process_id">
+                                <p>
+                                    <a class="oe_bold process_subflow" t-att-id="subflow.subflow[0]" href="javascript: void(0)">
+                                        <t t-esc="subflow.subflow[1]"/>
+                                    </a>
+                                </p>
+                            </t>
+                        </t>
+                    </t>
+                    <t t-if="process_related.length and process_related[0][0] != process_id">
+                        <strong>Related:</strong>
+                        <p>
+                            <a class="oe_bold process_subflow" t-att-id="process_related[0][0]" href="javascript: void(0)">
+                                <t t-esc="process_related[0][1]"/>
+                            </a>
+                        </p>
+                    </t>
+                </t>
+            </td>
+        </tr>
+        <tr t-if="process_selection">
+            <td style="padding-left:10px;">
+                <fieldset>
+                    <legend>
+                        Select Process
+                        </legend>
+                    <select id="select_process">
+                        <t t-foreach="process_selection" t-as="prc">
+                            <option t-att-value="prc[0]">
+                                <t t-esc="prc[1]"/>
+                            </option>
+                        </t>
+                    </select>
+                    <button class="oe_button oe_highlight" id="change_process">Select</button>
+                </fieldset>
+            </td>
+        </tr>
+        <tr t-if="process_id">
+            <td>
+                <div class="process_canvas"></div>
+            </td>
+        </tr>
+        <tr t-if="process_id">
+            <td style="padding-left:10px;">
+                <button class="oe_button oe_highlight" id="edit_process">Edit Process</button>
+            </td>
+        </tr>
+    </table>
+</t>
+</template>
diff --git a/addons/procurement/__openerp__.py b/addons/procurement/__openerp__.py
index 7dc9ddba08c..e797766eb40 100644
--- a/addons/procurement/__openerp__.py
+++ b/addons/procurement/__openerp__.py
@@ -21,14 +21,13 @@
 
 
 {
-    "name" : "Procurements",
-    "version" : "1.0",
-    "author" : "OpenERP SA",
-    "website" : "http://www.openerp.com",
-    "category" : "Hidden/Dependency",
-    "depends" : ["process", "product", "stock"],
-    "description": """
-
+    'name' : 'Procurements',
+    'version' : '1.0',
+    'author' : 'OpenERP SA',
+    'website' : 'http://www.openerp.com',
+    'category' : 'Hidden/Dependency',
+    'depends' : ['base','process', 'product', 'stock'],
+    'description': """
 This is the module for computing Procurements.
 ==============================================
 
diff --git a/addons/procurement/i18n/ar.po b/addons/procurement/i18n/ar.po
index 507978d09ed..47a63b81e44 100644
--- a/addons/procurement/i18n/ar.po
+++ b/addons/procurement/i18n/ar.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:36+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: procurement
 #: view:make.procurement:0
diff --git a/addons/procurement/i18n/bg.po b/addons/procurement/i18n/bg.po
index 333fd211e61..336df797694 100644
--- a/addons/procurement/i18n/bg.po
+++ b/addons/procurement/i18n/bg.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:36+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: procurement
 #: view:make.procurement:0
diff --git a/addons/procurement/i18n/ca.po b/addons/procurement/i18n/ca.po
index 07c9ea2ad99..d0ff42d4780 100644
--- a/addons/procurement/i18n/ca.po
+++ b/addons/procurement/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:36+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: procurement
 #: view:make.procurement:0
diff --git a/addons/procurement/i18n/cs.po b/addons/procurement/i18n/cs.po
index 392a9468534..2aaf7ce8541 100644
--- a/addons/procurement/i18n/cs.po
+++ b/addons/procurement/i18n/cs.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:36+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 "X-Poedit-Language: Czech\n"
 
 #. module: procurement
diff --git a/addons/procurement/i18n/da.po b/addons/procurement/i18n/da.po
index c9b070c086f..fda84d7a815 100644
--- a/addons/procurement/i18n/da.po
+++ b/addons/procurement/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:36+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: procurement
 #: view:make.procurement:0
diff --git a/addons/procurement/i18n/de.po b/addons/procurement/i18n/de.po
index 62855d475d1..6101927356b 100644
--- a/addons/procurement/i18n/de.po
+++ b/addons/procurement/i18n/de.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:36+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: procurement
 #: view:make.procurement:0
diff --git a/addons/procurement/i18n/es.po b/addons/procurement/i18n/es.po
index cc51723d9c7..e3b64863731 100644
--- a/addons/procurement/i18n/es.po
+++ b/addons/procurement/i18n/es.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:32+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:36+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: procurement
 #: view:make.procurement:0
diff --git a/addons/procurement/i18n/es_CL.po b/addons/procurement/i18n/es_CL.po
index 5c04fd1a7ef..54027f29730 100644
--- a/addons/procurement/i18n/es_CL.po
+++ b/addons/procurement/i18n/es_CL.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:32+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:36+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: procurement
 #: view:make.procurement:0
diff --git a/addons/procurement/i18n/es_CR.po b/addons/procurement/i18n/es_CR.po
index 71322acb17a..caa48b0af2a 100644
--- a/addons/procurement/i18n/es_CR.po
+++ b/addons/procurement/i18n/es_CR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:32+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:36+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 "Language: es\n"
 
 #. module: procurement
diff --git a/addons/procurement/i18n/es_EC.po b/addons/procurement/i18n/es_EC.po
index f786b1fd5d4..795fcc5cbb6 100644
--- a/addons/procurement/i18n/es_EC.po
+++ b/addons/procurement/i18n/es_EC.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:32+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:36+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: procurement
 #: view:make.procurement:0
diff --git a/addons/procurement/i18n/fi.po b/addons/procurement/i18n/fi.po
index cf331c1ca93..42bb7a778ac 100644
--- a/addons/procurement/i18n/fi.po
+++ b/addons/procurement/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:36+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: procurement
 #: view:make.procurement:0
diff --git a/addons/procurement/i18n/fr.po b/addons/procurement/i18n/fr.po
index 2999f85a49d..62a5c8cddc3 100644
--- a/addons/procurement/i18n/fr.po
+++ b/addons/procurement/i18n/fr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:36+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: procurement
 #: view:make.procurement:0
diff --git a/addons/procurement/i18n/gl.po b/addons/procurement/i18n/gl.po
index 8f53c3327d4..b4c28afba8d 100644
--- a/addons/procurement/i18n/gl.po
+++ b/addons/procurement/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:36+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: procurement
 #: view:make.procurement:0
diff --git a/addons/procurement/i18n/hr.po b/addons/procurement/i18n/hr.po
index 38e767eb578..583e153870f 100644
--- a/addons/procurement/i18n/hr.po
+++ b/addons/procurement/i18n/hr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:32+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:36+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: procurement
 #: view:make.procurement:0
diff --git a/addons/procurement/i18n/hu.po b/addons/procurement/i18n/hu.po
index eed50010ee7..e4b867e591f 100644
--- a/addons/procurement/i18n/hu.po
+++ b/addons/procurement/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:36+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: procurement
 #: view:make.procurement:0
diff --git a/addons/procurement/i18n/id.po b/addons/procurement/i18n/id.po
index 8e00f95b23f..e3d3e3744ff 100644
--- a/addons/procurement/i18n/id.po
+++ b/addons/procurement/i18n/id.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:36+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: procurement
 #: view:make.procurement:0
diff --git a/addons/procurement/i18n/it.po b/addons/procurement/i18n/it.po
index 91c44b3ade4..d7ebef7b535 100644
--- a/addons/procurement/i18n/it.po
+++ b/addons/procurement/i18n/it.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:36+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: procurement
 #: view:make.procurement:0
diff --git a/addons/procurement/i18n/ja.po b/addons/procurement/i18n/ja.po
index 1a9b972920a..ebbd5a9f094 100644
--- a/addons/procurement/i18n/ja.po
+++ b/addons/procurement/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:36+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: procurement
 #: view:make.procurement:0
diff --git a/addons/procurement/i18n/mn.po b/addons/procurement/i18n/mn.po
index 48388307394..d7f531baf1b 100644
--- a/addons/procurement/i18n/mn.po
+++ b/addons/procurement/i18n/mn.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:36+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: procurement
 #: view:make.procurement:0
diff --git a/addons/procurement/i18n/nb.po b/addons/procurement/i18n/nb.po
index 10c09e2c5a9..47a83619454 100644
--- a/addons/procurement/i18n/nb.po
+++ b/addons/procurement/i18n/nb.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:36+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: procurement
 #: view:make.procurement:0
diff --git a/addons/procurement/i18n/nl.po b/addons/procurement/i18n/nl.po
index 460b289bede..e133736214d 100644
--- a/addons/procurement/i18n/nl.po
+++ b/addons/procurement/i18n/nl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:36+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: procurement
 #: view:make.procurement:0
@@ -196,7 +196,7 @@ msgstr "Gereed"
 #. module: procurement
 #: field:procurement.order.compute.all,automatic:0
 msgid "Automatic orderpoint"
-msgstr "Automatisch bestelpunt"
+msgstr "Minimale voorraadregel toepassen"
 
 #. module: procurement
 #: code:addons/procurement/schedulers.py:123
@@ -279,7 +279,7 @@ msgstr "Fout! U kunt geen recursieve bedrijven aanmaken."
 #: code:addons/procurement/procurement.py:386
 #, python-format
 msgid "Procurement '%s' is in exception: "
-msgstr "Verwerving '%s' is in fout: "
+msgstr "Bij de verwerving van '%s' is een probleem ontstaan: "
 
 #. module: procurement
 #: field:procurement.order,priority:0
@@ -379,7 +379,7 @@ msgstr "Aantal"
 #: code:addons/procurement/procurement.py:379
 #, python-format
 msgid "Not enough stock and no minimum orderpoint rule defined."
-msgstr "Onvoldoende voorraad en geen minimum bestelpunt gedefinieerd."
+msgstr "Onvoldoende voorraad en geen minimum voorraadregel gedefinieerd."
 
 #. module: procurement
 #: code:addons/procurement/procurement.py:137
@@ -532,15 +532,15 @@ msgid ""
 "If the active field is set to False, it will allow you to hide the "
 "orderpoint without removing it."
 msgstr ""
-"Als het actief veld uit staat, kunt u het bestelpunt verbergen zonder deze "
-"te verwijderen."
+"Als het actief veld uit staat, kunt u de minimale voorraadregel verbergen "
+"zonder deze te verwijderen."
 
 #. module: procurement
 #: help:procurement.orderpoint.compute,automatic:0
 msgid "If the stock of a product is under 0, it will act like an orderpoint"
 msgstr ""
 "Als de voorraad van een product negatief wordt, gedraagt het zich als een "
-"bestelpunt"
+"minimale voorraadregel."
 
 #. module: procurement
 #: view:procurement.order:0
@@ -636,7 +636,7 @@ msgstr "Automatisch BP: %s"
 #. module: procurement
 #: model:ir.model,name:procurement.model_procurement_orderpoint_compute
 msgid "Automatic Order Point"
-msgstr "Automatisch bestelpunt"
+msgstr "Minimale voorraadregel toepassen"
 
 #. module: procurement
 #: model:ir.model,name:procurement.model_stock_warehouse_orderpoint
@@ -1017,7 +1017,7 @@ msgstr "Zeer urgent"
 #. module: procurement
 #: field:procurement.orderpoint.compute,automatic:0
 msgid "Automatic Orderpoint"
-msgstr "Automatisch bestelpunt"
+msgstr "Minimale voorraadregel toepassen"
 
 #. module: procurement
 #: view:procurement.order:0
diff --git a/addons/procurement/i18n/pl.po b/addons/procurement/i18n/pl.po
index d9d5c277fe6..f30c55e7d53 100644
--- a/addons/procurement/i18n/pl.po
+++ b/addons/procurement/i18n/pl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:32+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:36+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: procurement
 #: view:make.procurement:0
diff --git a/addons/procurement/i18n/pt.po b/addons/procurement/i18n/pt.po
index 0eac1cb44a8..20d2410cbb2 100644
--- a/addons/procurement/i18n/pt.po
+++ b/addons/procurement/i18n/pt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:32+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:36+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: procurement
 #: view:make.procurement:0
diff --git a/addons/procurement/i18n/pt_BR.po b/addons/procurement/i18n/pt_BR.po
index 4c65ccd6dff..abafbcf4955 100644
--- a/addons/procurement/i18n/pt_BR.po
+++ b/addons/procurement/i18n/pt_BR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:32+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:36+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: procurement
 #: view:make.procurement:0
@@ -84,7 +84,7 @@ msgstr "Somente calcula \"regras de estoque mínimo\""
 #. module: procurement
 #: view:procurement.order:0
 msgid "Temporary Procurement Exceptions"
-msgstr ""
+msgstr "Exceções Temporárias de Procurações"
 
 #. module: procurement
 #: field:procurement.order,company_id:0
@@ -162,7 +162,7 @@ msgstr ""
 #. module: procurement
 #: view:procurement.order:0
 msgid "Permanent Procurement Exceptions"
-msgstr ""
+msgstr "Exceções Permanentes de Procurações"
 
 #. module: procurement
 #: view:stock.warehouse.orderpoint:0
@@ -384,7 +384,7 @@ msgstr "Referências"
 #: view:product.product:0
 #: field:product.product,orderpoint_ids:0
 msgid "Minimum Stock Rule"
-msgstr ""
+msgstr "Regra Minima de Estoque"
 
 #. module: procurement
 #: view:res.company:0
@@ -506,6 +506,7 @@ msgstr "mais"
 #: constraint:stock.move:0
 msgid "You can not move products from or to a location of the type view."
 msgstr ""
+"Você não pode mover os produtos de/para um Local do tipo Visualização"
 
 #. module: procurement
 #: help:stock.warehouse.orderpoint,active:0
diff --git a/addons/procurement/i18n/ro.po b/addons/procurement/i18n/ro.po
index 810ede588a6..9b8da9e1491 100644
--- a/addons/procurement/i18n/ro.po
+++ b/addons/procurement/i18n/ro.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:32+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:36+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: procurement
 #: view:make.procurement:0
diff --git a/addons/procurement/i18n/ru.po b/addons/procurement/i18n/ru.po
index ac902c7f29a..4beb8951849 100644
--- a/addons/procurement/i18n/ru.po
+++ b/addons/procurement/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-02-08 00:37+0000\n"
-"PO-Revision-Date: 2011-03-16 07:09+0000\n"
+"PO-Revision-Date: 2012-08-30 18:15+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: 2012-08-07 05:32+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-31 04:56+0000\n"
+"X-Generator: Launchpad (build 15887)\n"
 
 #. module: procurement
 #: view:make.procurement:0
@@ -376,7 +376,7 @@ msgstr "Ссылки"
 #: view:product.product:0
 #: field:product.product,orderpoint_ids:0
 msgid "Minimum Stock Rule"
-msgstr ""
+msgstr "Правило минимальных запасов"
 
 #. module: procurement
 #: view:res.company:0
@@ -390,6 +390,8 @@ msgid ""
 "Please check the quantity in procurement order(s), it should not be 0 or "
 "less!"
 msgstr ""
+"Пожалуйста, проверьте количество в заказе на снабжение, оно не должно быть "
+"нулевым или отрицательным!"
 
 #. module: procurement
 #: help:procurement.order,procure_method:0
@@ -615,7 +617,7 @@ msgstr "Правило минимума ТМЦ"
 #. module: procurement
 #: help:stock.warehouse.orderpoint,qty_multiple:0
 msgid "The procurement quantity will be rounded up to this multiple."
-msgstr ""
+msgstr "Количество в заказе будет округляться до этого значения."
 
 #. module: procurement
 #: model:ir.model,name:procurement.model_res_company
@@ -655,7 +657,7 @@ msgstr "Заказ по максимуму"
 #. module: procurement
 #: sql_constraint:stock.picking:0
 msgid "Reference must be unique per Company!"
-msgstr ""
+msgstr "Ссылка должна быть уникальна для каждой компании!"
 
 #. module: procurement
 #: field:procurement.order,date_close:0
@@ -896,7 +898,7 @@ msgstr ""
 #. module: procurement
 #: sql_constraint:res.company:0
 msgid "The company name must be unique !"
-msgstr ""
+msgstr "Название компании должно быть уникальным!"
 
 #. module: procurement
 #: field:mrp.property,name:0
@@ -995,7 +997,7 @@ msgstr ""
 #. module: procurement
 #: constraint:product.product:0
 msgid "Error: Invalid ean code"
-msgstr ""
+msgstr "Ошибка: Неверный штрих-код"
 
 #. module: procurement
 #: code:addons/procurement/schedulers.py:152
diff --git a/addons/procurement/i18n/sr.po b/addons/procurement/i18n/sr.po
index b5e3d3140e8..000eaadd575 100644
--- a/addons/procurement/i18n/sr.po
+++ b/addons/procurement/i18n/sr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:32+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:36+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: procurement
 #: view:make.procurement:0
diff --git a/addons/procurement/i18n/sr@latin.po b/addons/procurement/i18n/sr@latin.po
index 779c6527bc1..3a561f60a3b 100644
--- a/addons/procurement/i18n/sr@latin.po
+++ b/addons/procurement/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:32+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:36+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: procurement
 #: view:make.procurement:0
diff --git a/addons/procurement/i18n/sv.po b/addons/procurement/i18n/sv.po
index 1eaf13e40a7..4f66666d0d8 100644
--- a/addons/procurement/i18n/sv.po
+++ b/addons/procurement/i18n/sv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:32+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:36+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: procurement
 #: view:make.procurement:0
diff --git a/addons/procurement/i18n/tr.po b/addons/procurement/i18n/tr.po
index 46320f8fea1..598c518cd88 100644
--- a/addons/procurement/i18n/tr.po
+++ b/addons/procurement/i18n/tr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:32+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:36+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: procurement
 #: view:make.procurement:0
diff --git a/addons/procurement/i18n/vi.po b/addons/procurement/i18n/vi.po
index 33f12aea044..2940cd75cef 100644
--- a/addons/procurement/i18n/vi.po
+++ b/addons/procurement/i18n/vi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:32+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:36+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: procurement
 #: view:make.procurement:0
diff --git a/addons/procurement/i18n/zh_CN.po b/addons/procurement/i18n/zh_CN.po
index 381e77b2223..06a82ce39bb 100644
--- a/addons/procurement/i18n/zh_CN.po
+++ b/addons/procurement/i18n/zh_CN.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:32+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:36+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: procurement
 #: view:make.procurement:0
diff --git a/addons/procurement/procurement.py b/addons/procurement/procurement.py
index d1fb3f8a395..db50ebd94fd 100644
--- a/addons/procurement/procurement.py
+++ b/addons/procurement/procurement.py
@@ -289,14 +289,14 @@ class procurement_order(osv.osv):
                 return False
             if not procurement.product_id.seller_ids:
                 message = _('No supplier defined for this product !')
-                self.message_append_note(cr, uid, [procurement.id], body=message)
+                self.message_post(cr, uid, [procurement.id], body=message)
                 cr.execute('update procurement_order set message=%s where id=%s', (message, procurement.id))
                 return False
             partner = procurement.product_id.seller_id #Taken Main Supplier of Product of Procurement.
 
             if not partner:
                 message = _('No default supplier defined for this product')
-                self.message_append_note(cr, uid, [procurement.id], body=message)
+                self.message_post(cr, uid, [procurement.id], body=message)
                 cr.execute('update procurement_order set message=%s where id=%s', (message, procurement.id))
                 return False
             if user.company_id and user.company_id.partner_id:
@@ -306,7 +306,7 @@ class procurement_order(osv.osv):
             address_id = partner_obj.address_get(cr, uid, [partner.id], ['delivery'])['delivery']
             if not address_id:
                 message = _('No address defined for the supplier')
-                self.message_append_note(cr, uid, [procurement.id], body=message)
+                self.message_post(cr, uid, [procurement.id], body=message)
                 cr.execute('update procurement_order set message=%s where id=%s', (message, procurement.id))
                 return False
         return True
@@ -365,7 +365,7 @@ class procurement_order(osv.osv):
         message = _('From stock: products assigned.')
         self.write(cr, uid, ids, {'state': 'running',
                 'message': message}, context=context)
-        self.message_append_note(cr, uid, ids, body=message, context=context)
+        self.message_post(cr, uid, ids, body=message, context=context)
         self.running_send_note(cr, uid, ids, context=context)
         return True
 
@@ -389,7 +389,7 @@ class procurement_order(osv.osv):
                 ok = ok and self.pool.get('stock.move').action_assign(cr, uid, [id])
                 order_point_id = self.pool.get('stock.warehouse.orderpoint').search(cr, uid, [('product_id', '=', procurement.product_id.id)], context=context)
                 if not order_point_id and not ok:
-                     message = _("Not enough stock and no minimum orderpoint rule defined.")
+                    message = _("Not enough stock and no minimum orderpoint rule defined.")
                 elif not order_point_id:
                     message = _("No minimum orderpoint rule defined.")
                 elif not ok:
@@ -398,7 +398,7 @@ class procurement_order(osv.osv):
                 if message:
                     message = _("Procurement '%s' is in exception: ") % (procurement.name) + message
                     cr.execute('update procurement_order set message=%s where id=%s', (message, procurement.id))
-                    self.message_append_note(cr, uid, [procurement.id], body=message, context=context)
+                    self.message_post(cr, uid, [procurement.id], body=message, context=context)
         return ok
 
     def action_produce_assign_service(self, cr, uid, ids, context=None):
@@ -496,22 +496,22 @@ class procurement_order(osv.osv):
         return obj_id
 
     def create_send_note(self, cr, uid, ids, context=None):
-        self.message_append_note(cr, uid, ids, body=_("Procurement has been <b>created</b>."), context=context)
+        self.message_post(cr, uid, ids, body=_("Procurement has been <b>created</b>."), context=context)
 
     def confirm_send_note(self, cr, uid, ids, context=None):
-        self.message_append_note(cr, uid, ids, body=_("Procurement has been <b>confirmed</b>."), context=context)
+        self.message_post(cr, uid, ids, body=_("Procurement has been <b>confirmed</b>."), context=context)
 
     def running_send_note(self, cr, uid, ids, context=None):
-        self.message_append_note(cr, uid, ids, body=_("Procurement has been set to <b>running</b>."), context=context)
+        self.message_post(cr, uid, ids, body=_("Procurement has been set to <b>running</b>."), context=context)
 
     def ready_send_note(self, cr, uid, ids, context=None):
-        self.message_append_note(cr, uid, ids, body=_("Procurement has been set to <b>ready</b>."), context=context)
+        self.message_post(cr, uid, ids, body=_("Procurement has been set to <b>ready</b>."), context=context)
 
     def cancel_send_note(self, cr, uid, ids, context=None):
-        self.message_append_note(cr, uid, ids, body=_("Procurement has been <b>cancelled</b>."), context=context)
+        self.message_post(cr, uid, ids, body=_("Procurement has been <b>cancelled</b>."), context=context)
 
     def done_send_note(self, cr, uid, ids, context=None):
-        self.message_append_note(cr, uid, ids, body=_("Procurement has been <b>done</b>."), context=context)
+        self.message_post(cr, uid, ids, body=_("Procurement has been <b>done</b>."), context=context)
 
 procurement_order()
 
diff --git a/addons/procurement/procurement_view.xml b/addons/procurement/procurement_view.xml
index dbdc65c6763..432ff13aaa5 100644
--- a/addons/procurement/procurement_view.xml
+++ b/addons/procurement/procurement_view.xml
@@ -261,12 +261,12 @@
         </record>
 
         <act_window
-        context="{'search_default_warehouse_id': active_id, 'default_warehouse_id': active_id}"
-        id="act_stock_warehouse_2_stock_warehouse_orderpoint"
-        name="Reordering Rules"
-        res_model="stock.warehouse.orderpoint"
-        src_model="stock.warehouse"
-        groups="stock.group_stock_user"/>
+            context="{'search_default_warehouse_id': active_id, 'default_warehouse_id': active_id}"
+            id="act_stock_warehouse_2_stock_warehouse_orderpoint"
+            name="Reordering Rules"
+            res_model="stock.warehouse.orderpoint"
+            src_model="stock.warehouse"
+            groups="stock.group_stock_user"/>
 
         <act_window
             context="{'product_uom': locals().has_key('uom_id') and uom_id, 'default_procurement_id': active_id}"
@@ -283,23 +283,11 @@
         <menuitem id="menu_stock_procurement" name="Automatic Procurements" parent="stock.menu_stock_configuration" sequence="5"/>
             <menuitem action="action_orderpoint_form" id="menu_stock_order_points" parent="stock.menu_stock_configuration" sequence="10"/>
 
-        <record id="product_normal_form_view" model="ir.ui.view">
-            <field name="name">product.normal.form.orderpoint.inherit</field>
-            <field name="model">product.product</field>
-            <field name="inherit_id" ref="product.product_normal_form_view"/>
-            <field name="arch" type="xml">
-                <page string="Procurement &amp; Locations" position="inside">
-                    <separator string="Minimum Stock Rules"/>
-                        <field name="orderpoint_ids" widget="one2many_list" mode="tree" context="{'default_product_id': active_id}">
-                            <tree string="Reordering Rules">
-                                <field name="name"/>
-                                <field name="warehouse_id"/>
-                                <field name="product_min_qty"/>
-                                <field name="product_max_qty"/>
-                            </tree>
-                        </field>
-                </page>
-            </field>
+
+        <record model="ir.actions.act_window" id="product_open_orderpoint">
+            <field name="context">{'default_product_id': active_id, 'search_default_product_id': active_id}</field>
+            <field name="name">Orderpoints</field>
+            <field name="res_model">stock.warehouse.orderpoint</field>
         </record>
 
         <record model="ir.ui.view" id="product_form_view_procurement_button">
@@ -307,10 +295,9 @@
             <field name="model">product.product</field>
             <field name="inherit_id" ref="product.product_normal_form_view"/>
             <field name="arch" type="xml">
-                <xpath expr="//field[@name='image_medium']" position="after">
-                    <div class='oe_right oe_button_box'>
-                        <button string="Procurement Request" name="%(act_make_procurement)d" type="action"/>
-                    </div>
+                <xpath expr="//div[@name='buttons']" position="inside">
+                    <button string="Request Procurement" name="%(act_make_procurement)d" type="action"/>
+                    <button string="Orderpoints" name="%(product_open_orderpoint)d" type="action"/>
                 </xpath>
             </field>
         </record>
diff --git a/addons/procurement/schedulers.py b/addons/procurement/schedulers.py
index 7a87697f5c8..1c8ac5934fc 100644
--- a/addons/procurement/schedulers.py
+++ b/addons/procurement/schedulers.py
@@ -54,7 +54,6 @@ class procurement_order(osv.osv):
         '''
         if context is None:
             context = {}
-
         try:
             if use_new_cursor:
                 cr = pooler.get_db(use_new_cursor).cursor()
@@ -119,19 +118,6 @@ class procurement_order(osv.osv):
                 offset += len(ids)
                 if not ids: break
             end_date = fields.datetime.now()
-            if uid:
-                # Chatter: old res.request is now a chatter on res.users, id=uid
-                summary = _("""Here is the procurement scheduling report.
-
-        Start Time: %s 
-        End Time: %s 
-        Total Procurements processed: %d 
-        Procurements with exceptions: %d 
-        Skipped Procurements (scheduled date outside of scheduler range) %d 
-
-        Exceptions:\n""") % (start_date, end_date, report_total, report_except, report_later)
-                summary += '\n'.join(report)
-                procurement_obj.message_append_note(cr, uid, ids, body=summary, context=context)
 
             if use_new_cursor:
                 cr.commit()
diff --git a/addons/procurement/wizard/make_procurement_view.xml b/addons/procurement/wizard/make_procurement_view.xml
index 4d2e7553371..9228fcc323b 100644
--- a/addons/procurement/wizard/make_procurement_view.xml
+++ b/addons/procurement/wizard/make_procurement_view.xml
@@ -9,13 +9,21 @@
             <field name="model">make.procurement</field>
             <field name="arch" type="xml">
                 <form string="Procurement Request" version="7.0">
-                    <group col="4" string="This wizard will plan the procurement for this product. This procurement may generate task, production orders or purchase orders."/>
-                     <group>
-                        <field name="product_id" on_change="onchange_product_id(product_id)"/>
-                        <field name="qty"/>
-                        <field name="uom_id" groups="product.group_uom"/>
-                        <field name="date_planned"/>
+                    <p class="oe_gray">
+                        Fill is this for to launch 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.
+                    </p>
+                    <group>
                         <field name="warehouse_id" groups="stock.group_locations"/>
+                        <field name="product_id" on_change="onchange_product_id(product_id)"/>
+                        <label for="qty"/>
+                        <div>
+                            <field name="qty" class="oe_inline"/>
+                            <field name="uom_id" groups="product.group_uom"/>
+                        </div>
+                        <field name="date_planned"/>
                     </group>
                     <footer>
                         <button name="make_procurement" string="Ask New Products" type="object"  class="oe_highlight"  />
@@ -26,13 +34,13 @@
             </field>
         </record>
 
-        <act_window name="Procurement Request"
-            res_model="make.procurement"
-            src_model="product.product"
-            view_mode="form"
-            target="new"
-            key2="client_action_multi"
-            id="act_make_procurement"/>
+        <record model="ir.actions.act_window" id="act_make_procurement">
+            <field name="name">Procurement Request</field>
+            <field name="res_model">make.procurement</field>
+            <field name="src_model">product.product</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+        </record>
 
     </data>
 </openerp>
diff --git a/addons/product/__openerp__.py b/addons/product/__openerp__.py
index 5ade1a1a66b..0c14b999e99 100644
--- a/addons/product/__openerp__.py
+++ b/addons/product/__openerp__.py
@@ -21,14 +21,13 @@
 
 
 {
-    "name" : "Products & Pricelists",
-    "version" : "1.1",
-    "author" : "OpenERP SA",
+    'name': 'Products & Pricelists',
+    'version': '1.1',
+    'author': 'OpenERP SA',
     'category': 'Sales Management',
-    "depends" : ["base", "process", "decimal_precision", "mail"],
-    "init_xml" : [],
-    "demo_xml" : ["product_demo.xml", "product_image_demo.xml"],
-    "description": """
+    'depends': ['base', 'process', 'decimal_precision', 'mail'],
+    'demo': ['product_demo.xml', 'product_image_demo.xml'],
+    'description': """
 This is the base module for managing products and pricelists in OpenERP.
 ========================================================================
 
@@ -36,6 +35,7 @@ Products support variants, different pricing methods, suppliers information,
 make to stock/order, different unit of measures, packaging and properties.
 
 Pricelists support:
+-------------------
     * Multiple-level of discount (by product, category, quantities)
     * Compute price based on different criteria:
         * Other pricelist
@@ -47,7 +47,7 @@ Pricelists preferences by product and/or partners.
 
 Print product labels with barcode.
     """,
-    'update_xml': [
+    'data': [
         'security/product_security.xml',
         'security/ir.model.access.csv',
         'wizard/product_price_view.xml',
diff --git a/addons/product/i18n/ar.po b/addons/product/i18n/ar.po
index f3638639691..bef58060a90 100644
--- a/addons/product/i18n/ar.po
+++ b/addons/product/i18n/ar.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-14 04:44+0000\n"
-"X-Generator: Launchpad (build 15791)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:17+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: product
 #: model:product.template,name:product.product_product_ram512_product_template
@@ -363,7 +363,7 @@ msgstr ""
 #: model:product.price.type,name:product.list_price
 #: field:product.product,lst_price:0
 msgid "Public Price"
-msgstr ""
+msgstr "السعر العام"
 
 #. module: product
 #: field:product.price_list,qty5:0
@@ -532,7 +532,7 @@ msgstr ""
 #. module: product
 #: model:product.ul,name:product.product_ul_box
 msgid "Box 20x20x40"
-msgstr ""
+msgstr "صندوق 20×20×40"
 
 #. module: product
 #: view:product.pricelist.item:0
@@ -928,7 +928,7 @@ msgstr ""
 #. module: product
 #: field:product.packaging,weight:0
 msgid "Total Package Weight"
-msgstr ""
+msgstr "مجموع وزن الحزمة"
 
 #. module: product
 #: field:product.template,seller_info_id:0
diff --git a/addons/product/i18n/bg.po b/addons/product/i18n/bg.po
index 317e5e6849c..bee312cc895 100644
--- a/addons/product/i18n/bg.po
+++ b/addons/product/i18n/bg.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-14 04:44+0000\n"
-"X-Generator: Launchpad (build 15791)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:17+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: product
 #: model:product.template,name:product.product_product_ram512_product_template
diff --git a/addons/product/i18n/bs.po b/addons/product/i18n/bs.po
index bbd96fcd370..77a0fcb2613 100644
--- a/addons/product/i18n/bs.po
+++ b/addons/product/i18n/bs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-14 04:44+0000\n"
-"X-Generator: Launchpad (build 15791)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:17+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: product
 #: model:product.template,name:product.product_product_ram512_product_template
diff --git a/addons/product/i18n/ca.po b/addons/product/i18n/ca.po
index 8eb8ee9aec0..96d501b5cef 100644
--- a/addons/product/i18n/ca.po
+++ b/addons/product/i18n/ca.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-14 04:44+0000\n"
-"X-Generator: Launchpad (build 15791)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:17+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: product
 #: model:product.template,name:product.product_product_ram512_product_template
diff --git a/addons/product/i18n/cs.po b/addons/product/i18n/cs.po
index f4449e9a5b7..6904c287473 100644
--- a/addons/product/i18n/cs.po
+++ b/addons/product/i18n/cs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-14 04:44+0000\n"
-"X-Generator: Launchpad (build 15791)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:18+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 "X-Poedit-Language: Czech\n"
 
 #. module: product
diff --git a/addons/product/i18n/da.po b/addons/product/i18n/da.po
index 2183d47b9ee..2faad67ce7f 100644
--- a/addons/product/i18n/da.po
+++ b/addons/product/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-14 04:44+0000\n"
-"X-Generator: Launchpad (build 15791)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:18+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: product
 #: model:product.template,name:product.product_product_ram512_product_template
diff --git a/addons/product/i18n/de.po b/addons/product/i18n/de.po
index 3734aaf15c0..5e72140b5c6 100644
--- a/addons/product/i18n/de.po
+++ b/addons/product/i18n/de.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-14 04:44+0000\n"
-"X-Generator: Launchpad (build 15791)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:18+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: product
 #: model:product.template,name:product.product_product_ram512_product_template
diff --git a/addons/product/i18n/el.po b/addons/product/i18n/el.po
index 90ee73de604..1ab3a760a74 100644
--- a/addons/product/i18n/el.po
+++ b/addons/product/i18n/el.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-14 04:44+0000\n"
-"X-Generator: Launchpad (build 15791)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:18+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: product
 #: model:product.template,name:product.product_product_ram512_product_template
diff --git a/addons/product/i18n/es.po b/addons/product/i18n/es.po
index 4641ad40f6d..61a58edecef 100644
--- a/addons/product/i18n/es.po
+++ b/addons/product/i18n/es.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-14 04:45+0000\n"
-"X-Generator: Launchpad (build 15791)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:18+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: product
 #: model:product.template,name:product.product_product_ram512_product_template
diff --git a/addons/product/i18n/es_AR.po b/addons/product/i18n/es_AR.po
index 01e4e9b1821..b9707979452 100644
--- a/addons/product/i18n/es_AR.po
+++ b/addons/product/i18n/es_AR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-14 04:45+0000\n"
-"X-Generator: Launchpad (build 15791)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:18+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: product
 #: model:product.template,name:product.product_product_ram512_product_template
diff --git a/addons/product/i18n/es_CL.po b/addons/product/i18n/es_CL.po
index 8252e1cdbe8..1e263b6d84a 100644
--- a/addons/product/i18n/es_CL.po
+++ b/addons/product/i18n/es_CL.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-14 04:45+0000\n"
-"X-Generator: Launchpad (build 15791)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:18+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: product
 #: model:product.template,name:product.product_product_ram512_product_template
diff --git a/addons/product/i18n/es_CR.po b/addons/product/i18n/es_CR.po
index ef7bc9c4450..76d0e2a34fb 100644
--- a/addons/product/i18n/es_CR.po
+++ b/addons/product/i18n/es_CR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-14 04:45+0000\n"
-"X-Generator: Launchpad (build 15791)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:18+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 "Language: \n"
 
 #. module: product
diff --git a/addons/product/i18n/es_EC.po b/addons/product/i18n/es_EC.po
index ea8937e84e9..f454c1d0a85 100644
--- a/addons/product/i18n/es_EC.po
+++ b/addons/product/i18n/es_EC.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-14 04:45+0000\n"
-"X-Generator: Launchpad (build 15791)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:19+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: product
 #: model:product.template,name:product.product_product_ram512_product_template
diff --git a/addons/product/i18n/es_PY.po b/addons/product/i18n/es_PY.po
index 9bd7140da3d..6150919a265 100644
--- a/addons/product/i18n/es_PY.po
+++ b/addons/product/i18n/es_PY.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-14 04:45+0000\n"
-"X-Generator: Launchpad (build 15791)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:19+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: product
 #: model:product.template,name:product.product_product_ram512_product_template
diff --git a/addons/product/i18n/et.po b/addons/product/i18n/et.po
index 3bfc41b2135..3811d5d2ef4 100644
--- a/addons/product/i18n/et.po
+++ b/addons/product/i18n/et.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-14 04:44+0000\n"
-"X-Generator: Launchpad (build 15791)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:18+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: product
 #: code:addons/product/pricelist.py:178
diff --git a/addons/product/i18n/eu.po b/addons/product/i18n/eu.po
index 12067767e7a..7302e85ed83 100644
--- a/addons/product/i18n/eu.po
+++ b/addons/product/i18n/eu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-14 04:44+0000\n"
-"X-Generator: Launchpad (build 15791)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:17+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: product
 #: model:product.template,name:product.product_product_ram512_product_template
diff --git a/addons/product/i18n/fi.po b/addons/product/i18n/fi.po
index 2b529d4f432..7a66ee65473 100644
--- a/addons/product/i18n/fi.po
+++ b/addons/product/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-14 04:44+0000\n"
-"X-Generator: Launchpad (build 15791)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:18+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: product
 #: model:product.template,name:product.product_product_ram512_product_template
diff --git a/addons/product/i18n/fr.po b/addons/product/i18n/fr.po
index 4a281c0b62c..44966fb40b3 100644
--- a/addons/product/i18n/fr.po
+++ b/addons/product/i18n/fr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-14 04:44+0000\n"
-"X-Generator: Launchpad (build 15791)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:18+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: product
 #: view:product.product:0
diff --git a/addons/product/i18n/gl.po b/addons/product/i18n/gl.po
index a82ca272886..ab2d6ae680b 100644
--- a/addons/product/i18n/gl.po
+++ b/addons/product/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-14 04:44+0000\n"
-"X-Generator: Launchpad (build 15791)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:18+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: product
 #: model:product.template,name:product.product_product_ram512_product_template
diff --git a/addons/product/i18n/hr.po b/addons/product/i18n/hr.po
index f9cd6377049..12e3922d6dc 100644
--- a/addons/product/i18n/hr.po
+++ b/addons/product/i18n/hr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-14 04:45+0000\n"
-"X-Generator: Launchpad (build 15791)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:18+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: product
 #: model:product.template,name:product.product_product_ram512_product_template
diff --git a/addons/product/i18n/hu.po b/addons/product/i18n/hu.po
index 6f9241f2716..88efa494de7 100644
--- a/addons/product/i18n/hu.po
+++ b/addons/product/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-14 04:44+0000\n"
-"X-Generator: Launchpad (build 15791)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:18+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: product
 #: model:product.template,name:product.product_product_ram512_product_template
diff --git a/addons/product/i18n/id.po b/addons/product/i18n/id.po
index 478075ac0c4..2d6d3656b5d 100644
--- a/addons/product/i18n/id.po
+++ b/addons/product/i18n/id.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-14 04:44+0000\n"
-"X-Generator: Launchpad (build 15791)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:18+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: product
 #: model:product.template,name:product.product_product_ram512_product_template
diff --git a/addons/product/i18n/it.po b/addons/product/i18n/it.po
index 172cf1374f4..3d28002e324 100644
--- a/addons/product/i18n/it.po
+++ b/addons/product/i18n/it.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-14 04:44+0000\n"
-"X-Generator: Launchpad (build 15791)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:18+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: product
 #: model:product.template,name:product.product_product_ram512_product_template
diff --git a/addons/product/i18n/ja.po b/addons/product/i18n/ja.po
index 13ecf2b02f1..0b8ce96ebca 100644
--- a/addons/product/i18n/ja.po
+++ b/addons/product/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-14 04:44+0000\n"
-"X-Generator: Launchpad (build 15791)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:18+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: product
 #: model:product.template,name:product.product_product_ram512_product_template
diff --git a/addons/product/i18n/ko.po b/addons/product/i18n/ko.po
index ff02facde07..cb980b4f332 100644
--- a/addons/product/i18n/ko.po
+++ b/addons/product/i18n/ko.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-14 04:44+0000\n"
-"X-Generator: Launchpad (build 15791)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:18+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: product
 #: model:product.template,name:product.product_product_ram512_product_template
diff --git a/addons/product/i18n/lt.po b/addons/product/i18n/lt.po
index c72a3862b2c..e844d91605a 100644
--- a/addons/product/i18n/lt.po
+++ b/addons/product/i18n/lt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-14 04:44+0000\n"
-"X-Generator: Launchpad (build 15791)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:18+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 "Language: lt\n"
 
 #. module: product
diff --git a/addons/product/i18n/lv.po b/addons/product/i18n/lv.po
index 622be8c58b8..3a8cb954c54 100644
--- a/addons/product/i18n/lv.po
+++ b/addons/product/i18n/lv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-14 04:44+0000\n"
-"X-Generator: Launchpad (build 15791)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:18+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: product
 #: model:product.template,name:product.product_product_ram512_product_template
diff --git a/addons/product/i18n/mn.po b/addons/product/i18n/mn.po
index 4629527264a..b55f32ae558 100644
--- a/addons/product/i18n/mn.po
+++ b/addons/product/i18n/mn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-14 04:44+0000\n"
-"X-Generator: Launchpad (build 15791)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:18+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: product
 #: model:product.template,name:product.product_product_ram512_product_template
diff --git a/addons/product/i18n/nb.po b/addons/product/i18n/nb.po
index 7b4b2162133..404fbb3e0ca 100644
--- a/addons/product/i18n/nb.po
+++ b/addons/product/i18n/nb.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-14 04:44+0000\n"
-"X-Generator: Launchpad (build 15791)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:18+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: product
 #: model:product.template,name:product.product_product_ram512_product_template
diff --git a/addons/product/i18n/nl.po b/addons/product/i18n/nl.po
index e6953754ebe..95753866161 100644
--- a/addons/product/i18n/nl.po
+++ b/addons/product/i18n/nl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-14 04:44+0000\n"
-"X-Generator: Launchpad (build 15791)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:18+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: product
 #: model:product.template,name:product.product_product_ram512_product_template
diff --git a/addons/product/i18n/nl_BE.po b/addons/product/i18n/nl_BE.po
index b448ddb1b05..1b97cdb965d 100644
--- a/addons/product/i18n/nl_BE.po
+++ b/addons/product/i18n/nl_BE.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-14 04:45+0000\n"
-"X-Generator: Launchpad (build 15791)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:18+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: product
 #: model:product.template,name:product.product_product_ram512_product_template
diff --git a/addons/product/i18n/pl.po b/addons/product/i18n/pl.po
index d5af6d76fe9..78eaf22090b 100644
--- a/addons/product/i18n/pl.po
+++ b/addons/product/i18n/pl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-14 04:44+0000\n"
-"X-Generator: Launchpad (build 15791)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:18+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: product
 #: model:product.template,name:product.product_product_ram512_product_template
diff --git a/addons/product/i18n/pt.po b/addons/product/i18n/pt.po
index 881a013046e..86471923a65 100644
--- a/addons/product/i18n/pt.po
+++ b/addons/product/i18n/pt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-14 04:45+0000\n"
-"X-Generator: Launchpad (build 15791)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:18+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: product
 #: model:product.template,name:product.product_product_ram512_product_template
diff --git a/addons/product/i18n/pt_BR.po b/addons/product/i18n/pt_BR.po
index 6d50128ee72..8288cab55f8 100644
--- a/addons/product/i18n/pt_BR.po
+++ b/addons/product/i18n/pt_BR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-14 04:45+0000\n"
-"X-Generator: Launchpad (build 15791)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:18+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: product
 #: model:product.template,name:product.product_product_ram512_product_template
diff --git a/addons/product/i18n/ro.po b/addons/product/i18n/ro.po
index dc4d16a5d5a..b6a95e1b63b 100644
--- a/addons/product/i18n/ro.po
+++ b/addons/product/i18n/ro.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-14 04:45+0000\n"
-"X-Generator: Launchpad (build 15791)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:18+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: product
 #: model:product.template,name:product.product_product_ram512_product_template
diff --git a/addons/product/i18n/ru.po b/addons/product/i18n/ru.po
index 2cb0b0ba735..5762449e179 100644
--- a/addons/product/i18n/ru.po
+++ b/addons/product/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-02-08 00:37+0000\n"
-"PO-Revision-Date: 2012-07-26 16:28+0000\n"
-"Last-Translator: Michael Otcheskih <otma@mail.ru>\n"
+"PO-Revision-Date: 2012-08-30 18:22+0000\n"
+"Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-14 04:45+0000\n"
-"X-Generator: Launchpad (build 15791)\n"
+"X-Launchpad-Export-Date: 2012-08-31 04:56+0000\n"
+"X-Generator: Launchpad (build 15887)\n"
 
 #. module: product
 #: model:product.template,name:product.product_product_ram512_product_template
@@ -968,7 +968,7 @@ msgstr "Итоговый вес пакета"
 #. module: product
 #: field:product.template,seller_info_id:0
 msgid "unknown"
-msgstr ""
+msgstr "неизвесно"
 
 #. module: product
 #: help:product.packaging,code:0
@@ -1893,7 +1893,7 @@ msgstr "Другие ТМЦ"
 #. module: product
 #: field:product.product,color:0
 msgid "Color Index"
-msgstr ""
+msgstr "Цветовая палитра"
 
 #. module: product
 #: view:product.product:0
@@ -1919,7 +1919,7 @@ msgstr "Каталог поставщика"
 #: code:addons/product/product.py:175
 #, python-format
 msgid "Warning"
-msgstr ""
+msgstr "Внимание"
 
 #. module: product
 #: field:product.pricelist.item,base:0
@@ -2007,7 +2007,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:product.product_uom_categ_form_action
 #: model:ir.ui.menu,name:product.menu_product_uom_categ_form_action
 msgid "UoM Categories"
-msgstr ""
+msgstr "Категории единиц"
 
 #. module: product
 #: field:product.template,seller_delay:0
@@ -2088,7 +2088,7 @@ msgstr "Поставщик ТМЦ"
 #. module: product
 #: field:product.product,product_image:0
 msgid "Image"
-msgstr ""
+msgstr "Изображение"
 
 #. module: product
 #: field:product.uom,uom_type:0
diff --git a/addons/product/i18n/sk.po b/addons/product/i18n/sk.po
index 0e784836e1a..d9d679a035b 100644
--- a/addons/product/i18n/sk.po
+++ b/addons/product/i18n/sk.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-14 04:45+0000\n"
-"X-Generator: Launchpad (build 15791)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:18+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: product
 #: model:product.template,name:product.product_product_ram512_product_template
diff --git a/addons/product/i18n/sl.po b/addons/product/i18n/sl.po
index 9e83e3cdc01..9472eb7fb99 100644
--- a/addons/product/i18n/sl.po
+++ b/addons/product/i18n/sl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-14 04:45+0000\n"
-"X-Generator: Launchpad (build 15791)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:18+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: product
 #: model:product.template,name:product.product_product_ram512_product_template
diff --git a/addons/product/i18n/sq.po b/addons/product/i18n/sq.po
index c2830068339..817c8155a01 100644
--- a/addons/product/i18n/sq.po
+++ b/addons/product/i18n/sq.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-14 04:44+0000\n"
-"X-Generator: Launchpad (build 15791)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:17+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: product
 #: model:product.template,name:product.product_product_ram512_product_template
diff --git a/addons/product/i18n/sr.po b/addons/product/i18n/sr.po
index 895a3519292..1ef5fd8081d 100644
--- a/addons/product/i18n/sr.po
+++ b/addons/product/i18n/sr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-14 04:45+0000\n"
-"X-Generator: Launchpad (build 15791)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:18+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: product
 #: model:product.template,name:product.product_product_ram512_product_template
diff --git a/addons/product/i18n/sr@latin.po b/addons/product/i18n/sr@latin.po
index 54873997260..48301e7d00b 100644
--- a/addons/product/i18n/sr@latin.po
+++ b/addons/product/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-14 04:45+0000\n"
-"X-Generator: Launchpad (build 15791)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:19+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: product
 #: model:product.template,name:product.product_product_ram512_product_template
diff --git a/addons/product/i18n/sv.po b/addons/product/i18n/sv.po
index fe3398817d0..f216bfc8bdb 100644
--- a/addons/product/i18n/sv.po
+++ b/addons/product/i18n/sv.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-14 04:45+0000\n"
-"X-Generator: Launchpad (build 15791)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:18+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: product
 #: model:product.template,name:product.product_product_ram512_product_template
diff --git a/addons/product/i18n/th.po b/addons/product/i18n/th.po
index a2a7d9b5bd7..8e28e8e4ff3 100644
--- a/addons/product/i18n/th.po
+++ b/addons/product/i18n/th.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-14 04:45+0000\n"
-"X-Generator: Launchpad (build 15791)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:18+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: product
 #: model:product.template,name:product.product_product_ram512_product_template
diff --git a/addons/product/i18n/tlh.po b/addons/product/i18n/tlh.po
index 8e0f2b053e4..550b4ebae98 100644
--- a/addons/product/i18n/tlh.po
+++ b/addons/product/i18n/tlh.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-14 04:45+0000\n"
-"X-Generator: Launchpad (build 15791)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:18+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: product
 #: model:product.template,name:product.product_product_ram512_product_template
diff --git a/addons/product/i18n/tr.po b/addons/product/i18n/tr.po
index 10f0fb02810..44e7b46a7b5 100644
--- a/addons/product/i18n/tr.po
+++ b/addons/product/i18n/tr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-14 04:45+0000\n"
-"X-Generator: Launchpad (build 15791)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:18+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: product
 #: model:product.template,name:product.product_product_ram512_product_template
@@ -174,7 +174,7 @@ msgstr ""
 #. module: product
 #: model:product.uom,name:product.product_uom_dozen
 msgid "Dozen"
-msgstr ""
+msgstr "Düzine"
 
 #. module: product
 #: selection:product.template,cost_method:0
@@ -257,6 +257,8 @@ msgid ""
 "Create a product form for everything you buy or sell. Specify a supplier if "
 "the product can be purchased."
 msgstr ""
+"Satınaldığınız ya da sattığınız herşeyden bir ürün oluşturun. Satınalınır "
+"bir ürünse bir tedarikçi belirleyin."
 
 #. module: product
 #: view:product.uom:0
@@ -542,7 +544,7 @@ msgstr "Metal takoz"
 #: code:addons/product/product.py:175
 #, python-format
 msgid "Cannot change the category of existing UoM '%s'."
-msgstr ""
+msgstr "Mevcut Ölçü Biriminin '%s' kategorisi değiştirilemiyor."
 
 #. module: product
 #: model:ir.model,name:product.model_product_uom_categ
@@ -562,7 +564,7 @@ msgstr "Fiyat Hesaplaması"
 #. module: product
 #: model:res.groups,name:product.group_uos
 msgid "Product UoS View"
-msgstr ""
+msgstr "Ürün Satış Birimi Görünümü"
 
 #. module: product
 #: field:product.template,purchase_ok:0
@@ -610,7 +612,7 @@ msgstr "Ürün Kartı Şablonu"
 #. module: product
 #: field:product.category,parent_left:0
 msgid "Left Parent"
-msgstr ""
+msgstr "Sol Üst Öğe"
 
 #. module: product
 #: model:product.template,name:product.product_product_restaurantexpenses0_product_template
@@ -660,7 +662,7 @@ msgstr "Taban Fiyatı"
 #. module: product
 #: model:product.template,name:product.product_consultant_product_template
 msgid "Service on Timesheet"
-msgstr ""
+msgstr "Zamançizlgesi Hizmeti"
 
 #. module: product
 #: model:product.template,name:product.product_product_fan2_product_template
@@ -696,7 +698,7 @@ msgstr "Tedarikçi"
 #. module: product
 #: field:product.product,qty_available:0
 msgid "Quantity On Hand"
-msgstr ""
+msgstr "Eldeki Miktar"
 
 #. module: product
 #: model:product.template,name:product.product_product_26_product_template
@@ -711,7 +713,7 @@ msgstr "Fiyat Adı"
 #. module: product
 #: model:product.template,name:product.product_product_arm_product_template
 msgid "Cabinet"
-msgstr ""
+msgstr "Dolap"
 
 #. module: product
 #: help:product.product,incoming_qty:0
@@ -730,7 +732,7 @@ msgstr ""
 #. module: product
 #: model:product.template,name:product.product_product_woodentable0_product_template
 msgid "Wooden Table"
-msgstr ""
+msgstr "Ahşap Masa"
 
 #. module: product
 #: model:product.template,name:product.product_product_cpu3_product_template
@@ -896,7 +898,7 @@ msgstr "Geliştirilmekte"
 #: code:addons/product/product.py:363
 #, python-format
 msgid "UoM categories Mismatch!"
-msgstr ""
+msgstr "Ölçü Birimi kategorileri uyuşmuyor!"
 
 #. module: product
 #: model:product.template,name:product.product_product_shelfofcm1_product_template
@@ -973,7 +975,7 @@ msgstr "Toplam Paket Ağırlığı"
 #. module: product
 #: field:product.template,seller_info_id:0
 msgid "unknown"
-msgstr ""
+msgstr "bilinmeyen"
 
 #. module: product
 #: help:product.packaging,code:0
@@ -1121,7 +1123,7 @@ msgstr "Referans Ölçü biriminden büyük"
 #. module: product
 #: field:product.category,parent_right:0
 msgid "Right Parent"
-msgstr ""
+msgstr "Sağ Üst Öğe"
 
 #. module: product
 #: view:product.product:0
@@ -1307,7 +1309,7 @@ msgstr "Hizmetler"
 #. module: product
 #: model:ir.actions.act_window,name:product.product_form_config_action
 msgid "Create or Import Products"
-msgstr ""
+msgstr "Ürünleri Oluştur ya da İçeaktar"
 
 #. module: product
 #: field:product.pricelist.item,base_pricelist_id:0
@@ -1415,7 +1417,7 @@ msgstr "Fiyat Listesi Versiyonu"
 #. module: product
 #: field:product.product,virtual_available:0
 msgid "Quantity Available"
-msgstr ""
+msgstr "Mevcut Miktar"
 
 #. module: product
 #: help:product.pricelist.item,sequence:0
@@ -1588,7 +1590,7 @@ msgstr "Boş UL nin ağırlığı"
 #. module: product
 #: model:product.template,name:product.product_product_woodmm10_product_template
 msgid "Wood 10mm"
-msgstr ""
+msgstr "10 mm Tahta"
 
 #. module: product
 #: selection:product.uom,uom_type:0
@@ -1622,7 +1624,7 @@ msgstr "Paketin EAN barkodu"
 #. module: product
 #: help:product.supplierinfo,product_uom:0
 msgid "This comes from the product form."
-msgstr ""
+msgstr "Bu, ürün formundan geliyor."
 
 #. module: product
 #: field:product.packaging,weight_ul:0
@@ -1792,7 +1794,7 @@ msgstr "Yuvarlama yöntemi"
 #. module: product
 #: model:product.category,name:product.product_category_assembly
 msgid "Assembly Service"
-msgstr ""
+msgstr "Montaj Hizmeti"
 
 #. module: product
 #: model:ir.actions.report.xml,name:product.report_product_label
@@ -1902,7 +1904,7 @@ msgstr "Diğer Ürünler"
 #. module: product
 #: field:product.product,color:0
 msgid "Color Index"
-msgstr ""
+msgstr "Renk Endeksi"
 
 #. module: product
 #: view:product.product:0
@@ -1928,7 +1930,7 @@ msgstr "Tedarikçi Fiyat Listesi"
 #: code:addons/product/product.py:175
 #, python-format
 msgid "Warning"
-msgstr ""
+msgstr "Uyarı"
 
 #. module: product
 #: field:product.pricelist.item,base:0
@@ -1938,7 +1940,7 @@ msgstr "Temelinde"
 #. module: product
 #: model:product.uom,name:product.product_uom_ton
 msgid "t"
-msgstr ""
+msgstr "t"
 
 #. module: product
 #: model:product.category,name:product.product_category_rawmaterial0
@@ -2016,7 +2018,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:product.product_uom_categ_form_action
 #: model:ir.ui.menu,name:product.menu_product_uom_categ_form_action
 msgid "UoM Categories"
-msgstr ""
+msgstr "Ölçü Birimi Kategorileri"
 
 #. module: product
 #: field:product.template,seller_delay:0
@@ -2051,7 +2053,7 @@ msgstr ""
 #. module: product
 #: view:product.product:0
 msgid "Context..."
-msgstr ""
+msgstr "İçerik..."
 
 #. module: product
 #: model:product.template,name:product.product_product_hdd1_product_template
@@ -2096,7 +2098,7 @@ msgstr "Ürün Tedarikçisi"
 #. module: product
 #: field:product.product,product_image:0
 msgid "Image"
-msgstr ""
+msgstr "Görüntü"
 
 #. module: product
 #: field:product.uom,uom_type:0
@@ -2245,7 +2247,7 @@ msgstr "Sıra No"
 #. module: product
 #: model:product.template,name:product.product_assembly_product_template
 msgid "Assembly Service Cost"
-msgstr ""
+msgstr "Montaj Hizmeti Maliyeti"
 
 #. module: product
 #: view:product.price_list:0
@@ -2276,7 +2278,7 @@ msgstr "Gecikmeler"
 #. module: product
 #: view:product.product:0
 msgid "Both stockable and consumable products"
-msgstr ""
+msgstr "Hem stoklanabilir hem de tüketilebilir ürün"
 
 #. module: product
 #: model:process.node,note:product.process_node_product0
@@ -2383,7 +2385,7 @@ msgstr "Fiyat Listesi Versiyonları"
 #. module: product
 #: model:product.template,name:product.product_product_span100_product_template
 msgid "Shelf Panel"
-msgstr ""
+msgstr "Raf Paneli"
 
 #. module: product
 #: help:product.pricelist.item,price_round:0
@@ -2405,7 +2407,7 @@ msgstr "Satış Fiyatı"
 #. module: product
 #: constraint:product.category:0
 msgid "Error ! You cannot create recursive categories."
-msgstr ""
+msgstr "Yinelenen kategoriler oluşturamazsınız."
 
 #. module: product
 #: field:product.category,type:0
@@ -2429,7 +2431,7 @@ msgstr ""
 #. module: product
 #: constraint:res.partner:0
 msgid "Error ! You cannot create recursive associated members."
-msgstr ""
+msgstr "Hata ! yinelenen ilişkili üyeler oluşturamazsınız."
 
 #. module: product
 #: field:product.pricelist.item,price_discount:0
diff --git a/addons/product/i18n/uk.po b/addons/product/i18n/uk.po
index c8df83efc50..ae2f900ffde 100644
--- a/addons/product/i18n/uk.po
+++ b/addons/product/i18n/uk.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-14 04:45+0000\n"
-"X-Generator: Launchpad (build 15791)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:18+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: product
 #: model:product.template,name:product.product_product_ram512_product_template
diff --git a/addons/product/i18n/vi.po b/addons/product/i18n/vi.po
index f547c2ed8bc..b392aa5b661 100644
--- a/addons/product/i18n/vi.po
+++ b/addons/product/i18n/vi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-14 04:45+0000\n"
-"X-Generator: Launchpad (build 15791)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:18+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: product
 #: model:product.template,name:product.product_product_ram512_product_template
diff --git a/addons/product/i18n/zh_CN.po b/addons/product/i18n/zh_CN.po
index 01a320a2dd4..9bf52905906 100644
--- a/addons/product/i18n/zh_CN.po
+++ b/addons/product/i18n/zh_CN.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-14 04:45+0000\n"
-"X-Generator: Launchpad (build 15791)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:19+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: product
 #: model:product.template,name:product.product_product_ram512_product_template
diff --git a/addons/product/i18n/zh_TW.po b/addons/product/i18n/zh_TW.po
index a07ce3ea580..fae3fe5d5f1 100644
--- a/addons/product/i18n/zh_TW.po
+++ b/addons/product/i18n/zh_TW.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-14 04:45+0000\n"
-"X-Generator: Launchpad (build 15791)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:18+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: product
 #: model:product.template,name:product.product_product_ram512_product_template
diff --git a/addons/product/product.py b/addons/product/product.py
index ae99711a5ec..16b08e67cee 100644
--- a/addons/product/product.py
+++ b/addons/product/product.py
@@ -28,18 +28,10 @@ import re
 import tools
 from tools.translate import _
 
-def is_pair(x):
-    return not x%2
-
-def check_ean(eancode):
-    if not eancode:
-        return True
+def ean_checksum(eancode):
+    """returns the checksum of an ean string of length 13, returns -1 if the string has the wrong length"""
     if len(eancode) <> 13:
-        return False
-    try:
-        int(eancode)
-    except:
-        return False
+        return -1
     oddsum=0
     evensum=0
     total=0
@@ -48,17 +40,38 @@ def check_ean(eancode):
     finalean=reversevalue[1:]
 
     for i in range(len(finalean)):
-        if is_pair(i):
+        if i % 2 == 0:
             oddsum += int(finalean[i])
         else:
             evensum += int(finalean[i])
     total=(oddsum * 3) + evensum
 
     check = int(10 - math.ceil(total % 10.0)) %10
+    return check
 
-    if check != int(eancode[-1]):
+def check_ean(eancode):
+    """returns True if eancode is a valid ean13 string, or null"""
+    if not eancode:
+        return True
+    if len(eancode) <> 13:
         return False
-    return True
+    try:
+        int(eancode)
+    except:
+        return False
+    return ean_checksum(eancode) == int(eancode[-1])
+
+def sanitize_ean13(ean13):
+    """Creates and returns a valid ean13 from an invalid one"""
+    if not ean13:
+        return "0000000000000"
+    ean13 = re.sub("[A-Za-z]","0",ean13);
+    ean13 = re.sub("[^0-9]","",ean13);
+    ean13 = ean13[:13]
+    if len(ean13) < 13:
+        ean13 = ean13 + '0' * (13-len(ean13))
+    return ean13[:-1] + str(ean_checksum(ean13))
+
 #----------------------------------------------------------
 # UOM
 #----------------------------------------------------------
@@ -195,8 +208,10 @@ product_ul()
 class product_category(osv.osv):
 
     def name_get(self, cr, uid, ids, context=None):
-        if not len(ids):
+        if isinstance(ids, (list, tuple)) and not len(ids):
             return []
+        if isinstance(ids, (long, int)):
+            ids = [ids]
         reads = self.read(cr, uid, ids, ['name','parent_id'], context=context)
         res = []
         for record in reads:
@@ -273,13 +288,13 @@ class product_template(osv.osv):
         'rental': fields.boolean('Can be Rent'),
         'categ_id': fields.many2one('product.category','Category', required=True, change_default=True, domain="[('type','=','normal')]" ,help="Select category for the current product"),
         'list_price': fields.float('Sale Price', digits_compute=dp.get_precision('Product Price'), help="Base price for computing the customer price. Sometimes called the catalog price."),
-        'standard_price': fields.float('Cost Price', required=True, digits_compute=dp.get_precision('Product Price'), help="Product's cost for accounting stock valuation. It is the base price for the supplier price.", groups="base.group_user"),
+        'standard_price': fields.float('Cost', digits_compute=dp.get_precision('Product Price'), help="Product's cost for accounting stock valuation. It is the base price for the supplier price.", groups="base.group_user"),
         'volume': fields.float('Volume', help="The volume in m3."),
         'weight': fields.float('Gross Weight', digits_compute=dp.get_precision('Stock Weight'), help="The gross weight in Kg."),
         'weight_net': fields.float('Net Weight', digits_compute=dp.get_precision('Stock Weight'), help="The net weight in Kg."),
         'cost_method': fields.selection([('standard','Standard Price'), ('average','Average Price')], 'Costing Method', required=True,
             help="Standard Price: the cost price is fixed and recomputed periodically (usually at the end of the year), Average Price: the cost price is recomputed at each reception of products."),
-        'warranty': fields.float('Warranty (months)'),
+        'warranty': fields.float('Warranty'),
         'sale_ok': fields.boolean('Can be Sold', help="Determines if the product can be visible in the list of product within a selection from a sale order line."),
         'purchase_ok': fields.boolean('Can be Purchased', help="Determine if the product is visible in the list of products within a selection from a purchase order line."),
         'state': fields.selection([('',''),
@@ -287,7 +302,7 @@ class product_template(osv.osv):
             ('sellable','Normal'),
             ('end','End of Lifecycle'),
             ('obsolete','Obsolete')], 'Status', help="Tells the user if he can use the product or not."),
-        'uom_id': fields.many2one('product.uom', 'Default Unit of Measure', required=True, help="Default Unit of Measure used for all stock operation."),
+        '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='Used by companies that manage two units of measure: invoicing and inventory management. For example, in food industries, you will manage a stock of ham but invoice in Kg. Keep empty to use the default Unit of Measure.'),
@@ -339,7 +354,7 @@ class product_template(osv.osv):
         'list_price': lambda *a: 1,
         'cost_method': lambda *a: 'standard',
         'supply_method': lambda *a: 'buy',
-        'standard_price': lambda *a: 1,
+        'standard_price': lambda *a: 0.0,
         'sale_ok': lambda *a: 1,
         'sale_delay': lambda *a: 7,
         'produce_delay': lambda *a: 1,
@@ -484,7 +499,7 @@ class product_product(osv.osv):
             main_supplier = self._get_main_product_supplier(cr, uid, product, context=context)
             result[product.id] = {
                 'seller_info_id': main_supplier and main_supplier.id or False,
-                'seller_delay': main_supplier and main_supplier.delay or 1,
+                'seller_delay': main_supplier.delay if main_supplier else 1,
                 'seller_qty': main_supplier and main_supplier.qty or 0.0,
                 'seller_id': main_supplier and main_supplier.name.id or False
             }
@@ -520,13 +535,13 @@ class product_product(osv.osv):
         'outgoing_qty': fields.function(_product_outgoing_qty, type='float', string='Outgoing'),
         'price': fields.function(_product_price, type='float', string='Pricelist', digits_compute=dp.get_precision('Product Price')),
         'lst_price' : fields.function(_product_lst_price, type='float', string='Public Price', digits_compute=dp.get_precision('Product Price')),
-        'code': fields.function(_product_code, type='char', string='Reference'),
+        'code': fields.function(_product_code, type='char', string='Internal Reference'),
         'partner_ref' : fields.function(_product_partner_ref, type='char', string='Customer ref'),
-        'default_code' : fields.char('Reference', size=64, select=True),
+        'default_code' : fields.char('Internal Reference', size=64, select=True),
         'active': fields.boolean('Active', help="If the active field is set to False, it will allow you to hide the product without removing it."),
         'variants': fields.char('Variants', size=64),
         'product_tmpl_id': fields.many2one('product.template', 'Product Template', required=True, ondelete="cascade"),
-        'ean13': fields.char('EAN13', size=13, help="The numbers encoded in EAN-13 bar codes are product identification numbers."),
+        'ean13': fields.char('EAN13 Barcode', size=13, help="The numbers encoded in EAN-13 bar codes are product identification numbers."),
         'packaging' : fields.one2many('product.packaging', 'product_id', 'Logistical Units', help="Gives the different ways to package the same product. This has no impact on the picking order and is mainly used if you use the EDI module."),
         'price_extra': fields.float('Variant Price Extra', digits_compute=dp.get_precision('Product Price')),
         'price_margin': fields.float('Variant Price Margin', digits_compute=dp.get_precision('Product Price')),
@@ -565,7 +580,7 @@ class product_product(osv.osv):
         return obj_id
 
     def create_send_note(self, cr, uid, ids, context=None):
-        return self.message_append_note(cr, uid, ids, body=_("Product has been <b>created</b>."), context=context)
+        return self.message_post(cr, uid, ids, body=_("Product has been <b>created</b>."), context=context)
 
     def unlink(self, cr, uid, ids, context=None):
         unlink_ids = []
@@ -594,6 +609,7 @@ class product_product(osv.osv):
             res = check_ean(product['ean13'])
         return res
 
+
     _constraints = [(_check_ean_key, 'Error: Invalid ean code', ['ean13'])]
 
     def on_order(self, cr, uid, ids, orderline, quantity):
diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index 70651a0a795..d75fec3861b 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -12,8 +12,6 @@
                    <filter string="Services" icon="terp-accessories-archiver" domain="[('type','=','service')]"/>
                    <filter string="Products" icon="terp-accessories-archiver" domain="['|',('type','=','product'),('type','=','consu')]" help="Both stockable and consumable products"/>
                    <separator/>
-                   <filter string="To Sell" name="filter_to_sell" icon="terp-accessories-archiver-minus" domain="[('sale_ok','=',1)]"/>
-                   <separator/>
                    <filter name="filter_to_purchase" string="To Purchase" icon="terp-accessories-archiver+" domain="[('purchase_ok', '=', 1)]"/>
                    <filter string="Can be Sold" name="filter_to_sell" icon="terp-accessories-archiver-minus" domain="[('sale_ok','=',1)]"/>
                    <filter name="filter_to_purchase" string="Can be Purchased" icon="terp-accessories-archiver+" domain="[('purchase_ok', '=', 1)]"/>
@@ -71,85 +69,90 @@
                             </h1>
                             <label for="categ_id" class="oe_edit_only"/>
                             <h2><field name="categ_id"/></h2>
+                            <div name="options" groups="base.group_user">
+                                <field name="sale_ok"/>
+                                <label for="sale_ok"/>
+                                <field name="purchase_ok"/>
+                                <label for="purchase_ok"/>
+                            </div>
+                        </div>
+                        <div class="oe_right oe_button_box" name="buttons">
                         </div>
                         <notebook>
                             <page string="Information">
                                 <group>
                                     <group>
-                                        <field name="default_code"/>
-                                        <field name="ean13" placeholder="e.g. 5901234123457"/>
-                                        <field groups="product.group_product_variant" name="variants"/>
-                                    </group>
-                                    <group groups="base.group_user">
-                                        <field name="sale_ok"/>
-                                        <field name="purchase_ok"/>
-                                    </group>
-                                    <group string="Procurement">
                                         <field name="type"/>
-                                        <field name="procure_method" groups="base.group_user"/>
-                                        <field name="supply_method" groups="base.group_user"/>
-                                    </group>
-                                    <group string="Prices">
+                                        <field name="uom_id" on_change="onchange_uom(uom_id,uom_po_id)" groups="product.group_uom"/>
                                         <field name="list_price"/>
-                                        <field name="cost_method" groups="base.group_user"/>
-                                        <field name="standard_price" attrs="{'readonly':[('cost_method','=','average')]}"/>
+                                    </group>
+                                    <group>
+                                        <field name="default_code"/>
+                                        <label for="ean13"/>
+                                        <div name="ean">
+                                            <field name="ean13" placeholder="e.g. 5901234123457"/>
+                                        </div>
+                                    </group>
+                                    <group>
+                                        <field groups="product.group_product_variant" name="variants"/>
                                         <field name="price_margin" groups="product.group_product_variant"/>
                                         <field name="price_extra" groups="product.group_product_variant"/>
                                     </group>
-
+                                </group>
+                                <field name="description" placeholder="describe the product's characteristics for internal use..."/>
+                            </page>
+                            <page string="Procurements" groups="base.group_user">
+                                <group name="procurement">
+                                    <group>
+                                        <field name="procure_method" groups="base.group_user" attrs="{'invisible':[('type','=', 'service')]}"/>
+                                        <field name="cost_method" groups="product.group_costing_method"/>
+                                        <field name="standard_price" attrs="{'readonly':[('cost_method','=','average')]}"/>
+                                    </group>
+                                    <group>
+                                        <field name="uom_po_id" groups="product.group_uom"/>
+                                    </group>
+                                </group>
+                                <separator string="Notes for Suppliers"/>
+                                <field name="description_purchase" placeholder="This note will be displayed on requests for quotation..."/>
+                            </page>
+                            <page string="Inventory" groups="base.group_user">
+                                <group name="inventory">
+                                    <group name="status" string="Status">
+                                        <field name="state"/>
+                                        <field name="product_manager"/>
+                                    </group>
+                                    <group name="store" string="Storage Localisation">
+                                        <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                                        <field name="loc_rack" attrs="{'invisible':[('type','=','service')]}"/>
+                                        <field name="loc_row" attrs="{'invisible':[('type','=','service')]}"/>
+                                        <field name="loc_case" attrs="{'invisible':[('type','=','service')]}"/>
+                                    </group>
                                     <group groups="product.group_stock_packaging" string="Weights">
                                         <field digits="(14, 3)" name="volume" attrs="{'readonly':[('type','=','service')]}"/>
                                         <field name="weight" attrs="{'readonly':[('type','=','service')]}"/>
                                         <field name="weight_net" attrs="{'readonly':[('type','=','service')]}"/>
                                     </group>
-
-                                    <group name="uom" groups="product.group_uom" string="Unit of Measure">
-                                        <field name="uom_id" on_change="onchange_uom(uom_id,uom_po_id)"/>
-                                        <field name="uom_po_id"/>
+                                </group>
+                            </page>
+                            <page string="Sales" attrs="{'readonly':[('sale_ok','=',0)]}">
+                                <group name="sale">
+                                    <group string="Sale Conditions">
+                                        <label for="sale_delay"/>
+                                        <div>
+                                            <field name="sale_delay" class="oe_inline"/> days
+                                        </div>
+                                        <label for="warranty"/>
+                                        <div>
+                                            <field name="warranty" class="oe_inline"/> months
+                                        </div>
+                                    </group>
+                                    <group groups="product.group_uos" string="Unit of Measure">
                                         <field name="uos_id"/>
                                         <field name="uos_coeff"/>
                                         <field name="mes_type"/>
                                     </group>
-
-                                    <group name="status" string="Status">
-                                        <field name="state"/>
-                                        <field name="product_manager"/>
-                                    </group>
-
                                 </group>
-                            </page>
-                            <page string="Procurement &amp; Locations" groups="base.group_user">
-                                <group>
-                                    <group name="delay" string="Delays">
-                                        <field name="sale_delay" attrs="{'readonly':[('sale_ok','=',0)]}"/>
-                                        <field name="produce_delay" attrs="{'invisible':[('type','=','service')]}"/>
-                                        <field name="warranty"/>
-                                    </group>
-                                    <group name="store" string="Storage Localisation">
-                                        <field name="loc_rack" attrs="{'readonly':[('type','=','service')]}"/>
-                                        <field name="loc_row" attrs="{'readonly':[('type','=','service')]}"/>
-                                        <field name="loc_case" attrs="{'readonly':[('type','=','service')]}"/>
-                                    </group>
-                                    <group name="misc" string="Miscellaneous">
-                                        <field name="active"/>
-                                        <field name="company_id" groups="base.group_multi_company" widget="selection"/>
-                                    </group>
-                                </group>
-
-                            </page>
-                            <page string="Suppliers" groups="base.group_user">
-                                <field name="seller_ids" context="{'uom_id': uom_id}"/>
-                            </page>
-                            <page string="Descriptions" groups="base.group_user">
-                                <separator string="Description"/>
-                                <field name="description"/>
-                                <separator string="Sale Description"/>
-                                <field name="description_sale" placeholder="This note will be displayed on quotations..."/>
-                                <separator string="Purchase Description"/>
-                                <field name="description_purchase" placeholder="This note will be displayed on requests for quotation..."/>
-                            </page>
-                            <page groups="product.group_stock_packaging" string="Packaging">
-                                <field name="packaging">
+                                <field name="packaging" groups="product.group_stock_packaging">
                                     <form string="Packaging" version="7.0">
                                         <group col="4">
                                             <field name="ean"/>
@@ -171,6 +174,8 @@
                                         <field name="name"/>
                                     </form>
                                 </field>
+                                <separator string="Notes on Quotations"/>
+                                <field name="description_sale" placeholder="note to be displayed on quotations..."/>
                             </page>
                         </notebook>
                     </sheet>
@@ -183,42 +188,30 @@
         </record>
 
         <!-- Product Kanban View  -->
-        <record model="ir.ui.view" id="product_kanban_view">
+
+        <record model="ir.ui.view" id="product.product_kanban_view">
             <field name="name">Product Kanban</field>
             <field name="model">product.product</field>
             <field name="arch" type="xml">
                 <kanban>
                     <field name="color"/>
                     <field name="type"/>
-                    <field name="image_medium"/>
+                    <field name="image_small"/>
                     <field name="list_price"/>
                     <templates>
                         <t t-name="kanban-box">
-                            <t t-if="record.type.raw_value!='service' and record.qty_available.raw_value lte 0" t-set="border">oe_kanban_color_red</t>
-                            <div t-attf-class="#{kanban_color(record.color.raw_value)} #{border || ''}">
-                                <div class="oe_kanban_box oe_kanban_color_border">
-                                    <div class="oe_kanban_box_header oe_kanban_color_bgdark oe_kanban_color_border oe_kanban_draghandle oe_kanban_title">
-                                        <field name="name"/>
-                                    </div>
-                                    <div class="oe_kanban_box_content oe_kanban_color_bglight oe_kanban_box_show_onclick_trigger">
-                                        <img t-att-src="kanban_image('product.product', 'image_medium', record.id.value)" width="48" style="float: left; padding: 0 4px 4px 0"/>
-                                        Code: <field name="code"/>
-                                        <div t-if="record.type.raw_value == 'service'">No Stock</div>
-                                        <t t-if="record.type.raw_value != 'service'">
-                                            <div>Stock: <field name="qty_available"/> on hand, <field name="virtual_available"/> available</div>
-                                            <div t-if="record.list_price.raw_value != 0">Public Price: <field name="lst_price"/></div>
-                                            <!-- TODO would deserve to be hidden at the field level -->
-                                            <div groups="base.group_user">Cost : <field name="standard_price"/></div>
-                                        </t>
-                                        <div class="oe_kanban_clear"/>
-                                    </div>
-                                    <div class="oe_kanban_buttons_set oe_kanban_color_border oe_kanban_color_bglight oe_kanban_box_show_onclick">
-                                        <div class="oe_kanban_left">
-                                            <a string="Edit" icon="gtk-edit" type="edit"/>
-                                            <a string="Change Color" icon="color-picker" type="color" name="color"/>
-                                        </div>
-                                        <div class="oe_kanban_clear"/>
-                                    </div>
+                            <div class="oe_kanban_vignette oe_semantic_html_override">
+                                <a type="open"><img t-att-src="kanban_image('product.product', 'image_small', record.id.value)" class="oe_kanban_image"/></a>
+                                <div class="oe_kanban_details">
+                                    <h4>
+                                        <a type="open">
+                                             <t t-if="record.code.raw_value">[<field name="code"/>]</t> <field name="name"/>
+                                        </a>
+                                    </h4>
+                                    <div name="tags"/>
+                                    <ul>
+                                        <li>Price: <field name="lst_price"></field></li>
+                                    </ul>
                                 </div>
                             </div>
                         </t>
@@ -248,7 +241,7 @@
             <field name="name">Products</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">product.product</field>
-            <field name="view_mode">tree,form,kanban</field>
+            <field name="view_mode">kanban,tree,form</field>
             <field name="view_type">form</field>
             <field name="context">{"search_default_filter_to_sell":1}</field>
             <field name="view_id" ref="product_product_tree_view"/>
@@ -271,7 +264,7 @@
         <record id="open_view_product_tree1" model="ir.actions.act_window.view">
             <field name="sequence" eval="2"/>
             <field name="view_mode">tree</field>
-           <field name="view_id" ref="product_product_tree_view"/>
+            <field name="view_id" ref="product_product_tree_view"/>
             <field name="act_window_id" ref="product_normal_action_sell"/>
         </record>
 
@@ -285,8 +278,8 @@
         <record id="open_view_product_kanban1" model="ir.actions.act_window.view">
             <field name="sequence" eval="1"/>
             <field name="view_mode">kanban</field>
-           <field name="view_id" ref="product_kanban_view"/>
-            <field name="act_window_id" ref="product_normal_action"/>
+            <field name="view_id" ref="product_kanban_view"/>
+            <field name="act_window_id" ref="product_normal_action_sell"/>
         </record>
 
         <menuitem id="base.menu_product" name="Products" parent="base.menu_base_partner" sequence="9"/>
@@ -555,7 +548,7 @@
             <field name="model">product.packaging</field>
             <field name="arch" type="xml">
                 <tree string="Packaging">
-                    <field name="sequence" invisible="1"/>
+                    <field name="sequence" widget="handle"/>
                     <field name="ean"/>
                     <field name="qty"/>
                     <field name="ul"/>
@@ -627,7 +620,7 @@
             <field name="model">product.supplierinfo</field>
             <field name="arch" type="xml">
                 <tree string="Supplier Information">
-                    <field name="sequence" string="Seq"/>
+                    <field name="sequence" widget="handle"/>
                     <field name="name"/>
                     <field name="delay"/>
                     <field name="min_qty"/>
@@ -737,7 +730,10 @@
                             <group>
                                 <group name="delay" string="Delays">
                                     <field name="sale_delay" attrs="{'readonly':[('sale_ok','=',0)]}"/>
-                                    <field name="produce_delay"/>
+                                    <label for="produce_delay"/>
+                                    <div>
+                                        <field name="produce_delay" class="oe_inline"/> days
+                                    </div>
                                     <field name="warranty"/>
                                 </group>
                                 <group name="store" string="Storage Localisation">
diff --git a/addons/product/security/product_security.xml b/addons/product/security/product_security.xml
index 1d2c795083a..73ab6f8a3d5 100644
--- a/addons/product/security/product_security.xml
+++ b/addons/product/security/product_security.xml
@@ -23,7 +23,12 @@
         <field name="name">Purchase Pricelists</field>
         <field name="category_id" ref="base.module_category_hidden"/>
     </record>
-
+	
+	<record id="group_costing_method" model="res.groups">
+        <field name="name">Costing Method</field>
+        <field name="category_id" ref="base.module_category_hidden"/>
+    </record>
+	
     <record id="group_uom" model="res.groups">
         <field name="name">Manage Multiple Units of Measure</field>
         <field name="category_id" ref="base.module_category_hidden"/>
diff --git a/addons/product_expiry/__openerp__.py b/addons/product_expiry/__openerp__.py
index 29e30bf380d..b4f66edc482 100644
--- a/addons/product_expiry/__openerp__.py
+++ b/addons/product_expiry/__openerp__.py
@@ -18,28 +18,28 @@
 #
 ##############################################################################
 {
-    "name" : "Products Expiry Date",
-    "version" : "1.0",
-    "author" : "OpenERP SA",
-    "category" : "Specific Industry Applications",
-    "depends" : ["stock"],
-    "init_xml" : [],
-    "demo_xml" : ["product_expiry_demo.xml"],
-    "description": '''
+    'name' : 'Products Expiry Date',
+    'version' : '1.0',
+    'author' : 'OpenERP SA',
+    'category' : 'Specific Industry Applications',
+    'depends' : ['stock'],
+    'demo' : ['product_expiry_demo.xml'],
+    'description': """
 Track different dates on products and production lots.
 ======================================================
 
 Following dates can be tracked:
+-------------------------------
     - end of life
     - best before date
     - removal date
     - alert date
 
-Used, for example, in food industries.''',
-    "update_xml" : ["product_expiry_view.xml"],
-    "auto_install": False,
-    "installable": True,
-    "certificate": "00421222123914960109",
+Used, for example, in food industries.""",
+    'data' : ['product_expiry_view.xml'],
+    'auto_install': False,
+    'installable': True,
+    'certificate': '00421222123914960109',
     'images': ['images/production_lots_dates.jpeg','images/products_dates.jpeg'],
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/product_expiry/i18n/ar.po b/addons/product_expiry/i18n/ar.po
index 6721711ed99..a8686f8dde7 100644
--- a/addons/product_expiry/i18n/ar.po
+++ b/addons/product_expiry/i18n/ar.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:28+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:32+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: product_expiry
 #: model:ir.model,name:product_expiry.model_stock_production_lot
diff --git a/addons/product_expiry/i18n/ca.po b/addons/product_expiry/i18n/ca.po
index f027b5fed61..f9d99255ee2 100644
--- a/addons/product_expiry/i18n/ca.po
+++ b/addons/product_expiry/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:28+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:32+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: product_expiry
 #: model:ir.model,name:product_expiry.model_stock_production_lot
diff --git a/addons/product_expiry/i18n/da.po b/addons/product_expiry/i18n/da.po
index 16ef24cef51..040eba4c8b1 100644
--- a/addons/product_expiry/i18n/da.po
+++ b/addons/product_expiry/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:28+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:32+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: product_expiry
 #: model:ir.model,name:product_expiry.model_stock_production_lot
diff --git a/addons/product_expiry/i18n/de.po b/addons/product_expiry/i18n/de.po
index 88ffc1ded22..4c804aa8a51 100644
--- a/addons/product_expiry/i18n/de.po
+++ b/addons/product_expiry/i18n/de.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:28+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:33+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: product_expiry
 #: model:ir.model,name:product_expiry.model_stock_production_lot
diff --git a/addons/product_expiry/i18n/el.po b/addons/product_expiry/i18n/el.po
index 11379bd2a4b..a463d7ff810 100644
--- a/addons/product_expiry/i18n/el.po
+++ b/addons/product_expiry/i18n/el.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:28+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:33+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: product_expiry
 #: model:ir.model,name:product_expiry.model_stock_production_lot
diff --git a/addons/product_expiry/i18n/es.po b/addons/product_expiry/i18n/es.po
index e262837b78e..fc05684b87d 100644
--- a/addons/product_expiry/i18n/es.po
+++ b/addons/product_expiry/i18n/es.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:28+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:33+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: product_expiry
 #: model:ir.model,name:product_expiry.model_stock_production_lot
diff --git a/addons/product_expiry/i18n/es_CR.po b/addons/product_expiry/i18n/es_CR.po
index eddfde6ea25..37589a8b4df 100644
--- a/addons/product_expiry/i18n/es_CR.po
+++ b/addons/product_expiry/i18n/es_CR.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:28+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:33+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 "Language: es\n"
 
 #. module: product_expiry
diff --git a/addons/product_expiry/i18n/es_EC.po b/addons/product_expiry/i18n/es_EC.po
index 8c600992a65..0f9e1800304 100644
--- a/addons/product_expiry/i18n/es_EC.po
+++ b/addons/product_expiry/i18n/es_EC.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:28+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:33+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: product_expiry
 #: model:ir.model,name:product_expiry.model_stock_production_lot
diff --git a/addons/product_expiry/i18n/et.po b/addons/product_expiry/i18n/et.po
index 0a60353068d..46637e1cf73 100644
--- a/addons/product_expiry/i18n/et.po
+++ b/addons/product_expiry/i18n/et.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:28+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:32+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: product_expiry
 #: model:ir.model,name:product_expiry.model_stock_production_lot
diff --git a/addons/product_expiry/i18n/fi.po b/addons/product_expiry/i18n/fi.po
index 72550a48591..cc00e69c6e4 100644
--- a/addons/product_expiry/i18n/fi.po
+++ b/addons/product_expiry/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:28+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:32+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: product_expiry
 #: model:ir.model,name:product_expiry.model_stock_production_lot
diff --git a/addons/product_expiry/i18n/fr.po b/addons/product_expiry/i18n/fr.po
index 0fa59ccc80c..5184e07f1b4 100644
--- a/addons/product_expiry/i18n/fr.po
+++ b/addons/product_expiry/i18n/fr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:28+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:33+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: product_expiry
 #: model:ir.model,name:product_expiry.model_stock_production_lot
diff --git a/addons/product_expiry/i18n/gl.po b/addons/product_expiry/i18n/gl.po
index bdfb8561450..26687436be2 100644
--- a/addons/product_expiry/i18n/gl.po
+++ b/addons/product_expiry/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:28+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:33+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: product_expiry
 #: model:ir.model,name:product_expiry.model_stock_production_lot
diff --git a/addons/product_expiry/i18n/hr.po b/addons/product_expiry/i18n/hr.po
index 326658e31f3..dab210bcbf5 100644
--- a/addons/product_expiry/i18n/hr.po
+++ b/addons/product_expiry/i18n/hr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:28+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:33+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: product_expiry
 #: model:ir.model,name:product_expiry.model_stock_production_lot
diff --git a/addons/product_expiry/i18n/hu.po b/addons/product_expiry/i18n/hu.po
index 0695927bcf3..c9ded27b769 100644
--- a/addons/product_expiry/i18n/hu.po
+++ b/addons/product_expiry/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:28+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:33+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: product_expiry
 #: model:ir.model,name:product_expiry.model_stock_production_lot
diff --git a/addons/product_expiry/i18n/it.po b/addons/product_expiry/i18n/it.po
index c1d71398dc2..27e31127ceb 100644
--- a/addons/product_expiry/i18n/it.po
+++ b/addons/product_expiry/i18n/it.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:28+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:33+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: product_expiry
 #: model:ir.model,name:product_expiry.model_stock_production_lot
diff --git a/addons/product_expiry/i18n/ja.po b/addons/product_expiry/i18n/ja.po
index 6c604cc286f..457c414886a 100644
--- a/addons/product_expiry/i18n/ja.po
+++ b/addons/product_expiry/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:28+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:33+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: product_expiry
 #: model:ir.model,name:product_expiry.model_stock_production_lot
diff --git a/addons/product_expiry/i18n/mn.po b/addons/product_expiry/i18n/mn.po
index 083ac52f802..5ef96838e65 100644
--- a/addons/product_expiry/i18n/mn.po
+++ b/addons/product_expiry/i18n/mn.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:28+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:33+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: product_expiry
 #: model:ir.model,name:product_expiry.model_stock_production_lot
diff --git a/addons/product_expiry/i18n/nl.po b/addons/product_expiry/i18n/nl.po
index 91a079ec6ba..9284d168484 100644
--- a/addons/product_expiry/i18n/nl.po
+++ b/addons/product_expiry/i18n/nl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:28+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:32+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: product_expiry
 #: model:ir.model,name:product_expiry.model_stock_production_lot
diff --git a/addons/product_expiry/i18n/pl.po b/addons/product_expiry/i18n/pl.po
index b2d731eb162..6a8a9780936 100644
--- a/addons/product_expiry/i18n/pl.po
+++ b/addons/product_expiry/i18n/pl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:28+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:33+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: product_expiry
 #: model:ir.model,name:product_expiry.model_stock_production_lot
diff --git a/addons/product_expiry/i18n/pt.po b/addons/product_expiry/i18n/pt.po
index a5c60ab18bb..82d0eecedb5 100644
--- a/addons/product_expiry/i18n/pt.po
+++ b/addons/product_expiry/i18n/pt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:28+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:33+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: product_expiry
 #: model:ir.model,name:product_expiry.model_stock_production_lot
diff --git a/addons/product_expiry/i18n/pt_BR.po b/addons/product_expiry/i18n/pt_BR.po
index bd05b2b82cd..22850a82ad2 100644
--- a/addons/product_expiry/i18n/pt_BR.po
+++ b/addons/product_expiry/i18n/pt_BR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:28+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:33+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: product_expiry
 #: model:ir.model,name:product_expiry.model_stock_production_lot
diff --git a/addons/product_expiry/i18n/ro.po b/addons/product_expiry/i18n/ro.po
index 98cc5a4c95b..1d473acf271 100644
--- a/addons/product_expiry/i18n/ro.po
+++ b/addons/product_expiry/i18n/ro.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:28+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:33+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: product_expiry
 #: model:ir.model,name:product_expiry.model_stock_production_lot
diff --git a/addons/product_expiry/i18n/ru.po b/addons/product_expiry/i18n/ru.po
index 710d81c4816..0a5e14aa86d 100644
--- a/addons/product_expiry/i18n/ru.po
+++ b/addons/product_expiry/i18n/ru.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:28+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:33+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: product_expiry
 #: model:ir.model,name:product_expiry.model_stock_production_lot
diff --git a/addons/product_expiry/i18n/sl.po b/addons/product_expiry/i18n/sl.po
index d2bf5f4bc43..05286b2ff4d 100644
--- a/addons/product_expiry/i18n/sl.po
+++ b/addons/product_expiry/i18n/sl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:28+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:33+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: product_expiry
 #: model:ir.model,name:product_expiry.model_stock_production_lot
diff --git a/addons/product_expiry/i18n/sr.po b/addons/product_expiry/i18n/sr.po
index c8024d2b457..a3b52fe67b2 100644
--- a/addons/product_expiry/i18n/sr.po
+++ b/addons/product_expiry/i18n/sr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:28+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:33+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: product_expiry
 #: model:ir.model,name:product_expiry.model_stock_production_lot
diff --git a/addons/product_expiry/i18n/sr@latin.po b/addons/product_expiry/i18n/sr@latin.po
index 0d6fd710e09..d114f0c0f73 100644
--- a/addons/product_expiry/i18n/sr@latin.po
+++ b/addons/product_expiry/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:28+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:33+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: product_expiry
 #: model:ir.model,name:product_expiry.model_stock_production_lot
diff --git a/addons/product_expiry/i18n/sv.po b/addons/product_expiry/i18n/sv.po
index 21b82a371d1..f99b37fe4c1 100644
--- a/addons/product_expiry/i18n/sv.po
+++ b/addons/product_expiry/i18n/sv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:28+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:33+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: product_expiry
 #: model:ir.model,name:product_expiry.model_stock_production_lot
diff --git a/addons/product_expiry/i18n/tr.po b/addons/product_expiry/i18n/tr.po
index 3f131cd2dff..c6a0be54471 100644
--- a/addons/product_expiry/i18n/tr.po
+++ b/addons/product_expiry/i18n/tr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:28+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:33+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: product_expiry
 #: model:ir.model,name:product_expiry.model_stock_production_lot
diff --git a/addons/product_expiry/i18n/vi.po b/addons/product_expiry/i18n/vi.po
index d90d971b7d5..ef27c831bcd 100644
--- a/addons/product_expiry/i18n/vi.po
+++ b/addons/product_expiry/i18n/vi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:28+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:33+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: product_expiry
 #: model:ir.model,name:product_expiry.model_stock_production_lot
diff --git a/addons/product_expiry/i18n/zh_CN.po b/addons/product_expiry/i18n/zh_CN.po
index 71a2d830c67..759a586f127 100644
--- a/addons/product_expiry/i18n/zh_CN.po
+++ b/addons/product_expiry/i18n/zh_CN.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:28+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:33+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: product_expiry
 #: model:ir.model,name:product_expiry.model_stock_production_lot
diff --git a/addons/product_expiry/product_expiry_view.xml b/addons/product_expiry/product_expiry_view.xml
index f883ca55fe0..88ea6f365e8 100644
--- a/addons/product_expiry/product_expiry_view.xml
+++ b/addons/product_expiry/product_expiry_view.xml
@@ -21,14 +21,14 @@
             <field name="model">product.product</field>
             <field name="inherit_id" ref="product.product_normal_form_view" />
             <field name="arch" type="xml">
-                <notebook position="inside">
-                    <page string="Dates">
+                <group name="inventory">
+                    <group string="Dates">
                         <field name="life_time" />
                         <field name="use_time" />
                         <field name="removal_time" />
                         <field name="alert_time" />
-                    </page>
-                </notebook>
+                    </group>
+                </group>
             </field>
         </record>
     </data>
diff --git a/addons/product_manufacturer/__openerp__.py b/addons/product_manufacturer/__openerp__.py
index 98cf8d2d8de..8e24f8476f0 100644
--- a/addons/product_manufacturer/__openerp__.py
+++ b/addons/product_manufacturer/__openerp__.py
@@ -18,30 +18,30 @@
 #
 ##############################################################################
 {
-    "name" : "Products Manufacturers",
-    "version" : "1.0",
-    "author" : "OpenERP SA",
+    'name': 'Products Manufacturers',
+    'version': '1.0',
+    'author': 'OpenERP SA',
     'category': 'Purchase Management',
-    "depends" : ["stock"],
-    "init_xml" : [],
-    "demo_xml" : [],
-    "description": """
+    'depends': ['stock'],
+    'demo': [],
+    'description': """
 A module that adds manufacturers and attributes on the product form.
 ====================================================================
 
 You can now define the following for a product:
+-----------------------------------------------
     * Manufacturer
     * Manufacturer Product Name
     * Manufacturer Product Code
     * Product Attributes
     """,
-    "update_xml" : [
-        "security/ir.model.access.csv",
-        "product_manufacturer_view.xml"
+    'data': [
+        'security/ir.model.access.csv',
+        'product_manufacturer_view.xml'
     ],
-    "auto_install": False,
-    "installable": True,
-    "certificate" : "00720153953662760781",
+    'auto_install': False,
+    'installable': True,
+    'certificate': '00720153953662760781',
     'images': ['images/products_manufacturer.jpeg'],
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/product_manufacturer/i18n/ar.po b/addons/product_manufacturer/i18n/ar.po
index 2313f81268c..032805f7212 100644
--- a/addons/product_manufacturer/i18n/ar.po
+++ b/addons/product_manufacturer/i18n/ar.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:28+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:33+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: product_manufacturer
 #: field:product.product,manufacturer_pref:0
diff --git a/addons/product_manufacturer/i18n/bg.po b/addons/product_manufacturer/i18n/bg.po
index bc4a8096fb8..67312c97d55 100644
--- a/addons/product_manufacturer/i18n/bg.po
+++ b/addons/product_manufacturer/i18n/bg.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:28+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:33+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: product_manufacturer
 #: field:product.product,manufacturer_pref:0
diff --git a/addons/product_manufacturer/i18n/ca.po b/addons/product_manufacturer/i18n/ca.po
index e5cf1bd794f..6d5fe7393b0 100644
--- a/addons/product_manufacturer/i18n/ca.po
+++ b/addons/product_manufacturer/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:28+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:33+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: product_manufacturer
 #: field:product.product,manufacturer_pref:0
diff --git a/addons/product_manufacturer/i18n/da.po b/addons/product_manufacturer/i18n/da.po
index 3f499979e2f..dbb3d6179c1 100644
--- a/addons/product_manufacturer/i18n/da.po
+++ b/addons/product_manufacturer/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:28+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:33+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: product_manufacturer
 #: field:product.product,manufacturer_pref:0
diff --git a/addons/product_manufacturer/i18n/de.po b/addons/product_manufacturer/i18n/de.po
index 50abf2a4fc4..f9752919403 100644
--- a/addons/product_manufacturer/i18n/de.po
+++ b/addons/product_manufacturer/i18n/de.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:28+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:33+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: product_manufacturer
 #: field:product.product,manufacturer_pref:0
diff --git a/addons/product_manufacturer/i18n/el.po b/addons/product_manufacturer/i18n/el.po
index 9e49f542bcc..c1a9d37905f 100644
--- a/addons/product_manufacturer/i18n/el.po
+++ b/addons/product_manufacturer/i18n/el.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:28+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:33+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: product_manufacturer
 #: field:product.product,manufacturer_pref:0
diff --git a/addons/product_manufacturer/i18n/es.po b/addons/product_manufacturer/i18n/es.po
index 1b5587ba74e..f471ac7e4f3 100644
--- a/addons/product_manufacturer/i18n/es.po
+++ b/addons/product_manufacturer/i18n/es.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:28+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:33+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: product_manufacturer
 #: field:product.product,manufacturer_pref:0
diff --git a/addons/product_manufacturer/i18n/es_CR.po b/addons/product_manufacturer/i18n/es_CR.po
index a981fb20cdd..525dc45a3af 100644
--- a/addons/product_manufacturer/i18n/es_CR.po
+++ b/addons/product_manufacturer/i18n/es_CR.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:28+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:33+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 "Language: es\n"
 
 #. module: product_manufacturer
diff --git a/addons/product_manufacturer/i18n/es_EC.po b/addons/product_manufacturer/i18n/es_EC.po
index 9280034b17a..ae42043af3e 100644
--- a/addons/product_manufacturer/i18n/es_EC.po
+++ b/addons/product_manufacturer/i18n/es_EC.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:28+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:33+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: product_manufacturer
 #: field:product.product,manufacturer_pref:0
diff --git a/addons/product_manufacturer/i18n/et.po b/addons/product_manufacturer/i18n/et.po
index 760f9688b86..f4cc37e9e32 100644
--- a/addons/product_manufacturer/i18n/et.po
+++ b/addons/product_manufacturer/i18n/et.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:28+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:33+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: product_manufacturer
 #: field:product.product,manufacturer_pref:0
diff --git a/addons/product_manufacturer/i18n/fi.po b/addons/product_manufacturer/i18n/fi.po
index d95c0f3f019..97760d3448f 100644
--- a/addons/product_manufacturer/i18n/fi.po
+++ b/addons/product_manufacturer/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:28+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:33+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: product_manufacturer
 #: field:product.product,manufacturer_pref:0
diff --git a/addons/product_manufacturer/i18n/fr.po b/addons/product_manufacturer/i18n/fr.po
index 81aa2d262a6..fc9e8da9100 100644
--- a/addons/product_manufacturer/i18n/fr.po
+++ b/addons/product_manufacturer/i18n/fr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:28+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:33+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: product_manufacturer
 #: field:product.product,manufacturer_pref:0
diff --git a/addons/product_manufacturer/i18n/gl.po b/addons/product_manufacturer/i18n/gl.po
index c89fd0802fc..9d9b707ded0 100644
--- a/addons/product_manufacturer/i18n/gl.po
+++ b/addons/product_manufacturer/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:28+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:33+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: product_manufacturer
 #: field:product.product,manufacturer_pref:0
diff --git a/addons/product_manufacturer/i18n/hr.po b/addons/product_manufacturer/i18n/hr.po
index 4d3ccf8a40f..9c387571a2f 100644
--- a/addons/product_manufacturer/i18n/hr.po
+++ b/addons/product_manufacturer/i18n/hr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:28+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:33+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: product_manufacturer
 #: field:product.product,manufacturer_pref:0
diff --git a/addons/product_manufacturer/i18n/hu.po b/addons/product_manufacturer/i18n/hu.po
index 9d37d907657..04167eb5d0e 100644
--- a/addons/product_manufacturer/i18n/hu.po
+++ b/addons/product_manufacturer/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:28+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:33+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: product_manufacturer
 #: field:product.product,manufacturer_pref:0
diff --git a/addons/product_manufacturer/i18n/it.po b/addons/product_manufacturer/i18n/it.po
index 861b8bcaee0..8e6716d6084 100644
--- a/addons/product_manufacturer/i18n/it.po
+++ b/addons/product_manufacturer/i18n/it.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:28+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:33+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: product_manufacturer
 #: field:product.product,manufacturer_pref:0
diff --git a/addons/product_manufacturer/i18n/ja.po b/addons/product_manufacturer/i18n/ja.po
index 31e998df9a7..bf8cf7d17f7 100644
--- a/addons/product_manufacturer/i18n/ja.po
+++ b/addons/product_manufacturer/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:28+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:33+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: product_manufacturer
 #: field:product.product,manufacturer_pref:0
diff --git a/addons/product_manufacturer/i18n/mn.po b/addons/product_manufacturer/i18n/mn.po
index 44dc56018a0..31a350daee7 100644
--- a/addons/product_manufacturer/i18n/mn.po
+++ b/addons/product_manufacturer/i18n/mn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:28+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:33+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: product_manufacturer
 #: field:product.product,manufacturer_pref:0
diff --git a/addons/product_manufacturer/i18n/nb.po b/addons/product_manufacturer/i18n/nb.po
index 233ceb7bdcc..56196c54abf 100644
--- a/addons/product_manufacturer/i18n/nb.po
+++ b/addons/product_manufacturer/i18n/nb.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:28+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:33+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: product_manufacturer
 #: field:product.product,manufacturer_pref:0
diff --git a/addons/product_manufacturer/i18n/nl.po b/addons/product_manufacturer/i18n/nl.po
index a85f71bc7ec..60fb8b7887d 100644
--- a/addons/product_manufacturer/i18n/nl.po
+++ b/addons/product_manufacturer/i18n/nl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:28+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:33+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: product_manufacturer
 #: field:product.product,manufacturer_pref:0
diff --git a/addons/product_manufacturer/i18n/pl.po b/addons/product_manufacturer/i18n/pl.po
index 1b510e5f390..4f6d3b1999c 100644
--- a/addons/product_manufacturer/i18n/pl.po
+++ b/addons/product_manufacturer/i18n/pl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:28+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:33+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: product_manufacturer
 #: field:product.product,manufacturer_pref:0
diff --git a/addons/product_manufacturer/i18n/pt.po b/addons/product_manufacturer/i18n/pt.po
index d035a8d2c40..86ba54cff76 100644
--- a/addons/product_manufacturer/i18n/pt.po
+++ b/addons/product_manufacturer/i18n/pt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:28+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:33+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: product_manufacturer
 #: field:product.product,manufacturer_pref:0
diff --git a/addons/product_manufacturer/i18n/pt_BR.po b/addons/product_manufacturer/i18n/pt_BR.po
index 54b5ccac8ab..3cea4b5d7f4 100644
--- a/addons/product_manufacturer/i18n/pt_BR.po
+++ b/addons/product_manufacturer/i18n/pt_BR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:28+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:33+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: product_manufacturer
 #: field:product.product,manufacturer_pref:0
diff --git a/addons/product_manufacturer/i18n/ro.po b/addons/product_manufacturer/i18n/ro.po
index 4fcadf4a4fb..d840abca1f0 100644
--- a/addons/product_manufacturer/i18n/ro.po
+++ b/addons/product_manufacturer/i18n/ro.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:28+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:33+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: product_manufacturer
 #: field:product.product,manufacturer_pref:0
diff --git a/addons/product_manufacturer/i18n/ru.po b/addons/product_manufacturer/i18n/ru.po
index a77c6a638df..c8841a8929e 100644
--- a/addons/product_manufacturer/i18n/ru.po
+++ b/addons/product_manufacturer/i18n/ru.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:28+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:33+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: product_manufacturer
 #: field:product.product,manufacturer_pref:0
diff --git a/addons/product_manufacturer/i18n/sl.po b/addons/product_manufacturer/i18n/sl.po
index 6b9faa26778..a281d9b5dd0 100644
--- a/addons/product_manufacturer/i18n/sl.po
+++ b/addons/product_manufacturer/i18n/sl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:28+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:33+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: product_manufacturer
 #: field:product.product,manufacturer_pref:0
diff --git a/addons/product_manufacturer/i18n/sr.po b/addons/product_manufacturer/i18n/sr.po
index a8e056c6cd2..326a7c375a8 100644
--- a/addons/product_manufacturer/i18n/sr.po
+++ b/addons/product_manufacturer/i18n/sr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:28+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:33+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: product_manufacturer
 #: field:product.product,manufacturer_pref:0
diff --git a/addons/product_manufacturer/i18n/sr@latin.po b/addons/product_manufacturer/i18n/sr@latin.po
index fab847e4ef2..028158e7cb6 100644
--- a/addons/product_manufacturer/i18n/sr@latin.po
+++ b/addons/product_manufacturer/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:28+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:33+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: product_manufacturer
 #: field:product.product,manufacturer_pref:0
diff --git a/addons/product_manufacturer/i18n/sv.po b/addons/product_manufacturer/i18n/sv.po
index 3e4bd87de6e..600169855cf 100644
--- a/addons/product_manufacturer/i18n/sv.po
+++ b/addons/product_manufacturer/i18n/sv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:28+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:33+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: product_manufacturer
 #: field:product.product,manufacturer_pref:0
diff --git a/addons/product_manufacturer/i18n/tr.po b/addons/product_manufacturer/i18n/tr.po
index a4c295dcfe5..ab13b37d473 100644
--- a/addons/product_manufacturer/i18n/tr.po
+++ b/addons/product_manufacturer/i18n/tr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:28+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:33+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: product_manufacturer
 #: field:product.product,manufacturer_pref:0
diff --git a/addons/product_manufacturer/i18n/zh_CN.po b/addons/product_manufacturer/i18n/zh_CN.po
index 7b727476ea9..bb1673e66b7 100644
--- a/addons/product_manufacturer/i18n/zh_CN.po
+++ b/addons/product_manufacturer/i18n/zh_CN.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:28+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:33+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: product_manufacturer
 #: field:product.product,manufacturer_pref:0
diff --git a/addons/product_manufacturer/product_manufacturer_view.xml b/addons/product_manufacturer/product_manufacturer_view.xml
index 5f620747d64..88f528693df 100644
--- a/addons/product_manufacturer/product_manufacturer_view.xml
+++ b/addons/product_manufacturer/product_manufacturer_view.xml
@@ -7,23 +7,21 @@
             <field name="model">product.product</field>
             <field name="inherit_id" ref="product.product_normal_form_view" />
             <field name="arch" type="xml">
-                <notebook position="inside">
-                    <page string="Manufacturer">
-                        <group string="Manufacturer">
-                            <field name="manufacturer" />
-                            <field name="manufacturer_pname"/>
-                            <field name="manufacturer_pref"/>
-                        </group>
-                        <group string="Attributes">
-                            <field name="attribute_ids" colspan="4" nolabel="1">
-                                <tree string="Product Attributes" editable="bottom">
-                                    <field name="name"/>
-                                    <field name="value"/>
-                                </tree>
-                            </field>
-                        </group>
-                    </page>
-                </notebook>
+                <group name="procurement" position="inside">
+                    <group string="Manufacturer">
+                        <field name="manufacturer" />
+                        <field name="manufacturer_pname"/>
+                        <field name="manufacturer_pref"/>
+                    </group>
+                    <group string="Attributes">
+                        <field name="attribute_ids" colspan="4" nolabel="1">
+                            <tree string="Product Attributes" editable="bottom">
+                                <field name="name"/>
+                                <field name="value"/>
+                            </tree>
+                        </field>
+                    </group>
+                </group>
             </field>
         </record>
 
diff --git a/addons/product_margin/__openerp__.py b/addons/product_margin/__openerp__.py
index e45734cde52..76e4d3964b1 100644
--- a/addons/product_margin/__openerp__.py
+++ b/addons/product_margin/__openerp__.py
@@ -32,13 +32,13 @@ The wizard to launch the report has several options to help you get the data you
 """,
     'author': 'OpenERP SA',
     'depends': ['account'],
-    'update_xml': [
-                   'security/ir.model.access.csv',
-                   'wizard/product_margin_view.xml',
-                   'product_margin_view.xml'
+    'data': [
+        'security/ir.model.access.csv',
+        'wizard/product_margin_view.xml',
+        'product_margin_view.xml'
     ],
     'test':['test/product_margin.yml'],
-    'demo_xml': [],
+    'demo': [],
     'installable': True,
     'auto_install': False,
     'certificate': '0064392591773',
diff --git a/addons/product_margin/i18n/ar.po b/addons/product_margin/i18n/ar.po
index 68e8881bd37..1185a6273fb 100644
--- a/addons/product_margin/i18n/ar.po
+++ b/addons/product_margin/i18n/ar.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: product_margin
 #: view:product.product:0
diff --git a/addons/product_margin/i18n/bg.po b/addons/product_margin/i18n/bg.po
index 6d7237d0ad0..6621792f06f 100644
--- a/addons/product_margin/i18n/bg.po
+++ b/addons/product_margin/i18n/bg.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: product_margin
 #: view:product.product:0
diff --git a/addons/product_margin/i18n/bs.po b/addons/product_margin/i18n/bs.po
index 81364d748a7..a2222e66567 100644
--- a/addons/product_margin/i18n/bs.po
+++ b/addons/product_margin/i18n/bs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: product_margin
 #: view:product.product:0
diff --git a/addons/product_margin/i18n/ca.po b/addons/product_margin/i18n/ca.po
index 5949557fe67..d1e285b40e1 100644
--- a/addons/product_margin/i18n/ca.po
+++ b/addons/product_margin/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: product_margin
 #: view:product.product:0
diff --git a/addons/product_margin/i18n/cs.po b/addons/product_margin/i18n/cs.po
index cd88eb90c6e..6b1da560c20 100644
--- a/addons/product_margin/i18n/cs.po
+++ b/addons/product_margin/i18n/cs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: product_margin
 #: view:product.product:0
diff --git a/addons/product_margin/i18n/da.po b/addons/product_margin/i18n/da.po
index dc26b79e2c3..15b7982fc6e 100644
--- a/addons/product_margin/i18n/da.po
+++ b/addons/product_margin/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: product_margin
 #: view:product.product:0
diff --git a/addons/product_margin/i18n/de.po b/addons/product_margin/i18n/de.po
index 1b2bd4f8a59..821ba56557a 100644
--- a/addons/product_margin/i18n/de.po
+++ b/addons/product_margin/i18n/de.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: product_margin
 #: view:product.product:0
diff --git a/addons/product_margin/i18n/el.po b/addons/product_margin/i18n/el.po
index 7d430ce55a4..cb6f9403171 100644
--- a/addons/product_margin/i18n/el.po
+++ b/addons/product_margin/i18n/el.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
 "X-Poedit-SourceCharset: utf-8\n"
diff --git a/addons/product_margin/i18n/es.po b/addons/product_margin/i18n/es.po
index 4a5c30c1beb..2913fb4809a 100644
--- a/addons/product_margin/i18n/es.po
+++ b/addons/product_margin/i18n/es.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: product_margin
 #: view:product.product:0
diff --git a/addons/product_margin/i18n/es_AR.po b/addons/product_margin/i18n/es_AR.po
index 167c49b2ef3..e8a246155ad 100644
--- a/addons/product_margin/i18n/es_AR.po
+++ b/addons/product_margin/i18n/es_AR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: product_margin
 #: view:product.product:0
diff --git a/addons/product_margin/i18n/es_CR.po b/addons/product_margin/i18n/es_CR.po
index 89df3ab4ccf..b1f5cf97dcd 100644
--- a/addons/product_margin/i18n/es_CR.po
+++ b/addons/product_margin/i18n/es_CR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 "Language: \n"
 
 #. module: product_margin
diff --git a/addons/product_margin/i18n/es_EC.po b/addons/product_margin/i18n/es_EC.po
index abf219f0691..d11b1871696 100644
--- a/addons/product_margin/i18n/es_EC.po
+++ b/addons/product_margin/i18n/es_EC.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: product_margin
 #: view:product.product:0
diff --git a/addons/product_margin/i18n/et.po b/addons/product_margin/i18n/et.po
index 1bc94e5f4fa..d092339ab1a 100644
--- a/addons/product_margin/i18n/et.po
+++ b/addons/product_margin/i18n/et.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: product_margin
 #: view:product.product:0
diff --git a/addons/product_margin/i18n/fi.po b/addons/product_margin/i18n/fi.po
index b26ef544599..457ff77abbb 100644
--- a/addons/product_margin/i18n/fi.po
+++ b/addons/product_margin/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: product_margin
 #: view:product.product:0
diff --git a/addons/product_margin/i18n/fr.po b/addons/product_margin/i18n/fr.po
index c17792fc365..b804980eb0f 100644
--- a/addons/product_margin/i18n/fr.po
+++ b/addons/product_margin/i18n/fr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: product_margin
 #: view:product.product:0
diff --git a/addons/product_margin/i18n/gl.po b/addons/product_margin/i18n/gl.po
index 46b62a2e178..0c8dff3def4 100644
--- a/addons/product_margin/i18n/gl.po
+++ b/addons/product_margin/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: product_margin
 #: view:product.product:0
diff --git a/addons/product_margin/i18n/gu.po b/addons/product_margin/i18n/gu.po
index b4d4bf2dc98..83d394ed889 100644
--- a/addons/product_margin/i18n/gu.po
+++ b/addons/product_margin/i18n/gu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: product_margin
 #: view:product.product:0
diff --git a/addons/product_margin/i18n/hr.po b/addons/product_margin/i18n/hr.po
index 93b49244397..c34a3cc316e 100644
--- a/addons/product_margin/i18n/hr.po
+++ b/addons/product_margin/i18n/hr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: product_margin
 #: view:product.product:0
diff --git a/addons/product_margin/i18n/hu.po b/addons/product_margin/i18n/hu.po
index 36afa1da30a..827624109b1 100644
--- a/addons/product_margin/i18n/hu.po
+++ b/addons/product_margin/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: product_margin
 #: view:product.product:0
diff --git a/addons/product_margin/i18n/id.po b/addons/product_margin/i18n/id.po
index d50027281f6..6446f17db0e 100644
--- a/addons/product_margin/i18n/id.po
+++ b/addons/product_margin/i18n/id.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: product_margin
 #: view:product.product:0
diff --git a/addons/product_margin/i18n/it.po b/addons/product_margin/i18n/it.po
index 5e55b9b719f..6f76c3faca9 100644
--- a/addons/product_margin/i18n/it.po
+++ b/addons/product_margin/i18n/it.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: product_margin
 #: view:product.product:0
diff --git a/addons/product_margin/i18n/ja.po b/addons/product_margin/i18n/ja.po
index c7f54681418..74aaec7737e 100644
--- a/addons/product_margin/i18n/ja.po
+++ b/addons/product_margin/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: product_margin
 #: view:product.product:0
diff --git a/addons/product_margin/i18n/ko.po b/addons/product_margin/i18n/ko.po
index 2460c101fe8..e9d2fc7cfd7 100644
--- a/addons/product_margin/i18n/ko.po
+++ b/addons/product_margin/i18n/ko.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: product_margin
 #: view:product.product:0
diff --git a/addons/product_margin/i18n/lt.po b/addons/product_margin/i18n/lt.po
index b41ad5dd2ad..d210bf8252f 100644
--- a/addons/product_margin/i18n/lt.po
+++ b/addons/product_margin/i18n/lt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: product_margin
 #: view:product.product:0
diff --git a/addons/product_margin/i18n/nl.po b/addons/product_margin/i18n/nl.po
index 35d9d1f1624..d37d6e4ce44 100644
--- a/addons/product_margin/i18n/nl.po
+++ b/addons/product_margin/i18n/nl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: product_margin
 #: view:product.product:0
diff --git a/addons/product_margin/i18n/nl_BE.po b/addons/product_margin/i18n/nl_BE.po
index ba7d78275c3..adc4ecb2df0 100644
--- a/addons/product_margin/i18n/nl_BE.po
+++ b/addons/product_margin/i18n/nl_BE.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: product_margin
 #: view:product.product:0
diff --git a/addons/product_margin/i18n/pl.po b/addons/product_margin/i18n/pl.po
index 45534e0deac..66dfb9087f1 100644
--- a/addons/product_margin/i18n/pl.po
+++ b/addons/product_margin/i18n/pl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: product_margin
 #: view:product.product:0
diff --git a/addons/product_margin/i18n/pt.po b/addons/product_margin/i18n/pt.po
index 17ef7a30bda..f4b0bbc2094 100644
--- a/addons/product_margin/i18n/pt.po
+++ b/addons/product_margin/i18n/pt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: product_margin
 #: view:product.product:0
diff --git a/addons/product_margin/i18n/pt_BR.po b/addons/product_margin/i18n/pt_BR.po
index 2bf2105ee69..c3035876b87 100644
--- a/addons/product_margin/i18n/pt_BR.po
+++ b/addons/product_margin/i18n/pt_BR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: product_margin
 #: view:product.product:0
diff --git a/addons/product_margin/i18n/ro.po b/addons/product_margin/i18n/ro.po
index 0e92c7a0712..f2761392824 100644
--- a/addons/product_margin/i18n/ro.po
+++ b/addons/product_margin/i18n/ro.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: product_margin
 #: view:product.product:0
diff --git a/addons/product_margin/i18n/ru.po b/addons/product_margin/i18n/ru.po
index 08384dab6ca..baabfa56a39 100644
--- a/addons/product_margin/i18n/ru.po
+++ b/addons/product_margin/i18n/ru.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: product_margin
 #: view:product.product:0
diff --git a/addons/product_margin/i18n/sl.po b/addons/product_margin/i18n/sl.po
index 72bba12033d..a93fd1917db 100644
--- a/addons/product_margin/i18n/sl.po
+++ b/addons/product_margin/i18n/sl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: product_margin
 #: view:product.product:0
diff --git a/addons/product_margin/i18n/sq.po b/addons/product_margin/i18n/sq.po
index 744cf91add8..61f91140ad6 100644
--- a/addons/product_margin/i18n/sq.po
+++ b/addons/product_margin/i18n/sq.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: product_margin
 #: view:product.product:0
diff --git a/addons/product_margin/i18n/sr.po b/addons/product_margin/i18n/sr.po
index 567c3b7fe20..2293069f420 100644
--- a/addons/product_margin/i18n/sr.po
+++ b/addons/product_margin/i18n/sr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: product_margin
 #: view:product.product:0
diff --git a/addons/product_margin/i18n/sr@latin.po b/addons/product_margin/i18n/sr@latin.po
index 4943e0fd9cf..e4623f60028 100644
--- a/addons/product_margin/i18n/sr@latin.po
+++ b/addons/product_margin/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: product_margin
 #: view:product.product:0
diff --git a/addons/product_margin/i18n/sv.po b/addons/product_margin/i18n/sv.po
index 4f34abff0a2..7efca2af081 100644
--- a/addons/product_margin/i18n/sv.po
+++ b/addons/product_margin/i18n/sv.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: product_margin
 #: view:product.product:0
diff --git a/addons/product_margin/i18n/tlh.po b/addons/product_margin/i18n/tlh.po
index a1240e064cc..058e969b631 100644
--- a/addons/product_margin/i18n/tlh.po
+++ b/addons/product_margin/i18n/tlh.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: product_margin
 #: view:product.product:0
diff --git a/addons/product_margin/i18n/tr.po b/addons/product_margin/i18n/tr.po
index b2458016334..aa0587131c8 100644
--- a/addons/product_margin/i18n/tr.po
+++ b/addons/product_margin/i18n/tr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: product_margin
 #: view:product.product:0
diff --git a/addons/product_margin/i18n/uk.po b/addons/product_margin/i18n/uk.po
index b69f33044ec..236e023aaba 100644
--- a/addons/product_margin/i18n/uk.po
+++ b/addons/product_margin/i18n/uk.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: product_margin
 #: view:product.product:0
diff --git a/addons/product_margin/i18n/vi.po b/addons/product_margin/i18n/vi.po
index 1438d46e80a..0ed76a5768c 100644
--- a/addons/product_margin/i18n/vi.po
+++ b/addons/product_margin/i18n/vi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: product_margin
 #: view:product.product:0
diff --git a/addons/product_margin/i18n/zh_CN.po b/addons/product_margin/i18n/zh_CN.po
index d5950f84a8f..e4aa2061bec 100644
--- a/addons/product_margin/i18n/zh_CN.po
+++ b/addons/product_margin/i18n/zh_CN.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: product_margin
 #: view:product.product:0
diff --git a/addons/product_margin/i18n/zh_TW.po b/addons/product_margin/i18n/zh_TW.po
index 477bb82ea57..137e93d7b17 100644
--- a/addons/product_margin/i18n/zh_TW.po
+++ b/addons/product_margin/i18n/zh_TW.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: product_margin
 #: view:product.product:0
diff --git a/addons/product_margin/test/product_margin.yml b/addons/product_margin/test/product_margin.yml
index b1dee4a423d..9252fdd52b8 100644
--- a/addons/product_margin/test/product_margin.yml
+++ b/addons/product_margin/test/product_margin.yml
@@ -6,7 +6,7 @@
     to_date: !eval "'%s-12-31' %(datetime.now().year)"
     invoice_state: open_paid
 -
-  I open margin for PC3
+  I open margin for PC-DEM
 -
   !python {model: product.margin}: |
     self.action_open_window(cr, uid, [ref("product_margin_wiz0")], {"lang": 'en_US',
diff --git a/addons/product_visible_discount/__openerp__.py b/addons/product_visible_discount/__openerp__.py
index 0bba2cca4ac..d3c35dfe8b0 100644
--- a/addons/product_visible_discount/__openerp__.py
+++ b/addons/product_visible_discount/__openerp__.py
@@ -18,29 +18,29 @@
 #
 ##############################################################################
 {
-    "name": "Prices Visible Discounts",
-    "version": "1.0",
-    "author": "OpenERP SA",
+    'name': 'Prices Visible Discounts',
+    'version': '1.0',
+    'author': 'OpenERP SA',
     'category': 'Sales Management',
-    "description": """
+    'description': """
 This module lets you calculate discounts on Sale Order lines and Invoice lines base on the partner's pricelist.
 ===============================================================================================================
 
-To this end, a new check box named "Visible Discount" is added to the pricelist form.
+To this end, a new check box named 'Visible Discount' is added to the pricelist form.
 
-Example:
+**Example:**
     For the product PC1 and the partner "Asustek": if listprice=450, and the price
     calculated using Asustek's pricelist is 225. If the check box is checked, we
     will have on the sale order line: Unit price=450, Discount=50,00, Net price=225.
     If the check box is unchecked, we will have on Sale Order and Invoice lines:
     Unit price=225, Discount=0,00, Net price=225.
     """,
-    "depends": ["sale"],
-    "demo_xml": [],
-    "update_xml": ['product_visible_discount_view.xml'],
-    "auto_install": False,
-    "installable": True,
-    "certificate" : "001144718884654279901",
+    'depends': ['sale'],
+    'demo': [],
+    'data': ['product_visible_discount_view.xml'],
+    'auto_install': False,
+    'installable': True,
+    'certificate' : '001144718884654279901',
     'images': ['images/pricelists_visible_discount.jpeg'],
 }
 
diff --git a/addons/product_visible_discount/i18n/ar.po b/addons/product_visible_discount/i18n/ar.po
index 9e213203151..0b6001968c0 100644
--- a/addons/product_visible_discount/i18n/ar.po
+++ b/addons/product_visible_discount/i18n/ar.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:33+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: product_visible_discount
 #: code:addons/product_visible_discount/product_visible_discount.py:153
diff --git a/addons/product_visible_discount/i18n/bg.po b/addons/product_visible_discount/i18n/bg.po
index 59f1f99124b..2ae4480924a 100644
--- a/addons/product_visible_discount/i18n/bg.po
+++ b/addons/product_visible_discount/i18n/bg.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:33+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: product_visible_discount
 #: code:addons/product_visible_discount/product_visible_discount.py:153
diff --git a/addons/product_visible_discount/i18n/ca.po b/addons/product_visible_discount/i18n/ca.po
index d99d679fbbf..49fc53146da 100644
--- a/addons/product_visible_discount/i18n/ca.po
+++ b/addons/product_visible_discount/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:33+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: product_visible_discount
 #: code:addons/product_visible_discount/product_visible_discount.py:153
diff --git a/addons/product_visible_discount/i18n/da.po b/addons/product_visible_discount/i18n/da.po
index 24c863de5d7..333e2bd72e1 100644
--- a/addons/product_visible_discount/i18n/da.po
+++ b/addons/product_visible_discount/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: product_visible_discount
 #: code:addons/product_visible_discount/product_visible_discount.py:153
diff --git a/addons/product_visible_discount/i18n/de.po b/addons/product_visible_discount/i18n/de.po
index 5aeebfc95dc..6235fa341d1 100644
--- a/addons/product_visible_discount/i18n/de.po
+++ b/addons/product_visible_discount/i18n/de.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: product_visible_discount
 #: code:addons/product_visible_discount/product_visible_discount.py:153
diff --git a/addons/product_visible_discount/i18n/el.po b/addons/product_visible_discount/i18n/el.po
index edcd0088a9f..06c4af0cbb3 100644
--- a/addons/product_visible_discount/i18n/el.po
+++ b/addons/product_visible_discount/i18n/el.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: product_visible_discount
 #: code:addons/product_visible_discount/product_visible_discount.py:153
diff --git a/addons/product_visible_discount/i18n/es.po b/addons/product_visible_discount/i18n/es.po
index 4e7f200c2b2..b1c2ae7dc73 100644
--- a/addons/product_visible_discount/i18n/es.po
+++ b/addons/product_visible_discount/i18n/es.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: product_visible_discount
 #: code:addons/product_visible_discount/product_visible_discount.py:153
diff --git a/addons/product_visible_discount/i18n/es_CR.po b/addons/product_visible_discount/i18n/es_CR.po
index b3c01ac82b6..e143e841904 100644
--- a/addons/product_visible_discount/i18n/es_CR.po
+++ b/addons/product_visible_discount/i18n/es_CR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 "Language: es\n"
 
 #. module: product_visible_discount
diff --git a/addons/product_visible_discount/i18n/es_EC.po b/addons/product_visible_discount/i18n/es_EC.po
index 809308bf9f6..30f607f83d3 100644
--- a/addons/product_visible_discount/i18n/es_EC.po
+++ b/addons/product_visible_discount/i18n/es_EC.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: product_visible_discount
 #: code:addons/product_visible_discount/product_visible_discount.py:153
diff --git a/addons/product_visible_discount/i18n/et.po b/addons/product_visible_discount/i18n/et.po
index 55d1761e65c..01153a72362 100644
--- a/addons/product_visible_discount/i18n/et.po
+++ b/addons/product_visible_discount/i18n/et.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: product_visible_discount
 #: code:addons/product_visible_discount/product_visible_discount.py:153
diff --git a/addons/product_visible_discount/i18n/fi.po b/addons/product_visible_discount/i18n/fi.po
index 822cf0e162f..91f0eb6b4d5 100644
--- a/addons/product_visible_discount/i18n/fi.po
+++ b/addons/product_visible_discount/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: product_visible_discount
 #: code:addons/product_visible_discount/product_visible_discount.py:153
diff --git a/addons/product_visible_discount/i18n/fr.po b/addons/product_visible_discount/i18n/fr.po
index 50d64099f3a..57c263d8d27 100644
--- a/addons/product_visible_discount/i18n/fr.po
+++ b/addons/product_visible_discount/i18n/fr.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: product_visible_discount
 #: code:addons/product_visible_discount/product_visible_discount.py:153
diff --git a/addons/product_visible_discount/i18n/gl.po b/addons/product_visible_discount/i18n/gl.po
index d3282f879b8..0b4df5572c6 100644
--- a/addons/product_visible_discount/i18n/gl.po
+++ b/addons/product_visible_discount/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: product_visible_discount
 #: code:addons/product_visible_discount/product_visible_discount.py:153
diff --git a/addons/product_visible_discount/i18n/hr.po b/addons/product_visible_discount/i18n/hr.po
index 5b63d4dd687..e1223afceb3 100644
--- a/addons/product_visible_discount/i18n/hr.po
+++ b/addons/product_visible_discount/i18n/hr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: product_visible_discount
 #: code:addons/product_visible_discount/product_visible_discount.py:153
diff --git a/addons/product_visible_discount/i18n/hu.po b/addons/product_visible_discount/i18n/hu.po
index 37b562c55b9..71846dfa3b1 100644
--- a/addons/product_visible_discount/i18n/hu.po
+++ b/addons/product_visible_discount/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: product_visible_discount
 #: code:addons/product_visible_discount/product_visible_discount.py:153
diff --git a/addons/product_visible_discount/i18n/it.po b/addons/product_visible_discount/i18n/it.po
index 1c0a9c43734..f3737755c6d 100644
--- a/addons/product_visible_discount/i18n/it.po
+++ b/addons/product_visible_discount/i18n/it.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: product_visible_discount
 #: code:addons/product_visible_discount/product_visible_discount.py:153
diff --git a/addons/product_visible_discount/i18n/ja.po b/addons/product_visible_discount/i18n/ja.po
index ca9a71d6a1c..4d4b88ef410 100644
--- a/addons/product_visible_discount/i18n/ja.po
+++ b/addons/product_visible_discount/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: product_visible_discount
 #: code:addons/product_visible_discount/product_visible_discount.py:153
diff --git a/addons/product_visible_discount/i18n/mn.po b/addons/product_visible_discount/i18n/mn.po
index acba77d71b3..1289ccb90ff 100644
--- a/addons/product_visible_discount/i18n/mn.po
+++ b/addons/product_visible_discount/i18n/mn.po
@@ -14,14 +14,14 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: product_visible_discount
 #: code:addons/product_visible_discount/product_visible_discount.py:153
 #, python-format
 msgid "No Sale Pricelist Found!"
-msgstr ""
+msgstr "Борлуулах Үнийн Жагсаалт олдсонгүй!"
 
 #. module: product_visible_discount
 #: field:product.pricelist,visible_discount:0
@@ -32,34 +32,35 @@ msgstr "Хөнгөлөлт харагдах"
 #: code:addons/product_visible_discount/product_visible_discount.py:145
 #, python-format
 msgid "No Purchase Pricelist Found!"
-msgstr ""
+msgstr "Худалдан Авах Үнийн Жагсаалт олдсонгүй!"
 
 #. module: product_visible_discount
 #: model:ir.model,name:product_visible_discount.model_account_invoice_line
 msgid "Invoice Line"
-msgstr ""
+msgstr "Нэхэмжлэлийн мөр"
 
 #. module: product_visible_discount
 #: model:ir.model,name:product_visible_discount.model_product_pricelist
 msgid "Pricelist"
-msgstr ""
+msgstr "Үнийн жагсаалт"
 
 #. module: product_visible_discount
 #: code:addons/product_visible_discount/product_visible_discount.py:145
 #, python-format
 msgid "You must first define a pricelist on the supplier form!"
 msgstr ""
+"Эхлээд та нийлүүлэгчийн маягт дээр үнийн жагсаалтыг тодорхойлох ёстой!"
 
 #. module: product_visible_discount
 #: model:ir.model,name:product_visible_discount.model_sale_order_line
 msgid "Sales Order Line"
-msgstr ""
+msgstr "Борлуулалтын Захиалгын Мөр"
 
 #. module: product_visible_discount
 #: code:addons/product_visible_discount/product_visible_discount.py:153
 #, python-format
 msgid "You must first define a pricelist on the customer form!"
-msgstr ""
+msgstr "Эхлээд захиалагчийн маягт дээр үнийн жагсаалтыг тодорхойлох ёстой!"
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Дэлгэцийн XML алдаатай!"
diff --git a/addons/product_visible_discount/i18n/nl.po b/addons/product_visible_discount/i18n/nl.po
index a9261996baa..fbefa81f907 100644
--- a/addons/product_visible_discount/i18n/nl.po
+++ b/addons/product_visible_discount/i18n/nl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: product_visible_discount
 #: code:addons/product_visible_discount/product_visible_discount.py:153
diff --git a/addons/product_visible_discount/i18n/pl.po b/addons/product_visible_discount/i18n/pl.po
index 23f15198316..be9e0cac094 100644
--- a/addons/product_visible_discount/i18n/pl.po
+++ b/addons/product_visible_discount/i18n/pl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: product_visible_discount
 #: code:addons/product_visible_discount/product_visible_discount.py:153
diff --git a/addons/product_visible_discount/i18n/pt.po b/addons/product_visible_discount/i18n/pt.po
index bb7a1c8e653..ff7804cb413 100644
--- a/addons/product_visible_discount/i18n/pt.po
+++ b/addons/product_visible_discount/i18n/pt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: product_visible_discount
 #: code:addons/product_visible_discount/product_visible_discount.py:153
diff --git a/addons/product_visible_discount/i18n/pt_BR.po b/addons/product_visible_discount/i18n/pt_BR.po
index 468db3b9ff0..9145182cbb1 100644
--- a/addons/product_visible_discount/i18n/pt_BR.po
+++ b/addons/product_visible_discount/i18n/pt_BR.po
@@ -9,13 +9,14 @@ msgstr ""
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:37+0000\n"
 "PO-Revision-Date: 2012-07-28 19:35+0000\n"
-"Last-Translator: Fábio Martinelli <webmaster@guaru.net>\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: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: product_visible_discount
 #: code:addons/product_visible_discount/product_visible_discount.py:153
diff --git a/addons/product_visible_discount/i18n/ro.po b/addons/product_visible_discount/i18n/ro.po
index af2bb063280..ab8988ef447 100644
--- a/addons/product_visible_discount/i18n/ro.po
+++ b/addons/product_visible_discount/i18n/ro.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: product_visible_discount
 #: code:addons/product_visible_discount/product_visible_discount.py:153
diff --git a/addons/product_visible_discount/i18n/ru.po b/addons/product_visible_discount/i18n/ru.po
index 8e8917f9ab4..bfba2cc7fdb 100644
--- a/addons/product_visible_discount/i18n/ru.po
+++ b/addons/product_visible_discount/i18n/ru.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: product_visible_discount
 #: code:addons/product_visible_discount/product_visible_discount.py:153
diff --git a/addons/product_visible_discount/i18n/sl.po b/addons/product_visible_discount/i18n/sl.po
index 8c9f086e7c5..f5f9a000036 100644
--- a/addons/product_visible_discount/i18n/sl.po
+++ b/addons/product_visible_discount/i18n/sl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: product_visible_discount
 #: code:addons/product_visible_discount/product_visible_discount.py:153
diff --git a/addons/product_visible_discount/i18n/sr.po b/addons/product_visible_discount/i18n/sr.po
index 5d0a609430e..acae389d9c9 100644
--- a/addons/product_visible_discount/i18n/sr.po
+++ b/addons/product_visible_discount/i18n/sr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: product_visible_discount
 #: code:addons/product_visible_discount/product_visible_discount.py:153
diff --git a/addons/product_visible_discount/i18n/sr@latin.po b/addons/product_visible_discount/i18n/sr@latin.po
index a88c2cdab8c..4a4e039bc9e 100644
--- a/addons/product_visible_discount/i18n/sr@latin.po
+++ b/addons/product_visible_discount/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: product_visible_discount
 #: code:addons/product_visible_discount/product_visible_discount.py:153
diff --git a/addons/product_visible_discount/i18n/sv.po b/addons/product_visible_discount/i18n/sv.po
index b2564b32e11..0b4e3e7301a 100644
--- a/addons/product_visible_discount/i18n/sv.po
+++ b/addons/product_visible_discount/i18n/sv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: product_visible_discount
 #: code:addons/product_visible_discount/product_visible_discount.py:153
diff --git a/addons/product_visible_discount/i18n/tr.po b/addons/product_visible_discount/i18n/tr.po
index 0eb1fe43e66..2247a77672b 100644
--- a/addons/product_visible_discount/i18n/tr.po
+++ b/addons/product_visible_discount/i18n/tr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: product_visible_discount
 #: code:addons/product_visible_discount/product_visible_discount.py:153
diff --git a/addons/product_visible_discount/i18n/vi.po b/addons/product_visible_discount/i18n/vi.po
index e8e6588e126..1ea60c37894 100644
--- a/addons/product_visible_discount/i18n/vi.po
+++ b/addons/product_visible_discount/i18n/vi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: product_visible_discount
 #: code:addons/product_visible_discount/product_visible_discount.py:153
diff --git a/addons/product_visible_discount/i18n/zh_CN.po b/addons/product_visible_discount/i18n/zh_CN.po
index 394f06f4296..e2d07d85e02 100644
--- a/addons/product_visible_discount/i18n/zh_CN.po
+++ b/addons/product_visible_discount/i18n/zh_CN.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: product_visible_discount
 #: code:addons/product_visible_discount/product_visible_discount.py:153
diff --git a/addons/profile_tools/__openerp__.py b/addons/profile_tools/__openerp__.py
index d1055c60318..ddd1eba5ca0 100644
--- a/addons/profile_tools/__openerp__.py
+++ b/addons/profile_tools/__openerp__.py
@@ -21,12 +21,12 @@
 
 
 {
-    "name" : "Miscellaneous Tools",
-    "version" : "1.0",
-    "depends" : ["base", "base_setup"],
-    "author" : "OpenERP SA",
-    "category" : "Hidden/Dependency",
-    "description": """
+    'name' : 'Miscellaneous Tools',
+    'version' : '1.0',
+    'depends' : ['base', 'base_setup'],
+    'author' : 'OpenERP SA',
+    'category' : 'Hidden/Dependency',
+    'description': """
 Installer for extra Hidden like lunch, survey, idea, share.
 ===========================================================
 
@@ -34,10 +34,8 @@ Makes the Extra Hidden Configuration available from where you can install
 modules like share, lunch, pad, idea, survey and subscription.
     """,
     'website': 'http://www.openerp.com',
-    'init_xml': [],
-    'update_xml': [
-    ],
-    'demo_xml': [],
+    'data': [],
+    'demo': [],
     'installable': True,
     'auto_install': False,
     'certificate' : '00557100228403879621',
diff --git a/addons/profile_tools/i18n/ar.po b/addons/profile_tools/i18n/ar.po
index 802a9ccc097..04cf1da095a 100644
--- a/addons/profile_tools/i18n/ar.po
+++ b/addons/profile_tools/i18n/ar.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:40+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #~ msgid "Configure"
 #~ msgstr "تهيئة"
diff --git a/addons/profile_tools/i18n/bg.po b/addons/profile_tools/i18n/bg.po
index 9f1b4af6d34..e0399c7adf0 100644
--- a/addons/profile_tools/i18n/bg.po
+++ b/addons/profile_tools/i18n/bg.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:40+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #~ msgid "Configure"
 #~ msgstr "Настройване"
diff --git a/addons/profile_tools/i18n/ca.po b/addons/profile_tools/i18n/ca.po
index c94bcdc819c..4cfe71909e0 100644
--- a/addons/profile_tools/i18n/ca.po
+++ b/addons/profile_tools/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:40+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #~ msgid "Configure"
 #~ msgstr "Configura"
diff --git a/addons/profile_tools/i18n/da.po b/addons/profile_tools/i18n/da.po
index 1229f315596..f297208d493 100644
--- a/addons/profile_tools/i18n/da.po
+++ b/addons/profile_tools/i18n/da.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:40+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 
diff --git a/addons/profile_tools/i18n/de.po b/addons/profile_tools/i18n/de.po
index 24560b5e555..11421e73a19 100644
--- a/addons/profile_tools/i18n/de.po
+++ b/addons/profile_tools/i18n/de.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:40+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #~ msgid "Ideas Box"
 #~ msgstr "Betriebliche Vorschläge"
diff --git a/addons/profile_tools/i18n/es.po b/addons/profile_tools/i18n/es.po
index 97712196478..2e6b5d45b8d 100644
--- a/addons/profile_tools/i18n/es.po
+++ b/addons/profile_tools/i18n/es.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:40+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #~ msgid "Ideas Box"
 #~ msgstr "Caja de ideas"
diff --git a/addons/profile_tools/i18n/es_CR.po b/addons/profile_tools/i18n/es_CR.po
index 51ddfdabedb..ef77d888c44 100644
--- a/addons/profile_tools/i18n/es_CR.po
+++ b/addons/profile_tools/i18n/es_CR.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:40+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 "Language: es\n"
 
 #~ msgid "Ideas Box"
diff --git a/addons/profile_tools/i18n/fi.po b/addons/profile_tools/i18n/fi.po
index 8d3829b15cc..9f78c8ea9c0 100644
--- a/addons/profile_tools/i18n/fi.po
+++ b/addons/profile_tools/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:40+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #~ msgid "Miscellaneous Tools"
 #~ msgstr "Sekalaiset työkalut"
diff --git a/addons/profile_tools/i18n/fr.po b/addons/profile_tools/i18n/fr.po
index fd0842b43e4..5dc1ad90d10 100644
--- a/addons/profile_tools/i18n/fr.po
+++ b/addons/profile_tools/i18n/fr.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:40+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #~ msgid "Ideas Box"
 #~ msgstr "Boite à idées"
diff --git a/addons/profile_tools/i18n/gl.po b/addons/profile_tools/i18n/gl.po
index f551098af75..b1962cc639d 100644
--- a/addons/profile_tools/i18n/gl.po
+++ b/addons/profile_tools/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:40+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #~ msgid "Promote ideas of the employees, votes and discussion on best ideas."
 #~ msgstr ""
diff --git a/addons/profile_tools/i18n/hr.po b/addons/profile_tools/i18n/hr.po
index 11acbc28cb6..07236a02e42 100644
--- a/addons/profile_tools/i18n/hr.po
+++ b/addons/profile_tools/i18n/hr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:40+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #~ msgid "Miscellaneous Tools"
 #~ msgstr "Razni alati"
diff --git a/addons/profile_tools/i18n/hu.po b/addons/profile_tools/i18n/hu.po
index 9da7a8e83df..bd22908c9ad 100644
--- a/addons/profile_tools/i18n/hu.po
+++ b/addons/profile_tools/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:40+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #~ msgid "Configure"
 #~ msgstr "Beállítás"
diff --git a/addons/profile_tools/i18n/it.po b/addons/profile_tools/i18n/it.po
index 647b346f92f..30c6c5fd3ef 100644
--- a/addons/profile_tools/i18n/it.po
+++ b/addons/profile_tools/i18n/it.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:40+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #~ msgid "Configure"
 #~ msgstr "Configura"
diff --git a/addons/profile_tools/i18n/mn.po b/addons/profile_tools/i18n/mn.po
index d0ac9d24950..768bcdfcde8 100644
--- a/addons/profile_tools/i18n/mn.po
+++ b/addons/profile_tools/i18n/mn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:40+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #~ msgid "Tools Configuration"
 #~ msgstr "Тохиргооны Хэрэгслүүд"
diff --git a/addons/profile_tools/i18n/nl.po b/addons/profile_tools/i18n/nl.po
index 7b24710ef8a..c39e843a1ea 100644
--- a/addons/profile_tools/i18n/nl.po
+++ b/addons/profile_tools/i18n/nl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:40+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #~ msgid "Promote ideas of the employees, votes and discussion on best ideas."
 #~ msgstr ""
diff --git a/addons/profile_tools/i18n/pt.po b/addons/profile_tools/i18n/pt.po
index 43aad05c72c..51f082ded69 100644
--- a/addons/profile_tools/i18n/pt.po
+++ b/addons/profile_tools/i18n/pt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:40+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #~ msgid "Image"
 #~ msgstr "Imagem"
diff --git a/addons/profile_tools/i18n/pt_BR.po b/addons/profile_tools/i18n/pt_BR.po
index 588f85bf3b1..9f5a6e9f54a 100644
--- a/addons/profile_tools/i18n/pt_BR.po
+++ b/addons/profile_tools/i18n/pt_BR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:40+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #~ msgid "Configure"
 #~ msgstr "Configurar"
diff --git a/addons/profile_tools/i18n/ro.po b/addons/profile_tools/i18n/ro.po
index 7cf2b62da23..fd3bd34600b 100644
--- a/addons/profile_tools/i18n/ro.po
+++ b/addons/profile_tools/i18n/ro.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:40+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #~ msgid "Promote ideas of the employees, votes and discussion on best ideas."
 #~ msgstr ""
diff --git a/addons/profile_tools/i18n/ru.po b/addons/profile_tools/i18n/ru.po
index a43a40ec333..ba1a7ef879b 100644
--- a/addons/profile_tools/i18n/ru.po
+++ b/addons/profile_tools/i18n/ru.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:40+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #~ msgid "Configure"
 #~ msgstr "Настройки"
diff --git a/addons/profile_tools/i18n/tr.po b/addons/profile_tools/i18n/tr.po
index 3416a6229e8..6627dccf652 100644
--- a/addons/profile_tools/i18n/tr.po
+++ b/addons/profile_tools/i18n/tr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:40+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #~ msgid "Configure"
 #~ msgstr "Yapılandır"
diff --git a/addons/profile_tools/i18n/zh_CN.po b/addons/profile_tools/i18n/zh_CN.po
index 19f22e54715..d2c03db32db 100644
--- a/addons/profile_tools/i18n/zh_CN.po
+++ b/addons/profile_tools/i18n/zh_CN.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:40+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #~ msgid "Miscellaneous Tools"
 #~ msgstr "各种工具"
diff --git a/addons/project/__openerp__.py b/addons/project/__openerp__.py
index aa523b438c7..7d3c85e96ad 100644
--- a/addons/project/__openerp__.py
+++ b/addons/project/__openerp__.py
@@ -19,18 +19,33 @@
 #
 ##############################################################################
 
-
 {
-    "name": "Project Management",
-    "version": "1.1",
-    "author": "OpenERP SA",
-    "website": "http://www.openerp.com",
-    "category": "Project Management",
-    "sequence": 8,
-    "summary": "Projects, Tasks",
-    "images": ["images/gantt.png", "images/project_dashboard.jpeg","images/project_task_tree.jpeg","images/project_task.jpeg","images/project.jpeg","images/task_analysis.jpeg"],
-    "depends": ["base_setup", "base_status", "product", "analytic", "board",  "mail", "resource","web_kanban"],
-    "description": """
+    'name': 'Project Management',
+    'version': '1.1',
+    'author': 'OpenERP SA',
+    'website': 'http://www.openerp.com',
+    'category': 'Project Management',
+    'sequence': 8,
+    'summary': 'Projects, Tasks',
+    'images': [
+        'images/gantt.png',
+        'images/project_dashboard.jpeg',
+        'images/project_task_tree.jpeg',
+        'images/project_task.jpeg',
+        'images/project.jpeg',
+        'images/task_analysis.jpeg'
+    ],
+    'depends': [
+        'base_setup',
+        'base_status',
+        'product',
+        'analytic',
+        'board',
+        'mail',
+        'resource',
+        'web_kanban'
+    ],
+    'description': """
 Project Management module tracks multi-level projects, tasks, work done on tasks.
 =================================================================================
 
@@ -41,25 +56,22 @@ Dashboard for project management that includes:
     * List of My Open Tasks
     * Graph of My Remaining Hours by Project
     """,
-    "init_xml": [],
-    "update_xml": [
-        "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",
-        "process/task_process.xml",
-        "res_partner_view.xml",
-        "report/project_report_view.xml",
+    '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',
+        'process/task_process.xml',
+        'res_partner_view.xml',
+        'report/project_report_view.xml',
         'report/project_cumulative.xml',
-        "board_project_view.xml",
+        'board_project_view.xml',
         'res_config_view.xml',
     ],
-    'demo_xml': [
-        'project_demo.xml',
-    ],
-    'test':[
+    'demo': ['project_demo.xml'],
+    'test': [
         'test/project_demo.yml',
         'test/project_process.yml',
         'test/task_process.yml',
diff --git a/addons/project/board_project_view.xml b/addons/project/board_project_view.xml
index 2023ba5a0b9..931c661d211 100644
--- a/addons/project/board_project_view.xml
+++ b/addons/project/board_project_view.xml
@@ -16,7 +16,7 @@
                     <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="context.get('set_visible',False)" groups="base.group_no_one"/>
+                    <field name="state" invisible="1"/>
                 </tree>
             </field>
         </record>
diff --git a/addons/project/i18n/ar.po b/addons/project/i18n/ar.po
index c34459215f4..2daeaaa5198 100644
--- a/addons/project/i18n/ar.po
+++ b/addons/project/i18n/ar.po
@@ -13,13 +13,13 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:46+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:55+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project
 #: view:report.project.task.user:0
 msgid "New tasks"
-msgstr ""
+msgstr "مهام جديدة"
 
 #. module: project
 #: help:project.task.delegate,new_task_description:0
@@ -190,7 +190,7 @@ msgstr "شركة"
 #. module: project
 #: view:report.project.task.user:0
 msgid "Pending tasks"
-msgstr ""
+msgstr "مهام قيد التنقيذ"
 
 #. module: project
 #: field:project.task.delegate,prefix:0
@@ -257,7 +257,7 @@ msgstr "يوم"
 #. module: project
 #: model:ir.ui.menu,name:project.menu_project_config_project
 msgid "Projects and Stages"
-msgstr ""
+msgstr "المشاريع و المراحل"
 
 #. module: project
 #: view:project.project:0
@@ -293,7 +293,7 @@ msgstr "فتح المهامات الخاصة بي"
 #, python-format
 msgid ""
 "Please specify the Project Manager or email address of Project Manager."
-msgstr ""
+msgstr "يرجى تحديد مدير المشروع أو عنوان البريد الإلكتروني لمدير المشروع."
 
 #. module: project
 #: view:project.task:0
@@ -361,7 +361,7 @@ msgstr "المتغيرات التلقائية للرؤوس والتذييل. ا
 #. module: project
 #: view:project.task:0
 msgid "Show only tasks having a deadline"
-msgstr ""
+msgstr "اظهار المهام فقط التي لها زمن نهائي"
 
 #. module: project
 #: selection:project.task,state:0 selection:project.task.history,state:0
@@ -384,7 +384,7 @@ msgstr "رأس البريد"
 #. module: project
 #: view:project.task:0
 msgid "Change to Next Stage"
-msgstr ""
+msgstr "التغير للمرحلة القادمة"
 
 #. module: project
 #: model:process.node,name:project.process_node_donetask0
@@ -492,7 +492,7 @@ msgstr " (نسخ)"
 #. module: project
 #: view:project.task:0
 msgid "New Tasks"
-msgstr ""
+msgstr "مهام جديدة"
 
 #. module: project
 #: view:report.project.task.user:0 field:report.project.task.user,nbr:0
@@ -557,7 +557,7 @@ msgstr "# من الايام"
 #. module: project
 #: view:project.project:0
 msgid "Open Projects"
-msgstr ""
+msgstr "فتح المشاريع"
 
 #. module: project
 #: code:addons/project/project.py:358
diff --git a/addons/project/i18n/bg.po b/addons/project/i18n/bg.po
index 9260304a4c7..a315365a91f 100644
--- a/addons/project/i18n/bg.po
+++ b/addons/project/i18n/bg.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:47+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:55+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project
 #: view:report.project.task.user:0
diff --git a/addons/project/i18n/bs.po b/addons/project/i18n/bs.po
index 6ee1a9e60be..24d31217ffa 100644
--- a/addons/project/i18n/bs.po
+++ b/addons/project/i18n/bs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:47+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:55+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project
 #: view:report.project.task.user:0
diff --git a/addons/project/i18n/ca.po b/addons/project/i18n/ca.po
index 4bcf4e10704..6a40897c8ed 100644
--- a/addons/project/i18n/ca.po
+++ b/addons/project/i18n/ca.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:47+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:55+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project
 #: view:report.project.task.user:0
diff --git a/addons/project/i18n/cs.po b/addons/project/i18n/cs.po
index 861f82f0149..a7e4885e245 100644
--- a/addons/project/i18n/cs.po
+++ b/addons/project/i18n/cs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:47+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:55+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 "X-Poedit-Language: Czech\n"
 
 #. module: project
diff --git a/addons/project/i18n/da.po b/addons/project/i18n/da.po
index 6a1ba48142d..564c176fed0 100644
--- a/addons/project/i18n/da.po
+++ b/addons/project/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:47+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:55+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project
 #: view:report.project.task.user:0
diff --git a/addons/project/i18n/de.po b/addons/project/i18n/de.po
index bd67b2784b3..cba84622d8c 100644
--- a/addons/project/i18n/de.po
+++ b/addons/project/i18n/de.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:47+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:55+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project
 #: view:report.project.task.user:0
diff --git a/addons/project/i18n/el.po b/addons/project/i18n/el.po
index f7d1e150254..01b1e053d58 100644
--- a/addons/project/i18n/el.po
+++ b/addons/project/i18n/el.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:47+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:55+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
 "X-Poedit-SourceCharset: utf-8\n"
diff --git a/addons/project/i18n/es.po b/addons/project/i18n/es.po
index 41ca159f5ec..a66d47e5974 100644
--- a/addons/project/i18n/es.po
+++ b/addons/project/i18n/es.po
@@ -8,13 +8,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 01:37+0100\n"
 "PO-Revision-Date: 2012-02-15 20:00+0000\n"
-"Last-Translator: Carlos @ smile-iberia <Unknown>\n"
+"Last-Translator: Carlos Ch. <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: 2012-08-07 04:47+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:55+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project
 #: view:report.project.task.user:0
diff --git a/addons/project/i18n/es_AR.po b/addons/project/i18n/es_AR.po
index 07244223140..3a33ad460f2 100644
--- a/addons/project/i18n/es_AR.po
+++ b/addons/project/i18n/es_AR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:48+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:55+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project
 #: view:report.project.task.user:0
diff --git a/addons/project/i18n/es_CR.po b/addons/project/i18n/es_CR.po
index 3bffbce0aa6..6024d528a28 100644
--- a/addons/project/i18n/es_CR.po
+++ b/addons/project/i18n/es_CR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:48+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:55+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 "Language: \n"
 
 #. module: project
diff --git a/addons/project/i18n/es_EC.po b/addons/project/i18n/es_EC.po
index 44b438c6fea..89168f88a42 100644
--- a/addons/project/i18n/es_EC.po
+++ b/addons/project/i18n/es_EC.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:48+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:56+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project
 #: view:report.project.task.user:0
diff --git a/addons/project/i18n/es_PY.po b/addons/project/i18n/es_PY.po
index a3aaff36a18..aff45cd4e54 100644
--- a/addons/project/i18n/es_PY.po
+++ b/addons/project/i18n/es_PY.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:48+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:56+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project
 #: view:report.project.task.user:0
diff --git a/addons/project/i18n/et.po b/addons/project/i18n/et.po
index a1652611d83..664b39d8b90 100644
--- a/addons/project/i18n/et.po
+++ b/addons/project/i18n/et.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:47+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:55+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project
 #: view:report.project.task.user:0
diff --git a/addons/project/i18n/eu.po b/addons/project/i18n/eu.po
index 9b23ed90a6b..3ead5319319 100644
--- a/addons/project/i18n/eu.po
+++ b/addons/project/i18n/eu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:47+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:55+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project
 #: view:report.project.task.user:0
diff --git a/addons/project/i18n/fi.po b/addons/project/i18n/fi.po
index 92e74b98249..fde023a2443 100644
--- a/addons/project/i18n/fi.po
+++ b/addons/project/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:47+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:55+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project
 #: view:report.project.task.user:0
diff --git a/addons/project/i18n/fr.po b/addons/project/i18n/fr.po
index 50499e44f4b..4c0e87af64b 100644
--- a/addons/project/i18n/fr.po
+++ b/addons/project/i18n/fr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:47+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:55+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project
 #: view:report.project.task.user:0
diff --git a/addons/project/i18n/gl.po b/addons/project/i18n/gl.po
index 9dcfd56b9f3..2b83f0924db 100644
--- a/addons/project/i18n/gl.po
+++ b/addons/project/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:47+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:55+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project
 #: view:report.project.task.user:0
diff --git a/addons/project/i18n/gu.po b/addons/project/i18n/gu.po
index cd646d9a8fd..325d77c09ec 100644
--- a/addons/project/i18n/gu.po
+++ b/addons/project/i18n/gu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:47+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:55+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project
 #: view:report.project.task.user:0
diff --git a/addons/project/i18n/hr.po b/addons/project/i18n/hr.po
index 567c5531777..9309d95cd1b 100644
--- a/addons/project/i18n/hr.po
+++ b/addons/project/i18n/hr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:47+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:55+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 "Language: hr\n"
 
 #. module: project
diff --git a/addons/project/i18n/hu.po b/addons/project/i18n/hu.po
index 0ca2ec532d3..ca553216211 100644
--- a/addons/project/i18n/hu.po
+++ b/addons/project/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:47+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:55+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project
 #: view:report.project.task.user:0
diff --git a/addons/project/i18n/id.po b/addons/project/i18n/id.po
index 2eef5437086..22892b050d1 100644
--- a/addons/project/i18n/id.po
+++ b/addons/project/i18n/id.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:47+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:55+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project
 #: view:report.project.task.user:0
diff --git a/addons/project/i18n/it.po b/addons/project/i18n/it.po
index 57c72b24172..662ea2bd962 100644
--- a/addons/project/i18n/it.po
+++ b/addons/project/i18n/it.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:47+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:55+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project
 #: view:report.project.task.user:0
diff --git a/addons/project/i18n/ja.po b/addons/project/i18n/ja.po
index 481957ce0c1..fa91a44a984 100644
--- a/addons/project/i18n/ja.po
+++ b/addons/project/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:47+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:55+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project
 #: view:report.project.task.user:0
diff --git a/addons/project/i18n/ko.po b/addons/project/i18n/ko.po
index 591b793ca42..fe17fa20853 100644
--- a/addons/project/i18n/ko.po
+++ b/addons/project/i18n/ko.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:47+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:55+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project
 #: view:report.project.task.user:0
diff --git a/addons/project/i18n/lt.po b/addons/project/i18n/lt.po
index 5deed677ff8..50bca2bd371 100644
--- a/addons/project/i18n/lt.po
+++ b/addons/project/i18n/lt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:47+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:55+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project
 #: view:report.project.task.user:0
diff --git a/addons/project/i18n/lv.po b/addons/project/i18n/lv.po
index edd76e1868c..4ef32f1bc1e 100644
--- a/addons/project/i18n/lv.po
+++ b/addons/project/i18n/lv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:47+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:55+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project
 #: view:report.project.task.user:0
diff --git a/addons/project/i18n/mn.po b/addons/project/i18n/mn.po
index 72422dee7f2..21fea817261 100644
--- a/addons/project/i18n/mn.po
+++ b/addons/project/i18n/mn.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:47+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:55+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project
 #: view:report.project.task.user:0
diff --git a/addons/project/i18n/nb.po b/addons/project/i18n/nb.po
index d83014763bd..59c7111be4f 100644
--- a/addons/project/i18n/nb.po
+++ b/addons/project/i18n/nb.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:47+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:55+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project
 #: view:report.project.task.user:0
diff --git a/addons/project/i18n/nl.po b/addons/project/i18n/nl.po
index 3849f54ab53..f84c1286285 100644
--- a/addons/project/i18n/nl.po
+++ b/addons/project/i18n/nl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:47+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:55+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project
 #: view:report.project.task.user:0
diff --git a/addons/project/i18n/nl_BE.po b/addons/project/i18n/nl_BE.po
index 8fdcb4d8acb..4593e3cb2be 100644
--- a/addons/project/i18n/nl_BE.po
+++ b/addons/project/i18n/nl_BE.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:48+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:55+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project
 #: view:report.project.task.user:0
diff --git a/addons/project/i18n/pl.po b/addons/project/i18n/pl.po
index b401d3195d9..cb00edd6111 100644
--- a/addons/project/i18n/pl.po
+++ b/addons/project/i18n/pl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:47+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:55+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project
 #: view:report.project.task.user:0
diff --git a/addons/project/i18n/pt.po b/addons/project/i18n/pt.po
index 20a39bcf27d..74d51f30434 100644
--- a/addons/project/i18n/pt.po
+++ b/addons/project/i18n/pt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:47+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:55+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project
 #: view:report.project.task.user:0
diff --git a/addons/project/i18n/pt_BR.po b/addons/project/i18n/pt_BR.po
index 90992262cf5..caf11f137ba 100644
--- a/addons/project/i18n/pt_BR.po
+++ b/addons/project/i18n/pt_BR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:48+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:55+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project
 #: view:report.project.task.user:0
@@ -369,7 +369,7 @@ msgstr ""
 #. module: project
 #: view:project.task:0
 msgid "Show only tasks having a deadline"
-msgstr ""
+msgstr "Mostrar apenas tarefas que tem um prazo final"
 
 #. module: project
 #: selection:project.task,state:0 selection:project.task.history,state:0
@@ -742,7 +742,7 @@ msgstr "Julho"
 #. module: project
 #: view:project.task.history.burndown:0
 msgid "Burndown Chart of Tasks"
-msgstr ""
+msgstr "Gráficos de Tarefas Concluídas"
 
 #. module: project
 #: field:project.task,date_start:0 field:report.project.task.user,date_start:0
@@ -1039,7 +1039,7 @@ msgstr "Data inicial"
 #: selection:project.task.history,kanban_state:0
 #: selection:project.task.history.cumulative,kanban_state:0
 msgid "Ready To Pull"
-msgstr ""
+msgstr "Pronto para prosseguir"
 
 #. module: project
 #: view:project.task:0 field:project.task,parent_ids:0
@@ -1060,6 +1060,8 @@ msgid ""
 "If the task has a progress of 99.99% you should close the task if it's "
 "finished or reevaluate the time"
 msgstr ""
+"Se uma tarefa tem um progresso de 99.99% você deve fechar a tarefa se foi "
+"concluída, ou reavaliar o prazo"
 
 #. module: project
 #: view:project.project:0
@@ -1074,6 +1076,11 @@ msgid ""
 " * Blocked indicates something is preventing the progress of this task\n"
 " * Ready To Pull indicates the task is ready to be pulled to the next stage"
 msgstr ""
+"O Painel Kanban de tarefas indica uma situação especial a seguir:\n"
+" * Normal é a situação padrão\n"
+" * Bloqueada indica que algo está impedindo o progresso dessa tarefa\n"
+" * Pronto para prosseguir indica que a tarefa está pronta para seguir ao "
+"próximo estágio"
 
 #. module: project
 #: view:project.project:0
@@ -1088,7 +1095,7 @@ msgstr "Cobrança"
 #. module: project
 #: view:project.task:0
 msgid "For changing to delegate state"
-msgstr ""
+msgstr "Para mudar para Situação Delegada"
 
 #. module: project
 #: field:project.task,priority:0 field:report.project.task.user,priority:0
@@ -1115,7 +1122,7 @@ msgstr "project.task.reevaluate"
 #: code:addons/project/wizard/project_task_delegate.py:81
 #, python-format
 msgid "CHECK: %s"
-msgstr ""
+msgstr "VERIFICAR: %s"
 
 #. module: project
 #: view:project.project:0
@@ -1149,7 +1156,7 @@ msgstr "Baixo"
 #: field:project.task,kanban_state:0 field:project.task.history,kanban_state:0
 #: field:project.task.history.cumulative,kanban_state:0
 msgid "Kanban State"
-msgstr ""
+msgstr "Situação Kanban"
 
 #. module: project
 #: view:project.project:0
@@ -1178,6 +1185,8 @@ msgid ""
 "Project's members are users who can have an access to the tasks related to "
 "this project."
 msgstr ""
+"Membros do projeto são usuários que podem acessar as tarefas relacionadas a "
+"este projeto"
 
 #. module: project
 #: view:project.project:0 field:project.task,manager_id:0
@@ -1230,7 +1239,7 @@ msgstr ""
 #: code:addons/project/wizard/mail_compose_message.py:45
 #, python-format
 msgid "Please specify the Customer or email address of Customer."
-msgstr ""
+msgstr "Por favor especifique o Cliente ou o email de um Cliente"
 
 #. module: project
 #: selection:report.project.task.user,month:0
@@ -1283,7 +1292,7 @@ msgstr "Novembro"
 #. module: project
 #: model:ir.actions.act_window,name:project.action_create_initial_projects_installer
 msgid "Create your Firsts Projects"
-msgstr ""
+msgstr "Crie seus Primeiros Projetos"
 
 #. module: project
 #: code:addons/project/project.py:229
@@ -1294,7 +1303,7 @@ msgstr "O Projeto '%s' foi concluído."
 #. module: project
 #: view:project.task.history.cumulative:0
 msgid "Tasks's Cumulative Flow"
-msgstr ""
+msgstr "Fluxo de Tarefas Acumuladas"
 
 #. module: project
 #: view:project.task:0
@@ -1309,7 +1318,7 @@ msgstr "Outubro"
 #. module: project
 #: view:project.task:0
 msgid "Validate planned time and open task"
-msgstr ""
+msgstr "Validar o tempo planejado e abrir tarefa"
 
 #. module: project
 #: help:project.task,delay_hours:0
@@ -1470,7 +1479,7 @@ msgstr "Estado"
 #: code:addons/project/project.py:925
 #, python-format
 msgid "Delegated User should be specified"
-msgstr ""
+msgstr "É necessário especificar o usuário delegado"
 
 #. module: project
 #: code:addons/project/project.py:862
@@ -1558,11 +1567,13 @@ msgid ""
 "Child task still open.\n"
 "Please cancel or complete child task first."
 msgstr ""
+"Tarefa filha ainda aberta.\n"
+"Por favor cancele ou finalize a tarefa filha primeiro."
 
 #. module: project
 #: view:project.task.type:0
 msgid "Stages common to all projects"
-msgstr ""
+msgstr "Estágios comuns para todos os projetos"
 
 #. module: project
 #: constraint:project.task:0
@@ -1683,6 +1694,8 @@ msgid ""
 "If you check this field, this stage will be proposed by default on each new "
 "project. It will not assign this stage to existing projects."
 msgstr ""
+"Se você marcar este campo, este estágio será proposto por padrão em cada "
+"novo projeto. Isto não irá associar este estágio a projetos existentes."
 
 #. module: project
 #: view:board.board:0
@@ -1846,6 +1859,8 @@ msgid ""
 "The stages can be common to all project or specific to one project. Each "
 "task will follow the different stages in order to be closed."
 msgstr ""
+"Os estágios podem ser comuns a todos os projetos ou específico a um projeto. "
+"Cada tarefa seguirá os estágios diferentes para ser fechado."
 
 #. module: project
 #: help:project.project,sequence:0
@@ -1867,7 +1882,7 @@ msgstr "ID"
 #: model:ir.actions.act_window,name:project.action_view_task_history_burndown
 #: model:ir.ui.menu,name:project.menu_action_view_task_history_burndown
 msgid "Burndown Chart"
-msgstr ""
+msgstr "Gráfico de Burndown"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.act_res_users_2_project_task_opened
@@ -1887,7 +1902,7 @@ msgstr "Ano Atual"
 #. module: project
 #: constraint:res.partner:0
 msgid "Error ! You cannot create recursive associated members."
-msgstr ""
+msgstr "Erro! Você não pode criar recursivamente a membros associados."
 
 #. module: project
 #: field:project.project,priority:0 field:project.project,sequence:0
@@ -1976,7 +1991,7 @@ msgstr "A tarefa '%s' está cancelada."
 #. module: project
 #: view:project.task:0 view:res.partner:0
 msgid "For changing to open state"
-msgstr ""
+msgstr "Para alterar para Aberto"
 
 #. module: project
 #: model:ir.model,name:project.model_res_partner view:project.project:0
diff --git a/addons/project/i18n/ro.po b/addons/project/i18n/ro.po
index a54241ee4b6..2fafcf110c8 100644
--- a/addons/project/i18n/ro.po
+++ b/addons/project/i18n/ro.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:47+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:55+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project
 #: view:report.project.task.user:0
diff --git a/addons/project/i18n/ru.po b/addons/project/i18n/ru.po
index c2b93a6f66f..7efea5391ff 100644
--- a/addons/project/i18n/ru.po
+++ b/addons/project/i18n/ru.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:47+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:55+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project
 #: view:report.project.task.user:0
diff --git a/addons/project/i18n/sk.po b/addons/project/i18n/sk.po
index 826be10263a..8fff648e513 100644
--- a/addons/project/i18n/sk.po
+++ b/addons/project/i18n/sk.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:47+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:55+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project
 #: view:report.project.task.user:0
diff --git a/addons/project/i18n/sl.po b/addons/project/i18n/sl.po
index fe5aa1204c0..a1fbb859a5b 100644
--- a/addons/project/i18n/sl.po
+++ b/addons/project/i18n/sl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:47+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:55+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project
 #: view:report.project.task.user:0
diff --git a/addons/project/i18n/sq.po b/addons/project/i18n/sq.po
index 1dd1a31cce7..56deafc1420 100644
--- a/addons/project/i18n/sq.po
+++ b/addons/project/i18n/sq.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:46+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:55+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project
 #: view:report.project.task.user:0
diff --git a/addons/project/i18n/sv.po b/addons/project/i18n/sv.po
index c4a94471782..0ddcb5ba646 100644
--- a/addons/project/i18n/sv.po
+++ b/addons/project/i18n/sv.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:47+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:55+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project
 #: view:report.project.task.user:0
diff --git a/addons/project/i18n/tlh.po b/addons/project/i18n/tlh.po
index 9e315e760f4..cf9fc993586 100644
--- a/addons/project/i18n/tlh.po
+++ b/addons/project/i18n/tlh.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:47+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:55+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project
 #: view:report.project.task.user:0
diff --git a/addons/project/i18n/tr.po b/addons/project/i18n/tr.po
index d2e659dd855..ff2ed9a3b4d 100644
--- a/addons/project/i18n/tr.po
+++ b/addons/project/i18n/tr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:47+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:55+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project
 #: view:report.project.task.user:0
diff --git a/addons/project/i18n/uk.po b/addons/project/i18n/uk.po
index 77169f77915..9aa0fcefa8f 100644
--- a/addons/project/i18n/uk.po
+++ b/addons/project/i18n/uk.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:48+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:55+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project
 #: view:report.project.task.user:0
diff --git a/addons/project/i18n/vi.po b/addons/project/i18n/vi.po
index 9404189187a..5fa2656c267 100644
--- a/addons/project/i18n/vi.po
+++ b/addons/project/i18n/vi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:48+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:55+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project
 #: view:report.project.task.user:0
diff --git a/addons/project/i18n/zh_CN.po b/addons/project/i18n/zh_CN.po
index 4133d27d027..85bc1101182 100644
--- a/addons/project/i18n/zh_CN.po
+++ b/addons/project/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-02-08 01:37+0100\n"
-"PO-Revision-Date: 2012-02-14 10:21+0000\n"
-"Last-Translator: Jeff Wang <wjfonhand@hotmail.com>\n"
+"PO-Revision-Date: 2012-08-19 21:16+0000\n"
+"Last-Translator: Heling Yao <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: 2012-08-07 04:48+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:55+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project
 #: view:report.project.task.user:0
@@ -646,7 +646,7 @@ msgstr "剩余的小时数"
 #. module: project
 #: model:ir.model,name:project.model_mail_compose_message
 msgid "Email composition wizard"
-msgstr ""
+msgstr "电子邮件撰写向导"
 
 #. module: project
 #: view:report.project.task.user:0
diff --git a/addons/project/i18n/zh_TW.po b/addons/project/i18n/zh_TW.po
index b969a6e2e41..248cb18f42c 100644
--- a/addons/project/i18n/zh_TW.po
+++ b/addons/project/i18n/zh_TW.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:48+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:55+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project
 #: view:report.project.task.user:0
diff --git a/addons/project/project.py b/addons/project/project.py
index 1a8f8c8bfe5..9bd939dd4fe 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -26,6 +26,7 @@ from osv import fields, osv
 from openerp.addons.resource.faces import task as Task
 import time
 from tools.translate import _
+from openerp import SUPERUSER_ID
 
 _TASK_STATE = [('draft', 'New'),('open', 'In Progress'),('pending', 'Pending'), ('done', 'Done'), ('cancelled', 'Cancelled')]
 
@@ -66,7 +67,7 @@ class project(osv.osv):
     _description = "Project"
     _inherits = {'account.analytic.account': "analytic_account_id",
                  "mail.alias": "alias_id"}
-    _inherit = ['ir.needaction_mixin', 'mail.thread']
+    _inherit = ['mail.thread', 'ir.needaction_mixin']
 
     def search(self, cr, user, args, offset=0, limit=None, order=None, context=None, count=False):
         if user == 1:
@@ -186,23 +187,6 @@ class project(osv.osv):
         """Overriden in project_issue to offer more options"""
         return [('project.task', "Tasks")]
 
-    def _get_followers(self, cr, uid, ids, name, arg, context=None):
-        '''
-        Functional field that computes the users that are 'following' a thread.
-        '''
-        res = {}
-        for project in self.browse(cr, uid, ids, context=context):
-            l = set()
-            for message in project.message_ids:
-                l.add(message.user_id and message.user_id.id or False)
-            res[project.id] = list(filter(None, l))
-        return res
-
-    def _search_followers(self, cr, uid, obj, name, args, context=None):
-        project_obj = self.pool.get('project.project')
-        project_ids = project_obj.search(cr, uid, [('message_ids.user_id.id', 'in', args[0][2])], context=context)
-        return [('id', 'in', project_ids)]
-
     # 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)
 
@@ -210,7 +194,7 @@ class project(osv.osv):
         'complete_name': fields.function(_complete_name, string="Project Name", type='char', size=250),
         'active': fields.boolean('Active', help="If the active field is set to False, it will allow you to hide the project without removing it."),
         'sequence': fields.integer('Sequence', help="Gives the sequence order when displaying a list of Projects."),
-        'analytic_account_id': fields.many2one('account.analytic.account', 'Analytic Account', help="Link this project to an analytic account if you need financial management on projects. It enables you to connect projects with budgets, planning, cost and revenue analysis, timesheets on projects, etc.", ondelete="cascade", required=True),
+        'analytic_account_id': fields.many2one('account.analytic.account', 'Contract/Analytic', help="Link this project to an analytic account if you need financial management on projects. It enables you to connect projects with budgets, planning, cost and revenue analysis, timesheets on projects, etc.", ondelete="cascade", required=True),
         'priority': fields.integer('Sequence', help="Gives the sequence order when displaying the list of projects"),
         'members': fields.many2many('res.users', 'project_user_rel', 'project_id', 'uid', 'Project Members',
             help="Project's members are users who can have an access to the tasks related to this project.", states={'close':[('readonly',True)], 'cancelled':[('readonly',True)]}),
@@ -246,13 +230,8 @@ class project(osv.osv):
                                         help="The kind of document created when an email is received on this project's email alias"),
         'privacy_visibility': fields.selection([('public','Public'), ('followers','Followers Only')], 'Privacy / Visibility', required=True),
         'state': fields.selection([('template', 'Template'),('draft','New'),('open','In Progress'), ('cancelled', 'Cancelled'),('pending','Pending'),('close','Closed')], 'Status', required=True,),
-        'followers': fields.function(_get_followers, method=True, fnct_search=_search_followers,
-                        type='many2many', relation='res.users', string='Followers'),
      }
 
-    def dummy(self, cr, uid, ids, context):
-        return True
-
     def _get_type_common(self, cr, uid, context):
         ids = self.pool.get('project.task.type').search(cr, uid, [('case_default','=',1)], context=context)
         return ids
@@ -514,11 +493,6 @@ def Project():
     # OpenChatter methods and notifications
     # ------------------------------------------------
 
-    def message_get_monitored_follower_fields(self, cr, uid, ids, context=None):
-        """ Add 'user_id' to the monitored fields """
-        res = super(project, self).message_get_monitored_follower_fields(cr, uid, ids, context=context)
-        return res + ['user_id']
-
     def create(self, cr, uid, vals, context=None):
         if context is None: context = {}
         # Prevent double project creation when 'use_tasks' is checked!
@@ -526,7 +500,7 @@ def Project():
         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, 
+            alias_id = mail_alias.create_unique_alias(cr, uid,
                           # Using '+' allows using subaddressing for those who don't
                           # have a catchall domain setup.
                           {'alias_name': "project+"+short_name(vals['name'])},
@@ -539,23 +513,23 @@ def Project():
         return project_id
 
     def create_send_note(self, cr, uid, ids, context=None):
-        return self.message_append_note(cr, uid, ids, body=_("Project has been <b>created</b>."), context=context)
+        return self.message_post(cr, uid, ids, body=_("Project has been <b>created</b>."), context=context)
 
     def set_open_send_note(self, cr, uid, ids, context=None):
         message = _("Project has been <b>opened</b>.")
-        return self.message_append_note(cr, uid, ids, body=message, context=context)
+        return self.message_post(cr, uid, ids, body=message, context=context)
 
     def set_pending_send_note(self, cr, uid, ids, context=None):
         message = _("Project is now <b>pending</b>.")
-        return self.message_append_note(cr, uid, ids, body=message, context=context)
+        return self.message_post(cr, uid, ids, body=message, context=context)
 
     def set_cancel_send_note(self, cr, uid, ids, context=None):
         message = _("Project has been <b>cancelled</b>.")
-        return self.message_append_note(cr, uid, ids, body=message, context=context)
+        return self.message_post(cr, uid, ids, body=message, context=context)
 
     def set_close_send_note(self, cr, uid, ids, context=None):
         message = _("Project has been <b>closed</b>.")
-        return self.message_append_note(cr, uid, ids, body=message, context=context)
+        return self.message_post(cr, uid, ids, body=message, context=context)
 
     def write(self, cr, uid, ids, vals, context=None):
         # if alias_model has been changed, update alias_model_id accordingly
@@ -568,7 +542,7 @@ class task(base_stage, osv.osv):
     _name = "project.task"
     _description = "Task"
     _date_name = "date_start"
-    _inherit = ['ir.needaction_mixin', 'mail.thread']
+    _inherit = ['mail.thread', 'ir.needaction_mixin']
 
     def _get_default_project_id(self, cr, uid, context=None):
         """ Gives default section by checking if present in the context """
@@ -608,13 +582,17 @@ class task(base_stage, osv.osv):
         search_domain = []
         project_id = self._resolve_project_id_from_context(cr, uid, context=context)
         if project_id:
-            search_domain += ['|', '&', ('project_ids', '=', project_id), ('fold', '=', False)]
-        search_domain += ['|', ('id', 'in', ids), '&', ('case_default', '=', True), ('fold', '=', False)]
+            search_domain += ['|', ('project_ids', '=', project_id)]
+        search_domain += ['|', ('id', 'in', ids), ('case_default', '=', True)]
         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])))
-        return result
+
+        fold = {}
+        for stage in stage_obj.browse(cr, access_rights_uid, stage_ids, context=context):
+            fold[stage.id] = stage.fold or False
+        return result, fold
 
     def _read_group_user_id(self, cr, uid, ids, domain, read_group_order=None, access_rights_uid=None, context=None):
         res_users = self.pool.get('res.users')
@@ -631,7 +609,7 @@ class task(base_stage, osv.osv):
         result = res_users.name_get(cr, access_rights_uid, ids, context=context)
         # restore order of the search
         result.sort(lambda x,y: cmp(ids.index(x[0]), ids.index(y[0])))
-        return result
+        return result, {}
 
     _group_by_full = {
         'stage_id': _read_group_stage_ids,
@@ -741,7 +719,7 @@ class task(base_stage, osv.osv):
         'priority': fields.selection([('4','Very Low'), ('3','Low'), ('2','Medium'), ('1','Important'), ('0','Very important')], 'Priority', select=True),
         'sequence': fields.integer('Sequence', select=True, help="Gives the sequence order when displaying a list of tasks."),
         'stage_id': fields.many2one('project.task.type', 'Stage',
-                        domain="['|', ('project_ids', '=', project_id), ('case_default', '=', True)]"),
+                        domain="['&', ('fold', '=', False), '|', ('project_ids', '=', project_id), ('case_default', '=', True)]"),
         'state': fields.related('stage_id', 'state', type="selection", store=True,
                 selection=_TASK_STATE, string="State", readonly=True,
                 help='The state is set to \'Draft\', when a case is created.\
@@ -880,7 +858,7 @@ class task(base_stage, osv.osv):
         if context is None: context = {}
         # read uom as admin to avoid access rights issues, e.g. for portal/share users,
         # this should be safe (no context passed to avoid side-effects)
-        obj_tm = users_obj.browse(cr, 1, uid, context=context).company_id.project_time_mode_id
+        obj_tm = users_obj.browse(cr, SUPERUSER_ID, uid, context=context).company_id.project_time_mode_id
         tm = obj_tm and obj_tm.name or 'Hours'
 
         res = super(task, self).fields_view_get(cr, uid, view_id, view_type, context, toolbar, submenu=submenu)
@@ -1181,6 +1159,45 @@ class task(base_stage, osv.osv):
         result += "\n"
         return result
 
+    # ---------------------------------------------------
+    # mail gateway
+    # ---------------------------------------------------
+
+    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 = {}
+        custom_values.update({
+            'name': subject,
+            'planned_hours': 0.0,
+            'subject': msg.get('subject'),
+        })
+        return super(project_tasks,self).message_new(cr, uid, msg, custom_values=custom_values, context=context)
+
+    def message_update(self, cr, uid, ids, msg, update_vals=None, context=None):
+        """ Override to update the task according to the email. """
+        if update_vals is None: update_vals = {}
+        act = False
+        maps = {
+            'cost':'planned_hours',
+        }
+        for line in msg['body'].split('\n'):
+            line = line.strip()
+            res = tools.misc.command_re.match(line)
+            if res:
+                match = res.group(1).lower()
+                field = maps.get(match)
+                if field:
+                    try:
+                        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(project_tasks,self).message_update(cr, uid, msg, update_vals=update_vals, context=context)
+
     # ---------------------------------------------------
     # OpenChatter methods and notifications
     # ---------------------------------------------------
@@ -1209,19 +1226,19 @@ class task(base_stage, osv.osv):
     def stage_set_send_note(self, cr, uid, ids, stage_id, context=None):
         """ Override of the (void) default notification method. """
         stage_name = self.pool.get('project.task.type').name_get(cr, uid, [stage_id], context=context)[0][1]
-        return self.message_append_note(cr, uid, ids, body= _("Stage changed to <b>%s</b>.") % (stage_name), context=context)
+        return self.message_post(cr, uid, ids, body= _("Stage changed to <b>%s</b>.") % (stage_name), context=context)
 
     def create_send_note(self, cr, uid, ids, context=None):
-        return self.message_append_note(cr, uid, ids, body=_("Task has been <b>created</b>."), context=context)
+        return self.message_post(cr, uid, ids, body=_("Task has been <b>created</b>."), context=context)
 
     def case_draft_send_note(self, cr, uid, ids, context=None):
         msg = _('Task has been set as <b>draft</b>.')
-        return self.message_append_note(cr, uid, ids, body=msg, context=context)
+        return self.message_post(cr, uid, ids, body=msg, context=context)
 
     def do_delegation_send_note(self, cr, uid, ids, context=None):
         for task in self.browse(cr, uid, ids, context=context):
             msg = _('Task has been <b>delegated</b> to <em>%s</em>.') % (task.user_id.name)
-            self.message_append_note(cr, uid, [task.id], body=msg, context=context)
+            self.message_post(cr, uid, [task.id], body=msg, context=context)
         return True
 
 
@@ -1268,7 +1285,7 @@ class account_analytic_account(osv.osv):
     _inherit = 'account.analytic.account'
     _description = 'Analytic Account'
     _columns = {
-        'use_tasks': fields.boolean('Tasks Mgmt.',help="If check,this contract will be available in the project menu and you will be able to manage tasks or track issues"),
+        'use_tasks': fields.boolean('Tasks',help="If check,this contract will be available in the project menu and you will be able to manage tasks or track issues"),
         'company_uom_id': fields.related('company_id', 'project_time_mode_id', type='many2one', relation='product.uom'),
     }
 
diff --git a/addons/project/project_data.xml b/addons/project/project_data.xml
index c2d37f7943d..5cc4c99df1b 100644
--- a/addons/project/project_data.xml
+++ b/addons/project/project_data.xml
@@ -85,13 +85,15 @@
         </record>
 
         <!-- notify all employees of module installation -->
-        <function model="mail.group" name="message_append_note">
-            <!-- ids, subject, body, parent_id=False, type='notification', content_subtype='html' -->
-            <value eval="[ref('mail.group_all_employees')]"/>
-            <value>Module Project Management has been installed</value>
-            <value>Manage multi-level projects and tasks.  You can delegate tasks, track the work done on tasks, and review your planning based on the entered data.
+        <record model="mail.message" id="module_install_notification">
+            <field name="model">mail.group</field>
+            <field name="res_id" ref="mail.group_all_employees"/>
+            <field name="type">notification</field>
+            <field name="subject">Project Management application installed!</field>
+            <field name="body">Manage multi-level projects and tasks.  You can delegate tasks, track task work, and review your planning.
 
-You can manage todo lists on tasks by installing the module "Todo Lists", which supports the methodology Getting Things Done (GTD).  You can also manage issues/bugs in projects by installing the module "Issues Tracker."</value>
-        </function>
+You can manage todo lists on tasks by installing the "Todo Lists" application, supporting the Getting Things Done (GTD) methodology.
+You can also manage issues/bugs in projects by installing the "Issue Tracker" application.</field>
+        </record>
     </data>
 </openerp>
diff --git a/addons/project/project_demo.xml b/addons/project/project_demo.xml
index 0ead9f4443c..cd22bad67d4 100644
--- a/addons/project/project_demo.xml
+++ b/addons/project/project_demo.xml
@@ -7,49 +7,6 @@
             <field name="groups_id" eval="[(4, ref('base.group_sale_salesman')),(4, ref('group_project_user'))]"/>
         </record>
 
-        <record id="base.user_niv" model="res.users">
-            <field name="name">Nicolas</field>
-            <field name="groups_id" eval="[(6, 0, [ref('base.group_user'), ref('project.group_project_manager')])]"/>
-            <field name="login">niv</field>
-            <field name="password">niv</field>
-        </record>
-        <record id="base.user_al" model="res.users">
-            <field name="name">Antony</field>
-            <field name="groups_id" eval="[(6, 0, [ref('base.group_user'), ref('project.group_project_manager')])]"/>
-            <field name="login">al</field>
-            <field name="password">al</field>
-        </record>
-        <record id="base.user_qdp" model="res.users">
-            <field name="name">Quentin</field>
-            <field name="groups_id" eval="[(6, 0, [ref('base.group_user'), ref('project.group_project_user')])]"/>
-            <field name="login">qdp</field>
-            <field name="password">qdp</field>
-        </record>
-        <record id="base.user_fpi" model="res.users">
-            <field name="name">Francois</field>
-            <field name="groups_id" eval="[(6, 0, [ref('base.group_user'), ref('project.group_project_user')])]"/>
-            <field name="login">fpi</field>
-            <field name="password">fpi</field>
-        </record>
-        <record id="base.user_jth" model="res.users">
-            <field name="name">Julien</field>
-            <field name="groups_id" eval="[(6, 0, [ref('base.group_user'), ref('project.group_project_user')])]"/>
-            <field name="login">jth</field>
-            <field name="password">jth</field>
-        </record>
-        <record id="base.user_mit" model="res.users">
-            <field name="name">Minh</field>
-            <field name="groups_id" eval="[(6, 0, [ref('base.group_user'), ref('project.group_project_user')])]"/>
-            <field name="login">mit</field>
-            <field name="password">mit</field>
-        </record>
-        <record id="base.user_vad" model="res.users">
-            <field name="name">Valérie</field>
-            <field name="groups_id" eval="[(6, 0, [ref('base.group_user')])]"/>
-            <field name="login">vad</field>
-            <field name="password">vad</field>
-        </record>
-
         <!-- Categories -->
         <record id="project_category_01" model="project.category">
             <field name="name">Contact's suggestion</field>
@@ -90,10 +47,9 @@
             <field name="parent_id" ref="all_projects_account"/>
             <field name="privacy_visibility">followers</field>
             <field name="members" eval="[(6, 0, [
-                    ref('base.user_niv'),
-                    ref('base.user_al'),
-                    ref('base.user_qdp')])]"/>
-            <field name="user_id" ref="base.user_al"/>
+                    ref('base.user_root'),
+                    ref('base.user_demo')])]"/>
+            <field name="user_id" ref="base.user_demo"/>
             <field name="description">Implement new website for Sale and Warehouse Management for a customer.</field>
             <field name="alias_model">project.task</field>
             <field name="type_ids" eval="[(6, 0, [ref('project_tt_analysis'),ref('project_tt_specification'),ref('project_tt_negotiation'),ref('project_tt_development'),ref('project_tt_testing'),ref('project_tt_deployment')])]"/>
@@ -102,7 +58,7 @@
         <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="user_id" ref="base.user_al"/>
+            <field name="user_id" ref="base.user_demo"/>
             <field name="alias_model">project.task</field>
             <field name="type_ids" eval="[(6, 0, [ref('project_tt_specification'),ref('project_tt_development'),ref('project_tt_testing'),ref('project_tt_merge'),ref('project_tt_deployment')])]"/>
         </record>
@@ -114,9 +70,8 @@
             <field name="user_id" ref="base.user_demo"/>
             <field name="alias_model">project.task</field>
             <field name="members" eval="[(6, 0, [
-                    ref('base.user_fpi'),
-                    ref('base.user_jth'),
-                    ref('base.user_mit')])]"/>
+                    ref('base.user_root'),
+                    ref('base.user_demo')])]"/>
             <field name="type_ids" eval="[(6, 0, [ref('project_tt_specification'),ref('project_tt_development'),ref('project_tt_testing'),ref('project_tt_merge'),ref('project_tt_deployment')])]"/>
         </record>
 
@@ -128,8 +83,8 @@
             <field name="alias_model">project.task</field>
             <field name="type_ids" eval="[(6, 0, [ref('project_tt_design'),ref('project_tt_development'),ref('project_tt_testing')])]"/>
             <field name="members" eval="[(6, 0, [
-                    ref('base.user_niv'),
-                    ref('base.user_mit')])]"/>
+                    ref('base.user_root'),
+                    ref('base.user_demo')])]"/>
         </record>
 
         <record id="project_project_5" model="project.project">
@@ -141,7 +96,7 @@
             <field name="type_ids" eval="[(6, 0, [ref('project_tt_development')])]"/>
             <field name="members" eval="[(6, 0, [
                     ref('base.user_root'),
-                    ref('base.user_qdp')])]"/>
+                    ref('base.user_demo')])]"/>
         </record>
 
 
@@ -149,7 +104,7 @@
         <record id="project_task_1" model="project.task">
             <field name="planned_hours" eval="40.0"/>
             <field name="remaining_hours" eval="40.0"/>
-            <field name="user_id" ref="base.user_niv"/>
+            <field name="user_id" ref="base.user_demo"/>
             <field name="priority">4</field>
             <field name="project_id" ref="project.project_project_1"/>
             <field name="name">Prepare Requirements Document</field>
@@ -159,7 +114,7 @@
         <record id="project_task_2" model="project.task">
             <field name="planned_hours" eval="32.0"/>
             <field name="remaining_hours" eval="32.0"/>
-            <field name="user_id" ref="base.user_niv"/>
+            <field name="user_id" ref="base.user_demo"/>
             <field name="priority">4</field>
             <field name="project_id" ref="project.project_project_1"/>
             <field name="name">Make SRS</field>
@@ -168,7 +123,7 @@
         <record id="project_task_3" model="project.task">
             <field name="planned_hours" eval="10.0"/>
             <field name="remaining_hours" eval="10.0"/>
-            <field name="user_id" ref="base.user_al"/>
+            <field name="user_id" ref="base.user_root"/>
             <field name="priority">4</field>
             <field name="project_id" ref="project.project_project_1"/>
             <field name="name">Budget Planning</field>
@@ -179,7 +134,7 @@
         <record id="project_task_4" model="project.task">
             <field name="planned_hours" eval="60.0"/>
             <field name="remaining_hours" eval="60.0"/>
-            <field name="user_id" ref="base.user_al"/>
+            <field name="user_id" ref="base.user_demo"/>
             <field name="priority">4</field>
             <field name="project_id" ref="project.project_project_1"/>
             <field name="name">Develop module for Sale Management</field>
@@ -193,7 +148,7 @@
         <record id="project_task_5" model="project.task">
             <field name="planned_hours" eval="76.0"/>
             <field name="remaining_hours" eval="76.0"/>
-            <field name="user_id" ref="base.user_al"/>
+            <field name="user_id" ref="base.user_root"/>
             <field name="priority">2</field>
             <field name="project_id" ref="project.project_project_1"/>
             <field name="name">Develop module for Warehouse</field>
@@ -207,7 +162,7 @@
         <record id="project_task_6" model="project.task">
             <field name="planned_hours" eval="24.0"/>
             <field name="remaining_hours" eval="24.0"/>
-            <field name="user_id" ref="base.user_al"/>
+            <field name="user_id" ref="base.user_root"/>
             <field name="priority">2</field>
             <field name="project_id" ref="project.project_project_1"/>
             <field name="name">Integrate Modules</field>
@@ -216,7 +171,7 @@
         <record id="project_task_7" model="project.task">
             <field name="planned_hours" eval="15.0"/>
             <field name="remaining_hours" eval="5.0"/>
-            <field name="user_id" ref="base.user_al"/>
+            <field name="user_id" ref="base.user_root"/>
             <field name="priority">2</field>
             <field name="project_id" ref="project.project_project_1"/>
             <field name="name">Internal testing + Software Install</field>
@@ -225,7 +180,7 @@
         <record id="project_task_8" model="project.task">
             <field name="planned_hours" eval="22.0"/>
             <field name="remaining_hours" eval="22.0"/>
-            <field name="user_id" ref="base.user_al"/>
+            <field name="user_id" ref="base.user_demo"/>
             <field name="priority">2</field>
             <field name="project_id" ref="project.project_project_2"/>
             <field name="name">New portal system</field>
@@ -237,7 +192,7 @@
         <record id="project_task_9" model="project.task">
             <field name="planned_hours" eval="18.0"/>
             <field name="remaining_hours" eval="18.0"/>
-            <field name="user_id" ref="base.user_al"/>
+            <field name="user_id" ref="base.user_demo"/>
             <field name="priority">2</field>
             <field name="project_id" ref="project.project_project_2"/>
             <field name="name">Document history management</field>
@@ -246,7 +201,7 @@
         <record id="project_task_10" model="project.task">
             <field name="planned_hours" eval="38.0"/>
             <field name="remaining_hours" eval="38.0"/>
-            <field name="user_id" ref="base.user_fpi"/>
+            <field name="user_id" ref="base.user_demo"/>
             <field name="priority">2</field>
             <field name="project_id" ref="project.project_project_2"/>
             <field name="name">Social network integration</field>
@@ -256,7 +211,7 @@
         <record id="project_task_11" model="project.task">
             <field name="planned_hours" eval="16.0"/>
             <field name="remaining_hours" eval="16.0"/>
-            <field name="user_id" ref="base.user_fpi"/>
+            <field name="user_id" ref="base.user_root"/>
             <field name="priority">2</field>
             <field name="project_id" ref="project.project_project_2"/>
             <field name="name">User interface improvements</field>
@@ -270,7 +225,7 @@
         <record id="project_task_12" model="project.task">
             <field name="planned_hours" eval="40.0"/>
             <field name="remaining_hours" eval="40.0"/>
-            <field name="user_id" ref="base.user_fpi"/>
+            <field name="user_id" ref="base.user_root"/>
             <field name="priority">2</field>
             <field name="project_id" ref="project.project_project_2"/>
             <field name="name">Improve+clean code and functionality</field>
@@ -282,7 +237,7 @@
         <record id="project_task_13" model="project.task">
             <field name="planned_hours" eval="12.0"/>
             <field name="remaining_hours" eval="12.0"/>
-            <field name="user_id" ref="base.user_mit"/>
+            <field name="user_id" ref="base.user_demo"/>
             <field name="priority">2</field>
             <field name="project_id" ref="project.project_project_3"/>
             <field name="name">Design Use Cases</field>
@@ -293,7 +248,7 @@
         <record id="project_task_14" model="project.task">
             <field name="planned_hours" eval="12.0"/>
             <field name="remaining_hours" eval="12.0"/>
-            <field name="user_id" ref="base.user_mit"/>
+            <field name="user_id" ref="base.user_root"/>
             <field name="priority">2</field>
             <field name="project_id" ref="project.project_project_3"/>
             <field name="name">Dataflow Design</field>
@@ -302,7 +257,7 @@
         <record id="project_task_15" model="project.task">
             <field name="planned_hours" eval="55.0"/>
             <field name="remaining_hours" eval="55.0"/>
-            <field name="user_id" ref="base.user_fpi"/>
+            <field name="user_id" ref="base.user_root"/>
             <field name="priority">2</field>
             <field name="project_id" ref="project.project_project_3"/>
             <field name="name">User Interface design</field>
@@ -316,7 +271,7 @@
             <field name="sequence" eval="10"/>
             <field name="planned_hours" eval="80.0"/>
             <field name="remaining_hours" eval="80.0"/>
-            <field name="user_id" ref="base.user_mit"/>
+            <field name="user_id" ref="base.user_demo"/>
             <field name="priority">2</field>
             <field name="project_id" ref="project.project_project_3"/>
             <field name="name">Set target for all deparments</field>
@@ -327,7 +282,7 @@
         <record id="project_task_17" model="project.task">
             <field name="planned_hours" eval="34.0"/>
             <field name="remaining_hours" eval="34.0"/>
-            <field name="user_id" ref="base.user_niv"/>
+            <field name="user_id" ref="base.user_demo"/>
             <field name="priority">2</field>
             <field name="project_id" ref="project.project_project_3"/>
             <field name="name">Integration of core components</field>
@@ -338,7 +293,7 @@
         <record id="project_task_18" model="project.task">
             <field name="planned_hours" eval="16.0"/>
             <field name="remaining_hours" eval="16.0"/>
-            <field name="user_id" ref="base.user_niv"/>
+            <field name="user_id" ref="base.user_root"/>
             <field name="priority">2</field>
             <field name="project_id" ref="project.project_project_3"/>
             <field name="name">Deploy and review on live system</field>
@@ -438,5 +393,34 @@
         <function model="project.project" name="schedule_tasks"
             eval="[ref('project_project_3'), ref('project_project_4'), ref('project_project_5')], {'install_mode': True}"/>
 
+        <record id="message_task_1" model="mail.message">
+            <field name="model">project.task</field>
+            <field name="res_id" ref="project_task_22"/>
+            <field name="body">Hello Demo,
+There is a change in customer requirement.
+Can you check the document from customer again.
+Thanks,</field>
+            <field name="type">comment</field>
+            <field name="author_id" ref="base.partner_root"/>
+        </record>
+        <record id="message_task_2" model="mail.message">
+            <field name="model">project.task</field>
+            <field name="res_id" ref="project_task_22"/>
+            <field name="parent_id" ref="message_task_1"/>
+            <field name="body">Ok, I have checked the mail,
+I will update the document and let you know.</field>
+            <field name="type">comment</field>
+            <field name="author_id" ref="base.partner_demo"/>
+        </record>
+        <record id="message_task_3" model="mail.message">
+            <field name="model">project.task</field>
+            <field name="res_id" ref="project_task_22"/>
+            <field name="parent_id" ref="message_task_2"/>
+            <field name="body">Fine!
+Send it ASAP, its urgent.</field>
+            <field name="type">comment</field>
+            <field name="author_id" ref="base.partner_root"/>
+        </record>
+
     </data>
 </openerp>
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index eb17d446816..a4ba5a233a1 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -76,33 +76,29 @@
                 </header>
                 <sheet string="Project">
                     <field name="analytic_account_id" invisible="1" required="0"/>
-                    <label for="name" class="oe_edit_only" string="Project Name"/>
-                    <h1>
-                        <field name="name" string="Project Name"/>
-                    </h1>
-                    <div attrs="{'invisible': [('alias_domain', '=', False)]}">
-                        <field name="alias_id" invisible="1" required="0"/>
-                        <label for="alias_name" class="oe_edit_only "/>
-                        <field name="alias_name" class="oe_inline" attrs="{'required': [('alias_id', '!=', False)]}"/>@<field name="alias_domain" class="oe_inline"/>
+                    <div class="oe_title">
+                        <label for="name" class="oe_edit_only" string="Project Name"/>
+                        <h1>
+                            <field name="name" string="Project Name"/>
+                        </h1>
+                        <div name="options_active">
+                            <field name="use_tasks" class="oe_inline"/>
+                            <label for="use_tasks"/>
+                        </div>
+                    </div>
+                    <div class="oe_right oe_button_box" name="buttons">
+                        <button name="%(act_project_project_2_project_task_all)d" string="Tasks"
+                            type="action" attrs="{'invisible':[('use_tasks','=', 0)]}"/>
+                        <button name="%(base.action_attachment)d" string="Documents" type="action"/>
                     </div>
                     <group>
                         <group>
                             <field name="user_id" string="Project Manager" attrs="{'readonly':[('state','in',['close', 'cancelled'])]}"/>
                             <field name="partner_id" string="Contact" on_change="onchange_partner_id(partner_id)"/>
-                            <field name="privacy_visibility"/>
-                            <field name="analytic_account_id" invisible="1" required="0"/>
                         </group>
                         <group>
-                            <table>
-                                <tr name="use_tasks_row">
-                                    <td><group><field name="use_tasks"/></group></td>
-                                    <td><button icon="terp-gtk-go-back-rtl" name="%(act_project_project_2_project_task_all)d" string="Tasks" type="action" attrs="{'invisible':[('use_tasks','=', 0)]}"/></td>
-                                </tr>
-                                <tr name="use_attachment_row">
-                                    <td/>
-                                    <td><button icon="terp-gtk-go-back-rtl" class="oe_btn_width" name="%(base.action_attachment)d" string="Documents" type="action"/></td>
-                                </tr>
-                            </table>
+                            <field name="privacy_visibility"/>
+                            <field name="analytic_account_id" readonly="1" required="0"/>
                         </group>
                     </group>
                     <notebook>
@@ -126,6 +122,13 @@
                             </field>
                         </page>
                         <page string="Other Info">
+                            <group string="Email Interface" colspan="2">
+                                <div attrs="{'invisible': [('alias_domain', '=', False)]}">
+                                    <field name="alias_id" invisible="1" required="0"/>
+                                    <label for="alias_name" class="oe_edit_only "/>
+                                    <field name="alias_name" class="oe_inline" attrs="{'required': [('alias_id', '!=', False)]}"/>@<field name="alias_domain" class="oe_inline"/>
+                                </div>
+                            </group>
                             <group>
                                 <group string="Administration">
                                     <field name="planned_hours" widget="float_time"/>
@@ -133,11 +136,11 @@
                                     <field name="resource_calendar_id"/>
                                 </group>
                                 <group string="Miscellaneous" name="misc">
-                                    <field name="company_id" groups="base.group_multi_company" widget="selection" required="1"/>
+                                    <field name="parent_id" domain="[('id','!=',analytic_account_id)]" context="{'current_model': 'project.project'}"/>
                                     <field name="priority"/>
                                     <field name="active" attrs="{'invisible':[('state','in',['open', 'pending', 'template'])]}"/>
                                     <field name="currency_id" groups="base.group_multi_company" required="1"/>
-                                    <field name="parent_id" domain="[('id','!=',analytic_account_id)]" context="{'current_model': 'project.project'}"/>
+                                    <field name="company_id" groups="base.group_multi_company" widget="selection" required="1"/>
                                 </group>
                             </group>
                         </page>
@@ -160,7 +163,7 @@
             <field name="arch" type="xml">
                 <search string="Search Project">
                     <field name="complete_name" string="Project Name"/>
-                    <filter icon="terp-mail-message-new" string="Inbox" help="Unread messages" name="needaction_pending" domain="[('needaction_pending','=',True)]"/>
+                    <filter icon="terp-mail-message-new" string="Inbox" help="Unread messages" name="message_unread" domain="[('message_unread','=',True)]"/>
                     <separator/>
                     <filter icon="terp-check" string="Open" name="Current" domain="[('state', '=','open')]" help="Open Projects"/>
                     <filter icon="gtk-media-pause" string="Pending" name="Pending" domain="[('state', '=','pending')]" help="Pending Projects"/>
@@ -185,9 +188,9 @@
             <field name="model">project.project</field>
             <field name="field_parent">child_ids</field>
             <field name="arch" type="xml">
-                <tree fonts="bold:needaction_pending==True" colors="red:date and (date&lt;current_date) and (state == 'open');blue:state in ('draft','pending');grey: state in ('close','cancelled')" string="Projects">
+                <tree fonts="bold:message_unread==True" colors="red:date and (date&lt;current_date) and (state == 'open');blue:state in ('draft','pending');grey: state in ('close','cancelled')" string="Projects">
                     <field name="sequence" invisible="1"/>
-                    <field name="needaction_pending" invisible="1"/>
+                    <field name="message_unread" invisible="1"/>
                     <field name="date" invisible="1"/>
                     <field name="name" string="Project Name"/>
                     <field name="user_id" string="Project Manager"/>
@@ -215,7 +218,7 @@
             <field name="name">project.project.kanban</field>
             <field name="model">project.project</field>
             <field name="arch" type="xml">
-                <kanban>
+                <kanban version="7.0" class="oe_background_grey">
                     <field name="effective_hours"/>
                     <field name="planned_hours"/>
                     <field name="name"/>
@@ -229,40 +232,62 @@
                     <field name="alias_domain"/>
                     <templates>
                         <t t-name="kanban-box">
-                            <div t-attf-class="oe_kanban_color_#{kanban_getcolor(record.color.raw_value)} oe_kanban_card oe_kanban_project oe_kanban_auto_height oe_kanban_global_click">
+                            <div t-attf-class="oe_kanban_color_#{kanban_getcolor(record.color.raw_value)} oe_kanban_card oe_kanban_project oe_kanban_global_click">
                                 <div class="oe_dropdown_toggle oe_dropdown_kanban">
                                     <span class="oe_e">í</span>
                                     <ul class="oe_dropdown_menu">
-                                        <li><a type="edit">Edit...</a></li>
-                                        <li><a type="delete">Delete</a></li>
+                                        <t t-if="widget.view.is_action_enabled('edit')"><li><a type="edit">Edit...</a></li></t>
+                                        <t t-if="widget.view.is_action_enabled('delete')"><li><a type="delete">Delete</a></li></t>
                                         <li><ul class="oe_kanban_colorpicker" data-field="color"/></li>
                                     </ul>
                                 </div>
                                 <div class="oe_kanban_content">
-                                    <h3 class="oe_kanban_ellipsis"><field name="name"/></h3>
 
+                                    <h4><field name="name"/></h4>
                                     <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">
-                                            Tasks(<field name="task_count"/>)</a>
-                                    </div>
-
-                                    <div class="oe_kanban_project_fields oe_kanban_project_deadline" t-if="record.date.raw_value">
-                                        <div>Deadline</div>
-                                        <div><field name="date"/></div>
-                                    </div>
-                                    <div class="oe_kanban_project_fields oe_kanban_project_progress">
-                                        <div>Progress</div>
-                                        <div><t t-esc="Math.round(record.effective_hours.raw_value)"/> / <t t-esc="Math.round(record.planned_hours.raw_value)"/> <field name="company_uom_id"/></div>
-                                    </div>
-                                    <div name="alias_box" t-if="record.alias_domain.raw_value" class="oe_kanban_ellipsis">
-                                        <a t-attf-href="mailto:#{record.alias_id.value}"><field name="alias_id"/></a>
+                                        <a t-if="record.use_tasks.raw_value" name="%(act_project_project_2_project_task_all)d" type="action"> <field name="task_count"/> Tasks</a>
                                     </div>
+                                    <table>
+                                      <tr class="oe_kanban_project_fields oe_kanban_project_deadline" t-if="record.date.raw_value">
+                                        <th>Deadline</th>
+                                        <td><field name="date"/></td>
+                                      </tr>
+                                      <tr class="oe_kanban_project_fields oe_kanban_project_progress">
+                                        <th>Progress</th>
+                                        <td><t t-esc="Math.round(record.effective_hours.raw_value)"/>/<t t-esc="Math.round(record.planned_hours.raw_value)"/> <field name="company_uom_id"/></td>
+                                      </tr>
+                                    </table>
                                     <div class="oe_kanban_project_avatars">
                                         <t t-foreach="record.members.raw_value" t-as="member">
                                             <img t-att-src="kanban_image('res.users', 'image_small', member)" t-att-data-member_id="member"/>
                                         </t>
                                     </div>
+
+                                    <!--<h3 class="oe_kanban_ellipsis"><field name="name"/></h3>-->
+
+                                    <!--<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">-->
+                                            <!--Tasks(<field name="task_count"/>)</a>-->
+                                    <!--</div>-->
+
+                                    <!--<div class="oe_kanban_project_fields oe_kanban_project_deadline" t-if="record.date.raw_value">-->
+                                        <!--<div>Deadline</div>-->
+                                        <!--<div><field name="date"/></div>-->
+                                    <!--</div>-->
+                                    <!--<div class="oe_kanban_project_fields oe_kanban_project_progress">-->
+                                        <!--<div>Progress</div>-->
+                                        <!--<div><t t-esc="Math.round(record.effective_hours.raw_value)"/> / <t t-esc="Math.round(record.planned_hours.raw_value)"/> <field name="company_uom_id"/></div>-->
+                                    <!--</div>-->
+                                    <!--<div name="alias_box" t-if="record.alias_domain.raw_value" class="oe_kanban_ellipsis">-->
+                                        <!--<a t-attf-href="mailto:#{record.alias_id.value}"><field name="alias_id"/></a>-->
+                                    <!--</div>-->
+                                    <!--<div class="oe_kanban_project_avatars">-->
+                                        <!--<t t-foreach="record.members.raw_value" t-as="member">-->
+                                            <!--<img t-att-src="kanban_image('res.users', 'image_small', member)" t-att-data-member_id="member"/>-->
+                                        <!--</t>-->
+                                    <!--</div>-->
+
                                 </div>
                             </div>
                         </t>
@@ -290,7 +315,7 @@
             <field name="search_view_id" ref="view_project_project_filter"/>
             <field name="context">{}</field>
             <field name="help" type="html">
-                <p class="oe_form_nocontent_create">
+                <p class="oe_view_nocontent_create">
                   Click to start a new project.
                 </p>
                 <p>
@@ -399,7 +424,7 @@
                             <button name="%(action_project_task_reevaluate)d" string="Reactivate" type="action"
                                     states="cancelled,done" context="{'button_reactivate':True}"/>
                             <button name="action_close" string="Done" type="object"
-                                    states="draft,open,pending" class="oe_highlight"/>
+                                    states="draft,open,pending"/>
                             <button name="%(action_project_task_delegate)d" string="Delegate" type="action"
                                     states="pending,open,draft" groups="project.group_delegate_task"/>
                             <button name="do_cancel" string="Cancel" type="object"
@@ -420,12 +445,10 @@
                         </group>
                         <group>
                             <field name="date_deadline" attrs="{'readonly':[('state','in',['done', 'cancelled'])]}"/>
+                            <field name="categ_ids" widget="many2many_tags"/>
                             <field name="progress" widget="progressbar"
                                 groups="project.group_time_work_estimation_tasks"/>
                         </group>
-                        <group>
-                            <field name="categ_ids" widget="many2many_tags"/>
-                        </group>
                     </group>
                     <notebook>
                         <page string="Description">
@@ -459,7 +482,7 @@
                                     <field name="name"/>
                                     <field name="user_id"/>
                                     <field name="stage_id"/>
-                                    <field name="state" groups="base.group_no_one"/>
+                                    <field name="state" invisible="1"/>
                                     <field name="effective_hours" widget="float_time"/>
                                     <field name="progress" widget="progressbar"/>
                                     <field name="remaining_hours" widget="float_time"/>
@@ -475,7 +498,7 @@
                                 <field name="planned_hours" widget="float_time" attrs="{'readonly':[('state','!=','draft')]}"
                                     groups="project.group_time_work_estimation_tasks"
                                     on_change="onchange_planned(planned_hours, effective_hours)"/>
-                                <field name="state" groups="base.group_no_one"/>
+                                <field name="state" invisible="1"/>
                             </group>
                         </page>
                     </notebook>
@@ -506,7 +529,7 @@
                     <field name="remaining_hours" sum="Remaining Time" groups="project.group_time_work_estimation_tasks"/>
                     <field name="date_deadline"/>
                     <field name="message_summary"/>
-                    <field name="needaction_pending"/>
+                    <field name="message_unread"/>
                     <field name="categ_ids"/>
                     <templates>
                     <t t-name="kanban-box">
@@ -514,8 +537,8 @@
                             <div class="oe_dropdown_toggle oe_dropdown_kanban">
                                 <span class="oe_e">í</span>
                                 <ul class="oe_dropdown_menu">
-                                    <li><a type="edit" >Edit...</a></li>
-                                    <li><a type="delete">Delete</a></li>
+                                    <t t-if="widget.view.is_action_enabled('edit')"><li><a type="edit">Edit...</a></li></t>
+                                    <t t-if="widget.view.is_action_enabled('delete')"><li><a type="delete">Delete</a></li></t>
                                     <li>
                                       <ul class="oe_kanban_project_times">
                                         <li><a name="set_remaining_time_1" type="object" class="oe_kanban_button">1</a></li>
@@ -571,8 +594,8 @@
             <field name="model">project.task</field>
             <field eval="2" name="priority"/>
             <field name="arch" type="xml">
-                <tree fonts="bold:needaction_pending==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">
-                    <field name="needaction_pending" invisible="1"/>
+                <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">
+                    <field name="message_unread" invisible="1"/>
                     <field name="sequence" invisible="not context.get('seq_visible', False)"/>
                     <field name="name"/>
                     <field name="project_id" icon="gtk-indent" invisible="context.get('user_invisible', False)"/>
@@ -584,7 +607,7 @@
                     <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="context.get('set_visible',False)" groups="base.group_no_one"/>
+                    <field name="state" invisible="1"/>
                     <field name="date_start" invisible="1" groups="base.group_no_one"/>
                     <field name="date_end" invisible="1" groups="base.group_no_one"/>
                     <field name="progress" widget="progressbar" invisible="context.get('set_visible',False)"/>
@@ -632,7 +655,7 @@
             <field name="arch" type="xml">
                <search string="Tasks">
                     <field name="name" string="Tasks"/>
-                    <filter icon="terp-mail-message-new" string="Inbox" help="Unread messages" name="needaction_pending" domain="[('needaction_pending','=',True)]"/>
+                    <filter icon="terp-mail-message-new" string="Inbox" help="Unread messages" name="message_unread" domain="[('message_unread','=',True)]"/>
                     <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"/>
@@ -651,7 +674,6 @@
                         <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="Status" name="group_state" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
                         <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="End Date" icon="terp-go-month" domain="[]" context="{'group_by':'date_end'}" groups="base.group_no_one"/>
@@ -666,11 +688,9 @@
             <field name="inherit_id" ref="analytic.view_account_analytic_account_form"/>
             <field eval="18" name="priority"/>
             <field name="arch" type="xml">
-                <xpath expr='//separator[@name="project_sep"]' position='replace'>
-                    <separator colspan="4" string="Project Management" name="project_sep"/> <!-- removal of invisible attribute -->
-                </xpath>
-                <xpath expr='//separator[@name="project_sep"]' position='after'>
+                <xpath expr='//div[@name="project"]' position='inside'>
                     <field name="use_tasks"/>
+                    <label for="use_tasks"/>
                 </xpath>
             </field>
         </record>
diff --git a/addons/project/report/project_report_view.xml b/addons/project/report/project_report_view.xml
index 5d6132b1b8f..1d60479f65c 100644
--- a/addons/project/report/project_report_view.xml
+++ b/addons/project/report/project_report_view.xml
@@ -79,7 +79,6 @@
                         <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="Status" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
                         <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"/>
diff --git a/addons/project/security/ir.model.access.csv b/addons/project/security/ir.model.access.csv
index 3f79cfee3de..d9f6cb9d2f6 100644
--- a/addons/project/security/ir.model.access.csv
+++ b/addons/project/security/ir.model.access.csv
@@ -18,3 +18,5 @@ access_account_analytic_line_project,account.analytic.line project,analytic.mode
 access_project_task_history,project.task.history project,project.model_project_task_history,project.group_project_user,1,1,1,0
 access_project_task_history_cumulative,project.task.history project,project.model_project_task_history_cumulative,project.group_project_manager,1,0,0,0
 access_resource_calendar,project.resource_calendar manager,resource.model_resource_calendar,project.group_project_manager,1,0,0,0
+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
diff --git a/addons/project/security/project_security.xml b/addons/project/security/project_security.xml
index f867285138a..3afe0f14e7a 100644
--- a/addons/project/security/project_security.xml
+++ b/addons/project/security/project_security.xml
@@ -45,7 +45,7 @@
         <field name="name">public Members</field>
         <field name="model_id" ref="model_project_project"/>
         <field name="global" eval="True"/>
-        <field name="domain_force">['|','|',('privacy_visibility','in',[False,'public']),('members','in',[user.id]),('followers','in',[user.id])]</field>
+        <field name="domain_force">['|','|',('privacy_visibility','in',[False,'public']),('members','in',[user.id]),('follower_ids','in',[user.partner_id.id])]</field>
     </record>
 
     <record model="ir.rule" id="task_comp_rule">
diff --git a/addons/project/static/src/css/project.css b/addons/project/static/src/css/project.css
index ebab44e225a..f90162fcc76 100644
--- a/addons/project/static/src/css/project.css
+++ b/addons/project/static/src/css/project.css
@@ -1,23 +1,42 @@
+.oe_kanban_card {
+  margin: 2px;
+}
+
 .oe_kanban_project {
-    width: 300px;
+    width: 250px;
+    min-height: 160px;
 }
+
 .oe_kanban_project_list {
-    margin: 8px 0 8px 0;
+    margin: 4px 0;
 }
-/*.oe_kanban_project_list a:not(:first-child):before {
-    content: ' - ';
-}*/
-.oe_kanban_project_fields div {
-    display: inline-block;
-    width: 49%;
-    box-sizing: border-box;
-    padding: 2px 0 2px 0;
+
+.openerp .oe_kanban_content h4 {
+    margin: 0 0 8px;
 }
+
+.oe_kanban_content > table {
+    width: 100%;
+}
+
+.oe_kanban_content > table > th {
+    padding: 0;
+    border-right: 1px solid #DDD;
+    vertical-align: top;
+    font-weight: normal;
+}
+
+.oe_kanban_content > table > td {
+    padding: 2px 0 2px 8px;
+    color: #888;
+}
+
 .oe_kanban_project_fields div:nth-child(odd) {
     border-right: 1px solid #dddddd;
     vertical-align: top;
     padding-right: 8px;
 }
+
 .oe_kanban_project_fields div:nth-child(even) {
     padding-left: 8px;
     color: #888888;
@@ -27,6 +46,7 @@
     padding-top: 1em;
     margin-top: 8px;
 }
+
 .oe_kanban_project_avatars img {
     width: 30px;
     height: 30px;
diff --git a/addons/project/static/src/js/project.js b/addons/project/static/src/js/project.js
index c8250edcafd..194cc186f27 100644
--- a/addons/project/static/src/js/project.js
+++ b/addons/project/static/src/js/project.js
@@ -10,7 +10,7 @@ openerp.project = function(openerp) {
             var members_ids = [];
 
             // Collect members ids
-            self.$element.find('img[data-member_id]').each(function() {
+            self.$el.find('img[data-member_id]').each(function() {
                 members_ids.push($(this).data('member_id'));
             });
 
@@ -19,7 +19,7 @@ openerp.project = function(openerp) {
             dataset.read_slice(['id', 'name']).then(function(result) {
                 _.each(result, function(v, k) {
                     // Set the proper value in the DOM
-                    self.$element.find('img[data-member_id=' + v.id + ']').attr('title', v.name).tipsy({
+                    self.$el.find('img[data-member_id=' + v.id + ']').attr('title', v.name).tipsy({
                         offset: 10
                     });
                 });
@@ -35,7 +35,7 @@ openerp.project = function(openerp) {
             var categ_ids = [];
 
             // Collect categories ids
-            self.$element.find('span[data-categ_id]').each(function() {
+            self.$el.find('span[data-categ_id]').each(function() {
                 categ_ids.push($(this).data('categ_id'));
             });
 
@@ -44,7 +44,7 @@ openerp.project = function(openerp) {
             dataset.read_slice(['id', 'name']).then(function(result) {
                 _.each(result, function(v, k) {
                     // Set the proper value in the DOM and display the element
-                    self.$element.find('span[data-categ_id=' + v.id + ']').text(v.name);
+                    self.$el.find('span[data-categ_id=' + v.id + ']').text(v.name);
                 });
             });
         },
diff --git a/addons/project/test/task_process.yml b/addons/project/test/task_process.yml
index ad4bbe53bb3..e37b2116714 100644
--- a/addons/project/test/task_process.yml
+++ b/addons/project/test/task_process.yml
@@ -11,7 +11,7 @@
     - state == "pending"
 -
   !record {model: project.task.delegate, id: delegate_id}:
-    user_id: base.user_niv
+    user_id: base.user_demo
     planned_hours: 12.0
     planned_hours_me: 2.0
 -
diff --git a/addons/project_gtd/__openerp__.py b/addons/project_gtd/__openerp__.py
index c28bc6f732a..116a063b77d 100644
--- a/addons/project_gtd/__openerp__.py
+++ b/addons/project_gtd/__openerp__.py
@@ -24,8 +24,8 @@
     'name': 'Todo Lists',
     'version': '1.0',
     'category': 'Project Management',
-    "sequence": 20,
-    "summary": "Personal Tasks",
+    'sequence': 20,
+    'summary': 'Personal Tasks',
     'description': """
 This module implements all concepts defined by the Getting Things Done methodology.
 ===================================================================================
@@ -48,18 +48,15 @@ performing those tasks.
     'author': 'OpenERP SA',
     'images': ['images/project_gtd.jpeg'],
     'depends': ['project'],
-    'init_xml': [],
-    'update_xml': [
+    'data': [
         'project_gtd_data.xml',
         'project_gtd_view.xml',
         'security/ir.model.access.csv',
         'wizard/project_gtd_empty_view.xml',
         'wizard/project_gtd_fill_view.xml',
     ],
-    'demo_xml': ['project_gtd_demo.xml'],
-    'test':[
-         'test/task_timebox.yml'
-    ],
+    'demo': ['project_gtd_demo.xml'],
+    'test':['test/task_timebox.yml'],
     'installable': True,
     'application': True,
     'auto_install': False,
diff --git a/addons/project_gtd/i18n/ar.po b/addons/project_gtd/i18n/ar.po
index 40bb73bf486..84ec7d14d7b 100644
--- a/addons/project_gtd/i18n/ar.po
+++ b/addons/project_gtd/i18n/ar.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:17+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:22+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project_gtd
 #: view:project.task:0
diff --git a/addons/project_gtd/i18n/bg.po b/addons/project_gtd/i18n/bg.po
index b58dcd236ec..4eadb16b91d 100644
--- a/addons/project_gtd/i18n/bg.po
+++ b/addons/project_gtd/i18n/bg.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:17+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:22+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project_gtd
 #: view:project.task:0
diff --git a/addons/project_gtd/i18n/bs.po b/addons/project_gtd/i18n/bs.po
index 9ec72e05741..96dd08b2063 100644
--- a/addons/project_gtd/i18n/bs.po
+++ b/addons/project_gtd/i18n/bs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:17+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:22+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project_gtd
 #: view:project.task:0
diff --git a/addons/project_gtd/i18n/ca.po b/addons/project_gtd/i18n/ca.po
index f3aa7ea9b6a..3f0cc5e74b1 100644
--- a/addons/project_gtd/i18n/ca.po
+++ b/addons/project_gtd/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:17+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:22+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project_gtd
 #: view:project.task:0
diff --git a/addons/project_gtd/i18n/cs.po b/addons/project_gtd/i18n/cs.po
index b235b119b19..06daec64cfb 100644
--- a/addons/project_gtd/i18n/cs.po
+++ b/addons/project_gtd/i18n/cs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:17+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:22+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project_gtd
 #: view:project.task:0
diff --git a/addons/project_gtd/i18n/da.po b/addons/project_gtd/i18n/da.po
index 6d7bbd77ac4..d3622cde4ca 100644
--- a/addons/project_gtd/i18n/da.po
+++ b/addons/project_gtd/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:17+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:22+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project_gtd
 #: view:project.task:0
diff --git a/addons/project_gtd/i18n/de.po b/addons/project_gtd/i18n/de.po
index 0de236a18f6..7ca31102b04 100644
--- a/addons/project_gtd/i18n/de.po
+++ b/addons/project_gtd/i18n/de.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:17+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:22+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project_gtd
 #: view:project.task:0
diff --git a/addons/project_gtd/i18n/el.po b/addons/project_gtd/i18n/el.po
index 3d7cd281983..15db75a3cba 100644
--- a/addons/project_gtd/i18n/el.po
+++ b/addons/project_gtd/i18n/el.po
@@ -12,8 +12,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:17+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:22+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
 "X-Poedit-SourceCharset: utf-8\n"
diff --git a/addons/project_gtd/i18n/es.po b/addons/project_gtd/i18n/es.po
index 0a16b7c2fec..7631339c9be 100644
--- a/addons/project_gtd/i18n/es.po
+++ b/addons/project_gtd/i18n/es.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:17+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:22+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project_gtd
 #: view:project.task:0
diff --git a/addons/project_gtd/i18n/es_AR.po b/addons/project_gtd/i18n/es_AR.po
index 6fe4871c9e3..28cc735b046 100644
--- a/addons/project_gtd/i18n/es_AR.po
+++ b/addons/project_gtd/i18n/es_AR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:17+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:23+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project_gtd
 #: view:project.task:0
diff --git a/addons/project_gtd/i18n/es_CR.po b/addons/project_gtd/i18n/es_CR.po
index cfff8f7c2ad..f8739a34f4e 100644
--- a/addons/project_gtd/i18n/es_CR.po
+++ b/addons/project_gtd/i18n/es_CR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:17+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:23+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 "Language: \n"
 
 #. module: project_gtd
diff --git a/addons/project_gtd/i18n/es_EC.po b/addons/project_gtd/i18n/es_EC.po
index b4975356a00..c2700d2e768 100644
--- a/addons/project_gtd/i18n/es_EC.po
+++ b/addons/project_gtd/i18n/es_EC.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:17+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:23+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project_gtd
 #: view:project.task:0
diff --git a/addons/project_gtd/i18n/et.po b/addons/project_gtd/i18n/et.po
index fe76aa87273..021ea4bc7b0 100644
--- a/addons/project_gtd/i18n/et.po
+++ b/addons/project_gtd/i18n/et.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:17+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:22+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project_gtd
 #: view:project.task:0
diff --git a/addons/project_gtd/i18n/fi.po b/addons/project_gtd/i18n/fi.po
index 95d5ff489a8..0cbdae13a9f 100644
--- a/addons/project_gtd/i18n/fi.po
+++ b/addons/project_gtd/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:17+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:22+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project_gtd
 #: view:project.task:0
diff --git a/addons/project_gtd/i18n/fr.po b/addons/project_gtd/i18n/fr.po
index 754574e5431..9cc218f5382 100644
--- a/addons/project_gtd/i18n/fr.po
+++ b/addons/project_gtd/i18n/fr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:17+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:22+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project_gtd
 #: view:project.task:0
diff --git a/addons/project_gtd/i18n/gl.po b/addons/project_gtd/i18n/gl.po
index f3bc5c976cd..73b714d84b0 100644
--- a/addons/project_gtd/i18n/gl.po
+++ b/addons/project_gtd/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:17+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:22+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project_gtd
 #: view:project.task:0
diff --git a/addons/project_gtd/i18n/hr.po b/addons/project_gtd/i18n/hr.po
index 93cd9718494..0f86bccb8dc 100644
--- a/addons/project_gtd/i18n/hr.po
+++ b/addons/project_gtd/i18n/hr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:17+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:22+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 "Language: hr\n"
 
 #. module: project_gtd
diff --git a/addons/project_gtd/i18n/hu.po b/addons/project_gtd/i18n/hu.po
index aa5fbe04be8..2e2c3dda52f 100644
--- a/addons/project_gtd/i18n/hu.po
+++ b/addons/project_gtd/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:17+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:22+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project_gtd
 #: view:project.task:0
diff --git a/addons/project_gtd/i18n/id.po b/addons/project_gtd/i18n/id.po
index c4bfb58d795..c616f695c49 100644
--- a/addons/project_gtd/i18n/id.po
+++ b/addons/project_gtd/i18n/id.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:17+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:22+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project_gtd
 #: view:project.task:0
diff --git a/addons/project_gtd/i18n/it.po b/addons/project_gtd/i18n/it.po
index ce06ba71974..61c4ada22e5 100644
--- a/addons/project_gtd/i18n/it.po
+++ b/addons/project_gtd/i18n/it.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:17+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:22+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project_gtd
 #: view:project.task:0
diff --git a/addons/project_gtd/i18n/ja.po b/addons/project_gtd/i18n/ja.po
index e273b35579b..091edf94e68 100644
--- a/addons/project_gtd/i18n/ja.po
+++ b/addons/project_gtd/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:17+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:22+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project_gtd
 #: view:project.task:0
diff --git a/addons/project_gtd/i18n/ko.po b/addons/project_gtd/i18n/ko.po
index 76461d012a4..bec5d13893a 100644
--- a/addons/project_gtd/i18n/ko.po
+++ b/addons/project_gtd/i18n/ko.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:17+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:22+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project_gtd
 #: view:project.task:0
diff --git a/addons/project_gtd/i18n/lt.po b/addons/project_gtd/i18n/lt.po
index ec48859235c..29b97a9b0f8 100644
--- a/addons/project_gtd/i18n/lt.po
+++ b/addons/project_gtd/i18n/lt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:17+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:22+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project_gtd
 #: view:project.task:0
diff --git a/addons/project_gtd/i18n/lv.po b/addons/project_gtd/i18n/lv.po
index cba015c75b4..e6f5b7d41b7 100644
--- a/addons/project_gtd/i18n/lv.po
+++ b/addons/project_gtd/i18n/lv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:17+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:22+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project_gtd
 #: view:project.task:0
diff --git a/addons/project_gtd/i18n/mn.po b/addons/project_gtd/i18n/mn.po
index 1988e571e3b..74fa4909cf0 100644
--- a/addons/project_gtd/i18n/mn.po
+++ b/addons/project_gtd/i18n/mn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:17+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:22+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project_gtd
 #: view:project.task:0
diff --git a/addons/project_gtd/i18n/nl.po b/addons/project_gtd/i18n/nl.po
index 4d476f05cda..14262194d52 100644
--- a/addons/project_gtd/i18n/nl.po
+++ b/addons/project_gtd/i18n/nl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:17+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:22+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project_gtd
 #: view:project.task:0
diff --git a/addons/project_gtd/i18n/nl_BE.po b/addons/project_gtd/i18n/nl_BE.po
index dbffa53127d..1127230aa7e 100644
--- a/addons/project_gtd/i18n/nl_BE.po
+++ b/addons/project_gtd/i18n/nl_BE.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:17+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:23+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project_gtd
 #: view:project.task:0
diff --git a/addons/project_gtd/i18n/pl.po b/addons/project_gtd/i18n/pl.po
index 4be219422de..87d790d9411 100644
--- a/addons/project_gtd/i18n/pl.po
+++ b/addons/project_gtd/i18n/pl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:17+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:22+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project_gtd
 #: view:project.task:0
diff --git a/addons/project_gtd/i18n/pt.po b/addons/project_gtd/i18n/pt.po
index f694c7ae066..b6a2f43cd42 100644
--- a/addons/project_gtd/i18n/pt.po
+++ b/addons/project_gtd/i18n/pt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:17+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:22+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project_gtd
 #: view:project.task:0
diff --git a/addons/project_gtd/i18n/pt_BR.po b/addons/project_gtd/i18n/pt_BR.po
index 14c4f3bcde8..8e208087d6e 100644
--- a/addons/project_gtd/i18n/pt_BR.po
+++ b/addons/project_gtd/i18n/pt_BR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:17+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:22+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project_gtd
 #: view:project.task:0
@@ -24,7 +24,7 @@ msgstr "Em Progresso"
 #. module: project_gtd
 #: view:project.task:0
 msgid "Show only tasks having a deadline"
-msgstr ""
+msgstr "Mostrar apenas tarefas que tem um prazo final"
 
 #. module: project_gtd
 #: view:project.task:0
@@ -34,12 +34,12 @@ msgstr "Reativar"
 #. module: project_gtd
 #: help:project.task,timebox_id:0
 msgid "Time-laps during which task has to be treated"
-msgstr ""
+msgstr "Tempo em que cada tarefa deverá ser tratada"
 
 #. module: project_gtd
 #: help:project.gtd.timebox,sequence:0
 msgid "Gives the sequence order when displaying a list of timebox."
-msgstr ""
+msgstr "Mostra a sequência quando exibindo uma lista de Timebox"
 
 #. module: project_gtd
 #: model:project.gtd.context,name:project_gtd.context_travel
@@ -49,12 +49,12 @@ msgstr "Viagens"
 #. module: project_gtd
 #: view:project.timebox.empty:0
 msgid "Timebox Empty Process Completed Successfully."
-msgstr ""
+msgstr "Processo Vazio no Timebox concluído com sucesso"
 
 #. module: project_gtd
 #: view:project.task:0
 msgid "Pending Tasks"
-msgstr ""
+msgstr "Tarefas Pendentes"
 
 #. module: project_gtd
 #: view:project.task:0
@@ -68,6 +68,9 @@ msgid ""
 "defines a period of time in order to categorize your tasks: today, this "
 "week, this month, long term."
 msgstr ""
+"Timebox são definidos com a metodologia \"Getting Things Done\"  Faça "
+"Acontecer. Um timebox define um período de tempo para categorizar suas "
+"tarefas: hoje, esta semana, este mês, a longo prazo."
 
 #. module: project_gtd
 #: model:project.gtd.timebox,name:project_gtd.timebox_daily
@@ -82,7 +85,7 @@ msgstr "Longo Prazo"
 #. module: project_gtd
 #: model:ir.model,name:project_gtd.model_project_timebox_empty
 msgid "Project Timebox Empty"
-msgstr ""
+msgstr "Timebox do Projeto Vazio"
 
 #. module: project_gtd
 #: view:project.task:0
@@ -116,7 +119,7 @@ msgstr "Minhas Tarefas"
 #. module: project_gtd
 #: constraint:project.task:0
 msgid "Error ! You cannot create recursive tasks."
-msgstr ""
+msgstr "Erro! Você não pode criar tarefas recursivas."
 
 #. module: project_gtd
 #: model:project.gtd.timebox,name:project_gtd.timebox_weekly
@@ -137,7 +140,7 @@ msgstr "Período vazio"
 #. module: project_gtd
 #: view:project.task:0
 msgid "Tasks having no timebox assigned yet"
-msgstr ""
+msgstr "Tarefas sem um timebox definido"
 
 #. module: project_gtd
 #: constraint:project.task:0
@@ -152,7 +155,7 @@ msgstr "Ícone"
 #. module: project_gtd
 #: model:ir.model,name:project_gtd.model_project_timebox_fill_plan
 msgid "Project Timebox Fill"
-msgstr ""
+msgstr "Preencher o Timebox do Projeto"
 
 #. module: project_gtd
 #: model:ir.model,name:project_gtd.model_project_task
@@ -183,7 +186,7 @@ msgstr "Carro"
 #. module: project_gtd
 #: view:project.task:0
 msgid "Show Context"
-msgstr ""
+msgstr "Mostrar Contexto"
 
 #. module: project_gtd
 #: model:ir.actions.act_window,name:project_gtd.action_project_gtd_fill
@@ -206,7 +209,7 @@ msgstr "Período de tempo"
 #. module: project_gtd
 #: view:project.task:0
 msgid "In Progress and draft tasks"
-msgstr ""
+msgstr "Tarefas em Andamento e Provisórias"
 
 #. module: project_gtd
 #: model:ir.model,name:project_gtd.model_project_gtd_context
@@ -219,7 +222,7 @@ msgstr "Contexto"
 #: code:addons/project_gtd/wizard/project_gtd_empty.py:52
 #, python-format
 msgid "No timebox child of this one !"
-msgstr ""
+msgstr "Nenhum timebox filho deste aqui!"
 
 #. module: project_gtd
 #: view:project.timebox.empty:0
@@ -229,7 +232,7 @@ msgstr "_Ok"
 #. module: project_gtd
 #: model:project.gtd.context,name:project_gtd.context_office
 msgid "Office"
-msgstr ""
+msgstr "Escritório"
 
 #. module: project_gtd
 #: field:project.gtd.context,sequence:0 field:project.gtd.timebox,sequence:0
@@ -239,7 +242,7 @@ msgstr "Sequencia"
 #. module: project_gtd
 #: view:project.task:0
 msgid "Show the context field"
-msgstr ""
+msgstr "Mostrar o campo de contexto"
 
 #. module: project_gtd
 #: help:project.gtd.context,sequence:0
@@ -249,7 +252,7 @@ msgstr "Fornece a sequencia de ordem quando exibe uma lista de contextos."
 #. module: project_gtd
 #: view:project.task:0
 msgid "Show Deadlines"
-msgstr ""
+msgstr "Mostrar Prazos Finais"
 
 #. module: project_gtd
 #: view:project.gtd.timebox:0
@@ -264,7 +267,7 @@ msgstr "Seleção de tarefas"
 #. module: project_gtd
 #: view:project.task:0
 msgid "Inbox"
-msgstr ""
+msgstr "Caixa de Entrada"
 
 #. module: project_gtd
 #: field:project.timebox.fill.plan,timebox_id:0
@@ -274,7 +277,7 @@ msgstr "Pegando do período"
 #. module: project_gtd
 #: help:project.task,context_id:0
 msgid "The context place where user has to treat task"
-msgstr ""
+msgstr "Local aonde o usuário deve executar a tarefa"
 
 #. module: project_gtd
 #: model:project.gtd.context,name:project_gtd.context_home
@@ -288,11 +291,15 @@ msgid ""
 "you to categorize your tasks according to the context in which they have to "
 "be done: at the office, at home, when I take my car, etc."
 msgstr ""
+"Contextos são definidos na metodologia \"Getting Things Done\". Isto permite "
+"a você categorizar suas tarefas de acordo com o contexto em que eles "
+"necessitam ser feitos: no escritório, em casa, quando eu estiver no carro, "
+"etc."
 
 #. module: project_gtd
 #: view:project.task:0
 msgid "For reopening the tasks"
-msgstr ""
+msgstr "Para reabrir as tarefas"
 
 #. module: project_gtd
 #: view:project.task:0
diff --git a/addons/project_gtd/i18n/ro.po b/addons/project_gtd/i18n/ro.po
index 79af7e000c8..603907b7612 100644
--- a/addons/project_gtd/i18n/ro.po
+++ b/addons/project_gtd/i18n/ro.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:17+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:22+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project_gtd
 #: view:project.task:0
diff --git a/addons/project_gtd/i18n/ru.po b/addons/project_gtd/i18n/ru.po
index 061248c0ead..8b047f2050d 100644
--- a/addons/project_gtd/i18n/ru.po
+++ b/addons/project_gtd/i18n/ru.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:17+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:22+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project_gtd
 #: view:project.task:0
diff --git a/addons/project_gtd/i18n/sl.po b/addons/project_gtd/i18n/sl.po
index a598daa25c1..19b00357385 100644
--- a/addons/project_gtd/i18n/sl.po
+++ b/addons/project_gtd/i18n/sl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:17+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:22+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project_gtd
 #: view:project.task:0
diff --git a/addons/project_gtd/i18n/sq.po b/addons/project_gtd/i18n/sq.po
index 6fd7ff478bb..244b174d55a 100644
--- a/addons/project_gtd/i18n/sq.po
+++ b/addons/project_gtd/i18n/sq.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:17+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:22+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project_gtd
 #: view:project.task:0
diff --git a/addons/project_gtd/i18n/sv.po b/addons/project_gtd/i18n/sv.po
index 016395df4f1..b64930ceaa1 100644
--- a/addons/project_gtd/i18n/sv.po
+++ b/addons/project_gtd/i18n/sv.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:17+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:22+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project_gtd
 #: view:project.task:0
diff --git a/addons/project_gtd/i18n/tlh.po b/addons/project_gtd/i18n/tlh.po
index 11b75ff88cd..9adcead8a56 100644
--- a/addons/project_gtd/i18n/tlh.po
+++ b/addons/project_gtd/i18n/tlh.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:17+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:22+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project_gtd
 #: view:project.task:0
diff --git a/addons/project_gtd/i18n/tr.po b/addons/project_gtd/i18n/tr.po
index c9056a1e98c..14930d1decf 100644
--- a/addons/project_gtd/i18n/tr.po
+++ b/addons/project_gtd/i18n/tr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:17+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:22+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project_gtd
 #: view:project.task:0
diff --git a/addons/project_gtd/i18n/uk.po b/addons/project_gtd/i18n/uk.po
index 83f5fe0a5f1..ceedfc9e297 100644
--- a/addons/project_gtd/i18n/uk.po
+++ b/addons/project_gtd/i18n/uk.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:17+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:22+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project_gtd
 #: view:project.task:0
diff --git a/addons/project_gtd/i18n/vi.po b/addons/project_gtd/i18n/vi.po
index de1c8c394d7..5f5264819e0 100644
--- a/addons/project_gtd/i18n/vi.po
+++ b/addons/project_gtd/i18n/vi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:17+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:22+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project_gtd
 #: view:project.task:0
diff --git a/addons/project_gtd/i18n/zh_CN.po b/addons/project_gtd/i18n/zh_CN.po
index d9d0c10d4b5..7125540c139 100644
--- a/addons/project_gtd/i18n/zh_CN.po
+++ b/addons/project_gtd/i18n/zh_CN.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:17+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:23+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project_gtd
 #: view:project.task:0
diff --git a/addons/project_gtd/i18n/zh_TW.po b/addons/project_gtd/i18n/zh_TW.po
index 03a84f0d385..28fece63263 100644
--- a/addons/project_gtd/i18n/zh_TW.po
+++ b/addons/project_gtd/i18n/zh_TW.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:17+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:23+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project_gtd
 #: view:project.task:0
diff --git a/addons/project_gtd/project_gtd_data.xml b/addons/project_gtd/project_gtd_data.xml
index dc1df93dc46..61b2468329c 100644
--- a/addons/project_gtd/project_gtd_data.xml
+++ b/addons/project_gtd/project_gtd_data.xml
@@ -26,11 +26,14 @@
 
     <data noupdate="1">
         <!-- notify all employees of module installation -->
-        <function model="mail.group" name="message_append_note">
-            <!-- ids, subject, body, parent_id=False, type='notification', content_subtype='html' -->
-            <value eval="[ref('mail.group_all_employees')]"/>
-            <value>Module Todo Lists has been installed</value>
-            <value>Add todo items on project tasks, to help you organize your work.  This module supports the methodology Getting Things Done (GTD), created by David Allen, and described in the book of the same name.</value>
-        </function>
+        <record model="mail.message" id="module_install_notification">
+            <field name="model">mail.group</field>
+            <field name="res_id" ref="mail.group_all_employees"/>
+            <field name="type">notification</field>
+            <field name="subject">Todo Lists application installed!</field>
+            <field name="body">Add todo items on project tasks, to help you organize your work.
+This application supports the Getting Things Done (GTD) methodology, based on David Allen's book.</field>
+        </record>
+
     </data>
 </openerp>
diff --git a/addons/project_issue/__openerp__.py b/addons/project_issue/__openerp__.py
index 8aeecf2985e..3d005f3fad6 100644
--- a/addons/project_issue/__openerp__.py
+++ b/addons/project_issue/__openerp__.py
@@ -21,11 +21,11 @@
 ##############################################################################
 
 {
-    'name': 'Issues Tracker',
+    'name': 'Issue Tracker',
     'version': '1.0',
     'category': 'Project Management',
-    "sequence": 22,
-    "summary": "Support, Bug Traker, Helpdesk",
+    'sequence': 22,
+    'summary': 'Support, Bug Tracker, Helpdesk',
     'description': """
 This module provides Issues/Bugs Management in Project.
 =======================================================
@@ -43,32 +43,28 @@ and decide on their status as they evolve.
         'crm',
         'project',
     ],
-    'init_xml': [
-        'project_issue_data.xml'
-    ],
-    'update_xml': [
+    'data': [
         'project_issue_view.xml',
         'project_issue_menu.xml',
         'report/project_issue_report_view.xml',
         'security/project_issue_security.xml',
         'security/ir.model.access.csv',
-        "board_project_issue_view.xml",
-        "res_config_view.xml",
+        'board_project_issue_view.xml',
+        'res_config_view.xml',
+        'project_issue_data.xml'
      ],
-    'demo_xml': ['project_issue_demo.xml'],
+    'demo': ['project_issue_demo.xml'],
     'test': [
-      'test/subscribe_issue.yml',
-      'test/issue_process.yml',
-      'test/cancel_issue.yml',
-      'test/issue_demo.yml'
+        'test/subscribe_issue.yml',
+        'test/issue_process.yml',
+        'test/cancel_issue.yml',
+        'test/issue_demo.yml'
     ],
     'installable': True,
     'auto_install': False,
     'application': True,
-    'certificate' : '001236490750848623845',
-    'js': [
-        'static/src/js/project_issue.js',
-    ],
+    'certificate': '001236490750848623845',
+    'js': ['static/src/js/project_issue.js'],
 }
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/project_issue/board_project_issue_view.xml b/addons/project_issue/board_project_issue_view.xml
index 3b4fa57fc58..d7574042c37 100644
--- a/addons/project_issue/board_project_issue_view.xml
+++ b/addons/project_issue/board_project_issue_view.xml
@@ -16,7 +16,7 @@
                     <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" groups="base.group_no_one"/>
+                    <field name="state" invisible="1"/>
                     <field name="categ_ids" invisible="1"/>
                     <field name="task_id" invisible="1"/>
                 </tree>
diff --git a/addons/project_issue/i18n/ar.po b/addons/project_issue/i18n/ar.po
index 7ced084c5d4..c8eb5454458 100644
--- a/addons/project_issue/i18n/ar.po
+++ b/addons/project_issue/i18n/ar.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:32+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:37+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project_issue
 #: view:project.issue.report:0
diff --git a/addons/project_issue/i18n/ca.po b/addons/project_issue/i18n/ca.po
index 17195087612..2f6ba67d4eb 100644
--- a/addons/project_issue/i18n/ca.po
+++ b/addons/project_issue/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:33+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:37+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project_issue
 #: view:project.issue.report:0
diff --git a/addons/project_issue/i18n/da.po b/addons/project_issue/i18n/da.po
index 14fc5ffa386..6596b8f30bb 100644
--- a/addons/project_issue/i18n/da.po
+++ b/addons/project_issue/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:33+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:37+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project_issue
 #: view:project.issue.report:0
diff --git a/addons/project_issue/i18n/de.po b/addons/project_issue/i18n/de.po
index 7eefcc906d1..4be4942ad3c 100644
--- a/addons/project_issue/i18n/de.po
+++ b/addons/project_issue/i18n/de.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:33+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:37+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project_issue
 #: view:project.issue.report:0
diff --git a/addons/project_issue/i18n/es.po b/addons/project_issue/i18n/es.po
index 3483309f942..491ba1a75a2 100644
--- a/addons/project_issue/i18n/es.po
+++ b/addons/project_issue/i18n/es.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:33+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:37+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project_issue
 #: view:project.issue.report:0
diff --git a/addons/project_issue/i18n/es_CR.po b/addons/project_issue/i18n/es_CR.po
index 3ab69a6b372..bcab004dddf 100644
--- a/addons/project_issue/i18n/es_CR.po
+++ b/addons/project_issue/i18n/es_CR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:33+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:37+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 "Language: es\n"
 
 #. module: project_issue
diff --git a/addons/project_issue/i18n/fi.po b/addons/project_issue/i18n/fi.po
index feaa865a5b9..a72c5a98ebe 100644
--- a/addons/project_issue/i18n/fi.po
+++ b/addons/project_issue/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:33+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:37+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project_issue
 #: view:project.issue.report:0
diff --git a/addons/project_issue/i18n/fr.po b/addons/project_issue/i18n/fr.po
index 50dd25b2d6d..c5cd12150ba 100644
--- a/addons/project_issue/i18n/fr.po
+++ b/addons/project_issue/i18n/fr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:33+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:37+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project_issue
 #: view:project.issue.report:0
diff --git a/addons/project_issue/i18n/hr.po b/addons/project_issue/i18n/hr.po
index 7b7eb856f64..c7ae5a4554b 100644
--- a/addons/project_issue/i18n/hr.po
+++ b/addons/project_issue/i18n/hr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:33+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:37+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project_issue
 #: view:project.issue.report:0
diff --git a/addons/project_issue/i18n/hu.po b/addons/project_issue/i18n/hu.po
index 2e259ce801e..3d15a33e65f 100644
--- a/addons/project_issue/i18n/hu.po
+++ b/addons/project_issue/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:33+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:37+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project_issue
 #: view:project.issue.report:0
diff --git a/addons/project_issue/i18n/it.po b/addons/project_issue/i18n/it.po
index 1fb9357c984..689033671ff 100644
--- a/addons/project_issue/i18n/it.po
+++ b/addons/project_issue/i18n/it.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:33+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:37+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project_issue
 #: view:project.issue.report:0
diff --git a/addons/project_issue/i18n/ja.po b/addons/project_issue/i18n/ja.po
index 67a8ee0fed3..f588591a512 100644
--- a/addons/project_issue/i18n/ja.po
+++ b/addons/project_issue/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:33+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:37+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project_issue
 #: view:project.issue.report:0
diff --git a/addons/project_issue/i18n/lt.po b/addons/project_issue/i18n/lt.po
index 1b7c8aa4ff8..2341e024e5d 100644
--- a/addons/project_issue/i18n/lt.po
+++ b/addons/project_issue/i18n/lt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:33+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:37+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project_issue
 #: view:project.issue.report:0
diff --git a/addons/project_issue/i18n/lv.po b/addons/project_issue/i18n/lv.po
index 1a7673b88c3..88051e39b6f 100644
--- a/addons/project_issue/i18n/lv.po
+++ b/addons/project_issue/i18n/lv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:33+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:37+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project_issue
 #: view:project.issue.report:0
diff --git a/addons/project_issue/i18n/mn.po b/addons/project_issue/i18n/mn.po
index 794d91198f0..abd056c80d1 100644
--- a/addons/project_issue/i18n/mn.po
+++ b/addons/project_issue/i18n/mn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:33+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:37+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project_issue
 #: view:project.issue.report:0
diff --git a/addons/project_issue/i18n/nb.po b/addons/project_issue/i18n/nb.po
index 2dc1cfc3161..5a94f1be748 100644
--- a/addons/project_issue/i18n/nb.po
+++ b/addons/project_issue/i18n/nb.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:33+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:37+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project_issue
 #: view:project.issue.report:0
diff --git a/addons/project_issue/i18n/nl.po b/addons/project_issue/i18n/nl.po
index b87c7966aa6..106beae5b06 100644
--- a/addons/project_issue/i18n/nl.po
+++ b/addons/project_issue/i18n/nl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:33+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:37+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project_issue
 #: view:project.issue.report:0
diff --git a/addons/project_issue/i18n/nl_BE.po b/addons/project_issue/i18n/nl_BE.po
index 4fa410515b7..7c251f37d0a 100644
--- a/addons/project_issue/i18n/nl_BE.po
+++ b/addons/project_issue/i18n/nl_BE.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:33+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:37+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project_issue
 #: view:project.issue.report:0
diff --git a/addons/project_issue/i18n/pl.po b/addons/project_issue/i18n/pl.po
index 92559da0ea5..f03313289ff 100644
--- a/addons/project_issue/i18n/pl.po
+++ b/addons/project_issue/i18n/pl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:33+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:37+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project_issue
 #: view:project.issue.report:0
diff --git a/addons/project_issue/i18n/pt.po b/addons/project_issue/i18n/pt.po
index fd1559f13e3..22f05797e6a 100644
--- a/addons/project_issue/i18n/pt.po
+++ b/addons/project_issue/i18n/pt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:33+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:37+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project_issue
 #: view:project.issue.report:0
diff --git a/addons/project_issue/i18n/pt_BR.po b/addons/project_issue/i18n/pt_BR.po
index 22b85e90fd2..9e2c7e8856d 100644
--- a/addons/project_issue/i18n/pt_BR.po
+++ b/addons/project_issue/i18n/pt_BR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:33+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:37+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project_issue
 #: view:project.issue.report:0
@@ -25,7 +25,7 @@ msgstr "Mês Anterior"
 #. module: project_issue
 #: field:project.issue.report,delay_open:0
 msgid "Avg. Delay to Open"
-msgstr ""
+msgstr "Atraso Médio de Abertura"
 
 #. module: project_issue
 #: view:project.issue:0 view:project.issue.report:0
@@ -35,7 +35,7 @@ msgstr "Agrupar Por..."
 #. module: project_issue
 #: field:project.issue,working_hours_open:0
 msgid "Working Hours to Open the Issue"
-msgstr ""
+msgstr "Horas Trabalhadas para Abrir o Caso"
 
 #. module: project_issue
 #: constraint:project.project:0
@@ -82,7 +82,7 @@ msgstr "Emails dos Observadores"
 #. module: project_issue
 #: view:project.issue:0
 msgid "Today's features"
-msgstr ""
+msgstr "Recursos de Hoje"
 
 #. module: project_issue
 #: model:ir.model,name:project_issue.model_project_issue_version
@@ -101,6 +101,8 @@ msgid ""
 "You cannot escalate this issue.\n"
 "The relevant Project has not configured the Escalation Project!"
 msgstr ""
+"Você não pode escalonar este caso.\n"
+"O Projeto em questão não foi configurado como Projeto Escalonado!"
 
 #. module: project_issue
 #: constraint:project.project:0
@@ -116,7 +118,7 @@ msgstr "Urgente"
 #. module: project_issue
 #: help:project.issue,inactivity_days:0
 msgid "Difference in days between last action and current date"
-msgstr ""
+msgstr "Diferença em dias entre a última ação e a data atual"
 
 #. module: project_issue
 #: view:project.issue.report:0 field:project.issue.report,day:0
@@ -126,7 +128,7 @@ msgstr "Dia"
 #. module: project_issue
 #: field:project.issue,days_since_creation:0
 msgid "Days since creation date"
-msgstr ""
+msgstr "Dias desde a data da criação"
 
 #. module: project_issue
 #: view:project.issue:0
@@ -152,7 +154,7 @@ msgstr "Mensagens"
 #. module: project_issue
 #: field:project.issue,inactivity_days:0
 msgid "Days since last action"
-msgstr ""
+msgstr "Dias desde a última ação"
 
 #. module: project_issue
 #: model:ir.model,name:project_issue.model_project_project
@@ -164,7 +166,7 @@ msgstr "Projeto"
 #. module: project_issue
 #: model:ir.actions.act_window,name:project_issue.action_view_my_open_project_issue_tree
 msgid "My Open Project issues"
-msgstr ""
+msgstr "Meus Casos em Aberto do Projeto"
 
 #. module: project_issue
 #: selection:project.issue,state:0 selection:project.issue.report,state:0
@@ -184,7 +186,7 @@ msgstr "Data do Fechamento"
 #. module: project_issue
 #: view:project.issue:0
 msgid "Issue Tracker Search"
-msgstr ""
+msgstr "Rastreador de Problemas"
 
 #. module: project_issue
 #: field:project.issue,color:0
@@ -194,12 +196,12 @@ msgstr "Índice de Cores"
 #. module: project_issue
 #: view:project.issue:0
 msgid "Issue / Partner"
-msgstr ""
+msgstr "Questão / Parceiro"
 
 #. module: project_issue
 #: field:project.issue.report,working_hours_open:0
 msgid "Avg. Working Hours to Open"
-msgstr ""
+msgstr "Média de Horas Trabalhadas para Abrir"
 
 #. module: project_issue
 #: field:project.issue,date_action_next:0
@@ -212,6 +214,8 @@ msgid ""
 "If any issue is escalated from the current Project, it will be listed under "
 "the project selected here."
 msgstr ""
+"Se esta questão for escalonada do Projeto atual, ela será listada abaixo do "
+"projeto selecionado aqui."
 
 #. module: project_issue
 #: view:project.issue:0
@@ -226,6 +230,10 @@ msgid ""
 "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 ""
+"Este relatório nos casos do projeto te permitem analisar a qualidade do seu "
+"suporte ou do pós-venda. Você pode rastrear as questões por período. Você "
+"pode analisar o tempo necessário para abrir ou fechar uma questão, o número "
+"de emails trocados e o tempo gasto em média por questão."
 
 #. module: project_issue
 #: view:project.issue:0
@@ -269,7 +277,7 @@ msgstr "Manutenção"
 #: model:ir.ui.menu,name:project_issue.menu_project_issue_report_tree
 #: view:project.issue.report:0
 msgid "Issues Analysis"
-msgstr ""
+msgstr "Análise de Questões"
 
 #. module: project_issue
 #: view:project.issue:0
@@ -297,7 +305,7 @@ msgstr "Versão"
 #: view:project.issue:0 selection:project.issue,state:0
 #: view:project.issue.report:0
 msgid "New"
-msgstr ""
+msgstr "Novo"
 
 #. module: project_issue
 #: model:ir.actions.act_window,name:project_issue.project_issue_categ_action
@@ -323,7 +331,7 @@ msgstr "Mais Baixa"
 #. module: project_issue
 #: view:project.issue:0
 msgid "Unassigned Issues"
-msgstr ""
+msgstr "Questões não atribuídas"
 
 #. module: project_issue
 #: field:project.issue,create_date:0 view:project.issue.report:0
@@ -340,7 +348,7 @@ msgstr "Versões"
 #. module: project_issue
 #: view:project.issue:0
 msgid "To Do Issues"
-msgstr ""
+msgstr "Questões a Serem Feitas"
 
 #. module: project_issue
 #: view:project.issue:0
@@ -356,7 +364,7 @@ msgstr "Hoje"
 #: model:ir.actions.act_window,name:project_issue.open_board_project_issue
 #: model:ir.ui.menu,name:project_issue.menu_deshboard_project_issue
 msgid "Project Issue Dashboard"
-msgstr ""
+msgstr "Painel de Questões do Projeto"
 
 #. module: project_issue
 #: view:project.issue:0 selection:project.issue,state:0
@@ -389,7 +397,7 @@ msgstr "Histórico"
 #: model:ir.actions.act_window,name:project_issue.action_view_current_project_issue_tree
 #: model:ir.actions.act_window,name:project_issue.action_view_pending_project_issue_tree
 msgid "Project issues"
-msgstr ""
+msgstr "Questões do Projeto"
 
 #. module: project_issue
 #: view:project.issue:0
@@ -399,12 +407,12 @@ msgstr "Comunicação & Histórico"
 #. module: project_issue
 #: view:project.issue.report:0
 msgid "My Open Project Issue"
-msgstr ""
+msgstr "Minhas Questões do Projeto Abertas"
 
 #. module: project_issue
 #: model:ir.actions.act_window,name:project_issue.action_view_my_project_issue_tree
 msgid "My Project Issues"
-msgstr ""
+msgstr "Minhas Questões do Projeto"
 
 #. module: project_issue
 #: view:project.issue:0
@@ -425,7 +433,7 @@ msgstr "Meus Problemas"
 #. module: project_issue
 #: view:project.issue:0
 msgid "Change to Previous Stage"
-msgstr ""
+msgstr "Mudar para o estágio anterior"
 
 #. module: project_issue
 #: model:ir.actions.act_window,help:project_issue.project_issue_version_action
@@ -434,6 +442,10 @@ msgid ""
 "development project, to handle claims in after-sales services, etc. Define "
 "here the different versions of your products on which you can work on issues."
 msgstr ""
+"Você pode usar o rastreador de questões no OpenErp para controlar os bugs em "
+"projetos de desenvolvimento de softwares, para controlar solicitações em pós-"
+"venda, etc. Defina aqui as diferentes versões de seus produtos em que você "
+"posse trabalhar em questões."
 
 #. module: project_issue
 #: code:addons/project_issue/project_issue.py:330
@@ -459,7 +471,7 @@ msgstr "Dezembro"
 #. module: project_issue
 #: view:project.issue:0
 msgid "Issue Tracker Tree"
-msgstr ""
+msgstr "Árvore de Rastreamento de Questões"
 
 #. module: project_issue
 #: view:project.issue:0 view:project.issue.report:0
@@ -470,7 +482,7 @@ msgstr "Mês"
 #. module: project_issue
 #: model:ir.model,name:project_issue.model_project_issue_report
 msgid "project.issue.report"
-msgstr ""
+msgstr "project.issue.report"
 
 #. module: project_issue
 #: code:addons/project_issue/project_issue.py:408 view:project.issue:0
@@ -491,7 +503,7 @@ msgstr "Data de Atualização"
 #. module: project_issue
 #: view:project.issue:0
 msgid "Open Features"
-msgstr ""
+msgstr "Recursos Abertos"
 
 #. module: project_issue
 #: view:project.issue:0
@@ -507,22 +519,22 @@ msgstr "Categoria"
 #. module: project_issue
 #: field:project.issue,user_email:0
 msgid "User Email"
-msgstr ""
+msgstr "E-mail do Usuário"
 
 #. module: project_issue
 #: view:project.issue.report:0
 msgid "#Number of Project Issues"
-msgstr ""
+msgstr "#Número de Questões de Projeto"
 
 #. module: project_issue
 #: view:project.issue:0
 msgid "Reset to New"
-msgstr ""
+msgstr "Reiniciar como Novo"
 
 #. module: project_issue
 #: help:project.issue,channel_id:0
 msgid "Communication channel."
-msgstr ""
+msgstr "Canal de comunicação"
 
 #. module: project_issue
 #: help:project.issue,email_cc:0
@@ -531,6 +543,9 @@ msgid ""
 "outbound emails for this record before being sent. Separate multiple email "
 "addresses with a comma"
 msgstr ""
+"Estes endereços de email serão adicionados para o campo CC de todas entradas "
+"e saídas de emails para este registro antes de ser enviado. Separe múltiplos "
+"endereços de email com vírgula."
 
 #. module: project_issue
 #: selection:project.issue.report,state:0
@@ -540,7 +555,7 @@ msgstr "Provisório"
 #. module: project_issue
 #: view:project.issue:0
 msgid "Contact Information"
-msgstr ""
+msgstr "Informação de Contato"
 
 #. module: project_issue
 #: field:project.issue,date_closed:0 selection:project.issue.report,state:0
@@ -555,7 +570,7 @@ msgstr "Resposta"
 #. module: project_issue
 #: field:project.issue.report,delay_close:0
 msgid "Avg. Delay to Close"
-msgstr ""
+msgstr "Média de atraso para Conclusão"
 
 #. module: project_issue
 #: view:project.issue:0 selection:project.issue,state:0
@@ -571,7 +586,7 @@ msgstr "Status"
 #. module: project_issue
 #: view:project.issue.report:0
 msgid "#Project Issues"
-msgstr ""
+msgstr "#Questões do Projeto"
 
 #. module: project_issue
 #: view:board.board:0
@@ -592,7 +607,7 @@ msgstr "Normal"
 #. module: project_issue
 #: view:project.issue:0
 msgid "Global CC"
-msgstr ""
+msgstr "CC Global"
 
 #. module: project_issue
 #: view:project.issue:0 view:project.issue.report:0
@@ -607,7 +622,7 @@ msgstr "Junho"
 #. module: project_issue
 #: view:project.issue:0
 msgid "New Issues"
-msgstr ""
+msgstr "Novas Questões"
 
 #. module: project_issue
 #: field:project.issue,day_close:0
@@ -637,17 +652,17 @@ msgstr "Outubro"
 #. module: project_issue
 #: view:board.board:0
 msgid "Issues Dashboard"
-msgstr ""
+msgstr "Painel de Questões"
 
 #. module: project_issue
 #: view:project.issue:0 field:project.issue,type_id:0
 msgid "Stages"
-msgstr ""
+msgstr "Estágios"
 
 #. module: project_issue
 #: help:project.issue,days_since_creation:0
 msgid "Difference in days between creation date and current date"
-msgstr ""
+msgstr "Diferença em dias entre a data de criação e a data atual"
 
 #. module: project_issue
 #: selection:project.issue.report,month:0
@@ -657,7 +672,7 @@ msgstr "Janeiro"
 #. module: project_issue
 #: view:project.issue:0
 msgid "Feature Tracker Tree"
-msgstr ""
+msgstr "Árvore de Recursos"
 
 #. module: project_issue
 #: help:project.issue,email_from:0
@@ -688,7 +703,7 @@ msgstr "Atribuído a"
 #. module: project_issue
 #: field:project.project,reply_to:0
 msgid "Reply-To Email Address"
-msgstr ""
+msgstr "Email de Responder Para"
 
 #. module: project_issue
 #: field:project.issue,partner_address_id:0
@@ -698,7 +713,7 @@ msgstr "Contato do Parceiro"
 #. module: project_issue
 #: view:project.issue:0
 msgid "Issue Tracker Form"
-msgstr ""
+msgstr "Formulário de Rastrear Questões"
 
 #. module: project_issue
 #: view:project.issue:0 field:project.issue,state:0
@@ -714,7 +729,7 @@ msgstr "Geral"
 #. module: project_issue
 #: view:project.issue:0
 msgid "Current Features"
-msgstr ""
+msgstr "Recursos Atuais"
 
 #. module: project_issue
 #: view:project.issue.version:0
@@ -753,7 +768,7 @@ msgstr "Problemas"
 #. module: project_issue
 #: selection:project.issue,state:0
 msgid "In Progress"
-msgstr ""
+msgstr "Em Progresso"
 
 #. module: project_issue
 #: model:ir.actions.act_window,name:project_issue.action_project_issue_graph_stage
@@ -761,12 +776,12 @@ msgstr ""
 #: model:ir.model,name:project_issue.model_project_issue
 #: view:project.issue.report:0
 msgid "Project Issue"
-msgstr ""
+msgstr "Questões do Projeto"
 
 #. module: project_issue
 #: view:project.issue:0
 msgid "Creation Month"
-msgstr ""
+msgstr "Mês de criação"
 
 #. module: project_issue
 #: help:project.issue,progress:0
@@ -781,6 +796,11 @@ msgid ""
 "issue (analysis, development, done). With the mailgateway module, issues can "
 "be integrated through an email address (example: support@mycompany.com)"
 msgstr ""
+"Questões como bugs no sistema, reclamações de clientes, e falhas de "
+"materiais são coletadas aqui.  Você pode definir os estágios associados "
+"quando for resolver as questões do projeto(análise, desenvolvimento, "
+"concluído). Com o módulo de email, as questões podem ser integradas através "
+"de um email (exemplo: suporte@minhaempresa.com.br)"
 
 #. module: project_issue
 #: view:board.board:0 view:project.issue:0
@@ -795,7 +815,7 @@ msgstr "Problema"
 #. module: project_issue
 #: view:project.issue:0
 msgid "Feature Tracker Search"
-msgstr ""
+msgstr "Procurar Recurso"
 
 #. module: project_issue
 #: view:project.issue:0 field:project.issue,description:0
@@ -845,22 +865,22 @@ msgstr "Fevereiro"
 #: code:addons/project_issue/project_issue.py:70
 #, python-format
 msgid "Issue '%s' has been opened."
-msgstr ""
+msgstr "Questão '%s' foi aberta."
 
 #. module: project_issue
 #: view:project.issue:0
 msgid "Feature description"
-msgstr ""
+msgstr "Descrição do Recurso"
 
 #. module: project_issue
 #: view:project.issue:0
 msgid "Edit"
-msgstr ""
+msgstr "Editar"
 
 #. module: project_issue
 #: field:project.project,project_escalation_id:0
 msgid "Project Escalation"
-msgstr ""
+msgstr "Escalação do Projeto"
 
 #. module: project_issue
 #: help:project.issue,section_id:0
@@ -868,6 +888,8 @@ msgid ""
 "Sales team to which Case belongs to.                             Define "
 "Responsible user and Email account for mail gateway."
 msgstr ""
+"Equipe de Vendas a que este caso pertence. Defina o usuário responsável e o "
+"endereço de email."
 
 #. module: project_issue
 #: view:project.issue.report:0
@@ -893,7 +915,7 @@ msgstr "Referências"
 #. module: project_issue
 #: field:project.issue,working_hours_close:0
 msgid "Working Hours to Close the Issue"
-msgstr ""
+msgstr "Horas de Trabalho para Concluir a Questão"
 
 #. module: project_issue
 #: field:project.issue,id:0
@@ -903,7 +925,7 @@ msgstr "ID"
 #. module: project_issue
 #: view:project.issue.report:0
 msgid "Current Year"
-msgstr ""
+msgstr "Este Ano"
 
 #. module: project_issue
 #: code:addons/project_issue/project_issue.py:415
@@ -915,7 +937,7 @@ msgstr "Sem Título"
 #: help:project.issue.report,delay_close:0
 #: help:project.issue.report,delay_open:0
 msgid "Number of Days to close the project issue"
-msgstr ""
+msgstr "Número de dias para fechar a questão do projeto."
 
 #. module: project_issue
 #: view:project.issue.report:0 field:project.issue.report,section_id:0
@@ -925,7 +947,7 @@ msgstr "Time de Vendas"
 #. module: project_issue
 #: field:project.issue.report,working_hours_close:0
 msgid "Avg. Working Hours to Close"
-msgstr ""
+msgstr "Média de Horas Trabalhadas para Fechar"
 
 #. module: project_issue
 #: selection:project.issue,priority:0
@@ -936,27 +958,27 @@ msgstr "Alta"
 #. module: project_issue
 #: field:project.issue,date_deadline:0
 msgid "Deadline"
-msgstr ""
+msgstr "Prazo Final"
 
 #. module: project_issue
 #: field:project.issue,date_action_last:0
 msgid "Last Action"
-msgstr ""
+msgstr "Última Ação"
 
 #. module: project_issue
 #: view:project.issue.report:0 field:project.issue.report,name:0
 msgid "Year"
-msgstr ""
+msgstr "Ano"
 
 #. module: project_issue
 #: field:project.issue,duration:0
 msgid "Duration"
-msgstr ""
+msgstr "Duração"
 
 #. module: project_issue
 #: view:board.board:0
 msgid "My Open Issues by Creation Date"
-msgstr ""
+msgstr "Minhas Questões em Aberto por Data de Criação"
 
 #~ msgid "Close Working hours"
 #~ msgstr "Fechar horas Trabalhadas"
diff --git a/addons/project_issue/i18n/ro.po b/addons/project_issue/i18n/ro.po
index 2c0eb37af11..4037729c195 100644
--- a/addons/project_issue/i18n/ro.po
+++ b/addons/project_issue/i18n/ro.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:33+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:37+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project_issue
 #: view:project.issue.report:0
diff --git a/addons/project_issue/i18n/ru.po b/addons/project_issue/i18n/ru.po
index 6513f3c8950..0cb9677ecc6 100644
--- a/addons/project_issue/i18n/ru.po
+++ b/addons/project_issue/i18n/ru.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:33+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:37+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project_issue
 #: view:project.issue.report:0
diff --git a/addons/project_issue/i18n/sv.po b/addons/project_issue/i18n/sv.po
index 2d49052d4da..f4d6feb2819 100644
--- a/addons/project_issue/i18n/sv.po
+++ b/addons/project_issue/i18n/sv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:33+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:37+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project_issue
 #: view:project.issue.report:0
diff --git a/addons/project_issue/i18n/tr.po b/addons/project_issue/i18n/tr.po
index 1f0beb1ab05..367584b95e8 100644
--- a/addons/project_issue/i18n/tr.po
+++ b/addons/project_issue/i18n/tr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:33+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:37+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project_issue
 #: view:project.issue.report:0
diff --git a/addons/project_issue/i18n/zh_CN.po b/addons/project_issue/i18n/zh_CN.po
index e6e73fe468c..2f1dc9b6e27 100644
--- a/addons/project_issue/i18n/zh_CN.po
+++ b/addons/project_issue/i18n/zh_CN.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:33+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:37+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project_issue
 #: view:project.issue.report:0
diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py
index 5c440976b5c..6121acbd607 100644
--- a/addons/project_issue/project_issue.py
+++ b/addons/project_issue/project_issue.py
@@ -46,8 +46,7 @@ class project_issue(base_stage, osv.osv):
     _name = "project.issue"
     _description = "Project Issue"
     _order = "priority, create_date desc"
-    _inherit = ['ir.needaction_mixin', 'mail.thread']
-    _mail_compose_message = True
+    _inherit = ['mail.thread', 'ir.needaction_mixin']
 
     def _get_default_project_id(self, cr, uid, context=None):
         """ Gives default project by checking if present in the context """
@@ -88,14 +87,18 @@ class project_issue(base_stage, osv.osv):
         search_domain = []
         project_id = self._resolve_project_id_from_context(cr, uid, context=context)
         if project_id:
-            search_domain += ['|', '&', ('project_ids', '=', project_id), ('fold', '=', False)]
-        search_domain += ['|', ('id', 'in', ids), '&', ('case_default', '=', True), ('fold', '=', False)]
+            search_domain += ['|', ('project_ids', '=', project_id)]
+        search_domain += ['|', ('id', 'in', ids), ('case_default', '=', True)]
         # perform search
         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])))
-        return result
+
+        fold = {}
+        for stage in stage_obj.browse(cr, access_rights_uid, stage_ids, context=context):
+            fold[stage.id] = stage.fold or False
+        return result, fold
 
     def _compute_day(self, cr, uid, ids, fields, args, context=None):
         """
@@ -240,7 +243,7 @@ class project_issue(base_stage, osv.osv):
         'priority': fields.selection(crm.AVAILABLE_PRIORITIES, 'Priority', select=True),
         'version_id': fields.many2one('project.issue.version', 'Version'),
         'stage_id': fields.many2one ('project.task.type', 'Stage',
-                        domain="['|', ('project_ids', '=', project_id), ('case_default', '=', True)]"),
+                        domain="['&', ('fold', '=', False), '|', ('project_ids', '=', project_id), ('case_default', '=', True)]"),
         'project_id':fields.many2one('project.project', 'Project'),
         'duration': fields.float('Duration'),
         'task_id': fields.many2one('project.task', 'Task', domain="[('project_id','=',project_id)]"),
@@ -364,7 +367,6 @@ class project_issue(base_stage, osv.osv):
         return super(project_issue, self).write(cr, uid, ids, vals, context)
 
     def onchange_task_id(self, cr, uid, ids, task_id, context=None):
-        result = {}
         if not task_id:
             return {'value':{}}
         task = self.pool.get('project.task').browse(cr, uid, task_id, context=context)
@@ -454,14 +456,13 @@ class project_issue(base_stage, osv.osv):
 
         custom_values.update({
             'name':  msg.get('subject') or _("No Subject"),
-            'description': msg.get('body_text'),
+            'description': msg.get('body'),
             'email_from': msg.get('from'),
             'email_cc': msg.get('cc'),
             'user_id': False,
         })
         if  msg.get('priority'):
             custom_values['priority'] =  msg.get('priority')
-        custom_values.update(self.message_partner_by_email(cr, uid, msg.get('from'), context=context))
 
         res_id = super(project_issue, self).message_new(cr, uid, msg, custom_values=custom_values, context=context)
         # self.convert_to_bug(cr, uid, [res_id], context=context)
@@ -477,16 +478,16 @@ class project_issue(base_stage, osv.osv):
         if update_vals is None: update_vals = {}
 
         # Update doc values according to the message
-        update_vals['description'] = msg.get('body_text', '')
+        update_vals['description'] = msg.get('body', '')
         if msg.get('priority'):
             update_vals['priority'] = msg.get('priority')
-        # Parse 'body_text' to find values to update
+        # Parse 'body' to find values to update
         maps = {
             'cost': 'planned_cost',
             'revenue': 'planned_revenue',
             'probability': 'probability',
         }
-        for line in msg.get('body_text', '').split('\n'):
+        for line in msg.get('body', '').split('\n'):
             line = line.strip()
             res = tools.misc.command_re.match(line)
             if res and maps.get(res.group(1).lower(), False):
@@ -499,36 +500,31 @@ class project_issue(base_stage, osv.osv):
     # OpenChatter methods and notifications
     # -------------------------------------------------------
 
-    def message_get_monitored_follower_fields(self, cr, uid, ids, context=None):
-        """ Add 'user_id' to the monitored fields """
-        res = super(project_issue, self).message_get_monitored_follower_fields(cr, uid, ids, context=context)
-        return res + ['user_id']
-
     def stage_set_send_note(self, cr, uid, ids, stage_id, context=None):
         """ Override of the (void) default notification method. """
         stage_name = self.pool.get('project.task.type').name_get(cr, uid, [stage_id], context=context)[0][1]
-        return self.message_append_note(cr, uid, ids, body= _("Stage changed to <b>%s</b>.") % (stage_name), context=context)
+        return self.message_post(cr, uid, ids, body= _("Stage changed to <b>%s</b>.") % (stage_name), context=context)
 
     def case_get_note_msg_prefix(self, cr, uid, id, context=None):
         """ Override of default prefix for notifications. """
         return 'Project issue'
 
     def convert_to_task_send_note(self, cr, uid, ids, context=None):
-        message = _("Project issue has been <b>converted</b> into task.")
-        return self.message_append_note(cr, uid, ids, body=message, context=context)
+        message = _("Project issue <b>converted</b> to task.")
+        return self.message_post(cr, uid, ids, body=message, context=context)
 
     def create_send_note(self, cr, uid, ids, context=None):
-        message = _("Project issue has been <b>created</b>.")
-        return self.message_append_note(cr, uid, ids, body=message, context=context)
+        message = _("Project issue <b>created</b>.")
+        return self.message_post(cr, uid, ids, body=message, context=context)
 
     def case_escalate_send_note(self, cr, uid, ids, context=None):
         for obj in self.browse(cr, uid, ids, context=context):
             if obj.project_id:
-                message = _("has been <b>escalated</b> to <em>'%s'</em>.") % (obj.project_id.name)
-                obj.message_append_note(body=message, context=context)
+                message = _("<b>escalated</b> to <em>'%s'</em>.") % (obj.project_id.name)
+                obj.message_post(body=message)
             else:
-                message = _("has been <b>escalated</b>.")
-                obj.message_append_note(body=message, context=context)
+                message = _("<b>escalated</b>.")
+                obj.message_post(body=message)
         return True
 
 project_issue()
@@ -569,7 +565,7 @@ class account_analytic_account(osv.osv):
     _description = 'Analytic Account'
 
     _columns = {
-        'use_issues' : fields.boolean('Issues Tracking', help="Check this field if this project manages issues"),
+        'use_issues' : fields.boolean('Issues', help="Check this field if this project manages issues"),
     }
 
     def on_change_template(self, cr, uid, ids, template_id, context=None):
@@ -580,8 +576,9 @@ class account_analytic_account(osv.osv):
         return res
 
     def _trigger_project_creation(self, cr, uid, vals, context=None):
+        if context is None: context = {}
         res = super(account_analytic_account, self)._trigger_project_creation(cr, uid, vals, context=context)
-        return res or vals.get('use_issues')
+        return res or (vals.get('use_issues') and not 'project_creation_in_progress' in context)
 
 account_analytic_account()
 
diff --git a/addons/project_issue/project_issue_data.xml b/addons/project_issue/project_issue_data.xml
index a191cb4454f..ddb0d575e63 100644
--- a/addons/project_issue/project_issue_data.xml
+++ b/addons/project_issue/project_issue_data.xml
@@ -32,13 +32,15 @@
         </record>
 
         <!-- notify all employees of module installation -->
-        <function model="mail.group" name="message_append_note">
-            <!-- ids, subject, body, parent_id=False, type='notification', content_subtype='html' -->
-            <value eval="[ref('mail.group_all_employees')]"/>
-            <value>Module Issues Tracker has been installed.</value>
-            <value>Manage the issues you might face in a project, like bugs in a system, client complaints or material breakdowns.  You can record issues, assign them to some responsible person, and keep track of their status as they evolve over time.
+        <record model="mail.message" id="module_install_notification">
+            <field name="model">mail.group</field>
+            <field name="res_id" ref="mail.group_all_employees"/>
+            <field name="type">notification</field>
+            <field name="subject">Issue Tracker application installed!</field>
+            <field name="body">Manage the issues you might face in a project, such as bugs in a system, client complaints or material breakdowns.
+You can record issues, assign them to a responsible person, and keep track of their status as they evolve over time.
+Access all issues from the top Project menu, and access the issues of a specific project via the projects gallery view.</field>
+        </record>
 
-You can access issues from the top menu Project, and access the issues of a specific project from the projects gallery view.</value>
-        </function>
     </data>
 </openerp>
diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
index bb15f8c2f94..fea22c519a8 100644
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -151,7 +151,7 @@
                                 <field name="id"/>
                                 <field name="active"/>
                             </group>
-                            <group colspan="4" col="4">
+                            <group colspan="4" col="4" invisible="1">
                                 <separator string="Status" colspan="4"/>
                                 <field name="state" groups="base.group_no_one" string="Status"/>
                             </group>
@@ -170,8 +170,8 @@
             <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:needaction_pending==True" colors="black:state=='open';blue:state=='pending';grey:state in ('cancel', 'done')">
-                    <field name="needaction_pending" invisible="1"/>
+                <tree string="Issue Tracker Tree" fonts="bold:message_unread==True" colors="black:state=='open';blue:state=='pending';grey:state in ('cancel', 'done')">
+                    <field name="message_unread" invisible="1"/>
                     <field name="id"/>
                     <field name="create_date" groups="base.group_no_one"/>
                     <field name="name"/>
@@ -182,7 +182,7 @@
                     <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" groups="base.group_no_one"/>
+                    <field name="state" invisible="1"/>
                     <field name="categ_ids" invisible="1"/>
                     <field name="task_id" invisible="1"/>
                 </tree>
@@ -196,7 +196,7 @@
                 <search string="Issue Tracker Search">
                     <field name="name" string="Issue" filter_domain="['|', '|',('partner_id','ilike',self),('email_from','ilike',self),('name','ilike',self)]"/>
                     <field name="id"/>
-                    <filter icon="terp-mail-message-new" string="Inbox" help="Unread messages" name="needaction_pending" domain="[('needaction_pending','=',True)]"/>
+                    <filter icon="terp-mail-message-new" string="Inbox" help="Unread messages" name="message_unread" domain="[('message_unread','=',True)]"/>
                     <separator/>
                     <filter string="New" icon="terp-document-new" domain="[('state','=','draft')]" help="New Issues"/>
                     <filter string="To Do" domain="[('state','=','open')]" help="To Do Issues" icon="terp-check"/>
@@ -212,7 +212,6 @@
                         <filter string="Category" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'categ_id'}"/>
                         <filter string="Priority" icon="terp-rating-rated" domain="[]" context="{'group_by':'priority'}"/>
                         <filter string="Stage" icon="terp-stage" domain="[]" context="{'group_by':'stage_id'}"/>
-                        <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
                         <filter string="Month" icon="terp-go-month" domain="[]" context="{'group_by':'create_date'}" help="Creation Month"/>
                     </group>
                 </search>
@@ -239,6 +238,7 @@
             <field name="model">project.issue</field>
             <field name="arch" type="xml">
                 <kanban default_group_by="stage_id">
+                    <field name="stage_id"/>
                     <field name="color"/>
                     <field name="priority"/>
                     <field name="user_email"/>
@@ -252,12 +252,12 @@
                            </ul>
                         </t>
                         <t t-name="kanban-box">
-                            <div t-attf-class="oe_kanban_color_#{kanban_getcolor(record.color.raw_value)} oe_kanban_card oe_kanban_global_click">
+                            <div t-attf-class="oe_kanban_color_#{kanban_getcolor(record.color.raw_value)} oe_kanban_card oe_kanban_global_click oe_semantic_html_override">
                                 <div class="oe_dropdown_toggle oe_dropdown_kanban">
                                     <span class="oe_e">i</span>
                                     <ul class="oe_dropdown_menu">
-                                        <li><a type="edit" >Edit...</a></li>
-                                        <li><a type="delete">Delete</a></li>
+                                        <t t-if="widget.view.is_action_enabled('edit')"><li><a type="edit">Edit...</a></li></t>
+                                        <t t-if="widget.view.is_action_enabled('delete')"><li><a type="delete">Delete</a></li></t>
                                         <li><ul class="oe_kanban_colorpicker" data-field="color"/></li>
                                     </ul>
                                 </div>
@@ -310,9 +310,9 @@
             <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:needaction_pending==True" colors="red:state=='open';black:state in ('draft', 'cancel','done','pending')">
+                <tree string="Feature Tracker Tree" fonts="bold:message_unread==True" colors="red:state=='open';black:state in ('draft', 'cancel','done','pending')">
                     <field name="id"/>
-                    <field name="needaction_pending" invisible="1"/>
+                    <field name="message_unread" invisible="1"/>
                     <field name="name" string="Feature description"/>
                     <field name="partner_id"/>
                     <field name="priority" string="Priority"/>
@@ -354,11 +354,12 @@
             <field name="model">project.project</field>
             <field name="inherit_id" ref="project.edit_project"/>
             <field name="arch" type="xml">
-                <xpath expr='//tr[@name="use_tasks_row"]' position='after'>
-                    <tr>
-                        <td><group><field name="use_issues"/></group></td>
-                        <td><button icon="terp-gtk-go-back-rtl" name="%(act_project_project_2_project_issue_all)d" string="Issues" type="action" attrs="{'invisible':[('use_issues','=', 0)]}"/></td>
-                    </tr>
+                <xpath expr='//div[@name="options_active"]' position='inside'>
+                    <field name="use_issues" class="oe_inline"/>
+                    <label for="use_issues"/>
+                </xpath>
+                <xpath expr='//div[@name="buttons"]' position='inside'>
+                    <button name="%(act_project_project_2_project_issue_all)d" string="Issues" type="action" attrs="{'invisible':[('use_issues','=', 0)]}"/>
                 </xpath>
                 <field name="priority" position="before">
                     <field name="project_escalation_id"/>
@@ -381,7 +382,7 @@
                 <xpath expr="//div[contains(@class, 'oe_kanban_project_list')]" position="inside">
                     <a t-if="record.use_issues.raw_value"
                         name="%(act_project_project_2_project_issue_all)d" type="action">
-                        Issues(<field name="issue_count"/>)</a>
+                        <field name="issue_count"/> Issues</a>
                 </xpath>
             </field>
         </record>
@@ -392,11 +393,9 @@
             <field name="inherit_id" ref="project.analytic_account_inherited_form"/>
             <field eval="18" name="priority"/>
             <field name="arch" type="xml">
-                <xpath expr='//separator[@name="project_sep"]' position='replace'>
-                    <separator colspan="4" string="Project Management" name="project_sep"/> <!-- removal of invisible attribute -->
-                </xpath>
-                <xpath expr='//separator[@name="project_sep"]' position='after'>
+                <xpath expr='//div[@name="project"]' position='inside'>
                     <field name="use_issues"/>
+                    <label for="use_issues"/>
                 </xpath>
             </field>
         </record>
diff --git a/addons/project_issue/report/project_issue_report_view.xml b/addons/project_issue/report/project_issue_report_view.xml
index 625e6e64374..f90f349ea3b 100644
--- a/addons/project_issue/report/project_issue_report_view.xml
+++ b/addons/project_issue/report/project_issue_report_view.xml
@@ -67,7 +67,6 @@
                         <filter string="Version"  icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'version_id'}"/>
                         <filter string="Priority"  icon="terp-rating-rated" domain="[]" context="{'group_by':'priority'}" />
                         <filter string="Stage" icon="terp-stage" domain="[]" context="{'group_by':'stage_id'}"/>
-                        <filter string="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="Creation Date"/>
                         <filter string="Month" icon="terp-go-month" domain="[]" context="{'group_by':'month'}" help="Creation Date"/>
diff --git a/addons/project_issue_sheet/__openerp__.py b/addons/project_issue_sheet/__openerp__.py
index cb47432c749..e12bc1a14cd 100644
--- a/addons/project_issue_sheet/__openerp__.py
+++ b/addons/project_issue_sheet/__openerp__.py
@@ -23,7 +23,7 @@
 {
     'name': 'Timesheet on Issues',
     'version': '1.0',
-    "category": "Project Management",
+    'category': 'Project Management',
     'description': """
 This module adds the Timesheet support for the Issues/Bugs Management in Project.
 =================================================================================
@@ -37,14 +37,11 @@ Worklogs can be maintained to signify number of hours spent by users to handle a
         'project_issue',
         'hr_timesheet_sheet',
     ],
-    'init_xml': [
-    ],
-    'update_xml': [
+    'data': [
         'project_issue_sheet_view.xml',
         'security/ir.model.access.csv',
     ],
-    'demo_xml': [
-    ],
+    'demo': [],
     'installable': True,
     'auto_install': False,
     'certificate' : '00856032058128997037',
diff --git a/addons/project_issue_sheet/i18n/ar.po b/addons/project_issue_sheet/i18n/ar.po
index 4fc46aad966..82c0d201f5b 100644
--- a/addons/project_issue_sheet/i18n/ar.po
+++ b/addons/project_issue_sheet/i18n/ar.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:57+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:36+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project_issue_sheet
 #: model:ir.model,name:project_issue_sheet.model_account_analytic_line
diff --git a/addons/project_issue_sheet/i18n/ca.po b/addons/project_issue_sheet/i18n/ca.po
index b097db7704d..1c926711193 100644
--- a/addons/project_issue_sheet/i18n/ca.po
+++ b/addons/project_issue_sheet/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:57+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:36+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project_issue_sheet
 #: model:ir.model,name:project_issue_sheet.model_account_analytic_line
diff --git a/addons/project_issue_sheet/i18n/da.po b/addons/project_issue_sheet/i18n/da.po
index 66a6f98e27b..aa3133c5085 100644
--- a/addons/project_issue_sheet/i18n/da.po
+++ b/addons/project_issue_sheet/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:57+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:36+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project_issue_sheet
 #: model:ir.model,name:project_issue_sheet.model_account_analytic_line
diff --git a/addons/project_issue_sheet/i18n/de.po b/addons/project_issue_sheet/i18n/de.po
index 9ba8bd9e586..5c86ecd213d 100644
--- a/addons/project_issue_sheet/i18n/de.po
+++ b/addons/project_issue_sheet/i18n/de.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:57+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:36+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project_issue_sheet
 #: model:ir.model,name:project_issue_sheet.model_account_analytic_line
diff --git a/addons/project_issue_sheet/i18n/es.po b/addons/project_issue_sheet/i18n/es.po
index ce496d1be9c..6945289eb99 100644
--- a/addons/project_issue_sheet/i18n/es.po
+++ b/addons/project_issue_sheet/i18n/es.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:57+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:36+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project_issue_sheet
 #: model:ir.model,name:project_issue_sheet.model_account_analytic_line
diff --git a/addons/project_issue_sheet/i18n/es_CR.po b/addons/project_issue_sheet/i18n/es_CR.po
index fb70c2ddd68..8edb1c3271a 100644
--- a/addons/project_issue_sheet/i18n/es_CR.po
+++ b/addons/project_issue_sheet/i18n/es_CR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:57+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:36+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 "Language: es\n"
 
 #. module: project_issue_sheet
diff --git a/addons/project_issue_sheet/i18n/fi.po b/addons/project_issue_sheet/i18n/fi.po
index c7b838aaea8..e0aa1ee58ac 100644
--- a/addons/project_issue_sheet/i18n/fi.po
+++ b/addons/project_issue_sheet/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:57+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:36+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project_issue_sheet
 #: model:ir.model,name:project_issue_sheet.model_account_analytic_line
diff --git a/addons/project_issue_sheet/i18n/fr.po b/addons/project_issue_sheet/i18n/fr.po
index 2e94e94e24e..5ea16d9bf43 100644
--- a/addons/project_issue_sheet/i18n/fr.po
+++ b/addons/project_issue_sheet/i18n/fr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:57+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:36+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project_issue_sheet
 #: model:ir.model,name:project_issue_sheet.model_account_analytic_line
diff --git a/addons/project_issue_sheet/i18n/gl.po b/addons/project_issue_sheet/i18n/gl.po
index 168ee37f6c3..75e1379e4db 100644
--- a/addons/project_issue_sheet/i18n/gl.po
+++ b/addons/project_issue_sheet/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:57+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:36+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project_issue_sheet
 #: model:ir.model,name:project_issue_sheet.model_account_analytic_line
diff --git a/addons/project_issue_sheet/i18n/hr.po b/addons/project_issue_sheet/i18n/hr.po
index 0599a90f39b..8c564449f5d 100644
--- a/addons/project_issue_sheet/i18n/hr.po
+++ b/addons/project_issue_sheet/i18n/hr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:57+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:36+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project_issue_sheet
 #: model:ir.model,name:project_issue_sheet.model_account_analytic_line
diff --git a/addons/project_issue_sheet/i18n/hu.po b/addons/project_issue_sheet/i18n/hu.po
index a09750806ce..2b1698d306c 100644
--- a/addons/project_issue_sheet/i18n/hu.po
+++ b/addons/project_issue_sheet/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:57+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:36+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project_issue_sheet
 #: model:ir.model,name:project_issue_sheet.model_account_analytic_line
diff --git a/addons/project_issue_sheet/i18n/it.po b/addons/project_issue_sheet/i18n/it.po
index 45b7f6aaf62..43c8f27bf61 100644
--- a/addons/project_issue_sheet/i18n/it.po
+++ b/addons/project_issue_sheet/i18n/it.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:57+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:36+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project_issue_sheet
 #: model:ir.model,name:project_issue_sheet.model_account_analytic_line
diff --git a/addons/project_issue_sheet/i18n/ja.po b/addons/project_issue_sheet/i18n/ja.po
index ed5f00a1df2..d89029107e5 100644
--- a/addons/project_issue_sheet/i18n/ja.po
+++ b/addons/project_issue_sheet/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:57+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:36+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project_issue_sheet
 #: model:ir.model,name:project_issue_sheet.model_account_analytic_line
diff --git a/addons/project_issue_sheet/i18n/lv.po b/addons/project_issue_sheet/i18n/lv.po
index 268a563fc78..498f0e620de 100644
--- a/addons/project_issue_sheet/i18n/lv.po
+++ b/addons/project_issue_sheet/i18n/lv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:57+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:36+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project_issue_sheet
 #: model:ir.model,name:project_issue_sheet.model_account_analytic_line
diff --git a/addons/project_issue_sheet/i18n/mn.po b/addons/project_issue_sheet/i18n/mn.po
index b875ef0f156..ded2b3b6278 100644
--- a/addons/project_issue_sheet/i18n/mn.po
+++ b/addons/project_issue_sheet/i18n/mn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:57+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:36+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project_issue_sheet
 #: model:ir.model,name:project_issue_sheet.model_account_analytic_line
diff --git a/addons/project_issue_sheet/i18n/nl.po b/addons/project_issue_sheet/i18n/nl.po
index 2a98fe3527f..3f963971ae2 100644
--- a/addons/project_issue_sheet/i18n/nl.po
+++ b/addons/project_issue_sheet/i18n/nl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:57+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:36+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project_issue_sheet
 #: model:ir.model,name:project_issue_sheet.model_account_analytic_line
diff --git a/addons/project_issue_sheet/i18n/pl.po b/addons/project_issue_sheet/i18n/pl.po
index 0e442f23aa2..0a74d2b9f92 100644
--- a/addons/project_issue_sheet/i18n/pl.po
+++ b/addons/project_issue_sheet/i18n/pl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:57+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:36+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project_issue_sheet
 #: model:ir.model,name:project_issue_sheet.model_account_analytic_line
diff --git a/addons/project_issue_sheet/i18n/pt.po b/addons/project_issue_sheet/i18n/pt.po
index 150957d0021..8ef90944b02 100644
--- a/addons/project_issue_sheet/i18n/pt.po
+++ b/addons/project_issue_sheet/i18n/pt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:57+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:36+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project_issue_sheet
 #: model:ir.model,name:project_issue_sheet.model_account_analytic_line
diff --git a/addons/project_issue_sheet/i18n/pt_BR.po b/addons/project_issue_sheet/i18n/pt_BR.po
index 582f81483c0..a426469a4fd 100644
--- a/addons/project_issue_sheet/i18n/pt_BR.po
+++ b/addons/project_issue_sheet/i18n/pt_BR.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-14 04:45+0000\n"
-"X-Generator: Launchpad (build 15791)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:36+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project_issue_sheet
 #: model:ir.model,name:project_issue_sheet.model_account_analytic_line
diff --git a/addons/project_issue_sheet/i18n/ro.po b/addons/project_issue_sheet/i18n/ro.po
index e09fecdedbb..014275ffbe1 100644
--- a/addons/project_issue_sheet/i18n/ro.po
+++ b/addons/project_issue_sheet/i18n/ro.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:57+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:36+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project_issue_sheet
 #: model:ir.model,name:project_issue_sheet.model_account_analytic_line
diff --git a/addons/project_issue_sheet/i18n/ru.po b/addons/project_issue_sheet/i18n/ru.po
index b1419de6576..8809c03e394 100644
--- a/addons/project_issue_sheet/i18n/ru.po
+++ b/addons/project_issue_sheet/i18n/ru.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:57+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:36+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project_issue_sheet
 #: model:ir.model,name:project_issue_sheet.model_account_analytic_line
diff --git a/addons/project_issue_sheet/i18n/sv.po b/addons/project_issue_sheet/i18n/sv.po
index 2d5b6296064..daae5eb8782 100644
--- a/addons/project_issue_sheet/i18n/sv.po
+++ b/addons/project_issue_sheet/i18n/sv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:57+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:36+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project_issue_sheet
 #: model:ir.model,name:project_issue_sheet.model_account_analytic_line
diff --git a/addons/project_issue_sheet/i18n/tr.po b/addons/project_issue_sheet/i18n/tr.po
index 4fb03440716..87be5dc0657 100644
--- a/addons/project_issue_sheet/i18n/tr.po
+++ b/addons/project_issue_sheet/i18n/tr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:57+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:36+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project_issue_sheet
 #: model:ir.model,name:project_issue_sheet.model_account_analytic_line
diff --git a/addons/project_issue_sheet/i18n/zh_CN.po b/addons/project_issue_sheet/i18n/zh_CN.po
index c2c9127662c..9026850253f 100644
--- a/addons/project_issue_sheet/i18n/zh_CN.po
+++ b/addons/project_issue_sheet/i18n/zh_CN.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:57+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:36+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project_issue_sheet
 #: model:ir.model,name:project_issue_sheet.model_account_analytic_line
diff --git a/addons/project_long_term/__openerp__.py b/addons/project_long_term/__openerp__.py
index 3882eddbdb5..2968a5b035d 100644
--- a/addons/project_long_term/__openerp__.py
+++ b/addons/project_long_term/__openerp__.py
@@ -20,14 +20,14 @@
 ##############################################################################
 
 {
-    "name": "Long Term Projects",
-    "version": "1.1",
-    "author": "OpenERP SA",
-    "website": "http://www.openerp.com",
-    "category": "Project Management",
-    "images": ["images/project_phase_form.jpeg","images/project_phases.jpeg", "images/resources_allocation.jpeg"],
-    "depends": ["project"],
-    "description": """
+    'name': 'Long Term Projects',
+    'version': '1.1',
+    'author': 'OpenERP SA',
+    'website': 'http://www.openerp.com',
+    'category': 'Project Management',
+    'images': ['images/project_phase_form.jpeg','images/project_phases.jpeg', 'images/resources_allocation.jpeg'],
+    'depends': ['project'],
+    'description': """
 Long Term Project management module that tracks planning, scheduling, resources allocation.
 ===========================================================================================
 
@@ -44,18 +44,17 @@ Features:
     * Schedule Tasks: All the tasks which are in draft, pending and open state
       are scheduled with taking the phase's start date.
     """,
-    "init_xml": [],
-    "demo_xml": ["project_long_term_demo.xml"],
-    "test": [
+    'demo': ['project_long_term_demo.xml'],
+    'test': [
           'test/phase_process.yml',
           'test/task_process.yml',
     ],
-    "update_xml": [
-        "security/ir.model.access.csv",
-        "project_long_term_view.xml",
-        "project_long_term_workflow.xml",
-        "wizard/project_compute_phases_view.xml",
-        "wizard/project_compute_tasks_view.xml",
+    'data': [
+        'security/ir.model.access.csv',
+        'project_long_term_view.xml',
+        'project_long_term_workflow.xml',
+        'wizard/project_compute_phases_view.xml',
+        'wizard/project_compute_tasks_view.xml',
     ],
     'installable': True,
     'auto_install': False,
diff --git a/addons/project_long_term/i18n/ar.po b/addons/project_long_term/i18n/ar.po
index e4859c5f75b..43a951e3222 100644
--- a/addons/project_long_term/i18n/ar.po
+++ b/addons/project_long_term/i18n/ar.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:34+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project_long_term
 #: model:ir.actions.act_window,name:project_long_term.act_project_phases
diff --git a/addons/project_long_term/i18n/ca.po b/addons/project_long_term/i18n/ca.po
index afd8216df7d..674c38a1b5b 100644
--- a/addons/project_long_term/i18n/ca.po
+++ b/addons/project_long_term/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:34+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project_long_term
 #: model:ir.actions.act_window,name:project_long_term.act_project_phases
diff --git a/addons/project_long_term/i18n/da.po b/addons/project_long_term/i18n/da.po
index 5b6ce585453..751b47c3eec 100644
--- a/addons/project_long_term/i18n/da.po
+++ b/addons/project_long_term/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:34+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project_long_term
 #: model:ir.actions.act_window,name:project_long_term.act_project_phases
diff --git a/addons/project_long_term/i18n/de.po b/addons/project_long_term/i18n/de.po
index f53e34c0cb6..53dd34c174f 100644
--- a/addons/project_long_term/i18n/de.po
+++ b/addons/project_long_term/i18n/de.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project_long_term
 #: model:ir.actions.act_window,name:project_long_term.act_project_phases
diff --git a/addons/project_long_term/i18n/es.po b/addons/project_long_term/i18n/es.po
index 82f0c276df8..f6aa74f4186 100644
--- a/addons/project_long_term/i18n/es.po
+++ b/addons/project_long_term/i18n/es.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project_long_term
 #: model:ir.actions.act_window,name:project_long_term.act_project_phases
diff --git a/addons/project_long_term/i18n/es_CR.po b/addons/project_long_term/i18n/es_CR.po
index cd54b36536f..87935703b57 100644
--- a/addons/project_long_term/i18n/es_CR.po
+++ b/addons/project_long_term/i18n/es_CR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 "Language: es\n"
 
 #. module: project_long_term
diff --git a/addons/project_long_term/i18n/es_EC.po b/addons/project_long_term/i18n/es_EC.po
index cec5a0f9a46..e344d14e458 100644
--- a/addons/project_long_term/i18n/es_EC.po
+++ b/addons/project_long_term/i18n/es_EC.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project_long_term
 #: model:ir.actions.act_window,name:project_long_term.act_project_phases
diff --git a/addons/project_long_term/i18n/fi.po b/addons/project_long_term/i18n/fi.po
index e7209e67bde..baaf3dfb806 100644
--- a/addons/project_long_term/i18n/fi.po
+++ b/addons/project_long_term/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:34+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project_long_term
 #: model:ir.actions.act_window,name:project_long_term.act_project_phases
diff --git a/addons/project_long_term/i18n/fr.po b/addons/project_long_term/i18n/fr.po
index c55e3582939..f9ff359fe15 100644
--- a/addons/project_long_term/i18n/fr.po
+++ b/addons/project_long_term/i18n/fr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project_long_term
 #: model:ir.actions.act_window,name:project_long_term.act_project_phases
diff --git a/addons/project_long_term/i18n/hr.po b/addons/project_long_term/i18n/hr.po
index c634626e1ed..7ec043b8e8d 100644
--- a/addons/project_long_term/i18n/hr.po
+++ b/addons/project_long_term/i18n/hr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project_long_term
 #: model:ir.actions.act_window,name:project_long_term.act_project_phases
diff --git a/addons/project_long_term/i18n/hu.po b/addons/project_long_term/i18n/hu.po
index a0721aa6bbf..4bce37309af 100644
--- a/addons/project_long_term/i18n/hu.po
+++ b/addons/project_long_term/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project_long_term
 #: model:ir.actions.act_window,name:project_long_term.act_project_phases
diff --git a/addons/project_long_term/i18n/it.po b/addons/project_long_term/i18n/it.po
index 31cca39375b..8a20a31b164 100644
--- a/addons/project_long_term/i18n/it.po
+++ b/addons/project_long_term/i18n/it.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project_long_term
 #: model:ir.actions.act_window,name:project_long_term.act_project_phases
diff --git a/addons/project_long_term/i18n/ja.po b/addons/project_long_term/i18n/ja.po
index b6942982ae9..560f21fc98e 100644
--- a/addons/project_long_term/i18n/ja.po
+++ b/addons/project_long_term/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project_long_term
 #: model:ir.actions.act_window,name:project_long_term.act_project_phases
diff --git a/addons/project_long_term/i18n/lv.po b/addons/project_long_term/i18n/lv.po
index 50c53125eef..d7b9deb19f5 100644
--- a/addons/project_long_term/i18n/lv.po
+++ b/addons/project_long_term/i18n/lv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project_long_term
 #: model:ir.actions.act_window,name:project_long_term.act_project_phases
diff --git a/addons/project_long_term/i18n/mn.po b/addons/project_long_term/i18n/mn.po
index 6a35bb779e4..0cc208e3611 100644
--- a/addons/project_long_term/i18n/mn.po
+++ b/addons/project_long_term/i18n/mn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project_long_term
 #: model:ir.actions.act_window,name:project_long_term.act_project_phases
diff --git a/addons/project_long_term/i18n/nl.po b/addons/project_long_term/i18n/nl.po
index 0e84060aaba..e889f74d09b 100644
--- a/addons/project_long_term/i18n/nl.po
+++ b/addons/project_long_term/i18n/nl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:34+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project_long_term
 #: model:ir.actions.act_window,name:project_long_term.act_project_phases
diff --git a/addons/project_long_term/i18n/pl.po b/addons/project_long_term/i18n/pl.po
index bec5bb71d3e..0d85c0e256f 100644
--- a/addons/project_long_term/i18n/pl.po
+++ b/addons/project_long_term/i18n/pl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project_long_term
 #: model:ir.actions.act_window,name:project_long_term.act_project_phases
diff --git a/addons/project_long_term/i18n/pt.po b/addons/project_long_term/i18n/pt.po
index 7aca4caa234..e1118b072e2 100644
--- a/addons/project_long_term/i18n/pt.po
+++ b/addons/project_long_term/i18n/pt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project_long_term
 #: model:ir.actions.act_window,name:project_long_term.act_project_phases
diff --git a/addons/project_long_term/i18n/pt_BR.po b/addons/project_long_term/i18n/pt_BR.po
index 344a22a99e4..5bc24758372 100644
--- a/addons/project_long_term/i18n/pt_BR.po
+++ b/addons/project_long_term/i18n/pt_BR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project_long_term
 #: model:ir.actions.act_window,name:project_long_term.act_project_phases
@@ -42,7 +42,7 @@ msgstr "Agrupar Por..."
 #. module: project_long_term
 #: field:project.phase,user_ids:0
 msgid "Assigned Users"
-msgstr ""
+msgstr "Usuários não Associados"
 
 #. module: project_long_term
 #: field:project.phase,progress:0
@@ -57,7 +57,7 @@ msgstr "Erro! A data inicial do projeto precisa ser menor que a data final."
 #. module: project_long_term
 #: view:project.phase:0
 msgid "In Progress Phases"
-msgstr ""
+msgstr "Fases em Progresso"
 
 #. module: project_long_term
 #: view:project.phase:0
@@ -88,7 +88,7 @@ msgstr "Dia"
 #. module: project_long_term
 #: model:ir.model,name:project_long_term.model_project_user_allocation
 msgid "Phase User Allocation"
-msgstr ""
+msgstr "Alocação de Usuário nas Fases"
 
 #. module: project_long_term
 #: model:ir.model,name:project_long_term.model_project_task
@@ -105,6 +105,12 @@ msgid ""
 "users, convert your phases into a series of tasks when you start working on "
 "the project."
 msgstr ""
+"Um projeto pode ser dividido em diferentes fases. Para cada fase, você pode "
+"definir a alocação de usuários, descrever diferentes tarefas e associar cada "
+"fase a uma fase anterior ou posterior, adicionar restrições de data para o "
+"agendamento automático. Use o planejamento a longo prazo para detalhar seus "
+"usuários disponíveis, converter suas fases em uma série de tarefas quando "
+"você começar a trabalhar no projeto."
 
 #. module: project_long_term
 #: selection:project.compute.phases,target_project:0
@@ -128,7 +134,7 @@ msgstr "UdM (Unidade de Medida) é a unidade de medida para Duração"
 #: view:project.phase:0
 #: view:project.user.allocation:0
 msgid "Planning of Users"
-msgstr ""
+msgstr "Planejamento de Usuários"
 
 #. module: project_long_term
 #: help:project.phase,date_end:0
@@ -173,7 +179,7 @@ msgstr "Prazo Final"
 #. module: project_long_term
 #: selection:project.compute.phases,target_project:0
 msgid "Compute All My Projects"
-msgstr ""
+msgstr "Calcular Todos os Meus Projetos"
 
 #. module: project_long_term
 #: view:project.compute.phases:0
@@ -190,7 +196,7 @@ msgstr " (cópia)"
 #. module: project_long_term
 #: view:project.user.allocation:0
 msgid "Project User Allocation"
-msgstr ""
+msgstr "Alocação de Usuários no Projeto"
 
 #. module: project_long_term
 #: view:project.phase:0
@@ -202,18 +208,18 @@ msgstr "Status"
 #: view:project.compute.phases:0
 #: view:project.compute.tasks:0
 msgid "C_ompute"
-msgstr ""
+msgstr "C_alcular"
 
 #. module: project_long_term
 #: view:project.phase:0
 #: selection:project.phase,state:0
 msgid "New"
-msgstr ""
+msgstr "Novo"
 
 #. module: project_long_term
 #: help:project.phase,progress:0
 msgid "Computed based on related tasks"
-msgstr ""
+msgstr "Calculada com base em tarefas relacionadas"
 
 #. module: project_long_term
 #: field:project.phase,product_uom:0
@@ -234,7 +240,7 @@ msgstr "Recursos"
 #. module: project_long_term
 #: view:project.phase:0
 msgid "My Projects"
-msgstr ""
+msgstr "Meus Projetos"
 
 #. module: project_long_term
 #: help:project.user.allocation,date_start:0
@@ -249,13 +255,13 @@ msgstr "Tarefas Relacionadas"
 #. module: project_long_term
 #: view:project.phase:0
 msgid "New Phases"
-msgstr ""
+msgstr "Novas Fases"
 
 #. module: project_long_term
 #: code:addons/project_long_term/wizard/project_compute_phases.py:48
 #, python-format
 msgid "Please specify a project to schedule."
-msgstr ""
+msgstr "Por favor especifique um projeto para agendar"
 
 #. module: project_long_term
 #: help:project.phase,constraint_date_start:0
@@ -289,7 +295,7 @@ msgstr "Data de Início da Fase deve ser inferior a data final de fase."
 #. module: project_long_term
 #: view:project.phase:0
 msgid "Start Month"
-msgstr ""
+msgstr "Mês de Início"
 
 #. module: project_long_term
 #: field:project.phase,date_start:0
@@ -307,6 +313,8 @@ msgstr "forçar a fase para terminar antes dessa data"
 msgid ""
 "The ressources on the project can be computed automatically by the scheduler"
 msgstr ""
+"Os recursos neste projeto podem ser calculados automaticamente pelo "
+"agendador."
 
 #. module: project_long_term
 #: view:project.phase:0
@@ -316,7 +324,7 @@ msgstr "Provisório"
 #. module: project_long_term
 #: view:project.phase:0
 msgid "Pending Phases"
-msgstr ""
+msgstr "Fases Pendentes"
 
 #. module: project_long_term
 #: view:project.phase:0
@@ -333,7 +341,7 @@ msgstr "Usuário"
 #. module: project_long_term
 #: model:ir.model,name:project_long_term.model_project_compute_tasks
 msgid "Project Compute Tasks"
-msgstr ""
+msgstr "Tarefas do Projeto Calculadas"
 
 #. module: project_long_term
 #: view:project.phase:0
@@ -343,7 +351,7 @@ msgstr "Restrições"
 #. module: project_long_term
 #: help:project.phase,sequence:0
 msgid "Gives the sequence order when displaying a list of phases."
-msgstr ""
+msgstr "Dá a ordem da seqüência ao exibir uma lista de fases."
 
 #. module: project_long_term
 #: model:ir.actions.act_window,name:project_long_term.act_project_phase
@@ -380,7 +388,7 @@ msgstr "Horas Restantes"
 #. module: project_long_term
 #: constraint:project.task:0
 msgid "Error ! Task end-date must be greater then task start-date"
-msgstr ""
+msgstr "Erro ! A data final deve ser maior do que a data inicial"
 
 #. module: project_long_term
 #: model:ir.ui.menu,name:project_long_term.menu_view_resource_calendar
@@ -392,7 +400,7 @@ msgstr "Tempo Trabalhado"
 #: model:ir.ui.menu,name:project_long_term.menu_compute_phase
 #: view:project.compute.phases:0
 msgid "Schedule Phases"
-msgstr ""
+msgstr "Planejar Fases"
 
 #. module: project_long_term
 #: view:project.phase:0
@@ -407,7 +415,7 @@ msgstr "Horas Totais"
 #. module: project_long_term
 #: view:project.user.allocation:0
 msgid "Users"
-msgstr ""
+msgstr "Usuários"
 
 #. module: project_long_term
 #: view:project.user.allocation:0
@@ -423,6 +431,10 @@ msgid ""
 "          \n"
 " If the phase is over, the states is set to 'Done'."
 msgstr ""
+"Se a fase for criada com a situação 'Provisória'.\n"
+" Se a fase for iniciada, a situação muda para 'Em Progresso'.\n"
+" Se for necessário uma revisão a fase ficará em 'Pendente'.\n"
+" Se a fase for concluída, a situação é alterada para 'Concluída'."
 
 #. module: project_long_term
 #: field:project.phase,date_end:0
@@ -448,7 +460,7 @@ msgstr "Duração"
 #. module: project_long_term
 #: view:project.phase:0
 msgid "Project Users"
-msgstr ""
+msgstr "Usuários do Projeto"
 
 #. module: project_long_term
 #: model:ir.model,name:project_long_term.model_project_phase
@@ -466,16 +478,19 @@ msgid ""
 "view.\n"
 "               "
 msgstr ""
+"Para agendar fases de todos ou de um projeto específico. Então abrirá a "
+"visão em gantt.\n"
+"               "
 
 #. module: project_long_term
 #: model:ir.model,name:project_long_term.model_project_compute_phases
 msgid "Project Compute Phases"
-msgstr ""
+msgstr "Fases Calculadas do Projeto"
 
 #. module: project_long_term
 #: constraint:project.phase:0
 msgid "Loops in phases not allowed"
-msgstr ""
+msgstr "Loops em fases não é permitido"
 
 #. module: project_long_term
 #: field:project.phase,sequence:0
@@ -485,25 +500,25 @@ msgstr "Sequência"
 #. module: project_long_term
 #: model:ir.ui.menu,name:project_long_term.menu_view_resource_calendar_leaves
 msgid "Resource Leaves"
-msgstr ""
+msgstr "Ausências de Recurso"
 
 #. module: project_long_term
 #: model:ir.actions.act_window,name:project_long_term.action_project_compute_tasks
 #: model:ir.ui.menu,name:project_long_term.menu_compute_tasks
 #: view:project.compute.tasks:0
 msgid "Schedule Tasks"
-msgstr ""
+msgstr "Agenda de Tarefas"
 
 #. module: project_long_term
 #: help:project.phase,duration:0
 msgid "By default in days"
-msgstr ""
+msgstr "Por padrão em dias"
 
 #. module: project_long_term
 #: view:project.phase:0
 #: field:project.phase,user_force_ids:0
 msgid "Force Assigned Users"
-msgstr ""
+msgstr "Forçar Usuários Atribuídos"
 
 #. module: project_long_term
 #: model:ir.ui.menu,name:project_long_term.menu_phase_schedule
@@ -599,3 +614,6 @@ msgstr "Agendamento"
 
 #~ msgid "Message"
 #~ msgstr "Mensagem"
+
+#~ msgid "Displaying settings"
+#~ msgstr "Mostrando configurações"
diff --git a/addons/project_long_term/i18n/ro.po b/addons/project_long_term/i18n/ro.po
index cc92d00cbc6..1eafda8f36e 100644
--- a/addons/project_long_term/i18n/ro.po
+++ b/addons/project_long_term/i18n/ro.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project_long_term
 #: model:ir.actions.act_window,name:project_long_term.act_project_phases
diff --git a/addons/project_long_term/i18n/sv.po b/addons/project_long_term/i18n/sv.po
index 04a335c2a9a..f23c8519d5b 100644
--- a/addons/project_long_term/i18n/sv.po
+++ b/addons/project_long_term/i18n/sv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project_long_term
 #: model:ir.actions.act_window,name:project_long_term.act_project_phases
diff --git a/addons/project_long_term/i18n/tr.po b/addons/project_long_term/i18n/tr.po
index 3b286bfe63d..56879dcd683 100644
--- a/addons/project_long_term/i18n/tr.po
+++ b/addons/project_long_term/i18n/tr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project_long_term
 #: model:ir.actions.act_window,name:project_long_term.act_project_phases
diff --git a/addons/project_long_term/i18n/zh_CN.po b/addons/project_long_term/i18n/zh_CN.po
index 7f1c5ddf0d0..42be528437a 100644
--- a/addons/project_long_term/i18n/zh_CN.po
+++ b/addons/project_long_term/i18n/zh_CN.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project_long_term
 #: model:ir.actions.act_window,name:project_long_term.act_project_phases
diff --git a/addons/project_long_term/project_long_term.py b/addons/project_long_term/project_long_term.py
index d5ac3868a5e..2eab5fa6ac6 100644
--- a/addons/project_long_term/project_long_term.py
+++ b/addons/project_long_term/project_long_term.py
@@ -273,9 +273,9 @@ class account_analytic_account(osv.osv):
     _inherit = 'account.analytic.account'
     _description = 'Analytic Account'
     _columns = {
-        'use_phases': fields.boolean('Phases Planing', help="Check this field if project manages phases"),
+        'use_phases': fields.boolean('Phases', help="Check this field if you plan to use phase-based scheduling"),
     }
-    
+
     def on_change_template(self, cr, uid, ids, template_id, context=None):
         res = super(account_analytic_account, self).on_change_template(cr, uid, ids, template_id, context=context)
         if template_id and 'value' in res:
diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml
index b4b98e8fe4a..55a91b36f08 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -96,11 +96,14 @@
             <field name="model">project.project</field>
             <field name="inherit_id" ref="project.edit_project"/>
             <field name="arch" type="xml">
-                <xpath expr='//tr[@name="use_tasks_row"]' position='after'>
-                    <tr>
-                        <td><group><field name="use_phases"/></group></td>
-                        <td><button icon="terp-gtk-go-back-rtl" name="%(act_project_phases)d" string="Phases" type="action" attrs="{'invisible':[('use_phases','=', 0)]}"/></td>
-                    </tr>
+                <xpath expr="//div[@name='options_active']" position='inside'>
+                       <field name="use_phases" class="oe_inline"/>
+                       <label for="use_phases"/>
+                </xpath>
+                <xpath expr="//div[@name='buttons']" position='inside'>
+                        <button icon="terp-gtk-go-back-rtl" name="%(act_project_phases)d"
+                                string="Phases" type="action"
+                                attrs="{'invisible':[('use_phases','=', 0)]}"/>
                 </xpath>
             </field>
         </record>
@@ -347,11 +350,9 @@
             <field name="inherit_id" ref="analytic.view_account_analytic_account_form"/>
             <field eval="18" name="priority"/>
             <field name="arch" type="xml">
-                <xpath expr='//separator[@name="project_sep"]' position='replace'>
-                    <separator name="project_sep" string="Project Management" colspan="4"/> <!-- removal of invisible attribute -->
-                </xpath>
-                <xpath expr='//separator[@name="project_sep"]' position='after'>
+                <xpath expr='//div[@name="project"]' position='inside'>
                     <field name="use_phases"/>
+                    <label for="use_phases"/>
                 </xpath>
             </field>
         </record>
diff --git a/addons/project_mailgate/i18n/ar.po b/addons/project_mailgate/i18n/ar.po
deleted file mode 100644
index eec678816a3..00000000000
--- a/addons/project_mailgate/i18n/ar.po
+++ /dev/null
@@ -1,102 +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-02-08 00:37+0000\n"
-"PO-Revision-Date: 2012-01-12 21:12+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: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: project_mailgate
-#: view:project.task:0
-msgid "History Information"
-msgstr "معلومات المحفوظات"
-
-#. module: project_mailgate
-#: model:ir.model,name:project_mailgate.model_project_task
-msgid "Task"
-msgstr "مهمة"
-
-#. module: project_mailgate
-#: constraint:project.task:0
-msgid "Error ! You cannot create recursive tasks."
-msgstr "خطأ ! لا يمكنك انشاء مهام رجعية."
-
-#. module: project_mailgate
-#: field:project.task,message_ids:0
-msgid "Messages"
-msgstr "الرسائل"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:90
-#, python-format
-msgid "Draft"
-msgstr "مسودة"
-
-#. module: project_mailgate
-#: constraint:project.task:0
-msgid "Error ! Task end-date must be greater then task start-date"
-msgstr "خطأ! يجب ان يكون تاريخ انتهاء المهمة اكبر من تاريخ البداية"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:116
-#, python-format
-msgid "Cancel"
-msgstr "إلغاء"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:110
-#, python-format
-msgid "Done"
-msgstr "تم"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:96
-#, python-format
-msgid "Open"
-msgstr "فتح"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:102
-#, python-format
-msgid "Pending"
-msgstr "معلّق"
-
-#. module: project_mailgate
-#: view:project.task:0
-msgid "History"
-msgstr "محفوظات"
-
-#~ msgid "Attachments"
-#~ msgstr "مرفقات"
-
-#~ msgid "Details"
-#~ msgstr "تفاصيل"
-
-#~ msgid "Project MailGateWay"
-#~ msgstr "مدخل بريد المشروع"
-
-#~ msgid ""
-#~ "This module is an interface that synchronises mails with OpenERP Project "
-#~ "Task.\n"
-#~ "\n"
-#~ "It allows creating tasks as soon as a new mail arrives in our configured "
-#~ "mail server.\n"
-#~ "Moreover, it keeps track of all further communications and task states.\n"
-#~ "    "
-#~ msgstr ""
-#~ "هذه الوحدة هي تفاعل التي تتزامن البريد مع مهام مشروع OpenERP .\n"
-#~ "وهي تسمح بإنشاء المهام في اقرب وقت كما يصل البريد الجديد في خادم البريد الذي "
-#~ "تم ضبطه.\n"
-#~ "علاوة على ذلك, تستمر في تعقب المزيد من كل الاتصالات وحالات المهمة.\n"
-#~ "    "
diff --git a/addons/project_mailgate/i18n/ca.po b/addons/project_mailgate/i18n/ca.po
deleted file mode 100644
index 790de65815b..00000000000
--- a/addons/project_mailgate/i18n/ca.po
+++ /dev/null
@@ -1,106 +0,0 @@
-# Catalan translation for openobject-addons
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2011-02-06 21:57+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Catalan <ca@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: project_mailgate
-#: view:project.task:0
-msgid "History Information"
-msgstr "Informació històrica"
-
-#. module: project_mailgate
-#: model:ir.model,name:project_mailgate.model_project_task
-msgid "Task"
-msgstr "Tasca"
-
-#. module: project_mailgate
-#: constraint:project.task:0
-msgid "Error ! You cannot create recursive tasks."
-msgstr "Error! No podeu crear tasques recursives."
-
-#. module: project_mailgate
-#: field:project.task,message_ids:0
-msgid "Messages"
-msgstr "Missatges"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:90
-#, python-format
-msgid "Draft"
-msgstr "Esborrany"
-
-#. module: project_mailgate
-#: constraint:project.task:0
-msgid "Error ! Task end-date must be greater then task start-date"
-msgstr ""
-"Error ! La data final de la tasca ha de ser major que la data d'inici"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:116
-#, python-format
-msgid "Cancel"
-msgstr "Canceŀla"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:110
-#, python-format
-msgid "Done"
-msgstr "Realitzat"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:96
-#, python-format
-msgid "Open"
-msgstr "Obre"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:102
-#, python-format
-msgid "Pending"
-msgstr "Pendent"
-
-#. module: project_mailgate
-#: view:project.task:0
-msgid "History"
-msgstr "Històric"
-
-#~ msgid "Project MailGateWay"
-#~ msgstr "Ruta d'enllaç del projecte"
-
-#~ msgid "Attachments"
-#~ msgstr "Adjunts"
-
-#~ msgid "Details"
-#~ msgstr "Detalls"
-
-#~ msgid ""
-#~ "This module is an interface that synchronises mails with OpenERP Project "
-#~ "Task.\n"
-#~ "\n"
-#~ "It allows creating tasks as soon as a new mail arrives in our configured "
-#~ "mail server.\n"
-#~ "Moreover, it keeps track of all further communications and task states.\n"
-#~ "    "
-#~ msgstr ""
-#~ "Aquest mòdul proporciona una interfície per sincronitzar correus amb les "
-#~ "tasques de projectes d'OpenERP.\n"
-#~ "\n"
-#~ "Permet crear tasques tan aviat com arriba un nou correu en el nostre "
-#~ "servidor de correu prèviament configurat.\n"
-#~ "A més realitza un seguiment de totes les comunicacions addicionals i estats "
-#~ "de la tasca.\n"
-#~ "    "
diff --git a/addons/project_mailgate/i18n/cs.po b/addons/project_mailgate/i18n/cs.po
deleted file mode 100644
index 23417dc0330..00000000000
--- a/addons/project_mailgate/i18n/cs.po
+++ /dev/null
@@ -1,78 +0,0 @@
-# Czech 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-02-08 00:37+0000\n"
-"PO-Revision-Date: 2012-04-06 06:41+0000\n"
-"Last-Translator: Jiří Hajda <robie@centrum.cz>\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: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: project_mailgate
-#: view:project.task:0
-msgid "History Information"
-msgstr "Informace historie"
-
-#. module: project_mailgate
-#: model:ir.model,name:project_mailgate.model_project_task
-msgid "Task"
-msgstr "Úkol"
-
-#. module: project_mailgate
-#: constraint:project.task:0
-msgid "Error ! You cannot create recursive tasks."
-msgstr "Chyba ! Nemůžete vytvořit rekurzivní úkoly."
-
-#. module: project_mailgate
-#: field:project.task,message_ids:0
-msgid "Messages"
-msgstr "Zprávy"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:90
-#, python-format
-msgid "Draft"
-msgstr "Koncept"
-
-#. module: project_mailgate
-#: constraint:project.task:0
-msgid "Error ! Task end-date must be greater then task start-date"
-msgstr "Chyba ! Datum ukončení úkolu musí být větší než počáteční datum"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:116
-#, python-format
-msgid "Cancel"
-msgstr "Zrušit"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:110
-#, python-format
-msgid "Done"
-msgstr "Dokončené"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:96
-#, python-format
-msgid "Open"
-msgstr "Otevřené"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:102
-#, python-format
-msgid "Pending"
-msgstr "Čekající"
-
-#. module: project_mailgate
-#: view:project.task:0
-msgid "History"
-msgstr "Historie"
diff --git a/addons/project_mailgate/i18n/da.po b/addons/project_mailgate/i18n/da.po
deleted file mode 100644
index cceaf824221..00000000000
--- a/addons/project_mailgate/i18n/da.po
+++ /dev/null
@@ -1,78 +0,0 @@
-# Danish 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-02-08 00:37+0000\n"
-"PO-Revision-Date: 2012-01-27 06:33+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: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: project_mailgate
-#: view:project.task:0
-msgid "History Information"
-msgstr ""
-
-#. module: project_mailgate
-#: model:ir.model,name:project_mailgate.model_project_task
-msgid "Task"
-msgstr ""
-
-#. module: project_mailgate
-#: constraint:project.task:0
-msgid "Error ! You cannot create recursive tasks."
-msgstr ""
-
-#. module: project_mailgate
-#: field:project.task,message_ids:0
-msgid "Messages"
-msgstr ""
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:90
-#, python-format
-msgid "Draft"
-msgstr ""
-
-#. module: project_mailgate
-#: constraint:project.task:0
-msgid "Error ! Task end-date must be greater then task start-date"
-msgstr ""
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:116
-#, python-format
-msgid "Cancel"
-msgstr ""
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:110
-#, python-format
-msgid "Done"
-msgstr ""
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:96
-#, python-format
-msgid "Open"
-msgstr ""
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:102
-#, python-format
-msgid "Pending"
-msgstr ""
-
-#. module: project_mailgate
-#: view:project.task:0
-msgid "History"
-msgstr ""
diff --git a/addons/project_mailgate/i18n/de.po b/addons/project_mailgate/i18n/de.po
deleted file mode 100644
index 18518c8faa6..00000000000
--- a/addons/project_mailgate/i18n/de.po
+++ /dev/null
@@ -1,106 +0,0 @@
-# German translation for openobject-addons
-# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2010-12-31 10:37+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: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: project_mailgate
-#: view:project.task:0
-msgid "History Information"
-msgstr "Information Historie"
-
-#. module: project_mailgate
-#: model:ir.model,name:project_mailgate.model_project_task
-msgid "Task"
-msgstr "Aufgabe"
-
-#. module: project_mailgate
-#: constraint:project.task:0
-msgid "Error ! You cannot create recursive tasks."
-msgstr "Fehler ! Sie können keine rekursiven Aufgaben definieren."
-
-#. module: project_mailgate
-#: field:project.task,message_ids:0
-msgid "Messages"
-msgstr "Nachrichten"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:90
-#, python-format
-msgid "Draft"
-msgstr "Entwurf"
-
-#. module: project_mailgate
-#: constraint:project.task:0
-msgid "Error ! Task end-date must be greater then task start-date"
-msgstr "Fehler! Aufgaben End-Datum muss größer als Aufgaben-Beginn sein"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:116
-#, python-format
-msgid "Cancel"
-msgstr "Abbrechen"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:110
-#, python-format
-msgid "Done"
-msgstr "Erledigt"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:96
-#, python-format
-msgid "Open"
-msgstr "Offen"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:102
-#, python-format
-msgid "Pending"
-msgstr "Im Wartezustand"
-
-#. module: project_mailgate
-#: view:project.task:0
-msgid "History"
-msgstr "Historie"
-
-#~ msgid "Project MailGateWay"
-#~ msgstr "Projekte Mailgateway"
-
-#~ msgid ""
-#~ "This module is an interface that synchronises mails with OpenERP Project "
-#~ "Task.\n"
-#~ "\n"
-#~ "It allows creating tasks as soon as a new mail arrives in our configured "
-#~ "mail server.\n"
-#~ "Moreover, it keeps track of all further communications and task states.\n"
-#~ "    "
-#~ msgstr ""
-#~ "Dieses Modul ermöglicht die Synchronisation von Email mit openERP "
-#~ "Projektaufgaben.\n"
-#~ "\n"
-#~ "Es ermöglicht die Erstellung einer neuen Aufgabe sobald eine neue EMail von "
-#~ "Ihrem Mailserver empfangen wird.\n"
-#~ "Ausserdem können Sie dann alle weitere Korrespondenz und Kommunikation "
-#~ "rückverfolgen sowie den Status der Aufgabe überwachen.\n"
-#~ "    "
-
-#~ msgid "Details"
-#~ msgstr "Details"
-
-#~ msgid "Attachments"
-#~ msgstr "Anhänge"
diff --git a/addons/project_mailgate/i18n/es.po b/addons/project_mailgate/i18n/es.po
deleted file mode 100644
index a3c4717a3b9..00000000000
--- a/addons/project_mailgate/i18n/es.po
+++ /dev/null
@@ -1,106 +0,0 @@
-# Spanish translation for openobject-addons
-# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2010-12-28 08:35+0000\n"
-"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
-"<jesteve@zikzakmedia.com>\n"
-"Language-Team: Spanish <es@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: project_mailgate
-#: view:project.task:0
-msgid "History Information"
-msgstr "Información histórica"
-
-#. module: project_mailgate
-#: model:ir.model,name:project_mailgate.model_project_task
-msgid "Task"
-msgstr "Tarea"
-
-#. module: project_mailgate
-#: constraint:project.task:0
-msgid "Error ! You cannot create recursive tasks."
-msgstr "¡Error! No puede crear tareas recursivas."
-
-#. module: project_mailgate
-#: field:project.task,message_ids:0
-msgid "Messages"
-msgstr "Mensajes"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:90
-#, python-format
-msgid "Draft"
-msgstr "Borrador"
-
-#. module: project_mailgate
-#: constraint:project.task:0
-msgid "Error ! Task end-date must be greater then task start-date"
-msgstr ""
-"¡ Error ! La fecha final de la tarea debe ser mayor que la fecha de inicio"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:116
-#, python-format
-msgid "Cancel"
-msgstr "Cancelar"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:110
-#, python-format
-msgid "Done"
-msgstr "Realizado"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:96
-#, python-format
-msgid "Open"
-msgstr "Abrir"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:102
-#, python-format
-msgid "Pending"
-msgstr "Pendiente"
-
-#. module: project_mailgate
-#: view:project.task:0
-msgid "History"
-msgstr "Historial"
-
-#~ msgid "Project MailGateWay"
-#~ msgstr "Ruta de enlace del proyecto"
-
-#~ msgid "Details"
-#~ msgstr "Detalles"
-
-#~ msgid ""
-#~ "This module is an interface that synchronises mails with OpenERP Project "
-#~ "Task.\n"
-#~ "\n"
-#~ "It allows creating tasks as soon as a new mail arrives in our configured "
-#~ "mail server.\n"
-#~ "Moreover, it keeps track of all further communications and task states.\n"
-#~ "    "
-#~ msgstr ""
-#~ "Este módulo proporciona una interfaz para sincronizar correos con las tareas "
-#~ "de proyectos de OpenERP.\n"
-#~ "Permite crear tareas tan pronto como llega un nuevo correo en nuestro "
-#~ "servidor de correo previamente configurado.\n"
-#~ "Además realiza un seguimiento de todas las comunicaciones adicionales y "
-#~ "estados de la tarea.\n"
-#~ "    "
-
-#~ msgid "Attachments"
-#~ msgstr "Adjuntos"
diff --git a/addons/project_mailgate/i18n/es_CR.po b/addons/project_mailgate/i18n/es_CR.po
deleted file mode 100644
index 23cffe03abf..00000000000
--- a/addons/project_mailgate/i18n/es_CR.po
+++ /dev/null
@@ -1,107 +0,0 @@
-# Spanish translation for openobject-addons
-# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2012-02-17 00:30+0000\n"
-"Last-Translator: Carlos Vásquez (CLEARCORP) "
-"<carlos.vasquez@clearcorp.co.cr>\n"
-"Language-Team: Spanish <es@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-"Language: es\n"
-
-#. module: project_mailgate
-#: view:project.task:0
-msgid "History Information"
-msgstr "Información histórica"
-
-#. module: project_mailgate
-#: model:ir.model,name:project_mailgate.model_project_task
-msgid "Task"
-msgstr "Tarea"
-
-#. module: project_mailgate
-#: constraint:project.task:0
-msgid "Error ! You cannot create recursive tasks."
-msgstr "¡Error! No puede crear tareas recursivas."
-
-#. module: project_mailgate
-#: field:project.task,message_ids:0
-msgid "Messages"
-msgstr "Mensajes"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:90
-#, python-format
-msgid "Draft"
-msgstr "Borrador"
-
-#. module: project_mailgate
-#: constraint:project.task:0
-msgid "Error ! Task end-date must be greater then task start-date"
-msgstr ""
-"¡ Error ! La fecha final de la tarea debe ser mayor que la fecha de inicio"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:116
-#, python-format
-msgid "Cancel"
-msgstr "Cancelar"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:110
-#, python-format
-msgid "Done"
-msgstr "Realizado"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:96
-#, python-format
-msgid "Open"
-msgstr "Abrir"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:102
-#, python-format
-msgid "Pending"
-msgstr "Pendiente"
-
-#. module: project_mailgate
-#: view:project.task:0
-msgid "History"
-msgstr "Historial"
-
-#~ msgid "Project MailGateWay"
-#~ msgstr "Ruta de enlace del proyecto"
-
-#~ msgid "Details"
-#~ msgstr "Detalles"
-
-#~ msgid ""
-#~ "This module is an interface that synchronises mails with OpenERP Project "
-#~ "Task.\n"
-#~ "\n"
-#~ "It allows creating tasks as soon as a new mail arrives in our configured "
-#~ "mail server.\n"
-#~ "Moreover, it keeps track of all further communications and task states.\n"
-#~ "    "
-#~ msgstr ""
-#~ "Este módulo proporciona una interfaz para sincronizar correos con las tareas "
-#~ "de proyectos de OpenERP.\n"
-#~ "Permite crear tareas tan pronto como llega un nuevo correo en nuestro "
-#~ "servidor de correo previamente configurado.\n"
-#~ "Además realiza un seguimiento de todas las comunicaciones adicionales y "
-#~ "estados de la tarea.\n"
-#~ "    "
-
-#~ msgid "Attachments"
-#~ msgstr "Adjuntos"
diff --git a/addons/project_mailgate/i18n/es_MX.po b/addons/project_mailgate/i18n/es_MX.po
deleted file mode 100644
index 2736d2572ac..00000000000
--- a/addons/project_mailgate/i18n/es_MX.po
+++ /dev/null
@@ -1,108 +0,0 @@
-# Spanish translation for openobject-addons
-# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2010-12-28 08:35+0000\n"
-"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
-"<jesteve@zikzakmedia.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: 2011-09-05 05:56+0000\n"
-"X-Generator: Launchpad (build 13830)\n"
-
-#. module: project_mailgate
-#: view:project.task:0
-msgid "History Information"
-msgstr "Información histórica"
-
-#. module: project_mailgate
-#: model:ir.model,name:project_mailgate.model_project_task
-msgid "Task"
-msgstr "Tarea"
-
-#. module: project_mailgate
-#: model:ir.module.module,description:project_mailgate.module_meta_information
-msgid ""
-"This module is an interface that synchronises mails with OpenERP Project "
-"Task.\n"
-"\n"
-"It allows creating tasks as soon as a new mail arrives in our configured "
-"mail server.\n"
-"Moreover, it keeps track of all further communications and task states.\n"
-"    "
-msgstr ""
-"Este módulo proporciona una interfaz para sincronizar correos con las tareas "
-"de proyectos de OpenERP.\n"
-"Permite crear tareas tan pronto como llega un nuevo correo en nuestro "
-"servidor de correo previamente configurado.\n"
-"Además realiza un seguimiento de todas las comunicaciones adicionales y "
-"estados de la tarea.\n"
-"    "
-
-#. module: project_mailgate
-#: view:project.task:0
-msgid "Attachments"
-msgstr "Adjuntos"
-
-#. module: project_mailgate
-#: model:ir.module.module,shortdesc:project_mailgate.module_meta_information
-msgid "Project MailGateWay"
-msgstr "Ruta de enlace del proyecto"
-
-#. module: project_mailgate
-#: constraint:project.task:0
-msgid "Error ! You cannot create recursive tasks."
-msgstr "¡Error! No puede crear tareas recursivas."
-
-#. module: project_mailgate
-#: field:project.task,message_ids:0
-msgid "Messages"
-msgstr "Mensajes"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:123
-#, python-format
-msgid "Draft"
-msgstr "Borrador"
-
-#. module: project_mailgate
-#: view:project.task:0
-msgid "Details"
-msgstr "Detalles"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:149
-#, python-format
-msgid "Cancel"
-msgstr "Cancelar"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:143
-#, python-format
-msgid "Done"
-msgstr "Realizado"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:129
-#, python-format
-msgid "Open"
-msgstr "Abrir"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:135
-#, python-format
-msgid "Pending"
-msgstr "Pendiente"
-
-#. module: project_mailgate
-#: view:project.task:0
-msgid "History"
-msgstr "Historial"
diff --git a/addons/project_mailgate/i18n/es_VE.po b/addons/project_mailgate/i18n/es_VE.po
deleted file mode 100644
index 2736d2572ac..00000000000
--- a/addons/project_mailgate/i18n/es_VE.po
+++ /dev/null
@@ -1,108 +0,0 @@
-# Spanish translation for openobject-addons
-# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2010-12-28 08:35+0000\n"
-"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
-"<jesteve@zikzakmedia.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: 2011-09-05 05:56+0000\n"
-"X-Generator: Launchpad (build 13830)\n"
-
-#. module: project_mailgate
-#: view:project.task:0
-msgid "History Information"
-msgstr "Información histórica"
-
-#. module: project_mailgate
-#: model:ir.model,name:project_mailgate.model_project_task
-msgid "Task"
-msgstr "Tarea"
-
-#. module: project_mailgate
-#: model:ir.module.module,description:project_mailgate.module_meta_information
-msgid ""
-"This module is an interface that synchronises mails with OpenERP Project "
-"Task.\n"
-"\n"
-"It allows creating tasks as soon as a new mail arrives in our configured "
-"mail server.\n"
-"Moreover, it keeps track of all further communications and task states.\n"
-"    "
-msgstr ""
-"Este módulo proporciona una interfaz para sincronizar correos con las tareas "
-"de proyectos de OpenERP.\n"
-"Permite crear tareas tan pronto como llega un nuevo correo en nuestro "
-"servidor de correo previamente configurado.\n"
-"Además realiza un seguimiento de todas las comunicaciones adicionales y "
-"estados de la tarea.\n"
-"    "
-
-#. module: project_mailgate
-#: view:project.task:0
-msgid "Attachments"
-msgstr "Adjuntos"
-
-#. module: project_mailgate
-#: model:ir.module.module,shortdesc:project_mailgate.module_meta_information
-msgid "Project MailGateWay"
-msgstr "Ruta de enlace del proyecto"
-
-#. module: project_mailgate
-#: constraint:project.task:0
-msgid "Error ! You cannot create recursive tasks."
-msgstr "¡Error! No puede crear tareas recursivas."
-
-#. module: project_mailgate
-#: field:project.task,message_ids:0
-msgid "Messages"
-msgstr "Mensajes"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:123
-#, python-format
-msgid "Draft"
-msgstr "Borrador"
-
-#. module: project_mailgate
-#: view:project.task:0
-msgid "Details"
-msgstr "Detalles"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:149
-#, python-format
-msgid "Cancel"
-msgstr "Cancelar"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:143
-#, python-format
-msgid "Done"
-msgstr "Realizado"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:129
-#, python-format
-msgid "Open"
-msgstr "Abrir"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:135
-#, python-format
-msgid "Pending"
-msgstr "Pendiente"
-
-#. module: project_mailgate
-#: view:project.task:0
-msgid "History"
-msgstr "Historial"
diff --git a/addons/project_mailgate/i18n/fi.po b/addons/project_mailgate/i18n/fi.po
deleted file mode 100644
index 1433a51d448..00000000000
--- a/addons/project_mailgate/i18n/fi.po
+++ /dev/null
@@ -1,88 +0,0 @@
-# Finnish translation for openobject-addons
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2011-06-22 10:01+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Finnish <fi@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: project_mailgate
-#: view:project.task:0
-msgid "History Information"
-msgstr "Historiatiedot"
-
-#. module: project_mailgate
-#: model:ir.model,name:project_mailgate.model_project_task
-msgid "Task"
-msgstr "Tehtävä"
-
-#. module: project_mailgate
-#: constraint:project.task:0
-msgid "Error ! You cannot create recursive tasks."
-msgstr "Virhe ! Et voi luoda rekursiivisiä tehtäviä."
-
-#. module: project_mailgate
-#: field:project.task,message_ids:0
-msgid "Messages"
-msgstr "Viestit"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:90
-#, python-format
-msgid "Draft"
-msgstr "Luonnos"
-
-#. module: project_mailgate
-#: constraint:project.task:0
-msgid "Error ! Task end-date must be greater then task start-date"
-msgstr ""
-"Virhe! Tehtävän lopetuspäivän tulee olla myöhäisempi kuin aloituspäivä"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:116
-#, python-format
-msgid "Cancel"
-msgstr "Peruuta"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:110
-#, python-format
-msgid "Done"
-msgstr "Valmis"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:96
-#, python-format
-msgid "Open"
-msgstr "Auki"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:102
-#, python-format
-msgid "Pending"
-msgstr "Odottava"
-
-#. module: project_mailgate
-#: view:project.task:0
-msgid "History"
-msgstr "Historia"
-
-#~ msgid "Project MailGateWay"
-#~ msgstr "Projektin sähköpostivälittäjä"
-
-#~ msgid "Attachments"
-#~ msgstr "Liitteet"
-
-#~ msgid "Details"
-#~ msgstr "Yksityiskohdat"
diff --git a/addons/project_mailgate/i18n/fr.po b/addons/project_mailgate/i18n/fr.po
deleted file mode 100644
index 3f3839a46c4..00000000000
--- a/addons/project_mailgate/i18n/fr.po
+++ /dev/null
@@ -1,106 +0,0 @@
-# French translation for openobject-addons
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2011-01-13 23:14+0000\n"
-"Last-Translator: lholivier <olivier.lenoir@free.fr>\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: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: project_mailgate
-#: view:project.task:0
-msgid "History Information"
-msgstr "Historique"
-
-#. module: project_mailgate
-#: model:ir.model,name:project_mailgate.model_project_task
-msgid "Task"
-msgstr "Tâche"
-
-#. module: project_mailgate
-#: constraint:project.task:0
-msgid "Error ! You cannot create recursive tasks."
-msgstr "Erreur ! Vous ne pouvez pas créer de tâches récursives."
-
-#. module: project_mailgate
-#: field:project.task,message_ids:0
-msgid "Messages"
-msgstr "Messages"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:90
-#, python-format
-msgid "Draft"
-msgstr "Brouillon"
-
-#. module: project_mailgate
-#: constraint:project.task:0
-msgid "Error ! Task end-date must be greater then task start-date"
-msgstr ""
-"Erreur ! La date de fin de la tâche doit être postérieure à la date de "
-"démarrage"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:116
-#, python-format
-msgid "Cancel"
-msgstr "Annuler"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:110
-#, python-format
-msgid "Done"
-msgstr "Terminé"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:96
-#, python-format
-msgid "Open"
-msgstr "Ouvert"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:102
-#, python-format
-msgid "Pending"
-msgstr "En attente"
-
-#. module: project_mailgate
-#: view:project.task:0
-msgid "History"
-msgstr "Historique"
-
-#~ msgid "Attachments"
-#~ msgstr "Pièces jointes"
-
-#~ msgid "Details"
-#~ msgstr "Détails"
-
-#~ msgid "Project MailGateWay"
-#~ msgstr "Messagerie de Projet"
-
-#~ msgid ""
-#~ "This module is an interface that synchronises mails with OpenERP Project "
-#~ "Task.\n"
-#~ "\n"
-#~ "It allows creating tasks as soon as a new mail arrives in our configured "
-#~ "mail server.\n"
-#~ "Moreover, it keeps track of all further communications and task states.\n"
-#~ "    "
-#~ msgstr ""
-#~ "Ce module est un interface de synchronisation des emails avec la gestion de "
-#~ "projet d'OpenERP.\n"
-#~ "\n"
-#~ "Il permet la création de tâches sur l'arrivée de nouveaux emails dans le "
-#~ "serveur de messagerie configuré.\n"
-#~ "De plus, il conserve les échanges ultérieurs et l'état des tâches.\n"
-#~ "    "
diff --git a/addons/project_mailgate/i18n/gl.po b/addons/project_mailgate/i18n/gl.po
deleted file mode 100644
index 321e40cac17..00000000000
--- a/addons/project_mailgate/i18n/gl.po
+++ /dev/null
@@ -1,105 +0,0 @@
-# Galician translation for openobject-addons
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2011-05-10 08:39+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Galician <gl@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: project_mailgate
-#: view:project.task:0
-msgid "History Information"
-msgstr "Información histórica"
-
-#. module: project_mailgate
-#: model:ir.model,name:project_mailgate.model_project_task
-msgid "Task"
-msgstr "Tarefa"
-
-#. module: project_mailgate
-#: constraint:project.task:0
-msgid "Error ! You cannot create recursive tasks."
-msgstr "Erro! Non pode crear tarefas recorrentes."
-
-#. module: project_mailgate
-#: field:project.task,message_ids:0
-msgid "Messages"
-msgstr "Mensaxes"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:90
-#, python-format
-msgid "Draft"
-msgstr "Borrador"
-
-#. module: project_mailgate
-#: constraint:project.task:0
-msgid "Error ! Task end-date must be greater then task start-date"
-msgstr ""
-"Erro! A data de remate da tarefa debe ser posterior á data de inicio da "
-"tarefa"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:116
-#, python-format
-msgid "Cancel"
-msgstr "Anular"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:110
-#, python-format
-msgid "Done"
-msgstr "Feito"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:96
-#, python-format
-msgid "Open"
-msgstr "Abrir"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:102
-#, python-format
-msgid "Pending"
-msgstr "Pendente"
-
-#. module: project_mailgate
-#: view:project.task:0
-msgid "History"
-msgstr "Historial"
-
-#~ msgid "Project MailGateWay"
-#~ msgstr "Ruta de enlace do proxecto"
-
-#~ msgid ""
-#~ "This module is an interface that synchronises mails with OpenERP Project "
-#~ "Task.\n"
-#~ "\n"
-#~ "It allows creating tasks as soon as a new mail arrives in our configured "
-#~ "mail server.\n"
-#~ "Moreover, it keeps track of all further communications and task states.\n"
-#~ "    "
-#~ msgstr ""
-#~ "Este módulo proporciona unha interface para sincronizar correos coas tarefas "
-#~ "de proxectos de OpenERP. Permite crear tarefas tan pronto como chegue un "
-#~ "novo correo no noso servidor de correo previamente configurado. Ademais "
-#~ "realiza un seguimento de tódalas comunicacións adicionais e dos estados da "
-#~ "tarefa.\n"
-#~ "    "
-
-#~ msgid "Attachments"
-#~ msgstr "Anexos"
-
-#~ msgid "Details"
-#~ msgstr "Detalles"
diff --git a/addons/project_mailgate/i18n/hr.po b/addons/project_mailgate/i18n/hr.po
deleted file mode 100644
index 570434b246e..00000000000
--- a/addons/project_mailgate/i18n/hr.po
+++ /dev/null
@@ -1,104 +0,0 @@
-# Croatian translation for openobject-addons
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2011-12-12 08:56+0000\n"
-"Last-Translator: Tomislav Bosnjakovic <Unknown>\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: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: project_mailgate
-#: view:project.task:0
-msgid "History Information"
-msgstr "Informacije o povjesti"
-
-#. module: project_mailgate
-#: model:ir.model,name:project_mailgate.model_project_task
-msgid "Task"
-msgstr "Zadatak"
-
-#. module: project_mailgate
-#: constraint:project.task:0
-msgid "Error ! You cannot create recursive tasks."
-msgstr "Greška! Ne možete kreirati rekurzivne zadatke."
-
-#. module: project_mailgate
-#: field:project.task,message_ids:0
-msgid "Messages"
-msgstr "Poruke"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:90
-#, python-format
-msgid "Draft"
-msgstr "Nacrt"
-
-#. module: project_mailgate
-#: constraint:project.task:0
-msgid "Error ! Task end-date must be greater then task start-date"
-msgstr ""
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:116
-#, python-format
-msgid "Cancel"
-msgstr "Odustani"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:110
-#, python-format
-msgid "Done"
-msgstr "Izvršeno"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:96
-#, python-format
-msgid "Open"
-msgstr "Otvoreno"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:102
-#, python-format
-msgid "Pending"
-msgstr "Na čekanju"
-
-#. module: project_mailgate
-#: view:project.task:0
-msgid "History"
-msgstr "Povijest"
-
-#~ msgid "Project MailGateWay"
-#~ msgstr "MailGateWay projekta"
-
-#~ msgid ""
-#~ "This module is an interface that synchronises mails with OpenERP Project "
-#~ "Task.\n"
-#~ "\n"
-#~ "It allows creating tasks as soon as a new mail arrives in our configured "
-#~ "mail server.\n"
-#~ "Moreover, it keeps track of all further communications and task states.\n"
-#~ "    "
-#~ msgstr ""
-#~ "Ovaj modul je sučelje za sinhronizaciju poruka sa OpenERP projektnim "
-#~ "zadacima.\n"
-#~ "\n"
-#~ "Omogućava kreiranje zadataka čim stigne novi e-mail na naš konfigurirani "
-#~ "mail poslužitelj.\n"
-#~ "Štoviše, čuva zapise o svim kasnijim komunikacijama i statusima zadataka.\n"
-#~ "    "
-
-#~ msgid "Attachments"
-#~ msgstr "Privici"
-
-#~ msgid "Details"
-#~ msgstr "Pojedinosti"
diff --git a/addons/project_mailgate/i18n/hu.po b/addons/project_mailgate/i18n/hu.po
deleted file mode 100644
index 03232bb1a07..00000000000
--- a/addons/project_mailgate/i18n/hu.po
+++ /dev/null
@@ -1,84 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#    * project_mailgate
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2011-01-25 13:21+0000\n"
-"Last-Translator: NOVOTRADE RENDSZERHÁZ ( novotrade.hu ) "
-"<openerp@novotrade.hu>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: project_mailgate
-#: view:project.task:0
-msgid "History Information"
-msgstr "Előzmény"
-
-#. module: project_mailgate
-#: model:ir.model,name:project_mailgate.model_project_task
-msgid "Task"
-msgstr "Feladat"
-
-#. module: project_mailgate
-#: constraint:project.task:0
-msgid "Error ! You cannot create recursive tasks."
-msgstr "Hiba! Nem hozhat létre rekurzív feladatokat."
-
-#. module: project_mailgate
-#: field:project.task,message_ids:0
-msgid "Messages"
-msgstr "Üzenetek"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:90
-#, python-format
-msgid "Draft"
-msgstr "Tervezet"
-
-#. module: project_mailgate
-#: constraint:project.task:0
-msgid "Error ! Task end-date must be greater then task start-date"
-msgstr ""
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:116
-#, python-format
-msgid "Cancel"
-msgstr "Mégsem"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:110
-#, python-format
-msgid "Done"
-msgstr "Kész"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:96
-#, python-format
-msgid "Open"
-msgstr "Nyitott"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:102
-#, python-format
-msgid "Pending"
-msgstr "Függőben lévő"
-
-#. module: project_mailgate
-#: view:project.task:0
-msgid "History"
-msgstr "Előzmény"
-
-#~ msgid "Attachments"
-#~ msgstr "Mellékletek"
-
-#~ msgid "Details"
-#~ msgstr "Részletek"
diff --git a/addons/project_mailgate/i18n/it.po b/addons/project_mailgate/i18n/it.po
deleted file mode 100644
index a690d26ccea..00000000000
--- a/addons/project_mailgate/i18n/it.po
+++ /dev/null
@@ -1,106 +0,0 @@
-# Italian translation for openobject-addons
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2011-04-22 09:54+0000\n"
-"Last-Translator: simone.sandri <lexluxsox@hotmail.it>\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: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: project_mailgate
-#: view:project.task:0
-msgid "History Information"
-msgstr "Storico informazioni"
-
-#. module: project_mailgate
-#: model:ir.model,name:project_mailgate.model_project_task
-msgid "Task"
-msgstr "Attività"
-
-#. module: project_mailgate
-#: constraint:project.task:0
-msgid "Error ! You cannot create recursive tasks."
-msgstr "Errore ! Non è possibile creare attività ricorsive."
-
-#. module: project_mailgate
-#: field:project.task,message_ids:0
-msgid "Messages"
-msgstr "Messaggi"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:90
-#, python-format
-msgid "Draft"
-msgstr "Bozza"
-
-#. module: project_mailgate
-#: constraint:project.task:0
-msgid "Error ! Task end-date must be greater then task start-date"
-msgstr ""
-"Errore ! La data finale della mansione deve essere  più vecchia di quella "
-"iniziale"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:116
-#, python-format
-msgid "Cancel"
-msgstr "Annulla"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:110
-#, python-format
-msgid "Done"
-msgstr "Completato"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:96
-#, python-format
-msgid "Open"
-msgstr "Apri"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:102
-#, python-format
-msgid "Pending"
-msgstr "In sospeso"
-
-#. module: project_mailgate
-#: view:project.task:0
-msgid "History"
-msgstr "Storico"
-
-#~ msgid "Attachments"
-#~ msgstr "Allegati"
-
-#~ msgid "Details"
-#~ msgstr "Dettagli"
-
-#~ msgid ""
-#~ "This module is an interface that synchronises mails with OpenERP Project "
-#~ "Task.\n"
-#~ "\n"
-#~ "It allows creating tasks as soon as a new mail arrives in our configured "
-#~ "mail server.\n"
-#~ "Moreover, it keeps track of all further communications and task states.\n"
-#~ "    "
-#~ msgstr ""
-#~ "Questo modulo è una infertaccia che sincronizza mail con le attività di "
-#~ "progetto di OpenERP.\n"
-#~ "\n"
-#~ "Esso permette di creare attività non appena una nuova mail arriva nel mail "
-#~ "server configurato.\n"
-#~ "Inoltre, tiene traccia di tutte le comunicazioni e lo stato delle attività.\n"
-#~ "    "
-
-#~ msgid "Project MailGateWay"
-#~ msgstr "Ingresso Mail di Progetto"
diff --git a/addons/project_mailgate/i18n/ja.po b/addons/project_mailgate/i18n/ja.po
deleted file mode 100644
index 99aee84157e..00000000000
--- a/addons/project_mailgate/i18n/ja.po
+++ /dev/null
@@ -1,78 +0,0 @@
-# Japanese 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-02-08 00:37+0000\n"
-"PO-Revision-Date: 2012-06-10 03:13+0000\n"
-"Last-Translator: Akira Hiyama <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: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: project_mailgate
-#: view:project.task:0
-msgid "History Information"
-msgstr "履歴情報"
-
-#. module: project_mailgate
-#: model:ir.model,name:project_mailgate.model_project_task
-msgid "Task"
-msgstr "タスク"
-
-#. module: project_mailgate
-#: constraint:project.task:0
-msgid "Error ! You cannot create recursive tasks."
-msgstr "エラー。再帰的なタスクを作成することはできません。"
-
-#. module: project_mailgate
-#: field:project.task,message_ids:0
-msgid "Messages"
-msgstr "メッセージ"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:90
-#, python-format
-msgid "Draft"
-msgstr "ドラフト"
-
-#. module: project_mailgate
-#: constraint:project.task:0
-msgid "Error ! Task end-date must be greater then task start-date"
-msgstr "エラー。タスクの終了日は開始日以降の日付に設定しなければなりません。"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:116
-#, python-format
-msgid "Cancel"
-msgstr "キャンセル"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:110
-#, python-format
-msgid "Done"
-msgstr "完了"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:96
-#, python-format
-msgid "Open"
-msgstr "開く"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:102
-#, python-format
-msgid "Pending"
-msgstr "保留中"
-
-#. module: project_mailgate
-#: view:project.task:0
-msgid "History"
-msgstr "履歴"
diff --git a/addons/project_mailgate/i18n/lv.po b/addons/project_mailgate/i18n/lv.po
deleted file mode 100644
index d4ad512adb8..00000000000
--- a/addons/project_mailgate/i18n/lv.po
+++ /dev/null
@@ -1,87 +0,0 @@
-# Latvian translation for openobject-addons
-# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2010-12-31 10:38+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
-"Language-Team: Latvian <lv@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: project_mailgate
-#: view:project.task:0
-msgid "History Information"
-msgstr "Vēstures informācija"
-
-#. module: project_mailgate
-#: model:ir.model,name:project_mailgate.model_project_task
-msgid "Task"
-msgstr "Uzdevums"
-
-#. module: project_mailgate
-#: constraint:project.task:0
-msgid "Error ! You cannot create recursive tasks."
-msgstr "Kļūda! Nedrīkst veidot rekursīvus uzdevumus."
-
-#. module: project_mailgate
-#: field:project.task,message_ids:0
-msgid "Messages"
-msgstr "Ziņojumi"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:90
-#, python-format
-msgid "Draft"
-msgstr "Melnraksts"
-
-#. module: project_mailgate
-#: constraint:project.task:0
-msgid "Error ! Task end-date must be greater then task start-date"
-msgstr ""
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:116
-#, python-format
-msgid "Cancel"
-msgstr "Atcelt"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:110
-#, python-format
-msgid "Done"
-msgstr "Pabeigts"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:96
-#, python-format
-msgid "Open"
-msgstr "Atvērt"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:102
-#, python-format
-msgid "Pending"
-msgstr "Neizlemts"
-
-#. module: project_mailgate
-#: view:project.task:0
-msgid "History"
-msgstr "Vēsture"
-
-#~ msgid "Project MailGateWay"
-#~ msgstr "Projekta MailGateWay"
-
-#~ msgid "Attachments"
-#~ msgstr "Piesaistnes"
-
-#~ msgid "Details"
-#~ msgstr "Sīkāka informācija"
diff --git a/addons/project_mailgate/i18n/mn.po b/addons/project_mailgate/i18n/mn.po
deleted file mode 100644
index 999da7fd06c..00000000000
--- a/addons/project_mailgate/i18n/mn.po
+++ /dev/null
@@ -1,85 +0,0 @@
-# Mongolian translation for openobject-addons
-# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2010-12-21 13:53+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\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: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: project_mailgate
-#: view:project.task:0
-msgid "History Information"
-msgstr "Түүх"
-
-#. module: project_mailgate
-#: model:ir.model,name:project_mailgate.model_project_task
-msgid "Task"
-msgstr "Ажил"
-
-#. module: project_mailgate
-#: constraint:project.task:0
-msgid "Error ! You cannot create recursive tasks."
-msgstr "Алдаа ! Та рекурсив цэс үүсгэж болохгүй!"
-
-#. module: project_mailgate
-#: field:project.task,message_ids:0
-msgid "Messages"
-msgstr "Мессежүүд"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:90
-#, python-format
-msgid "Draft"
-msgstr "Ноорог"
-
-#. module: project_mailgate
-#: constraint:project.task:0
-msgid "Error ! Task end-date must be greater then task start-date"
-msgstr ""
-"Алдаа ! Даалгаврын дуусах хугацаа нь эхлэх хугацаанаасаа хойно байх ёстой"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:116
-#, python-format
-msgid "Cancel"
-msgstr "Болих"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:110
-#, python-format
-msgid "Done"
-msgstr "Хийсэн"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:96
-#, python-format
-msgid "Open"
-msgstr "Нээх"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:102
-#, python-format
-msgid "Pending"
-msgstr "Хүлээгдэж буй"
-
-#. module: project_mailgate
-#: view:project.task:0
-msgid "History"
-msgstr "Түүх"
-
-#~ msgid "Project MailGateWay"
-#~ msgstr "MailGateWay Төсөл"
-
-#~ msgid "Details"
-#~ msgstr "Нарийвчлал"
diff --git a/addons/project_mailgate/i18n/nl.po b/addons/project_mailgate/i18n/nl.po
deleted file mode 100644
index 61d3f593979..00000000000
--- a/addons/project_mailgate/i18n/nl.po
+++ /dev/null
@@ -1,104 +0,0 @@
-# Dutch translation for openobject-addons
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2011-01-18 20:55+0000\n"
-"Last-Translator: Douwe Wullink (Dypalio) <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: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: project_mailgate
-#: view:project.task:0
-msgid "History Information"
-msgstr "Historie informatie"
-
-#. module: project_mailgate
-#: model:ir.model,name:project_mailgate.model_project_task
-msgid "Task"
-msgstr "Taak"
-
-#. module: project_mailgate
-#: constraint:project.task:0
-msgid "Error ! You cannot create recursive tasks."
-msgstr "Fout! U kunt geen recursieve taken aanmaken."
-
-#. module: project_mailgate
-#: field:project.task,message_ids:0
-msgid "Messages"
-msgstr "Berichten"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:90
-#, python-format
-msgid "Draft"
-msgstr "Concept"
-
-#. module: project_mailgate
-#: constraint:project.task:0
-msgid "Error ! Task end-date must be greater then task start-date"
-msgstr "Fout! Einddatum taak moet groter zijn dat begindatum taak"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:116
-#, python-format
-msgid "Cancel"
-msgstr "Annuleren"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:110
-#, python-format
-msgid "Done"
-msgstr "Gereed"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:96
-#, python-format
-msgid "Open"
-msgstr "Open"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:102
-#, python-format
-msgid "Pending"
-msgstr "Wachtend"
-
-#. module: project_mailgate
-#: view:project.task:0
-msgid "History"
-msgstr "Geschiedenis"
-
-#~ msgid ""
-#~ "This module is an interface that synchronises mails with OpenERP Project "
-#~ "Task.\n"
-#~ "\n"
-#~ "It allows creating tasks as soon as a new mail arrives in our configured "
-#~ "mail server.\n"
-#~ "Moreover, it keeps track of all further communications and task states.\n"
-#~ "    "
-#~ msgstr ""
-#~ "Deze module is een interface dat mail synchroniseert met OpenERP Project "
-#~ "taak.\n"
-#~ "\n"
-#~ "Het maakt nieuwe taken aan zodra mail binnenkomt op de ingestelde "
-#~ "mailserver.\n"
-#~ "Daarbij houdt het alle verdere communicaties en taak statussen bij.\n"
-#~ "    "
-
-#~ msgid "Attachments"
-#~ msgstr "Bijlagen"
-
-#~ msgid "Details"
-#~ msgstr "Details"
-
-#~ msgid "Project MailGateWay"
-#~ msgstr "Project MailGateWay"
diff --git a/addons/project_mailgate/i18n/nl_BE.po b/addons/project_mailgate/i18n/nl_BE.po
deleted file mode 100644
index 5e6f599f236..00000000000
--- a/addons/project_mailgate/i18n/nl_BE.po
+++ /dev/null
@@ -1,105 +0,0 @@
-# Dutch (Belgium) 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-02-08 00:37+0000\n"
-"PO-Revision-Date: 2012-03-01 15:19+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Dutch (Belgium) <nl_BE@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: project_mailgate
-#: view:project.task:0
-msgid "History Information"
-msgstr "Historiekinformatie"
-
-#. module: project_mailgate
-#: model:ir.model,name:project_mailgate.model_project_task
-msgid "Task"
-msgstr "Taak"
-
-#. module: project_mailgate
-#: constraint:project.task:0
-msgid "Error ! You cannot create recursive tasks."
-msgstr "U kunt niet dezelfde taken maken."
-
-#. module: project_mailgate
-#: field:project.task,message_ids:0
-msgid "Messages"
-msgstr "Berichten"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:90
-#, python-format
-msgid "Draft"
-msgstr "Voorlopig"
-
-#. module: project_mailgate
-#: constraint:project.task:0
-msgid "Error ! Task end-date must be greater then task start-date"
-msgstr ""
-"Let op: de einddatum van de taak moet na de begindatum van de taak liggen"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:116
-#, python-format
-msgid "Cancel"
-msgstr "Annuleren"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:110
-#, python-format
-msgid "Done"
-msgstr "Gereed"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:96
-#, python-format
-msgid "Open"
-msgstr "Open"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:102
-#, python-format
-msgid "Pending"
-msgstr "Wachtend"
-
-#. module: project_mailgate
-#: view:project.task:0
-msgid "History"
-msgstr "Historiek"
-
-#~ msgid ""
-#~ "This module is an interface that synchronises mails with OpenERP Project "
-#~ "Task.\n"
-#~ "\n"
-#~ "It allows creating tasks as soon as a new mail arrives in our configured "
-#~ "mail server.\n"
-#~ "Moreover, it keeps track of all further communications and task states.\n"
-#~ "    "
-#~ msgstr ""
-#~ "Deze module is een interface waarmee mails met OpenERP-projecttaken worden "
-#~ "gesynchroniseerd.\n"
-#~ "\n"
-#~ "Hiermee worden taken gemaakt zodra een nieuwe mail binnenkomt via de "
-#~ "ingestelde mailserver.\n"
-#~ "Bovendien worden alle communicatie en taakstatussen bijgehouden.\n"
-#~ "    "
-
-#~ msgid "Attachments"
-#~ msgstr "Bijlagen"
-
-#~ msgid "Project MailGateWay"
-#~ msgstr "Projectmailgateway"
-
-#~ msgid "Details"
-#~ msgstr "Details"
diff --git a/addons/project_mailgate/i18n/pl.po b/addons/project_mailgate/i18n/pl.po
deleted file mode 100644
index d7a2d878eac..00000000000
--- a/addons/project_mailgate/i18n/pl.po
+++ /dev/null
@@ -1,102 +0,0 @@
-# Polish translation for openobject-addons
-# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2010-11-28 12:29+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\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: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: project_mailgate
-#: view:project.task:0
-msgid "History Information"
-msgstr "Informacja o historii"
-
-#. module: project_mailgate
-#: model:ir.model,name:project_mailgate.model_project_task
-msgid "Task"
-msgstr "Zadanie"
-
-#. module: project_mailgate
-#: constraint:project.task:0
-msgid "Error ! You cannot create recursive tasks."
-msgstr ""
-
-#. module: project_mailgate
-#: field:project.task,message_ids:0
-msgid "Messages"
-msgstr "Wiadomosći"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:90
-#, python-format
-msgid "Draft"
-msgstr "Projekt"
-
-#. module: project_mailgate
-#: constraint:project.task:0
-msgid "Error ! Task end-date must be greater then task start-date"
-msgstr ""
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:116
-#, python-format
-msgid "Cancel"
-msgstr "Anuluj"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:110
-#, python-format
-msgid "Done"
-msgstr "Wykonano"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:96
-#, python-format
-msgid "Open"
-msgstr "Otwórz"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:102
-#, python-format
-msgid "Pending"
-msgstr "Oczekujące"
-
-#. module: project_mailgate
-#: view:project.task:0
-msgid "History"
-msgstr "Historia"
-
-#~ msgid "Project MailGateWay"
-#~ msgstr "MailGateWay dla projektu"
-
-#~ msgid ""
-#~ "This module is an interface that synchronises mails with OpenERP Project "
-#~ "Task.\n"
-#~ "\n"
-#~ "It allows creating tasks as soon as a new mail arrives in our configured "
-#~ "mail server.\n"
-#~ "Moreover, it keeps track of all further communications and task states.\n"
-#~ "    "
-#~ msgstr ""
-#~ "Ten moduł jest interfejsem do synchronizacji poczty z zadaniami w projektach "
-#~ "OpenERP.\n"
-#~ "\n"
-#~ "Pozwala tworzyć projekty po otrzymaniu wiadomości przez odpowiednio "
-#~ "skonfigurowany\n"
-#~ "server pocztowy. Co więcej, utrzymuje on w jednym miejscu dalszą komunikację "
-#~ "i stany zadań.\n"
-#~ "    "
-
-#~ msgid "Details"
-#~ msgstr "Szczegóły"
diff --git a/addons/project_mailgate/i18n/project_mailgate.pot b/addons/project_mailgate/i18n/project_mailgate.pot
deleted file mode 100644
index acb1e4e981c..00000000000
--- a/addons/project_mailgate/i18n/project_mailgate.pot
+++ /dev/null
@@ -1,77 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* project_mailgate
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.1rc1\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2012-02-08 00:37+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: project_mailgate
-#: view:project.task:0
-msgid "History Information"
-msgstr ""
-
-#. module: project_mailgate
-#: model:ir.model,name:project_mailgate.model_project_task
-msgid "Task"
-msgstr ""
-
-#. module: project_mailgate
-#: constraint:project.task:0
-msgid "Error ! You cannot create recursive tasks."
-msgstr ""
-
-#. module: project_mailgate
-#: field:project.task,message_ids:0
-msgid "Messages"
-msgstr ""
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:90
-#, python-format
-msgid "Draft"
-msgstr ""
-
-#. module: project_mailgate
-#: constraint:project.task:0
-msgid "Error ! Task end-date must be greater then task start-date"
-msgstr ""
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:116
-#, python-format
-msgid "Cancel"
-msgstr ""
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:110
-#, python-format
-msgid "Done"
-msgstr ""
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:96
-#, python-format
-msgid "Open"
-msgstr ""
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:102
-#, python-format
-msgid "Pending"
-msgstr ""
-
-#. module: project_mailgate
-#: view:project.task:0
-msgid "History"
-msgstr ""
-
diff --git a/addons/project_mailgate/i18n/pt.po b/addons/project_mailgate/i18n/pt.po
deleted file mode 100644
index bbc23852001..00000000000
--- a/addons/project_mailgate/i18n/pt.po
+++ /dev/null
@@ -1,84 +0,0 @@
-# Portuguese translation for openobject-addons
-# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2010-12-12 10:12+0000\n"
-"Last-Translator: OpenERP Administrators <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: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: project_mailgate
-#: view:project.task:0
-msgid "History Information"
-msgstr "Informação do Histórico"
-
-#. module: project_mailgate
-#: model:ir.model,name:project_mailgate.model_project_task
-msgid "Task"
-msgstr "Tarefa"
-
-#. module: project_mailgate
-#: constraint:project.task:0
-msgid "Error ! You cannot create recursive tasks."
-msgstr "Erro ! Não se pode criar tarefas recursivas"
-
-#. module: project_mailgate
-#: field:project.task,message_ids:0
-msgid "Messages"
-msgstr "Mensagens"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:90
-#, python-format
-msgid "Draft"
-msgstr "Rascunho"
-
-#. module: project_mailgate
-#: constraint:project.task:0
-msgid "Error ! Task end-date must be greater then task start-date"
-msgstr "Erro !Data final da tarefa dever ser posterior à data inicial"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:116
-#, python-format
-msgid "Cancel"
-msgstr "Cancelar"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:110
-#, python-format
-msgid "Done"
-msgstr "Concluído"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:96
-#, python-format
-msgid "Open"
-msgstr "Abrir"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:102
-#, python-format
-msgid "Pending"
-msgstr "Pendente"
-
-#. module: project_mailgate
-#: view:project.task:0
-msgid "History"
-msgstr "Histórico"
-
-#~ msgid "Details"
-#~ msgstr "Detalhes"
-
-#~ msgid "Attachments"
-#~ msgstr "Anexos"
diff --git a/addons/project_mailgate/i18n/pt_BR.po b/addons/project_mailgate/i18n/pt_BR.po
deleted file mode 100644
index 0430c61420e..00000000000
--- a/addons/project_mailgate/i18n/pt_BR.po
+++ /dev/null
@@ -1,105 +0,0 @@
-# Brazilian Portuguese translation for openobject-addons
-# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2011-01-17 11:53+0000\n"
-"Last-Translator: Emerson <Unknown>\n"
-"Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: project_mailgate
-#: view:project.task:0
-msgid "History Information"
-msgstr "Informação Histórica"
-
-#. module: project_mailgate
-#: model:ir.model,name:project_mailgate.model_project_task
-msgid "Task"
-msgstr "Tarefa"
-
-#. module: project_mailgate
-#: constraint:project.task:0
-msgid "Error ! You cannot create recursive tasks."
-msgstr "Erro! Você não pode criar tarefas recursivas."
-
-#. module: project_mailgate
-#: field:project.task,message_ids:0
-msgid "Messages"
-msgstr "Mensagens"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:90
-#, python-format
-msgid "Draft"
-msgstr "Provisório"
-
-#. module: project_mailgate
-#: constraint:project.task:0
-msgid "Error ! Task end-date must be greater then task start-date"
-msgstr ""
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:116
-#, python-format
-msgid "Cancel"
-msgstr "Cancelar"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:110
-#, python-format
-msgid "Done"
-msgstr "Concluído"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:96
-#, python-format
-msgid "Open"
-msgstr "Abrir"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:102
-#, python-format
-msgid "Pending"
-msgstr "Pendente"
-
-#. module: project_mailgate
-#: view:project.task:0
-msgid "History"
-msgstr "Histórico"
-
-#~ msgid "Details"
-#~ msgstr "Detalhes"
-
-#~ msgid ""
-#~ "This module is an interface that synchronises mails with OpenERP Project "
-#~ "Task.\n"
-#~ "\n"
-#~ "It allows creating tasks as soon as a new mail arrives in our configured "
-#~ "mail server.\n"
-#~ "Moreover, it keeps track of all further communications and task states.\n"
-#~ "    "
-#~ msgstr ""
-#~ "Este módulo é uma interface que sincroniza emails com as Tarefas de Projetos "
-#~ "OpenERP.\n"
-#~ "\n"
-#~ "Permite a criação de tarefas tão logo um novo email chegue no nosso servidor "
-#~ "de email configurado.\n"
-#~ "Além disso, mantém o controle de todas as demais comunicações e estados das "
-#~ "tarefas.\n"
-#~ "    "
-
-#~ msgid "Project MailGateWay"
-#~ msgstr "Projeto Gateway de Email"
-
-#~ msgid "Attachments"
-#~ msgstr "Anexos"
diff --git a/addons/project_mailgate/i18n/ro.po b/addons/project_mailgate/i18n/ro.po
deleted file mode 100644
index c5d715f3fe5..00000000000
--- a/addons/project_mailgate/i18n/ro.po
+++ /dev/null
@@ -1,107 +0,0 @@
-# Romanian 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-02-08 00:37+0000\n"
-"PO-Revision-Date: 2012-01-13 11:48+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: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: project_mailgate
-#: view:project.task:0
-msgid "History Information"
-msgstr "Istoric Informatii"
-
-#. module: project_mailgate
-#: model:ir.model,name:project_mailgate.model_project_task
-msgid "Task"
-msgstr "Sarcina"
-
-#. module: project_mailgate
-#: constraint:project.task:0
-msgid "Error ! You cannot create recursive tasks."
-msgstr "Eroare ! Nu puteti crea sarcini recursive."
-
-#. module: project_mailgate
-#: field:project.task,message_ids:0
-msgid "Messages"
-msgstr "Mesaje"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:90
-#, python-format
-msgid "Draft"
-msgstr "Ciorna"
-
-#. module: project_mailgate
-#: constraint:project.task:0
-msgid "Error ! Task end-date must be greater then task start-date"
-msgstr ""
-"Eroare ! Data de sfarsit a sarcinii trebuie sa fie mai mare decat data de "
-"inceput"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:116
-#, python-format
-msgid "Cancel"
-msgstr "Anulati"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:110
-#, python-format
-msgid "Done"
-msgstr "Efectuat"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:96
-#, python-format
-msgid "Open"
-msgstr "Deschideti"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:102
-#, python-format
-msgid "Pending"
-msgstr "In asteptare"
-
-#. module: project_mailgate
-#: view:project.task:0
-msgid "History"
-msgstr "Istoric"
-
-#~ msgid "Project MailGateWay"
-#~ msgstr "MailGAteWay Proiect"
-
-#~ msgid ""
-#~ "This module is an interface that synchronises mails with OpenERP Project "
-#~ "Task.\n"
-#~ "\n"
-#~ "It allows creating tasks as soon as a new mail arrives in our configured "
-#~ "mail server.\n"
-#~ "Moreover, it keeps track of all further communications and task states.\n"
-#~ "    "
-#~ msgstr ""
-#~ "Acest modul este o interfată care sincronizează email-urile cu Activitatea "
-#~ "de Proiect OpenERP.\n"
-#~ "\n"
-#~ "Permite crearea de sarcini de indată ce un nou email soseste in serverul de "
-#~ "mail configurat.\n"
-#~ "In plus, tine evidenta tuturor comunicatiilor viitoare si a stărilor "
-#~ "activitătilor.\n"
-#~ "    "
-
-#~ msgid "Attachments"
-#~ msgstr "Atașamente"
-
-#~ msgid "Details"
-#~ msgstr "Detalii"
diff --git a/addons/project_mailgate/i18n/sv.po b/addons/project_mailgate/i18n/sv.po
deleted file mode 100644
index 21d5c54d16b..00000000000
--- a/addons/project_mailgate/i18n/sv.po
+++ /dev/null
@@ -1,78 +0,0 @@
-# Swedish 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-02-08 00:37+0000\n"
-"PO-Revision-Date: 2012-06-18 23:27+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: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: project_mailgate
-#: view:project.task:0
-msgid "History Information"
-msgstr "Historikinformation"
-
-#. module: project_mailgate
-#: model:ir.model,name:project_mailgate.model_project_task
-msgid "Task"
-msgstr "Aktivitet"
-
-#. module: project_mailgate
-#: constraint:project.task:0
-msgid "Error ! You cannot create recursive tasks."
-msgstr "Fel ! Du kan inte skapa rekursiva aktiviteter"
-
-#. module: project_mailgate
-#: field:project.task,message_ids:0
-msgid "Messages"
-msgstr "Meddelanden"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:90
-#, python-format
-msgid "Draft"
-msgstr "Preliminär"
-
-#. module: project_mailgate
-#: constraint:project.task:0
-msgid "Error ! Task end-date must be greater then task start-date"
-msgstr "Fel ! Aktivitetens slutdatum måste komma efter startdatumet"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:116
-#, python-format
-msgid "Cancel"
-msgstr "Avbryt"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:110
-#, python-format
-msgid "Done"
-msgstr "Färdig"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:96
-#, python-format
-msgid "Open"
-msgstr "Öppen"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:102
-#, python-format
-msgid "Pending"
-msgstr "Väntande"
-
-#. module: project_mailgate
-#: view:project.task:0
-msgid "History"
-msgstr "Historik"
diff --git a/addons/project_mailgate/i18n/tr.po b/addons/project_mailgate/i18n/tr.po
deleted file mode 100644
index 3d73a29ac80..00000000000
--- a/addons/project_mailgate/i18n/tr.po
+++ /dev/null
@@ -1,78 +0,0 @@
-# Turkish 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-02-08 00:37+0000\n"
-"PO-Revision-Date: 2012-01-25 17:33+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: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: project_mailgate
-#: view:project.task:0
-msgid "History Information"
-msgstr ""
-
-#. module: project_mailgate
-#: model:ir.model,name:project_mailgate.model_project_task
-msgid "Task"
-msgstr "Görev"
-
-#. module: project_mailgate
-#: constraint:project.task:0
-msgid "Error ! You cannot create recursive tasks."
-msgstr ""
-
-#. module: project_mailgate
-#: field:project.task,message_ids:0
-msgid "Messages"
-msgstr "Mesajlar"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:90
-#, python-format
-msgid "Draft"
-msgstr "Taslak"
-
-#. module: project_mailgate
-#: constraint:project.task:0
-msgid "Error ! Task end-date must be greater then task start-date"
-msgstr ""
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:116
-#, python-format
-msgid "Cancel"
-msgstr "İptal"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:110
-#, python-format
-msgid "Done"
-msgstr "Tamamlandı"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:96
-#, python-format
-msgid "Open"
-msgstr "Açık"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:102
-#, python-format
-msgid "Pending"
-msgstr "Bekleyen"
-
-#. module: project_mailgate
-#: view:project.task:0
-msgid "History"
-msgstr ""
diff --git a/addons/project_mailgate/i18n/zh_CN.po b/addons/project_mailgate/i18n/zh_CN.po
deleted file mode 100644
index 9e2c09990f2..00000000000
--- a/addons/project_mailgate/i18n/zh_CN.po
+++ /dev/null
@@ -1,101 +0,0 @@
-# Chinese (Simplified) translation for openobject-addons
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2011-06-28 16:25+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: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: project_mailgate
-#: view:project.task:0
-msgid "History Information"
-msgstr "日志信息"
-
-#. module: project_mailgate
-#: model:ir.model,name:project_mailgate.model_project_task
-msgid "Task"
-msgstr "任务"
-
-#. module: project_mailgate
-#: constraint:project.task:0
-msgid "Error ! You cannot create recursive tasks."
-msgstr "错误！不能创建循环引用的任务"
-
-#. module: project_mailgate
-#: field:project.task,message_ids:0
-msgid "Messages"
-msgstr "消息"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:90
-#, python-format
-msgid "Draft"
-msgstr "草稿"
-
-#. module: project_mailgate
-#: constraint:project.task:0
-msgid "Error ! Task end-date must be greater then task start-date"
-msgstr "错误！任务结束日期必须大于任务开始日期"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:116
-#, python-format
-msgid "Cancel"
-msgstr "取消"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:110
-#, python-format
-msgid "Done"
-msgstr "完成"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:96
-#, python-format
-msgid "Open"
-msgstr "未结"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:102
-#, python-format
-msgid "Pending"
-msgstr "等待中"
-
-#. module: project_mailgate
-#: view:project.task:0
-msgid "History"
-msgstr "日志"
-
-#~ msgid "Project MailGateWay"
-#~ msgstr "Project MailGateWay"
-
-#~ msgid ""
-#~ "This module is an interface that synchronises mails with OpenERP Project "
-#~ "Task.\n"
-#~ "\n"
-#~ "It allows creating tasks as soon as a new mail arrives in our configured "
-#~ "mail server.\n"
-#~ "Moreover, it keeps track of all further communications and task states.\n"
-#~ "    "
-#~ msgstr ""
-#~ "此模块是邮件和任务的接口。\n"
-#~ "允许在特定邮件服务器收到邮件后马上创建任务。\n"
-#~ "还能跟踪进一步的沟通和任务阶段\n"
-#~ "    "
-
-#~ msgid "Attachments"
-#~ msgstr "附件"
-
-#~ msgid "Details"
-#~ msgstr "详细信息"
diff --git a/addons/project_mailgate/project_mailgate.py b/addons/project_mailgate/project_mailgate.py
deleted file mode 100644
index ba3cd702760..00000000000
--- a/addons/project_mailgate/project_mailgate.py
+++ /dev/null
@@ -1,81 +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/>.
-#
-##############################################################################
-
-import binascii
-from osv import fields, osv
-from tools.translate import _
-import tools
-
-class project_tasks(osv.osv):
-    _inherit = 'project.task'
-
-    def message_new(self, cr, uid, msg, custom_values=None, context=None):
-        """ Overrides mail_thread message_new that is called by the mailgateway
-            through message_process.
-            This override updates the document according to the email.
-        """
-        if custom_values is None: custom_values = {}
-        custom_values.update({
-            'name': subject,
-            'planned_hours': 0.0,
-            'subject': msg.get('subject'),
-        })
-        custom_values.update(self.message_partner_by_email(cr, uid, msg.get('from', False), context=context))
-        return super(project_tasks,self).message_new(cr, uid, msg, custom_values=custom_values, context=context)
-
-    def message_update(self, cr, uid, ids, msg, update_vals=None, context=None):
-        """ Overrides mail_thread message_update that is called by the mailgateway
-            through message_process.
-            This method updates the task according to the email.
-        """
-        if update_vals is None: update_vals = {}
-        act = False
-        maps = {
-            'cost':'planned_hours',
-        }
-        for line in msg['body_text'].split('\n'):
-            line = line.strip()
-            res = tools.misc.command_re.match(line)
-            if res:
-                match = res.group(1).lower()
-                field = maps.get(match)
-                if field:
-                    try:
-                        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(project_tasks,self).message_update(cr, uid, msg, update_vals=update_vals, context=context)
-
-    def message_thread_followers(self, cr, uid, ids, context=None):
-        followers = super(project_tasks,self).message_thread_followers(cr, uid, ids, context=context)
-        for task in self.browse(cr, uid, followers.keys(), context=context):
-            task_followers = set(followers[task.id])
-            task_followers.add(task.user_id.email)
-            followers[task.id] = filter(None, task_followers)
-        return followers
-
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/project_mrp/__openerp__.py b/addons/project_mrp/__openerp__.py
index 5c818a57e7a..dd20c1c9c1e 100644
--- a/addons/project_mrp/__openerp__.py
+++ b/addons/project_mrp/__openerp__.py
@@ -23,7 +23,7 @@
 {
     'name': 'Create Tasks on SO',
     'version': '1.0',
-    "category": "Project Management",
+    'category': 'Project Management',
     'description': """
 Automatically creates project tasks from procurement lines.
 ===========================================================
@@ -50,9 +50,8 @@ task is completed.
     'website': 'http://www.openerp.com',
     'images': ['images/product.jpeg', 'images/task_from_SO.jpeg'],
     'depends': ['project', 'procurement', 'sale', 'mrp_jit'],
-    'init_xml': [],
-    'update_xml': ['project_mrp_workflow.xml', 'process/project_mrp_process.xml', 'project_mrp_view.xml'],
-    'demo_xml': ['project_mrp_demo.xml'],
+    'data': ['project_mrp_workflow.xml', 'process/project_mrp_process.xml', 'project_mrp_view.xml'],
+    'demo': ['project_mrp_demo.xml'],
     'test': ['test/project_task_procurement.yml'],
     'installable': True,
     'auto_install': False,
diff --git a/addons/project_mrp/i18n/ar.po b/addons/project_mrp/i18n/ar.po
index dc0537a5152..312c789f7c8 100644
--- a/addons/project_mrp/i18n/ar.po
+++ b/addons/project_mrp/i18n/ar.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:15+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:21+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project_mrp
 #: sql_constraint:sale.order:0
diff --git a/addons/project_mrp/i18n/bg.po b/addons/project_mrp/i18n/bg.po
index 1e8cd00aa42..eb68e89a07e 100644
--- a/addons/project_mrp/i18n/bg.po
+++ b/addons/project_mrp/i18n/bg.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:15+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:21+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project_mrp
 #: sql_constraint:sale.order:0
diff --git a/addons/project_mrp/i18n/bs.po b/addons/project_mrp/i18n/bs.po
index 767450788eb..749ade89030 100644
--- a/addons/project_mrp/i18n/bs.po
+++ b/addons/project_mrp/i18n/bs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:15+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:21+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project_mrp
 #: sql_constraint:sale.order:0
diff --git a/addons/project_mrp/i18n/ca.po b/addons/project_mrp/i18n/ca.po
index 405482af0fc..3a35b355daa 100644
--- a/addons/project_mrp/i18n/ca.po
+++ b/addons/project_mrp/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:15+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:21+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project_mrp
 #: sql_constraint:sale.order:0
diff --git a/addons/project_mrp/i18n/cs.po b/addons/project_mrp/i18n/cs.po
index 597588e106b..f004821ba7f 100644
--- a/addons/project_mrp/i18n/cs.po
+++ b/addons/project_mrp/i18n/cs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:15+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:21+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 "X-Poedit-Language: Czech\n"
 
 #. module: project_mrp
diff --git a/addons/project_mrp/i18n/da.po b/addons/project_mrp/i18n/da.po
index 8c8061575cc..a8a8f00f2f6 100644
--- a/addons/project_mrp/i18n/da.po
+++ b/addons/project_mrp/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:15+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:21+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project_mrp
 #: sql_constraint:sale.order:0
diff --git a/addons/project_mrp/i18n/de.po b/addons/project_mrp/i18n/de.po
index 71e8c527f9f..04c90f6379b 100644
--- a/addons/project_mrp/i18n/de.po
+++ b/addons/project_mrp/i18n/de.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:15+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:21+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project_mrp
 #: sql_constraint:sale.order:0
diff --git a/addons/project_mrp/i18n/el.po b/addons/project_mrp/i18n/el.po
index b55aae89db0..318960dea0f 100644
--- a/addons/project_mrp/i18n/el.po
+++ b/addons/project_mrp/i18n/el.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:16+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:21+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
 "X-Poedit-SourceCharset: utf-8\n"
diff --git a/addons/project_mrp/i18n/es.po b/addons/project_mrp/i18n/es.po
index e5786ab41e7..2f2e086918f 100644
--- a/addons/project_mrp/i18n/es.po
+++ b/addons/project_mrp/i18n/es.po
@@ -8,13 +8,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 00:37+0000\n"
 "PO-Revision-Date: 2012-02-15 20:01+0000\n"
-"Last-Translator: Carlos @ smile-iberia <Unknown>\n"
+"Last-Translator: Carlos Ch. <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: 2012-08-07 05:16+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:21+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project_mrp
 #: sql_constraint:sale.order:0
diff --git a/addons/project_mrp/i18n/es_AR.po b/addons/project_mrp/i18n/es_AR.po
index ce5344cf8ea..0734bc683f6 100644
--- a/addons/project_mrp/i18n/es_AR.po
+++ b/addons/project_mrp/i18n/es_AR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:16+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:21+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project_mrp
 #: sql_constraint:sale.order:0
diff --git a/addons/project_mrp/i18n/es_CR.po b/addons/project_mrp/i18n/es_CR.po
index 1852b2ff4ed..060f309e8de 100644
--- a/addons/project_mrp/i18n/es_CR.po
+++ b/addons/project_mrp/i18n/es_CR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:16+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:21+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 "Language: \n"
 
 #. module: project_mrp
diff --git a/addons/project_mrp/i18n/es_EC.po b/addons/project_mrp/i18n/es_EC.po
index 4ec7d5450c8..0b130511886 100644
--- a/addons/project_mrp/i18n/es_EC.po
+++ b/addons/project_mrp/i18n/es_EC.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:16+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:21+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project_mrp
 #: sql_constraint:sale.order:0
diff --git a/addons/project_mrp/i18n/et.po b/addons/project_mrp/i18n/et.po
index 633d3a971a9..c35efbe0b0a 100644
--- a/addons/project_mrp/i18n/et.po
+++ b/addons/project_mrp/i18n/et.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:15+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:21+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project_mrp
 #: sql_constraint:sale.order:0
diff --git a/addons/project_mrp/i18n/fi.po b/addons/project_mrp/i18n/fi.po
index c408a056a5f..c998777db9d 100644
--- a/addons/project_mrp/i18n/fi.po
+++ b/addons/project_mrp/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:15+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:21+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project_mrp
 #: sql_constraint:sale.order:0
diff --git a/addons/project_mrp/i18n/fr.po b/addons/project_mrp/i18n/fr.po
index 0c2d32ec89d..bb7d7c89b04 100644
--- a/addons/project_mrp/i18n/fr.po
+++ b/addons/project_mrp/i18n/fr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:15+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:21+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project_mrp
 #: sql_constraint:sale.order:0
diff --git a/addons/project_mrp/i18n/gl.po b/addons/project_mrp/i18n/gl.po
index daa8b92bc8d..f4f8e637882 100644
--- a/addons/project_mrp/i18n/gl.po
+++ b/addons/project_mrp/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:16+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:21+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project_mrp
 #: sql_constraint:sale.order:0
diff --git a/addons/project_mrp/i18n/gu.po b/addons/project_mrp/i18n/gu.po
index d16d7e0851b..a168b3d45a7 100644
--- a/addons/project_mrp/i18n/gu.po
+++ b/addons/project_mrp/i18n/gu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:16+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:21+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project_mrp
 #: sql_constraint:sale.order:0
diff --git a/addons/project_mrp/i18n/hr.po b/addons/project_mrp/i18n/hr.po
index 09b1d047a62..fe845f845b7 100644
--- a/addons/project_mrp/i18n/hr.po
+++ b/addons/project_mrp/i18n/hr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:16+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:21+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 "Language: hr\n"
 
 #. module: project_mrp
diff --git a/addons/project_mrp/i18n/hu.po b/addons/project_mrp/i18n/hu.po
index 2232dca926d..791d39ae8b0 100644
--- a/addons/project_mrp/i18n/hu.po
+++ b/addons/project_mrp/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:16+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:21+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project_mrp
 #: sql_constraint:sale.order:0
diff --git a/addons/project_mrp/i18n/id.po b/addons/project_mrp/i18n/id.po
index 9866b23d458..9359e90da79 100644
--- a/addons/project_mrp/i18n/id.po
+++ b/addons/project_mrp/i18n/id.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:16+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:21+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project_mrp
 #: sql_constraint:sale.order:0
diff --git a/addons/project_mrp/i18n/it.po b/addons/project_mrp/i18n/it.po
index 16bccd7c0d5..8730d80a3f1 100644
--- a/addons/project_mrp/i18n/it.po
+++ b/addons/project_mrp/i18n/it.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:16+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:21+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project_mrp
 #: sql_constraint:sale.order:0
diff --git a/addons/project_mrp/i18n/ja.po b/addons/project_mrp/i18n/ja.po
index 629082364ca..c1962584c81 100644
--- a/addons/project_mrp/i18n/ja.po
+++ b/addons/project_mrp/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:16+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:21+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project_mrp
 #: sql_constraint:sale.order:0
diff --git a/addons/project_mrp/i18n/ko.po b/addons/project_mrp/i18n/ko.po
index 0b4cf0d024d..45e321be424 100644
--- a/addons/project_mrp/i18n/ko.po
+++ b/addons/project_mrp/i18n/ko.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:16+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:21+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project_mrp
 #: sql_constraint:sale.order:0
diff --git a/addons/project_mrp/i18n/lt.po b/addons/project_mrp/i18n/lt.po
index 7bd08666ba8..749ade89030 100644
--- a/addons/project_mrp/i18n/lt.po
+++ b/addons/project_mrp/i18n/lt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:16+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:21+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project_mrp
 #: sql_constraint:sale.order:0
diff --git a/addons/project_mrp/i18n/lv.po b/addons/project_mrp/i18n/lv.po
index 773b32d7d1c..194348b16fe 100644
--- a/addons/project_mrp/i18n/lv.po
+++ b/addons/project_mrp/i18n/lv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:16+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:21+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project_mrp
 #: sql_constraint:sale.order:0
diff --git a/addons/project_mrp/i18n/mn.po b/addons/project_mrp/i18n/mn.po
index 5a9bfd3e97d..c848982aa80 100644
--- a/addons/project_mrp/i18n/mn.po
+++ b/addons/project_mrp/i18n/mn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:16+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:21+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project_mrp
 #: sql_constraint:sale.order:0
diff --git a/addons/project_mrp/i18n/nb.po b/addons/project_mrp/i18n/nb.po
index 294f813998b..1cb55a5b712 100644
--- a/addons/project_mrp/i18n/nb.po
+++ b/addons/project_mrp/i18n/nb.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-13 05:25+0000\n"
-"X-Generator: Launchpad (build 15791)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:21+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project_mrp
 #: sql_constraint:sale.order:0
diff --git a/addons/project_mrp/i18n/nl.po b/addons/project_mrp/i18n/nl.po
index b04001a41ee..364e0007207 100644
--- a/addons/project_mrp/i18n/nl.po
+++ b/addons/project_mrp/i18n/nl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:15+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:21+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project_mrp
 #: sql_constraint:sale.order:0
diff --git a/addons/project_mrp/i18n/nl_BE.po b/addons/project_mrp/i18n/nl_BE.po
index 1cd96626e62..53151538154 100644
--- a/addons/project_mrp/i18n/nl_BE.po
+++ b/addons/project_mrp/i18n/nl_BE.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:16+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:21+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project_mrp
 #: sql_constraint:sale.order:0
diff --git a/addons/project_mrp/i18n/pl.po b/addons/project_mrp/i18n/pl.po
index 6f1de02aa68..3bf66f1b8c9 100644
--- a/addons/project_mrp/i18n/pl.po
+++ b/addons/project_mrp/i18n/pl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:16+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:21+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project_mrp
 #: sql_constraint:sale.order:0
diff --git a/addons/project_mrp/i18n/pt.po b/addons/project_mrp/i18n/pt.po
index 12793bec0b4..00e15b8244e 100644
--- a/addons/project_mrp/i18n/pt.po
+++ b/addons/project_mrp/i18n/pt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:16+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:21+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project_mrp
 #: sql_constraint:sale.order:0
diff --git a/addons/project_mrp/i18n/pt_BR.po b/addons/project_mrp/i18n/pt_BR.po
index 537e828f337..eedf32b50f3 100644
--- a/addons/project_mrp/i18n/pt_BR.po
+++ b/addons/project_mrp/i18n/pt_BR.po
@@ -14,13 +14,13 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:16+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:21+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project_mrp
 #: sql_constraint:sale.order:0
 msgid "Order Reference must be unique per Company!"
-msgstr ""
+msgstr "Referência de ordem deve ser única por empresa!"
 
 #. module: project_mrp
 #: model:process.node,note:project_mrp.process_node_procuretasktask0
@@ -35,12 +35,12 @@ msgstr "Taréfa de Aquisição"
 #. module: project_mrp
 #: model:ir.model,name:project_mrp.model_sale_order
 msgid "Sales Order"
-msgstr ""
+msgstr "Pedido de Venda"
 
 #. module: project_mrp
 #: field:procurement.order,sale_line_id:0
 msgid "Sale order line"
-msgstr ""
+msgstr "Linha do pedido de venda"
 
 #. module: project_mrp
 #: model:process.transition,note:project_mrp.process_transition_createtask0
@@ -55,7 +55,7 @@ msgstr "Se o tipo de produto é 'serviço' então isto cria a tarefa"
 #. module: project_mrp
 #: constraint:project.task:0
 msgid "Error ! Task end-date must be greater then task start-date"
-msgstr ""
+msgstr "Erro ! A data final deve ser maior do que a data inicial"
 
 #. module: project_mrp
 #: model:process.node,name:project_mrp.process_node_saleordertask0
@@ -126,7 +126,7 @@ msgstr "No caso de venda de serviços no Pedido de Venda"
 #. module: project_mrp
 #: field:project.task,sale_line_id:0
 msgid "Sale Order Line"
-msgstr ""
+msgstr "Linha do Pedido de Venda"
 
 #~ msgid "Procurement and Project Management integration"
 #~ msgstr "Integração de Aquisição e Gerenciamento de Projeto"
diff --git a/addons/project_mrp/i18n/ro.po b/addons/project_mrp/i18n/ro.po
index 81bec283b8f..af1b1473cdf 100644
--- a/addons/project_mrp/i18n/ro.po
+++ b/addons/project_mrp/i18n/ro.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:16+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:21+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project_mrp
 #: sql_constraint:sale.order:0
diff --git a/addons/project_mrp/i18n/ru.po b/addons/project_mrp/i18n/ru.po
index 189b0d58f8a..c33cf3d1840 100644
--- a/addons/project_mrp/i18n/ru.po
+++ b/addons/project_mrp/i18n/ru.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:16+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:21+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project_mrp
 #: sql_constraint:sale.order:0
diff --git a/addons/project_mrp/i18n/sl.po b/addons/project_mrp/i18n/sl.po
index ed66fb3fb34..83e14b5295c 100644
--- a/addons/project_mrp/i18n/sl.po
+++ b/addons/project_mrp/i18n/sl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:16+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:21+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project_mrp
 #: sql_constraint:sale.order:0
diff --git a/addons/project_mrp/i18n/sq.po b/addons/project_mrp/i18n/sq.po
index eed0dc7c6f3..5e4033e5006 100644
--- a/addons/project_mrp/i18n/sq.po
+++ b/addons/project_mrp/i18n/sq.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:15+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:21+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project_mrp
 #: sql_constraint:sale.order:0
diff --git a/addons/project_mrp/i18n/sv.po b/addons/project_mrp/i18n/sv.po
index 4dd67665fef..15e8506a49a 100644
--- a/addons/project_mrp/i18n/sv.po
+++ b/addons/project_mrp/i18n/sv.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:16+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:21+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project_mrp
 #: sql_constraint:sale.order:0
diff --git a/addons/project_mrp/i18n/tlh.po b/addons/project_mrp/i18n/tlh.po
index 1d6550840e2..4785da87baf 100644
--- a/addons/project_mrp/i18n/tlh.po
+++ b/addons/project_mrp/i18n/tlh.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:16+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:21+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project_mrp
 #: sql_constraint:sale.order:0
diff --git a/addons/project_mrp/i18n/tr.po b/addons/project_mrp/i18n/tr.po
index 3c1bf8bce85..13c7813bb95 100644
--- a/addons/project_mrp/i18n/tr.po
+++ b/addons/project_mrp/i18n/tr.po
@@ -13,48 +13,48 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:16+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:21+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project_mrp
 #: sql_constraint:sale.order:0
 msgid "Order Reference must be unique per Company!"
-msgstr ""
+msgstr "Sipariş Kaynağı Her Şirket İçin Eşsiz Olmalı!"
 
 #. module: project_mrp
 #: model:process.node,note:project_mrp.process_node_procuretasktask0
 msgid "For each product, on type service and on order"
-msgstr ""
+msgstr "Her bir ürün için, hizmet türü ve sipariş"
 
 #. module: project_mrp
 #: model:process.transition,name:project_mrp.process_transition_procuretask0
 msgid "Procurement Task"
-msgstr ""
+msgstr "Satınalma Görevi"
 
 #. module: project_mrp
 #: model:ir.model,name:project_mrp.model_sale_order
 msgid "Sales Order"
-msgstr ""
+msgstr "Satış Siparişi"
 
 #. module: project_mrp
 #: field:procurement.order,sale_line_id:0
 msgid "Sale order line"
-msgstr ""
+msgstr "Satış Siparişi Satırı"
 
 #. module: project_mrp
 #: model:process.transition,note:project_mrp.process_transition_createtask0
 msgid "Product type is service, then its creates the task."
-msgstr ""
+msgstr "Ürün türü hizmettir, sonra görev oluşturur."
 
 #. module: project_mrp
 #: model:process.transition,note:project_mrp.process_transition_procuretask0
 msgid "if product type is 'service' then it creates the task."
-msgstr ""
+msgstr "Ürün türü 'hizmet' ise görevi oluşturur."
 
 #. module: project_mrp
 #: constraint:project.task:0
 msgid "Error ! Task end-date must be greater then task start-date"
-msgstr ""
+msgstr "Hata! görev bitiş tarihi başlangıç tarihinden sonra olmalı"
 
 #. module: project_mrp
 #: model:process.node,name:project_mrp.process_node_saleordertask0
@@ -93,7 +93,7 @@ msgstr "Görev"
 #. module: project_mrp
 #: model:process.node,note:project_mrp.process_node_mrptask0
 msgid "A task is created to provide the service."
-msgstr ""
+msgstr "Hizmetin sağlanması için bir görev oluşturuldu."
 
 #. module: project_mrp
 #: model:process.transition,name:project_mrp.process_transition_ordertask0
@@ -103,7 +103,7 @@ msgstr "Sipariş Görevi"
 #. module: project_mrp
 #: constraint:project.task:0
 msgid "Error ! You cannot create recursive tasks."
-msgstr ""
+msgstr "Hata ! Yinelenen görevler oluşturamazsınız."
 
 #. module: project_mrp
 #: model:process.transition,name:project_mrp.process_transition_createtask0
@@ -113,17 +113,17 @@ msgstr "Görev Oluştur"
 #. module: project_mrp
 #: model:process.transition,note:project_mrp.process_transition_ordertask0
 msgid "If procurement method is Make to order and supply method is produce"
-msgstr ""
+msgstr "Eğer satınalma yöntemi sipariş etmek ve tedarik yöntemi üretmekse"
 
 #. module: project_mrp
 #: model:process.node,note:project_mrp.process_node_saleordertask0
 msgid "In case you sell services on sale order"
-msgstr ""
+msgstr "Satış siparişi üzerine hizmet satılması durumunda"
 
 #. module: project_mrp
 #: field:project.task,sale_line_id:0
 msgid "Sale Order Line"
-msgstr ""
+msgstr "Satış Sipariş Satırı"
 
 #~ msgid "Project Management - MRP and Sale Integration"
 #~ msgstr "Proje Yönetimi - MRP ve Satış Entegrasyonu"
diff --git a/addons/project_mrp/i18n/uk.po b/addons/project_mrp/i18n/uk.po
index 9456673aece..0fa4ae4d2f9 100644
--- a/addons/project_mrp/i18n/uk.po
+++ b/addons/project_mrp/i18n/uk.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:16+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:21+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project_mrp
 #: sql_constraint:sale.order:0
diff --git a/addons/project_mrp/i18n/vi.po b/addons/project_mrp/i18n/vi.po
index 817f2857aeb..a734b642dc2 100644
--- a/addons/project_mrp/i18n/vi.po
+++ b/addons/project_mrp/i18n/vi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:16+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:21+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project_mrp
 #: sql_constraint:sale.order:0
diff --git a/addons/project_mrp/i18n/zh_CN.po b/addons/project_mrp/i18n/zh_CN.po
index 5cbe79bf5c9..3b8fa378ffd 100644
--- a/addons/project_mrp/i18n/zh_CN.po
+++ b/addons/project_mrp/i18n/zh_CN.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:16+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:21+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project_mrp
 #: sql_constraint:sale.order:0
diff --git a/addons/project_mrp/i18n/zh_TW.po b/addons/project_mrp/i18n/zh_TW.po
index 728f3b3d4f3..0b6a42a2a42 100644
--- a/addons/project_mrp/i18n/zh_TW.po
+++ b/addons/project_mrp/i18n/zh_TW.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:16+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:21+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project_mrp
 #: sql_constraint:sale.order:0
diff --git a/addons/project_mrp/project_mrp_view.xml b/addons/project_mrp/project_mrp_view.xml
index ffceb33a611..f9e761117b6 100644
--- a/addons/project_mrp/project_mrp_view.xml
+++ b/addons/project_mrp/project_mrp_view.xml
@@ -14,10 +14,10 @@
         <record id="view_product_task_form" model="ir.ui.view">
             <field name="name">product.form.view.inherit</field>
             <field name="model">product.product</field>
-            <field name="inherit_id" ref="product.product_normal_form_view"/>
+            <field name="inherit_id" ref="stock.view_normal_procurement_locations_form"/>
             <field name="arch" type="xml">
-                <field name="active" position="after">
-                    <field name="project_id" attrs="{'readonly':[('type','!=','service')]}" />
+                <field name="type" position="after">
+                    <field name="project_id" attrs="{'invisible':[('type','!=','service')]}" />
                 </field>
             </field>
         </record>
diff --git a/addons/project_retro_planning/__openerp__.py b/addons/project_retro_planning/__openerp__.py
index f5fa2d11d89..e3e7a444676 100644
--- a/addons/project_retro_planning/__openerp__.py
+++ b/addons/project_retro_planning/__openerp__.py
@@ -32,12 +32,9 @@ the tasks will change accordingly.
     """,
     'author': 'OpenERP SA',
     'depends': ['base', 'project'],
-    'init_xml': [],
-    'update_xml': [],
-    'demo_xml': [],
-    'test' : [
-              'test/deadline_change.yml'
-              ],
+    'data': [],
+    'demo': [],
+    'test': ['test/deadline_change.yml'],
     'installable': True,
     'auto_install': False,
     'certificate': '0057235475485',
diff --git a/addons/project_scrum/i18n/ar.po b/addons/project_scrum/i18n/ar.po
index 1b5ea1e3277..5c348927adb 100644
--- a/addons/project_scrum/i18n/ar.po
+++ b/addons/project_scrum/i18n/ar.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:54+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:01+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project_scrum
 #: view:project.scrum.backlog.assign.sprint:0
diff --git a/addons/project_scrum/i18n/bg.po b/addons/project_scrum/i18n/bg.po
index bfd36eb06e4..393f49f1a67 100644
--- a/addons/project_scrum/i18n/bg.po
+++ b/addons/project_scrum/i18n/bg.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:54+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:01+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project_scrum
 #: view:project.scrum.backlog.assign.sprint:0
diff --git a/addons/project_scrum/i18n/bs.po b/addons/project_scrum/i18n/bs.po
index d797af71fdf..5c7d468125d 100644
--- a/addons/project_scrum/i18n/bs.po
+++ b/addons/project_scrum/i18n/bs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:54+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:01+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project_scrum
 #: view:project.scrum.backlog.assign.sprint:0
diff --git a/addons/project_scrum/i18n/ca.po b/addons/project_scrum/i18n/ca.po
index f756948a6f1..85d04c16e3a 100644
--- a/addons/project_scrum/i18n/ca.po
+++ b/addons/project_scrum/i18n/ca.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:54+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:01+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project_scrum
 #: view:project.scrum.backlog.assign.sprint:0
diff --git a/addons/project_scrum/i18n/cs.po b/addons/project_scrum/i18n/cs.po
index 361e599df1c..1ec471a21b3 100644
--- a/addons/project_scrum/i18n/cs.po
+++ b/addons/project_scrum/i18n/cs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:54+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:01+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project_scrum
 #: view:project.scrum.backlog.assign.sprint:0
diff --git a/addons/project_scrum/i18n/da.po b/addons/project_scrum/i18n/da.po
index 25a7bbec9d3..5397dd0a4e5 100644
--- a/addons/project_scrum/i18n/da.po
+++ b/addons/project_scrum/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:54+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:01+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project_scrum
 #: view:project.scrum.backlog.assign.sprint:0
diff --git a/addons/project_scrum/i18n/de.po b/addons/project_scrum/i18n/de.po
index e4c3407f6c4..dca01e7560d 100644
--- a/addons/project_scrum/i18n/de.po
+++ b/addons/project_scrum/i18n/de.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:54+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:01+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project_scrum
 #: view:project.scrum.backlog.assign.sprint:0
diff --git a/addons/project_scrum/i18n/el.po b/addons/project_scrum/i18n/el.po
index 18dea3e2769..10755d151d4 100644
--- a/addons/project_scrum/i18n/el.po
+++ b/addons/project_scrum/i18n/el.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:54+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:01+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project_scrum
 #: view:project.scrum.backlog.assign.sprint:0
diff --git a/addons/project_scrum/i18n/es.po b/addons/project_scrum/i18n/es.po
index 0973a9ffd0b..f80c1160f68 100644
--- a/addons/project_scrum/i18n/es.po
+++ b/addons/project_scrum/i18n/es.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:55+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:02+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project_scrum
 #: view:project.scrum.backlog.assign.sprint:0
diff --git a/addons/project_scrum/i18n/es_AR.po b/addons/project_scrum/i18n/es_AR.po
index 595d6ae4a9a..ad1b45a9e10 100644
--- a/addons/project_scrum/i18n/es_AR.po
+++ b/addons/project_scrum/i18n/es_AR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:55+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:02+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project_scrum
 #: view:project.scrum.backlog.assign.sprint:0
diff --git a/addons/project_scrum/i18n/et.po b/addons/project_scrum/i18n/et.po
index c4efe9af353..0ac9fcca876 100644
--- a/addons/project_scrum/i18n/et.po
+++ b/addons/project_scrum/i18n/et.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:54+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:01+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project_scrum
 #: view:project.scrum.backlog.assign.sprint:0
diff --git a/addons/project_scrum/i18n/fr.po b/addons/project_scrum/i18n/fr.po
index 67f80b97fa2..819c50f4bc3 100644
--- a/addons/project_scrum/i18n/fr.po
+++ b/addons/project_scrum/i18n/fr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:54+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:01+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project_scrum
 #: view:project.scrum.backlog.assign.sprint:0
diff --git a/addons/project_scrum/i18n/gu.po b/addons/project_scrum/i18n/gu.po
index 1c738d822ab..05d7f4c8e69 100644
--- a/addons/project_scrum/i18n/gu.po
+++ b/addons/project_scrum/i18n/gu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:54+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:01+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project_scrum
 #: view:project.scrum.backlog.assign.sprint:0
diff --git a/addons/project_scrum/i18n/hr.po b/addons/project_scrum/i18n/hr.po
index 878bbb50416..ebaf115403e 100644
--- a/addons/project_scrum/i18n/hr.po
+++ b/addons/project_scrum/i18n/hr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:55+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:02+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project_scrum
 #: view:project.scrum.backlog.assign.sprint:0
diff --git a/addons/project_scrum/i18n/hu.po b/addons/project_scrum/i18n/hu.po
index 4645628487a..9accd22676e 100644
--- a/addons/project_scrum/i18n/hu.po
+++ b/addons/project_scrum/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:54+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:01+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project_scrum
 #: view:project.scrum.backlog.assign.sprint:0
diff --git a/addons/project_scrum/i18n/id.po b/addons/project_scrum/i18n/id.po
index 2315ac4c12d..d1b1744494a 100644
--- a/addons/project_scrum/i18n/id.po
+++ b/addons/project_scrum/i18n/id.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:54+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:01+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project_scrum
 #: view:project.scrum.backlog.assign.sprint:0
diff --git a/addons/project_scrum/i18n/it.po b/addons/project_scrum/i18n/it.po
index 7e3edea2370..04a1f775e15 100644
--- a/addons/project_scrum/i18n/it.po
+++ b/addons/project_scrum/i18n/it.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:54+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:01+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project_scrum
 #: view:project.scrum.backlog.assign.sprint:0
diff --git a/addons/project_scrum/i18n/ja.po b/addons/project_scrum/i18n/ja.po
index 928ba2ed0e8..4848105e31f 100644
--- a/addons/project_scrum/i18n/ja.po
+++ b/addons/project_scrum/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:54+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:01+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project_scrum
 #: view:project.scrum.backlog.assign.sprint:0
diff --git a/addons/project_scrum/i18n/ko.po b/addons/project_scrum/i18n/ko.po
index 7855477c329..e8eb624cdbd 100644
--- a/addons/project_scrum/i18n/ko.po
+++ b/addons/project_scrum/i18n/ko.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:54+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:01+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project_scrum
 #: view:project.scrum.backlog.assign.sprint:0
diff --git a/addons/project_scrum/i18n/lt.po b/addons/project_scrum/i18n/lt.po
index af20260e598..1c6935bb0bd 100644
--- a/addons/project_scrum/i18n/lt.po
+++ b/addons/project_scrum/i18n/lt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:54+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:02+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project_scrum
 #: view:project.scrum.backlog.assign.sprint:0
diff --git a/addons/project_scrum/i18n/nl.po b/addons/project_scrum/i18n/nl.po
index f4ff5f0128c..2e702ea07d7 100644
--- a/addons/project_scrum/i18n/nl.po
+++ b/addons/project_scrum/i18n/nl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:54+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:01+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project_scrum
 #: view:project.scrum.backlog.assign.sprint:0
diff --git a/addons/project_scrum/i18n/nl_BE.po b/addons/project_scrum/i18n/nl_BE.po
index eb4669fd6c4..5e13b5fa08e 100644
--- a/addons/project_scrum/i18n/nl_BE.po
+++ b/addons/project_scrum/i18n/nl_BE.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:55+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:02+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project_scrum
 #: view:project.scrum.backlog.assign.sprint:0
diff --git a/addons/project_scrum/i18n/pl.po b/addons/project_scrum/i18n/pl.po
index f55f32ee12b..59746af755a 100644
--- a/addons/project_scrum/i18n/pl.po
+++ b/addons/project_scrum/i18n/pl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:54+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:02+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project_scrum
 #: view:project.scrum.backlog.assign.sprint:0
diff --git a/addons/project_scrum/i18n/pt.po b/addons/project_scrum/i18n/pt.po
index 02ffe5d02af..91cc4545d7f 100644
--- a/addons/project_scrum/i18n/pt.po
+++ b/addons/project_scrum/i18n/pt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:55+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:02+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project_scrum
 #: view:project.scrum.backlog.assign.sprint:0
diff --git a/addons/project_scrum/i18n/pt_BR.po b/addons/project_scrum/i18n/pt_BR.po
index cf7762eda0c..397992f01c7 100644
--- a/addons/project_scrum/i18n/pt_BR.po
+++ b/addons/project_scrum/i18n/pt_BR.po
@@ -8,13 +8,14 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 00:37+0000\n"
 "PO-Revision-Date: 2012-07-28 20:36+0000\n"
-"Last-Translator: Fábio Martinelli <webmaster@guaru.net>\n"
+"Last-Translator: Fábio Martinelli - http://zupy.com.br "
+"<webmaster@guaru.net>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:55+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:02+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project_scrum
 #: view:project.scrum.backlog.assign.sprint:0
diff --git a/addons/project_scrum/i18n/ro.po b/addons/project_scrum/i18n/ro.po
index d0b888f8ed4..1c6935bb0bd 100644
--- a/addons/project_scrum/i18n/ro.po
+++ b/addons/project_scrum/i18n/ro.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:55+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:02+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project_scrum
 #: view:project.scrum.backlog.assign.sprint:0
diff --git a/addons/project_scrum/i18n/ru.po b/addons/project_scrum/i18n/ru.po
index be5082a2645..300c1c665d0 100644
--- a/addons/project_scrum/i18n/ru.po
+++ b/addons/project_scrum/i18n/ru.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:55+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:02+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project_scrum
 #: view:project.scrum.backlog.assign.sprint:0
diff --git a/addons/project_scrum/i18n/sl.po b/addons/project_scrum/i18n/sl.po
index 02f03511b46..2e11b8d6968 100644
--- a/addons/project_scrum/i18n/sl.po
+++ b/addons/project_scrum/i18n/sl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:55+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:02+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project_scrum
 #: view:project.scrum.backlog.assign.sprint:0
diff --git a/addons/project_scrum/i18n/sq.po b/addons/project_scrum/i18n/sq.po
index 8745a10af15..c43eacb13ce 100644
--- a/addons/project_scrum/i18n/sq.po
+++ b/addons/project_scrum/i18n/sq.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:54+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:01+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project_scrum
 #: view:project.scrum.backlog.assign.sprint:0
diff --git a/addons/project_scrum/i18n/sv.po b/addons/project_scrum/i18n/sv.po
index 9b9a3db0692..d166e31e503 100644
--- a/addons/project_scrum/i18n/sv.po
+++ b/addons/project_scrum/i18n/sv.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:55+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:02+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project_scrum
 #: view:project.scrum.backlog.assign.sprint:0
diff --git a/addons/project_scrum/i18n/tlh.po b/addons/project_scrum/i18n/tlh.po
index de562fb1e10..a8a2db3dc9a 100644
--- a/addons/project_scrum/i18n/tlh.po
+++ b/addons/project_scrum/i18n/tlh.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:55+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:02+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project_scrum
 #: view:project.scrum.backlog.assign.sprint:0
diff --git a/addons/project_scrum/i18n/tr.po b/addons/project_scrum/i18n/tr.po
index 85a567adf65..2e6228f10ab 100644
--- a/addons/project_scrum/i18n/tr.po
+++ b/addons/project_scrum/i18n/tr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:55+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:02+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project_scrum
 #: view:project.scrum.backlog.assign.sprint:0
diff --git a/addons/project_scrum/i18n/uk.po b/addons/project_scrum/i18n/uk.po
index 595c48510d4..f19f17ecccd 100644
--- a/addons/project_scrum/i18n/uk.po
+++ b/addons/project_scrum/i18n/uk.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:55+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:02+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project_scrum
 #: view:project.scrum.backlog.assign.sprint:0
diff --git a/addons/project_scrum/i18n/vi.po b/addons/project_scrum/i18n/vi.po
index 145c86a85c3..9081ac58546 100644
--- a/addons/project_scrum/i18n/vi.po
+++ b/addons/project_scrum/i18n/vi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:55+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:02+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project_scrum
 #: view:project.scrum.backlog.assign.sprint:0
diff --git a/addons/project_scrum/i18n/zh_CN.po b/addons/project_scrum/i18n/zh_CN.po
index 7b5d707917d..07ba8d6271c 100644
--- a/addons/project_scrum/i18n/zh_CN.po
+++ b/addons/project_scrum/i18n/zh_CN.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:55+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:02+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project_scrum
 #: view:project.scrum.backlog.assign.sprint:0
diff --git a/addons/project_scrum/i18n/zh_TW.po b/addons/project_scrum/i18n/zh_TW.po
index 01c60a76d0d..ac4c4d29cad 100644
--- a/addons/project_scrum/i18n/zh_TW.po
+++ b/addons/project_scrum/i18n/zh_TW.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:55+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:02+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project_scrum
 #: view:project.scrum.backlog.assign.sprint:0
diff --git a/addons/project_timesheet/__openerp__.py b/addons/project_timesheet/__openerp__.py
index a55f67bda2c..805556c1a96 100644
--- a/addons/project_timesheet/__openerp__.py
+++ b/addons/project_timesheet/__openerp__.py
@@ -35,21 +35,20 @@ with the effect of creating, editing and deleting either ways.
     'website': 'http://www.openerp.com',
     'images': ['images/invoice_task_work.jpeg', 'images/my_timesheet.jpeg', 'images/working_hour.jpeg'],
     'depends': ['project', 'hr_timesheet_sheet', 'hr_timesheet_invoice', 'account_analytic_analysis'],
-    'init_xml': ['project_timesheet_data.xml'],
-    'update_xml': [
-        "security/ir.model.access.csv",
-        "security/project_timesheet_security.xml",
-        "process/project_timesheet_process.xml", 
-        "report/task_report_view.xml", 
-        "project_timesheet_view.xml",
-        ],
-    'demo_xml': ["project_timesheet_demo.xml"],
+    'data': [
+        'security/ir.model.access.csv',
+        'security/project_timesheet_security.xml',
+        'process/project_timesheet_process.xml',
+        'report/task_report_view.xml',
+        'project_timesheet_view.xml',
+    ],
+    'demo': ['project_timesheet_demo.xml'],
     'test': [
         'test/worktask_entry_to_timesheetline_entry.yml',
         'test/work_timesheet.yml',
     ],
     'installable': True,
-    'auto_install': False,
+    'auto_install': True,
     'certificate': '0075123647453',
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/project_timesheet/i18n/ar.po b/addons/project_timesheet/i18n/ar.po
index 9118c010849..1319aeb010d 100644
--- a/addons/project_timesheet/i18n/ar.po
+++ b/addons/project_timesheet/i18n/ar.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:52+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:24+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project_timesheet
 #: model:ir.actions.act_window,help:project_timesheet.action_project_timesheet_bill_task
diff --git a/addons/project_timesheet/i18n/bg.po b/addons/project_timesheet/i18n/bg.po
index d793f5fbf42..3389cbe057d 100644
--- a/addons/project_timesheet/i18n/bg.po
+++ b/addons/project_timesheet/i18n/bg.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:52+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:24+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project_timesheet
 #: model:ir.actions.act_window,help:project_timesheet.action_project_timesheet_bill_task
diff --git a/addons/project_timesheet/i18n/bs.po b/addons/project_timesheet/i18n/bs.po
index 400b1e7d956..e4f9451c6e8 100644
--- a/addons/project_timesheet/i18n/bs.po
+++ b/addons/project_timesheet/i18n/bs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:52+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:24+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project_timesheet
 #: model:ir.actions.act_window,help:project_timesheet.action_project_timesheet_bill_task
diff --git a/addons/project_timesheet/i18n/ca.po b/addons/project_timesheet/i18n/ca.po
index 372a9d5d99a..f50f35919b8 100644
--- a/addons/project_timesheet/i18n/ca.po
+++ b/addons/project_timesheet/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:52+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:24+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project_timesheet
 #: model:ir.actions.act_window,help:project_timesheet.action_project_timesheet_bill_task
diff --git a/addons/project_timesheet/i18n/cs.po b/addons/project_timesheet/i18n/cs.po
index e0157b13d45..f153804619b 100644
--- a/addons/project_timesheet/i18n/cs.po
+++ b/addons/project_timesheet/i18n/cs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:52+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:24+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project_timesheet
 #: model:ir.actions.act_window,help:project_timesheet.action_project_timesheet_bill_task
diff --git a/addons/project_timesheet/i18n/da.po b/addons/project_timesheet/i18n/da.po
index 0cdf25cb192..0126ccdedae 100644
--- a/addons/project_timesheet/i18n/da.po
+++ b/addons/project_timesheet/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:52+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:24+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project_timesheet
 #: model:ir.actions.act_window,help:project_timesheet.action_project_timesheet_bill_task
diff --git a/addons/project_timesheet/i18n/de.po b/addons/project_timesheet/i18n/de.po
index dfda3d91c68..8362ca0b627 100644
--- a/addons/project_timesheet/i18n/de.po
+++ b/addons/project_timesheet/i18n/de.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:52+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:24+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project_timesheet
 #: model:ir.actions.act_window,help:project_timesheet.action_project_timesheet_bill_task
diff --git a/addons/project_timesheet/i18n/el.po b/addons/project_timesheet/i18n/el.po
index a1d4a99cdec..f4e1c3aac3e 100644
--- a/addons/project_timesheet/i18n/el.po
+++ b/addons/project_timesheet/i18n/el.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:52+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:24+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
 "X-Poedit-SourceCharset: utf-8\n"
diff --git a/addons/project_timesheet/i18n/es.po b/addons/project_timesheet/i18n/es.po
index c9dfc0635b0..f2de5e041d0 100644
--- a/addons/project_timesheet/i18n/es.po
+++ b/addons/project_timesheet/i18n/es.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:52+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:24+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project_timesheet
 #: model:ir.actions.act_window,help:project_timesheet.action_project_timesheet_bill_task
diff --git a/addons/project_timesheet/i18n/es_AR.po b/addons/project_timesheet/i18n/es_AR.po
index fda58b5cf4a..102763a2ca7 100644
--- a/addons/project_timesheet/i18n/es_AR.po
+++ b/addons/project_timesheet/i18n/es_AR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:52+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:24+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project_timesheet
 #: model:ir.actions.act_window,help:project_timesheet.action_project_timesheet_bill_task
diff --git a/addons/project_timesheet/i18n/es_CR.po b/addons/project_timesheet/i18n/es_CR.po
index dca2e0a9aae..43cde80038f 100644
--- a/addons/project_timesheet/i18n/es_CR.po
+++ b/addons/project_timesheet/i18n/es_CR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:52+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:24+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 "Language: \n"
 
 #. module: project_timesheet
diff --git a/addons/project_timesheet/i18n/et.po b/addons/project_timesheet/i18n/et.po
index b175bd7f9ef..0ff339dba44 100644
--- a/addons/project_timesheet/i18n/et.po
+++ b/addons/project_timesheet/i18n/et.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:52+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:24+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project_timesheet
 #: model:ir.actions.act_window,help:project_timesheet.action_project_timesheet_bill_task
diff --git a/addons/project_timesheet/i18n/fi.po b/addons/project_timesheet/i18n/fi.po
index 915468d84ad..bc094ea8948 100644
--- a/addons/project_timesheet/i18n/fi.po
+++ b/addons/project_timesheet/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:52+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:24+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project_timesheet
 #: model:ir.actions.act_window,help:project_timesheet.action_project_timesheet_bill_task
diff --git a/addons/project_timesheet/i18n/fr.po b/addons/project_timesheet/i18n/fr.po
index 15eba9c8f57..11fe668e46e 100644
--- a/addons/project_timesheet/i18n/fr.po
+++ b/addons/project_timesheet/i18n/fr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:52+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:24+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project_timesheet
 #: model:ir.actions.act_window,help:project_timesheet.action_project_timesheet_bill_task
diff --git a/addons/project_timesheet/i18n/gl.po b/addons/project_timesheet/i18n/gl.po
index 05dddb18e62..826196448e7 100644
--- a/addons/project_timesheet/i18n/gl.po
+++ b/addons/project_timesheet/i18n/gl.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:52+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:24+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project_timesheet
 #: model:ir.actions.act_window,help:project_timesheet.action_project_timesheet_bill_task
diff --git a/addons/project_timesheet/i18n/hr.po b/addons/project_timesheet/i18n/hr.po
index bc94b9730a4..ca1ec014a1b 100644
--- a/addons/project_timesheet/i18n/hr.po
+++ b/addons/project_timesheet/i18n/hr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:52+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:24+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 "Language: hr\n"
 
 #. module: project_timesheet
diff --git a/addons/project_timesheet/i18n/hu.po b/addons/project_timesheet/i18n/hu.po
index 34a214047ab..6f5c93e0ed8 100644
--- a/addons/project_timesheet/i18n/hu.po
+++ b/addons/project_timesheet/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:52+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:24+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project_timesheet
 #: model:ir.actions.act_window,help:project_timesheet.action_project_timesheet_bill_task
diff --git a/addons/project_timesheet/i18n/id.po b/addons/project_timesheet/i18n/id.po
index 7af7445fae8..b465f22301f 100644
--- a/addons/project_timesheet/i18n/id.po
+++ b/addons/project_timesheet/i18n/id.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:52+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:24+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project_timesheet
 #: model:ir.actions.act_window,help:project_timesheet.action_project_timesheet_bill_task
diff --git a/addons/project_timesheet/i18n/it.po b/addons/project_timesheet/i18n/it.po
index 9bc45907a00..ce127938438 100644
--- a/addons/project_timesheet/i18n/it.po
+++ b/addons/project_timesheet/i18n/it.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:52+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:24+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project_timesheet
 #: model:ir.actions.act_window,help:project_timesheet.action_project_timesheet_bill_task
diff --git a/addons/project_timesheet/i18n/ja.po b/addons/project_timesheet/i18n/ja.po
index ee5b73d265b..2ea878f0a83 100644
--- a/addons/project_timesheet/i18n/ja.po
+++ b/addons/project_timesheet/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:52+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:24+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project_timesheet
 #: model:ir.actions.act_window,help:project_timesheet.action_project_timesheet_bill_task
diff --git a/addons/project_timesheet/i18n/ko.po b/addons/project_timesheet/i18n/ko.po
index 4c58046562b..2da83095608 100644
--- a/addons/project_timesheet/i18n/ko.po
+++ b/addons/project_timesheet/i18n/ko.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:52+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:24+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project_timesheet
 #: model:ir.actions.act_window,help:project_timesheet.action_project_timesheet_bill_task
diff --git a/addons/project_timesheet/i18n/lt.po b/addons/project_timesheet/i18n/lt.po
index 0179e91939b..83ba9f83a18 100644
--- a/addons/project_timesheet/i18n/lt.po
+++ b/addons/project_timesheet/i18n/lt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:52+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:24+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project_timesheet
 #: model:ir.actions.act_window,help:project_timesheet.action_project_timesheet_bill_task
diff --git a/addons/project_timesheet/i18n/lv.po b/addons/project_timesheet/i18n/lv.po
index 29e672c62c3..5860c36ffe5 100644
--- a/addons/project_timesheet/i18n/lv.po
+++ b/addons/project_timesheet/i18n/lv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:52+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:24+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project_timesheet
 #: model:ir.actions.act_window,help:project_timesheet.action_project_timesheet_bill_task
diff --git a/addons/project_timesheet/i18n/mn.po b/addons/project_timesheet/i18n/mn.po
index d993f49f79b..2fd01125723 100644
--- a/addons/project_timesheet/i18n/mn.po
+++ b/addons/project_timesheet/i18n/mn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:52+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:24+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project_timesheet
 #: model:ir.actions.act_window,help:project_timesheet.action_project_timesheet_bill_task
diff --git a/addons/project_timesheet/i18n/nl.po b/addons/project_timesheet/i18n/nl.po
index a7c5891d397..b0015f104fb 100644
--- a/addons/project_timesheet/i18n/nl.po
+++ b/addons/project_timesheet/i18n/nl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:52+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:24+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project_timesheet
 #: model:ir.actions.act_window,help:project_timesheet.action_project_timesheet_bill_task
@@ -206,7 +206,7 @@ msgstr "Te vernieuwen contracten"
 #. module: project_timesheet
 #: model:ir.ui.menu,name:project_timesheet.menu_hr_timesheet_sign_in
 msgid "Sign in / Sign out by project"
-msgstr "Klok in / Klok uit per project"
+msgstr "Inklokken/Uitklokken per project"
 
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
diff --git a/addons/project_timesheet/i18n/nl_BE.po b/addons/project_timesheet/i18n/nl_BE.po
index bb5b26244f4..1329bc3236e 100644
--- a/addons/project_timesheet/i18n/nl_BE.po
+++ b/addons/project_timesheet/i18n/nl_BE.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:52+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:24+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project_timesheet
 #: model:ir.actions.act_window,help:project_timesheet.action_project_timesheet_bill_task
diff --git a/addons/project_timesheet/i18n/pl.po b/addons/project_timesheet/i18n/pl.po
index 98176f31c36..949587250bb 100644
--- a/addons/project_timesheet/i18n/pl.po
+++ b/addons/project_timesheet/i18n/pl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:52+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:24+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project_timesheet
 #: model:ir.actions.act_window,help:project_timesheet.action_project_timesheet_bill_task
diff --git a/addons/project_timesheet/i18n/pt.po b/addons/project_timesheet/i18n/pt.po
index beb36572453..eed63fe3fe4 100644
--- a/addons/project_timesheet/i18n/pt.po
+++ b/addons/project_timesheet/i18n/pt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:52+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:24+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project_timesheet
 #: model:ir.actions.act_window,help:project_timesheet.action_project_timesheet_bill_task
diff --git a/addons/project_timesheet/i18n/pt_BR.po b/addons/project_timesheet/i18n/pt_BR.po
index 643b9e5ee27..6f34afc580e 100644
--- a/addons/project_timesheet/i18n/pt_BR.po
+++ b/addons/project_timesheet/i18n/pt_BR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:52+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:24+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project_timesheet
 #: model:ir.actions.act_window,help:project_timesheet.action_project_timesheet_bill_task
@@ -24,6 +24,10 @@ msgid ""
 "pricelist and the field 'Invoice Task Work' on the tab 'Billing' of\n"
 "the project form."
 msgstr ""
+"Você vai encontrar aqui todas as tarefas realizadas que você pode faturar.\n"
+"No pedido da fatura o tempo gasto em um projeto, você deve definir a lista "
+"de preços e 'Fatura Tarefa Realizada' o campo de \"faturamento\" na guia do "
+"formulário de projeto."
 
 #. module: project_timesheet
 #: code:addons/project_timesheet/project_timesheet.py:55
@@ -38,7 +42,9 @@ msgstr ""
 msgid ""
 "No journal defined on the related employee.\n"
 "Fill in the timesheet tab of the employee form."
-msgstr "Nenhum diário definido para o empregado relacionado."
+msgstr ""
+"Nenhum diário definido para o empregado relacionado.\n"
+"Preencha na guia folha de horas do formulário do funcionário."
 
 #. module: project_timesheet
 #: model:process.node,name:project_timesheet.process_node_timesheettask0
@@ -48,17 +54,17 @@ msgstr "Tarefas de Planilhas de Tempo"
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
 msgid "Group by year of date"
-msgstr ""
+msgstr "Agrupar por data do ano"
 
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
 msgid "Task Hours in current month"
-msgstr ""
+msgstr "Horas de tarefas no mês atual"
 
 #. module: project_timesheet
 #: constraint:project.task:0
 msgid "Error ! Task end-date must be greater then task start-date"
-msgstr ""
+msgstr "Erro ! A data final deve ser maior do que a data inicial"
 
 #. module: project_timesheet
 #: field:project.task.work,hr_analytic_timesheet_id:0
@@ -82,6 +88,8 @@ msgid ""
 "You cannot delete a partner which is assigned to project, we suggest you to "
 "uncheck the active box!"
 msgstr ""
+"Você não pode excluir um parceiro que está associado a um projeto, nós "
+"sugerimos que você desmarque a caixa de Ativo!"
 
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
@@ -106,7 +114,7 @@ msgstr "Planilha de Horas/Relatório de Horas de Tarefas por Mês"
 #. module: project_timesheet
 #: view:project.project:0
 msgid "Billable"
-msgstr ""
+msgstr "Faturável"
 
 #. module: project_timesheet
 #: model:ir.actions.act_window,help:project_timesheet.action_account_analytic_overdue
@@ -114,6 +122,8 @@ msgid ""
 "You will find here the contracts related to your customer projects in order "
 "to track the invoicing progress."
 msgstr ""
+"Você vai encontrar aqui os contratos relativos a projetos de seus clientes, "
+"a fim de acompanhar o progresso de faturamento."
 
 #. module: project_timesheet
 #: view:account.analytic.line:0
@@ -139,12 +149,12 @@ msgstr "Erro! A data inicial do projeto precisa ser menor que a data final."
 #. module: project_timesheet
 #: model:ir.actions.act_window,name:project_timesheet.action_account_analytic_overdue
 msgid "Customer Projects"
-msgstr ""
+msgstr "Projetos de Clientes"
 
 #. module: project_timesheet
 #: model:ir.model,name:project_timesheet.model_account_analytic_line
 msgid "Analytic Line"
-msgstr ""
+msgstr "Linha Analítica"
 
 #. module: project_timesheet
 #: selection:report.timesheet.task.user,month:0
@@ -174,7 +184,7 @@ msgstr "Erro! Você não pode criar tarefas recursivas."
 #. module: project_timesheet
 #: model:ir.ui.menu,name:project_timesheet.menu_project_working_hours
 msgid "Timesheet Lines"
-msgstr ""
+msgstr "Itens da Planilha de Horas"
 
 #. module: project_timesheet
 #: code:addons/project_timesheet/project_timesheet.py:231
@@ -185,12 +195,12 @@ msgstr "Ação Inválida!"
 #. module: project_timesheet
 #: view:project.project:0
 msgid "Billable Project"
-msgstr ""
+msgstr "Projeto Faturável"
 
 #. module: project_timesheet
 #: model:ir.ui.menu,name:project_timesheet.menu_invoicing_contracts
 msgid "Contracts to Renew"
-msgstr ""
+msgstr "Contratos a Renovar"
 
 #. module: project_timesheet
 #: model:ir.ui.menu,name:project_timesheet.menu_hr_timesheet_sign_in
@@ -200,7 +210,7 @@ msgstr "Entrada / Saída por projeto"
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
 msgid "Group by month of date"
-msgstr ""
+msgstr "Agrupar por mês da data"
 
 #. module: project_timesheet
 #: model:ir.model,name:project_timesheet.model_project_task
@@ -241,7 +251,7 @@ msgstr "Complete sua Planilha de Tempo"
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
 msgid "Task Hours in current year"
-msgstr ""
+msgstr "Horas de Tarefas este ano"
 
 #. module: project_timesheet
 #: view:project.project:0
@@ -296,7 +306,7 @@ msgstr "Novembro"
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
 msgid "Task hours of last month"
-msgstr ""
+msgstr "Horas de tarefas no último mês"
 
 #. module: project_timesheet
 #: selection:report.timesheet.task.user,month:0
@@ -332,7 +342,7 @@ msgstr "Parceiro"
 #: code:addons/project_timesheet/project_timesheet.py:247
 #, python-format
 msgid "Invalid Analytic Account !"
-msgstr ""
+msgstr "Conta analítica inválida!"
 
 #. module: project_timesheet
 #: code:addons/project_timesheet/project_timesheet.py:59
@@ -361,7 +371,7 @@ msgstr "Faturamento"
 #. module: project_timesheet
 #: constraint:res.partner:0
 msgid "Error ! You cannot create recursive associated members."
-msgstr ""
+msgstr "Erro! Você não pode criar recursivamente a membros associados."
 
 #. module: project_timesheet
 #: code:addons/project_timesheet/project_timesheet.py:247
@@ -369,6 +379,8 @@ msgstr ""
 msgid ""
 "You cannot select a Analytic Account which is in Close or Cancelled state"
 msgstr ""
+"Você não pode selecionar uma Conta Analítica que está como Fechado ou "
+"Cancelado"
 
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
@@ -409,12 +421,12 @@ msgstr "Mês"
 #. module: project_timesheet
 #: model:ir.ui.menu,name:project_timesheet.menu_act_project_management_timesheet_sheet_form
 msgid "My Timesheet"
-msgstr ""
+msgstr "Minha Planilha de Horas"
 
 #. module: project_timesheet
 #: constraint:account.analytic.line:0
 msgid "You can not create analytic line on view account."
-msgstr ""
+msgstr "Você não pode criar uma linha analítica na conta de visualização"
 
 #. module: project_timesheet
 #: view:project.project:0
diff --git a/addons/project_timesheet/i18n/ro.po b/addons/project_timesheet/i18n/ro.po
index 403b7a6d990..52e15bc21d1 100644
--- a/addons/project_timesheet/i18n/ro.po
+++ b/addons/project_timesheet/i18n/ro.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:52+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:24+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project_timesheet
 #: model:ir.actions.act_window,help:project_timesheet.action_project_timesheet_bill_task
diff --git a/addons/project_timesheet/i18n/ru.po b/addons/project_timesheet/i18n/ru.po
index 0fd83f874b6..9d453aa1f84 100644
--- a/addons/project_timesheet/i18n/ru.po
+++ b/addons/project_timesheet/i18n/ru.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:52+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:24+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project_timesheet
 #: model:ir.actions.act_window,help:project_timesheet.action_project_timesheet_bill_task
diff --git a/addons/project_timesheet/i18n/sl.po b/addons/project_timesheet/i18n/sl.po
index 4685b340d0e..7e92139f790 100644
--- a/addons/project_timesheet/i18n/sl.po
+++ b/addons/project_timesheet/i18n/sl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:52+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:24+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project_timesheet
 #: model:ir.actions.act_window,help:project_timesheet.action_project_timesheet_bill_task
diff --git a/addons/project_timesheet/i18n/sq.po b/addons/project_timesheet/i18n/sq.po
index 052e72a5a37..e5aee2fed2d 100644
--- a/addons/project_timesheet/i18n/sq.po
+++ b/addons/project_timesheet/i18n/sq.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:52+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:24+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project_timesheet
 #: model:ir.actions.act_window,help:project_timesheet.action_project_timesheet_bill_task
diff --git a/addons/project_timesheet/i18n/sv.po b/addons/project_timesheet/i18n/sv.po
index f4ebd20077f..30576424a33 100644
--- a/addons/project_timesheet/i18n/sv.po
+++ b/addons/project_timesheet/i18n/sv.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:52+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:24+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project_timesheet
 #: model:ir.actions.act_window,help:project_timesheet.action_project_timesheet_bill_task
diff --git a/addons/project_timesheet/i18n/tlh.po b/addons/project_timesheet/i18n/tlh.po
index ead4dda2668..62d3cff14e9 100644
--- a/addons/project_timesheet/i18n/tlh.po
+++ b/addons/project_timesheet/i18n/tlh.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:52+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:24+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project_timesheet
 #: model:ir.actions.act_window,help:project_timesheet.action_project_timesheet_bill_task
diff --git a/addons/project_timesheet/i18n/tr.po b/addons/project_timesheet/i18n/tr.po
index 883b263b656..39436fb18a9 100644
--- a/addons/project_timesheet/i18n/tr.po
+++ b/addons/project_timesheet/i18n/tr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:52+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:24+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project_timesheet
 #: model:ir.actions.act_window,help:project_timesheet.action_project_timesheet_bill_task
diff --git a/addons/project_timesheet/i18n/uk.po b/addons/project_timesheet/i18n/uk.po
index 3d247932943..632cdeaef66 100644
--- a/addons/project_timesheet/i18n/uk.po
+++ b/addons/project_timesheet/i18n/uk.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:52+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:24+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project_timesheet
 #: model:ir.actions.act_window,help:project_timesheet.action_project_timesheet_bill_task
diff --git a/addons/project_timesheet/i18n/vi.po b/addons/project_timesheet/i18n/vi.po
index 33cc1337532..04e41a92779 100644
--- a/addons/project_timesheet/i18n/vi.po
+++ b/addons/project_timesheet/i18n/vi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:52+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:24+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project_timesheet
 #: model:ir.actions.act_window,help:project_timesheet.action_project_timesheet_bill_task
diff --git a/addons/project_timesheet/i18n/zh_CN.po b/addons/project_timesheet/i18n/zh_CN.po
index b82aee6822a..c22b571d377 100644
--- a/addons/project_timesheet/i18n/zh_CN.po
+++ b/addons/project_timesheet/i18n/zh_CN.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:52+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:24+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project_timesheet
 #: model:ir.actions.act_window,help:project_timesheet.action_project_timesheet_bill_task
diff --git a/addons/project_timesheet/i18n/zh_TW.po b/addons/project_timesheet/i18n/zh_TW.po
index f92e4c18308..8e0f48f512e 100644
--- a/addons/project_timesheet/i18n/zh_TW.po
+++ b/addons/project_timesheet/i18n/zh_TW.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:52+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:24+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project_timesheet
 #: model:ir.actions.act_window,help:project_timesheet.action_project_timesheet_bill_task
diff --git a/addons/project_timesheet/project_timesheet.py b/addons/project_timesheet/project_timesheet.py
index e4374f096fd..1e50848201c 100644
--- a/addons/project_timesheet/project_timesheet.py
+++ b/addons/project_timesheet/project_timesheet.py
@@ -28,33 +28,6 @@ from tools.translate import _
 
 class project_project(osv.osv):
     _inherit = 'project.project'
-
-    def _to_invoice(self, cr, uid, ids, field_name, arg, context=None):
-        account_analytic_line = self.pool.get("account.analytic.line")
-        res = {}
-        for project in self.browse(cr,uid,ids,context=context):
-            line_ids = account_analytic_line.search(cr, uid, [('account_id', '=', project.analytic_account_id.id), ('to_invoice','=',1), ('invoice_id','=',False)])
-            lines = account_analytic_line.browse(cr, uid, line_ids, context)
-            res[project.id] = {
-                'amount_to_invoice': sum(line.amount for line in lines),
-                'time_to_invoice': sum(line.unit_amount for line in lines),
-            }
-        return res
-
-    def _timesheet_count(self, cr, uid, ids, field_name, arg, context=None):
-        account_analytic_line = self.pool.get('account.analytic.line')
-        res = {}
-        for project in self.browse(cr, uid, ids, context):
-            line_ids = account_analytic_line.search(cr, uid, [('account_id', '=', project.analytic_account_id.id)])
-            res[project.id] = len(line_ids)
-        return res
-
-    _columns = {
-        'amount_to_invoice': fields.function(_to_invoice, string="Amount to Invoice", multi="sums"),
-        'time_to_invoice': fields.function(_to_invoice, string="Time to Invoice", multi="sums"),
-        'timesheet_count': fields.function(_timesheet_count, type='integer', string="Issue"),
-    }
-
     def onchange_partner_id(self, cr, uid, ids, part=False, context=None):
         res = super(project_project, self).onchange_partner_id(cr, uid, ids, part, context)
         if part and res and ('value' in res):
@@ -66,6 +39,31 @@ class project_project(osv.osv):
                 res['value'].update({'to_invoice': factor_id})
         return res
 
+    _defaults = {
+        'use_timesheets': True,
+    }
+
+    def open_timesheets(self, cr, uid, ids, context=None):
+        """ open Timesheets view """
+        project = self.browse(cr, uid, ids[0], context)
+        try:
+            journal_id = self.pool.get('ir.model.data').get_object(cr, uid, 'hr_timesheet', 'analytic_journal').id
+        except ValueError:
+            journal_id = False
+        view_context = {
+            'search_default_account_id': [project.analytic_account_id.id],
+            'default_account_id': project.analytic_account_id.id,
+            'default_journal_id': journal_id,
+        }
+        return {
+            'type': 'ir.actions.act_window',
+            'name': _('Bill Tasks Works'),
+            'res_model': 'account.analytic.line',
+            'view_type': 'form',
+            'view_mode': 'tree,form',
+            'context': view_context,
+            'nodestroy': True,
+        }
 project_project()
 
 class project_work(osv.osv):
diff --git a/addons/project_timesheet/project_timesheet_data.xml b/addons/project_timesheet/project_timesheet_data.xml.THIS
similarity index 96%
rename from addons/project_timesheet/project_timesheet_data.xml
rename to addons/project_timesheet/project_timesheet_data.xml.THIS
index ed87cb8c65f..fc6597595ae 100644
--- a/addons/project_timesheet/project_timesheet_data.xml
+++ b/addons/project_timesheet/project_timesheet_data.xml.THIS
@@ -1,6 +1,6 @@
 <?xml version="1.0" ?>
 <openerp>
-    <data>
+    <data noupdate="1">
 
       <!--   <record id="base.menu_project_management_time_tracking" model="ir.ui.menu">
             <field name="name">Time Tracking</field>
diff --git a/addons/project_timesheet/project_timesheet_demo.xml b/addons/project_timesheet/project_timesheet_demo.xml
index 6d3dfb23767..90873d2a418 100644
--- a/addons/project_timesheet/project_timesheet_demo.xml
+++ b/addons/project_timesheet/project_timesheet_demo.xml
@@ -3,13 +3,11 @@
     <data noupdate="1">
         <!-- Example employee -->
         <record id="hr.employee_qdp" model="hr.employee">
-            <field name="user_id" ref="base.user_qdp"/>
             <field name="product_id" ref="product.product_product_consultant"/>
             <field name="journal_id" ref="hr_timesheet.analytic_journal"/>
         </record>
 
         <record id="hr.employee_al" model="hr.employee">
-            <field name="user_id" ref="base.user_al"/>
             <field name="product_id" ref="product.product_product_consultant"/>
             <field name="journal_id" ref="hr_timesheet.analytic_journal"/>
         </record>
@@ -17,7 +15,6 @@
         <record id="hr.employee_phu" model="hr.employee">
             <field name="name">Phuong</field>
             <field name="calendar_id" ref="resource.timesheet_group1"/>
-            <field name="user_id" ref="base.user_phu"/>
             <field name="category_ids" eval="[(6, 0, [ref('hr.employee_category_4')])]"/>
             <field name="product_id" ref="product.product_product_consultant"/>
             <field name="journal_id" ref="hr_timesheet.analytic_journal"/>
@@ -26,7 +23,6 @@
         <record id="hr.employee_fpi" model="hr.employee">
             <field name="name">Francois</field>
             <field name="calendar_id" ref="resource.timesheet_group1"/>
-            <field name="user_id" ref="base.user_fpi"/>
             <field name="category_ids" eval="[(6, 0, [ref('hr.employee_category_4')])]"/>
             <field name="product_id" ref="product.product_product_consultant"/>
             <field name="journal_id" ref="hr_timesheet.analytic_journal"/>
@@ -34,7 +30,6 @@
         <record id="hr.employee_jth" model="hr.employee">
             <field name="name">Julien</field>
             <field name="calendar_id" ref="resource.timesheet_group1"/>
-            <field name="user_id" ref="base.user_jth"/>
             <field name="category_ids" eval="[(6, 0, [ref('hr.employee_category_4')])]"/>
             <field name="product_id" ref="product.product_product_consultant"/>
             <field name="journal_id" ref="hr_timesheet.analytic_journal"/>
@@ -42,7 +37,6 @@
         <record id="hr.employee7" model="hr.employee">
             <field name="name">Aline</field>
             <field name="calendar_id" ref="resource.timesheet_group1"/>
-            <field name="user_id" ref="base.user_apr"/>
             <field name="category_ids" eval="[(6, 0, [ref('hr.employee_category_4')])]"/>
             <field name="product_id" ref="product.product_product_consultant"/>
             <field name="journal_id" ref="hr_timesheet.analytic_journal"/>
diff --git a/addons/project_timesheet/project_timesheet_view.xml b/addons/project_timesheet/project_timesheet_view.xml
index c47c411f6c9..66104ee0d8c 100644
--- a/addons/project_timesheet/project_timesheet_view.xml
+++ b/addons/project_timesheet/project_timesheet_view.xml
@@ -9,33 +9,29 @@
             <field name="arch" type="xml">
                 <field name="use_tasks" position="after">
                     <field name="use_timesheets"/>
-                    <field name="timesheet_count"/>
+                    <field name="hours_quantity"/>
                     <field name="currency_id"/>
                     <field name="partner_id"/>
                 </field>
                 <xpath expr="//div[contains(@class, 'oe_kanban_project_list')]" position="inside">
                     <a t-if="record.use_timesheets.raw_value"
-                        name="open_timesheets" type="object">Timesheets(<field name="timesheet_count"/>)</a>
-                </xpath>
-                <xpath expr="//div[contains(@class, 'oe_kanban_project_deadline')]" position="before">
-                    <div class="oe_kanban_project_fields oe_kanban_project_invoice" t-if="record.partner_id.raw_value">
-                        <div>Amount to invoice</div>
-                        <div><field name="amount_to_invoice"/> <t t-esc="record.currency_id.raw_value[1].split(' ')[1][1]"/></div>
-                        <div>Time to Invoice</div>
-                        <div><field name="time_to_invoice"/> <field name="company_uom_id"/></div>
-                    </div>
+                        name="open_timesheets" type="object"><field name="hours_quantity"/> Timesheets</a>
                 </xpath>
             </field>
         </record>
 
-        <record id="project_invoice_form_cutomer" model="ir.ui.view">
-            <field name="name">Inherit project form : Customer</field>
+        <record id="project_invoice_form" model="ir.ui.view">
+            <field name="name">Inherit project form : Invoicing Data</field>
             <field name="model">project.project</field>
-            <field name="inherit_id" ref="analytic_contract_project.project_invoice_form"/>
+            <field name="inherit_id" ref="project.edit_project"/>
             <field name="arch" type="xml">
-                <field name="partner_id" position="replace">
-                    <field name="partner_id" on_change="onchange_partner_id(partner_id)" string="Contact"  attrs="{'required':[('to_invoice','!=',False)]}"/>
-                </field>
+                <xpath expr='//div[@name="options_active"]' position='inside'>
+                    <field name="use_timesheets" class="oe_inline"/>
+                    <label for="use_timesheets"/>
+                </xpath>
+                <xpath expr='//div[@name="buttons"]' position="inside">
+                    <button name="open_timesheets" string="Timesheets" type="object" attrs="{'invisible':[('use_timesheets','=', 0)]}"/>
+                </xpath>
             </field>
         </record>
 
@@ -45,7 +41,6 @@
             <field name="inherit_id" ref="project.view_project_project_filter"/>
             <field name="arch" type="xml">
                 <xpath expr='//filter[@string="Project(s) Manager"]' position='after'>
-                    <separator/>
                     <filter icon="terp-camera_test" string="Billable" domain="[('to_invoice','!=', False)]" help="Billable Project"/>
                 </xpath>
             </field>
@@ -95,7 +90,7 @@
                 Click to add a work to invoice.
               </p><p>
                 You will find here all works made on tasks that you can
-                invoice.   
+                invoice.
               </p>
             </field>
         </record>
diff --git a/addons/project_timesheet/test/work_timesheet.yml b/addons/project_timesheet/test/work_timesheet.yml
index 2f75f908735..4867f92b4b1 100644
--- a/addons/project_timesheet/test/work_timesheet.yml
+++ b/addons/project_timesheet/test/work_timesheet.yml
@@ -6,7 +6,7 @@
     name: Test Timesheet records
     task_id: project.project_task_10
     hours: 20.0
-    user_id: base.user_fpi
+    user_id: base.user_demo
     company_id: base.main_company
 -
   I check Timesheet line for employee in current Timesheet
@@ -16,6 +16,7 @@
     start = (datetime.date.today().strftime('%Y-%m-%d'))
     task_work = self.search(cr, uid, [("name","=","Social network integration: Test Timesheet records")],context)[0]
     task_ids = self.browse(cr, uid, task_work, context)
-    assert task_ids.user_id.id == ref("base.user_fpi"), 'Error, The User in Timesheet is not Correct'
+    assert task_ids.user_id.id == ref("base.user_demo"), 'Error, The User in Timesheet is not Correct'
     assert task_ids.date == start, 'Error, The Date in Timesheet is not ok'
     assert task_ids.product_uom_id.name == "Hour", 'Error, The Hour in Timesheet is not ok'
+
diff --git a/addons/purchase/__openerp__.py b/addons/purchase/__openerp__.py
index eb8df0ff77b..a9a812878d6 100644
--- a/addons/purchase/__openerp__.py
+++ b/addons/purchase/__openerp__.py
@@ -24,8 +24,8 @@
     'name': 'Purchase Management',
     'version': '1.1',
     'category': 'Purchase Management',
-    "sequence": 19,
-    "summary": "RfQ, Purchase Orders, Delivery & Invoicing Control",
+    'sequence': 19,
+    'summary': 'RfQ, Purchase Orders, Delivery & Invoicing Control',
     'description': """
 Purchase Management module is for generating a purchase order for purchase of goods from a supplier.
 ====================================================================================================
diff --git a/addons/purchase/edi/purchase_order_action_data.xml b/addons/purchase/edi/purchase_order_action_data.xml
index b97da91fa1d..daad4467929 100644
--- a/addons/purchase/edi/purchase_order_action_data.xml
+++ b/addons/purchase/edi/purchase_order_action_data.xml
@@ -108,51 +108,6 @@
     </div>
 </div>
             ]]></field>
-            <field name="body_text"><![CDATA[
-Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name or ''},
-
-Here is a ${object.state in ('draft', 'sent') and 'request for quotation' or 'purchase order confirmation'} from ${object.company_id.name}:
-       | Order number: *${object.name}*
-       | Order total: *${object.amount_total} ${object.pricelist_id.currency_id.name}*
-       | Order date: ${object.date_order}
-       % if object.origin:
-       | Order reference: ${object.origin}
-       % endif
-       % if object.partner_ref:
-       | Your reference: ${object.partner_ref}<br />
-       % endif
-       | Your contact: ${object.validator.name} ${object.validator.email and '<%s>'%(object.validator.email) or ''}
-
-You can view the ${object.state in ('draft', 'sent') and 'request for quotation' or 'order confirmation'} and download it using the following link:
-    ${ctx.get('edi_web_url_view') or 'n/a'}
-
-If you have any question, do not hesitate to contact us.
-
-Thank you!
-
-
---
-${object.validator.name} ${object.validator.email and '<%s>'%(object.validator.email) or ''}
-${object.company_id.name}
-% if object.company_id.street:
-${object.company_id.street or ''}
-% endif
-% if object.company_id.street2:
-${object.company_id.street2}
-% endif
-% if object.company_id.city or object.company_id.zip:
-${object.company_id.zip or ''} ${object.company_id.city or ''}
-% endif
-% if object.company_id.country_id:
-${object.company_id.state_id and ('%s, ' % object.company_id.state_id.name) or ''} ${object.company_id.country_id.name or ''}
-% endif
-% if object.company_id.phone:
-Phone: ${object.company_id.phone}
-% endif
-% if object.company_id.website:
-${object.company_id.website or ''}
-% endif
-            ]]></field>
         </record>
     </data>
 </openerp>
diff --git a/addons/purchase/i18n/ar.po b/addons/purchase/i18n/ar.po
index 2f0479f77dd..378d405db66 100644
--- a/addons/purchase/i18n/ar.po
+++ b/addons/purchase/i18n/ar.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:45+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:56+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -1806,7 +1806,7 @@ msgstr ""
 "الرجاء تعيين واحداً قبل اختيار المنتج."
 
 #. module: purchase
-#: model:email.template,body_text:purchase.email_template_edi_purchase
+#: model:email.template,body:purchase.email_template_edi_purchase
 msgid ""
 "\n"
 "Hello${object.partner_address_id.name and ' ' or "
diff --git a/addons/purchase/i18n/bg.po b/addons/purchase/i18n/bg.po
index f93a83b069c..5bc0064dd0c 100644
--- a/addons/purchase/i18n/bg.po
+++ b/addons/purchase/i18n/bg.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:45+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:56+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -1768,7 +1768,7 @@ msgstr ""
 " Моля, изберете преди избора на продукт."
 
 #. module: purchase
-#: model:email.template,body_text:purchase.email_template_edi_purchase
+#: model:email.template,body:purchase.email_template_edi_purchase
 msgid ""
 "\n"
 "Hello${object.partner_address_id.name and ' ' or "
diff --git a/addons/purchase/i18n/bs.po b/addons/purchase/i18n/bs.po
index 87942674b68..e17c64da401 100644
--- a/addons/purchase/i18n/bs.po
+++ b/addons/purchase/i18n/bs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:45+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:56+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -1763,7 +1763,7 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: model:email.template,body_text:purchase.email_template_edi_purchase
+#: model:email.template,body:purchase.email_template_edi_purchase
 msgid ""
 "\n"
 "Hello${object.partner_address_id.name and ' ' or "
diff --git a/addons/purchase/i18n/ca.po b/addons/purchase/i18n/ca.po
index 09a8bf271d9..71da9bfdc15 100644
--- a/addons/purchase/i18n/ca.po
+++ b/addons/purchase/i18n/ca.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:45+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:56+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -1837,7 +1837,7 @@ msgstr ""
 "Indiqueu un abans de seleccionar un producte."
 
 #. module: purchase
-#: model:email.template,body_text:purchase.email_template_edi_purchase
+#: model:email.template,body:purchase.email_template_edi_purchase
 msgid ""
 "\n"
 "Hello${object.partner_address_id.name and ' ' or "
diff --git a/addons/purchase/i18n/cs.po b/addons/purchase/i18n/cs.po
index a1bda3cdbab..8c08429673d 100644
--- a/addons/purchase/i18n/cs.po
+++ b/addons/purchase/i18n/cs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:45+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:56+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 "X-Poedit-Language: Czech\n"
 
 #. module: purchase
@@ -1777,7 +1777,7 @@ msgstr ""
 "Před výběrem výrobku prosíme nastavte jednoho."
 
 #. module: purchase
-#: model:email.template,body_text:purchase.email_template_edi_purchase
+#: model:email.template,body:purchase.email_template_edi_purchase
 msgid ""
 "\n"
 "Hello${object.partner_address_id.name and ' ' or "
diff --git a/addons/purchase/i18n/da.po b/addons/purchase/i18n/da.po
index f445d54e9d0..32f4d820acf 100644
--- a/addons/purchase/i18n/da.po
+++ b/addons/purchase/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:45+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:56+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -1749,7 +1749,7 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: model:email.template,body_text:purchase.email_template_edi_purchase
+#: model:email.template,body:purchase.email_template_edi_purchase
 msgid ""
 "\n"
 "Hello${object.partner_address_id.name and ' ' or "
diff --git a/addons/purchase/i18n/de.po b/addons/purchase/i18n/de.po
index 5a22481f822..be27e50799e 100644
--- a/addons/purchase/i18n/de.po
+++ b/addons/purchase/i18n/de.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:45+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:56+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -1880,7 +1880,7 @@ msgstr ""
 "Auftragspositionen wählen."
 
 #. module: purchase
-#: model:email.template,body_text:purchase.email_template_edi_purchase
+#: model:email.template,body:purchase.email_template_edi_purchase
 msgid ""
 "\n"
 "Hello${object.partner_address_id.name and ' ' or "
diff --git a/addons/purchase/i18n/el.po b/addons/purchase/i18n/el.po
index 8ec1a85acf1..6153fbf083d 100644
--- a/addons/purchase/i18n/el.po
+++ b/addons/purchase/i18n/el.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:45+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:56+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
 "X-Poedit-SourceCharset: utf-8\n"
@@ -1770,7 +1770,7 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: model:email.template,body_text:purchase.email_template_edi_purchase
+#: model:email.template,body:purchase.email_template_edi_purchase
 msgid ""
 "\n"
 "Hello${object.partner_address_id.name and ' ' or "
diff --git a/addons/purchase/i18n/en_GB.po b/addons/purchase/i18n/en_GB.po
index 5a7f7371b28..d444a651b00 100644
--- a/addons/purchase/i18n/en_GB.po
+++ b/addons/purchase/i18n/en_GB.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:46+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:56+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -1818,7 +1818,7 @@ msgstr ""
 "Please set one before choosing a product."
 
 #. module: purchase
-#: model:email.template,body_text:purchase.email_template_edi_purchase
+#: model:email.template,body:purchase.email_template_edi_purchase
 msgid ""
 "\n"
 "Hello${object.partner_address_id.name and ' ' or "
diff --git a/addons/purchase/i18n/es.po b/addons/purchase/i18n/es.po
index 06f2f0bdd47..35589f062dc 100644
--- a/addons/purchase/i18n/es.po
+++ b/addons/purchase/i18n/es.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:45+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:56+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -1838,7 +1838,7 @@ msgstr ""
 "Indique uno antes de seleccionar un producto."
 
 #. module: purchase
-#: model:email.template,body_text:purchase.email_template_edi_purchase
+#: model:email.template,body:purchase.email_template_edi_purchase
 msgid ""
 "\n"
 "Hello${object.partner_address_id.name and ' ' or "
diff --git a/addons/purchase/i18n/es_AR.po b/addons/purchase/i18n/es_AR.po
index 3c946924ad3..93d07c576c1 100644
--- a/addons/purchase/i18n/es_AR.po
+++ b/addons/purchase/i18n/es_AR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:46+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:56+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -1766,7 +1766,7 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: model:email.template,body_text:purchase.email_template_edi_purchase
+#: model:email.template,body:purchase.email_template_edi_purchase
 msgid ""
 "\n"
 "Hello${object.partner_address_id.name and ' ' or "
diff --git a/addons/purchase/i18n/es_CL.po b/addons/purchase/i18n/es_CL.po
index c8fddc20f3f..bd2b69e5b91 100644
--- a/addons/purchase/i18n/es_CL.po
+++ b/addons/purchase/i18n/es_CL.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:46+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:56+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -1838,7 +1838,7 @@ msgstr ""
 "Indique uno antes de seleccionar un producto."
 
 #. module: purchase
-#: model:email.template,body_text:purchase.email_template_edi_purchase
+#: model:email.template,body:purchase.email_template_edi_purchase
 msgid ""
 "\n"
 "Hello${object.partner_address_id.name and ' ' or "
diff --git a/addons/purchase/i18n/es_CR.po b/addons/purchase/i18n/es_CR.po
index 01f5df83bc9..877e382ad81 100644
--- a/addons/purchase/i18n/es_CR.po
+++ b/addons/purchase/i18n/es_CR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:46+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:57+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 "Language: \n"
 
 #. module: purchase
@@ -1863,7 +1863,7 @@ msgstr ""
 "Indique uno antes de seleccionar un producto."
 
 #. module: purchase
-#: model:email.template,body_text:purchase.email_template_edi_purchase
+#: model:email.template,body:purchase.email_template_edi_purchase
 msgid ""
 "\n"
 "Hello${object.partner_address_id.name and ' ' or "
diff --git a/addons/purchase/i18n/es_EC.po b/addons/purchase/i18n/es_EC.po
index 46c6ae77960..3c3a694a896 100644
--- a/addons/purchase/i18n/es_EC.po
+++ b/addons/purchase/i18n/es_EC.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:46+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:57+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -1865,7 +1865,7 @@ msgstr ""
 "Indique uno antes de seleccionar un producto."
 
 #. module: purchase
-#: model:email.template,body_text:purchase.email_template_edi_purchase
+#: model:email.template,body:purchase.email_template_edi_purchase
 msgid ""
 "\n"
 "Hello${object.partner_address_id.name and ' ' or "
diff --git a/addons/purchase/i18n/es_MX.po.moved b/addons/purchase/i18n/es_MX.po.moved
deleted file mode 100644
index 17eef8e71ff..00000000000
--- a/addons/purchase/i18n/es_MX.po.moved
+++ /dev/null
@@ -1,1730 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* purchase
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.2\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2011-07-05 17:03+0000\n"
-"PO-Revision-Date: 2011-07-05 17: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: purchase
-#: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
-msgid "The buyer has to approve the RFQ before being sent to the supplier. The RFQ becomes a confirmed Purchase Order."
-msgstr "El comprador debe aprobar el RFQ antes de ser enviado al proveedor. El RFQ se convierte en una orden de compra confirmada."
-
-#. module: purchase
-#: code:addons/purchase/purchase.py:292
-#, python-format
-msgid "You can not confirm purchase order without Purchase Order Lines."
-msgstr "No puede confirmar un pedido de compra sin líneas de pedido de compra"
-
-#. module: purchase
-#: field:purchase.order,invoiced:0
-msgid "Invoiced & Paid"
-msgstr "Facturada & Pagada (conciliada)"
-
-#. module: purchase
-#: field:purchase.order,location_id:0
-#: view:purchase.report:0
-#: field:purchase.report,location_id:0
-msgid "Destination"
-msgstr "Destino"
-
-#. module: purchase
-#: code:addons/purchase/purchase.py:721
-#, python-format
-msgid "You have to select a product UOM in the same category than the purchase UOM of the product"
-msgstr "Debe seleccionar una UdM del producto de la misma categoría que la UdM de compra del producto"
-
-#. module: purchase
-#: help:purchase.report,date:0
-msgid "Date on which this document has been created"
-msgstr "Fecha en el que fue creado este documento."
-
-#. module: purchase
-#: model:ir.actions.act_window,help:purchase.purchase_rfq
-msgid "You can create a request for quotation when you want to buy products to a supplier but the purchase is not confirmed yet. Use also this menu to review requests for quotation created automatically based on your logistic rules (minimum stock, MTO, etc). You can convert the request for quotation into a purchase order once the order is confirmed. If you use the extended interface (from user's preferences), you can select the way to control your supplier invoices: based on the order, based on the receptions or manual encoding."
-msgstr "Puede crear una petición de presupuesto cuando quiera obtener productos de un proveedor pero la compra todavía no se haya confirmado. Utilice asimismo este menú para revisar las peticiones de compra creadas automáticamente en base a sus reglas de logística (stock mínimo, obtener bajo pedido, etc). Puede convertir la petición en una compra una vez el pedido se haya confirmado. Si utiliza la interfaz extendida (desde las Preferencias de Usuario), puede elegir la forma de controlar sus facturas de proveedor: basadas en pedido, basadas en recepciones o codificación manual."
-
-#. module: purchase
-#: selection:purchase.order,invoice_method:0
-msgid "From Picking"
-msgstr "Desde lista de empaque"
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Not Invoiced"
-msgstr "No facturado"
-
-#. module: purchase
-#: field:purchase.order,dest_address_id:0
-msgid "Destination Address"
-msgstr "Dirección destinatario"
-
-#. module: purchase
-#: report:purchase.order:0
-#: field:purchase.report,validator:0
-msgid "Validated By"
-msgstr "Validado por"
-
-#. module: purchase
-#: model:ir.model,name:purchase.model_stock_invoice_onshipping
-msgid "Stock Invoice Onshipping"
-msgstr "Stock factura en el envío"
-
-#. module: purchase
-#: view:purchase.order:0
-#: field:purchase.order,partner_id:0
-#: view:purchase.order.line:0
-#: view:purchase.report:0
-#: field:purchase.report,partner_id:0
-msgid "Supplier"
-msgstr "Proveedor"
-
-#. module: purchase
-#: view:purchase.order.line_invoice:0
-msgid "Do you want to generate the supplier invoices?"
-msgstr "¿Desea generar las facturas de proveedor?"
-
-#. module: purchase
-#: model:ir.actions.act_window,help:purchase.purchase_form_action
-msgid "Use this menu to search within your purchase orders by references, supplier, products, etc. For each purchase order, you can track the products received, and control the supplier invoices."
-msgstr "Utilice este menú para buscar en sus pedidos de compra por referencia, proveedor, producto, etc. Para cada pedido de compra, puede obtener los productos recibidos, y controlar las facturas de los proveedores."
-
-#. module: purchase
-#: code:addons/purchase/wizard/purchase_line_invoice.py:156
-#, python-format
-msgid "Supplier Invoices"
-msgstr "Facturas de proveedor"
-
-#. module: purchase
-#: sql_constraint:purchase.order:0
-msgid "Order Reference must be unique !"
-msgstr "¡La referencia del pedido debe ser única!"
-
-#. module: purchase
-#: model:process.transition,name:purchase.process_transition_packinginvoice0
-#: model:process.transition,name:purchase.process_transition_productrecept0
-msgid "From a Pick list"
-msgstr "Desde una lista de empaque"
-
-#. module: purchase
-#: code:addons/purchase/purchase.py:660
-#, python-format
-msgid "No Pricelist !"
-msgstr "¡Sin Lista de precio!"
-
-#. module: purchase
-#: field:purchase.order.line,product_qty:0
-#: view:purchase.report:0
-#: field:purchase.report,quantity:0
-msgid "Quantity"
-msgstr "Cantidad"
-
-#. module: purchase
-#: view:purchase.order.line_invoice:0
-msgid "Select an Open Sale Order"
-msgstr "Seleccionar un pedido de compra abierto"
-
-#. module: purchase
-#: field:purchase.order,company_id:0
-#: field:purchase.order.line,company_id:0
-#: view:purchase.report:0
-#: field:purchase.report,company_id:0
-msgid "Company"
-msgstr "Compañía"
-
-#. module: purchase
-#: view:board.board:0
-#: model:ir.actions.act_window,name:purchase.action_purchase_order_monthly_categ_graph
-#: view:purchase.report:0
-msgid "Monthly Purchase by Category"
-msgstr "Compra mensual por categoría"
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Set to Draft"
-msgstr "Cambiar a borrador"
-
-#. module: purchase
-#: selection:purchase.order,state:0
-#: selection:purchase.report,state:0
-msgid "Invoice Exception"
-msgstr "Excepción de factura"
-
-#. module: purchase
-#: model:product.pricelist,name:purchase.list0
-msgid "Default Purchase Pricelist"
-msgstr "Tarifa de compra por defecto"
-
-#. module: purchase
-#: model:ir.actions.act_window,name:purchase.action_current_purchases
-msgid "Current purchases"
-msgstr "Compras actuales"
-
-#. module: purchase
-#: help:purchase.order,dest_address_id:0
-msgid "Put an address if you want to deliver directly from the supplier to the customer.In this case, it will remove the warehouse link and set the customer location."
-msgstr "Introduzca una dirección si quiere enviar directamente desde el proveedor al cliente. En este caso, se eliminará el enlace al almacén y pondrá la ubicación del cliente."
-
-#. module: purchase
-#: help:res.partner,property_product_pricelist_purchase:0
-msgid "This pricelist will be used, instead of the default one, for purchases from the current partner"
-msgstr "Esta tarifa será utilizada en lugar de la por defecto para las compras de la empresa actual"
-
-#. module: purchase
-#: report:purchase.order:0
-msgid "Fax :"
-msgstr "Fax :"
-
-#. module: purchase
-#: help:purchase.order,pricelist_id:0
-msgid "The pricelist sets the currency used for this purchase order. It also computes the supplier price for the selected products/quantities."
-msgstr "La lista de precios fija la moneda utilizada en este pedido de compra. También calcula el precio del proveedor para los productos/cantidades seleccionados."
-
-#. module: purchase
-#: model:ir.model,name:purchase.model_stock_partial_picking
-msgid "Partial Picking"
-msgstr "Empaquetado parcial"
-
-#. module: purchase
-#: code:addons/purchase/purchase.py:296
-#, python-format
-msgid "Purchase order '%s' is confirmed."
-msgstr "Pedido de compra '%s' está confirmado."
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Approve Purchase"
-msgstr "Aprobar compra"
-
-#. module: purchase
-#: model:process.node,name:purchase.process_node_approvepurchaseorder0
-#: view:purchase.order:0
-#: selection:purchase.order,state:0
-#: selection:purchase.report,state:0
-msgid "Approved"
-msgstr "Aprobado"
-
-#. module: purchase
-#: view:purchase.report:0
-msgid "Reference UOM"
-msgstr "Referencia UdM"
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Origin"
-msgstr "Origen"
-
-#. module: purchase
-#: field:purchase.report,product_uom:0
-msgid "Reference UoM"
-msgstr "Referencia UdM"
-
-#. module: purchase
-#: model:ir.actions.act_window,name:purchase.action_purchase_line_product_tree
-msgid "Purchases"
-msgstr "Compras"
-
-#. module: purchase
-#: view:purchase.order:0
-#: field:purchase.order,notes:0
-#: view:purchase.order.line:0
-#: field:purchase.order.line,notes:0
-msgid "Notes"
-msgstr "Notas"
-
-#. module: purchase
-#: code:addons/purchase/purchase.py:660
-#, python-format
-msgid "You have to select a pricelist or a supplier in the purchase form !\n"
-"Please set one before choosing a product."
-msgstr "¡Debe seleccionar una tarifa o un proveedor en el formulario de compra!\n"
-"Indique uno antes de seleccionar un producto."
-
-#. module: purchase
-#: selection:purchase.report,month:0
-msgid "September"
-msgstr "Septiembre"
-
-#. module: purchase
-#: report:purchase.order:0
-#: field:purchase.order,amount_tax:0
-#: view:purchase.order.line:0
-#: field:purchase.order.line,taxes_id:0
-msgid "Taxes"
-msgstr "Impuestos"
-
-#. module: purchase
-#: model:ir.actions.report.xml,name:purchase.report_purchase_order
-#: model:ir.model,name:purchase.model_purchase_order
-#: model:process.node,name:purchase.process_node_purchaseorder0
-#: field:procurement.order,purchase_id:0
-#: view:purchase.order:0
-#: model:res.request.link,name:purchase.req_link_purchase_order
-#: field:stock.picking,purchase_id:0
-msgid "Purchase Order"
-msgstr "Pedido de compra"
-
-#. module: purchase
-#: field:purchase.order,name:0
-#: view:purchase.order.line:0
-#: field:purchase.order.line,order_id:0
-msgid "Order Reference"
-msgstr "Referencia del pedido"
-
-#. module: purchase
-#: report:purchase.order:0
-msgid "Net Total :"
-msgstr "Total neto :"
-
-#. module: purchase
-#: view:purchase.installer:0
-msgid "Configure Your Purchases Management Application"
-msgstr "Configure su aplicación de gestión de compras"
-
-#. module: purchase
-#: model:ir.ui.menu,name:purchase.menu_procurement_management_product
-#: model:ir.ui.menu,name:purchase.menu_procurement_partner_contact_form
-msgid "Products"
-msgstr "Productos"
-
-#. module: purchase
-#: field:purchase.installer,progress:0
-msgid "Configuration Progress"
-msgstr "Progreso configuración"
-
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_packinginvoice0
-msgid "A Pick list generates an invoice. Depending on the Invoicing control of the sale order, the invoice is based on delivered or on ordered quantities."
-msgstr "Una lista de empaque genera una factura. Según el control de facturación en el pedido de venta, la factura se basa en las cantidades enviadas u ordenadas."
-
-#. module: purchase
-#: selection:purchase.order,state:0
-#: selection:purchase.order.line,state:0
-#: selection:purchase.report,state:0
-msgid "Cancelled"
-msgstr "Cancelado"
-
-#. module: purchase
-#: code:addons/purchase/purchase.py:315
-#, python-format
-msgid "Purchase amount over the limit"
-msgstr "Importe de compra por encima del límite"
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Convert to Purchase Order"
-msgstr "Convertir a pedido de compra"
-
-#. module: purchase
-#: field:purchase.order,pricelist_id:0
-#: field:purchase.report,pricelist_id:0
-msgid "Pricelist"
-msgstr "Lista de precio"
-
-#. module: purchase
-#: selection:purchase.order,state:0
-#: selection:purchase.report,state:0
-msgid "Shipping Exception"
-msgstr "Excepción de envío"
-
-#. module: purchase
-#: field:purchase.order.line,invoice_lines:0
-msgid "Invoice Lines"
-msgstr "Líneas de factura"
-
-#. module: purchase
-#: model:process.node,name:purchase.process_node_packinglist0
-#: model:process.node,name:purchase.process_node_productrecept0
-msgid "Incoming Products"
-msgstr "Productos de entrada"
-
-#. module: purchase
-#: model:process.node,name:purchase.process_node_packinginvoice0
-msgid "Outgoing Products"
-msgstr "Productos de salida"
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Manually Corrected"
-msgstr "Corregido manualmente"
-
-#. module: purchase
-#: view:purchase.report:0
-msgid "   Month   "
-msgstr "   Mes   "
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Reference"
-msgstr "Referencia"
-
-#. module: purchase
-#: code:addons/purchase/purchase.py:244
-#, python-format
-msgid "Cannot delete Purchase Order(s) which are in %s State!"
-msgstr "¡No se pueden eliminar pedido(s) de compra que estén en estado %s!"
-
-#. module: purchase
-#: field:purchase.report,dest_address_id:0
-msgid "Dest. Address Contact Name"
-msgstr "Nombre contacto dirección dest."
-
-#. module: purchase
-#: model:ir.model,name:purchase.model_stock_move
-msgid "Stock Move"
-msgstr "Movimiento stock"
-
-#. module: purchase
-#: view:purchase.report:0
-#: field:purchase.report,day:0
-msgid "Day"
-msgstr "Día"
-
-#. module: purchase
-#: code:addons/purchase/purchase.py:344
-#, python-format
-msgid "Purchase order '%s' has been set in draft state."
-msgstr "Pedido de compra '%s' se ha cambiado al estado borrador."
-
-#. module: purchase
-#: field:purchase.order.line,account_analytic_id:0
-msgid "Analytic Account"
-msgstr "Cuenta analítica"
-
-#. module: purchase
-#: view:purchase.report:0
-#: field:purchase.report,nbr:0
-msgid "# of Lines"
-msgstr "Nº de líneas"
-
-#. module: purchase
-#: code:addons/purchase/purchase.py:696
-#: code:addons/purchase/purchase.py:735
-#: code:addons/purchase/wizard/purchase_order_group.py:47
-#, python-format
-msgid "Warning"
-msgstr "Aviso"
-
-#. module: purchase
-#: field:purchase.installer,purchase_analytic_plans:0
-msgid "Purchase Analytic Plans"
-msgstr "Planes analíticos de compra"
-
-#. module: purchase
-#: model:ir.model,name:purchase.model_purchase_installer
-msgid "purchase.installer"
-msgstr "compra.instalador"
-
-#. module: purchase
-#: selection:purchase.order.line,state:0
-msgid "Draft"
-msgstr "Borrador"
-
-#. module: purchase
-#: report:purchase.order:0
-msgid "Net Price"
-msgstr "Precio neto"
-
-#. module: purchase
-#: view:purchase.order.line:0
-msgid "Order Line"
-msgstr "Línea del pedido"
-
-#. module: purchase
-#: help:purchase.order,shipped:0
-msgid "It indicates that a picking has been done"
-msgstr "Indica que una orden ha sido realizada."
-
-#. module: purchase
-#: code:addons/purchase/purchase.py:721
-#, python-format
-msgid "Wrong Product UOM !"
-msgstr "¡UdM del producto errónea!"
-
-#. module: purchase
-#: model:process.node,name:purchase.process_node_confirmpurchaseorder0
-#: selection:purchase.order.line,state:0
-msgid "Confirmed"
-msgstr "Confirmado"
-
-#. module: purchase
-#: view:purchase.report:0
-#: field:purchase.report,price_average:0
-msgid "Average Price"
-msgstr "Precio medio"
-
-#. module: purchase
-#: report:purchase.order:0
-msgid "Total :"
-msgstr "Total :"
-
-#. module: purchase
-#: model:process.transition.action,name:purchase.process_transition_action_confirmpurchaseorder0
-#: view:purchase.order.line_invoice:0
-msgid "Confirm"
-msgstr "Confirmar"
-
-#. module: purchase
-#: model:ir.ui.menu,name:purchase.menu_procurement_management_invoice
-#: view:purchase.order:0
-msgid "Invoice Control"
-msgstr "Control factura"
-
-#. module: purchase
-#: constraint:res.company:0
-msgid "Error! You can not create recursive companies."
-msgstr "¡Error! No se pueden crear compañías recursivas."
-
-#. module: purchase
-#: field:purchase.order,partner_ref:0
-msgid "Supplier Reference"
-msgstr "Referencia del proveedor"
-
-#. module: purchase
-#: help:purchase.order,amount_tax:0
-msgid "The tax amount"
-msgstr "El importe de los impuestos."
-
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_productrecept0
-msgid "A Pick list generates a supplier invoice. Depending on the Invoicing control of the purchase order, the invoice is based on received or on ordered quantities."
-msgstr "Una lista de empaque genera una factura de proveedor. Según el control de facturación del pedido de compra, la factura se basa en las cantidades recibidas o pedidas."
-
-#. module: purchase
-#: view:purchase.order:0
-#: field:purchase.order,state:0
-#: view:purchase.order.line:0
-#: field:purchase.order.line,state:0
-#: view:purchase.report:0
-msgid "State"
-msgstr "Estado"
-
-#. module: purchase
-#: model:ir.actions.act_window,help:purchase.action_stock_move_report_po
-msgid "Reception Analysis allows you to easily check and analyse your company order receptions and the performance of your supplier's deliveries."
-msgstr "El análisis de recepción permite comprobar y analizar fácilmente las recepciones de su compañía y el rendimiento de las entregas de su proveedor."
-
-#. module: purchase
-#: report:purchase.quotation:0
-msgid "Tel.:"
-msgstr "Tel.:"
-
-#. module: purchase
-#: model:ir.model,name:purchase.model_stock_picking
-#: field:purchase.order,picking_ids:0
-msgid "Picking List"
-msgstr "Lista de empaque"
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Print"
-msgstr "Imprimir"
-
-#. module: purchase
-#: model:ir.actions.act_window,name:purchase.action_view_purchase_order_group
-msgid "Merge Purchase orders"
-msgstr "Fusionar pedidos de compra"
-
-#. module: purchase
-#: field:purchase.order,order_line:0
-msgid "Order Lines"
-msgstr "Líneas del pedido"
-
-#. module: purchase
-#: code:addons/purchase/purchase.py:662
-#, python-format
-msgid "No Partner!"
-msgstr "¡Falta empresa!"
-
-#. module: purchase
-#: report:purchase.quotation:0
-msgid "Fax:"
-msgstr "Fax:"
-
-#. module: purchase
-#: view:purchase.report:0
-#: field:purchase.report,price_total:0
-msgid "Total Price"
-msgstr "Precio total"
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Untaxed amount"
-msgstr "Monto sin impuestos"
-
-#. module: purchase
-#: model:ir.ui.menu,name:purchase.menu_product_pricelist_action2_purchase
-#: model:ir.ui.menu,name:purchase.menu_purchase_config_pricelist
-msgid "Pricelists"
-msgstr "Lista de precios"
-
-#. module: purchase
-#: field:purchase.report,partner_address_id:0
-msgid "Address Contact Name"
-msgstr "Nombre contacto dirección"
-
-#. module: purchase
-#: help:purchase.order,invoice_method:0
-msgid "From Order: a draft invoice will be pre-generated based on the purchase order. The accountant will just have to validate this invoice for control.\n"
-"From Picking: a draft invoice will be pre-generated based on validated receptions.\n"
-"Manual: allows you to generate suppliers invoices by chosing in the uninvoiced lines of all manual purchase orders."
-msgstr "Desde pedido: se generará una factura borrador basándose en los pedidos de compra. El contador sólo tendrá que validar la factura para su control.\n"
-"Desde la orden: se generará una factura borrador basándose en recepciones validadas.\n"
-"Manual: le permite generar facturas de proveedor eligiendo en las líneas no facturadas de todos los pedidos de compra manuales."
-
-#. module: purchase
-#: help:purchase.order,invoice_ids:0
-msgid "Invoices generated for a purchase order"
-msgstr "Facturas generadas para un pedido de compra"
-
-#. module: purchase
-#: code:addons/purchase/purchase.py:292
-#: code:addons/purchase/purchase.py:362
-#: code:addons/purchase/purchase.py:372
-#: code:addons/purchase/wizard/purchase_line_invoice.py:122
-#, python-format
-msgid "Error !"
-msgstr "¡Error!"
-
-#. module: purchase
-#: view:purchase.order.line:0
-msgid "General Information"
-msgstr "Información general"
-
-#. module: purchase
-#: view:board.board:0
-msgid "My Board"
-msgstr "Mi tablero"
-
-#. module: purchase
-#: report:purchase.order:0
-msgid "Purchase Order Confirmation N°"
-msgstr "Confirmación pedido de compra Nº"
-
-#. module: purchase
-#: model:ir.actions.act_window,help:purchase.action_purchase_order_report_all
-msgid "Purchase Analysis allows you to easily check and analyse your company purchase history and performance. From this menu you can track your negotiation performance, the delivery performance of your suppliers, etc."
-msgstr "Los análisis de compra le permite comprobar y analizar fácilmente el historial de compras de su compañía y su rendimiento. Desde este menú puede controlar el rendimiento de su negociación, el funcionamiento de las entregas de sus proveedores, etc."
-
-#. module: purchase
-#: code:addons/purchase/purchase.py:735
-#, python-format
-msgid "The selected supplier only sells this product by %s"
-msgstr "El proveedor seleccionado sólo vende este producto por %s"
-
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_invoicefrompackinglist0
-msgid "The invoice is created automatically if the Invoice control of the purchase order is 'On picking'. The invoice can also be generated manually by the accountant (Invoice control = Manual)."
-msgstr "La factura se crea de forma automática si el control de factura del pedido de compra es 'Desde orden'. La factura también puede ser generada manualmente por el contador (control de factura = Manual)."
-
-#. module: purchase
-#: selection:purchase.order,invoice_method:0
-msgid "From Order"
-msgstr "Desde pedido"
-
-#. module: purchase
-#: model:process.transition.action,name:purchase.process_transition_action_invoicefrompurchaseorder0
-msgid "Create invoice"
-msgstr "Crear factura"
-
-#. module: purchase
-#: field:purchase.order.line,move_dest_id:0
-msgid "Reservation Destination"
-msgstr "Reserva de Destino"
-
-#. module: purchase
-#: code:addons/purchase/purchase.py:244
-#, python-format
-msgid "Invalid action !"
-msgstr "¡Acción no válida!"
-
-#. module: purchase
-#: selection:purchase.order,state:0
-#: selection:purchase.order.line,state:0
-#: selection:purchase.report,state:0
-msgid "Done"
-msgstr "Realizado"
-
-#. module: purchase
-#: selection:purchase.report,month:0
-msgid "July"
-msgstr "Julio"
-
-#. module: purchase
-#: model:ir.ui.menu,name:purchase.menu_purchase_config_purchase
-#: view:res.company:0
-msgid "Configuration"
-msgstr "Configuración"
-
-#. module: purchase
-#: model:ir.actions.act_window,name:purchase.action_purchase_by_supplier
-#: view:purchase.report:0
-msgid "Purchase by supplier"
-msgstr "Compra por proveedor"
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Total amount"
-msgstr "Importe total"
-
-#. module: purchase
-#: model:ir.actions.act_window,name:purchase.act_purchase_order_2_stock_picking
-msgid "Receptions"
-msgstr "Recepciones"
-
-#. module: purchase
-#: field:purchase.order,validator:0
-#: view:purchase.report:0
-msgid "Validated by"
-msgstr "Validada por"
-
-#. module: purchase
-#: model:ir.actions.act_window,help:purchase.action_invoice_pending
-msgid "Use this menu to control the invoices to be received from your supplier. OpenERP pregenerates draft invoices from your purchase orders or receptions, according to your settings. Once you receive a supplier invoice, you can match it with the draft invoice and validate it."
-msgstr "Use este menú para controlar las facturas a recibir de su proveedor. OpenERP pregenera facturas borrador a partir de sus pedidos de compra o recepciones, en función de los parámetros. En cuanto reciba la factura del proveedor, puede verificarla con la factura borrador y validarla."
-
-#. module: purchase
-#: model:process.node,name:purchase.process_node_draftpurchaseorder0
-#: model:process.node,name:purchase.process_node_draftpurchaseorder1
-msgid "RFQ"
-msgstr "Petición de presupuesto"
-
-#. module: purchase
-#: model:ir.ui.menu,name:purchase.menu_procurement_management_pending_invoice
-msgid "Supplier Invoices to Receive"
-msgstr "Facturas de proveedor a recibir"
-
-#. module: purchase
-#: help:purchase.installer,purchase_requisition:0
-msgid "Manages your Purchase Requisition and allows you to easily keep track and manage all your purchase orders."
-msgstr "Gestiona sus peticiones de compras y permite controlar y gestionar fácilmente todos sus pedidos de compra."
-
-#. module: purchase
-#: view:purchase.report:0
-msgid "    Month-1    "
-msgstr "    Mes-1    "
-
-#. module: purchase
-#: code:addons/purchase/purchase.py:373
-#, python-format
-msgid "There is no purchase journal defined for this company: \"%s\" (id:%d)"
-msgstr "No se ha definido un diario para esta compañía: \"%s\" (id:%d)"
-
-#. module: purchase
-#: selection:purchase.order,state:0
-msgid "Waiting Approval"
-msgstr "Esperando aprobacion"
-
-#. module: purchase
-#: selection:purchase.order,invoice_method:0
-msgid "Manual"
-msgstr "Manual"
-
-#. module: purchase
-#: code:addons/purchase/purchase.py:410
-#, python-format
-msgid "You must first cancel all picking attached to this purchase order."
-msgstr "Debe primero cancelar todos las listas d empaque relacionadas a este pedido de compra."
-
-#. module: purchase
-#: view:purchase.order:0
-#: field:purchase.order.line,date_order:0
-#: field:purchase.report,date:0
-msgid "Order Date"
-msgstr "Fecha de pedido"
-
-#. module: purchase
-#: model:process.node,note:purchase.process_node_productrecept0
-msgid "Incoming products to control"
-msgstr "Productos de entrada a controlar"
-
-#. module: purchase
-#: model:process.transition,name:purchase.process_transition_approvingpurchaseorder0
-msgid "Approbation"
-msgstr "Aprobación"
-
-#. module: purchase
-#: view:purchase.report:0
-msgid "Purchase Orders Statistics"
-msgstr "Estadísticas de pedidos de compra"
-
-#. module: purchase
-#: model:ir.actions.act_window,help:purchase.purchase_line_form_action2
-msgid "If you set the invoicing control on a purchase order as \"Manual\", you can track here all the purchase order lines for which you have not received the supplier invoice yet. Once you are ready to receive a supplier invoice, you can generate a draft supplier invoice based on the lines from this menu."
-msgstr "Si establece el control de facturación de un pedido de compra a \"Manual\", puede controlar aquí todas las líneas de los pedidos de compra para los cuales no ha recibido todavía la factura de proveedor correspondiente. Una vez esté listo para recibir una factura de proveedor, puede generar una factura de proveedor en borrador basada en las lineas desde este menú."
-
-#. module: purchase
-#: model:process.node,name:purchase.process_node_invoiceafterpacking0
-#: model:process.node,name:purchase.process_node_invoicecontrol0
-msgid "Draft Invoice"
-msgstr "Factura borrador"
-
-#. module: purchase
-#: help:purchase.installer,purchase_analytic_plans:0
-msgid "Manages analytic distribution and purchase orders."
-msgstr "Gestiona distribución analítica y pedidos de compra."
-
-#. module: purchase
-#: help:purchase.order,minimum_planned_date:0
-msgid "This is computed as the minimum scheduled date of all purchase order lines' products."
-msgstr "Ésto se calcula como la mínima fecha planificada para todos los productos de las líneas del pedido de compra."
-
-#. module: purchase
-#: selection:purchase.report,month:0
-msgid "August"
-msgstr "Agosto"
-
-#. module: purchase
-#: field:purchase.installer,purchase_requisition:0
-msgid "Purchase Requisition"
-msgstr "Petición de compra"
-
-#. module: purchase
-#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
-msgid "Units of Measure Categories"
-msgstr "Categorías de unidades de medida"
-
-#. module: purchase
-#: view:purchase.report:0
-#: field:purchase.report,delay_pass:0
-msgid "Days to Deliver"
-msgstr "Días para entregar"
-
-#. module: purchase
-#: model:ir.ui.menu,name:purchase.menu_action_picking_tree_in_move
-#: model:ir.ui.menu,name:purchase.menu_procurement_management_inventory
-msgid "Receive Products"
-msgstr "Recibir productos"
-
-#. module: purchase
-#: model:ir.model,name:purchase.model_procurement_order
-msgid "Procurement"
-msgstr "Abastecimiento"
-
-#. module: purchase
-#: view:purchase.order:0
-#: field:purchase.order,invoice_ids:0
-msgid "Invoices"
-msgstr "Facturas"
-
-#. module: purchase
-#: model:process.node,note:purchase.process_node_purchaseorder0
-msgid "Confirmed purchase order to invoice"
-msgstr "Pedido de compra confirmado para facturar"
-
-#. module: purchase
-#: field:purchase.installer,config_logo:0
-msgid "Image"
-msgstr "Imagen"
-
-#. module: purchase
-#: view:purchase.report:0
-msgid "Total Orders Lines by User per month"
-msgstr "Total de líneas de pedidos por usuario por mes"
-
-#. module: purchase
-#: view:purchase.report:0
-#: field:purchase.report,month:0
-msgid "Month"
-msgstr "Mes"
-
-#. module: purchase
-#: selection:purchase.report,state:0
-msgid "Waiting Supplier Ack"
-msgstr "Esperando aceptación de proveedor"
-
-#. module: purchase
-#: report:purchase.quotation:0
-msgid "Request for Quotation :"
-msgstr "Presupuesto solicitado:"
-
-#. module: purchase
-#: view:board.board:0
-#: model:ir.actions.act_window,name:purchase.purchase_waiting
-msgid "Purchase Order Waiting Approval"
-msgstr "Esperando aprobacion de Pedido de compra"
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Total Untaxed amount"
-msgstr "Total de monto sin impuestos"
-
-#. module: purchase
-#: field:purchase.order,shipped:0
-#: field:purchase.order,shipped_rate:0
-msgid "Received"
-msgstr "Recibido"
-
-#. module: purchase
-#: model:process.node,note:purchase.process_node_packinglist0
-msgid "List of ordered products."
-msgstr "Lista de productos solicitados."
-
-#. module: purchase
-#: help:purchase.order,picking_ids:0
-msgid "This is the list of picking list that have been generated for this purchase"
-msgstr "Ésta es la lista de ordenes generadas por esta compra"
-
-#. module: purchase
-#: model:ir.module.module,shortdesc:purchase.module_meta_information
-#: model:ir.ui.menu,name:purchase.menu_procurement_management
-msgid "Purchase Management"
-msgstr "Gestion de Compras"
-
-#. module: purchase
-#: model:process.node,note:purchase.process_node_invoiceafterpacking0
-#: model:process.node,note:purchase.process_node_invoicecontrol0
-msgid "To be reviewed by the accountant."
-msgstr "Para ser revisado por el contador."
-
-#. module: purchase
-#: model:ir.actions.act_window,name:purchase.purchase_line_form_action2
-#: model:ir.ui.menu,name:purchase.menu_purchase_line_order_draft
-msgid "Purchase Lines Not Invoiced"
-msgstr "Líneas de compra no facturadas"
-
-#. module: purchase
-#: report:purchase.order:0
-msgid "Taxes :"
-msgstr "Impuestos :"
-
-#. module: purchase
-#: field:purchase.order,invoiced_rate:0
-#: field:purchase.order.line,invoiced:0
-msgid "Invoiced"
-msgstr "Facturado"
-
-#. module: purchase
-#: view:purchase.report:0
-#: field:purchase.report,category_id:0
-msgid "Category"
-msgstr "Categoría"
-
-#. module: purchase
-#: model:process.node,note:purchase.process_node_approvepurchaseorder0
-#: model:process.node,note:purchase.process_node_confirmpurchaseorder0
-msgid "State of the Purchase Order."
-msgstr "Estado del pedido de compra."
-
-#. module: purchase
-#: view:purchase.report:0
-msgid "  Year  "
-msgstr "  Año  "
-
-#. module: purchase
-#: field:purchase.report,state:0
-msgid "Order State"
-msgstr "Estado del pedido"
-
-#. module: purchase
-#: model:ir.actions.act_window,name:purchase.action_view_purchase_line_invoice
-msgid "Create invoices"
-msgstr "Crear facturas"
-
-#. module: purchase
-#: model:ir.model,name:purchase.model_purchase_order_line
-#: view:purchase.order.line:0
-#: field:stock.move,purchase_line_id:0
-msgid "Purchase Order Line"
-msgstr "Línea de pedido de compra"
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Calendar View"
-msgstr "Vista calendario"
-
-#. module: purchase
-#: model:ir.model,name:purchase.model_purchase_order_group
-msgid "Purchase Order Merge"
-msgstr "Fusión pedido compra"
-
-#. module: purchase
-#: report:purchase.quotation:0
-msgid "Regards,"
-msgstr "Recuerdos,"
-
-#. module: purchase
-#: model:ir.actions.act_window,name:purchase.action_negotiation_by_supplier
-#: view:purchase.report:0
-msgid "Negotiation by Supplier"
-msgstr "Negociación por el proveedor"
-
-#. module: purchase
-#: view:res.partner:0
-msgid "Purchase Properties"
-msgstr "Propiedades de compra"
-
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_purchaseinvoice0
-msgid "A purchase order generates a supplier invoice, as soon as it is confirmed by the buyer. Depending on the Invoicing control of the purchase order, the invoice is based on received or on ordered quantities."
-msgstr "Un pedido de compra genera una factura de proveedor, tan pronto como la confirme el comprador. En función del control de facturación del pedido de compra, la factura se basa en las cantidades recibidas u ordenadas."
-
-#. module: purchase
-#: field:purchase.order,amount_untaxed:0
-msgid "Untaxed Amount"
-msgstr "Monto sin impuestos"
-
-#. module: purchase
-#: help:purchase.order,invoiced:0
-msgid "It indicates that an invoice has been paid"
-msgstr "Indica que una factura ha sido pagada."
-
-#. module: purchase
-#: model:process.node,note:purchase.process_node_packinginvoice0
-msgid "Outgoing products to invoice"
-msgstr "Productos salientes a facturar"
-
-#. module: purchase
-#: view:purchase.installer:0
-msgid "Configure"
-msgstr "Configurar"
-
-#. module: purchase
-#: model:ir.actions.act_window,name:purchase.action_qty_per_product
-#: view:purchase.report:0
-msgid "Qty. per product"
-msgstr "Ctdad por producto"
-
-#. module: purchase
-#: constraint:stock.move:0
-msgid "You try to assign a lot which is not from the same product"
-msgstr "Está intentando asignar un lote que no es del mismo producto"
-
-#. module: purchase
-#: help:purchase.order,date_order:0
-msgid "Date on which this document has been created."
-msgstr "Fecha de la creación de este documento."
-
-#. module: purchase
-#: view:res.partner:0
-msgid "Sales & Purchases"
-msgstr "Ventas & Compras"
-
-#. module: purchase
-#: selection:purchase.report,month:0
-msgid "June"
-msgstr "Junio"
-
-#. module: purchase
-#: model:ir.model,name:purchase.model_purchase_report
-msgid "Purchases Orders"
-msgstr "Pedidos de compras"
-
-#. module: purchase
-#: view:purchase.order.line:0
-msgid "Manual Invoices"
-msgstr "Facturas manuales"
-
-#. module: purchase
-#: code:addons/purchase/purchase.py:318
-#, python-format
-msgid "Somebody has just confirmed a purchase with an amount over the defined limit"
-msgstr "Alguien ha confirmado un pedido con un importe por encima del límite definido"
-
-#. module: purchase
-#: selection:purchase.report,month:0
-msgid "November"
-msgstr "Noviembre"
-
-#. module: purchase
-#: view:purchase.report:0
-msgid "Extended Filters..."
-msgstr "Filtros extendidos..."
-
-#. module: purchase
-#: code:addons/purchase/purchase.py:362
-#: code:addons/purchase/wizard/purchase_line_invoice.py:123
-#, python-format
-msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
-msgstr "No se ha definido una cuenta de gastos para este producto: \"%s\" (id:%d)"
-
-#. module: purchase
-#: code:addons/purchase/purchase.py:418
-#, python-format
-msgid "You must first cancel all invoices attached to this purchase order."
-msgstr "Primero debe cancelar todas las facturas asociadas a este pedido de compra."
-
-#. module: purchase
-#: code:addons/purchase/wizard/purchase_order_group.py:48
-#, python-format
-msgid "Please select multiple order to merge in the list view."
-msgstr "Seleccione múltiples pedidos a fusionar en la vista listado."
-
-#. module: purchase
-#: model:process.transition,name:purchase.process_transition_createpackinglist0
-msgid "Pick list generated"
-msgstr "Orden generada"
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Exception"
-msgstr "Excepción"
-
-#. module: purchase
-#: selection:purchase.report,month:0
-msgid "October"
-msgstr "Octubre"
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Compute"
-msgstr "Calcular"
-
-#. module: purchase
-#: model:ir.module.module,description:purchase.module_meta_information
-msgid "\n"
-"    Purchase module is for generating a purchase order for purchase of goods from a supplier.\n"
-"    A supplier invoice is created for the particular order placed\n"
-"    Dashboard for purchase management that includes:\n"
-"    * Current Purchase Orders\n"
-"    * Draft Purchase Orders\n"
-"    * Graph for quantity and amount per month    \n"
-"\n"
-"    "
-msgstr "\n"
-"    El módulo de compras permite generar pedidos de compra para adquirir bienes de un proveedor.\n"
-"    Se crea una factura de proveedor para un pedido en concreto.\n"
-"    El tablero para la gestión de compras incluye:\n"
-"    * Pedidos actuales de compra.\n"
-"    * Pedidos de compra en borrador.\n"
-"    * Gráfico de cantidad e importe por mes.    \n"
-"\n"
-"    "
-
-#. module: purchase
-#: code:addons/purchase/purchase.py:696
-#, python-format
-msgid "The selected supplier has a minimal quantity set to %s, you cannot purchase less."
-msgstr "El proveedor seleccionado tiene establecida una cantidad mínima a %s, no puede comprar menos."
-
-#. module: purchase
-#: selection:purchase.report,month:0
-msgid "January"
-msgstr "Enero"
-
-#. module: purchase
-#: model:ir.model,name:purchase.model_res_company
-msgid "Companies"
-msgstr "Compañías"
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Cancel Purchase Order"
-msgstr "Cancelar pedido de compra"
-
-#. module: purchase
-#: constraint:stock.move:0
-msgid "You must assign a production lot for this product"
-msgstr "Debe asignar un lote de producción para este producto"
-
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_createpackinglist0
-msgid "A pick list is generated to track the incoming products."
-msgstr "Se genera una lista de empaque para el seguimiento de los productos entrantes."
-
-#. module: purchase
-#: model:ir.ui.menu,name:purchase.menu_purchase_deshboard
-msgid "Dashboard"
-msgstr "Tablero"
-
-#. module: purchase
-#: view:purchase.report:0
-#: field:purchase.report,price_standard:0
-msgid "Products Value"
-msgstr "Valor de productos"
-
-#. module: purchase
-#: model:ir.ui.menu,name:purchase.menu_purchase_product_pricelist_type
-msgid "Pricelists Types"
-msgstr "Tipos de lista de precios"
-
-#. module: purchase
-#: view:purchase.order:0
-#: view:purchase.report:0
-msgid "Quotations"
-msgstr "Presupuestos"
-
-#. module: purchase
-#: model:ir.actions.act_window,name:purchase.action_po_per_month_tree
-#: view:purchase.report:0
-msgid "Purchase order per month"
-msgstr "Pedido de compra por mes"
-
-#. module: purchase
-#: view:purchase.order.line:0
-msgid "History"
-msgstr "Historia"
-
-#. module: purchase
-#: model:ir.ui.menu,name:purchase.menu_product_by_category_purchase_form
-msgid "Products by Category"
-msgstr "Productos por categoría"
-
-#. module: purchase
-#: view:purchase.report:0
-#: field:purchase.report,delay:0
-msgid "Days to Validate"
-msgstr "Días a validar"
-
-#. module: purchase
-#: help:purchase.order,origin:0
-msgid "Reference of the document that generated this purchase order request."
-msgstr "Referencia al documento que ha generado esta solicitud de pedido de compra."
-
-#. module: purchase
-#: help:purchase.order,state:0
-msgid "The state of the purchase order or the quotation request. A quotation is a purchase order in a 'Draft' state. Then the order has to be confirmed by the user, the state switch to 'Confirmed'. Then the supplier must confirm the order to change the state to 'Approved'. When the purchase order is paid and received, the state becomes 'Done'. If a cancel action occurs in the invoice or in the reception of goods, the state becomes in exception."
-msgstr "El estado del pedido de compra o de la solicitud de presupuesto. Un presupuesto es un pedido de compra en estado 'Borrador'. Entonces, si el pedido es confirmado por el usuario, el estado cambiará a 'Confirmado'. Entonces el proveedor debe confirmar el pedido para cambiar el estado a 'Aprobado'. Cuando el pedido de compra está pagado y recibido, el estado se convierte en 'Relizado'. Si una acción de cancelación ocurre en la factura o en la recepción de mercancías, el estado se convierte en 'Excepción'."
-
-#. module: purchase
-#: field:purchase.order.line,price_subtotal:0
-msgid "Subtotal"
-msgstr "Subtotal"
-
-#. module: purchase
-#: model:ir.actions.act_window,name:purchase.purchase_rfq
-#: model:ir.ui.menu,name:purchase.menu_purchase_rfq
-msgid "Requests for Quotation"
-msgstr "Solicitudes de presupuesto"
-
-#. module: purchase
-#: help:purchase.order,date_approve:0
-msgid "Date on which purchase order has been approved"
-msgstr "Fecha en que el pedido de compra ha sido aprobado."
-
-#. module: purchase
-#: selection:purchase.order,state:0
-#: selection:purchase.report,state:0
-msgid "Waiting"
-msgstr "En espera"
-
-#. module: purchase
-#: model:product.pricelist.version,name:purchase.ver0
-msgid "Default Purchase Pricelist Version"
-msgstr "Versión lista de precio de compra por defecto"
-
-#. module: purchase
-#: view:purchase.installer:0
-msgid "Extend your Purchases Management Application with additional functionalities."
-msgstr "Extienda su aplicación de gestión de compras con funcionalidades adicionales."
-
-#. module: purchase
-#: model:ir.actions.act_window,name:purchase.action_purchase_install_module
-#: view:purchase.installer:0
-msgid "Purchases Application Configuration"
-msgstr "Configuración aplicación compras"
-
-#. module: purchase
-#: field:purchase.order,fiscal_position:0
-msgid "Fiscal Position"
-msgstr "Posición fiscal"
-
-#. module: purchase
-#: report:purchase.order:0
-msgid "Request for Quotation N°"
-msgstr "Petición de presupuesto Nº"
-
-#. module: purchase
-#: model:process.transition,name:purchase.process_transition_invoicefrompackinglist0
-#: model:process.transition,name:purchase.process_transition_invoicefrompurchase0
-msgid "Invoice"
-msgstr "Factura"
-
-#. module: purchase
-#: selection:purchase.report,month:0
-msgid "December"
-msgstr "Diciembre"
-
-#. module: purchase
-#: model:process.transition.action,name:purchase.process_transition_action_approvingcancelpurchaseorder0
-#: model:process.transition.action,name:purchase.process_transition_action_cancelpurchaseorder0
-#: view:purchase.order:0
-#: view:purchase.order.group:0
-#: view:purchase.order.line_invoice:0
-msgid "Cancel"
-msgstr "Cancelar"
-
-#. module: purchase
-#: view:purchase.order:0
-#: view:purchase.order.line:0
-msgid "Purchase Order Lines"
-msgstr "Líneas pedido de compra"
-
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_approvingpurchaseorder0
-msgid "The supplier approves the Purchase Order."
-msgstr "El proveedor aprueba el pedido de compra."
-
-#. module: purchase
-#: model:ir.actions.act_window,name:purchase.act_res_partner_2_purchase_order
-#: model:ir.actions.act_window,name:purchase.purchase_form_action
-#: model:ir.ui.menu,name:purchase.menu_purchase_form_action
-#: view:purchase.report:0
-msgid "Purchase Orders"
-msgstr "Pedidos de compra"
-
-#. module: purchase
-#: field:purchase.order,origin:0
-msgid "Source Document"
-msgstr "Documento origen"
-
-#. module: purchase
-#: view:purchase.order.group:0
-msgid "Merge orders"
-msgstr "Fusionar pedidos"
-
-#. module: purchase
-#: model:ir.model,name:purchase.model_purchase_order_line_invoice
-msgid "Purchase Order Line Make Invoice"
-msgstr "Línea pedido de compra realiza factura"
-
-#. module: purchase
-#: model:ir.ui.menu,name:purchase.menu_action_picking_tree4
-msgid "Incoming Shipments"
-msgstr "Ordenes de entrada"
-
-#. module: purchase
-#: model:ir.actions.act_window,name:purchase.action_purchase_order_by_user_all
-msgid "Total Orders by User per month"
-msgstr "Total pedidos por usuario mensual"
-
-#. module: purchase
-#: model:ir.actions.report.xml,name:purchase.report_purchase_quotation
-#: selection:purchase.order,state:0
-#: selection:purchase.report,state:0
-msgid "Request for Quotation"
-msgstr "Solicitud de presupuesto"
-
-#. module: purchase
-#: report:purchase.order:0
-msgid "Tél. :"
-msgstr "Tel. :"
-
-#. module: purchase
-#: field:purchase.order,create_uid:0
-#: view:purchase.report:0
-#: field:purchase.report,user_id:0
-msgid "Responsible"
-msgstr "Responsable"
-
-#. module: purchase
-#: report:purchase.order:0
-msgid "Our Order Reference"
-msgstr "Nuestra referencia"
-
-#. module: purchase
-#: view:purchase.order:0
-#: view:purchase.order.line:0
-msgid "Search Purchase Order"
-msgstr "Buscar pedido de compra"
-
-#. module: purchase
-#: field:purchase.order,warehouse_id:0
-#: view:purchase.report:0
-#: field:purchase.report,warehouse_id:0
-msgid "Warehouse"
-msgstr "Almacén"
-
-#. module: purchase
-#: model:process.node,note:purchase.process_node_draftpurchaseorder0
-#: model:process.node,note:purchase.process_node_draftpurchaseorder1
-msgid "Request for Quotations."
-msgstr "Solicitud de presupuesto"
-
-#. module: purchase
-#: report:purchase.order:0
-msgid "Date Req."
-msgstr "Fecha solicitud"
-
-#. module: purchase
-#: field:purchase.order,date_approve:0
-#: field:purchase.report,date_approve:0
-msgid "Date Approved"
-msgstr "Fecha aprobación"
-
-#. module: purchase
-#: code:addons/purchase/purchase.py:417
-#, python-format
-msgid "Could not cancel this purchase order !"
-msgstr "¡No se puede cancelar este pedido de compra!"
-
-#. module: purchase
-#: report:purchase.order:0
-#: field:purchase.order.line,price_unit:0
-msgid "Unit Price"
-msgstr "Precio unidad"
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Delivery & Invoicing"
-msgstr "Envío y Facturación"
-
-#. module: purchase
-#: field:purchase.order.line,date_planned:0
-msgid "Scheduled Date"
-msgstr "Fecha planificada"
-
-#. module: purchase
-#: model:ir.ui.menu,name:purchase.menu_product_in_config_purchase
-#: field:purchase.order,product_id:0
-#: view:purchase.order.line:0
-#: field:purchase.order.line,product_id:0
-#: view:purchase.report:0
-#: field:purchase.report,product_id:0
-msgid "Product"
-msgstr "Producto"
-
-#. module: purchase
-#: model:process.transition,name:purchase.process_transition_confirmingpurchaseorder0
-#: model:process.transition,name:purchase.process_transition_confirmingpurchaseorder1
-msgid "Confirmation"
-msgstr "Confirmación"
-
-#. module: purchase
-#: report:purchase.order:0
-#: field:purchase.order.line,name:0
-#: report:purchase.quotation:0
-msgid "Description"
-msgstr "Descripción"
-
-#. module: purchase
-#: help:res.company,po_lead:0
-msgid "This is the leads/security time for each purchase order."
-msgstr "Este es el plazo de tiempo de seguridad para cada pedido de compra."
-
-#. module: purchase
-#: report:purchase.quotation:0
-msgid "Expected Delivery address:"
-msgstr "Dirección de entrega prevista:"
-
-#. module: purchase
-#: model:ir.actions.act_window,name:purchase.action_stock_move_report_po
-#: model:ir.ui.menu,name:purchase.menu_action_stock_move_report_po
-msgid "Receptions Analysis"
-msgstr "Análisis recepciones"
-
-#. module: purchase
-#: help:purchase.order,amount_untaxed:0
-msgid "The amount without tax"
-msgstr "El importe sin impuestos."
-
-#. module: purchase
-#: model:ir.actions.act_window,help:purchase.action_supplier_address_form
-msgid "Access your supplier records and maintain a good relationship with your suppliers. You can track all your interactions with them through the History tab: emails, orders, meetings, etc."
-msgstr "Acceda a los registros de sus proveedores y mantenga una buena relación con ellos.  Puede mantener el registro de todas sus interacciones con ellos gracias a la pestaña histórico: emails, reuniones, etc."
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Delivery"
-msgstr "Entrega"
-
-#. module: purchase
-#: view:board.board:0
-#: model:ir.actions.act_window,name:purchase.purchase_draft
-msgid "Request for Quotations"
-msgstr "Solicitud de presupuestos"
-
-#. module: purchase
-#: field:purchase.order.line,product_uom:0
-msgid "Product UOM"
-msgstr "UdM del producto"
-
-#. module: purchase
-#: report:purchase.order:0
-#: report:purchase.quotation:0
-msgid "Qty"
-msgstr "Ctdad"
-
-#. module: purchase
-#: field:purchase.order,partner_address_id:0
-msgid "Address"
-msgstr "Dirección"
-
-#. module: purchase
-#: field:purchase.order.line,move_ids:0
-msgid "Reservation"
-msgstr "Reserva"
-
-#. module: purchase
-#: model:ir.actions.act_window,name:purchase.action_purchase_order_report_graph
-#: view:purchase.report:0
-msgid "Total Qty and Amount by month"
-msgstr "Ctdad total e importe por mes"
-
-#. module: purchase
-#: code:addons/purchase/purchase.py:409
-#, python-format
-msgid "Could not cancel purchase order !"
-msgstr "¡No se puede cancelar el pedido de compra!"
-
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder1
-msgid "In case there is no supplier for this product, the buyer can fill the form manually and confirm it. The RFQ becomes a confirmed Purchase Order."
-msgstr "En caso de que no exista ningún proveedor de este producto, el comprador puede rellenar el formulario manualmente y confirmarlo. La solicitud de presupuesto se convierte en un pedido de compra confirmado."
-
-#. module: purchase
-#: selection:purchase.report,month:0
-msgid "February"
-msgstr "Febrero"
-
-#. module: purchase
-#: model:ir.ui.menu,name:purchase.menu_product_category_config_purchase
-msgid "Products Categories"
-msgstr "Categorías de productos"
-
-#. module: purchase
-#: model:ir.actions.act_window,name:purchase.action_purchase_order_report_all
-#: model:ir.ui.menu,name:purchase.menu_action_purchase_order_report_all
-msgid "Purchase Analysis"
-msgstr "Análisis de compra"
-
-#. module: purchase
-#: report:purchase.order:0
-msgid "Your Order Reference"
-msgstr "Su referencia de orden"
-
-#. module: purchase
-#: view:purchase.order:0
-#: field:purchase.order,minimum_planned_date:0
-#: report:purchase.quotation:0
-#: field:purchase.report,expected_date:0
-msgid "Expected Date"
-msgstr "Fecha prevista"
-
-#. module: purchase
-#: model:ir.actions.act_window,name:purchase.action_total_price_by_product_by_state
-#: view:purchase.report:0
-msgid "Total price by product by state"
-msgstr "Total precio por producto por estado"
-
-#. module: purchase
-#: report:purchase.quotation:0
-msgid "TVA:"
-msgstr "IVA:"
-
-#. module: purchase
-#: report:purchase.order:0
-#: field:purchase.order,date_order:0
-msgid "Order Date"
-msgstr "Ordenado por Fecha"
-
-#. module: purchase
-#: report:purchase.order:0
-msgid "Shipping address :"
-msgstr "Dirección de envío: "
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "Purchase Control"
-msgstr "Control de compra"
-
-#. module: purchase
-#: selection:purchase.report,month:0
-msgid "March"
-msgstr "Marzo"
-
-#. module: purchase
-#: selection:purchase.report,month:0
-msgid "April"
-msgstr "Abril"
-
-#. module: purchase
-#: view:purchase.order.group:0
-msgid " Please note that: \n"
-" \n"
-" Orders will only be merged if: \n"
-" * Purchase Orders are in draft \n"
-" * Purchase Orders belong to the same supplier \n"
-" * Purchase Orders are have same stock location, same pricelist \n"
-" \n"
-" Lines will only be merged if: \n"
-" * Order lines are exactly the same except for the product,quantity and unit \n"
-" "
-msgstr " Tenga en cuenta que: \n"
-" \n"
-" Los pedidos sólo se fusionarán si: \n"
-" * Los pedidos de compra están en borrador. \n"
-" * Los pedidos pertenecen al mismo proveedor. \n"
-" * Los pedidos tienen la misma ubicación de stock y la misma lista de precios. \n"
-" \n"
-" Las líneas sólo se fusionarán si: \n"
-" * Las líneas de pedido son exactamente iguales excepto por el producto, cantidad y unidades. \n"
-" "
-
-#. module: purchase
-#: view:purchase.report:0
-#: field:purchase.report,name:0
-msgid "Year"
-msgstr "Año"
-
-#. module: purchase
-#: field:purchase.report,negociation:0
-msgid "Purchase-Standard Price"
-msgstr "Precio compra-estándar"
-
-#. module: purchase
-#: model:product.pricelist.type,name:purchase.pricelist_type_purchase
-#: field:res.partner,property_product_pricelist_purchase:0
-msgid "Purchase Pricelist"
-msgstr "Lista de precios de compra"
-
-#. module: purchase
-#: field:purchase.order,invoice_method:0
-msgid "Invoicing Control"
-msgstr "Método de facturación"
-
-#. module: purchase
-#: model:process.transition.action,name:purchase.process_transition_action_approvingpurchaseorder0
-msgid "Approve"
-msgstr "Aprobar"
-
-#. module: purchase
-#: view:purchase.order:0
-msgid "To Approve"
-msgstr "Para aprobar"
-
-#. module: purchase
-#: view:purchase.order.line:0
-msgid "Invoicing"
-msgstr "Facturación"
-
-#. module: purchase
-#: help:purchase.order.line,state:0
-msgid " * The 'Draft' state is set automatically when purchase order in draft state.                                        \n"
-"* The 'Confirmed' state is set automatically as confirm when purchase order in confirm state.                                        \n"
-"* The 'Done' state is set automatically when purchase order is set as done.                                        \n"
-"* The 'Cancelled' state is set automatically when user cancel purchase order."
-msgstr " * El estado 'Borrador' se establece automáticamente cuando crea un pedido (presupuesto) de compra.                                        \n"
-"* El estado 'Confirmado' se establece automáticamente al confirmar el pedido de compra.                                        \n"
-"* El estado 'Hecho' se establece automáticamente cuando el pedido de compra se realiza.                                        \n"
-"* El estado 'Cancelado' se establece automáticamente cuando el usuario cancela un pedido de compra."
-
-#. module: purchase
-#: code:addons/purchase/purchase.py:424
-#, python-format
-msgid "Purchase order '%s' is cancelled."
-msgstr "El pedido de compra '%s' está cancelado."
-
-#. module: purchase
-#: field:purchase.order,amount_total:0
-msgid "Total"
-msgstr "Total"
-
-#. module: purchase
-#: model:ir.ui.menu,name:purchase.menu_product_pricelist_action_purhase
-msgid "Pricelist Versions"
-msgstr "Versiones de tarifa"
-
-#. module: purchase
-#: model:ir.actions.act_window,name:purchase.action_supplier_address_form
-msgid "Addresses"
-msgstr "Direcciones"
-
-#. module: purchase
-#: view:purchase.order.group:0
-msgid "Are you sure you want to merge these orders?"
-msgstr "¿Está seguro que quiere fusionar estos pedidos?"
-
-#. module: purchase
-#: view:purchase.order:0
-#: view:purchase.order.line:0
-#: view:purchase.report:0
-msgid "Group By..."
-msgstr "Agrupar por..."
-
-#. module: purchase
-#: model:process.transition,name:purchase.process_transition_purchaseinvoice0
-msgid "From a purchase order"
-msgstr "Desde un pedido de compra"
-
-#. module: purchase
-#: report:purchase.order:0
-msgid "TVA :"
-msgstr "RFC:"
-
-#. module: purchase
-#: help:purchase.order,amount_total:0
-msgid "The total amount"
-msgstr "El importe total."
-
-#. module: purchase
-#: selection:purchase.report,month:0
-msgid "May"
-msgstr "Mayo"
-
-#. module: purchase
-#: field:res.company,po_lead:0
-msgid "Purchase Lead Time"
-msgstr "Plazo de tiempo de compra"
-
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_invoicefrompurchase0
-msgid "The invoice is created automatically if the Invoice control of the purchase order is 'On order'. The invoice can also be generated manually by the accountant (Invoice control = Manual)."
-msgstr "Se crea automáticamente la factura si el control de facturación del pedido de compra es 'Desde pedido'. La factura también puede ser generada manualmente por el contador (control facturación = Manual)."
-
-#. module: purchase
-#: model:process.process,name:purchase.process_process_purchaseprocess0
-msgid "Purchase"
-msgstr "Compra"
-
-#. module: purchase
-#: model:ir.model,name:purchase.model_res_partner
-#: field:purchase.order.line,partner_id:0
-msgid "Partner"
-msgstr "Empresa"
-
-#. module: purchase
-#: code:addons/purchase/purchase.py:662
-#, python-format
-msgid "You have to select a partner in the purchase form !\n"
-"Please set one partner before choosing a product."
-msgstr "¡Debe seleccionar una empresa en el formulario de compra!\n"
-"Por favor seleccione una empresa antes de seleccionar un producto."
-
-#. module: purchase
-#: view:purchase.installer:0
-msgid "title"
-msgstr "título"
-
-#. module: purchase
-#: model:ir.model,name:purchase.model_stock_partial_move
-msgid "Partial Move"
-msgstr "Movimiento parcial"
-
-#. module: purchase
-#: view:purchase.order.line:0
-msgid "Stock Moves"
-msgstr "Movimientos de stock"
-
-#. module: purchase
-#: model:ir.ui.menu,name:purchase.menu_purchase_unit_measure_purchase
-#: model:ir.ui.menu,name:purchase.menu_purchase_uom_form_action
-msgid "Units of Measure"
-msgstr "Unidades de medida"
-
-#. module: purchase
-#: view:purchase.report:0
-msgid "Orders"
-msgstr "Pedidos"
-
-#. module: purchase
-#: help:purchase.order,name:0
-msgid "unique number of the purchase order,computed automatically when the purchase order is created"
-msgstr "Número único del pedido de compra, calculado de forma automática cuando el pedido de compra se crea."
-
-#. module: purchase
-#: model:ir.actions.act_window,name:purchase.open_board_purchase
-#: model:ir.ui.menu,name:purchase.menu_board_purchase
-msgid "Purchase Dashboard"
-msgstr "Tablero de compras"
-
diff --git a/addons/purchase/i18n/et.po b/addons/purchase/i18n/et.po
index d0f3b9144ed..37b03923ce9 100644
--- a/addons/purchase/i18n/et.po
+++ b/addons/purchase/i18n/et.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:45+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:56+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:735
@@ -1770,7 +1770,7 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: model:email.template,body_text:purchase.email_template_edi_purchase
+#: model:email.template,body:purchase.email_template_edi_purchase
 msgid ""
 "\n"
 "Hello${object.partner_address_id.name and ' ' or "
diff --git a/addons/purchase/i18n/fi.po b/addons/purchase/i18n/fi.po
index e945ee225a1..aff6368643a 100644
--- a/addons/purchase/i18n/fi.po
+++ b/addons/purchase/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:45+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:56+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -1818,7 +1818,7 @@ msgstr ""
 "Ole hyvä ja valitse yksi ennenkuin valitset tuotteen."
 
 #. module: purchase
-#: model:email.template,body_text:purchase.email_template_edi_purchase
+#: model:email.template,body:purchase.email_template_edi_purchase
 msgid ""
 "\n"
 "Hello${object.partner_address_id.name and ' ' or "
diff --git a/addons/purchase/i18n/fr.po b/addons/purchase/i18n/fr.po
index 3824a516662..0fd3f5fb99c 100644
--- a/addons/purchase/i18n/fr.po
+++ b/addons/purchase/i18n/fr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:45+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:56+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -1870,7 +1870,7 @@ msgstr ""
 "Veuillez en sélectionner un avant de choisir un produit."
 
 #. module: purchase
-#: model:email.template,body_text:purchase.email_template_edi_purchase
+#: model:email.template,body:purchase.email_template_edi_purchase
 msgid ""
 "\n"
 "Hello${object.partner_address_id.name and ' ' or "
diff --git a/addons/purchase/i18n/gl.po b/addons/purchase/i18n/gl.po
index fbfa5ac46c2..65475c658d9 100644
--- a/addons/purchase/i18n/gl.po
+++ b/addons/purchase/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:45+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:56+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -1749,7 +1749,7 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: model:email.template,body_text:purchase.email_template_edi_purchase
+#: model:email.template,body:purchase.email_template_edi_purchase
 msgid ""
 "\n"
 "Hello${object.partner_address_id.name and ' ' or "
diff --git a/addons/purchase/i18n/hr.po b/addons/purchase/i18n/hr.po
index 7dc6dad6263..ab84932d9b4 100644
--- a/addons/purchase/i18n/hr.po
+++ b/addons/purchase/i18n/hr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:45+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:56+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -1820,7 +1820,7 @@ msgstr ""
 "naloga za nabavu."
 
 #. module: purchase
-#: model:email.template,body_text:purchase.email_template_edi_purchase
+#: model:email.template,body:purchase.email_template_edi_purchase
 msgid ""
 "\n"
 "Hello${object.partner_address_id.name and ' ' or "
diff --git a/addons/purchase/i18n/hu.po b/addons/purchase/i18n/hu.po
index 21799497083..32fc1a68540 100644
--- a/addons/purchase/i18n/hu.po
+++ b/addons/purchase/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:45+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:56+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -1842,7 +1842,7 @@ msgstr ""
 "Kérem, állítsa be, mielőtt kiválasztaná a terméket!"
 
 #. module: purchase
-#: model:email.template,body_text:purchase.email_template_edi_purchase
+#: model:email.template,body:purchase.email_template_edi_purchase
 msgid ""
 "\n"
 "Hello${object.partner_address_id.name and ' ' or "
diff --git a/addons/purchase/i18n/id.po b/addons/purchase/i18n/id.po
index a2c34dd8bb7..23dd0de81e9 100644
--- a/addons/purchase/i18n/id.po
+++ b/addons/purchase/i18n/id.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:45+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:56+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -1808,7 +1808,7 @@ msgstr ""
 "Harap menetapkan satu sebelum memilih produk."
 
 #. module: purchase
-#: model:email.template,body_text:purchase.email_template_edi_purchase
+#: model:email.template,body:purchase.email_template_edi_purchase
 msgid ""
 "\n"
 "Hello${object.partner_address_id.name and ' ' or "
diff --git a/addons/purchase/i18n/it.po b/addons/purchase/i18n/it.po
index 8dbffb30980..8e0d8bd90db 100644
--- a/addons/purchase/i18n/it.po
+++ b/addons/purchase/i18n/it.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:45+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:56+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -1825,7 +1825,7 @@ msgstr ""
 "Inserire quindi una di queste voci prima di scegliere il prodotto."
 
 #. module: purchase
-#: model:email.template,body_text:purchase.email_template_edi_purchase
+#: model:email.template,body:purchase.email_template_edi_purchase
 msgid ""
 "\n"
 "Hello${object.partner_address_id.name and ' ' or "
diff --git a/addons/purchase/i18n/ja.po b/addons/purchase/i18n/ja.po
index 3b6c33c2829..3c3503dda31 100644
--- a/addons/purchase/i18n/ja.po
+++ b/addons/purchase/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:45+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:56+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -1789,7 +1789,7 @@ msgstr ""
 "製品を選択する前にどちらかをセットして下さい。"
 
 #. module: purchase
-#: model:email.template,body_text:purchase.email_template_edi_purchase
+#: model:email.template,body:purchase.email_template_edi_purchase
 msgid ""
 "\n"
 "Hello${object.partner_address_id.name and ' ' or "
diff --git a/addons/purchase/i18n/ko.po b/addons/purchase/i18n/ko.po
index 3a44173d01c..fdebdb6a145 100644
--- a/addons/purchase/i18n/ko.po
+++ b/addons/purchase/i18n/ko.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:45+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:56+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -1752,7 +1752,7 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: model:email.template,body_text:purchase.email_template_edi_purchase
+#: model:email.template,body:purchase.email_template_edi_purchase
 msgid ""
 "\n"
 "Hello${object.partner_address_id.name and ' ' or "
diff --git a/addons/purchase/i18n/lt.po b/addons/purchase/i18n/lt.po
index 62a9269cb2f..e4ea511a9b6 100644
--- a/addons/purchase/i18n/lt.po
+++ b/addons/purchase/i18n/lt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:45+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:56+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -1754,7 +1754,7 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: model:email.template,body_text:purchase.email_template_edi_purchase
+#: model:email.template,body:purchase.email_template_edi_purchase
 msgid ""
 "\n"
 "Hello${object.partner_address_id.name and ' ' or "
diff --git a/addons/purchase/i18n/lv.po b/addons/purchase/i18n/lv.po
index b8c585b4451..2407428bfb1 100644
--- a/addons/purchase/i18n/lv.po
+++ b/addons/purchase/i18n/lv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:45+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:56+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -1749,7 +1749,7 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: model:email.template,body_text:purchase.email_template_edi_purchase
+#: model:email.template,body:purchase.email_template_edi_purchase
 msgid ""
 "\n"
 "Hello${object.partner_address_id.name and ' ' or "
diff --git a/addons/purchase/i18n/mn.po b/addons/purchase/i18n/mn.po
index e42ac03c37e..578cee625d4 100644
--- a/addons/purchase/i18n/mn.po
+++ b/addons/purchase/i18n/mn.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:45+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:56+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -1855,7 +1855,7 @@ msgstr ""
 "Бараа сонгохоосоо өмнө аль нэгийг нь сонго."
 
 #. module: purchase
-#: model:email.template,body_text:purchase.email_template_edi_purchase
+#: model:email.template,body:purchase.email_template_edi_purchase
 msgid ""
 "\n"
 "Hello${object.partner_address_id.name and ' ' or "
diff --git a/addons/purchase/i18n/nb.po b/addons/purchase/i18n/nb.po
index 76d56cdc691..c9da9748bf7 100644
--- a/addons/purchase/i18n/nb.po
+++ b/addons/purchase/i18n/nb.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:45+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:56+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -23,16 +23,18 @@ msgid ""
 "The buyer has to approve the RFQ before being sent to the supplier. The RFQ "
 "becomes a confirmed Purchase Order."
 msgstr ""
+"Kjøper må godkjenne forespørselen før den sendes leverandør. Forespørselen "
+"blir en bekreftet innkjøpsordre."
 
 #. module: purchase
 #: model:process.node,note:purchase.process_node_productrecept0
 msgid "Incoming products to control"
-msgstr "Inngående varer til kontroll"
+msgstr "Innkommende produkter til kontroll."
 
 #. module: purchase
 #: field:purchase.order,invoiced:0
 msgid "Invoiced & Paid"
-msgstr "Fakturert og betalt"
+msgstr "Fakturert & Betalt"
 
 #. module: purchase
 #: field:purchase.order,location_id:0 view:purchase.report:0
@@ -44,18 +46,18 @@ msgstr "Destinasjon"
 #: code:addons/purchase/purchase.py:236
 #, python-format
 msgid "In order to delete a purchase order, it must be cancelled first!"
-msgstr "for å kunne slette en innkjøpsordre, må den først kanselleres!"
+msgstr "For å slette en bestilling, må den bli kansellert først!"
 
 #. module: purchase
 #: help:purchase.report,date:0
 msgid "Date on which this document has been created"
-msgstr "Dato for når dokumentet ble laget"
+msgstr "Dato dette dokumentet er blitt opprettet"
 
 #. module: purchase
 #: view:purchase.order:0 view:purchase.order.line:0 view:purchase.report:0
 #: view:stock.picking:0
 msgid "Group By..."
-msgstr "Grupper etter..."
+msgstr "Grupper etter ..."
 
 #. module: purchase
 #: field:purchase.order,create_uid:0 view:purchase.report:0
@@ -75,6 +77,14 @@ msgid ""
 "supplier invoices: based on the order, based on the receptions or manual "
 "encoding."
 msgstr ""
+"Du kan opprette en forespørsel om kostnadsoverslag når du ønsker å kjøpe "
+"produkter til en leverandør, men kjøpet er ikke bekreftet enda. Bruk også "
+"denne menyen til å gjennomgå anmodninger om tilbudet opprettes automatisk "
+"basert på dine logistiske regler (minimum lager, MTO, etc). Du kan "
+"konvertere forespørsel om kostnadsoverslag til et kjøp etter at ordren er "
+"bekreftet. Hvis du bruker den utvidede grensesnittet (fra brukerens "
+"preferanser), kan du velge måten å kontrollere dine leverandørfakturaer: "
+"basert på rekkefølgen, basert på mottakelser eller manuell koding."
 
 #. module: purchase
 #: view:purchase.order:0
@@ -111,6 +121,9 @@ msgid ""
 "products, etc. For each purchase order, you can track the products received, "
 "and control the supplier invoices."
 msgstr ""
+"Bruk denne menyen til å søke innenfor dine bestillinger av referanser, "
+"leverandør, produkter osv. For hver bestilling, kan du spore produktene "
+"mottatt, og kontrollere leverandørfakturaer."
 
 #. module: purchase
 #: code:addons/purchase/wizard/purchase_line_invoice.py:145
@@ -138,7 +151,7 @@ msgstr "Ingen prisliste!"
 #. module: purchase
 #: model:ir.model,name:purchase.model_purchase_config_wizard
 msgid "purchase.config.wizard"
-msgstr ""
+msgstr "purchase.config.wizard"
 
 #. module: purchase
 #: view:board.board:0 model:ir.actions.act_window,name:purchase.purchase_draft
@@ -189,6 +202,8 @@ msgid ""
 "customer.In this case, it will remove the warehouse link and set the "
 "customer location."
 msgstr ""
+"Angi adresse dersom du ønsker å levere direkte fra leverandør til kunde. I "
+"så tilfelle vil kobling til lager fjernes og kundelokasjon bli angitt."
 
 #. module: purchase
 #: help:res.partner,property_product_pricelist_purchase:0
@@ -217,7 +232,7 @@ msgstr "Innstillinger for innkjøp"
 #. module: purchase
 #: model:ir.model,name:purchase.model_stock_partial_picking
 msgid "Partial Picking Processing Wizard"
-msgstr ""
+msgstr "Veiviser for delplukking"
 
 #. module: purchase
 #: view:purchase.order.line:0
@@ -242,7 +257,7 @@ msgstr "Basert på dannet fakturakladd"
 #. module: purchase
 #: view:purchase.report:0
 msgid "Order of Day"
-msgstr "Ordre fra dag"
+msgstr "Dagens ordre"
 
 #. module: purchase
 #: view:board.board:0
@@ -321,6 +336,8 @@ msgid ""
 "A Pick list generates an invoice. Depending on the Invoicing control of the "
 "sale order, the invoice is based on delivered or on ordered quantities."
 msgstr ""
+"En plukkliste danner faktura. Fakturaen baseres enten på levert eller "
+"bestilt antall avhengig av parameter for faktureringsregel på ordren."
 
 #. module: purchase
 #: selection:purchase.order,state:0 selection:purchase.order.line,state:0
@@ -378,12 +395,12 @@ msgstr "Lagerbevegelser"
 #: code:addons/purchase/purchase.py:419
 #, python-format
 msgid "You must first cancel all invoices related to this purchase order."
-msgstr ""
+msgstr "Du må først annullere alle fakturaer tilhørende innkjøpsordren."
 
 #. module: purchase
 #: field:purchase.report,dest_address_id:0
 msgid "Dest. Address Contact Name"
-msgstr ""
+msgstr "Mottakeradresse kontaktnavn"
 
 #. module: purchase
 #: report:purchase.order:0
@@ -394,7 +411,7 @@ msgstr "TVA :"
 #: code:addons/purchase/purchase.py:326
 #, python-format
 msgid "Purchase order '%s' has been set in draft state."
-msgstr ""
+msgstr "Status for innkjøpsordre '%s' er satt til Utkast."
 
 #. module: purchase
 #: field:purchase.order.line,account_analytic_id:0
@@ -474,7 +491,7 @@ msgstr "Gjennomsnittspris"
 #. module: purchase
 #: view:stock.picking:0
 msgid "Incoming Shipments already processed"
-msgstr ""
+msgstr "Innkommende leveranse er allerede behandlet"
 
 #. module: purchase
 #: report:purchase.order:0
@@ -511,6 +528,8 @@ msgid ""
 "of the purchase order, the invoice is based on received or on ordered "
 "quantities."
 msgstr ""
+"En plukkliste genererer en leverandør faktura. Avhengig Fakturering kontroll "
+"av bestillingen, blir fakturaen basert på mottatt eller bestilte mengder."
 
 #. module: purchase
 #: model:ir.actions.act_window,help:purchase.purchase_line_form_action2
@@ -521,6 +540,11 @@ msgid ""
 "supplier invoice, you can generate a draft supplier invoice based on the "
 "lines from this menu."
 msgstr ""
+"Hvis du setter Fakturering Kontroll på en bestilling som \"Basert på "
+"innkjøpsordrenumre linjer\", kan du spore alle innkjøpsordren linjer som du "
+"ennå ikke har mottatt leverandørfaktura. Når du er klar til å motta en "
+"leverandør faktura, kan du generere et utkast leverandør faktura basert på "
+"linjene fra denne menyen."
 
 #. module: purchase
 #: view:purchase.order:0
@@ -533,6 +557,8 @@ msgid ""
 "Reception Analysis allows you to easily check and analyse your company order "
 "receptions and the performance of your supplier's deliveries."
 msgstr ""
+"Mottak analyse kan du enkelt sjekke og analysere bedriftens bestiller "
+"mottakelser og resultatene til leverandør leveranser."
 
 #. module: purchase
 #: report:purchase.quotation:0
@@ -621,6 +647,8 @@ msgid ""
 "You have to select a partner in the purchase form !\n"
 "Please set one partner before choosing a product."
 msgstr ""
+"Du må velge en partner i kjøp av skjemaet!\n"
+"Vennligst sett en partner før du velger et produkt."
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:349
@@ -636,6 +664,9 @@ msgid ""
 "order is 'On picking'. The invoice can also be generated manually by the "
 "accountant (Invoice control = Manual)."
 msgstr ""
+"Fakturaen opprettes automatisk hvis Faktura kontroll av innkjøpsordren er "
+"'på plukke'. Fakturaen kan også genereres manuelt av revisor (Faktura "
+"kontroll = Manuell)."
 
 #. module: purchase
 #: report:purchase.order:0
@@ -649,6 +680,9 @@ msgid ""
 "purchase history and performance. From this menu you can track your "
 "negotiation performance, the delivery performance of your suppliers, etc."
 msgstr ""
+"Oppkjøpsanalyse kan du enkelt sjekke og analysere bedriftens kjøp historie "
+"og ytelse. Fra denne menyen kan du spore din forhandling ytelse, levering "
+"ytelsen til leverandørene, etc."
 
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_configuration_misc
@@ -664,7 +698,7 @@ msgstr "Den valgte leverandøren selger dette produktet bare som %s"
 #. module: purchase
 #: view:purchase.report:0
 msgid "Reference UOM"
-msgstr ""
+msgstr "Referanse UOM"
 
 #. module: purchase
 #: field:purchase.order.line,product_qty:0 view:purchase.report:0
@@ -734,6 +768,10 @@ msgid ""
 "according to your settings. Once you receive a supplier invoice, you can "
 "match it with the draft invoice and validate it."
 msgstr ""
+"Bruk denne menyen til å kontrollere fakturaene som skal mottas fra din "
+"leverandør. OpenERP pregenerates utkast fakturaer fra dine innkjøpsordrer "
+"eller mottagelser, i henhold til dine innstillinger. Når du mottar en "
+"leverandør faktura, kan du matche det med utkastet faktura og bekrefte det."
 
 #. module: purchase
 #: model:process.node,name:purchase.process_node_draftpurchaseorder0
@@ -807,6 +845,8 @@ msgid ""
 "This is computed as the minimum scheduled date of all purchase order lines' "
 "products."
 msgstr ""
+"Dette er beregnet som minimum planlagt dato for alle kjøp ordrelinjer "
+"produkter."
 
 #. module: purchase
 #: model:ir.model,name:purchase.model_purchase_order_group
@@ -868,6 +908,7 @@ msgstr "Måned"
 #: model:email.template,subject:purchase.email_template_edi_purchase
 msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
 msgstr ""
+"$ {object.company_id.name} Bestill (Ref $ {object.name eller 'n / a'})"
 
 #. module: purchase
 #: report:purchase.quotation:0
@@ -908,7 +949,7 @@ msgstr "Dette er plukklisten som er opprettet fra aktuell innkjøpsordren"
 #. module: purchase
 #: view:stock.picking:0
 msgid "Is a Back Order"
-msgstr ""
+msgstr "Er en restordre"
 
 #. module: purchase
 #: model:process.node,note:purchase.process_node_invoiceafterpacking0
@@ -945,7 +986,7 @@ msgstr "Status på innkjøpsordre"
 #. module: purchase
 #: field:purchase.order,dest_address_id:0
 msgid "Destination Address"
-msgstr ""
+msgstr "Bestemmelse adresse"
 
 #. module: purchase
 #: field:purchase.report,state:0
@@ -997,7 +1038,7 @@ msgstr "Beløpet uten avgift"
 #: code:addons/purchase/purchase.py:754
 #, python-format
 msgid "Selected UOM does not belong to the same category as the product UOM"
-msgstr ""
+msgstr "Valgt UOM hører ikke til samme kategori som produktet UOM"
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:907
@@ -1012,6 +1053,9 @@ msgid ""
 "the buyer. Depending on the Invoicing control of the purchase order, the "
 "invoice is based on received or on ordered quantities."
 msgstr ""
+"En kjøpsordre genererer en leverandør faktura, så snart den er bekreftet av "
+"kjøperen. Avhengig Fakturering kontroll av bestillingen, blir fakturaen "
+"basert på mottatt eller bestilte mengder."
 
 #. module: purchase
 #: field:purchase.order,amount_untaxed:0
@@ -1060,6 +1104,9 @@ msgid ""
 "order is 'On order'. The invoice can also be generated manually by the "
 "accountant (Invoice control = Manual)."
 msgstr ""
+"Fakturaen opprettes automatisk hvis Faktura kontroll av innkjøpsordren er "
+"«på bestilling». Fakturaen kan også genereres manuelt av revisor (Faktura "
+"kontroll = Manuell)."
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_email_templates
@@ -1107,7 +1154,7 @@ msgstr "Fakturakontroll ved innkjøp"
 #: code:addons/purchase/wizard/purchase_order_group.py:48
 #, python-format
 msgid "Please select multiple order to merge in the list view."
-msgstr ""
+msgstr "Velg flere for å fusjonere i listevisningen."
 
 #. module: purchase
 #: model:ir.actions.act_window,help:purchase.action_import_create_supplier_installer
@@ -1116,6 +1163,9 @@ msgid ""
 "can import your existing partners by CSV spreadsheet from \"Import Data\" "
 "wizard"
 msgstr ""
+"Opprette eller importere leverandører og deres kontakter manuelt fra dette "
+"skjemaet, eller du kan importere dine eksisterende partnere av CSV regneark "
+"fra \"Importer data\" wizard."
 
 #. module: purchase
 #: model:process.transition,name:purchase.process_transition_createpackinglist0
@@ -1166,7 +1216,7 @@ msgstr "Kan ikke få kansellert innkjøpsordren!"
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_createpackinglist0
 msgid "A pick list is generated to track the incoming products."
-msgstr ""
+msgstr "En plukk liste er laget for å spore innkommende produkter"
 
 #. module: purchase
 #: help:purchase.order,pricelist_id:0
@@ -1215,6 +1265,11 @@ msgid ""
 "Based on generated invoice: create a draft invoice you can validate later.\n"
 "Based on receptions: let you create an invoice when receptions are validated."
 msgstr ""
+"Basert på Kjøp Bestill linjer: plass enkelte linjer i \"Faktura Kontroll> "
+"Basert på PO linjer 'fra der du kan velge å opprette en faktura.\n"
+"Basert på genererte faktura: lage et utkast faktura som du kan validere "
+"senere.\n"
+"Basert på mottakelser: lar deg lage en faktura når mottakelser er validert."
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_supplier_address_form
@@ -1235,7 +1290,7 @@ msgstr "Produktkategorier"
 #. module: purchase
 #: view:purchase.report:0 field:purchase.report,delay:0
 msgid "Days to Validate"
-msgstr ""
+msgstr "Dager som skal valideres"
 
 #. module: purchase
 #: help:purchase.order,origin:0
@@ -1257,6 +1312,12 @@ msgid ""
 "received, the state becomes 'Done'. If a cancel action occurs in the invoice "
 "or in the reception of goods, the state becomes in exception."
 msgstr ""
+"Tilstanden til kjøpsordre eller sitatet forespørselen. Et sitat er en "
+"kjøpsordre på en 'kladd' tilstand. Da ordren må bekreftes av brukeren, til "
+"staten bryteren 'Bekreftet'. Da leverandøren må bekrefte ordren å endre "
+"tilstanden til \"Godkjent\". Når bestillingen er betalt og mottatt, blir "
+"staten Ferdig. Hvis en avbryt handling skjer i fakturaen eller i resepsjonen "
+"av varer, blir staten i unntaket."
 
 #. module: purchase
 #: field:purchase.order.line,price_subtotal:0
@@ -1404,7 +1465,7 @@ msgstr "Tel.:"
 #. module: purchase
 #: view:purchase.report:0
 msgid "Order of Month"
-msgstr ""
+msgstr "Bestilling av Måned"
 
 #. module: purchase
 #: report:purchase.order:0
@@ -1459,6 +1520,8 @@ msgid ""
 "The selected supplier has a minimal quantity set to %s %s, you should not "
 "purchase less."
 msgstr ""
+"Den valgte leverandøren har en minimum mengde satt til% s% s, bør du ikke "
+"kjøpe mindre."
 
 #. module: purchase
 #: field:purchase.order.line,date_planned:0
@@ -1517,6 +1580,9 @@ msgid ""
 "suppliers. You can track all your interactions with them through the History "
 "tab: emails, orders, meetings, etc."
 msgstr ""
+"Få tilgang til leverandørens poster og opprettholde et godt forhold til dine "
+"leverandører. Du kan spore alle dine interaksjoner med dem gjennom historia "
+"kategorien: e-post, ordre, møter etc."
 
 #. module: purchase
 #: view:purchase.order:0
@@ -1579,6 +1645,8 @@ msgid ""
 "This tool will help you to select the method you want to use to control "
 "supplier invoices."
 msgstr ""
+"Dette verktøyet vil hjelpe deg å velge den metoden du vil bruke til å "
+"kontrollere leverandørfakturaer."
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder1
@@ -1586,6 +1654,8 @@ msgid ""
 "In case there is no supplier for this product, the buyer can fill the form "
 "manually and confirm it. The RFQ becomes a confirmed Purchase Order."
 msgstr ""
+"I tilfelle det er ingen leverandør for dette produktet, kan kjøperen fylle "
+"ut skjemaet manuelt og bekrefte det. RFQ blir en bekreftet bestilling."
 
 #. module: purchase
 #: selection:purchase.report,month:0
@@ -1622,6 +1692,9 @@ msgid ""
 "receptions\", you can track here all the product receptions and create "
 "invoices for those receptions."
 msgstr ""
+"Hvis du setter Fakturering Kontroll på en bestilling som \"Basert på "
+"mottakelser\", kan du spore alle produktgruppene mottakelser og lage "
+"fakturaer for disse mottakelser."
 
 #. module: purchase
 #: view:purchase.order:0
@@ -1653,6 +1726,16 @@ msgid ""
 "\n"
 " "
 msgstr ""
+" Vær oppmerksom på at:\n"
+"Bestillinger vil bare bli slått sammen dersom:\n"
+"* Innkjøps ordrer er i utkast.\n"
+"* Innkjøps ordrer tilhører samme leverandør.\n"
+"* Bestillingene har samme lager sted, samme prisliste.\n"
+"\n"
+"Linjene vil bare bli slått sammen dersom:\n"
+" Bestillings linjene er nøyaktig det samme, unntatt for produktet, mengde og "
+"enhet. \n"
+" "
 
 #. module: purchase
 #: field:purchase.report,negociation:0
@@ -1678,7 +1761,7 @@ msgstr "Fakturakontroll"
 #. module: purchase
 #: view:stock.picking:0
 msgid "Back Orders"
-msgstr ""
+msgstr "Tilbake Ordrene"
 
 #. module: purchase
 #: model:process.transition.action,name:purchase.process_transition_action_approvingpurchaseorder0
@@ -1706,6 +1789,11 @@ msgid ""
 "                                      \n"
 "* The 'Cancelled' state is set automatically when user cancel purchase order."
 msgstr ""
+" * 'Kladdens' stat settes automatisk når kjøpsordre i utkast.\n"
+"* 'Bekreftet' stat settes automatisk som bekrefter når kjøpsordre i Bekreft "
+"tilstand.\n"
+"* Ferdig \"stat settes automatisk når bestillingen er satt som gjøres.\n"
+"* 'Avlyst \"stat settes automatisk når brukeren avbryte bestillingen."
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:426
@@ -1726,7 +1814,7 @@ msgstr "Prisliste versjoner"
 #. module: purchase
 #: constraint:res.partner:0
 msgid "Error ! You cannot create recursive associated members."
-msgstr ""
+msgstr "Feil! Du kan ikke opprette rekursive tilknyttede medlemmer."
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:359
@@ -1757,7 +1845,7 @@ msgstr ""
 "Vennligst velg en før du velger prosukt."
 
 #. module: purchase
-#: model:email.template,body_text:purchase.email_template_edi_purchase
+#: model:email.template,body:purchase.email_template_edi_purchase
 msgid ""
 "\n"
 "Hello${object.partner_address_id.name and ' ' or "
@@ -1812,6 +1900,55 @@ msgid ""
 "% endif\n"
 "            "
 msgstr ""
+"\n"
+"Hei $ {object.partner_address_id.name og '' eller''} $ "
+"{object.partner_address_id.name eller''},\n"
+"Her er en kjøp ordrebekreftelse fra $ {object.company_id.name}:\n"
+"Bestillingsnummer: * $ {object.name} *\n"
+"Bestilling totalt: * $ {object.amount_total} $ "
+"{object.pricelist_id.currency_id.name} *\n"
+"Bestilling dato: $ {object.date orden}\n"
+"% Hvis object.origin\n"
+"Bestilling referanse: $ {object.origin\n"
+"Bestilling referanse: $ {object.origin}\n"
+" % endif\n"
+" % Hvis object.partner_ref:\n"
+"  Din referanse: $ {object.partner_ref} <br />\n"
+"  % endif\n"
+"  Din kontakt: $ {object.validator.name} $ {object.validator.user_email og "
+"'<% s>'% (object.validator.user_email) eller''}\n"
+"Du kan se ordrebekreftelsen og laste den ned ved hjelp av følgende link:\n"
+"  $ {ctx.get ('edi_web_url_view') eller 'n / a'}\n"
+"\n"
+"Hvis du har noen spørsmål, ikke nøl med å kontakte oss.\n"
+"\n"
+"Takk!\n"
+"\n"
+"\n"
+"-\n"
+"$ {object.validator.name} $ {object.validator.user_email og '<% s>'% "
+"(object.validator.user_email) eller''}\n"
+"$ {object.company_id.name}\n"
+"% Hvis object.company_id.street:\n"
+"$ {object.company_id.street eller''}\n"
+"% endif\n"
+"% Hvis object.company_id.street2:\n"
+"$ {object.company_id.street2}\n"
+"% endif\n"
+"% Hvis object.company_id.city eller object.company_id.zip:\n"
+"$ {object.company_id.zip eller''} $ {object.company_id.city eller''}\n"
+"% endif\n"
+"% Hvis object.company_id.country_id:\n"
+"$ {object.company_id.state_id og ('% s'% object.company_id.state_id.name) "
+"eller''} $ {object.company_id.country_id.name eller''}\n"
+"% endif\n"
+"% Hvis object.company_id.phone:\n"
+"Telefon: $ {object.company_id.phone}\n"
+"% endif\n"
+"% Hvis object.company_id.website:\n"
+"$ {object.company_id.website eller''}\n"
+"% endif\n"
+"            "
 
 #. module: purchase
 #: view:purchase.order:0
diff --git a/addons/purchase/i18n/nl.po b/addons/purchase/i18n/nl.po
index 6297d304322..94375e08522 100644
--- a/addons/purchase/i18n/nl.po
+++ b/addons/purchase/i18n/nl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:45+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:56+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -1868,7 +1868,7 @@ msgstr ""
 "Stel er een in voordat u een product kiest."
 
 #. module: purchase
-#: model:email.template,body_text:purchase.email_template_edi_purchase
+#: model:email.template,body:purchase.email_template_edi_purchase
 msgid ""
 "\n"
 "Hello${object.partner_address_id.name and ' ' or "
diff --git a/addons/purchase/i18n/nl_BE.po b/addons/purchase/i18n/nl_BE.po
index e88150ed436..c86766b63de 100644
--- a/addons/purchase/i18n/nl_BE.po
+++ b/addons/purchase/i18n/nl_BE.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:46+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:57+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -1849,7 +1849,7 @@ msgstr ""
 "Gelieve dit te doen voordat u een product kiest."
 
 #. module: purchase
-#: model:email.template,body_text:purchase.email_template_edi_purchase
+#: model:email.template,body:purchase.email_template_edi_purchase
 msgid ""
 "\n"
 "Hello${object.partner_address_id.name and ' ' or "
diff --git a/addons/purchase/i18n/pl.po b/addons/purchase/i18n/pl.po
index 21d6d57633d..28c8bebad0a 100644
--- a/addons/purchase/i18n/pl.po
+++ b/addons/purchase/i18n/pl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:45+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:56+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -1838,7 +1838,7 @@ msgstr ""
 "Wybierz jedno z powyższych przed wybraniem produktu."
 
 #. module: purchase
-#: model:email.template,body_text:purchase.email_template_edi_purchase
+#: model:email.template,body:purchase.email_template_edi_purchase
 msgid ""
 "\n"
 "Hello${object.partner_address_id.name and ' ' or "
diff --git a/addons/purchase/i18n/pt.po b/addons/purchase/i18n/pt.po
index 6939735a946..325f63f78ef 100644
--- a/addons/purchase/i18n/pt.po
+++ b/addons/purchase/i18n/pt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:45+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:56+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -1858,7 +1858,7 @@ msgstr ""
 "Por favor, defina um antes de escolher um artigo."
 
 #. module: purchase
-#: model:email.template,body_text:purchase.email_template_edi_purchase
+#: model:email.template,body:purchase.email_template_edi_purchase
 msgid ""
 "\n"
 "Hello${object.partner_address_id.name and ' ' or "
diff --git a/addons/purchase/i18n/pt_BR.po b/addons/purchase/i18n/pt_BR.po
index bd16bef29a2..8f2cccb110b 100644
--- a/addons/purchase/i18n/pt_BR.po
+++ b/addons/purchase/i18n/pt_BR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:46+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:56+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -234,7 +234,7 @@ msgstr "Propriedades de Compras"
 #. module: purchase
 #: model:ir.model,name:purchase.model_stock_partial_picking
 msgid "Partial Picking Processing Wizard"
-msgstr ""
+msgstr "Assistente de Separação Parcial"
 
 #. module: purchase
 #: view:purchase.order.line:0
@@ -1010,7 +1010,7 @@ msgstr "Categorias de Produtos"
 #. module: purchase
 #: selection:purchase.config.wizard,default_method:0
 msgid "Pre-Generate Draft Invoices based on Purchase Orders"
-msgstr ""
+msgstr "Gerar previamente Faturas Provisórias baseadas em Pedidos de Compra"
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_view_purchase_line_invoice
@@ -1276,6 +1276,13 @@ msgid ""
 "Based on generated invoice: create a draft invoice you can validate later.\n"
 "Based on receptions: let you create an invoice when receptions are validated."
 msgstr ""
+"Baseada em Linhas da Ordem de Compra: Usa linhas individuais em 'Controle de "
+"Faturas > Baseadas em linhas de O.C' de onde você pode criar uma fatura "
+"seletivamente.\n"
+"Baseada em fatura gerada: cria uma fatura provisória que você pode validar "
+"depois.\n"
+"Baseada em recebimentos: permite que você crie uma fatura quando os "
+"recebimentos forem validados."
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_supplier_address_form
@@ -1645,7 +1652,7 @@ msgstr "Valor sem Impostos"
 #. module: purchase
 #: view:stock.picking:0
 msgid "Picking to Invoice"
-msgstr ""
+msgstr "Separação para Faturar"
 
 #. module: purchase
 #: view:purchase.config.wizard:0
@@ -1653,6 +1660,8 @@ msgid ""
 "This tool will help you to select the method you want to use to control "
 "supplier invoices."
 msgstr ""
+"Esta ferramenta te ajuda a selecionar o método que você deseja para "
+"controlar as faturas de fornecedores."
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder1
@@ -1699,6 +1708,9 @@ msgid ""
 "receptions\", you can track here all the product receptions and create "
 "invoices for those receptions."
 msgstr ""
+"Se você definir o Controle de Faturamento em ordem de compra como 'Baseado "
+"em recebimentos'. você pode rastrear aqui todos os recebimentos de produtos "
+"e criar faturas para estes recebimentos."
 
 #. module: purchase
 #: view:purchase.order:0
@@ -1750,7 +1762,7 @@ msgstr "Preço Padrão de Compra"
 #. module: purchase
 #: field:purchase.config.wizard,default_method:0
 msgid "Default Invoicing Control Method"
-msgstr ""
+msgstr "Método de Controle de Fatura Padrão"
 
 #. module: purchase
 #: model:product.pricelist.type,name:purchase.pricelist_type_purchase
@@ -1766,7 +1778,7 @@ msgstr "Controle Faturamento"
 #. module: purchase
 #: view:stock.picking:0
 msgid "Back Orders"
-msgstr ""
+msgstr "Pedidos Devolvidos"
 
 #. module: purchase
 #: model:process.transition.action,name:purchase.process_transition_action_approvingpurchaseorder0
@@ -1821,7 +1833,7 @@ msgstr "Versões da lista"
 #. module: purchase
 #: constraint:res.partner:0
 msgid "Error ! You cannot create recursive associated members."
-msgstr ""
+msgstr "Erro! Você não pode criar recursivamente a membros associados."
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:359
@@ -1853,7 +1865,7 @@ msgstr ""
 "Por favor, selecione um antes de escolher um produto."
 
 #. module: purchase
-#: model:email.template,body_text:purchase.email_template_edi_purchase
+#: model:email.template,body:purchase.email_template_edi_purchase
 msgid ""
 "\n"
 "Hello${object.partner_address_id.name and ' ' or "
@@ -1908,11 +1920,62 @@ msgid ""
 "% endif\n"
 "            "
 msgstr ""
+"\n"
+"Olá${object.partner_address_id.name and ' ' or "
+"''}${object.partner_address_id.name or ''},\n"
+"\n"
+"Esta é a confirmação do pedido de compra de ${object.company_id.name}:\n"
+"       | Número do Pedido: *${object.name}*\n"
+"       | Total do Pedido: *${object.amount_total} "
+"${object.pricelist_id.currency_id.name}*\n"
+"       | Data do Pedido: ${object.date_order}\n"
+"       % if object.origin:\n"
+"       | Referência do Pedido: ${object.origin}\n"
+"       % endif\n"
+"       % if object.partner_ref:\n"
+"       | Sua referência: ${object.partner_ref}<br />\n"
+"       % endif\n"
+"       | Seu contato: ${object.validator.name} ${object.validator.user_email "
+"and '<%s>'%(object.validator.user_email) or ''}\n"
+"\n"
+"Você pode ver a confirmação do pedido e fazer o download usando o seguinte "
+"link:\n"
+"    ${ctx.get('edi_web_url_view') or 'n/a'}\n"
+"\n"
+"Se você tiver alguma dúvida por favor entre em contato conosco.\n"
+"\n"
+"Obrigado!\n"
+"\n"
+"\n"
+"--\n"
+"${object.validator.name} ${object.validator.user_email and "
+"'<%s>'%(object.validator.user_email) or ''}\n"
+"${object.company_id.name}\n"
+"% if object.company_id.street:\n"
+"${object.company_id.street or ''}\n"
+"% endif\n"
+"% if object.company_id.street2:\n"
+"${object.company_id.street2}\n"
+"% endif\n"
+"% if object.company_id.city or object.company_id.zip:\n"
+"${object.company_id.zip or ''} ${object.company_id.city or ''}\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 ''}\n"
+"% endif\n"
+"% if object.company_id.phone:\n"
+"Telefone: ${object.company_id.phone}\n"
+"% endif\n"
+"% if object.company_id.website:\n"
+"${object.company_id.website or ''}\n"
+"% endif\n"
+"            "
 
 #. module: purchase
 #: view:purchase.order:0
 msgid "Purchase orders which are in draft state"
-msgstr ""
+msgstr "Pedidos de Compra que estão como Provisórios"
 
 #. module: purchase
 #: selection:purchase.report,month:0
@@ -1922,17 +1985,17 @@ msgstr "Maio"
 #. module: purchase
 #: model:res.groups,name:purchase.group_purchase_manager
 msgid "Manager"
-msgstr ""
+msgstr "Gerente"
 
 #. module: purchase
 #: view:purchase.config.wizard:0
 msgid "res_config_contents"
-msgstr ""
+msgstr "res_config_contents"
 
 #. module: purchase
 #: view:purchase.report:0
 msgid "Order in current year"
-msgstr ""
+msgstr "Pedidos este ano"
 
 #. module: purchase
 #: model:process.process,name:purchase.process_process_purchaseprocess0
@@ -1949,7 +2012,7 @@ msgstr "Ano"
 #: model:ir.ui.menu,name:purchase.menu_purchase_line_order_draft
 #: selection:purchase.order,invoice_method:0
 msgid "Based on Purchase Order lines"
-msgstr ""
+msgstr "Baseada em Linhas de Pedido de Compra"
 
 #. module: purchase
 #: model:ir.actions.todo.category,name:purchase.category_purchase_config
diff --git a/addons/purchase/i18n/purchase.pot b/addons/purchase/i18n/purchase.pot
index 44355e26cea..a7fd4cfaab8 100644
--- a/addons/purchase/i18n/purchase.pot
+++ b/addons/purchase/i18n/purchase.pot
@@ -1767,7 +1767,7 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: model:email.template,body_text:purchase.email_template_edi_purchase
+#: model:email.template,body:purchase.email_template_edi_purchase
 msgid ""
 "\n"
 "Hello${object.partner_address_id.name and ' ' or ''}${object."
diff --git a/addons/purchase/i18n/ro.po b/addons/purchase/i18n/ro.po
index 56cb34bd077..0a8c4858c18 100644
--- a/addons/purchase/i18n/ro.po
+++ b/addons/purchase/i18n/ro.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:45+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:56+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -1875,7 +1875,7 @@ msgstr ""
 "Va rugam sa setati una inainte de a alege un produs."
 
 #. module: purchase
-#: model:email.template,body_text:purchase.email_template_edi_purchase
+#: model:email.template,body:purchase.email_template_edi_purchase
 msgid ""
 "\n"
 "Hello${object.partner_address_id.name and ' ' or "
diff --git a/addons/purchase/i18n/ru.po b/addons/purchase/i18n/ru.po
index 5c26b06c64d..9fa7d0c5d39 100644
--- a/addons/purchase/i18n/ru.po
+++ b/addons/purchase/i18n/ru.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:45+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:56+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -1796,7 +1796,7 @@ msgstr ""
 "Пожалуйста выберите, перед выбором ТМЦ."
 
 #. module: purchase
-#: model:email.template,body_text:purchase.email_template_edi_purchase
+#: model:email.template,body:purchase.email_template_edi_purchase
 msgid ""
 "\n"
 "Hello${object.partner_address_id.name and ' ' or "
diff --git a/addons/purchase/i18n/sk.po b/addons/purchase/i18n/sk.po
index 34f62fb40b6..739d72747c9 100644
--- a/addons/purchase/i18n/sk.po
+++ b/addons/purchase/i18n/sk.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:45+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:56+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -1749,7 +1749,7 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: model:email.template,body_text:purchase.email_template_edi_purchase
+#: model:email.template,body:purchase.email_template_edi_purchase
 msgid ""
 "\n"
 "Hello${object.partner_address_id.name and ' ' or "
diff --git a/addons/purchase/i18n/sl.po b/addons/purchase/i18n/sl.po
index 593f8046d4d..5bcbd3ddd5c 100644
--- a/addons/purchase/i18n/sl.po
+++ b/addons/purchase/i18n/sl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:45+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:56+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -1800,7 +1800,7 @@ msgstr ""
 "Prosim izberi en sklop, preden se izbere izdelek."
 
 #. module: purchase
-#: model:email.template,body_text:purchase.email_template_edi_purchase
+#: model:email.template,body:purchase.email_template_edi_purchase
 msgid ""
 "\n"
 "Hello${object.partner_address_id.name and ' ' or "
diff --git a/addons/purchase/i18n/sq.po b/addons/purchase/i18n/sq.po
index a86abfbd826..0f73670c8a8 100644
--- a/addons/purchase/i18n/sq.po
+++ b/addons/purchase/i18n/sq.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:44+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:56+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -1749,7 +1749,7 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: model:email.template,body_text:purchase.email_template_edi_purchase
+#: model:email.template,body:purchase.email_template_edi_purchase
 msgid ""
 "\n"
 "Hello${object.partner_address_id.name and ' ' or "
diff --git a/addons/purchase/i18n/sr.po b/addons/purchase/i18n/sr.po
index cff5a08ba3a..ee8e7b3811b 100644
--- a/addons/purchase/i18n/sr.po
+++ b/addons/purchase/i18n/sr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:45+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:56+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -1764,7 +1764,7 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: model:email.template,body_text:purchase.email_template_edi_purchase
+#: model:email.template,body:purchase.email_template_edi_purchase
 msgid ""
 "\n"
 "Hello${object.partner_address_id.name and ' ' or "
diff --git a/addons/purchase/i18n/sr@latin.po b/addons/purchase/i18n/sr@latin.po
index 07a54d29b6c..dc37c25f445 100644
--- a/addons/purchase/i18n/sr@latin.po
+++ b/addons/purchase/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:46+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:57+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -1764,7 +1764,7 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: model:email.template,body_text:purchase.email_template_edi_purchase
+#: model:email.template,body:purchase.email_template_edi_purchase
 msgid ""
 "\n"
 "Hello${object.partner_address_id.name and ' ' or "
diff --git a/addons/purchase/i18n/sv.po b/addons/purchase/i18n/sv.po
index 6eb735a4c06..53a3f72dec7 100644
--- a/addons/purchase/i18n/sv.po
+++ b/addons/purchase/i18n/sv.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:45+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:56+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -22,6 +22,8 @@ msgid ""
 "The buyer has to approve the RFQ before being sent to the supplier. The RFQ "
 "becomes a confirmed Purchase Order."
 msgstr ""
+"Köparen måste godkänna offertförfrågan innan den skickas till leverantören. "
+"Inköpsförfrågan blir då en bekräftad Inköpsorder."
 
 #. module: purchase
 #: model:process.node,note:purchase.process_node_productrecept0
@@ -43,7 +45,7 @@ msgstr "Destination"
 #: code:addons/purchase/purchase.py:236
 #, python-format
 msgid "In order to delete a purchase order, it must be cancelled first!"
-msgstr ""
+msgstr "För att ta bort en Inköpsorder, måste den avbrytas först!"
 
 #. module: purchase
 #: help:purchase.report,date:0
@@ -118,6 +120,9 @@ msgid ""
 "products, etc. For each purchase order, you can track the products received, "
 "and control the supplier invoices."
 msgstr ""
+"Använd den här menyn för att söka i dina Inköpsordrar genom referenser, "
+"leverantör, produkter etc. Du kan spåra produkter som mottagits, och styra "
+"leverantörsfakturor, för varje Inköpsorder."
 
 #. module: purchase
 #: code:addons/purchase/wizard/purchase_line_invoice.py:145
@@ -166,7 +171,7 @@ msgstr "Företag"
 #. module: purchase
 #: help:res.company,po_lead:0
 msgid "This is the leads/security time for each purchase order."
-msgstr ""
+msgstr "Detta är ledtiden för varje beställning."
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_purchase_order_monthly_categ_graph
@@ -323,7 +328,7 @@ msgstr "Produkter"
 #: model:ir.actions.act_window,name:purchase.action_purchase_order_report_graph
 #: view:purchase.report:0
 msgid "Total Qty and Amount by month"
-msgstr ""
+msgstr "Totalt Antal och belopp per månad"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_packinginvoice0
@@ -331,6 +336,8 @@ msgid ""
 "A Pick list generates an invoice. Depending on the Invoicing control of the "
 "sale order, the invoice is based on delivered or on ordered quantities."
 msgstr ""
+"En plocklista genererar en faktura. Beroende på faktureringskontrollen av "
+"försäljningen blir fakturan baserad på levererad eller beställda kvantiteter."
 
 #. module: purchase
 #: selection:purchase.order,state:0 selection:purchase.order.line,state:0
@@ -394,7 +401,7 @@ msgstr ""
 #. module: purchase
 #: field:purchase.report,dest_address_id:0
 msgid "Dest. Address Contact Name"
-msgstr ""
+msgstr "Dest. Adress Kontakt Namn"
 
 #. module: purchase
 #: report:purchase.order:0
@@ -440,6 +447,7 @@ msgstr "Ordrar under senaste månaden"
 #, python-format
 msgid "You must first cancel all receptions related to this purchase order."
 msgstr ""
+"Du måste först avbryta alla inleveranser relaterade till denna Inköpsorder."
 
 #. module: purchase
 #: selection:purchase.order.line,state:0
@@ -464,7 +472,7 @@ msgstr "Anger att plockningen är klar."
 #. module: purchase
 #: view:purchase.order:0
 msgid "Purchase orders which are in exception state"
-msgstr ""
+msgstr "Beställningar som befinner sig i undantag"
 
 #. module: purchase
 #: report:purchase.order:0 field:purchase.report,validator:0
@@ -485,7 +493,7 @@ msgstr "Snittpris"
 #. module: purchase
 #: view:stock.picking:0
 msgid "Incoming Shipments already processed"
-msgstr ""
+msgstr "Inkommande leveranser som redan behandlats"
 
 #. module: purchase
 #: report:purchase.order:0
@@ -522,6 +530,9 @@ msgid ""
 "of the purchase order, the invoice is based on received or on ordered "
 "quantities."
 msgstr ""
+"En plocklista genererar en leverantörsfaktura. Beroende på "
+"faktureringskontroll över Inköpsordern blir fakturan baserad på mottagna "
+"eller beställda kvantiteter."
 
 #. module: purchase
 #: model:ir.actions.act_window,help:purchase.purchase_line_form_action2
@@ -532,11 +543,16 @@ msgid ""
 "supplier invoice, you can generate a draft supplier invoice based on the "
 "lines from this menu."
 msgstr ""
+"Om du ställer in Faktureringskontrollen på en Inköpsorder som \"Baserat på "
+"rader i inköpsorder\", kan du spåra alla rader på Inköpsorder som du ännu "
+"inte har fått Leverantörsfaktura. När du är redo att ta emot en "
+"Leverantörsfaktura kan du då skapa ett utkast på leverantörsfaktura baserad "
+"på raderna från den här menyn."
 
 #. module: purchase
 #: view:purchase.order:0
 msgid "Purchase order which are in the exception state"
-msgstr ""
+msgstr "Inköpsorder som befinner sig i undantag"
 
 #. module: purchase
 #: model:ir.actions.act_window,help:purchase.action_stock_move_report_po
@@ -544,6 +560,8 @@ msgid ""
 "Reception Analysis allows you to easily check and analyse your company order "
 "receptions and the performance of your supplier's deliveries."
 msgstr ""
+"Mottagning Analys gör att du enkelt kan kontrollera och analysera företagets "
+"ordermottagningar och resultatet för dina leverantörens leveranser."
 
 #. module: purchase
 #: report:purchase.quotation:0
@@ -651,6 +669,9 @@ msgid ""
 "order is 'On picking'. The invoice can also be generated manually by the "
 "accountant (Invoice control = Manual)."
 msgstr ""
+"Fakturan skapas  automatiskt om fakturakontroll av beställningen är \"Mot "
+"plockning\". Fakturan kan också genereras manuellt av den som bokför "
+"(Faktura kontroll = Manuell)."
 
 #. module: purchase
 #: report:purchase.order:0
@@ -664,6 +685,9 @@ msgid ""
 "purchase history and performance. From this menu you can track your "
 "negotiation performance, the delivery performance of your suppliers, etc."
 msgstr ""
+"Inköpsanalys gör att du kan analysera och enkelt kontrollera din köphistorik "
+"och företagets resultat. Från denna meny kan du spåra förhandlingsprestanda, "
+"leveranssäkerhet av dina leverantörer, osv."
 
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_configuration_misc
@@ -674,7 +698,7 @@ msgstr "Allmänt"
 #: code:addons/purchase/purchase.py:769
 #, python-format
 msgid "The selected supplier only sells this product by %s"
-msgstr ""
+msgstr "Den valda leverantören säljer endast denna produkt med %s"
 
 #. module: purchase
 #: view:purchase.report:0
@@ -739,7 +763,7 @@ msgstr "Inkommande leverans"
 #: code:addons/purchase/purchase.py:285
 #, python-format
 msgid "You cannot confirm a purchase order without any lines."
-msgstr ""
+msgstr "Du kan inte bekräfta en Inköpsorder utan några rader."
 
 #. module: purchase
 #: model:ir.actions.act_window,help:purchase.action_invoice_pending
@@ -749,12 +773,16 @@ msgid ""
 "according to your settings. Once you receive a supplier invoice, you can "
 "match it with the draft invoice and validate it."
 msgstr ""
+"Använd den här menyn för att kontrollera inkommande leverantörsfakturor. "
+"OpenERP kan tillverka utkast till fakturor baserat dina beställningar eller "
+"mottagningar, beroende på dina inställningar. När du får en "
+"leverantörsfaktura kan du matcha den mot fakturautkastet och godkänna den."
 
 #. module: purchase
 #: model:process.node,name:purchase.process_node_draftpurchaseorder0
 #: model:process.node,name:purchase.process_node_draftpurchaseorder1
 msgid "RFQ"
-msgstr "RFQ"
+msgstr "Offertförfrågan"
 
 #. module: purchase
 #: code:addons/purchase/edi/purchase_order.py:139
@@ -869,7 +897,7 @@ msgstr "Bild"
 #. module: purchase
 #: view:purchase.report:0
 msgid "Total Orders Lines by User per month"
-msgstr ""
+msgstr "Totalt orderrader per användare per månad"
 
 #. module: purchase
 #: view:purchase.order:0
@@ -978,7 +1006,7 @@ msgstr "Produktkategorier"
 #. module: purchase
 #: selection:purchase.config.wizard,default_method:0
 msgid "Pre-Generate Draft Invoices based on Purchase Orders"
-msgstr ""
+msgstr "Tillverka utkast på fakturor baserade på inköpsorder"
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_view_purchase_line_invoice
@@ -1004,7 +1032,7 @@ msgstr "Calendar View"
 #. module: purchase
 #: selection:purchase.config.wizard,default_method:0
 msgid "Based on Purchase Order Lines"
-msgstr ""
+msgstr "Baserat på inköpsorderrader"
 
 #. module: purchase
 #: help:purchase.order,amount_untaxed:0
@@ -1015,7 +1043,7 @@ msgstr "Summa utan moms."
 #: code:addons/purchase/purchase.py:754
 #, python-format
 msgid "Selected UOM does not belong to the same category as the product UOM"
-msgstr ""
+msgstr "Vald enhet tillhör inte samma kategori som produktens enhet"
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:907
@@ -1030,6 +1058,9 @@ msgid ""
 "the buyer. Depending on the Invoicing control of the purchase order, the "
 "invoice is based on received or on ordered quantities."
 msgstr ""
+"En inköpsorder genererar en leverantörsfaktura, så snart den bekräftas av "
+"köparen. Beroende på faktureringskontroll på beställningen blir fakturan "
+"baserad på mottagna eller beställda kvantiteter."
 
 #. module: purchase
 #: field:purchase.order,amount_untaxed:0
@@ -1078,6 +1109,9 @@ msgid ""
 "order is 'On order'. The invoice can also be generated manually by the "
 "accountant (Invoice control = Manual)."
 msgstr ""
+"Fakturan skapas automatiskt om Fakturakontrollen på beställningen är \"Mot "
+"order\". Fakturan kan också genereras manuellt av den som bokför (Faktura "
+"kontroll = Manuell)."
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_email_templates
@@ -1119,13 +1153,13 @@ msgstr "Utökade filter..."
 #. module: purchase
 #: view:purchase.config.wizard:0
 msgid "Invoicing Control on Purchases"
-msgstr ""
+msgstr "FaktureringsKontroll mot inköp"
 
 #. module: purchase
 #: code:addons/purchase/wizard/purchase_order_group.py:48
 #, python-format
 msgid "Please select multiple order to merge in the list view."
-msgstr ""
+msgstr "Välj flera för att sammanfoga i listvyn."
 
 #. module: purchase
 #: model:ir.actions.act_window,help:purchase.action_import_create_supplier_installer
@@ -1182,12 +1216,12 @@ msgstr "Cancel Purchase Order"
 #: code:addons/purchase/purchase.py:411 code:addons/purchase/purchase.py:418
 #, python-format
 msgid "Unable to cancel this purchase order!"
-msgstr ""
+msgstr "Kan inte avbryta inköpsorder!"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_createpackinglist0
 msgid "A pick list is generated to track the incoming products."
-msgstr ""
+msgstr "En plocklista genereras för att spåra inkommande produkter."
 
 #. module: purchase
 #: help:purchase.order,pricelist_id:0
@@ -1211,7 +1245,7 @@ msgstr "Referensen måste vara unik per bolag!"
 #. module: purchase
 #: view:purchase.report:0 field:purchase.report,price_standard:0
 msgid "Products Value"
-msgstr ""
+msgstr "Varuvärde"
 
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_partner_categories_in_form
@@ -1236,6 +1270,12 @@ msgid ""
 "Based on generated invoice: create a draft invoice you can validate later.\n"
 "Based on receptions: let you create an invoice when receptions are validated."
 msgstr ""
+"Baserat på rader i inköpsorder: placera enskilda rader i 'FakturaKontroll > "
+"Baserat på inköpsorderrader' från där du kan välja att skapa en faktura.\n"
+"Baserat på genererad faktura: skapar ett fakturautkast som du kan godkänna "
+"senare.\n"
+"Baserat på mottagningar: låter dig skapa en faktura när mottagningen "
+"godkänts."
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_supplier_address_form
@@ -1256,7 +1296,7 @@ msgstr "Produkter per kategori"
 #. module: purchase
 #: view:purchase.report:0 field:purchase.report,delay:0
 msgid "Days to Validate"
-msgstr ""
+msgstr "Dagar för att godkänna"
 
 #. module: purchase
 #: help:purchase.order,origin:0
@@ -1267,7 +1307,7 @@ msgstr ""
 #. module: purchase
 #: view:purchase.order:0
 msgid "Purchase orders which are not approved yet."
-msgstr ""
+msgstr "Inköpsordrar som inte är godkända ännu."
 
 #. module: purchase
 #: help:purchase.order,state:0
@@ -1279,12 +1319,12 @@ msgid ""
 "received, the state becomes 'Done'. If a cancel action occurs in the invoice "
 "or in the reception of goods, the state becomes in exception."
 msgstr ""
-"The state of the purchase order or the quotation request. A quotation is a "
-"purchase order in a 'Draft' state. Then the order has to be confirmed by the "
-"user, the state switch to 'Confirmed'. Then the supplier must confirm the "
-"order to change the state to 'Approved'. When the purchase order is paid and "
-"received, the state becomes 'Done'. If a cancel action occurs in the invoice "
-"or in the reception of goods, the state becomes in exception."
+"Tillstånd för Inköpsorder eller Offertförfråga. En offert är en Inköpsorder "
+"i \"utkast\"-läge. Ordern måste därefter bekräftas av användaren och växlar "
+"då över till \"Bekräftat\"-läge. Sedan måste leverantören bekräfta för att "
+"ändra tillståndet till \"Godkänd\". När beställningen är betald och "
+"mottagen, blir statusen \"Klar\". Om man Avbryter fakturan eller "
+"inleveransen blir statusen Undantag."
 
 #. module: purchase
 #: field:purchase.order.line,price_subtotal:0
@@ -1306,7 +1346,7 @@ msgstr "Inköpsorder '%s' är bekräftad."
 #. module: purchase
 #: help:purchase.order,date_approve:0
 msgid "Date on which purchase order has been approved"
-msgstr ""
+msgstr "Datum då inköpsorder har godkänts"
 
 #. module: purchase
 #: view:purchase.order:0 field:purchase.order,state:0
@@ -1376,7 +1416,7 @@ msgstr "Purchase Order Lines"
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_approvingpurchaseorder0
 msgid "The supplier approves the Purchase Order."
-msgstr ""
+msgstr "Leverantören godkänner beställningen."
 
 #. module: purchase
 #: code:addons/purchase/wizard/purchase_order_group.py:80
@@ -1406,7 +1446,7 @@ msgstr "Merge orders"
 #. module: purchase
 #: model:ir.model,name:purchase.model_purchase_order_line_invoice
 msgid "Purchase Order Line Make Invoice"
-msgstr ""
+msgstr "Inköpsorderrader Tillverka Faktura"
 
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_action_picking_tree4
@@ -1416,7 +1456,7 @@ msgstr "Inkommande leveranser"
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_purchase_order_by_user_all
 msgid "Total Orders by User per month"
-msgstr ""
+msgstr "Totalt order per användare per månad"
 
 #. module: purchase
 #: model:ir.actions.report.xml,name:purchase.report_purchase_quotation
@@ -1442,12 +1482,12 @@ msgstr "Our Order Reference"
 #. module: purchase
 #: view:purchase.order:0 view:purchase.order.line:0
 msgid "Search Purchase Order"
-msgstr ""
+msgstr "Sök Inköpsorder"
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_purchase_config
 msgid "Set the Default Invoicing Control Method"
-msgstr ""
+msgstr "Sätt Standardmetod för FaktureringsKontroll"
 
 #. module: purchase
 #: model:process.node,note:purchase.process_node_draftpurchaseorder0
@@ -1468,12 +1508,12 @@ msgstr "Datum godkänd"
 #. module: purchase
 #: selection:purchase.report,state:0
 msgid "Waiting Supplier Ack"
-msgstr ""
+msgstr "Väntar på Leverantörsbekräftelse"
 
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_procurement_management_pending_invoice
 msgid "Based on draft invoices"
-msgstr ""
+msgstr "Baserat på fakturautkast"
 
 #. module: purchase
 #: view:purchase.order:0
@@ -1487,6 +1527,8 @@ msgid ""
 "The selected supplier has a minimal quantity set to %s %s, you should not "
 "purchase less."
 msgstr ""
+"Den valda leverantören har en minimal mängd satt till %s %s, ska bör inte "
+"köpa mindre."
 
 #. module: purchase
 #: field:purchase.order.line,date_planned:0
@@ -1545,6 +1587,9 @@ msgid ""
 "suppliers. You can track all your interactions with them through the History "
 "tab: emails, orders, meetings, etc."
 msgstr ""
+"Visar din leverantör och upprätthåller en god relation med din leverantör. "
+"Du kan spåra alla dina leverantörsaktiviteter genom fliken Historik: e-post, "
+"ordrar, möten mm"
 
 #. module: purchase
 #: view:purchase.order:0
@@ -1589,7 +1634,7 @@ msgstr "Reservation"
 #. module: purchase
 #: view:purchase.order:0
 msgid "Purchase orders that include lines not invoiced."
-msgstr ""
+msgstr "Beställningar som inkluderar rader som inte är fakturerade."
 
 #. module: purchase
 #: view:purchase.order:0
@@ -1607,6 +1652,8 @@ msgid ""
 "This tool will help you to select the method you want to use to control "
 "supplier invoices."
 msgstr ""
+"Detta verktyg hjälper dig att välja den metod du vill använda för att "
+"kontrollera leverantörsfakturor."
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder1
@@ -1614,6 +1661,9 @@ msgid ""
 "In case there is no supplier for this product, the buyer can fill the form "
 "manually and confirm it. The RFQ becomes a confirmed Purchase Order."
 msgstr ""
+"Om det inte finns någon leverantör för denna produkt, kan köparen fylla i "
+"formuläret manuellt och bekräfta det. Offertförfrågan blir en bekräftad "
+"Inköpsorder."
 
 #. module: purchase
 #: selection:purchase.report,month:0
@@ -1650,6 +1700,9 @@ msgid ""
 "receptions\", you can track here all the product receptions and create "
 "invoices for those receptions."
 msgstr ""
+"Om du ställer in Faktureringskontroll på en beställning som \"Baserat på "
+"mottagningar\", kan du spåra alla mottagna produkter och skapa fakturor för "
+"dessa mottagningar."
 
 #. module: purchase
 #: view:purchase.order:0
@@ -1681,16 +1734,26 @@ msgid ""
 "\n"
 " "
 msgstr ""
+" Notera att:\n"
+" \n"
+"  Beställningar kommer endast att slås samman om:\n"
+"  * Inköpsorder är utkast\n"
+"  * Inköpsorder tillhör samma leverantör\n"
+"  * Inköpsorder är har samma lagerplats, samma prislista\n"
+" \n"
+"  Rader kommer endast att slås samman om:\n"
+"  * Order rader är exakt samma utom produkter, kvantitet och enhet \n"
+" "
 
 #. module: purchase
 #: field:purchase.report,negociation:0
 msgid "Purchase-Standard Price"
-msgstr ""
+msgstr "Standardpris Inköp"
 
 #. module: purchase
 #: field:purchase.config.wizard,default_method:0
 msgid "Default Invoicing Control Method"
-msgstr ""
+msgstr "Standard Faktureringskontrollmetod"
 
 #. module: purchase
 #: model:product.pricelist.type,name:purchase.pricelist_type_purchase
@@ -1734,6 +1797,13 @@ msgid ""
 "                                      \n"
 "* The 'Cancelled' state is set automatically when user cancel purchase order."
 msgstr ""
+" * Tillståndet \"Utkast\" ställs in automatiskt när inköpsorder är i utkast "
+"tillstånd.\n"
+"* Tillståndet \"Bekräftad\" ställs in automatiskt när bekräfta när "
+"inköpsorder är i bekräfta tillstånd.\n"
+"* Tillståndet \"Klar\" ställs in automatiskt när inköpsorder är klar.\n"
+"* Tillståndet \"Inställd\" ställs in automatiskt när användaren avbryter ett "
+"inköp."
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:426
@@ -1771,7 +1841,7 @@ msgstr ""
 #. module: purchase
 #: model:process.transition,name:purchase.process_transition_purchaseinvoice0
 msgid "From a purchase order"
-msgstr ""
+msgstr "Från en inköpsorder"
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:735
@@ -1780,9 +1850,11 @@ msgid ""
 "You have to select a pricelist or a supplier in the purchase form !\n"
 "Please set one before choosing a product."
 msgstr ""
+"Du måste välja en prislista eller en leverantör i inköpsformuläret!\n"
+"Välj en innan du väljer produkt."
 
 #. module: purchase
-#: model:email.template,body_text:purchase.email_template_edi_purchase
+#: model:email.template,body:purchase.email_template_edi_purchase
 msgid ""
 "\n"
 "Hello${object.partner_address_id.name and ' ' or "
@@ -1837,11 +1909,62 @@ msgid ""
 "% endif\n"
 "            "
 msgstr ""
+"\n"
+"Hej ${object.partner_address_id.name and ' ' or "
+"''}${object.partner_address_id.name or ''},\n"
+"\n"
+"Här är en inköpsorder bekräftelse från ${object.company_id.name}:\n"
+"       | Order number: *${object.name}*\n"
+"       | Order total: *${object.amount_total} "
+"${object.pricelist_id.currency_id.name}*\n"
+"       | Order date: ${object.date_order}\n"
+"       % if object.origin:\n"
+"       | Order reference: ${object.origin}\n"
+"       % endif\n"
+"       % if object.partner_ref:\n"
+"       | Your reference: ${object.partner_ref}<br />\n"
+"       % endif\n"
+"       | Your contact: ${object.validator.name} "
+"${object.validator.user_email and '<%s>'%(object.validator.user_email) or "
+"''}\n"
+"\n"
+"Du kan visa orderbekräftelsen och ladda ner det via följande länk:\n"
+"    ${ctx.get('edi_web_url_view') or 'n/a'}\n"
+"\n"
+"Om du har några frågor, tveka inte att kontakta oss.\n"
+"\n"
+"Tack!\n"
+"\n"
+"\n"
+"--\n"
+"${object.validator.name} ${object.validator.user_email and "
+"'<%s>'%(object.validator.user_email) or ''}\n"
+"${object.company_id.name}\n"
+"% if object.company_id.street:\n"
+"${object.company_id.street or ''}\n"
+"% endif\n"
+"% if object.company_id.street2:\n"
+"${object.company_id.street2}\n"
+"% endif\n"
+"% if object.company_id.city or object.company_id.zip:\n"
+"${object.company_id.zip or ''} ${object.company_id.city or ''}\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 ''}\n"
+"% endif\n"
+"% if object.company_id.phone:\n"
+"Phone: ${object.company_id.phone}\n"
+"% endif\n"
+"% if object.company_id.website:\n"
+"${object.company_id.website or ''}\n"
+"% endif\n"
+"            "
 
 #. module: purchase
 #: view:purchase.order:0
 msgid "Purchase orders which are in draft state"
-msgstr ""
+msgstr "Beställningar som är Utkast"
 
 #. module: purchase
 #: selection:purchase.report,month:0
@@ -1878,7 +2001,7 @@ msgstr "År"
 #: model:ir.ui.menu,name:purchase.menu_purchase_line_order_draft
 #: selection:purchase.order,invoice_method:0
 msgid "Based on Purchase Order lines"
-msgstr ""
+msgstr "Baserat på inköpsorderrader"
 
 #. module: purchase
 #: model:ir.actions.todo.category,name:purchase.category_purchase_config
@@ -1906,7 +2029,7 @@ msgstr "Ordrar"
 msgid ""
 "unique number of the purchase order,computed automatically when the purchase "
 "order is created"
-msgstr ""
+msgstr "Unikt inköpsordernummer, sätts automatiskt när inköpsordern skapas"
 
 #. module: purchase
 #: view:board.board:0
diff --git a/addons/purchase/i18n/th.po b/addons/purchase/i18n/th.po
index 0b37cff9ee6..cb219f6d201 100644
--- a/addons/purchase/i18n/th.po
+++ b/addons/purchase/i18n/th.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:45+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:56+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -1777,7 +1777,7 @@ msgstr ""
 "กรุณาเลือกก่อนที่จะเลือกสินค้า"
 
 #. module: purchase
-#: model:email.template,body_text:purchase.email_template_edi_purchase
+#: model:email.template,body:purchase.email_template_edi_purchase
 msgid ""
 "\n"
 "Hello${object.partner_address_id.name and ' ' or "
diff --git a/addons/purchase/i18n/tlh.po b/addons/purchase/i18n/tlh.po
index 0a594d707f5..9993644f106 100644
--- a/addons/purchase/i18n/tlh.po
+++ b/addons/purchase/i18n/tlh.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:45+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:56+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -1748,7 +1748,7 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: model:email.template,body_text:purchase.email_template_edi_purchase
+#: model:email.template,body:purchase.email_template_edi_purchase
 msgid ""
 "\n"
 "Hello${object.partner_address_id.name and ' ' or "
diff --git a/addons/purchase/i18n/tr.po b/addons/purchase/i18n/tr.po
index 6458e35a846..fcc6a30e190 100644
--- a/addons/purchase/i18n/tr.po
+++ b/addons/purchase/i18n/tr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:45+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:56+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -272,12 +272,12 @@ msgstr "Satınalmalar"
 #. module: purchase
 #: view:purchase.order:0
 msgid "Purchase order which are in draft state"
-msgstr "Taslak durumundaki Satınalma emirleri"
+msgstr "Taslak durumundaki Satınalma siparişleri"
 
 #. module: purchase
 #: view:purchase.order:0
 msgid "Origin"
-msgstr "Menşei"
+msgstr "Kökenİ"
 
 #. module: purchase
 #: view:purchase.order:0 field:purchase.order,notes:0
@@ -294,7 +294,7 @@ msgstr "Eylül"
 #: report:purchase.order:0 field:purchase.order,amount_tax:0
 #: view:purchase.order.line:0 field:purchase.order.line,taxes_id:0
 msgid "Taxes"
-msgstr "Vergi"
+msgstr "Vergiler"
 
 #. module: purchase
 #: model:ir.actions.report.xml,name:purchase.report_purchase_order
@@ -310,7 +310,7 @@ msgstr "Satınalma Siparişi"
 #: field:purchase.order,name:0 view:purchase.order.line:0
 #: field:purchase.order.line,order_id:0
 msgid "Order Reference"
-msgstr "Sipariş Referansı"
+msgstr "Sipariş İlgisi"
 
 #. module: purchase
 #: report:purchase.order:0
@@ -328,7 +328,7 @@ msgstr "Ürünler"
 #: model:ir.actions.act_window,name:purchase.action_purchase_order_report_graph
 #: view:purchase.report:0
 msgid "Total Qty and Amount by month"
-msgstr "Aylık Toplam Miktar ve Tutar"
+msgstr "Aylık Toplam Mik ve Tutar"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_packinginvoice0
@@ -379,12 +379,12 @@ msgstr "Giden Ürünler"
 #. module: purchase
 #: view:purchase.order:0
 msgid "Manually Corrected"
-msgstr "Manuel Olarak Düzeltildi"
+msgstr "Elle Düzeltildi"
 
 #. module: purchase
 #: view:purchase.order:0
 msgid "Reference"
-msgstr "Referans"
+msgstr "İlgi"
 
 #. module: purchase
 #: model:ir.model,name:purchase.model_stock_move
@@ -401,7 +401,7 @@ msgstr ""
 #. module: purchase
 #: field:purchase.report,dest_address_id:0
 msgid "Dest. Address Contact Name"
-msgstr "Varılacak Adres İlgili Kişi"
+msgstr "Varış Adresindeki İlgili Kişi"
 
 #. module: purchase
 #: report:purchase.order:0
@@ -422,7 +422,7 @@ msgstr "Analiz Hesabı"
 #. module: purchase
 #: view:purchase.report:0 field:purchase.report,nbr:0
 msgid "# of Lines"
-msgstr "# / Satır"
+msgstr "Satır sayısı"
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:754 code:addons/purchase/purchase.py:769
@@ -542,6 +542,11 @@ msgid ""
 "supplier invoice, you can generate a draft supplier invoice based on the "
 "lines from this menu."
 msgstr ""
+"Bir satınalma siparişinin Fatura Kontrolünü \"Satınalma Siparişi Öğelerine "
+"Göre\" ayarlarsanız, henüz almadığınız tedarikçi faturalarının satınalma "
+"öğelerinintümünü buradan izleyebilirsiniz. Bir tedarikçi faturası alma "
+"durumuna gelmişseniz, bu menü öğelerine göre bir taslak tedarikçi faturası "
+"oluşturabilirsiniz."
 
 #. module: purchase
 #: view:purchase.order:0
@@ -1161,6 +1166,9 @@ msgid ""
 "can import your existing partners by CSV spreadsheet from \"Import Data\" "
 "wizard"
 msgstr ""
+"Bu formdan elle Tedarikçileri ve kişilerini oluşturabilir ya da "
+"içeaktarabilirsiniz veya \"Veri İçeaktarma\" sihirbazından CSV çalışma "
+"sayfası olarak varolan paydaşlarınızı içeaktarabilirsiniz."
 
 #. module: purchase
 #: model:process.transition,name:purchase.process_transition_createpackinglist0
@@ -1261,6 +1269,12 @@ msgid ""
 "Based on generated invoice: create a draft invoice you can validate later.\n"
 "Based on receptions: let you create an invoice when receptions are validated."
 msgstr ""
+"Satınalma Sipariş satırlarına dayalı: seçerek fatura oluşturacağınız 'Fatura "
+"Kontrolü > S.S. satırlarına dayalı'nın içine tek satırları yerleştirin.\n"
+"Oluşturulan faturaya dayalı: daha sonra doğrulayabileceğiniz bir taslak "
+"fatura oluşturun.\n"
+"Kabullere dayanarak: kabuller doğrulandığında fatura oluşturmanıza izin "
+"verir."
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_supplier_address_form
@@ -1684,6 +1698,9 @@ msgid ""
 "receptions\", you can track here all the product receptions and create "
 "invoices for those receptions."
 msgstr ""
+"Satınalma siparişlerinin Fatura Kontrolünü \"Kabullere Dayanarak\" "
+"ayarlarsanız, burada tüm ürün kabullerini izleyebilir ve bu kabuller için "
+"faturalar oluşturabilirsiniz."
 
 #. module: purchase
 #: view:purchase.order:0
@@ -1838,7 +1855,7 @@ msgstr ""
 "Lütfen bir ürün seçmeden önce birini belirtin."
 
 #. module: purchase
-#: model:email.template,body_text:purchase.email_template_edi_purchase
+#: model:email.template,body:purchase.email_template_edi_purchase
 msgid ""
 "\n"
 "Hello${object.partner_address_id.name and ' ' or "
diff --git a/addons/purchase/i18n/uk.po b/addons/purchase/i18n/uk.po
index 77f31f76907..eb0da389943 100644
--- a/addons/purchase/i18n/uk.po
+++ b/addons/purchase/i18n/uk.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:45+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:56+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -1756,7 +1756,7 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: model:email.template,body_text:purchase.email_template_edi_purchase
+#: model:email.template,body:purchase.email_template_edi_purchase
 msgid ""
 "\n"
 "Hello${object.partner_address_id.name and ' ' or "
diff --git a/addons/purchase/i18n/vi.po b/addons/purchase/i18n/vi.po
index 582ab5d01e7..1f9ee993aad 100644
--- a/addons/purchase/i18n/vi.po
+++ b/addons/purchase/i18n/vi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:45+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:56+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -1749,7 +1749,7 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: model:email.template,body_text:purchase.email_template_edi_purchase
+#: model:email.template,body:purchase.email_template_edi_purchase
 msgid ""
 "\n"
 "Hello${object.partner_address_id.name and ' ' or "
diff --git a/addons/purchase/i18n/zh_CN.po b/addons/purchase/i18n/zh_CN.po
index d5f82950f1f..e010694db60 100644
--- a/addons/purchase/i18n/zh_CN.po
+++ b/addons/purchase/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-02-08 01:37+0100\n"
-"PO-Revision-Date: 2012-02-10 14:47+0000\n"
-"Last-Translator: Wei \"oldrev\" Li <oldrev@gmail.com>\n"
+"PO-Revision-Date: 2012-08-27 16:58+0000\n"
+"Last-Translator: ccdos <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: 2012-08-09 04:46+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:57+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -103,7 +103,7 @@ msgstr "开票"
 #. module: purchase
 #: view:purchase.order.line_invoice:0
 msgid "Do you want to generate the supplier invoices?"
-msgstr ""
+msgstr "你是否要生成供应商发票？"
 
 #. module: purchase
 #: model:ir.actions.act_window,help:purchase.purchase_form_action
@@ -139,7 +139,7 @@ msgstr "没有价格表！"
 #. module: purchase
 #: model:ir.model,name:purchase.model_purchase_config_wizard
 msgid "purchase.config.wizard"
-msgstr ""
+msgstr "采购.配置.向导"
 
 #. module: purchase
 #: view:board.board:0 model:ir.actions.act_window,name:purchase.purchase_draft
@@ -427,7 +427,7 @@ msgstr "上月采购单"
 #: code:addons/purchase/purchase.py:412
 #, python-format
 msgid "You must first cancel all receptions related to this purchase order."
-msgstr ""
+msgstr "你必须首先这个采购订单相关的所有收货单。"
 
 #. module: purchase
 #: selection:purchase.order.line,state:0
@@ -491,7 +491,7 @@ msgstr "确认"
 #: model:ir.ui.menu,name:purchase.menu_action_picking_tree4_picking_to_invoice
 #: selection:purchase.order,invoice_method:0
 msgid "Based on receptions"
-msgstr ""
+msgstr "基于收货单"
 
 #. module: purchase
 #: constraint:res.company:0
@@ -998,7 +998,7 @@ msgstr "不含税金额"
 #: code:addons/purchase/purchase.py:754
 #, python-format
 msgid "Selected UOM does not belong to the same category as the product UOM"
-msgstr ""
+msgstr "选择的单位跟产品单位不是同一个类别"
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:907
@@ -1772,7 +1772,7 @@ msgid ""
 msgstr "请在采购界面选择价格表或供应商！然后再选择产品。"
 
 #. module: purchase
-#: model:email.template,body_text:purchase.email_template_edi_purchase
+#: model:email.template,body:purchase.email_template_edi_purchase
 msgid ""
 "\n"
 "Hello${object.partner_address_id.name and ' ' or "
diff --git a/addons/purchase/i18n/zh_TW.po b/addons/purchase/i18n/zh_TW.po
index 1c0e6acc007..dae81c1827c 100644
--- a/addons/purchase/i18n/zh_TW.po
+++ b/addons/purchase/i18n/zh_TW.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:46+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:57+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -1748,7 +1748,7 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: model:email.template,body_text:purchase.email_template_edi_purchase
+#: model:email.template,body:purchase.email_template_edi_purchase
 msgid ""
 "\n"
 "Hello${object.partner_address_id.name and ' ' or "
diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py
index 756016d39e2..592bf783a64 100644
--- a/addons/purchase/purchase.py
+++ b/addons/purchase/purchase.py
@@ -220,7 +220,7 @@ class purchase_order(osv.osv):
         ('name_uniq', 'unique(name, company_id)', 'Order Reference must be unique per Company!'),
     ]
     _name = "purchase.order"
-    _inherit = ['ir.needaction_mixin', 'mail.thread']
+    _inherit = ['mail.thread', 'ir.needaction_mixin']
     _description = "Purchase Order"
     _order = "name desc"
 
@@ -731,24 +731,15 @@ class purchase_order(osv.osv):
     # OpenChatter methods and notifications
     # --------------------------------------
 
-    def get_needaction_user_ids(self, cr, uid, ids, context=None):
-        result = super(purchase_order, self).get_needaction_user_ids(cr, uid, ids, context=context)
-        for obj in self.browse(cr, uid, ids, context=context):
-            if obj.state == 'approved':
-                result[obj.id].append(obj.validator.id)
-        return result
-
-    def message_get_monitored_follower_fields(self, cr, uid, ids, context=None):
-        """ Add 'validator' to the monitored fields """
-        res = super(purchase_order, self).message_get_monitored_follower_fields(cr, uid, ids, context=context)
-        return res + ['validator']
+    def needaction_domain_get(self, cr, uid, ids, context=None):
+        return [('state', '=', 'draft')]
 
     def create_send_note(self, cr, uid, ids, context=None):
-        return self.message_append_note(cr, uid, ids, body=_("Request for quotation <b>created</b>."), context=context)
+        return self.message_post(cr, uid, ids, body=_("Request for quotation <b>created</b>."), context=context)
 
     def confirm_send_note(self, cr, uid, ids, context=None):
         for obj in self.browse(cr, uid, ids, context=context):
-            self.message_append_note(cr, uid, [obj.id], body=_("Quotation for <em>%s</em> <b>converted</b> to a Purchase Order of %s %s.") % (obj.partner_id.name, obj.amount_total, obj.pricelist_id.currency_id.symbol), context=context)
+            self.message_post(cr, uid, [obj.id], body=_("Quotation for <em>%s</em> <b>converted</b> to a Purchase Order of %s %s.") % (obj.partner_id.name, obj.amount_total, obj.pricelist_id.currency_id.symbol), context=context)
 
     def shipment_send_note(self, cr, uid, ids, picking_id, context=None):
         for order in self.browse(cr, uid, ids, context=context):
@@ -757,25 +748,25 @@ class purchase_order(osv.osv):
                 # convert it to the user TZ and re-render it with %Z to add the timezone
                 picking_datetime = fields.DT.datetime.strptime(picking.min_date, DEFAULT_SERVER_DATETIME_FORMAT)
                 picking_date_str = fields.datetime.context_timestamp(cr, uid, picking_datetime, context=context).strftime(DATETIME_FORMATS_MAP['%+'] + " (%Z)")
-                self.message_append_note(cr, uid, [order.id], body=_("Shipment <em>%s</em> <b>scheduled</b> for %s.") % (picking.name, picking_date_str), context=context)
+                self.message_post(cr, uid, [order.id], body=_("Shipment <em>%s</em> <b>scheduled</b> for %s.") % (picking.name, picking_date_str), context=context)
 
     def invoice_send_note(self, cr, uid, ids, invoice_id, context=None):
         for order in self.browse(cr, uid, ids, context=context):
             for invoice in (inv for inv in order.invoice_ids if inv.id == invoice_id):
-                self.message_append_note(cr, uid, [order.id], body=_("Draft Invoice of %s %s is <b>waiting for validation</b>.") % (invoice.amount_total, invoice.currency_id.symbol), context=context)
+                self.message_post(cr, uid, [order.id], body=_("Draft Invoice of %s %s is <b>waiting for validation</b>.") % (invoice.amount_total, invoice.currency_id.symbol), context=context)
 
     def shipment_done_send_note(self, cr, uid, ids, context=None):
-        self.message_append_note(cr, uid, ids, body=_("""Shipment <b>received</b>."""), context=context)
+        self.message_post(cr, uid, ids, body=_("""Shipment <b>received</b>."""), context=context)
 
     def invoice_done_send_note(self, cr, uid, ids, context=None):
-        self.message_append_note(cr, uid, ids, body=_("Invoice <b>paid</b>."), context=context)
+        self.message_post(cr, uid, ids, body=_("Invoice <b>paid</b>."), context=context)
 
     def draft_send_note(self, cr, uid, ids, context=None):
-        return self.message_append_note(cr, uid, ids, body=_("Purchase Order has been set to <b>draft</b>."), context=context)
+        return self.message_post(cr, uid, ids, body=_("Purchase Order has been set to <b>draft</b>."), context=context)
 
     def cancel_send_note(self, cr, uid, ids, context=None):
         for obj in self.browse(cr, uid, ids, context=context):
-            self.message_append_note(cr, uid, [obj.id], body=_("Purchase Order for <em>%s</em> <b>cancelled</b>.") % (obj.partner_id.name), context=context)
+            self.message_post(cr, uid, [obj.id], body=_("Purchase Order for <em>%s</em> <b>cancelled</b>.") % (obj.partner_id.name), context=context)
 
 purchase_order()
 
diff --git a/addons/purchase/purchase_data.xml b/addons/purchase/purchase_data.xml
index 75074d4cedf..693d18eb1ba 100644
--- a/addons/purchase/purchase_data.xml
+++ b/addons/purchase/purchase_data.xml
@@ -3,14 +3,15 @@
     <data noupdate="1">
 
         <!-- notify all employees of module installation -->
-        <function model="mail.group" name="message_append_note">
-            <!-- ids, subject, body, parent_id=False, type='notification', content_subtype='html' -->
-            <value eval="[ref('mail.group_all_employees')]"/>
-            <value>Module Purchase Management has been installed.</value>
-            <value>From the top menu Purchases, create purchase orders to buy products from your suppliers, encode supplier invoices and manage your payments.
+        <record model="mail.message" id="module_install_notification">
+            <field name="model">mail.group</field>
+            <field name="res_id" ref="mail.group_all_employees"/>
+            <field name="type">notification</field>
+            <field name="subject">Purchase Management application installed!</field>
+            <field name="body">From the top menu Purchases, create purchase orders to buy products from your suppliers, enter supplier invoices and manage payments.
 
-You can also manage purchase requisitions, see the Purchase Settings.</value>
-        </function>
+You can also manage purchase requisitions, see also the Purchase Settings.</field>
+        </record>
 
         <record id="req_link_purchase_order" model="res.request.link">
             <field name="name">Purchase Order</field>
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index d2fbba68866..ab5df67f52d 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -73,7 +73,7 @@
         parent="base.menu_purchase_root" sequence="6"/>
 
     <record id="action_invoice_pending" model="ir.actions.act_window">
-        <field name="name">Based on Draft Invoices</field>
+        <field name="name">On Draft Invoices</field>
         <field name="res_model">account.invoice</field>
         <field name="view_type">form</field>
         <field name="view_mode">tree,form,calendar,graph</field>
@@ -95,7 +95,7 @@
         </field>
     </record>
 
-     <menuitem name="Based on Draft Invoices"
+     <menuitem
           id="menu_procurement_management_pending_invoice"
           action="action_invoice_pending"
           parent="menu_procurement_management_invoice"
@@ -177,7 +177,7 @@
             <field name="arch" type="xml">
                 <form string="Purchase Order" version="7.0">
                 <header>
-                    <button name="purchase_confirm" states="draft,sent" string="Confirm Quotation" class="oe_highlight"/>
+                    <button name="purchase_confirm" states="draft,sent" string="Confirm Order" class="oe_highlight"/>
                     <button name="wkf_send_rfq" states="draft" string="Send RFQ" type="object" context="{'send_rfq':True}"/>
                     <button name="wkf_send_rfq" states="confirmed" string="Resend Purchase Order" type="object" class="oe_highlight"/>
                     <button name="action_cancel" states="except_picking,except_invoice" string="Cancel" type="object" />
@@ -214,12 +214,16 @@
                     <notebook>
                         <page string="Purchase Order">
                             <field name="order_line">
-                                <tree string="Purchase Order Lines">
-                                    <field name="date_planned"/>
+                                <tree string="Purchase Order Lines" editable="bottom">
+                                    <field name="product_id" on_change="onchange_product_id(parent.pricelist_id,product_id,product_qty,product_uom,parent.partner_id, parent.date_order,parent.fiscal_position,date_planned,name,price_unit,context)"/>
                                     <field name="name"/>
-                                    <field name="product_qty"/>
-                                    <field name="product_uom" groups="product.group_uom"/>
+                                    <field name="date_planned"/>
+                                    <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                                    <field name="account_analytic_id" groups="purchase.group_analytic_accounting" domain="[('parent_id','!=',False)]"/>
+                                    <field name="product_qty" on_change="onchange_product_id(parent.pricelist_id,product_id,product_qty,product_uom,parent.partner_id,parent.date_order,parent.fiscal_position,date_planned,name,price_unit,context)"/>
+                                    <field name="product_uom" groups="product.group_uom" on_change="onchange_product_uom(parent.pricelist_id,product_id,product_qty,product_uom,parent.partner_id, parent.date_order,parent.fiscal_position,date_planned,name,price_unit,context)"/>
                                     <field name="price_unit"/>
+                                    <field name="taxes_id" widget="many2many_tags" domain="[('parent_id','=',False),('type_tax_use','!=','sale')]"/>
                                     <field name="price_subtotal"/>
                                 </tree>
                             </field>
@@ -298,7 +302,7 @@
             <field name="arch" type="xml">
                 <search string="Search Purchase Order">
                     <field name="name" string="Reference"/>
-                    <filter icon="terp-mail-message-new" string="Inbox" help="Unread messages" name="needaction_pending" domain="[('needaction_pending','=',True)]"/>
+                    <filter icon="terp-mail-message-new" string="Inbox" help="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-check" name="approved" string="Purchase Orders" domain="[('state','not in',('draft','cancel'))]" help="Approved purchase orders"/>
@@ -323,8 +327,8 @@
             <field name="name">purchase.order.tree</field>
             <field name="model">purchase.order</field>
             <field name="arch" type="xml">
-                <tree fonts="bold:needaction_pending==True" colors="grey:state=='cancel';blue:state in (confirmed');red:state in ('except_invoice','except_picking')" string="Purchase Order">
-                    <field name="needaction_pending" invisible="1"/>
+                <tree fonts="bold:message_unread==True" colors="grey:state=='cancel';blue:state in ('wait','confirmed');red:state in ('except_invoice','except_picking')" string="Purchase Order">
+                    <field name="message_unread" invisible="1"/>
                     <field name="name" string="Reference"/>
                     <field name="date_order" />
                     <field name="partner_id"/>
@@ -508,7 +512,7 @@
 
 
         <record id="purchase_line_form_action2" model="ir.actions.act_window">
-            <field name="name">Based on Purchase Order Lines</field>
+            <field name="name">On Purchase Order Lines</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">purchase.order.line</field>
             <field name="domain">[('order_id.invoice_method','&lt;&gt;','picking'), ('state','in',('confirmed','done')), ('invoiced', '=', False)]</field>
@@ -554,5 +558,19 @@
                 </xpath>
             </field>
         </record>
+        
+        <!-- Product Suppliers-->
+        
+        <record id="view_product_supplier_inherit" model="ir.ui.view">
+            <field name="name">product.normal.supplier.form.inherit</field>
+            <field name="model">product.product</field>
+            <field name="inherit_id" ref="product.product_normal_form_view"/>
+            <field name="arch" type="xml">
+                <group name="procurement" position="after">
+                     <separator string="Suppliers"/>
+                     <field name="seller_ids" context="{'uom_id': uom_id}"/>
+                </group>
+            </field>
+        </record>
     </data>
 </openerp>
diff --git a/addons/purchase/report/order.rml b/addons/purchase/report/order.rml
index dedee77e8a1..eadbb1ea4c4 100644
--- a/addons/purchase/report/order.rml
+++ b/addons/purchase/report/order.rml
@@ -186,9 +186,9 @@
           <para style="terp_default_9">
             <font color="white"> </font>
           </para>
-          <para style="terp_default_9">Tél. : [[ (o.partner_id.phone) or removeParentNode('para') ]]</para>
+          <para style="terp_default_9">Tel : [[ (o.partner_id.phone) or removeParentNode('para') ]]</para>
           <para style="terp_default_9">Fax : [[ (o.partner_id.fax) or removeParentNode('para') ]]</para>
-          <para style="terp_default_9">TVA : [[ (o.partner_id.vat) or removeParentNode('para') ]]</para>
+          <para style="terp_default_9">TIN : [[ (o.partner_id.vat) or removeParentNode('para') ]]</para>
         </td>
       </tr>
     </blockTable>
diff --git a/addons/purchase/report/purchase_report.py b/addons/purchase/report/purchase_report.py
index 4ab6251c7a2..f4bd4fee425 100644
--- a/addons/purchase/report/purchase_report.py
+++ b/addons/purchase/report/purchase_report.py
@@ -78,7 +78,7 @@ class purchase_report(osv.osv):
                     to_char(s.date_order, 'YYYY-MM-DD') as day,
                     s.state,
                     s.date_approve,
-                    date_trunc('day',s.minimum_planned_date) as expected_date,
+                    s.minimum_planned_date as expected_date,
                     s.dest_address_id,
                     s.pricelist_id,
                     s.validator,
@@ -117,7 +117,7 @@ class purchase_report(osv.osv):
                     s.date_approve,
                     l.date_planned,
                     l.product_uom,
-                    date_trunc('day',s.minimum_planned_date),
+                    s.minimum_planned_date,
                     s.pricelist_id,
                     s.validator,
                     s.dest_address_id,
@@ -129,7 +129,7 @@ class purchase_report(osv.osv):
                     to_char(s.date_order, 'YYYY-MM-DD'),
                     s.state,
                     s.warehouse_id,
-                    u.uom_type, 
+                    u.uom_type,
                     u.category_id,
                     t.uom_id,
                     u.id,
diff --git a/addons/purchase/res_config.py b/addons/purchase/res_config.py
index 6beac5a4cd0..3d9c858cec5 100644
--- a/addons/purchase/res_config.py
+++ b/addons/purchase/res_config.py
@@ -40,6 +40,9 @@ class purchase_config_settings(osv.osv_memory):
         'group_uom':fields.boolean("manage different units of measure for products",
             implied_group='product.group_uom',
             help="""Allows you to select and maintain different units of measure for products."""),
+        'group_costing_method':fields.boolean("compute product cost price based on average cost",
+            implied_group='product.group_costing_method',
+            help="""Allows you to compute product cost price based on average cost."""),
         'group_purchase_delivery_address': fields.boolean("allow a different address for incoming products and invoicings",
             implied_group='purchase.group_delivery_invoice_address',
             help="Allows you to specify different delivery and invoice addresses on a purchase order."),
diff --git a/addons/purchase/res_config_view.xml b/addons/purchase/res_config_view.xml
index 23d89f1a7f1..00e0b6108e8 100644
--- a/addons/purchase/res_config_view.xml
+++ b/addons/purchase/res_config_view.xml
@@ -59,6 +59,10 @@
                                 <field name="group_purchase_delivery_address" class="oe_inline"/>
                                 <label for="group_purchase_delivery_address"/>
                             </div>
+                            <div>
+                                <field name="group_costing_method" class="oe_inline"/>
+                                <label for="group_costing_method"/>
+                            </div>
                             <div name="module_purchase_double_validation">
                                 <field name="module_purchase_double_validation" class="oe_inline"/>
                                 <label for="module_purchase_double_validation"/>
diff --git a/addons/purchase/security/ir.model.access.csv b/addons/purchase/security/ir.model.access.csv
index c45b8a9b070..3c8d072c536 100644
--- a/addons/purchase/security/ir.model.access.csv
+++ b/addons/purchase/security/ir.model.access.csv
@@ -6,7 +6,7 @@ access_purchase_order_line_manager,purchase.order.line manager,model_purchase_or
 access_stock_location_purchase_user,stock.location,stock.model_stock_location,group_purchase_user,1,0,0,0
 access_stock_warehouse_purchase_user,stock.warehouse,stock.model_stock_warehouse,group_purchase_user,1,0,0,0
 access_stock_picking_purchase_user,stock.picking,stock.model_stock_picking,group_purchase_user,1,1,1,1
-access_stock_move_purchase_user,stock.move,stock.model_stock_move,group_purchase_user,1,0,0,0
+access_stock_move_purchase_user,stock.move,stock.model_stock_move,group_purchase_user,1,1,1,0
 access_purchase_order_stock_worker,purchase.order,model_purchase_order,stock.group_stock_user,1,0,0,0
 access_purchase_order_line_stock_worker,purchase.order.line,model_purchase_order_line,stock.group_stock_user,1,0,0,0
 access_account_tax_purchase_user,account.tax,account.model_account_tax,group_purchase_user,1,0,0,0
@@ -19,7 +19,7 @@ access_stock_picking_purchase_user_manager,stock.picking,stock.model_stock_picki
 access_stock_move_purchase_user_manager,stock.move,stock.model_stock_move,group_purchase_manager,1,1,1,1
 access_account_tax_purchase_user_manager,account.tax,account.model_account_tax,group_purchase_manager,1,0,0,0
 access_product_product_purchase_user,product.product.purchase.user,product.model_product_product,group_purchase_user,1,0,0,0
-access_product_product_purchase_manager,product.product.purchase.manager,product.model_product_product,group_purchase_manager,1,0,0,0
+access_product_product_purchase_manager,product.product purchase_manager,product.model_product_product,purchase.group_purchase_manager,1,1,1,1
 access_product_template_purchase_user,product.template purchase_user,product.model_product_template,group_purchase_user,1,0,0,0
 access_product_template_purchase_manager,product.template purchase_manager,product.model_product_template,group_purchase_manager,1,0,0,0
 access_account_invoice_purchase,account_invoice purchase,account.model_account_invoice,group_purchase_user,1,1,1,1
@@ -49,7 +49,6 @@ access_product_uom_purchase_manager,product.uom purchase_manager,product.model_p
 access_product_ul_purchase_manager,product.ul purchase_manager,product.model_product_ul,purchase.group_purchase_manager,1,1,1,1
 access_product_category_purchase_manager,product.category purchase_manager,product.model_product_category,purchase.group_purchase_manager,1,1,1,1
 access_product_template_purchase_manager,product.template purchase_manager,product.model_product_template,purchase.group_purchase_manager,1,1,1,1
-access_product_product_purchase_manager,product.product purchase_manager,product.model_product_product,purchase.group_purchase_manager,1,1,1,1
 access_product_packaging_purchase_manager,product.packaging purchase_manager,product.model_product_packaging,purchase.group_purchase_manager,1,1,1,1
 access_product_supplierinfo_purchase_manager,product.supplierinfo purchase_manager,product.model_product_supplierinfo,purchase.group_purchase_manager,1,1,1,1
 access_pricelist_partnerinfo_purchase_manager,pricelist.partnerinfo purchase_manager,product.model_pricelist_partnerinfo,purchase.group_purchase_manager,1,1,1,1
@@ -65,3 +64,4 @@ access_account_journal_purchase_manager,account.journal purchase manager,account
 access_stock_tracking_purchase_user,stock.tracking purchase.user,stock.model_stock_tracking,purchase.group_purchase_user,1,1,1,0
 access_stock_location_purchase_manager,stock.location purchase manager,stock.model_stock_location,purchase.group_purchase_manager,1,0,0,0
 access_stock_warehouse_orderpoint_manager,stock.warehouse.orderpoint,procurement.model_stock_warehouse_orderpoint,purchase.group_purchase_manager,1,0,0,0
+access_stock_warehouse_orderpoint_manager,stock.warehouse.orderpoint,procurement.model_stock_warehouse_orderpoint,group_purchase_user,1,0,0,0
diff --git a/addons/purchase/stock_view.xml b/addons/purchase/stock_view.xml
index ad1c26a84c1..b522618ed2e 100644
--- a/addons/purchase/stock_view.xml
+++ b/addons/purchase/stock_view.xml
@@ -109,7 +109,7 @@
         </record>
 
         <record id="action_picking_tree4_picking_to_invoice" model="ir.actions.act_window">
-            <field name="name">Based on Incoming Shipments</field>
+            <field name="name">On Incoming Shipments</field>
             <field name="res_model">stock.picking</field>
             <field name="type">ir.actions.act_window</field>
             <field name="view_type">form</field>
diff --git a/addons/purchase/test/process/edi_purchase_order.yml b/addons/purchase/test/process/edi_purchase_order.yml
index 02756959848..d0e90f3788d 100644
--- a/addons/purchase/test/process/edi_purchase_order.yml
+++ b/addons/purchase/test/process/edi_purchase_order.yml
@@ -86,13 +86,13 @@
             "__model": "sale.order.line",
             "__import_module": "purchase", 
             "__import_model": "purchase.order.line", 
-            "name": "Basic PC", 
+            "name": "PC Assemble SC234", 
             "product_uom": ["product:724f93ec-ddd0-11e0-88ec-701a04e25543.product_uom_unit", "Unit"], 
             "product_qty": 1.0,
             "date_planned": "2011-09-30",
             "sequence": 10, 
             "price_unit": 150.0, 
-            "product_id": ["product:724f93ec-ddd0-11e0-88ec-701a04e25543.product_product_3", "[PC1] Basic PC"],
+            "product_id": ["product:724f93ec-ddd0-11e0-88ec-701a04e25543.product_product_3", "[PCSC234] PC Assemble SC234"],
         },
         {
             "__id": "sale:724f93ec-ddd0-11e0-88ec-701a04e25543.sale_order_line-LXEqeadasdad", 
@@ -100,13 +100,13 @@
             "__model": "sale.order.line",
             "__import_module": "purchase", 
             "__import_model": "purchase.order.line", 
-            "name": "Medium PC", 
+            "name": "PC on Demand", 
             "product_uom": ["product:724f93ec-ddd0-11e0-88ec-701a04e25543.product_uom_unit", "Unit"], 
             "product_qty": 10.0, 
             "sequence": 11, 
             "date_planned": "2011-09-15", 
             "price_unit": 20.0, 
-            "product_id": ["product:724f93ec-ddd0-11e0-88ec-701a04e25543.product_product_5", "[PC3] Medium PC"],
+            "product_id": ["product:724f93ec-ddd0-11e0-88ec-701a04e25543.product_product_5", "[PC-DEM] PC on Demand"],
         }], 
     }
     new_purchase_order_id = purchase_order_pool.edi_import(cr, uid, edi_document, context=context)
@@ -123,11 +123,11 @@
     assert order_new.amount_untaxed == 350, "untaxed amount is not same"
     assert len(order_new.order_line) == 2, "Purchase order lines number mismatch"
     for purchase_line in order_new.order_line:
-        if purchase_line.name == 'Basic PC':
+        if purchase_line.name == 'PC Assemble SC234':
             assert purchase_line.product_uom.name == "Unit" , "uom is not same"
             assert purchase_line.price_unit == 150 , "unit price is not same, got %s, expected 150"%(purchase_line.price_unit,)
             assert purchase_line.product_qty == 1 , "product qty is not same"
-        elif purchase_line.name == 'Medium PC':
+        elif purchase_line.name == 'PC on Demand':
             assert purchase_line.product_uom.name == "Unit" , "uom is not same"
             assert purchase_line.price_unit == 20 , "unit price is not same, got %s, expected 20"%(purchase_line.price_unit,)
             assert purchase_line.product_qty == 10 , "product qty is not same"
diff --git a/addons/purchase_analytic_plans/__openerp__.py b/addons/purchase_analytic_plans/__openerp__.py
index 283923895d6..801551c7a07 100644
--- a/addons/purchase_analytic_plans/__openerp__.py
+++ b/addons/purchase_analytic_plans/__openerp__.py
@@ -33,11 +33,10 @@ on a supplier purchase order into several accounts and analytic plans.
     """,
     'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
-    'images' : ['images/purchase_analytic_distribution.jpeg'],
+    'images': ['images/purchase_analytic_distribution.jpeg'],
     'depends': ['purchase', 'account_analytic_plans'],
-    'init_xml': [],
-    'update_xml': ['purchase_analytic_plans_view.xml'],
-    'demo_xml': [],
+    'data': ['purchase_analytic_plans_view.xml'],
+    'demo': [],
     'installable': True,
     'auto_install': False,
     'certificate': '0062176518909',
diff --git a/addons/purchase_analytic_plans/i18n/ar.po b/addons/purchase_analytic_plans/i18n/ar.po
index 8ade0860dfb..61f08f873f1 100644
--- a/addons/purchase_analytic_plans/i18n/ar.po
+++ b/addons/purchase_analytic_plans/i18n/ar.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:48+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:56+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: purchase_analytic_plans
 #: field:purchase.order.line,analytics_id:0
diff --git a/addons/purchase_analytic_plans/i18n/bg.po b/addons/purchase_analytic_plans/i18n/bg.po
index 4dc2b32524b..d8c451721cc 100644
--- a/addons/purchase_analytic_plans/i18n/bg.po
+++ b/addons/purchase_analytic_plans/i18n/bg.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:48+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:56+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: purchase_analytic_plans
 #: field:purchase.order.line,analytics_id:0
diff --git a/addons/purchase_analytic_plans/i18n/bs.po b/addons/purchase_analytic_plans/i18n/bs.po
index 8b92fdd76c8..5785660b7f2 100644
--- a/addons/purchase_analytic_plans/i18n/bs.po
+++ b/addons/purchase_analytic_plans/i18n/bs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:48+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:56+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: purchase_analytic_plans
 #: field:purchase.order.line,analytics_id:0
diff --git a/addons/purchase_analytic_plans/i18n/ca.po b/addons/purchase_analytic_plans/i18n/ca.po
index d6f2667bb6b..e95e2343a5d 100644
--- a/addons/purchase_analytic_plans/i18n/ca.po
+++ b/addons/purchase_analytic_plans/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:48+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:56+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: purchase_analytic_plans
 #: field:purchase.order.line,analytics_id:0
diff --git a/addons/purchase_analytic_plans/i18n/cs.po b/addons/purchase_analytic_plans/i18n/cs.po
index b0995a7565f..7c967fba9d9 100644
--- a/addons/purchase_analytic_plans/i18n/cs.po
+++ b/addons/purchase_analytic_plans/i18n/cs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:48+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:56+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: purchase_analytic_plans
 #: field:purchase.order.line,analytics_id:0
diff --git a/addons/purchase_analytic_plans/i18n/da.po b/addons/purchase_analytic_plans/i18n/da.po
index 9c73d750135..f6a12d8dc3f 100644
--- a/addons/purchase_analytic_plans/i18n/da.po
+++ b/addons/purchase_analytic_plans/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:48+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:56+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: purchase_analytic_plans
 #: field:purchase.order.line,analytics_id:0
diff --git a/addons/purchase_analytic_plans/i18n/de.po b/addons/purchase_analytic_plans/i18n/de.po
index 7e55222f586..7aa219270c8 100644
--- a/addons/purchase_analytic_plans/i18n/de.po
+++ b/addons/purchase_analytic_plans/i18n/de.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:48+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:56+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: purchase_analytic_plans
 #: field:purchase.order.line,analytics_id:0
diff --git a/addons/purchase_analytic_plans/i18n/el.po b/addons/purchase_analytic_plans/i18n/el.po
index 2542a85485b..ae7b41398b7 100644
--- a/addons/purchase_analytic_plans/i18n/el.po
+++ b/addons/purchase_analytic_plans/i18n/el.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:48+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:56+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
 "X-Poedit-SourceCharset: utf-8\n"
diff --git a/addons/purchase_analytic_plans/i18n/es.po b/addons/purchase_analytic_plans/i18n/es.po
index 3605199efbb..5e5045b7418 100644
--- a/addons/purchase_analytic_plans/i18n/es.po
+++ b/addons/purchase_analytic_plans/i18n/es.po
@@ -8,13 +8,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 00:37+0000\n"
 "PO-Revision-Date: 2011-01-13 12:42+0000\n"
-"Last-Translator: Carlos @ smile-iberia <Unknown>\n"
+"Last-Translator: Carlos Ch. <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: 2012-08-07 04:48+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:56+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: purchase_analytic_plans
 #: field:purchase.order.line,analytics_id:0
diff --git a/addons/purchase_analytic_plans/i18n/es_AR.po b/addons/purchase_analytic_plans/i18n/es_AR.po
index b3e15086790..cf7ae00c328 100644
--- a/addons/purchase_analytic_plans/i18n/es_AR.po
+++ b/addons/purchase_analytic_plans/i18n/es_AR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:48+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:56+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: purchase_analytic_plans
 #: field:purchase.order.line,analytics_id:0
diff --git a/addons/purchase_analytic_plans/i18n/es_CR.po b/addons/purchase_analytic_plans/i18n/es_CR.po
index 394bb7ef461..d651f469712 100644
--- a/addons/purchase_analytic_plans/i18n/es_CR.po
+++ b/addons/purchase_analytic_plans/i18n/es_CR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:48+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:56+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 "Language: \n"
 
 #. module: purchase_analytic_plans
diff --git a/addons/purchase_analytic_plans/i18n/et.po b/addons/purchase_analytic_plans/i18n/et.po
index 2627535351d..da1b788984e 100644
--- a/addons/purchase_analytic_plans/i18n/et.po
+++ b/addons/purchase_analytic_plans/i18n/et.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:48+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:56+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: purchase_analytic_plans
 #: field:purchase.order.line,analytics_id:0
diff --git a/addons/purchase_analytic_plans/i18n/fi.po b/addons/purchase_analytic_plans/i18n/fi.po
index 8b39ac7ed35..ca1aff6ded1 100644
--- a/addons/purchase_analytic_plans/i18n/fi.po
+++ b/addons/purchase_analytic_plans/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:48+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:56+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: purchase_analytic_plans
 #: field:purchase.order.line,analytics_id:0
diff --git a/addons/purchase_analytic_plans/i18n/fr.po b/addons/purchase_analytic_plans/i18n/fr.po
index 98ff6d30fd8..afb02a0451d 100644
--- a/addons/purchase_analytic_plans/i18n/fr.po
+++ b/addons/purchase_analytic_plans/i18n/fr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:48+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:56+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: purchase_analytic_plans
 #: field:purchase.order.line,analytics_id:0
diff --git a/addons/purchase_analytic_plans/i18n/gl.po b/addons/purchase_analytic_plans/i18n/gl.po
index cac6754f2cc..52c9244ce6c 100644
--- a/addons/purchase_analytic_plans/i18n/gl.po
+++ b/addons/purchase_analytic_plans/i18n/gl.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:48+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:56+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: purchase_analytic_plans
 #: field:purchase.order.line,analytics_id:0
diff --git a/addons/purchase_analytic_plans/i18n/hr.po b/addons/purchase_analytic_plans/i18n/hr.po
index 1f677e10820..b49b6cd6324 100644
--- a/addons/purchase_analytic_plans/i18n/hr.po
+++ b/addons/purchase_analytic_plans/i18n/hr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:48+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:56+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: purchase_analytic_plans
 #: field:purchase.order.line,analytics_id:0
diff --git a/addons/purchase_analytic_plans/i18n/hu.po b/addons/purchase_analytic_plans/i18n/hu.po
index 913f5d7c44f..6ca837937cd 100644
--- a/addons/purchase_analytic_plans/i18n/hu.po
+++ b/addons/purchase_analytic_plans/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:48+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:56+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: purchase_analytic_plans
 #: field:purchase.order.line,analytics_id:0
diff --git a/addons/purchase_analytic_plans/i18n/id.po b/addons/purchase_analytic_plans/i18n/id.po
index 162436a88b7..d4210813c23 100644
--- a/addons/purchase_analytic_plans/i18n/id.po
+++ b/addons/purchase_analytic_plans/i18n/id.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:48+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:56+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: purchase_analytic_plans
 #: field:purchase.order.line,analytics_id:0
diff --git a/addons/purchase_analytic_plans/i18n/it.po b/addons/purchase_analytic_plans/i18n/it.po
index 32ed415256c..79b69142004 100644
--- a/addons/purchase_analytic_plans/i18n/it.po
+++ b/addons/purchase_analytic_plans/i18n/it.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:48+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:56+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: purchase_analytic_plans
 #: field:purchase.order.line,analytics_id:0
diff --git a/addons/purchase_analytic_plans/i18n/ja.po b/addons/purchase_analytic_plans/i18n/ja.po
index 36f7f468f92..e1cd1925af4 100644
--- a/addons/purchase_analytic_plans/i18n/ja.po
+++ b/addons/purchase_analytic_plans/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:48+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:56+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: purchase_analytic_plans
 #: field:purchase.order.line,analytics_id:0
diff --git a/addons/purchase_analytic_plans/i18n/ko.po b/addons/purchase_analytic_plans/i18n/ko.po
index 54e01b4a8fa..02007db187d 100644
--- a/addons/purchase_analytic_plans/i18n/ko.po
+++ b/addons/purchase_analytic_plans/i18n/ko.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:48+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:56+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: purchase_analytic_plans
 #: field:purchase.order.line,analytics_id:0
diff --git a/addons/purchase_analytic_plans/i18n/lt.po b/addons/purchase_analytic_plans/i18n/lt.po
index bec1a4eda1d..88f87f4da7e 100644
--- a/addons/purchase_analytic_plans/i18n/lt.po
+++ b/addons/purchase_analytic_plans/i18n/lt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:48+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:56+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: purchase_analytic_plans
 #: field:purchase.order.line,analytics_id:0
diff --git a/addons/purchase_analytic_plans/i18n/mn.po b/addons/purchase_analytic_plans/i18n/mn.po
index 6b270b0ee5d..c9c423f8c29 100644
--- a/addons/purchase_analytic_plans/i18n/mn.po
+++ b/addons/purchase_analytic_plans/i18n/mn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:48+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:56+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: purchase_analytic_plans
 #: field:purchase.order.line,analytics_id:0
diff --git a/addons/purchase_analytic_plans/i18n/nl.po b/addons/purchase_analytic_plans/i18n/nl.po
index aefbb2f6dea..21b510289ee 100644
--- a/addons/purchase_analytic_plans/i18n/nl.po
+++ b/addons/purchase_analytic_plans/i18n/nl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:48+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:56+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: purchase_analytic_plans
 #: field:purchase.order.line,analytics_id:0
diff --git a/addons/purchase_analytic_plans/i18n/nl_BE.po b/addons/purchase_analytic_plans/i18n/nl_BE.po
index 599ca0f3922..9b5d24f7ca9 100644
--- a/addons/purchase_analytic_plans/i18n/nl_BE.po
+++ b/addons/purchase_analytic_plans/i18n/nl_BE.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:48+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:56+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: purchase_analytic_plans
 #: field:purchase.order.line,analytics_id:0
diff --git a/addons/purchase_analytic_plans/i18n/pl.po b/addons/purchase_analytic_plans/i18n/pl.po
index 208d15e79e7..293f58b4600 100644
--- a/addons/purchase_analytic_plans/i18n/pl.po
+++ b/addons/purchase_analytic_plans/i18n/pl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:48+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:56+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: purchase_analytic_plans
 #: field:purchase.order.line,analytics_id:0
diff --git a/addons/purchase_analytic_plans/i18n/pt.po b/addons/purchase_analytic_plans/i18n/pt.po
index 5860ba359c1..fffc1c05da2 100644
--- a/addons/purchase_analytic_plans/i18n/pt.po
+++ b/addons/purchase_analytic_plans/i18n/pt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:48+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:56+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: purchase_analytic_plans
 #: field:purchase.order.line,analytics_id:0
diff --git a/addons/purchase_analytic_plans/i18n/pt_BR.po b/addons/purchase_analytic_plans/i18n/pt_BR.po
index 736c89f4d7a..8e2599270c6 100644
--- a/addons/purchase_analytic_plans/i18n/pt_BR.po
+++ b/addons/purchase_analytic_plans/i18n/pt_BR.po
@@ -8,13 +8,14 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 00:37+0000\n"
 "PO-Revision-Date: 2012-07-28 20:58+0000\n"
-"Last-Translator: Fábio Martinelli <webmaster@guaru.net>\n"
+"Last-Translator: Fábio Martinelli - http://zupy.com.br "
+"<webmaster@guaru.net>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:48+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:56+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: purchase_analytic_plans
 #: field:purchase.order.line,analytics_id:0
diff --git a/addons/purchase_analytic_plans/i18n/ro.po b/addons/purchase_analytic_plans/i18n/ro.po
index 5f5d581749d..cb85dca58f0 100644
--- a/addons/purchase_analytic_plans/i18n/ro.po
+++ b/addons/purchase_analytic_plans/i18n/ro.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:48+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:56+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: purchase_analytic_plans
 #: field:purchase.order.line,analytics_id:0
diff --git a/addons/purchase_analytic_plans/i18n/ru.po b/addons/purchase_analytic_plans/i18n/ru.po
index 4dc00e1792c..b4e945f5c57 100644
--- a/addons/purchase_analytic_plans/i18n/ru.po
+++ b/addons/purchase_analytic_plans/i18n/ru.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:48+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:56+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: purchase_analytic_plans
 #: field:purchase.order.line,analytics_id:0
diff --git a/addons/purchase_analytic_plans/i18n/sl.po b/addons/purchase_analytic_plans/i18n/sl.po
index a4e8b69d47b..794de4075d2 100644
--- a/addons/purchase_analytic_plans/i18n/sl.po
+++ b/addons/purchase_analytic_plans/i18n/sl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:48+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:56+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: purchase_analytic_plans
 #: field:purchase.order.line,analytics_id:0
diff --git a/addons/purchase_analytic_plans/i18n/sq.po b/addons/purchase_analytic_plans/i18n/sq.po
index eebdf2a8775..81270c4dbe0 100644
--- a/addons/purchase_analytic_plans/i18n/sq.po
+++ b/addons/purchase_analytic_plans/i18n/sq.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:48+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:56+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: purchase_analytic_plans
 #: field:purchase.order.line,analytics_id:0
diff --git a/addons/purchase_analytic_plans/i18n/sr.po b/addons/purchase_analytic_plans/i18n/sr.po
index 57f9b98cf51..1cf8b4bfe6f 100644
--- a/addons/purchase_analytic_plans/i18n/sr.po
+++ b/addons/purchase_analytic_plans/i18n/sr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:48+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:56+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: purchase_analytic_plans
 #: field:purchase.order.line,analytics_id:0
diff --git a/addons/purchase_analytic_plans/i18n/sr@latin.po b/addons/purchase_analytic_plans/i18n/sr@latin.po
index 9feadf6d282..6a8239a97c0 100644
--- a/addons/purchase_analytic_plans/i18n/sr@latin.po
+++ b/addons/purchase_analytic_plans/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:48+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:56+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: purchase_analytic_plans
 #: field:purchase.order.line,analytics_id:0
diff --git a/addons/purchase_analytic_plans/i18n/sv.po b/addons/purchase_analytic_plans/i18n/sv.po
index f9a1ce3e509..3611dcf39c0 100644
--- a/addons/purchase_analytic_plans/i18n/sv.po
+++ b/addons/purchase_analytic_plans/i18n/sv.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:48+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:56+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: purchase_analytic_plans
 #: field:purchase.order.line,analytics_id:0
diff --git a/addons/purchase_analytic_plans/i18n/tlh.po b/addons/purchase_analytic_plans/i18n/tlh.po
index 80bce85fd97..0beeebede0c 100644
--- a/addons/purchase_analytic_plans/i18n/tlh.po
+++ b/addons/purchase_analytic_plans/i18n/tlh.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:48+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:56+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: purchase_analytic_plans
 #: field:purchase.order.line,analytics_id:0
diff --git a/addons/purchase_analytic_plans/i18n/tr.po b/addons/purchase_analytic_plans/i18n/tr.po
index 0beab3304e4..c40e604b824 100644
--- a/addons/purchase_analytic_plans/i18n/tr.po
+++ b/addons/purchase_analytic_plans/i18n/tr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:48+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:56+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: purchase_analytic_plans
 #: field:purchase.order.line,analytics_id:0
diff --git a/addons/purchase_analytic_plans/i18n/uk.po b/addons/purchase_analytic_plans/i18n/uk.po
index e786f399edd..c1640124db8 100644
--- a/addons/purchase_analytic_plans/i18n/uk.po
+++ b/addons/purchase_analytic_plans/i18n/uk.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:48+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:56+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: purchase_analytic_plans
 #: field:purchase.order.line,analytics_id:0
diff --git a/addons/purchase_analytic_plans/i18n/ur.po b/addons/purchase_analytic_plans/i18n/ur.po
index 09ad8d9d204..60be71fa152 100644
--- a/addons/purchase_analytic_plans/i18n/ur.po
+++ b/addons/purchase_analytic_plans/i18n/ur.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:48+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:56+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: purchase_analytic_plans
 #: field:purchase.order.line,analytics_id:0
diff --git a/addons/purchase_analytic_plans/i18n/vi.po b/addons/purchase_analytic_plans/i18n/vi.po
index 5b3617b5e67..62230d7ca25 100644
--- a/addons/purchase_analytic_plans/i18n/vi.po
+++ b/addons/purchase_analytic_plans/i18n/vi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:48+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:56+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: purchase_analytic_plans
 #: field:purchase.order.line,analytics_id:0
diff --git a/addons/purchase_analytic_plans/i18n/zh_CN.po b/addons/purchase_analytic_plans/i18n/zh_CN.po
index 63e94502138..ffd869aefba 100644
--- a/addons/purchase_analytic_plans/i18n/zh_CN.po
+++ b/addons/purchase_analytic_plans/i18n/zh_CN.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:48+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:56+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: purchase_analytic_plans
 #: field:purchase.order.line,analytics_id:0
diff --git a/addons/purchase_analytic_plans/i18n/zh_TW.po b/addons/purchase_analytic_plans/i18n/zh_TW.po
index 4be2d68631a..0538efe15f5 100644
--- a/addons/purchase_analytic_plans/i18n/zh_TW.po
+++ b/addons/purchase_analytic_plans/i18n/zh_TW.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:48+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:56+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: purchase_analytic_plans
 #: field:purchase.order.line,analytics_id:0
diff --git a/addons/purchase_double_validation/__openerp__.py b/addons/purchase_double_validation/__openerp__.py
index 970c85bc08c..d05870ca951 100644
--- a/addons/purchase_double_validation/__openerp__.py
+++ b/addons/purchase_double_validation/__openerp__.py
@@ -20,13 +20,13 @@
 ##############################################################################
 
 {
-    "name" : "Double Validation on Purchases",
-    "version" : "1.1",
+    'name' : 'Double Validation on Purchases',
+    'version' : '1.1',
     'category': 'Purchase Management',
-    "images" : ["images/purchase_validation.jpeg"],
-    "depends" : ["base","purchase"],
-    "author" : 'OpenERP SA',
-    "description": """
+    'images' : ['images/purchase_validation.jpeg'],
+    'depends' : ['base','purchase'],
+    'author' : 'OpenERP SA',
+    'description': """
 Double-validation for purchases exceeding minimum amount.
 =========================================================
 
@@ -34,8 +34,7 @@ This module modifies the purchase workflow in order to validate purchases that
 exceeds minimum amount set by configuration wizard.
     """,
     'website': 'http://www.openerp.com',
-    'init_xml': [],
-    'update_xml': [
+    'data': [
         'purchase_double_validation_workflow.xml',
         'purchase_double_validation_installer.xml',
         'purchase_double_validation_view.xml',
@@ -45,7 +44,7 @@ exceeds minimum amount set by configuration wizard.
         'test/purchase_double_validation_demo.yml',
         'test/purchase_double_validation_test.yml'
     ],
-    'demo_xml': [],
+    'demo': [],
     'installable': True,
     'auto_install': False,
     'certificate' : '00436592682510544157',
diff --git a/addons/purchase_double_validation/i18n/ar.po b/addons/purchase_double_validation/i18n/ar.po
index 5116cf4a0ce..b1924c5403b 100644
--- a/addons/purchase_double_validation/i18n/ar.po
+++ b/addons/purchase_double_validation/i18n/ar.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: purchase_double_validation
 #: view:purchase.double.validation.installer:0
diff --git a/addons/purchase_double_validation/i18n/bg.po b/addons/purchase_double_validation/i18n/bg.po
index 8099983261d..e5a021a53d1 100644
--- a/addons/purchase_double_validation/i18n/bg.po
+++ b/addons/purchase_double_validation/i18n/bg.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: purchase_double_validation
 #: view:purchase.double.validation.installer:0
diff --git a/addons/purchase_double_validation/i18n/ca.po b/addons/purchase_double_validation/i18n/ca.po
index c26230fe472..750c573dc6d 100644
--- a/addons/purchase_double_validation/i18n/ca.po
+++ b/addons/purchase_double_validation/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: purchase_double_validation
 #: view:purchase.double.validation.installer:0
diff --git a/addons/purchase_double_validation/i18n/da.po b/addons/purchase_double_validation/i18n/da.po
index 38a343bd939..33dfec1ee23 100644
--- a/addons/purchase_double_validation/i18n/da.po
+++ b/addons/purchase_double_validation/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: purchase_double_validation
 #: view:purchase.double.validation.installer:0
diff --git a/addons/purchase_double_validation/i18n/de.po b/addons/purchase_double_validation/i18n/de.po
index aca3540fa1a..16f0262f7f0 100644
--- a/addons/purchase_double_validation/i18n/de.po
+++ b/addons/purchase_double_validation/i18n/de.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: purchase_double_validation
 #: view:purchase.double.validation.installer:0
diff --git a/addons/purchase_double_validation/i18n/es.po b/addons/purchase_double_validation/i18n/es.po
index ecc40131e79..1138cd17dd5 100644
--- a/addons/purchase_double_validation/i18n/es.po
+++ b/addons/purchase_double_validation/i18n/es.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: purchase_double_validation
 #: view:purchase.double.validation.installer:0
diff --git a/addons/purchase_double_validation/i18n/es_CR.po b/addons/purchase_double_validation/i18n/es_CR.po
index 09cb15d7d20..fdd2fdbf933 100644
--- a/addons/purchase_double_validation/i18n/es_CR.po
+++ b/addons/purchase_double_validation/i18n/es_CR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 "Language: es\n"
 
 #. module: purchase_double_validation
diff --git a/addons/purchase_double_validation/i18n/fi.po b/addons/purchase_double_validation/i18n/fi.po
index 72ed260b01e..5c874639a39 100644
--- a/addons/purchase_double_validation/i18n/fi.po
+++ b/addons/purchase_double_validation/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: purchase_double_validation
 #: view:purchase.double.validation.installer:0
diff --git a/addons/purchase_double_validation/i18n/fr.po b/addons/purchase_double_validation/i18n/fr.po
index beedd672c5a..0e28fa23e37 100644
--- a/addons/purchase_double_validation/i18n/fr.po
+++ b/addons/purchase_double_validation/i18n/fr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: purchase_double_validation
 #: view:purchase.double.validation.installer:0
diff --git a/addons/purchase_double_validation/i18n/gl.po b/addons/purchase_double_validation/i18n/gl.po
index b47b43a3ba7..23c7625ca8a 100644
--- a/addons/purchase_double_validation/i18n/gl.po
+++ b/addons/purchase_double_validation/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: purchase_double_validation
 #: view:purchase.double.validation.installer:0
diff --git a/addons/purchase_double_validation/i18n/hr.po b/addons/purchase_double_validation/i18n/hr.po
index cb16e93a820..ce6b995a31b 100644
--- a/addons/purchase_double_validation/i18n/hr.po
+++ b/addons/purchase_double_validation/i18n/hr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: purchase_double_validation
 #: view:purchase.double.validation.installer:0
diff --git a/addons/purchase_double_validation/i18n/hu.po b/addons/purchase_double_validation/i18n/hu.po
index 6a15a070da2..4d96263ea35 100644
--- a/addons/purchase_double_validation/i18n/hu.po
+++ b/addons/purchase_double_validation/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: purchase_double_validation
 #: view:purchase.double.validation.installer:0
diff --git a/addons/purchase_double_validation/i18n/it.po b/addons/purchase_double_validation/i18n/it.po
index b38d86f0cd2..18e1de5cddc 100644
--- a/addons/purchase_double_validation/i18n/it.po
+++ b/addons/purchase_double_validation/i18n/it.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: purchase_double_validation
 #: view:purchase.double.validation.installer:0
diff --git a/addons/purchase_double_validation/i18n/ja.po b/addons/purchase_double_validation/i18n/ja.po
index a91f46164de..e6eef265e6a 100644
--- a/addons/purchase_double_validation/i18n/ja.po
+++ b/addons/purchase_double_validation/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: purchase_double_validation
 #: view:purchase.double.validation.installer:0
diff --git a/addons/purchase_double_validation/i18n/nl.po b/addons/purchase_double_validation/i18n/nl.po
index 1b66b0a8617..370baf556e0 100644
--- a/addons/purchase_double_validation/i18n/nl.po
+++ b/addons/purchase_double_validation/i18n/nl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: purchase_double_validation
 #: view:purchase.double.validation.installer:0
diff --git a/addons/purchase_double_validation/i18n/pl.po b/addons/purchase_double_validation/i18n/pl.po
index ec5ecf80a62..7f0b4aa322b 100644
--- a/addons/purchase_double_validation/i18n/pl.po
+++ b/addons/purchase_double_validation/i18n/pl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: purchase_double_validation
 #: view:purchase.double.validation.installer:0
diff --git a/addons/purchase_double_validation/i18n/pt.po b/addons/purchase_double_validation/i18n/pt.po
index 1af40a3be42..a1b45c771fb 100644
--- a/addons/purchase_double_validation/i18n/pt.po
+++ b/addons/purchase_double_validation/i18n/pt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: purchase_double_validation
 #: view:purchase.double.validation.installer:0
diff --git a/addons/purchase_double_validation/i18n/pt_BR.po b/addons/purchase_double_validation/i18n/pt_BR.po
index e38d58319fc..f3792ad5c6f 100644
--- a/addons/purchase_double_validation/i18n/pt_BR.po
+++ b/addons/purchase_double_validation/i18n/pt_BR.po
@@ -9,13 +9,14 @@ msgstr ""
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:37+0000\n"
 "PO-Revision-Date: 2012-07-28 21:05+0000\n"
-"Last-Translator: Fábio Martinelli <webmaster@guaru.net>\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: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: purchase_double_validation
 #: view:purchase.double.validation.installer:0
diff --git a/addons/purchase_double_validation/i18n/ro.po b/addons/purchase_double_validation/i18n/ro.po
index 3c5e3be9980..66e00214129 100644
--- a/addons/purchase_double_validation/i18n/ro.po
+++ b/addons/purchase_double_validation/i18n/ro.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: purchase_double_validation
 #: view:purchase.double.validation.installer:0
diff --git a/addons/purchase_double_validation/i18n/ru.po b/addons/purchase_double_validation/i18n/ru.po
index 5ef25ecb42c..c658e079f3f 100644
--- a/addons/purchase_double_validation/i18n/ru.po
+++ b/addons/purchase_double_validation/i18n/ru.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: purchase_double_validation
 #: view:purchase.double.validation.installer:0
diff --git a/addons/purchase_double_validation/i18n/sv.po b/addons/purchase_double_validation/i18n/sv.po
index 503b39217a6..ad9239aa192 100644
--- a/addons/purchase_double_validation/i18n/sv.po
+++ b/addons/purchase_double_validation/i18n/sv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: purchase_double_validation
 #: view:purchase.double.validation.installer:0
diff --git a/addons/purchase_double_validation/i18n/tr.po b/addons/purchase_double_validation/i18n/tr.po
index 5681e095589..54ebbe14572 100644
--- a/addons/purchase_double_validation/i18n/tr.po
+++ b/addons/purchase_double_validation/i18n/tr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: purchase_double_validation
 #: view:purchase.double.validation.installer:0
diff --git a/addons/purchase_double_validation/i18n/zh_CN.po b/addons/purchase_double_validation/i18n/zh_CN.po
index 09f70149a7b..03ae3047c56 100644
--- a/addons/purchase_double_validation/i18n/zh_CN.po
+++ b/addons/purchase_double_validation/i18n/zh_CN.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: purchase_double_validation
 #: view:purchase.double.validation.installer:0
diff --git a/addons/purchase_requisition/__openerp__.py b/addons/purchase_requisition/__openerp__.py
index 6824ef5d725..f2492b207c0 100644
--- a/addons/purchase_requisition/__openerp__.py
+++ b/addons/purchase_requisition/__openerp__.py
@@ -18,13 +18,13 @@
 #
 ##############################################################################
 {
-    "name" : "Purchase Requisitions",
-    "version" : "0.1",
-    "author" : "OpenERP SA",
-    "category" : "Purchase Management",
-    "images" : ['images/purchase_requisitions.jpeg'],
-    "website" : "http://www.openerp.com",
-    "description": """
+    'name': 'Purchase Requisitions',
+    'version': '0.1',
+    'author': 'OpenERP SA',
+    'category': 'Purchase Management',
+    'images': ['images/purchase_requisitions.jpeg'],
+    'website': 'http://www.openerp.com',
+    'description': """
 This module allows you to manage your Purchase Requisition.
 ===========================================================
 
@@ -32,24 +32,23 @@ When a purchase order is created, you now have the opportunity to save the
 related requisition. This new object will regroup and will allow you to easily
 keep track and order all your purchase orders.
 """,
-    "depends" : ["purchase","mrp"],
-    "init_xml" : [],
-    "demo_xml" : ['purchase_requisition_demo.xml'],
-    "update_xml" : ["security/purchase_tender.xml",
-                    "wizard/purchase_requisition_partner_view.xml",
-                    "purchase_requisition_data.xml",
-                    "purchase_requisition_view.xml",
-                    "purchase_requisition_report.xml",
-                    "security/ir.model.access.csv","purchase_requisition_sequence.xml"
+    'depends' : ['purchase','mrp'],
+    'demo': ['purchase_requisition_demo.xml'],
+    'data': ['security/purchase_tender.xml',
+              'wizard/purchase_requisition_partner_view.xml',
+              'purchase_requisition_data.xml',
+              'purchase_requisition_view.xml',
+              'purchase_requisition_report.xml',
+              'security/ir.model.access.csv','purchase_requisition_sequence.xml'
     ],
-    "auto_install": False,
-    "test":[
-            'test/purchase_requisition_demo.yml',
-            'test/purchase_requisition.yml',
-            'test/cancel_purchase_requisition.yml',
-            ],
-    "installable": True,
-    "certificate" : "001023264099823179629",
+    'auto_install': False,
+    'test': [
+        'test/purchase_requisition_demo.yml',
+        'test/purchase_requisition.yml',
+        'test/cancel_purchase_requisition.yml',
+    ],
+    'installable': True,
+    'certificate': '001023264099823179629',
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/purchase_requisition/i18n/ar.po b/addons/purchase_requisition/i18n/ar.po
index 781272e92de..5b4973a49c1 100644
--- a/addons/purchase_requisition/i18n/ar.po
+++ b/addons/purchase_requisition/i18n/ar.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:40+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: purchase_requisition
 #: sql_constraint:purchase.order:0
diff --git a/addons/purchase_requisition/i18n/bg.po b/addons/purchase_requisition/i18n/bg.po
index 5d3536ef29f..5aa83c26451 100644
--- a/addons/purchase_requisition/i18n/bg.po
+++ b/addons/purchase_requisition/i18n/bg.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:40+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: purchase_requisition
 #: sql_constraint:purchase.order:0
diff --git a/addons/purchase_requisition/i18n/ca.po b/addons/purchase_requisition/i18n/ca.po
index 10d5e950d25..a9cf8d9171b 100644
--- a/addons/purchase_requisition/i18n/ca.po
+++ b/addons/purchase_requisition/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:40+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: purchase_requisition
 #: sql_constraint:purchase.order:0
diff --git a/addons/purchase_requisition/i18n/da.po b/addons/purchase_requisition/i18n/da.po
index 4a77f067d4f..8b99f9cfa6d 100644
--- a/addons/purchase_requisition/i18n/da.po
+++ b/addons/purchase_requisition/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:40+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: purchase_requisition
 #: sql_constraint:purchase.order:0
diff --git a/addons/purchase_requisition/i18n/de.po b/addons/purchase_requisition/i18n/de.po
index a947c48efff..aa6898a3a96 100644
--- a/addons/purchase_requisition/i18n/de.po
+++ b/addons/purchase_requisition/i18n/de.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:40+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: purchase_requisition
 #: sql_constraint:purchase.order:0
diff --git a/addons/purchase_requisition/i18n/es.po b/addons/purchase_requisition/i18n/es.po
index fb747fc0d16..1c24be63761 100644
--- a/addons/purchase_requisition/i18n/es.po
+++ b/addons/purchase_requisition/i18n/es.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:40+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: purchase_requisition
 #: sql_constraint:purchase.order:0
diff --git a/addons/purchase_requisition/i18n/es_CR.po b/addons/purchase_requisition/i18n/es_CR.po
index 1d09fb33c8d..b6b8ffd847b 100644
--- a/addons/purchase_requisition/i18n/es_CR.po
+++ b/addons/purchase_requisition/i18n/es_CR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 "Language: es\n"
 
 #. module: purchase_requisition
diff --git a/addons/purchase_requisition/i18n/fi.po b/addons/purchase_requisition/i18n/fi.po
index 1d80bd3210f..6ee666dfb83 100644
--- a/addons/purchase_requisition/i18n/fi.po
+++ b/addons/purchase_requisition/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:40+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: purchase_requisition
 #: sql_constraint:purchase.order:0
diff --git a/addons/purchase_requisition/i18n/fr.po b/addons/purchase_requisition/i18n/fr.po
index 4d2280564f2..f6fbe564df8 100644
--- a/addons/purchase_requisition/i18n/fr.po
+++ b/addons/purchase_requisition/i18n/fr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:40+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: purchase_requisition
 #: sql_constraint:purchase.order:0
diff --git a/addons/purchase_requisition/i18n/hr.po b/addons/purchase_requisition/i18n/hr.po
index bed6f4374d5..5c95b9bc7cc 100644
--- a/addons/purchase_requisition/i18n/hr.po
+++ b/addons/purchase_requisition/i18n/hr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:40+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: purchase_requisition
 #: sql_constraint:purchase.order:0
diff --git a/addons/purchase_requisition/i18n/hu.po b/addons/purchase_requisition/i18n/hu.po
index dfa654a5105..7c13e9e111c 100644
--- a/addons/purchase_requisition/i18n/hu.po
+++ b/addons/purchase_requisition/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:40+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: purchase_requisition
 #: sql_constraint:purchase.order:0
diff --git a/addons/purchase_requisition/i18n/id.po b/addons/purchase_requisition/i18n/id.po
index 75d69f78ea9..f295fa03b37 100644
--- a/addons/purchase_requisition/i18n/id.po
+++ b/addons/purchase_requisition/i18n/id.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:40+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: purchase_requisition
 #: sql_constraint:purchase.order:0
diff --git a/addons/purchase_requisition/i18n/it.po b/addons/purchase_requisition/i18n/it.po
index d24b608b2f2..2af9250c07a 100644
--- a/addons/purchase_requisition/i18n/it.po
+++ b/addons/purchase_requisition/i18n/it.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:40+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: purchase_requisition
 #: sql_constraint:purchase.order:0
diff --git a/addons/purchase_requisition/i18n/ja.po b/addons/purchase_requisition/i18n/ja.po
index d28191d4561..c719150f7ce 100644
--- a/addons/purchase_requisition/i18n/ja.po
+++ b/addons/purchase_requisition/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:40+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: purchase_requisition
 #: sql_constraint:purchase.order:0
diff --git a/addons/purchase_requisition/i18n/nb.po b/addons/purchase_requisition/i18n/nb.po
index 6cea30b7125..0dda2f0aebc 100644
--- a/addons/purchase_requisition/i18n/nb.po
+++ b/addons/purchase_requisition/i18n/nb.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:40+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: purchase_requisition
 #: sql_constraint:purchase.order:0
diff --git a/addons/purchase_requisition/i18n/nl.po b/addons/purchase_requisition/i18n/nl.po
index 95553309024..06eb33425aa 100644
--- a/addons/purchase_requisition/i18n/nl.po
+++ b/addons/purchase_requisition/i18n/nl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:40+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: purchase_requisition
 #: sql_constraint:purchase.order:0
diff --git a/addons/purchase_requisition/i18n/pl.po b/addons/purchase_requisition/i18n/pl.po
index 89b97f02ec4..763e079ad3d 100644
--- a/addons/purchase_requisition/i18n/pl.po
+++ b/addons/purchase_requisition/i18n/pl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:40+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: purchase_requisition
 #: sql_constraint:purchase.order:0
diff --git a/addons/purchase_requisition/i18n/pt.po b/addons/purchase_requisition/i18n/pt.po
index f2dd61ef821..7fcc8a44f9f 100644
--- a/addons/purchase_requisition/i18n/pt.po
+++ b/addons/purchase_requisition/i18n/pt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:40+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: purchase_requisition
 #: sql_constraint:purchase.order:0
diff --git a/addons/purchase_requisition/i18n/pt_BR.po b/addons/purchase_requisition/i18n/pt_BR.po
index d88a5b1d07f..acd3ffa247d 100644
--- a/addons/purchase_requisition/i18n/pt_BR.po
+++ b/addons/purchase_requisition/i18n/pt_BR.po
@@ -14,13 +14,13 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:40+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: purchase_requisition
 #: sql_constraint:purchase.order:0
 msgid "Order Reference must be unique per Company!"
-msgstr ""
+msgstr "A Referência do Pedido deve ser única por empresa!"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
@@ -64,7 +64,7 @@ msgstr "Status"
 #. module: purchase_requisition
 #: view:purchase.requisition:0
 msgid "Purchase Requisition in negociation"
-msgstr ""
+msgstr "Solicitação de Compra em negociação"
 
 #. module: purchase_requisition
 #: report:purchase.requisition:0
@@ -75,7 +75,7 @@ msgstr "Fornecedor"
 #: view:purchase.requisition:0
 #: selection:purchase.requisition,state:0
 msgid "New"
-msgstr ""
+msgstr "Novo"
 
 #. module: purchase_requisition
 #: report:purchase.requisition:0
@@ -109,7 +109,7 @@ msgstr "Linha de Requisição de Compra"
 #. module: purchase_requisition
 #: view:purchase.order:0
 msgid "Purchase Orders with requisition"
-msgstr ""
+msgstr "Pedidos de Compra com solicitações"
 
 #. module: purchase_requisition
 #: model:ir.model,name:purchase_requisition.model_product_product
@@ -141,7 +141,7 @@ msgstr ""
 #: code:addons/purchase_requisition/purchase_requisition.py:136
 #, python-format
 msgid "Warning"
-msgstr ""
+msgstr "Alerta"
 
 #. module: purchase_requisition
 #: report:purchase.requisition:0
@@ -183,12 +183,12 @@ msgstr "Voltar para Provisório"
 #. module: purchase_requisition
 #: view:purchase.requisition:0
 msgid "Current Purchase Requisition"
-msgstr ""
+msgstr "Solicitações de Compra Atuais"
 
 #. module: purchase_requisition
 #: model:res.groups,name:purchase_requisition.group_purchase_requisition_user
 msgid "User"
-msgstr ""
+msgstr "Usuário"
 
 #. module: purchase_requisition
 #: field:purchase.requisition.partner,partner_address_id:0
@@ -223,7 +223,7 @@ msgstr "Quantidade"
 #. module: purchase_requisition
 #: view:purchase.requisition:0
 msgid "Unassigned  Requisition"
-msgstr ""
+msgstr "Solicitação não atribuída"
 
 #. module: purchase_requisition
 #: model:ir.actions.act_window,name:purchase_requisition.action_purchase_requisition
@@ -238,6 +238,8 @@ msgid ""
 "You have already one %s purchase order for this partner, you must cancel "
 "this purchase order to create a new quotation."
 msgstr ""
+"Você já tem um %s pedido de compra para este parceiro, você precisa cancelar "
+"este pedido para criar uma nova cotação."
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
@@ -314,7 +316,7 @@ msgstr "Tipo de Requisição"
 #. module: purchase_requisition
 #: view:purchase.requisition:0
 msgid "New Purchase Requisition"
-msgstr ""
+msgstr "Nova Solicitação de Compra"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
@@ -349,7 +351,7 @@ msgstr "Parceiros da Requisição de Compra"
 #. module: purchase_requisition
 #: view:purchase.requisition:0
 msgid "Start"
-msgstr ""
+msgstr "Inicio"
 
 #. module: purchase_requisition
 #: report:purchase.requisition:0
@@ -406,7 +408,7 @@ msgstr "Requisição de Compra (exclusiva)"
 #. module: purchase_requisition
 #: model:res.groups,name:purchase_requisition.group_purchase_requisition_manager
 msgid "Manager"
-msgstr ""
+msgstr "Gerente"
 
 #. module: purchase_requisition
 #: constraint:product.product:0
diff --git a/addons/purchase_requisition/i18n/ro.po b/addons/purchase_requisition/i18n/ro.po
index 0ef87b9b150..ff91181c291 100644
--- a/addons/purchase_requisition/i18n/ro.po
+++ b/addons/purchase_requisition/i18n/ro.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:40+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: purchase_requisition
 #: sql_constraint:purchase.order:0
diff --git a/addons/purchase_requisition/i18n/ru.po b/addons/purchase_requisition/i18n/ru.po
index 8906020512d..f20d10e6ac2 100644
--- a/addons/purchase_requisition/i18n/ru.po
+++ b/addons/purchase_requisition/i18n/ru.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:40+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: purchase_requisition
 #: sql_constraint:purchase.order:0
diff --git a/addons/purchase_requisition/i18n/sv.po b/addons/purchase_requisition/i18n/sv.po
index bd93f247d86..ba634a2363c 100644
--- a/addons/purchase_requisition/i18n/sv.po
+++ b/addons/purchase_requisition/i18n/sv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:40+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: purchase_requisition
 #: sql_constraint:purchase.order:0
diff --git a/addons/purchase_requisition/i18n/tr.po b/addons/purchase_requisition/i18n/tr.po
index 70cb915cd96..95282031494 100644
--- a/addons/purchase_requisition/i18n/tr.po
+++ b/addons/purchase_requisition/i18n/tr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:40+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: purchase_requisition
 #: sql_constraint:purchase.order:0
diff --git a/addons/purchase_requisition/i18n/zh_CN.po b/addons/purchase_requisition/i18n/zh_CN.po
index e491a3e4d66..6bc4667da05 100644
--- a/addons/purchase_requisition/i18n/zh_CN.po
+++ b/addons/purchase_requisition/i18n/zh_CN.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: purchase_requisition
 #: sql_constraint:purchase.order:0
diff --git a/addons/purchase_requisition/purchase_requisition.py b/addons/purchase_requisition/purchase_requisition.py
index cf0294730a7..90a5244e66f 100644
--- a/addons/purchase_requisition/purchase_requisition.py
+++ b/addons/purchase_requisition/purchase_requisition.py
@@ -31,7 +31,7 @@ import decimal_precision as dp
 class purchase_requisition(osv.osv):
     _name = "purchase.requisition"
     _description="Purchase Requisition"
-    _inherit = ['ir.needaction_mixin', 'mail.thread']
+    _inherit = ['mail.thread', 'ir.needaction_mixin']
     _columns = {
         'name': fields.char('Requisition Reference', size=32,required=True),
         'origin': fields.char('Source', size=32),
@@ -91,16 +91,16 @@ class purchase_requisition(osv.osv):
         return True
 
     def in_progress_send_note(self, cr, uid, ids, context=None):
-        self.message_append_note(cr, uid, ids, body=_("Draft Requisition has been <b>sent to suppliers</b>."), context=context)
+        self.message_post(cr, uid, ids, body=_("Draft Requisition has been <b>sent to suppliers</b>."), context=context)
     
     def reset_send_note(self, cr, uid, ids, context=None):
-        self.message_append_note(cr, uid, ids, body=_("Purchase Requisition has been set to <b>draft</b>."), context=context)
+        self.message_post(cr, uid, ids, body=_("Purchase Requisition has been set to <b>draft</b>."), context=context)
      
     def done_to_send_note(self, cr, uid, ids, context=None):
-        self.message_append_note(cr, uid, ids, body=_("Purchase Requisition has been <b>done</b>."), context=context)
+        self.message_post(cr, uid, ids, body=_("Purchase Requisition has been <b>done</b>."), context=context)
         
     def cancel_send_note(self, cr, uid, ids, context=None):
-        self.message_append_note(cr, uid, ids, body=_("Purchase Requisition has been <b>cancelled</b>."), context=context)
+        self.message_post(cr, uid, ids, body=_("Purchase Requisition has been <b>cancelled</b>."), context=context)
 
     def _planned_date(self, requisition, delay=0.0):
         company = requisition.company_id
@@ -184,7 +184,7 @@ class purchase_requisition(osv.osv):
         return res
     
     def create_send_note(self, cr, uid, ids, context=None):
-        return self.message_append_note(cr, uid, ids, body=_("Purchase Requisition has been <b>created</b>."), context=context)  
+        return self.message_post(cr, uid, ids, body=_("Purchase Requisition has been <b>created</b>."), context=context)  
 
     def create(self, cr, uid, vals, context=None):
         requisition =  super(purchase_requisition, self).create(cr, uid, vals, context=context)
@@ -194,27 +194,6 @@ class purchase_requisition(osv.osv):
 
 purchase_requisition()
 
-class mail_message(osv.osv):
-    _inherit = 'mail.message'
-    
-    def schedule_with_attach(self, cr, uid, email_from, email_to, subject, body, model=False, email_cc=None,
-                             email_bcc=None, reply_to=False, attachments=None, message_id=False, references=False,
-                             res_id=False, content_subtype='plain', headers=None, mail_server_id=False, auto_delete=False,
-                             context=None):
-        result = super(mail_message, self).schedule_with_attach(cr, uid, email_from, email_to, subject, body, model=model, email_cc=email_cc,
-            email_bcc=email_bcc, reply_to=reply_to, attachments=attachments, message_id=message_id, references=references,
-            res_id=res_id, content_subtype=content_subtype, headers=headers, mail_server_id=mail_server_id, auto_delete=auto_delete,
-            context=context)
-        # check model is purchase.order
-        if model and model == 'purchase.order' and res_id:
-            requisition_id = self.pool.get('purchase.order').browse(cr, uid, res_id, context=context).requisition_id
-            if requisition_id:
-                result = self.schedule_with_attach(cr, uid, email_from, email_to, subject, body, model='purchase.requisition', email_cc=email_cc,
-                    email_bcc=email_bcc, reply_to=reply_to, attachments=attachments, message_id=message_id, references=references,
-                    res_id=requisition_id.id, content_subtype=content_subtype, headers=headers, mail_server_id=mail_server_id, auto_delete=auto_delete,
-                    context=context)
-        return result
-
 class purchase_requisition_line(osv.osv):
 
     _name = "purchase.requisition.line"
diff --git a/addons/purchase_requisition/purchase_requisition_demo.xml b/addons/purchase_requisition/purchase_requisition_demo.xml
index 3d68a8b612f..21d348c2f0e 100644
--- a/addons/purchase_requisition/purchase_requisition_demo.xml
+++ b/addons/purchase_requisition/purchase_requisition_demo.xml
@@ -37,7 +37,7 @@
 
         <record id="rfq1_line" model="purchase.order.line">
             <field name="order_id" ref="rfq1"/>
-            <field name="name">[HDD3] HDD Seagate 7200.8 160GB</field>
+            <field name="name">[RAM-SR5] RAM DDR SR5</field>
             <field name="date_planned" eval="time.strftime('%Y/%m/10')"/>
             <field name="product_id" ref="product.product_product_13"/>
             <field name="product_uom" ref="product.product_uom_unit"/>
@@ -54,7 +54,7 @@
 
         <record id="rfq2_line" model="purchase.order.line">
             <field name="order_id" ref="rfq2"/>
-            <field name="name">[HDD3] HDD Seagate 7200.8 160GB</field>
+            <field name="name">[RAM-SR5] RAM DDR SR5</field>
             <field name="date_planned" eval="time.strftime('%Y/%m/15')"/>
             <field name="product_id" ref="product.product_product_13"/>
             <field name="product_uom" ref="product.product_uom_unit"/>
diff --git a/addons/purchase_requisition/purchase_requisition_view.xml b/addons/purchase_requisition/purchase_requisition_view.xml
index 188f81b6cbe..1fafec92bc7 100644
--- a/addons/purchase_requisition/purchase_requisition_view.xml
+++ b/addons/purchase_requisition/purchase_requisition_view.xml
@@ -112,8 +112,8 @@
         <field name="name">purchase.requisition.tree</field>
         <field name="model">purchase.requisition</field>
         <field name="arch" type="xml">
-            <tree fonts="bold:needaction_pending==True" colors="grey:state == 'cancel';red:date_end and date_end&lt;current_date;black:date_end&gt;current_date;" string="Purchase Requisition">
-                <field name="needaction_pending" invisible="1"/>
+            <tree fonts="bold:message_unread==True" colors="grey:state == 'cancel';red:date_end and date_end&lt;current_date;black:date_end&gt;current_date;" string="Purchase Requisition">
+                <field name="message_unread" invisible="1"/>
                 <field name="name"/>
                 <field name="date_start"/>
                 <field name="user_id"/>
@@ -182,10 +182,8 @@
         <field name="model">product.product</field>
         <field name="inherit_id" ref="product.product_normal_form_view"/>
         <field name="arch" type="xml">
-            <field name="supply_method" position="after">
-                <group colspan="2" col="2" attrs="{'invisible': [('supply_method','&lt;&gt;','buy')]}">
+            <field name="procure_method" position="before">
                 <field name="purchase_requisition"/>
-                </group>
             </field>
         </field>
     </record>
diff --git a/addons/report_designer/__openerp__.py b/addons/report_designer/__openerp__.py
index 8a8c6c3b7bb..3a2b9e95ea5 100644
--- a/addons/report_designer/__openerp__.py
+++ b/addons/report_designer/__openerp__.py
@@ -21,12 +21,12 @@
 
 
 {
-    "name" : "Report Designer",
-    "version" : "1.0",
-    "depends" : ["base", "base_setup"],
-    "author" : "OpenERP SA",
-    "category": "Tools",
-    "description": """
+    'name' : 'Report Designer',
+    'version' : '1.0',
+    'depends' : ['base', 'base_setup'],
+    'author' : 'OpenERP SA',
+    'category': 'Tools',
+    'description': """
 Installer for reporting Hidden.
 ===============================
 
@@ -34,11 +34,8 @@ Makes the Reporting Hidden Configuration available from where you can install
 modules like base_report_designer and base_report_creator.
     """,
     'website': 'http://www.openerp.com',
-    'init_xml': [],
-    'update_xml': [
-        'security/ir.model.access.csv',
-    ],
-    'demo_xml': [],
+    'data': ['security/ir.model.access.csv'],
+    'demo': [],
     'installable': True,
     'auto_install': False,
     'certificate' : '00764037194670093149',
diff --git a/addons/report_designer/i18n/ar.po b/addons/report_designer/i18n/ar.po
index 5517cd056ca..0116041242a 100644
--- a/addons/report_designer/i18n/ar.po
+++ b/addons/report_designer/i18n/ar.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: report_designer
 #: model:ir.actions.act_window,name:report_designer.action_report_designer_installer
diff --git a/addons/report_designer/i18n/bg.po b/addons/report_designer/i18n/bg.po
index 93735a75ae7..a894a524189 100644
--- a/addons/report_designer/i18n/bg.po
+++ b/addons/report_designer/i18n/bg.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: report_designer
 #: model:ir.actions.act_window,name:report_designer.action_report_designer_installer
diff --git a/addons/report_designer/i18n/ca.po b/addons/report_designer/i18n/ca.po
index 8d92a6b9921..c9888af8216 100644
--- a/addons/report_designer/i18n/ca.po
+++ b/addons/report_designer/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: report_designer
 #: model:ir.actions.act_window,name:report_designer.action_report_designer_installer
diff --git a/addons/report_designer/i18n/da.po b/addons/report_designer/i18n/da.po
index 7132998ff25..67160c84d89 100644
--- a/addons/report_designer/i18n/da.po
+++ b/addons/report_designer/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: report_designer
 #: model:ir.actions.act_window,name:report_designer.action_report_designer_installer
diff --git a/addons/report_designer/i18n/de.po b/addons/report_designer/i18n/de.po
index 0ddb3baf445..8ff7cec4753 100644
--- a/addons/report_designer/i18n/de.po
+++ b/addons/report_designer/i18n/de.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: report_designer
 #: model:ir.actions.act_window,name:report_designer.action_report_designer_installer
diff --git a/addons/report_designer/i18n/el.po b/addons/report_designer/i18n/el.po
index bd6f1f13a46..5e667511164 100644
--- a/addons/report_designer/i18n/el.po
+++ b/addons/report_designer/i18n/el.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: report_designer
 #: model:ir.actions.act_window,name:report_designer.action_report_designer_installer
diff --git a/addons/report_designer/i18n/es.po b/addons/report_designer/i18n/es.po
index b3d4461fa59..252c8a0523e 100644
--- a/addons/report_designer/i18n/es.po
+++ b/addons/report_designer/i18n/es.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: report_designer
 #: model:ir.actions.act_window,name:report_designer.action_report_designer_installer
diff --git a/addons/report_designer/i18n/es_CR.po b/addons/report_designer/i18n/es_CR.po
index 9a78c79006e..403c708707d 100644
--- a/addons/report_designer/i18n/es_CR.po
+++ b/addons/report_designer/i18n/es_CR.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 "Language: es\n"
 
 #. module: report_designer
diff --git a/addons/report_designer/i18n/fi.po b/addons/report_designer/i18n/fi.po
index 555731b685a..4b92693caed 100644
--- a/addons/report_designer/i18n/fi.po
+++ b/addons/report_designer/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: report_designer
 #: model:ir.actions.act_window,name:report_designer.action_report_designer_installer
diff --git a/addons/report_designer/i18n/fr.po b/addons/report_designer/i18n/fr.po
index b8a5e5dc9d0..8630dddb0fb 100644
--- a/addons/report_designer/i18n/fr.po
+++ b/addons/report_designer/i18n/fr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: report_designer
 #: model:ir.actions.act_window,name:report_designer.action_report_designer_installer
diff --git a/addons/report_designer/i18n/gl.po b/addons/report_designer/i18n/gl.po
index df6d23f578f..7547b1d3e46 100644
--- a/addons/report_designer/i18n/gl.po
+++ b/addons/report_designer/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: report_designer
 #: model:ir.actions.act_window,name:report_designer.action_report_designer_installer
diff --git a/addons/report_designer/i18n/hr.po b/addons/report_designer/i18n/hr.po
index a51c5b5e929..4318dd16828 100644
--- a/addons/report_designer/i18n/hr.po
+++ b/addons/report_designer/i18n/hr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: report_designer
 #: model:ir.actions.act_window,name:report_designer.action_report_designer_installer
diff --git a/addons/report_designer/i18n/hu.po b/addons/report_designer/i18n/hu.po
index 4487e86dbce..81b1d619634 100644
--- a/addons/report_designer/i18n/hu.po
+++ b/addons/report_designer/i18n/hu.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: report_designer
 #: model:ir.actions.act_window,name:report_designer.action_report_designer_installer
diff --git a/addons/report_designer/i18n/it.po b/addons/report_designer/i18n/it.po
index 553a4dbca93..1eab22b804f 100644
--- a/addons/report_designer/i18n/it.po
+++ b/addons/report_designer/i18n/it.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: report_designer
 #: model:ir.actions.act_window,name:report_designer.action_report_designer_installer
diff --git a/addons/report_designer/i18n/ja.po b/addons/report_designer/i18n/ja.po
index 1864682043c..4479603f11a 100644
--- a/addons/report_designer/i18n/ja.po
+++ b/addons/report_designer/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: report_designer
 #: model:ir.actions.act_window,name:report_designer.action_report_designer_installer
diff --git a/addons/report_designer/i18n/mn.po b/addons/report_designer/i18n/mn.po
index ea687af3b47..883b27a75e0 100644
--- a/addons/report_designer/i18n/mn.po
+++ b/addons/report_designer/i18n/mn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: report_designer
 #: model:ir.actions.act_window,name:report_designer.action_report_designer_installer
diff --git a/addons/report_designer/i18n/nb.po b/addons/report_designer/i18n/nb.po
index 7588e22537c..4ac3a4f0d8f 100644
--- a/addons/report_designer/i18n/nb.po
+++ b/addons/report_designer/i18n/nb.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: report_designer
 #: model:ir.actions.act_window,name:report_designer.action_report_designer_installer
diff --git a/addons/report_designer/i18n/nl.po b/addons/report_designer/i18n/nl.po
index 645d3db98c6..bb8caebdd2c 100644
--- a/addons/report_designer/i18n/nl.po
+++ b/addons/report_designer/i18n/nl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: report_designer
 #: model:ir.actions.act_window,name:report_designer.action_report_designer_installer
diff --git a/addons/report_designer/i18n/pt.po b/addons/report_designer/i18n/pt.po
index e9ddc3f5c11..f7cea1d2cca 100644
--- a/addons/report_designer/i18n/pt.po
+++ b/addons/report_designer/i18n/pt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: report_designer
 #: model:ir.actions.act_window,name:report_designer.action_report_designer_installer
diff --git a/addons/report_designer/i18n/pt_BR.po b/addons/report_designer/i18n/pt_BR.po
index caf79c7b74b..29ec28193c5 100644
--- a/addons/report_designer/i18n/pt_BR.po
+++ b/addons/report_designer/i18n/pt_BR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: report_designer
 #: model:ir.actions.act_window,name:report_designer.action_report_designer_installer
@@ -64,6 +64,8 @@ msgid ""
 "OpenERP's built-in reporting abilities can be improved even further with "
 "some of the following applications"
 msgstr ""
+"As funcionalidades de relatórios incorporadas no OpenErp podem ser "
+"melhoradas ainda mais com as seguintes aplicações"
 
 #. module: report_designer
 #: view:report_designer.installer:0
diff --git a/addons/report_designer/i18n/ro.po b/addons/report_designer/i18n/ro.po
index 5f651f3f47a..44ea3657ca4 100644
--- a/addons/report_designer/i18n/ro.po
+++ b/addons/report_designer/i18n/ro.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: report_designer
 #: model:ir.actions.act_window,name:report_designer.action_report_designer_installer
diff --git a/addons/report_designer/i18n/ru.po b/addons/report_designer/i18n/ru.po
index 8e3b51e6288..90ae0ecee94 100644
--- a/addons/report_designer/i18n/ru.po
+++ b/addons/report_designer/i18n/ru.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: report_designer
 #: model:ir.actions.act_window,name:report_designer.action_report_designer_installer
diff --git a/addons/report_designer/i18n/sv.po b/addons/report_designer/i18n/sv.po
index 6b4b6cffb84..dd3b2b80140 100644
--- a/addons/report_designer/i18n/sv.po
+++ b/addons/report_designer/i18n/sv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: report_designer
 #: model:ir.actions.act_window,name:report_designer.action_report_designer_installer
diff --git a/addons/report_designer/i18n/th.po b/addons/report_designer/i18n/th.po
index 601df55d61c..24816183ef8 100644
--- a/addons/report_designer/i18n/th.po
+++ b/addons/report_designer/i18n/th.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: report_designer
 #: model:ir.actions.act_window,name:report_designer.action_report_designer_installer
diff --git a/addons/report_designer/i18n/tr.po b/addons/report_designer/i18n/tr.po
index 760b7f04538..91cf3b477bd 100644
--- a/addons/report_designer/i18n/tr.po
+++ b/addons/report_designer/i18n/tr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: report_designer
 #: model:ir.actions.act_window,name:report_designer.action_report_designer_installer
diff --git a/addons/report_designer/i18n/zh_CN.po b/addons/report_designer/i18n/zh_CN.po
index 23f97ed1e48..63a0e6496f9 100644
--- a/addons/report_designer/i18n/zh_CN.po
+++ b/addons/report_designer/i18n/zh_CN.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: report_designer
 #: model:ir.actions.act_window,name:report_designer.action_report_designer_installer
diff --git a/addons/report_intrastat/__openerp__.py b/addons/report_intrastat/__openerp__.py
index 8d980c51f4f..aa4fa31a0b0 100644
--- a/addons/report_intrastat/__openerp__.py
+++ b/addons/report_intrastat/__openerp__.py
@@ -23,7 +23,7 @@
 {
     'name': 'Intrastat Reporting',
     'version': '1.0',
-    "category": 'Accounting & Finance',
+    'category': 'Accounting & Finance',
     'description': """
 A module that adds intrastat reports.
 =====================================
@@ -33,13 +33,13 @@ European Union.""",
     'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
     'depends': ['base', 'product', 'stock', 'sale', 'purchase'],
-    'init_xml': ['report_intrastat_data.xml'],
-    'update_xml': [
+    'data': [
         'security/ir.model.access.csv',
         'report_intrastat_view.xml',
-        'intrastat_report.xml'
+        'intrastat_report.xml',
+        'report_intrastat_data.xml'
     ],
-    'demo_xml': [],
+    'demo': [],
     'test': ['test/report_intrastat_report.yml'],
     'installable': True,
     'auto_install': False,
diff --git a/addons/report_intrastat/i18n/ar.po b/addons/report_intrastat/i18n/ar.po
index 29c6c1038be..9a15c70df2c 100644
--- a/addons/report_intrastat/i18n/ar.po
+++ b/addons/report_intrastat/i18n/ar.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:10+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:16+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
diff --git a/addons/report_intrastat/i18n/bg.po b/addons/report_intrastat/i18n/bg.po
index 70a57e2450a..9cd74e9afe8 100644
--- a/addons/report_intrastat/i18n/bg.po
+++ b/addons/report_intrastat/i18n/bg.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:10+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:16+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
diff --git a/addons/report_intrastat/i18n/bs.po b/addons/report_intrastat/i18n/bs.po
index 028b374a5d2..c2ef162509c 100644
--- a/addons/report_intrastat/i18n/bs.po
+++ b/addons/report_intrastat/i18n/bs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:10+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:16+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
diff --git a/addons/report_intrastat/i18n/ca.po b/addons/report_intrastat/i18n/ca.po
index 9e5c0aaa177..8cadd5d6da9 100644
--- a/addons/report_intrastat/i18n/ca.po
+++ b/addons/report_intrastat/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:10+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:16+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
diff --git a/addons/report_intrastat/i18n/cs.po b/addons/report_intrastat/i18n/cs.po
index 2ebe93d3f29..5fe60ef4b7b 100644
--- a/addons/report_intrastat/i18n/cs.po
+++ b/addons/report_intrastat/i18n/cs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:10+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:16+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
diff --git a/addons/report_intrastat/i18n/da.po b/addons/report_intrastat/i18n/da.po
index bb91a6bc5b4..3be261225fa 100644
--- a/addons/report_intrastat/i18n/da.po
+++ b/addons/report_intrastat/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:10+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:16+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
diff --git a/addons/report_intrastat/i18n/de.po b/addons/report_intrastat/i18n/de.po
index b5a627fc838..db7e0e890d5 100644
--- a/addons/report_intrastat/i18n/de.po
+++ b/addons/report_intrastat/i18n/de.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:10+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:16+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
diff --git a/addons/report_intrastat/i18n/es.po b/addons/report_intrastat/i18n/es.po
index 7385bc62ee9..015d8e10c3c 100644
--- a/addons/report_intrastat/i18n/es.po
+++ b/addons/report_intrastat/i18n/es.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:10+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:16+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
diff --git a/addons/report_intrastat/i18n/es_AR.po b/addons/report_intrastat/i18n/es_AR.po
index 902031309e4..6a5f8f8f757 100644
--- a/addons/report_intrastat/i18n/es_AR.po
+++ b/addons/report_intrastat/i18n/es_AR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:10+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:16+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
diff --git a/addons/report_intrastat/i18n/es_CR.po b/addons/report_intrastat/i18n/es_CR.po
index 0ace3842141..c538846cd99 100644
--- a/addons/report_intrastat/i18n/es_CR.po
+++ b/addons/report_intrastat/i18n/es_CR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:10+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:16+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 "Language: \n"
 
 #. module: report_intrastat
diff --git a/addons/report_intrastat/i18n/et.po b/addons/report_intrastat/i18n/et.po
index 31884c296a0..90c41650dd2 100644
--- a/addons/report_intrastat/i18n/et.po
+++ b/addons/report_intrastat/i18n/et.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:10+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:16+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
diff --git a/addons/report_intrastat/i18n/fi.po b/addons/report_intrastat/i18n/fi.po
index 76cdddde287..0c7b525ceff 100644
--- a/addons/report_intrastat/i18n/fi.po
+++ b/addons/report_intrastat/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:10+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:16+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
diff --git a/addons/report_intrastat/i18n/fr.po b/addons/report_intrastat/i18n/fr.po
index 6bf5b5ad213..f23a91bd164 100644
--- a/addons/report_intrastat/i18n/fr.po
+++ b/addons/report_intrastat/i18n/fr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:10+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:16+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
diff --git a/addons/report_intrastat/i18n/hr.po b/addons/report_intrastat/i18n/hr.po
index aa2b536eff7..66ad2f88919 100644
--- a/addons/report_intrastat/i18n/hr.po
+++ b/addons/report_intrastat/i18n/hr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:10+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:16+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 "Language: hr\n"
 
 #. module: report_intrastat
diff --git a/addons/report_intrastat/i18n/hu.po b/addons/report_intrastat/i18n/hu.po
index 4a9ebdfa790..c9630de5976 100644
--- a/addons/report_intrastat/i18n/hu.po
+++ b/addons/report_intrastat/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:10+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:16+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
diff --git a/addons/report_intrastat/i18n/id.po b/addons/report_intrastat/i18n/id.po
index f3758ae4ba7..f93d82f7992 100644
--- a/addons/report_intrastat/i18n/id.po
+++ b/addons/report_intrastat/i18n/id.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:10+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:16+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
diff --git a/addons/report_intrastat/i18n/it.po b/addons/report_intrastat/i18n/it.po
index 6620eae866c..a9b1e05495d 100644
--- a/addons/report_intrastat/i18n/it.po
+++ b/addons/report_intrastat/i18n/it.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:10+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:16+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
diff --git a/addons/report_intrastat/i18n/ja.po b/addons/report_intrastat/i18n/ja.po
index de1cb263ff4..7304fd5214d 100644
--- a/addons/report_intrastat/i18n/ja.po
+++ b/addons/report_intrastat/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:10+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:16+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
diff --git a/addons/report_intrastat/i18n/ko.po b/addons/report_intrastat/i18n/ko.po
index d3637700d02..7d38ce11383 100644
--- a/addons/report_intrastat/i18n/ko.po
+++ b/addons/report_intrastat/i18n/ko.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:10+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:16+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
diff --git a/addons/report_intrastat/i18n/lt.po b/addons/report_intrastat/i18n/lt.po
index 97357c9e61c..b821476396a 100644
--- a/addons/report_intrastat/i18n/lt.po
+++ b/addons/report_intrastat/i18n/lt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:10+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:16+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
diff --git a/addons/report_intrastat/i18n/nl.po b/addons/report_intrastat/i18n/nl.po
index ed57031156f..042ae2bc43a 100644
--- a/addons/report_intrastat/i18n/nl.po
+++ b/addons/report_intrastat/i18n/nl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:10+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:16+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
diff --git a/addons/report_intrastat/i18n/nl_BE.po b/addons/report_intrastat/i18n/nl_BE.po
index d102b69d879..e2325608bdb 100644
--- a/addons/report_intrastat/i18n/nl_BE.po
+++ b/addons/report_intrastat/i18n/nl_BE.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:10+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:16+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
diff --git a/addons/report_intrastat/i18n/pl.po b/addons/report_intrastat/i18n/pl.po
index ae5d42c6a3c..3511a81132a 100644
--- a/addons/report_intrastat/i18n/pl.po
+++ b/addons/report_intrastat/i18n/pl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:10+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:16+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
diff --git a/addons/report_intrastat/i18n/pt.po b/addons/report_intrastat/i18n/pt.po
index f39e7d4cd91..ec3a586158f 100644
--- a/addons/report_intrastat/i18n/pt.po
+++ b/addons/report_intrastat/i18n/pt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:10+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:16+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
diff --git a/addons/report_intrastat/i18n/pt_BR.po b/addons/report_intrastat/i18n/pt_BR.po
index 57241485ea2..b1ec3efbc9d 100644
--- a/addons/report_intrastat/i18n/pt_BR.po
+++ b/addons/report_intrastat/i18n/pt_BR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:10+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:16+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
@@ -164,7 +164,7 @@ msgstr "Ref. do Parceiro"
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
 msgid "Total (inclu. taxes):"
-msgstr ""
+msgstr "Total (com impostos):"
 
 #. module: report_intrastat
 #: selection:report.intrastat,month:0
diff --git a/addons/report_intrastat/i18n/ro.po b/addons/report_intrastat/i18n/ro.po
index da0eb6764b8..0d7f0b27244 100644
--- a/addons/report_intrastat/i18n/ro.po
+++ b/addons/report_intrastat/i18n/ro.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:10+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:16+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
diff --git a/addons/report_intrastat/i18n/ru.po b/addons/report_intrastat/i18n/ru.po
index 38240d1e7b0..2dea4bbb199 100644
--- a/addons/report_intrastat/i18n/ru.po
+++ b/addons/report_intrastat/i18n/ru.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:10+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:16+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
diff --git a/addons/report_intrastat/i18n/sl.po b/addons/report_intrastat/i18n/sl.po
index b6260a84930..03129a3653b 100644
--- a/addons/report_intrastat/i18n/sl.po
+++ b/addons/report_intrastat/i18n/sl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:10+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:16+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
diff --git a/addons/report_intrastat/i18n/sq.po b/addons/report_intrastat/i18n/sq.po
index fcb227cf700..ae0f2a81442 100644
--- a/addons/report_intrastat/i18n/sq.po
+++ b/addons/report_intrastat/i18n/sq.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:10+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:16+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
diff --git a/addons/report_intrastat/i18n/sv.po b/addons/report_intrastat/i18n/sv.po
index a8732cbd75d..bd5ea2e1e54 100644
--- a/addons/report_intrastat/i18n/sv.po
+++ b/addons/report_intrastat/i18n/sv.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:10+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:16+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
diff --git a/addons/report_intrastat/i18n/tlh.po b/addons/report_intrastat/i18n/tlh.po
index 92af79ca5f1..04380e4bbb1 100644
--- a/addons/report_intrastat/i18n/tlh.po
+++ b/addons/report_intrastat/i18n/tlh.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:10+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:16+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
diff --git a/addons/report_intrastat/i18n/tr.po b/addons/report_intrastat/i18n/tr.po
index 83dfc661d8e..0aa61709ac9 100644
--- a/addons/report_intrastat/i18n/tr.po
+++ b/addons/report_intrastat/i18n/tr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:10+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:16+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
diff --git a/addons/report_intrastat/i18n/uk.po b/addons/report_intrastat/i18n/uk.po
index 8b9d67ec603..8431b6c4542 100644
--- a/addons/report_intrastat/i18n/uk.po
+++ b/addons/report_intrastat/i18n/uk.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:10+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:16+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
diff --git a/addons/report_intrastat/i18n/vi.po b/addons/report_intrastat/i18n/vi.po
index bb5be346354..1ccb2193904 100644
--- a/addons/report_intrastat/i18n/vi.po
+++ b/addons/report_intrastat/i18n/vi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:10+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:16+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
diff --git a/addons/report_intrastat/i18n/zh_CN.po b/addons/report_intrastat/i18n/zh_CN.po
index 019c2d7f79a..ab854245849 100644
--- a/addons/report_intrastat/i18n/zh_CN.po
+++ b/addons/report_intrastat/i18n/zh_CN.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:10+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:16+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
diff --git a/addons/report_intrastat/i18n/zh_TW.po b/addons/report_intrastat/i18n/zh_TW.po
index 7eda50dce8c..b0966508749 100644
--- a/addons/report_intrastat/i18n/zh_TW.po
+++ b/addons/report_intrastat/i18n/zh_TW.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:10+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:16+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
diff --git a/addons/report_webkit/__openerp__.py b/addons/report_webkit/__openerp__.py
index 1021d129d39..28ad16b63d4 100644
--- a/addons/report_webkit/__openerp__.py
+++ b/addons/report_webkit/__openerp__.py
@@ -30,14 +30,15 @@
 ##############################################################################
 
 {
-    "name": "Webkit Report Engine",
-    "description": """
+    'name': 'Webkit Report Engine',
+    'description': """
 This module adds a new Report Engine based on WebKit library (wkhtmltopdf) to support reports designed in HTML + CSS.
 =====================================================================================================================
 
 The module structure and some code is inspired by the report_openoffice module.
 
 The module allows:
+------------------
     - HTML report definition
     - Multi header support
     - Multi logo
@@ -56,7 +57,7 @@ For a sample report see also the webkit_report_sample module, and this video:
     http://files.me.com/nbessi/06n92k.mov
 
 Requirements and Installation:
------------------------------
+------------------------------
 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).
@@ -65,7 +66,7 @@ After installing the library on the OpenERP Server machine, you need to set the
 path to the ``wkthtmltopdf`` executable file on each Company.
 
 If you are experiencing missing header/footer problems on Linux, be sure to
-install a "static" version of the library. The default ``wkhtmltopdf`` on
+install a 'static' version of the library. The default ``wkhtmltopdf`` on
 Ubuntu is known to have this issue.
 
 
@@ -76,21 +77,21 @@ TODO:
     * Zip return for separated PDF
     * Web client WYSIWYG
 """,
-    "version": "0.9",
-    "depends": ["base"],
-    "author": "Camptocamp",
-    "category": "Reporting", # i.e a technical module, not shown in Application install menu
-    "url": "http://http://www.camptocamp.com/",
-    "data": [ "security/ir.model.access.csv",
-              "data.xml",
-              "wizard/report_webkit_actions_view.xml",
-              "company_view.xml",
-              "header_view.xml",
-              "ir_report_view.xml",
+    'version': '0.9',
+    'depends': ['base'],
+    'author': 'Camptocamp',
+    'category': 'Reporting', # i.e a technical module, not shown in Application install menu
+    'url': 'http://http://www.camptocamp.com/',
+    'data': [ 'security/ir.model.access.csv',
+              'data.xml',
+              'wizard/report_webkit_actions_view.xml',
+              'company_view.xml',
+              'header_view.xml',
+              'ir_report_view.xml',
     ],
-    "installable": True,
-    "auto_install": False,
-    "certificate": "001159699313338995949",
+    'installable': True,
+    'auto_install': False,
+    'certificate': '001159699313338995949',
     'images': ['images/companies_webkit.jpeg','images/header_html.jpeg','images/header_img.jpeg'],
 }
 
diff --git a/addons/report_webkit/i18n/ar.po b/addons/report_webkit/i18n/ar.po
index bf50d042117..af65a530fe6 100644
--- a/addons/report_webkit/i18n/ar.po
+++ b/addons/report_webkit/i18n/ar.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: report_webkit
 #: view:ir.actions.report.xml:0
diff --git a/addons/report_webkit/i18n/bg.po b/addons/report_webkit/i18n/bg.po
index 0266fc7e3db..4b2a7d03b68 100644
--- a/addons/report_webkit/i18n/bg.po
+++ b/addons/report_webkit/i18n/bg.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: report_webkit
 #: view:ir.actions.report.xml:0
diff --git a/addons/report_webkit/i18n/ca.po b/addons/report_webkit/i18n/ca.po
index d543334648a..c32bba351da 100644
--- a/addons/report_webkit/i18n/ca.po
+++ b/addons/report_webkit/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: report_webkit
 #: view:ir.actions.report.xml:0
diff --git a/addons/report_webkit/i18n/da.po b/addons/report_webkit/i18n/da.po
index 7fb855af9f4..291a28969b9 100644
--- a/addons/report_webkit/i18n/da.po
+++ b/addons/report_webkit/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: report_webkit
 #: view:ir.actions.report.xml:0
diff --git a/addons/report_webkit/i18n/de.po b/addons/report_webkit/i18n/de.po
index 45c4041d365..febbc46f016 100644
--- a/addons/report_webkit/i18n/de.po
+++ b/addons/report_webkit/i18n/de.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: report_webkit
 #: view:ir.actions.report.xml:0
diff --git a/addons/report_webkit/i18n/es.po b/addons/report_webkit/i18n/es.po
index df03faeea7f..06dbb6a38ab 100644
--- a/addons/report_webkit/i18n/es.po
+++ b/addons/report_webkit/i18n/es.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: report_webkit
 #: view:ir.actions.report.xml:0
diff --git a/addons/report_webkit/i18n/es_CR.po b/addons/report_webkit/i18n/es_CR.po
index 7f18948cef9..6166014194d 100644
--- a/addons/report_webkit/i18n/es_CR.po
+++ b/addons/report_webkit/i18n/es_CR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 "Language: es\n"
 
 #. module: report_webkit
diff --git a/addons/report_webkit/i18n/fi.po b/addons/report_webkit/i18n/fi.po
index 3ac37adf842..974e9c17614 100644
--- a/addons/report_webkit/i18n/fi.po
+++ b/addons/report_webkit/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: report_webkit
 #: view:ir.actions.report.xml:0
diff --git a/addons/report_webkit/i18n/fr.po b/addons/report_webkit/i18n/fr.po
index 711d2582c6d..6f5b2b9867a 100644
--- a/addons/report_webkit/i18n/fr.po
+++ b/addons/report_webkit/i18n/fr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: report_webkit
 #: view:ir.actions.report.xml:0
diff --git a/addons/report_webkit/i18n/hr.po b/addons/report_webkit/i18n/hr.po
index 4f7519406a3..325e4ea6c3a 100644
--- a/addons/report_webkit/i18n/hr.po
+++ b/addons/report_webkit/i18n/hr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: report_webkit
 #: view:ir.actions.report.xml:0
diff --git a/addons/report_webkit/i18n/hu.po b/addons/report_webkit/i18n/hu.po
index adcf28359a0..9fd1c19b8b8 100644
--- a/addons/report_webkit/i18n/hu.po
+++ b/addons/report_webkit/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: report_webkit
 #: view:ir.actions.report.xml:0
diff --git a/addons/report_webkit/i18n/it.po b/addons/report_webkit/i18n/it.po
index e7ec991aa4b..13733c0b5dd 100644
--- a/addons/report_webkit/i18n/it.po
+++ b/addons/report_webkit/i18n/it.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: report_webkit
 #: view:ir.actions.report.xml:0
diff --git a/addons/report_webkit/i18n/ja.po b/addons/report_webkit/i18n/ja.po
index 2e817f835da..5dd6503f8b5 100644
--- a/addons/report_webkit/i18n/ja.po
+++ b/addons/report_webkit/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: report_webkit
 #: view:ir.actions.report.xml:0
diff --git a/addons/report_webkit/i18n/nl.po b/addons/report_webkit/i18n/nl.po
index ee27b7067c2..7894a1ed11d 100644
--- a/addons/report_webkit/i18n/nl.po
+++ b/addons/report_webkit/i18n/nl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: report_webkit
 #: view:ir.actions.report.xml:0
diff --git a/addons/report_webkit/i18n/pl.po b/addons/report_webkit/i18n/pl.po
index da98c162d43..3b51ffa8a7e 100644
--- a/addons/report_webkit/i18n/pl.po
+++ b/addons/report_webkit/i18n/pl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: report_webkit
 #: view:ir.actions.report.xml:0
diff --git a/addons/report_webkit/i18n/pt.po b/addons/report_webkit/i18n/pt.po
index 32e5af25127..29e0e8b2c88 100644
--- a/addons/report_webkit/i18n/pt.po
+++ b/addons/report_webkit/i18n/pt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: report_webkit
 #: view:ir.actions.report.xml:0
diff --git a/addons/report_webkit/i18n/pt_BR.po b/addons/report_webkit/i18n/pt_BR.po
index 08b336e3920..8a25e9b7c63 100644
--- a/addons/report_webkit/i18n/pt_BR.po
+++ b/addons/report_webkit/i18n/pt_BR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: report_webkit
 #: view:ir.actions.report.xml:0
diff --git a/addons/report_webkit/i18n/ro.po b/addons/report_webkit/i18n/ro.po
index d8b2b82cc61..9557deb86ec 100644
--- a/addons/report_webkit/i18n/ro.po
+++ b/addons/report_webkit/i18n/ro.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: report_webkit
 #: view:ir.actions.report.xml:0
diff --git a/addons/report_webkit/i18n/ru.po b/addons/report_webkit/i18n/ru.po
index 3dffe117f59..dd80c4c92bd 100644
--- a/addons/report_webkit/i18n/ru.po
+++ b/addons/report_webkit/i18n/ru.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: report_webkit
 #: view:ir.actions.report.xml:0
diff --git a/addons/report_webkit/i18n/sv.po b/addons/report_webkit/i18n/sv.po
index 0f8338e390d..13369165935 100644
--- a/addons/report_webkit/i18n/sv.po
+++ b/addons/report_webkit/i18n/sv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: report_webkit
 #: view:ir.actions.report.xml:0
diff --git a/addons/report_webkit/i18n/tr.po b/addons/report_webkit/i18n/tr.po
index ce407a876b7..1ec29943e2b 100644
--- a/addons/report_webkit/i18n/tr.po
+++ b/addons/report_webkit/i18n/tr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: report_webkit
 #: view:ir.actions.report.xml:0
diff --git a/addons/report_webkit/i18n/zh_CN.po b/addons/report_webkit/i18n/zh_CN.po
index 36cfa87868a..054c32161b0 100644
--- a/addons/report_webkit/i18n/zh_CN.po
+++ b/addons/report_webkit/i18n/zh_CN.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: report_webkit
 #: view:ir.actions.report.xml:0
diff --git a/addons/report_webkit_sample/__openerp__.py b/addons/report_webkit_sample/__openerp__.py
index 65b6a9d49e8..d10c336609e 100644
--- a/addons/report_webkit_sample/__openerp__.py
+++ b/addons/report_webkit_sample/__openerp__.py
@@ -30,8 +30,8 @@
 ##############################################################################
 
 {
-    "name": "Webkit Report Samples",
-    "description": """
+    'name': 'Webkit Report Samples',
+    'description': """
 Samples for Webkit Report Engine (report_webkit module).
 ========================================================
 
@@ -41,17 +41,15 @@ add Webkit Report entries on any Document in the system.
 You have to create the print buttons by calling the wizard. For more details see:
     http://files.me.com/nbessi/06n92k.mov
 """,
-    "version": "0.9",
-    "depends": ["base", "account", "report_webkit"],
-    "category": "Reporting",
-    "author": "Camptocamp SA - NBessi",
-    "url": "http://www.camptocamp.com/",
-    "data": ["report_webkit_html_view.xml",
-
-                   ],
-    "installable": True,
-    "auto_install": False,
-    "certificate": "00436592682591421981",
+    'version': '0.9',
+    'depends': ['base', 'account', 'report_webkit'],
+    'category': 'Reporting',
+    'author': 'Camptocamp SA - NBessi',
+    'url': 'http://www.camptocamp.com/',
+    'data': ['report_webkit_html_view.xml'],
+    'installable': True,
+    'auto_install': False,
+    'certificate': '00436592682591421981',
     'images': ['images/webkit_invoice_report.jpeg'],
 }
 
diff --git a/addons/report_webkit_sample/i18n/ar.po b/addons/report_webkit_sample/i18n/ar.po
index 5a11e9c32c0..1283adaebd9 100644
--- a/addons/report_webkit_sample/i18n/ar.po
+++ b/addons/report_webkit_sample/i18n/ar.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: report_webkit_sample
 #: report:addons/report_webkit_sample/report/report_webkit_html.mako:37
diff --git a/addons/report_webkit_sample/i18n/bg.po b/addons/report_webkit_sample/i18n/bg.po
index 2a0cb75b795..c709c400ce1 100644
--- a/addons/report_webkit_sample/i18n/bg.po
+++ b/addons/report_webkit_sample/i18n/bg.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: report_webkit_sample
 #: report:addons/report_webkit_sample/report/report_webkit_html.mako:37
diff --git a/addons/report_webkit_sample/i18n/ca.po b/addons/report_webkit_sample/i18n/ca.po
index 9024d0591f2..96adde44d05 100644
--- a/addons/report_webkit_sample/i18n/ca.po
+++ b/addons/report_webkit_sample/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: report_webkit_sample
 #: report:addons/report_webkit_sample/report/report_webkit_html.mako:37
diff --git a/addons/report_webkit_sample/i18n/da.po b/addons/report_webkit_sample/i18n/da.po
index 208458ec455..1c7a8c3e1ff 100644
--- a/addons/report_webkit_sample/i18n/da.po
+++ b/addons/report_webkit_sample/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: report_webkit_sample
 #: report:addons/report_webkit_sample/report/report_webkit_html.mako:37
diff --git a/addons/report_webkit_sample/i18n/de.po b/addons/report_webkit_sample/i18n/de.po
index a7f4c6fd9fd..a3e666eb7e4 100644
--- a/addons/report_webkit_sample/i18n/de.po
+++ b/addons/report_webkit_sample/i18n/de.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: report_webkit_sample
 #: report:addons/report_webkit_sample/report/report_webkit_html.mako:37
diff --git a/addons/report_webkit_sample/i18n/es.po b/addons/report_webkit_sample/i18n/es.po
index 0f88bf8b051..36a503fe9f1 100644
--- a/addons/report_webkit_sample/i18n/es.po
+++ b/addons/report_webkit_sample/i18n/es.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: report_webkit_sample
 #: report:addons/report_webkit_sample/report/report_webkit_html.mako:37
diff --git a/addons/report_webkit_sample/i18n/es_CR.po b/addons/report_webkit_sample/i18n/es_CR.po
index b7216ae4d1e..bc8a12987d4 100644
--- a/addons/report_webkit_sample/i18n/es_CR.po
+++ b/addons/report_webkit_sample/i18n/es_CR.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 "Language: es\n"
 
 #. module: report_webkit_sample
diff --git a/addons/report_webkit_sample/i18n/fi.po b/addons/report_webkit_sample/i18n/fi.po
index 886e876c73d..1d111bc49ca 100644
--- a/addons/report_webkit_sample/i18n/fi.po
+++ b/addons/report_webkit_sample/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: report_webkit_sample
 #: report:addons/report_webkit_sample/report/report_webkit_html.mako:37
diff --git a/addons/report_webkit_sample/i18n/fr.po b/addons/report_webkit_sample/i18n/fr.po
index cfebf1b2788..bd5fb759f9c 100644
--- a/addons/report_webkit_sample/i18n/fr.po
+++ b/addons/report_webkit_sample/i18n/fr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: report_webkit_sample
 #: report:addons/report_webkit_sample/report/report_webkit_html.mako:37
diff --git a/addons/report_webkit_sample/i18n/gl.po b/addons/report_webkit_sample/i18n/gl.po
index 7cb8cd07b41..ee0e7c98d3a 100644
--- a/addons/report_webkit_sample/i18n/gl.po
+++ b/addons/report_webkit_sample/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: report_webkit_sample
 #: report:addons/report_webkit_sample/report/report_webkit_html.mako:37
diff --git a/addons/report_webkit_sample/i18n/hr.po b/addons/report_webkit_sample/i18n/hr.po
index 12ac1021a97..710aaa90aa8 100644
--- a/addons/report_webkit_sample/i18n/hr.po
+++ b/addons/report_webkit_sample/i18n/hr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: report_webkit_sample
 #: report:addons/report_webkit_sample/report/report_webkit_html.mako:37
diff --git a/addons/report_webkit_sample/i18n/hu.po b/addons/report_webkit_sample/i18n/hu.po
index 563744ff4c4..2cb20dd3190 100644
--- a/addons/report_webkit_sample/i18n/hu.po
+++ b/addons/report_webkit_sample/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: report_webkit_sample
 #: report:addons/report_webkit_sample/report/report_webkit_html.mako:37
diff --git a/addons/report_webkit_sample/i18n/it.po b/addons/report_webkit_sample/i18n/it.po
index 2ef1f16ede4..44e5aea9974 100644
--- a/addons/report_webkit_sample/i18n/it.po
+++ b/addons/report_webkit_sample/i18n/it.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: report_webkit_sample
 #: report:addons/report_webkit_sample/report/report_webkit_html.mako:37
diff --git a/addons/report_webkit_sample/i18n/ja.po b/addons/report_webkit_sample/i18n/ja.po
index 6ddc02b5ebc..0a38d3ba41a 100644
--- a/addons/report_webkit_sample/i18n/ja.po
+++ b/addons/report_webkit_sample/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: report_webkit_sample
 #: report:addons/report_webkit_sample/report/report_webkit_html.mako:37
diff --git a/addons/report_webkit_sample/i18n/nl.po b/addons/report_webkit_sample/i18n/nl.po
index a82d44e5546..5be41950afd 100644
--- a/addons/report_webkit_sample/i18n/nl.po
+++ b/addons/report_webkit_sample/i18n/nl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: report_webkit_sample
 #: report:addons/report_webkit_sample/report/report_webkit_html.mako:37
diff --git a/addons/report_webkit_sample/i18n/pt.po b/addons/report_webkit_sample/i18n/pt.po
index e0932c6d53f..f473832b7f7 100644
--- a/addons/report_webkit_sample/i18n/pt.po
+++ b/addons/report_webkit_sample/i18n/pt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: report_webkit_sample
 #: report:addons/report_webkit_sample/report/report_webkit_html.mako:37
diff --git a/addons/report_webkit_sample/i18n/pt_BR.po b/addons/report_webkit_sample/i18n/pt_BR.po
index f9c95272560..5662c4569cd 100644
--- a/addons/report_webkit_sample/i18n/pt_BR.po
+++ b/addons/report_webkit_sample/i18n/pt_BR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: report_webkit_sample
 #: report:addons/report_webkit_sample/report/report_webkit_html.mako:37
diff --git a/addons/report_webkit_sample/i18n/ro.po b/addons/report_webkit_sample/i18n/ro.po
index 62728797ce1..99d40f3d9e1 100644
--- a/addons/report_webkit_sample/i18n/ro.po
+++ b/addons/report_webkit_sample/i18n/ro.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: report_webkit_sample
 #: report:addons/report_webkit_sample/report/report_webkit_html.mako:37
diff --git a/addons/report_webkit_sample/i18n/sv.po b/addons/report_webkit_sample/i18n/sv.po
index 8a3ab62d075..52a51890712 100644
--- a/addons/report_webkit_sample/i18n/sv.po
+++ b/addons/report_webkit_sample/i18n/sv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: report_webkit_sample
 #: report:addons/report_webkit_sample/report/report_webkit_html.mako:37
diff --git a/addons/report_webkit_sample/i18n/tr.po b/addons/report_webkit_sample/i18n/tr.po
index 4493e6fb440..1a481ec0a33 100644
--- a/addons/report_webkit_sample/i18n/tr.po
+++ b/addons/report_webkit_sample/i18n/tr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: report_webkit_sample
 #: report:addons/report_webkit_sample/report/report_webkit_html.mako:37
diff --git a/addons/report_webkit_sample/i18n/zh_CN.po b/addons/report_webkit_sample/i18n/zh_CN.po
index c622b758c5f..b8ad99a1863 100644
--- a/addons/report_webkit_sample/i18n/zh_CN.po
+++ b/addons/report_webkit_sample/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-02-08 00:37+0000\n"
-"PO-Revision-Date: 2011-07-12 19:36+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2012-08-19 21:17+0000\n"
+"Last-Translator: Heling Yao <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: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: report_webkit_sample
 #: report:addons/report_webkit_sample/report/report_webkit_html.mako:37
@@ -75,7 +75,7 @@ msgstr "数量"
 #. module: report_webkit_sample
 #: report:addons/report_webkit_sample/report/report_webkit_html.mako:25
 msgid "Email"
-msgstr ""
+msgstr "电子邮件"
 
 #. module: report_webkit_sample
 #: report:addons/report_webkit_sample/report/report_webkit_html.mako:64
diff --git a/addons/resource/__openerp__.py b/addons/resource/__openerp__.py
index 686207d8d9d..94c55105c2a 100644
--- a/addons/resource/__openerp__.py
+++ b/addons/resource/__openerp__.py
@@ -20,12 +20,12 @@
 ##############################################################################
 
 {
-    "name" : "Resource",
-    "version" : "1.1",
-    "author" : "OpenERP SA",
-    "category" : "Hidden/Dependency",
-    "website" : "http://www.openerp.com",
-    "description": """
+    'name' : 'Resource',
+    'version' : '1.1',
+    'author' : 'OpenERP SA',
+    'category' : 'Hidden/Dependency',
+    'website' : 'http://www.openerp.com',
+    'description': """
 Module for resource management.
 ===============================
 
@@ -36,13 +36,11 @@ associated to every resource. It also manages the leaves of every resource.
     'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
     'depends': ['process'],
-    'init_xml': [],
-    'update_xml': [
+    'data': [
         'security/ir.model.access.csv',
         'resource_view.xml',
     ],
-    'demo_xml': ['resource_demo.xml'
-    ],
+    'demo': ['resource_demo.xml'],
     'test': [
         'test/resource.yml',
         'test/duplicate_resource.yml',
diff --git a/addons/resource/i18n/ar.po b/addons/resource/i18n/ar.po
index e2a869784bc..43638eb80b8 100644
--- a/addons/resource/i18n/ar.po
+++ b/addons/resource/i18n/ar.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: resource
 #: help:resource.calendar.leaves,resource_id:0
diff --git a/addons/resource/i18n/bg.po b/addons/resource/i18n/bg.po
index f7fa2d13c28..38376aa7474 100644
--- a/addons/resource/i18n/bg.po
+++ b/addons/resource/i18n/bg.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: resource
 #: help:resource.calendar.leaves,resource_id:0
diff --git a/addons/resource/i18n/ca.po b/addons/resource/i18n/ca.po
index 403c964c0a1..7910e847459 100644
--- a/addons/resource/i18n/ca.po
+++ b/addons/resource/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: resource
 #: help:resource.calendar.leaves,resource_id:0
diff --git a/addons/resource/i18n/cs.po b/addons/resource/i18n/cs.po
index 628593bea0a..d4ce34f6bd0 100644
--- a/addons/resource/i18n/cs.po
+++ b/addons/resource/i18n/cs.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 "X-Poedit-Language: Czech\n"
 
 #. module: resource
diff --git a/addons/resource/i18n/da.po b/addons/resource/i18n/da.po
index 208c2821f49..00c10e83732 100644
--- a/addons/resource/i18n/da.po
+++ b/addons/resource/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: resource
 #: help:resource.calendar.leaves,resource_id:0
diff --git a/addons/resource/i18n/de.po b/addons/resource/i18n/de.po
index 9053bfe3d4c..aab7c4d54f4 100644
--- a/addons/resource/i18n/de.po
+++ b/addons/resource/i18n/de.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: resource
 #: help:resource.calendar.leaves,resource_id:0
diff --git a/addons/resource/i18n/es.po b/addons/resource/i18n/es.po
index 0bc3acee4c7..10e7c304bc7 100644
--- a/addons/resource/i18n/es.po
+++ b/addons/resource/i18n/es.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: resource
 #: help:resource.calendar.leaves,resource_id:0
diff --git a/addons/resource/i18n/es_CR.po b/addons/resource/i18n/es_CR.po
index e38e6b4285b..d90043ec206 100644
--- a/addons/resource/i18n/es_CR.po
+++ b/addons/resource/i18n/es_CR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 "Language: es\n"
 
 #. module: resource
diff --git a/addons/resource/i18n/es_EC.po b/addons/resource/i18n/es_EC.po
index f0e1d246b5e..5e7c24a9253 100644
--- a/addons/resource/i18n/es_EC.po
+++ b/addons/resource/i18n/es_EC.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: resource
 #: help:resource.calendar.leaves,resource_id:0
diff --git a/addons/resource/i18n/et.po b/addons/resource/i18n/et.po
index 6d03a14094b..82af443ba38 100644
--- a/addons/resource/i18n/et.po
+++ b/addons/resource/i18n/et.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: resource
 #: help:resource.calendar.leaves,resource_id:0
diff --git a/addons/resource/i18n/fi.po b/addons/resource/i18n/fi.po
index d9ca8b48f39..7efb7831ac9 100644
--- a/addons/resource/i18n/fi.po
+++ b/addons/resource/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: resource
 #: help:resource.calendar.leaves,resource_id:0
diff --git a/addons/resource/i18n/fr.po b/addons/resource/i18n/fr.po
index bb683df0492..b8a7d32bac6 100644
--- a/addons/resource/i18n/fr.po
+++ b/addons/resource/i18n/fr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: resource
 #: help:resource.calendar.leaves,resource_id:0
diff --git a/addons/resource/i18n/gl.po b/addons/resource/i18n/gl.po
index b0f11465f28..2dcc5ac5b16 100644
--- a/addons/resource/i18n/gl.po
+++ b/addons/resource/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: resource
 #: help:resource.calendar.leaves,resource_id:0
diff --git a/addons/resource/i18n/hr.po b/addons/resource/i18n/hr.po
index c8bed6a6de6..f17001caf6d 100644
--- a/addons/resource/i18n/hr.po
+++ b/addons/resource/i18n/hr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: resource
 #: help:resource.calendar.leaves,resource_id:0
diff --git a/addons/resource/i18n/hu.po b/addons/resource/i18n/hu.po
index ef790772d85..9a40e4561f0 100644
--- a/addons/resource/i18n/hu.po
+++ b/addons/resource/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: resource
 #: help:resource.calendar.leaves,resource_id:0
diff --git a/addons/resource/i18n/it.po b/addons/resource/i18n/it.po
index acaf3cb8d69..4756ebcd11e 100644
--- a/addons/resource/i18n/it.po
+++ b/addons/resource/i18n/it.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: resource
 #: help:resource.calendar.leaves,resource_id:0
diff --git a/addons/resource/i18n/ja.po b/addons/resource/i18n/ja.po
index e081695706a..1ce316b0561 100644
--- a/addons/resource/i18n/ja.po
+++ b/addons/resource/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: resource
 #: help:resource.calendar.leaves,resource_id:0
diff --git a/addons/resource/i18n/lt.po b/addons/resource/i18n/lt.po
index 1f714291a87..e6d871234bc 100644
--- a/addons/resource/i18n/lt.po
+++ b/addons/resource/i18n/lt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: resource
 #: help:resource.calendar.leaves,resource_id:0
diff --git a/addons/resource/i18n/mn.po b/addons/resource/i18n/mn.po
index 077b8b0e61d..84824c7fe29 100644
--- a/addons/resource/i18n/mn.po
+++ b/addons/resource/i18n/mn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: resource
 #: help:resource.calendar.leaves,resource_id:0
diff --git a/addons/resource/i18n/nl.po b/addons/resource/i18n/nl.po
index 734858d07e8..590acf291f5 100644
--- a/addons/resource/i18n/nl.po
+++ b/addons/resource/i18n/nl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: resource
 #: help:resource.calendar.leaves,resource_id:0
diff --git a/addons/resource/i18n/pl.po b/addons/resource/i18n/pl.po
index 05a71928a36..92d62e99347 100644
--- a/addons/resource/i18n/pl.po
+++ b/addons/resource/i18n/pl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: resource
 #: help:resource.calendar.leaves,resource_id:0
diff --git a/addons/resource/i18n/pt.po b/addons/resource/i18n/pt.po
index df71e9cbd93..d7cea65ccbd 100644
--- a/addons/resource/i18n/pt.po
+++ b/addons/resource/i18n/pt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: resource
 #: help:resource.calendar.leaves,resource_id:0
diff --git a/addons/resource/i18n/pt_BR.po b/addons/resource/i18n/pt_BR.po
index 2db1bfcc5cf..b57b8ada2cc 100644
--- a/addons/resource/i18n/pt_BR.po
+++ b/addons/resource/i18n/pt_BR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: resource
 #: help:resource.calendar.leaves,resource_id:0
@@ -23,6 +23,8 @@ msgid ""
 "If empty, this is a generic holiday for the company. If a resource is set, "
 "the holiday/leave is only for this resource"
 msgstr ""
+"Se estiver vazio, é um feriado comum para a empresa. Se o recurso for "
+"definido, o feriado/ausência é apenas para este recurso."
 
 #. module: resource
 #: selection:resource.resource,resource_type:0
@@ -38,12 +40,12 @@ msgstr "Tipo de Recurso"
 #: model:ir.model,name:resource.model_resource_calendar_leaves
 #: view:resource.calendar.leaves:0
 msgid "Leave Detail"
-msgstr ""
+msgstr "Detalhes da Folga"
 
 #. module: resource
 #: model:ir.actions.act_window,name:resource.resource_calendar_resources_leaves
 msgid "Resources Leaves"
-msgstr ""
+msgstr "Ausências dos Recursos"
 
 #. module: resource
 #: model:ir.actions.act_window,name:resource.action_resource_calendar_form
@@ -91,6 +93,8 @@ msgstr "Recursos"
 #, python-format
 msgid "Make sure the Working time has been configured with proper week days!"
 msgstr ""
+"Tenha certeza de que o tempo de trabalho está configurado com os dias da "
+"semana apropriados!"
 
 #. module: resource
 #: field:resource.calendar,manager:0
@@ -100,17 +104,17 @@ msgstr "Administrador do grupo de trabalho"
 #. module: resource
 #: help:resource.calendar.attendance,hour_from:0
 msgid "Working time will start from"
-msgstr ""
+msgstr "Horário de trabalho iniciará a partir"
 
 #. module: resource
 #: constraint:resource.calendar.leaves:0
 msgid "Error! leave start-date must be lower then leave end-date."
-msgstr ""
+msgstr "Erro! A data de início da folga precisa vir antes da data final"
 
 #. module: resource
 #: model:ir.model,name:resource.model_resource_calendar
 msgid "Resource Calendar"
-msgstr ""
+msgstr "Calendário de Recursos"
 
 #. module: resource
 #: field:resource.calendar,company_id:0
@@ -134,7 +138,7 @@ msgstr "Dia da semana"
 #. module: resource
 #: help:resource.calendar.attendance,hour_to:0
 msgid "Working time will end at"
-msgstr ""
+msgstr "Horário de trabalho terminará emr"
 
 #. module: resource
 #: field:resource.calendar.attendance,date_from:0
@@ -144,7 +148,7 @@ msgstr "Data inicial"
 #. module: resource
 #: view:resource.calendar:0
 msgid "Search Working Time"
-msgstr ""
+msgstr "Procurar Horário de Trabalho"
 
 #. module: resource
 #: view:resource.calendar.leaves:0
@@ -165,7 +169,7 @@ msgstr "Data"
 #. module: resource
 #: view:resource.calendar.leaves:0
 msgid "Search Working Period Leaves"
-msgstr ""
+msgstr "Procurar Ausências em Período de Trabalho"
 
 #. module: resource
 #: field:resource.resource,time_efficiency:0
@@ -180,7 +184,7 @@ msgstr "Data Final"
 #. module: resource
 #: model:ir.actions.act_window,name:resource.resource_calendar_closing_days
 msgid "Closing Days"
-msgstr ""
+msgstr "Dias de Fechamento"
 
 #. module: resource
 #: model:ir.ui.menu,name:resource.menu_resource_config
@@ -208,12 +212,12 @@ msgstr "Quarta"
 #: view:resource.calendar.leaves:0
 #: view:resource.resource:0
 msgid "Working Period"
-msgstr ""
+msgstr "Horário de trabalho"
 
 #. module: resource
 #: model:ir.model,name:resource.model_resource_resource
 msgid "Resource Detail"
-msgstr ""
+msgstr "Detalhes do Recurso"
 
 #. module: resource
 #: field:resource.resource,active:0
@@ -226,16 +230,18 @@ msgid ""
 "If the active field is set to False, it will allow you to hide the resource "
 "record without removing it."
 msgstr ""
+"Se o campo ativo for definido como Falso, te permitirá esconder o registro "
+"do recurso sem removê-lo"
 
 #. module: resource
 #: field:resource.calendar.attendance,calendar_id:0
 msgid "Resource's Calendar"
-msgstr ""
+msgstr "Calendário de Recursos"
 
 #. module: resource
 #: field:resource.calendar.attendance,hour_from:0
 msgid "Work from"
-msgstr ""
+msgstr "Trabalho de"
 
 #. module: resource
 #: model:ir.actions.act_window,help:resource.action_resource_calendar_form
@@ -243,21 +249,23 @@ msgid ""
 "Define working hours and time table that could be scheduled to your project "
 "members"
 msgstr ""
+"Definir horário de trabalhos e tabela de tempo que poderão ser agendadas aos "
+"seus membros do projeto."
 
 #. module: resource
 #: help:resource.resource,user_id:0
 msgid "Related user name for the resource to manage its access."
-msgstr ""
+msgstr "Usuário relacionado para o gerente controlar seus acessos"
 
 #. module: resource
 #: help:resource.resource,calendar_id:0
 msgid "Define the schedule of resource"
-msgstr ""
+msgstr "Definir a agenda do recurso"
 
 #. module: resource
 #: view:resource.calendar.leaves:0
 msgid "Starting Date of Leave"
-msgstr ""
+msgstr "Data de Início da Folga"
 
 #. module: resource
 #: field:resource.resource,code:0
@@ -282,6 +290,11 @@ msgid ""
 "show a load of 100% for this phase by default, but if we put a efficency of "
 "200%, then his load will only be 50%."
 msgstr ""
+"Este campo representam a eficiência do recurso a tarefas completos. recurso, "
+"por exemplo um recurso único com uma fase de 5 dias com 5 tarefas "
+"atribuídas, mostrará uma carga de 100% para esta fase por padrão, se "
+"colocarmos uma meta de eficiência de 200%, então sua ocupação para esta "
+"história será de 50%."
 
 #. module: resource
 #: selection:resource.calendar.attendance,dayofweek:0
@@ -291,13 +304,13 @@ msgstr "Terça"
 #. module: resource
 #: field:resource.calendar.leaves,calendar_id:0
 msgid "Working time"
-msgstr ""
+msgstr "Horário de Trabalho"
 
 #. module: resource
 #: model:ir.actions.act_window,name:resource.action_resource_calendar_leave_tree
 #: model:ir.ui.menu,name:resource.menu_view_resource_calendar_leaves_search
 msgid "Resource Leaves"
-msgstr ""
+msgstr "Ausências de Recurso"
 
 #. module: resource
 #: model:ir.actions.act_window,help:resource.action_resource_resource_tree
@@ -306,6 +319,9 @@ msgid ""
 "in a specific project phase. You can also set their efficiency level and "
 "workload based on their weekly working hours."
 msgstr ""
+"Recursos te permitem criar e controlar recursos que estão envolvidos em uma "
+"fase específica do projeto. Você pode também definir seu nível de eficiência "
+"e sobrecarga baseado nas horas de trabalho da semana."
 
 #. module: resource
 #: view:resource.resource:0
@@ -316,13 +332,13 @@ msgstr "Inativa"
 #: code:addons/resource/faces/resource.py:340
 #, python-format
 msgid "(vacation)"
-msgstr ""
+msgstr "(férias)"
 
 #. module: resource
 #: code:addons/resource/resource.py:392
 #, python-format
 msgid "Configuration Error!"
-msgstr ""
+msgstr "Erro de Configuração!"
 
 #. module: resource
 #: selection:resource.resource,resource_type:0
@@ -332,7 +348,7 @@ msgstr "Humano"
 #. module: resource
 #: model:ir.model,name:resource.model_resource_calendar_attendance
 msgid "Work Detail"
-msgstr ""
+msgstr "Detalhes do Trabalho"
 
 #. module: resource
 #: field:resource.calendar.leaves,date_from:0
@@ -358,3 +374,6 @@ msgstr "Sábado"
 
 #~ msgid "General Information"
 #~ msgstr "Informação Geral"
+
+#~ msgid "Efficiency factor"
+#~ msgstr "Fator de Eficiência"
diff --git a/addons/resource/i18n/ro.po b/addons/resource/i18n/ro.po
index 36388f3a9b2..6a6184775e6 100644
--- a/addons/resource/i18n/ro.po
+++ b/addons/resource/i18n/ro.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: resource
 #: help:resource.calendar.leaves,resource_id:0
diff --git a/addons/resource/i18n/ru.po b/addons/resource/i18n/ru.po
index 9285df176ad..76d71677b32 100644
--- a/addons/resource/i18n/ru.po
+++ b/addons/resource/i18n/ru.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: resource
 #: help:resource.calendar.leaves,resource_id:0
diff --git a/addons/resource/i18n/sl.po b/addons/resource/i18n/sl.po
index ab1822f2107..75b6293925d 100644
--- a/addons/resource/i18n/sl.po
+++ b/addons/resource/i18n/sl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: resource
 #: help:resource.calendar.leaves,resource_id:0
diff --git a/addons/resource/i18n/sv.po b/addons/resource/i18n/sv.po
index d7832481cfa..035821dedc6 100644
--- a/addons/resource/i18n/sv.po
+++ b/addons/resource/i18n/sv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: resource
 #: help:resource.calendar.leaves,resource_id:0
diff --git a/addons/resource/i18n/tr.po b/addons/resource/i18n/tr.po
index 390186a43d5..9eacea8f447 100644
--- a/addons/resource/i18n/tr.po
+++ b/addons/resource/i18n/tr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: resource
 #: help:resource.calendar.leaves,resource_id:0
diff --git a/addons/resource/i18n/vi.po b/addons/resource/i18n/vi.po
index 5c6c715bf83..389b5877f9f 100644
--- a/addons/resource/i18n/vi.po
+++ b/addons/resource/i18n/vi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: resource
 #: help:resource.calendar.leaves,resource_id:0
diff --git a/addons/resource/i18n/zh_CN.po b/addons/resource/i18n/zh_CN.po
index 3c4f96cab2e..8e44a860735 100644
--- a/addons/resource/i18n/zh_CN.po
+++ b/addons/resource/i18n/zh_CN.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: resource
 #: help:resource.calendar.leaves,resource_id:0
@@ -90,7 +90,7 @@ msgstr "资源"
 #: code:addons/resource/resource.py:392
 #, python-format
 msgid "Make sure the Working time has been configured with proper week days!"
-msgstr ""
+msgstr "请确保已经配置好适当的工作日的工作时间！"
 
 #. module: resource
 #: field:resource.calendar,manager:0
@@ -242,7 +242,7 @@ msgstr "工作从"
 msgid ""
 "Define working hours and time table that could be scheduled to your project "
 "members"
-msgstr ""
+msgstr "为你的项目成员定义工作时间和安排时间表"
 
 #. module: resource
 #: help:resource.resource,user_id:0
@@ -257,7 +257,7 @@ msgstr "定义资源调度"
 #. module: resource
 #: view:resource.calendar.leaves:0
 msgid "Starting Date of Leave"
-msgstr ""
+msgstr "假期开始日期"
 
 #. module: resource
 #: field:resource.resource,code:0
@@ -324,7 +324,7 @@ msgstr "（假期）"
 #: code:addons/resource/resource.py:392
 #, python-format
 msgid "Configuration Error!"
-msgstr ""
+msgstr "设置错误!"
 
 #. module: resource
 #: selection:resource.resource,resource_type:0
diff --git a/addons/sale/edi/sale_order_action_data.xml b/addons/sale/edi/sale_order_action_data.xml
index fedcd583d41..dcaf0828aef 100644
--- a/addons/sale/edi/sale_order_action_data.xml
+++ b/addons/sale/edi/sale_order_action_data.xml
@@ -126,67 +126,6 @@
     </div>
 </div>
             ]]></field>
-            <field name="body_text"><![CDATA[
-Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name or ''},
-
-Here is your ${object.state in ('draft', 'sent') and 'quotation' or 'order confirmation'} from ${object.company_id.name}:
-       | Order number: *${object.name}*
-       | Order total: *${object.amount_total} ${object.pricelist_id.currency_id.name}*
-       | Order date: ${object.date_order}
-       % if object.origin:
-       | Order reference: ${object.origin}
-       % endif
-       % if object.client_order_ref:
-       | Your reference: ${object.client_order_ref}<br />
-       % endif
-       | Your contact: ${object.user_id.name} ${object.user_id.email and '<%s>'%(object.user_id.email) or ''}
-
-You can view the ${object.state in ('draft', 'sent') and 'quotation' or 'order confirmation'}, download it and even pay online using the following link:
-    ${ctx.get('edi_web_url_view') or 'n/a'}
-
-% if object.order_policy in ('prepaid','manual') and object.company_id.paypal_account and object.state not in ('draft', 'sent'):
-<%
-comp_name = quote(object.company_id.name)
-order_name = quote(object.name)
-paypal_account = quote(object.company_id.paypal_account)
-order_amount = quote(str(object.amount_total))
-cur_name = quote(object.pricelist_id.currency_id.name)
-paypal_url = "https://www.paypal.com/cgi-bin/webscr?cmd=_xclick&business=%s&item_name=%s%%20Order%%20%s&invoice=%s&amount=%s" \
-             "&currency_code=%s&button_subtype=services&no_note=1&bn=OpenERP_Order_PayNow_%s" % \
-             (paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_name)
-%>
-It is also possible to directly pay with Paypal:
-    ${paypal_url}
-% endif
-
-If you have any question, do not hesitate to contact us.
-
-
-Thank you for choosing ${object.company_id.name}!
-
-
---
-${object.user_id.name} ${object.user_id.email and '<%s>'%(object.user_id.email) or ''}
-${object.company_id.name}
-% if object.company_id.street:
-${object.company_id.street or ''}
-% endif
-% if object.company_id.street2:
-${object.company_id.street2}
-% endif
-% if object.company_id.city or object.company_id.zip:
-${object.company_id.zip or ''} ${object.company_id.city or ''}
-% endif
-% if object.company_id.country_id:
-${object.company_id.state_id and ('%s, ' % object.company_id.state_id.name) or ''} ${object.company_id.country_id.name or ''}
-% endif
-% if object.company_id.phone:
-Phone: ${object.company_id.phone}
-% endif
-% if object.company_id.website:
-${object.company_id.website or ''}
-% endif
-            ]]></field>
         </record>
     </data>
 </openerp>
diff --git a/addons/sale/i18n/ar.po b/addons/sale/i18n/ar.po
index c7219d236a4..812f921b85f 100644
--- a/addons/sale/i18n/ar.po
+++ b/addons/sale/i18n/ar.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:46+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:57+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: sale
 #: field:sale.config.picking_policy,timesheet:0
@@ -1121,7 +1121,7 @@ msgid "Document of the move to the output or to the customer."
 msgstr "وثيقة الانتقال الى الخروج او اللى العميل."
 
 #. module: sale
-#: model:email.template,body_text:sale.email_template_edi_sale
+#: model:email.template,body:sale.email_template_edi_sale
 msgid ""
 "\n"
 "Hello${object.partner_order_id.name and ' ' or "
diff --git a/addons/sale/i18n/bg.po b/addons/sale/i18n/bg.po
index 94187e931da..571dde6252f 100644
--- a/addons/sale/i18n/bg.po
+++ b/addons/sale/i18n/bg.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:46+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:57+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: sale
 #: field:sale.config.picking_policy,timesheet:0
@@ -1101,7 +1101,7 @@ msgid "Document of the move to the output or to the customer."
 msgstr ""
 
 #. module: sale
-#: model:email.template,body_text:sale.email_template_edi_sale
+#: model:email.template,body:sale.email_template_edi_sale
 msgid ""
 "\n"
 "Hello${object.partner_order_id.name and ' ' or "
diff --git a/addons/sale/i18n/bs.po b/addons/sale/i18n/bs.po
index f0a4a5f7c13..a41483e0a3d 100644
--- a/addons/sale/i18n/bs.po
+++ b/addons/sale/i18n/bs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:46+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:57+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: sale
 #: field:sale.config.picking_policy,timesheet:0
@@ -1095,7 +1095,7 @@ msgid "Document of the move to the output or to the customer."
 msgstr ""
 
 #. module: sale
-#: model:email.template,body_text:sale.email_template_edi_sale
+#: model:email.template,body:sale.email_template_edi_sale
 msgid ""
 "\n"
 "Hello${object.partner_order_id.name and ' ' or "
diff --git a/addons/sale/i18n/ca.po b/addons/sale/i18n/ca.po
index 9310eb1df24..88360a3ac56 100644
--- a/addons/sale/i18n/ca.po
+++ b/addons/sale/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:46+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:57+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: sale
 #: field:sale.config.picking_policy,timesheet:0
@@ -1141,7 +1141,7 @@ msgid "Document of the move to the output or to the customer."
 msgstr "Document del moviment a la sortida o al client."
 
 #. module: sale
-#: model:email.template,body_text:sale.email_template_edi_sale
+#: model:email.template,body:sale.email_template_edi_sale
 msgid ""
 "\n"
 "Hello${object.partner_order_id.name and ' ' or "
diff --git a/addons/sale/i18n/cs.po b/addons/sale/i18n/cs.po
index 6c08ecf4413..4164a564d77 100644
--- a/addons/sale/i18n/cs.po
+++ b/addons/sale/i18n/cs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:46+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:57+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 "X-Poedit-Language: Czech\n"
 
 #. module: sale
@@ -1103,7 +1103,7 @@ msgid "Document of the move to the output or to the customer."
 msgstr "Dokument přesunu na výstup nebo k zákazníkovi"
 
 #. module: sale
-#: model:email.template,body_text:sale.email_template_edi_sale
+#: model:email.template,body:sale.email_template_edi_sale
 msgid ""
 "\n"
 "Hello${object.partner_order_id.name and ' ' or "
diff --git a/addons/sale/i18n/da.po b/addons/sale/i18n/da.po
index 8b8131a35d2..b368a2a0fa8 100644
--- a/addons/sale/i18n/da.po
+++ b/addons/sale/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:46+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:57+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: sale
 #: field:sale.config.picking_policy,timesheet:0
@@ -1102,7 +1102,7 @@ msgid "Document of the move to the output or to the customer."
 msgstr ""
 
 #. module: sale
-#: model:email.template,body_text:sale.email_template_edi_sale
+#: model:email.template,body:sale.email_template_edi_sale
 msgid ""
 "\n"
 "Hello${object.partner_order_id.name and ' ' or "
diff --git a/addons/sale/i18n/de.po b/addons/sale/i18n/de.po
index 32fbad8a772..ccc728a1bb6 100644
--- a/addons/sale/i18n/de.po
+++ b/addons/sale/i18n/de.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:46+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:57+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: sale
 #: field:sale.config.picking_policy,timesheet:0
@@ -338,6 +338,19 @@ msgid ""
 "  - The 'Invoice based on deliveries' choice is used to create an invoice "
 "during the picking process."
 msgstr ""
+"Die Regeln zur Rechnungserstellung stimmen Rechnungs- und "
+"Lieferscheinerstellung ab.\n"
+"  - \"Zahlung vor Auslieferung\" erstellt zuerst die Rechnung. Der "
+"Lieferschein, und damit die Kommissionierung, erfolgen erst nach "
+"Zahlungseingang.\n"
+"  - \"Kommissionierung & Rechnung aus Abruf\" erstellt sofort einen "
+"Lieferschein zur (Vor-)Kommissionierung. Danach wird auf den manuellen "
+"Rechnungsentwurf gemäss Verkaufsauftrag oder Auftragspositionen gewartet.\n"
+"  - Bei \"Rechnungserstellung nach Auslieferung\" erfolgt die "
+"Rechnungsstellung erst nach erfolgreicher Auslieferung aller "
+"Teillieferungen.\n"
+"  - \"Rechnung bei Kommissionierung\" erstellt im Moment der "
+"Kommissionierung eine zugehörige Rechnung."
 
 #. module: sale
 #: code:addons/sale/sale.py:1171
@@ -898,6 +911,14 @@ msgid ""
 "The 'Waiting Schedule' state is set when the invoice is confirmed but "
 "waiting for the scheduler to run on the order date."
 msgstr ""
+"Liefert den Status der Angebotsanfrage oder der Verkaufsauftrags.\n"
+"Der Ausnahme-Status wird bei Abbruch eines Vorgangs automatisch gesetzt. Bei "
+"Rechnungsprüfung wird einem Rechnungsabbruch folgend und bei "
+"Kommissionierungsfehlern oder Auslieferungsfehlern der Lieferungsabbruch zu "
+"dieser Ausnahme führen.\n"
+"Der Zustand \"Warte auf Terminierung\" wird erreicht, wenn eine Rechnung "
+"zwar erstellt und bestätigt wurde, aber die Auftrags-Terminierung diesen "
+"Auftrag noch nicht abgearbeitet hat."
 
 #. module: sale
 #: code:addons/sale/sale.py:1272
@@ -1163,7 +1184,7 @@ msgid "Document of the move to the output or to the customer."
 msgstr "Beleg für Warenversand oder Auslieferung"
 
 #. module: sale
-#: model:email.template,body_text:sale.email_template_edi_sale
+#: model:email.template,body:sale.email_template_edi_sale
 msgid ""
 "\n"
 "Hello${object.partner_order_id.name and ' ' or "
@@ -1299,6 +1320,9 @@ msgid ""
 "create a task, purchase order or manufacturing order linked to this sale "
 "order line."
 msgstr ""
+"Wenn \"Auf Abruf\", so wird eine Beschaffung ausgelöst sobald der "
+"Verkaufsauftrag bestätigt wurde. Somit wird eine Anforderung zum Einkauf "
+"oder eine Fertigung erzeugt."
 
 #. module: sale
 #: field:sale.advance.payment.inv,amount:0
@@ -1450,6 +1474,10 @@ msgid ""
 "Here is a proposition of quantities according to the packaging:\n"
 "EAN: %s Quantity: %s Type of ul: %s"
 msgstr ""
+"Sie haben die Anzahl von %d Einheiten gewählt.\n"
+"Dies ist mit der ausgewählten Verpackung nicht vereinbar.\n"
+"Ein Vorschlag der Verpackung entsprechend wäre:\n"
+"EAN: %s  Anzahl: %s  Art: %s"
 
 #. module: sale
 #: view:sale.order:0
diff --git a/addons/sale/i18n/el.po b/addons/sale/i18n/el.po
index a7f11600fc1..54ce749d11e 100644
--- a/addons/sale/i18n/el.po
+++ b/addons/sale/i18n/el.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:46+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:57+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: sale
 #: field:sale.config.picking_policy,timesheet:0
@@ -1108,7 +1108,7 @@ msgid "Document of the move to the output or to the customer."
 msgstr ""
 
 #. module: sale
-#: model:email.template,body_text:sale.email_template_edi_sale
+#: model:email.template,body:sale.email_template_edi_sale
 msgid ""
 "\n"
 "Hello${object.partner_order_id.name and ' ' or "
diff --git a/addons/sale/i18n/es.po b/addons/sale/i18n/es.po
index 23ba9ea96ef..969fff34188 100644
--- a/addons/sale/i18n/es.po
+++ b/addons/sale/i18n/es.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:47+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:58+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: sale
 #: field:sale.config.picking_policy,timesheet:0
@@ -1149,7 +1149,7 @@ msgid "Document of the move to the output or to the customer."
 msgstr "Documento del movimiento a la salida o al cliente."
 
 #. module: sale
-#: model:email.template,body_text:sale.email_template_edi_sale
+#: model:email.template,body:sale.email_template_edi_sale
 msgid ""
 "\n"
 "Hello${object.partner_order_id.name and ' ' or "
diff --git a/addons/sale/i18n/es_AR.po b/addons/sale/i18n/es_AR.po
index 3964c85e1e5..79290addc6c 100644
--- a/addons/sale/i18n/es_AR.po
+++ b/addons/sale/i18n/es_AR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:47+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:58+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: sale
 #: field:sale.config.picking_policy,timesheet:0
@@ -1095,7 +1095,7 @@ msgid "Document of the move to the output or to the customer."
 msgstr ""
 
 #. module: sale
-#: model:email.template,body_text:sale.email_template_edi_sale
+#: model:email.template,body:sale.email_template_edi_sale
 msgid ""
 "\n"
 "Hello${object.partner_order_id.name and ' ' or "
diff --git a/addons/sale/i18n/es_CL.po b/addons/sale/i18n/es_CL.po
index b45af002e9e..ef73d4445ad 100644
--- a/addons/sale/i18n/es_CL.po
+++ b/addons/sale/i18n/es_CL.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:47+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:58+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: sale
 #: field:sale.config.picking_policy,timesheet:0
@@ -1144,7 +1144,7 @@ msgid "Document of the move to the output or to the customer."
 msgstr "Documento del movimiento a la salida o al cliente."
 
 #. module: sale
-#: model:email.template,body_text:sale.email_template_edi_sale
+#: model:email.template,body:sale.email_template_edi_sale
 msgid ""
 "\n"
 "Hello${object.partner_order_id.name and ' ' or "
diff --git a/addons/sale/i18n/es_CR.po b/addons/sale/i18n/es_CR.po
index 6bf2f92f22e..c50f084e181 100644
--- a/addons/sale/i18n/es_CR.po
+++ b/addons/sale/i18n/es_CR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:47+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:58+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 "Language: \n"
 
 #. module: sale
@@ -1176,7 +1176,7 @@ msgid "Document of the move to the output or to the customer."
 msgstr "Documento del movimiento a la salida o al cliente."
 
 #. module: sale
-#: model:email.template,body_text:sale.email_template_edi_sale
+#: model:email.template,body:sale.email_template_edi_sale
 msgid ""
 "\n"
 "Hello${object.partner_order_id.name and ' ' or "
diff --git a/addons/sale/i18n/es_EC.po b/addons/sale/i18n/es_EC.po
index 5e00d1d5790..836615b8649 100644
--- a/addons/sale/i18n/es_EC.po
+++ b/addons/sale/i18n/es_EC.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:47+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:58+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: sale
 #: field:sale.config.picking_policy,timesheet:0
@@ -1110,7 +1110,7 @@ msgid "Document of the move to the output or to the customer."
 msgstr "Documento del movimiento de la salida o del cliente."
 
 #. module: sale
-#: model:email.template,body_text:sale.email_template_edi_sale
+#: model:email.template,body:sale.email_template_edi_sale
 msgid ""
 "\n"
 "Hello${object.partner_order_id.name and ' ' or "
diff --git a/addons/sale/i18n/es_MX.po.moved b/addons/sale/i18n/es_MX.po.moved
deleted file mode 100644
index cb43f04eb09..00000000000
--- a/addons/sale/i18n/es_MX.po.moved
+++ /dev/null
@@ -1,1987 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* sale
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.2\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2011-07-05 15:17+0000\n"
-"PO-Revision-Date: 2011-07-05 15:17+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: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_sales_by_salesman
-msgid "Sales by Salesman in last 90 days"
-msgstr "Ventas por vendedor últimos 90 días"
-
-#. module: sale
-#: help:sale.installer,delivery:0
-msgid "Allows you to compute delivery costs on your quotations."
-msgstr "Le permite calcular los costos de envío en sus presupuestos."
-
-#. module: sale
-#: help:sale.order,picking_policy:0
-msgid "If you don't have enough stock available to deliver all at once, do you accept partial shipments or not?"
-msgstr "Si no dispone de suficientes existencias para enviarlo todo de una vez, ¿acepta envíos parciales o no?"
-
-#. module: sale
-#: help:sale.order,partner_shipping_id:0
-msgid "Shipping address for current sales order."
-msgstr "Dirección de envío para el pedido de venta actual."
-
-#. module: sale
-#: field:sale.advance.payment.inv,qtty:0
-#: report:sale.order:0
-msgid "Quantity"
-msgstr "Cantidad"
-
-#. module: sale
-#: view:sale.report:0
-#: field:sale.report,day:0
-msgid "Day"
-msgstr "Día"
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_cancelorder0
-#: view:sale.order:0
-msgid "Cancel Order"
-msgstr "Cancelar pedido"
-
-#. module: sale
-#: view:sale.config.picking_policy:0
-msgid "Configure Sales Order Logistics"
-msgstr "Configurar logística pedidos de venta"
-
-#. module: sale
-#: code:addons/sale/sale.py:603
-#, python-format
-msgid "The quotation '%s' has been converted to a sales order."
-msgstr "El presupuesto '%s' ha sido convertido a un pedido de venta."
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Payment Before Delivery"
-msgstr "Pago antes del envío"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice.py:42
-#, python-format
-msgid "Warning !"
-msgstr "¡Aviso!"
-
-#. module: sale
-#: report:sale.order:0
-msgid "VAT"
-msgstr "IVA"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_saleorderprocurement0
-msgid "Drives procurement orders for every sales order line."
-msgstr "Genera órdenes de abastecimiento para cada línea de pedido de venta."
-
-#. module: sale
-#: selection:sale.config.picking_policy,picking_policy:0
-msgid "All at Once"
-msgstr "Todo a la vez"
-
-#. module: sale
-#: field:sale.order,project_id:0
-#: view:sale.report:0
-#: field:sale.report,analytic_account_id:0
-#: field:sale.shop,project_id:0
-msgid "Analytic Account"
-msgstr "Cuenta analítica"
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.action_order_line_tree2
-msgid "Here is a list of each sales order line to be invoiced. You can invoice sales orders partially, by lines of sales order. You do not need this list if you invoice from the delivery orders or if you invoice sales totally."
-msgstr "Esta es una lista de todas las líneas de pedidos de venta a facturar. Puede facturar pedidos de venta parcialmente, por líneas de pedido. No necesita esta lista si factura desde ordenes de salida o si factura pedidos de venta completos."
-
-#. module: sale
-#: model:process.node,name:sale.process_node_saleprocurement0
-msgid "Procurement Order"
-msgstr "Orden de abastecimiento"
-
-#. module: sale
-#: view:sale.report:0
-#: field:sale.report,partner_id:0
-msgid "Partner"
-msgstr "Empresa"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Order Line"
-msgstr "Línea del pedido"
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.action_order_form
-msgid "Sales Orders help you manage quotations and orders from your customers. OpenERP suggests that you start by creating a quotation. Once it is confirmed, the quotation will be converted into a Sales Order. OpenERP can handle several types of products so that a sales order may trigger tasks, delivery orders, manufacturing orders, purchases and so on. Based on the configuration of the sales order, a draft invoice will be generated so that you just have to confirm it when you want to bill your customer."
-msgstr "Los pedidos de ventas le ayudan a gestionar presupuestos y pedidos de sus clientes. OpenERP sugiere que comience por crear un presupuesto. Una vez esté confirmado, el presupuesto se convertirá en un pedido de venta. OpenERP puede gestionar varios tipos de productos de forma que un pedido de venta puede generar tareas, órdenes de entrega, órdenes de fabricación, compras, etc. Según la configuración del pedido de venta, se generará una factura en borrador de manera que sólo hay que confirmarla cuando se quiera facturar a su cliente."
-
-#. module: sale
-#: help:sale.order,invoice_quantity:0
-msgid "The sale order will automatically create the invoice proposition (draft invoice). Ordered and delivered quantities may not be the same. You have to choose if you want your invoice based on ordered or shipped quantities. If the product is a service, shipped quantities means hours spent on the associated tasks."
-msgstr "El pedido de venta creará automáticamente la proposición de la factura (factura borrador). Las cantidades pedidas y entregadas pueden no ser las mismas. Debe elegir si desea que su factura se base en las cantidades pedidas o entregadas. Si el producto es un servicio, las cantidades enviadas son las horas dedicadas a las tareas asociadas."
-
-#. module: sale
-#: field:sale.shop,payment_default_id:0
-msgid "Default Payment Term"
-msgstr "Plazo de pago por defecto"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_config_picking_policy
-msgid "Configure Picking Policy for Sales Order"
-msgstr "Configurar la política envío para pedidos de venta"
-
-#. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
-#: field:sale.order.line,state:0
-#: view:sale.report:0
-msgid "State"
-msgstr "Estado"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Disc.(%)"
-msgstr "Desc.(%)"
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_forceassignation0
-msgid "Force Assignation"
-msgstr "Forzar asignación"
-
-#. module: sale
-#: help:sale.make.invoice,grouped:0
-msgid "Check the box to group the invoices for the same customers"
-msgstr "Marque esta opción para agrupar las facturas de los mismos clientes."
-
-#. module: sale
-#: selection:sale.order,invoice_quantity:0
-msgid "Ordered Quantities"
-msgstr "Cantidades ordenadas"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales by Salesman"
-msgstr "Ventas por vendedor"
-
-#. module: sale
-#: field:sale.order.line,move_ids:0
-msgid "Inventory Moves"
-msgstr "Movimientos de inventario"
-
-#. module: sale
-#: field:sale.order,name:0
-#: field:sale.order.line,order_id:0
-msgid "Order Reference"
-msgstr "Referencia del pedido"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Other Information"
-msgstr "Otra información"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Dates"
-msgstr "Fechas"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_invoiceafterdelivery0
-msgid "The invoice is created automatically if the shipping policy is 'Invoice from pick' or 'Invoice on order after delivery'."
-msgstr "La factura se crea de forma automática si la política de facturación es \"Facturar desde la recoleccion\" o \"Facturar pedido después del envío\"."
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_make_invoice
-msgid "Sales Make Invoice"
-msgstr "Ventas. Realizar factura"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Recreate Packing"
-msgstr "Recrear Packing"
-
-#. module: sale
-#: field:sale.order.line,discount:0
-msgid "Discount (%)"
-msgstr "Descuento (%)"
-
-#. module: sale
-#: help:res.company,security_lead:0
-msgid "This is the days added to what you promise to customers for security purpose"
-msgstr "Estos días por razones de seguridad se añaden a los que promete a los clientes."
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.open_board_sales_manager
-#: model:ir.ui.menu,name:sale.menu_board_sales_manager
-msgid "Sales Manager Dashboard"
-msgstr "Tablero responsable ventas"
-
-#. module: sale
-#: field:sale.order.line,product_packaging:0
-msgid "Packaging"
-msgstr "Empaquetado"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_saleinvoice0
-msgid "From a sales order"
-msgstr "Desde un pedido de venta"
-
-#. module: sale
-#: field:sale.shop,name:0
-msgid "Shop Name"
-msgstr "Nombre tienda"
-
-#. module: sale
-#: code:addons/sale/sale.py:1014
-#, python-format
-msgid "No Customer Defined !"
-msgstr "¡No se ha definido un cliente!"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree2
-msgid "Sales in Exception"
-msgstr "Ventas en excepción"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Set to Draft"
-msgstr "Cambiar a borrador"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Conditions"
-msgstr "Condiciones"
-
-#. module: sale
-#: help:sale.order,order_policy:0
-msgid "The Shipping Policy is used to synchronise invoice and delivery operations.\n"
-"  - The 'Pay Before delivery' choice will first generate the invoice and then generate the picking order after the payment of this invoice.\n"
-"  - The 'Shipping & Manual Invoice' will create the picking order directly and wait for the user to manually click on the 'Invoice' button to generate the draft invoice.\n"
-"  - The 'Invoice On Order After Delivery' choice will generate the draft invoice based on sales order after all picking lists have been finished.\n"
-"  - The 'Invoice From The Picking' choice is used to create an invoice during the picking process."
-msgstr "La política de envío se utiliza para sincronizar las operaciones de envío y facturación.\n"
-"  -La opción 'Pagar antes del envío' primero generará la factura y más tarde la orden después del pago de dicha factura.\n"
-"  -La opción 'Envío y factura manual' creará la orden directamente y esperará a que un usuario haga clic manualemente sobre el botón 'Facturar' para generar la factura en el estado borrador.\n"
-"  -La opción 'Facturar pedido después del envío' generará la factura en estado borrador basándose en el pedido de venta después de que todas las ordenes hayan sido realizadas.\n"
-"  -La opción 'Facturar desde orden' se utiliza para crear una factura durante el proceso de preparación del pedido."
-
-#. module: sale
-#: code:addons/sale/sale.py:939
-#, python-format
-msgid "There is no income category account defined in default Properties for Product Category or Fiscal Position is not defined !"
-msgstr "¡No hay ninguna cuenta de categoría de ingresos definida en las propiedades por defecto de la categoría del producto o la posición fiscal no está definida!"
-
-#. module: sale
-#: view:sale.installer:0
-msgid "Configure"
-msgstr "Configurar"
-
-#. module: sale
-#: constraint:stock.move:0
-msgid "You try to assign a lot which is not from the same product"
-msgstr "Está intentando asignar un lote que no es del mismo producto"
-
-#. module: sale
-#: code:addons/sale/sale.py:620
-#, python-format
-msgid "invalid mode for test_state"
-msgstr "Modo no válido para test_state"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "June"
-msgstr "Junio"
-
-#. module: sale
-#: code:addons/sale/sale.py:584
-#, python-format
-msgid "Could not cancel this sales order !"
-msgstr "¡No se puede cancelar este pedido de venta!"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_report
-msgid "Sales Orders Statistics"
-msgstr "Estadísticas pedidos de venta"
-
-#. module: sale
-#: help:sale.order,project_id:0
-msgid "The analytic account related to a sales order."
-msgstr "La cuenta analítica relacionada con un pedido de venta."
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "October"
-msgstr "Octubre"
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
-#: view:sale.order:0
-#: view:sale.report:0
-msgid "Quotations"
-msgstr "Presupuestos"
-
-#. module: sale
-#: help:sale.order,pricelist_id:0
-msgid "Pricelist for current sales order."
-msgstr "Tarifa para el pedido de venta actual."
-
-#. module: sale
-#: selection:sale.config.picking_policy,step:0
-msgid "Delivery Order Only"
-msgstr "Sólo orden de entrega"
-
-#. module: sale
-#: report:sale.order:0
-msgid "TVA :"
-msgstr "IVA :"
-
-#. module: sale
-#: help:sale.order.line,delay:0
-msgid "Number of days between the order confirmation the shipping of the products to the customer"
-msgstr "Número de días entre la confirmación del pedido y el envío de los productos al cliente."
-
-#. module: sale
-#: report:sale.order:0
-msgid "Quotation Date"
-msgstr "Fecha presupuesto"
-
-#. module: sale
-#: field:sale.order,fiscal_position:0
-msgid "Fiscal Position"
-msgstr "Posición fiscal"
-
-#. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
-msgid "UoM"
-msgstr "UdM"
-
-#. module: sale
-#: field:sale.order.line,number_packages:0
-msgid "Number Packages"
-msgstr "Número paquetes"
-
-#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.report,state:0
-msgid "In Progress"
-msgstr "En proceso"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_confirmquotation0
-msgid "The salesman confirms the quotation. The state of the sales order becomes 'In progress' or 'Manual in progress'."
-msgstr "El vendedor confirma el presupuesto. El estado del pedido de venta se convierte 'En proceso' o 'Manual en proceso'."
-
-#. module: sale
-#: code:addons/sale/sale.py:971
-#, python-format
-msgid "You must first cancel stock moves attached to this sales order line."
-msgstr "Debe cancelar primero los movimientos de stock asociados a esta línea de pedido de venta."
-
-#. module: sale
-#: code:addons/sale/sale.py:1042
-#, python-format
-msgid "(n/a)"
-msgstr "(n/a)"
-
-#. module: sale
-#: help:sale.advance.payment.inv,product_id:0
-msgid "Select a product of type service which is called 'Advance Product'. You may have to create it and set it as a default value on this field."
-msgstr "Seleccione un producto del tipo de servicio que se llama 'Producto avanzado'. Puede que tenga que crearlo y configurarlo como un valor por defecto para este campo."
-
-#. module: sale
-#: report:sale.order:0
-msgid "Tel. :"
-msgstr "Tel. :"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:64
-#, python-format
-msgid "You cannot make an advance on a sales order                              that is defined as 'Automatic Invoice after delivery'."
-msgstr "No puede realizar un anticipo de un pedido de venta que está definido como 'Factura automática después envío'."
-
-#. module: sale
-#: view:sale.order:0
-#: field:sale.order,note:0
-#: view:sale.order.line:0
-#: field:sale.order.line,notes:0
-msgid "Notes"
-msgstr "Notas"
-
-#. module: sale
-#: help:sale.order,partner_invoice_id:0
-msgid "Invoice address for current sales order."
-msgstr "Dirección de facturación para el pedido de venta actual."
-
-#. module: sale
-#: view:sale.installer:0
-msgid "Enhance your core Sales Application with additional functionalities."
-msgstr "Optimizar su aplicación de ventas con funcionalidades adicionales."
-
-#. module: sale
-#: field:sale.order,invoiced_rate:0
-#: field:sale.order.line,invoiced:0
-msgid "Invoiced"
-msgstr "Facturado"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_deliveryorder0
-msgid "Delivery Order"
-msgstr "Orden de entrega"
-
-#. module: sale
-#: field:sale.order,date_confirm:0
-msgid "Confirmation Date"
-msgstr "Fecha confirmación"
-
-#. module: sale
-#: field:sale.order.line,address_allotment_id:0
-msgid "Allotment Partner"
-msgstr "Ubicación empresa"
-
-#. module: sale
-#: sql_constraint:sale.order:0
-msgid "Order Reference must be unique !"
-msgstr "¡La referencia del pedido debe ser única!"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "March"
-msgstr "Marzo"
-
-#. module: sale
-#: help:sale.order,amount_total:0
-msgid "The total amount."
-msgstr "El importe total."
-
-#. module: sale
-#: field:sale.order.line,price_subtotal:0
-msgid "Subtotal"
-msgstr "Subtotal"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Invoice address :"
-msgstr "Dirección de factura :"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_saleorderprocurement0
-msgid "For every sales order line, a procurement order is created to supply the sold product."
-msgstr "Para cada línea de pedido de venta, se crea una orden de abastecimiento para suministrar el producto vendido."
-
-#. module: sale
-#: help:sale.order,incoterm:0
-msgid "Incoterm which stands for 'International Commercial terms' implies its a series of sales terms which are used in the commercial transaction."
-msgstr "Incoterm, que significa 'Términos de Comercio Internacional', implica una serie de condiciones de venta que se utilizan en la transacción comercial."
-
-#. module: sale
-#: field:sale.order,partner_invoice_id:0
-msgid "Invoice Address"
-msgstr "Dirección de factura"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Search Uninvoiced Lines"
-msgstr "Buscar líneas no facturadas"
-
-#. module: sale
-#: model:ir.actions.report.xml,name:sale.report_sale_order
-msgid "Quotation / Order"
-msgstr "Presupuesto / Pedido"
-
-#. module: sale
-#: view:sale.report:0
-#: field:sale.report,nbr:0
-msgid "# of Lines"
-msgstr "# de líneas"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_open_invoice
-msgid "Sales Open Invoice"
-msgstr "Ventas. Abrir factura"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_order_line
-#: field:stock.move,sale_line_id:0
-msgid "Sales Order Line"
-msgstr "Línea pedido de venta"
-
-#. module: sale
-#: view:sale.config.picking_policy:0
-msgid "Setup your sales workflow and default values."
-msgstr "Configurar su flujo de ventas y valores por defecto."
-
-#. module: sale
-#: field:sale.shop,warehouse_id:0
-msgid "Warehouse"
-msgstr "Almacén"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Order N°"
-msgstr "Pedido Nº"
-
-#. module: sale
-#: field:sale.order,order_line:0
-msgid "Order Lines"
-msgstr "Líneas del pedido"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Untaxed amount"
-msgstr "Monto sin impuestos"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_tree2
-#: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
-msgid "Lines to Invoice"
-msgstr "Líneas a facturar"
-
-#. module: sale
-#: field:sale.order.line,product_uom_qty:0
-msgid "Quantity (UoM)"
-msgstr "Cantidad (UdM)"
-
-#. module: sale
-#: field:sale.order,create_date:0
-msgid "Creation Date"
-msgstr "Fecha de creación"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_tree3
-msgid "Uninvoiced and Delivered Lines"
-msgstr "Líneas no facturadas y entregadas"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Total :"
-msgstr "Total :"
-
-#. module: sale
-#: view:sale.report:0
-msgid "My Sales"
-msgstr "Mis ventas"
-
-#. module: sale
-#: code:addons/sale/sale.py:290
-#: code:addons/sale/sale.py:966
-#: code:addons/sale/sale.py:1165
-#, python-format
-msgid "Invalid action !"
-msgstr "¡Acción no válida!"
-
-#. module: sale
-#: field:sale.order,pricelist_id:0
-#: field:sale.report,pricelist_id:0
-#: field:sale.shop,pricelist_id:0
-msgid "Pricelist"
-msgstr "Lista de precios"
-
-#. module: sale
-#: view:sale.report:0
-#: field:sale.report,product_uom_qty:0
-msgid "# of Qty"
-msgstr "Nº de ctdad"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Order Date"
-msgstr "Fecha pedido"
-
-#. module: sale
-#: view:sale.order.line:0
-#: field:sale.report,shipped:0
-msgid "Shipped"
-msgstr "Enviado"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree5
-msgid "All Quotations"
-msgstr "Todos los presupuestos"
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Invoice On Order After Delivery"
-msgstr "Facturar pedido después de envío"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "September"
-msgstr "Septiembre"
-
-#. module: sale
-#: view:sale.report:0
-#: field:sale.report,categ_id:0
-msgid "Category of Product"
-msgstr "Categoría de producto"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Taxes :"
-msgstr "Impuestos :"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Stock Moves"
-msgstr "Movimientos de stock"
-
-#. module: sale
-#: view:sale.report:0
-msgid "  Year  "
-msgstr "  Año  "
-
-#. module: sale
-#: field:sale.order,state:0
-#: field:sale.report,state:0
-msgid "Order State"
-msgstr "Estado del pedido"
-
-#. module: sale
-#: view:sale.make.invoice:0
-#: view:sale.order.line.make.invoice:0
-msgid "Do you really want to create the invoice(s)?"
-msgstr "¿Desea crear la(s) factura(s)?"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales By Month"
-msgstr "Ventas por mes"
-
-#. module: sale
-#: code:addons/sale/sale.py:970
-#, python-format
-msgid "Could not cancel sales order line!"
-msgstr "¡No se puede cancelar línea pedido de venta!"
-
-#. module: sale
-#: field:res.company,security_lead:0
-msgid "Security Days"
-msgstr "Días seguridad"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_saleorderprocurement0
-msgid "Procurement of sold material"
-msgstr "Abastecimiento de material vendido"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Create Final Invoice"
-msgstr "Crear factura final"
-
-#. module: sale
-#: field:sale.order,partner_shipping_id:0
-msgid "Shipping Address"
-msgstr "Dirección de envío"
-
-#. module: sale
-#: help:sale.order,shipped:0
-msgid "It indicates that the sales order has been delivered. This field is updated only after the scheduler(s) have been launched."
-msgstr "Indica que el pedido de venta ha sido entregado. Este campo se actualiza sólo después que el planificador(es) se ha ejecutado."
-
-#. module: sale
-#: view:sale.report:0
-msgid "Extended Filters..."
-msgstr "Filtros extendidos..."
-
-#. module: sale
-#: model:ir.module.module,description:sale.module_meta_information
-msgid "\n"
-"    The base module to manage quotations and sales orders.\n"
-"\n"
-"    * Workflow with validation steps:\n"
-"        - Quotation -> Sales order -> Invoice\n"
-"    * Invoicing methods:\n"
-"        - Invoice on order (before or after shipping)\n"
-"        - Invoice on delivery\n"
-"        - Invoice on timesheets\n"
-"        - Advance invoice\n"
-"    * Partners preferences (shipping, invoicing, incoterm, ...)\n"
-"    * Products stocks and prices\n"
-"    * Delivery methods:\n"
-"        - all at once, multi-parcel\n"
-"        - delivery costs\n"
-"    * Dashboard for salesman that includes:\n"
-"    * Your open quotations\n"
-"    * Top 10 sales of the month\n"
-"    * Cases statistics\n"
-"    * Graph of sales by product\n"
-"    * Graph of cases of the month\n"
-"    "
-msgstr "\n"
-"    El módulo base para gestionar presupuestos y pedidos de venta.\n"
-"\n"
-"    * Flujo de trabajo con etapas de validación:\n"
-"        - Presupuesto -> Pedido de venta -> Factura\n"
-"    * Métodos de facturación:\n"
-"        - Factura del pedido (antes o después del envío)\n"
-"        - Factura de la orden\n"
-"        - Factura de la hoja de servicios\n"
-"        - Avanzar factura\n"
-"    * Preferencias de los clientes (envío, facturación, incoterm, ...)\n"
-"    * Existencias de los productos y precios\n"
-"    * Formas de envío:\n"
-"        - Todo a la vez, En varios paquetes\n"
-"        - Gastos de envío\n"
-"    * El tablero para el comercial incluye:\n"
-"    * Sus presupuestos abiertos\n"
-"    * Las 10 mejores ventas del mes\n"
-"    * Estadísticas de casos\n"
-"    * Gráfico de las ventas por producto\n"
-"    * Gráfico de los casos por mes\n"
-"    "
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_shop
-#: view:sale.shop:0
-msgid "Sales Shop"
-msgstr "Tienda ventas"
-
-#. module: sale
-#: model:ir.model,name:sale.model_res_company
-msgid "Companies"
-msgstr "Compañías"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "November"
-msgstr "Noviembre"
-
-#. module: sale
-#: view:sale.order:0
-msgid "History"
-msgstr "Historial"
-
-#. module: sale
-#: field:sale.config.picking_policy,picking_policy:0
-msgid "Picking Default Policy"
-msgstr "Política de empaquetado por defecto"
-
-#. module: sale
-#: help:sale.order,invoice_ids:0
-msgid "This is the list of invoices that have been generated for this sales order. The same sales order may have been invoiced in several times (by line for example)."
-msgstr "Esta es la lista de facturas que han sido generadas para este pedido de venta. El mismo pedido de venta puede haber sido facturado varias veces (línea a línea, por ejemplo)."
-
-#. module: sale
-#: report:sale.order:0
-msgid "Your Reference"
-msgstr "Su referencia"
-
-#. module: sale
-#: help:sale.order,partner_order_id:0
-msgid "The name and address of the contact who requested the order or quotation."
-msgstr "El nombre y la dirección del contacto que ha solicitado el pedido o presupuesto."
-
-#. module: sale
-#: code:addons/sale/sale.py:966
-#, python-format
-msgid "You cannot cancel a sales order line that has already been invoiced !"
-msgstr "¡No puede cancelar una línea de pedido de venta que ya ha sido facturada!"
-
-#. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
-msgid "Qty"
-msgstr "Ctdad"
-
-#. module: sale
-#: view:sale.order:0
-msgid "References"
-msgstr "Referencias"
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_cancel0
-#: model:process.transition.action,name:sale.process_transition_action_cancel1
-#: model:process.transition.action,name:sale.process_transition_action_cancel2
-#: view:sale.advance.payment.inv:0
-#: view:sale.make.invoice:0
-#: view:sale.order.line:0
-#: view:sale.order.line.make.invoice:0
-msgid "Cancel"
-msgstr "Cancelar"
-
-#. module: sale
-#: field:sale.installer,sale_order_dates:0
-msgid "Sales Order Dates"
-msgstr "Fechas en pedidos de venta"
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Exception"
-msgstr "Excepción"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_invoice0
-#: model:process.transition,name:sale.process_transition_invoiceafterdelivery0
-#: model:process.transition.action,name:sale.process_transition_action_createinvoice0
-#: view:sale.advance.payment.inv:0
-#: view:sale.order.line:0
-msgid "Create Invoice"
-msgstr "Crear factura"
-
-#. module: sale
-#: field:sale.installer,sale_margin:0
-msgid "Margins in Sales Orders"
-msgstr "Márgenes en pedidos de venta"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Total Tax Excluded"
-msgstr "Total sin impuestos"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Compute"
-msgstr "Calcular"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales by Partner"
-msgstr "Ventas por empresa"
-
-#. module: sale
-#: field:sale.order,partner_order_id:0
-msgid "Ordering Contact"
-msgstr "Contacto del pedido"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_view_sale_open_invoice
-#: view:sale.open.invoice:0
-msgid "Open Invoice"
-msgstr "Abrir factura"
-
-#. module: sale
-#: report:sale.order:0
-#: view:sale.order.line:0
-msgid "Price"
-msgstr "Precio"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_sale_installer
-#: view:sale.config.picking_policy:0
-#: view:sale.installer:0
-msgid "Sales Application Configuration"
-msgstr "Configuración aplicaciones de ventas"
-
-#. module: sale
-#: view:sale.report:0
-#: field:sale.report,price_total:0
-msgid "Total Price"
-msgstr "Precio total"
-
-#. module: sale
-#: selection:sale.order.line,type:0
-msgid "on order"
-msgstr "bajo pedido"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_invoiceafterdelivery0
-msgid "Based on the shipped or on the ordered quantities."
-msgstr "Basado en las cantidades enviadas o ordenadas."
-
-#. module: sale
-#: field:sale.order,picking_ids:0
-msgid "Related Picking"
-msgstr "Orden relacionada"
-
-#. module: sale
-#: field:sale.config.picking_policy,name:0
-msgid "Name"
-msgstr "Nombre"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Shipping address :"
-msgstr "Dirección de envío :"
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_sales_by_partner
-msgid "Sales per Customer in last 90 days"
-msgstr "Ventas por cliente últimos 90 días"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_quotation0
-msgid "Draft state of sales order"
-msgstr "Estado borrador del pedido de venta"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_deliver0
-msgid "Create Delivery Order"
-msgstr "Crear orden de entrega"
-
-#. module: sale
-#: field:sale.installer,delivery:0
-msgid "Delivery Costs"
-msgstr "Costes de envío"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Total Tax Included"
-msgstr "Total impuestos incluidos"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_packing0
-msgid "Create Pick List"
-msgstr "Crear lista empaque"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales by Product Category"
-msgstr "Ventas por categoría de producto"
-
-#. module: sale
-#: selection:sale.order,picking_policy:0
-msgid "Partial Delivery"
-msgstr "Envío parcial"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_confirmquotation0
-msgid "Confirm Quotation"
-msgstr "Confirmar presupuesto"
-
-#. module: sale
-#: help:sale.order,origin:0
-msgid "Reference of the document that generated this sales order request."
-msgstr "Referencia del documento que ha generado esta solicitud de pedido de venta."
-
-#. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
-#: view:sale.report:0
-msgid "Group By..."
-msgstr "Agrupar por..."
-
-#. module: sale
-#: view:sale.order:0
-msgid "Recreate Invoice"
-msgstr "Volver a Crear factura"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.outgoing_picking_list_to_invoice
-#: model:ir.ui.menu,name:sale.menu_action_picking_list_to_invoice
-msgid "Deliveries to Invoice"
-msgstr "Ordenes a facturar"
-
-#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.report,state:0
-msgid "Waiting Schedule"
-msgstr "Esperando fecha planificada"
-
-#. module: sale
-#: field:sale.order.line,type:0
-msgid "Procurement Method"
-msgstr "Método abastecimiento"
-
-#. module: sale
-#: view:sale.config.picking_policy:0
-#: view:sale.installer:0
-msgid "title"
-msgstr "título"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_packinglist0
-msgid "Pick List"
-msgstr "Lista de empaque"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Order date"
-msgstr "Fecha pedido"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_packinglist0
-msgid "Document of the move to the output or to the customer."
-msgstr "Documento del movimiento a la salida o al cliente."
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_validate0
-msgid "Validate"
-msgstr "Validar"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Confirm Order"
-msgstr "Confirmar pedido"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_saleprocurement0
-msgid "Create Procurement Order"
-msgstr "Crear orden de abastecimiento"
-
-#. module: sale
-#: view:sale.order:0
-#: field:sale.order,amount_tax:0
-#: field:sale.order.line,tax_id:0
-msgid "Taxes"
-msgstr "Impuestos"
-
-#. module: sale
-#: field:sale.order,order_policy:0
-msgid "Shipping Policy"
-msgstr "Política de facturación"
-
-#. module: sale
-#: help:sale.order,create_date:0
-msgid "Date on which sales order is created."
-msgstr "Fecha en la que se crea el pedido de venta."
-
-#. module: sale
-#: model:ir.model,name:sale.model_stock_move
-msgid "Stock Move"
-msgstr "Movimiento stock"
-
-#. module: sale
-#: view:sale.make.invoice:0
-#: view:sale.order.line.make.invoice:0
-msgid "Create Invoices"
-msgstr "Crear facturas"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Extra Info"
-msgstr "Información extra"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Fax :"
-msgstr "Fax :"
-
-#. module: sale
-#: field:sale.advance.payment.inv,amount:0
-msgid "Advance Amount"
-msgstr "Importe avanzado"
-
-#. module: sale
-#: selection:sale.order,invoice_quantity:0
-msgid "Shipped Quantities"
-msgstr "Cantidades enviadas"
-
-#. module: sale
-#: selection:sale.config.picking_policy,order_policy:0
-msgid "Invoice Based on Sales Orders"
-msgstr "Factura basada en pedidos de venta"
-
-#. module: sale
-#: model:ir.model,name:sale.model_stock_picking
-msgid "Picking List"
-msgstr "Lista de empaque"
-
-#. module: sale
-#: code:addons/sale/sale.py:387
-#: code:addons/sale/sale.py:920
-#: code:addons/sale/sale.py:938
-#, python-format
-msgid "Error !"
-msgstr "¡Error!"
-
-#. module: sale
-#: code:addons/sale/sale.py:570
-#, python-format
-msgid "Could not cancel sales order !"
-msgstr "¡No se puede cancelar el pedido de venta!"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "July"
-msgstr "Julio"
-
-#. module: sale
-#: field:sale.order.line,procurement_id:0
-msgid "Procurement"
-msgstr "Abastecimiento"
-
-#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.report,state:0
-msgid "Shipping Exception"
-msgstr "Excepción de envío"
-
-#. module: sale
-#: field:sale.make.invoice,grouped:0
-msgid "Group the invoices"
-msgstr "Agrupar las facturas"
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Shipping & Manual Invoice"
-msgstr "Enviar & Factura manual"
-
-#. module: sale
-#: code:addons/sale/sale.py:1051
-#, python-format
-msgid "Picking Information !"
-msgstr "¡Información de la Lista de empaque!"
-
-#. module: sale
-#: view:sale.report:0
-#: field:sale.report,month:0
-msgid "Month"
-msgstr "Mes"
-
-#. module: sale
-#: model:ir.module.module,shortdesc:sale.module_meta_information
-msgid "Sales Management"
-msgstr "Ventas"
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Invoice From The Picking"
-msgstr "Factura desde la orden"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_invoice0
-msgid "To be reviewed by the accountant."
-msgstr "Para ser revisado por el contador."
-
-#. module: sale
-#: view:sale.report:0
-#: field:sale.report,uom_name:0
-msgid "Reference UoM"
-msgstr "Referencia UdM"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_order_line_make_invoice
-msgid "Sale OrderLine Make_invoice"
-msgstr "Venta Línea_pedido Realizar_factura"
-
-#. module: sale
-#: help:sale.config.picking_policy,step:0
-msgid "By default, OpenERP is able to manage complex routing and paths of products in your warehouse and partner locations. This will configure the most common and simple methods to deliver products to the customer in one or two operations by the worker."
-msgstr "Por defecto, OpenERP es capaz de gestionar complejas rutas y caminos de los productos en su almacén y en las ubicaciones de otras empresas. Esto configurará los métodos más comunes y sencillos para entregar los productos al cliente en una o dos operaciones realizadas por el trabajador."
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree
-msgid "Old Quotations"
-msgstr "Presupuestos antiguos"
-
-#. module: sale
-#: field:sale.order,invoiced:0
-msgid "Paid"
-msgstr "Pagado"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_report_all
-#: model:ir.ui.menu,name:sale.menu_report_product_all
-#: view:sale.report:0
-msgid "Sales Analysis"
-msgstr "Análisis de ventas"
-
-#. module: sale
-#: field:sale.order.line,property_ids:0
-msgid "Properties"
-msgstr "Propiedades"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_quotation0
-#: selection:sale.order,state:0
-#: selection:sale.report,state:0
-msgid "Quotation"
-msgstr "Presupuesto"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_invoice0
-msgid "The Salesman creates an invoice manually, if the sales order shipping policy is 'Shipping and Manual in Progress'. The invoice is created automatically if the shipping policy is 'Payment before Delivery'."
-msgstr "El vendedor crea una factura manualmente si la política de facturación del pedido de venta es \"Envío y Factura manual\". La factura se crea de forma automática si la política de facturación es 'Pago antes del envío'."
-
-#. module: sale
-#: help:sale.config.picking_policy,order_policy:0
-msgid "You can generate invoices based on sales orders or based on shippings."
-msgstr "Puede generar facturas basadas en pedidos de venta o basadas en envíos."
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
-#: model:process.process,name:sale.process_process_salesprocess0
-#: view:sale.order:0
-#: view:sale.report:0
-msgid "Sales"
-msgstr "Ventas"
-
-#. module: sale
-#: report:sale.order:0
-#: field:sale.order.line,price_unit:0
-msgid "Unit Price"
-msgstr "Precio unidad"
-
-#. module: sale
-#: selection:sale.order,state:0
-#: view:sale.order.line:0
-#: selection:sale.order.line,state:0
-#: selection:sale.report,state:0
-msgid "Done"
-msgstr "Realizado"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_installer
-msgid "sale.installer"
-msgstr "venta.instalador"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_invoice0
-#: model:process.node,name:sale.process_node_invoiceafterdelivery0
-msgid "Invoice"
-msgstr "Factura"
-
-#. module: sale
-#: code:addons/sale/sale.py:1014
-#, python-format
-msgid "You have to select a customer in the sales form !\n"
-"Please set one customer before choosing a product."
-msgstr "¡Debe seleccionar un cliente en el formulario de ventas!\n"
-"Introduzca un cliente antes de seleccionar un producto."
-
-#. module: sale
-#: selection:sale.config.picking_policy,step:0
-msgid "Picking List & Delivery Order"
-msgstr "Orden y Orden de entrega"
-
-#. module: sale
-#: field:sale.order,origin:0
-msgid "Source Document"
-msgstr "Documento origen"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "To Do"
-msgstr "Para hacer"
-
-#. module: sale
-#: field:sale.order,picking_policy:0
-msgid "Picking Policy"
-msgstr "Política de envío"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_deliveryorder0
-msgid "Document of the move to the customer."
-msgstr "Documento del movimiento al cliente."
-
-#. module: sale
-#: help:sale.order,amount_untaxed:0
-msgid "The amount without tax."
-msgstr "El importe sin impuestos."
-
-#. module: sale
-#: code:addons/sale/sale.py:571
-#, python-format
-msgid "You must first cancel all picking attached to this sales order."
-msgstr "Debe primero cancelar todas las ordenes relacionadas con este pedido de venta."
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_advance_payment_inv
-msgid "Sales Advance Payment Invoice"
-msgstr "Ventas. Anticipo pago factura"
-
-#. module: sale
-#: field:sale.order,incoterm:0
-msgid "Incoterm"
-msgstr "Incoterm"
-
-#. module: sale
-#: view:sale.order.line:0
-#: field:sale.order.line,product_id:0
-#: view:sale.report:0
-#: field:sale.report,product_id:0
-msgid "Product"
-msgstr "Producto"
-
-#. module: sale
-#: model:ir.ui.menu,name:sale.menu_invoiced
-msgid "Invoicing"
-msgstr "Facturación"
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_cancelassignation0
-msgid "Cancel Assignation"
-msgstr "Cancelar asignación"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_config_picking_policy
-msgid "sale.config.picking_policy"
-msgstr "sale.config.picking_policy"
-
-#. module: sale
-#: help:sale.order,state:0
-msgid "Gives the state of the quotation or sales order. \n"
-"The exception state is automatically set when a cancel operation occurs in the invoice validation (Invoice Exception) or in the picking list process (Shipping Exception). \n"
-"The 'Waiting Schedule' state is set when the invoice is confirmed but waiting for the scheduler to run on the date 'Ordered Date'."
-msgstr "Indica el estado del presupuesto o pedido de venta. \n"
-"El estado de excepción se establece automáticamente cuando se produce una operación de cancelación en la validación de factura (excepción de factura) o en el procesado de la orden (excepción de envío). \n"
-"El estado 'Esperando planificación' se establece cuando se confirma la factura, pero está esperando que el planificador la active en la fecha de \"Fecha ordenada\"."
-
-#. module: sale
-#: field:sale.order,invoice_quantity:0
-msgid "Invoice on"
-msgstr "Facturar las"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Date Ordered"
-msgstr "Fecha ordenada"
-
-#. module: sale
-#: field:sale.order.line,product_uos:0
-msgid "Product UoS"
-msgstr "UdV del producto"
-
-#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.report,state:0
-msgid "Manual In Progress"
-msgstr "Manual en proceso"
-
-#. module: sale
-#: field:sale.order.line,product_uom:0
-msgid "Product UoM"
-msgstr "UdM del producto"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Logistic"
-msgstr "Logística"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Order"
-msgstr "Pedido"
-
-#. module: sale
-#: code:addons/sale/sale.py:921
-#, python-format
-msgid "There is no income account defined for this product: \"%s\" (id:%d)"
-msgstr "No se ha definido una cuenta de ingresos para este producto: \"%s\" (id:%d)"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Ignore Exception"
-msgstr "Ignorar excepción"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_saleinvoice0
-msgid "Depending on the Invoicing control of the sales order, the invoice can be based on delivered or on ordered quantities. Thus, a sales order can generates an invoice or a delivery order as soon as it is confirmed by the salesman."
-msgstr "En función del control de facturación de los pedidos de venta, la factura puede estar basada en las cantidades enviadas o vendidas. Por lo tanto, un pedido de venta puede generar una factura o una orden tan pronto como sea confirmada por el vendedor."
-
-#. module: sale
-#: code:addons/sale/sale.py:1116
-#, python-format
-msgid "You plan to sell %.2f %s but you only have %.2f %s available !\n"
-"The real stock is %.2f %s. (without reservations)"
-msgstr "¡Prevé vender %.2f %s pero sólo %.2f %s están disponibles!\n"
-"El stock real es %.2f %s. (sin reservas)"
-
-#. module: sale
-#: view:sale.order:0
-msgid "States"
-msgstr "Estados"
-
-#. module: sale
-#: view:sale.config.picking_policy:0
-msgid "res_config_contents"
-msgstr "res_config_contenidos"
-
-#. module: sale
-#: field:sale.order,client_order_ref:0
-msgid "Customer Reference"
-msgstr "Referencia cliente"
-
-#. module: sale
-#: field:sale.order,amount_total:0
-#: view:sale.order.line:0
-msgid "Total"
-msgstr "Total"
-
-#. module: sale
-#: code:addons/sale/sale.py:388
-#, python-format
-msgid "There is no sales journal defined for this company: \"%s\" (id:%d)"
-msgstr "No se ha definido un diario de ventas para esta compañía: \"%s\" (id:%d)"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_deliver0
-msgid "Depending on the configuration of the location Output, the move between the output area and the customer is done through the Delivery Order manually or automatically."
-msgstr "Dependiendo de la configuración de la ubicación de salida, el movimiento entre la zona de salida y el cliente se realiza a través de la orden de entrega de forma manual o automática."
-
-#. module: sale
-#: code:addons/sale/sale.py:1165
-#, python-format
-msgid "Cannot delete a sales order line which is %s !"
-msgstr "¡No se puede eliminar una línea de pedido de venta que está %s!"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
-#: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
-#: view:sale.order:0
-msgid "Make Invoices"
-msgstr "Realizar facturas"
-
-#. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
-msgid "To Invoice"
-msgstr "Para facturar"
-
-#. module: sale
-#: help:sale.order,date_confirm:0
-msgid "Date on which sales order is confirmed."
-msgstr "Fecha en la que se confirma el pedido de venta."
-
-#. module: sale
-#: field:sale.order,company_id:0
-#: field:sale.order.line,company_id:0
-#: view:sale.report:0
-#: field:sale.report,company_id:0
-#: field:sale.shop,company_id:0
-msgid "Company"
-msgstr "Compañía"
-
-#. module: sale
-#: field:sale.make.invoice,invoice_date:0
-msgid "Invoice Date"
-msgstr "Fecha factura"
-
-#. module: sale
-#: help:sale.advance.payment.inv,amount:0
-msgid "The amount to be invoiced in advance."
-msgstr "El importe a facturar por adelantado."
-
-#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.report,state:0
-msgid "Invoice Exception"
-msgstr "Excepción de factura"
-
-#. module: sale
-#: help:sale.order,picking_ids:0
-msgid "This is a list of picking that has been generated for this sales order."
-msgstr "Esta es la lista de ordenes que han sido generados para este pedido de venta."
-
-#. module: sale
-#: help:sale.installer,sale_margin:0
-msgid "Gives the margin of profitability by calculating the difference between Unit Price and Cost Price."
-msgstr "Indica el margen de rentabilidad mediante el cálculo de la diferencia entre el precio unitario y el precio de coste."
-
-#. module: sale
-#: view:sale.make.invoice:0
-#: view:sale.order.line.make.invoice:0
-msgid "Create invoices"
-msgstr "Crear facturas"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Net Total :"
-msgstr "Total neto :"
-
-#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.order.line,state:0
-#: selection:sale.report,state:0
-msgid "Cancelled"
-msgstr "Cancelado"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_shop_form
-#: model:ir.ui.menu,name:sale.menu_action_shop_form
-#: field:sale.order,shop_id:0
-#: view:sale.report:0
-#: field:sale.report,shop_id:0
-msgid "Shop"
-msgstr "Tienda"
-
-#. module: sale
-#: view:sale.report:0
-msgid "   Month   "
-msgstr "   Mes   "
-
-#. module: sale
-#: field:sale.report,date_confirm:0
-msgid "Date Confirm"
-msgstr "Fecha confirmación"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:111
-#, python-format
-msgid "Warning"
-msgstr "Aviso"
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_view_sales_by_month
-msgid "Sales by Month"
-msgstr "Ventas por mes"
-
-#. module: sale
-#: code:addons/sale/sale.py:1045
-#, python-format
-msgid "You selected a quantity of %d Units.\n"
-"But it's not compatible with the selected packaging.\n"
-"Here is a proposition of quantities according to the packaging:\n"
-"\n"
-"EAN: %s Quantity: %s Type of ul: %s"
-msgstr "Ha seleccionado una cantidad de %d unidades.\n"
-"Pero no es compatible con el empaquetado seleccionado.\n"
-"Aquí tiene una propuesta de cantidades acordes con este empaquetado:\n"
-"\n"
-"EAN: %s Cantidad: %s Tipo de ul: %s"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_order
-#: model:process.node,name:sale.process_node_order0
-#: model:process.node,name:sale.process_node_saleorder0
-#: model:res.request.link,name:sale.req_link_sale_order
-#: view:sale.order:0
-#: field:stock.picking,sale_id:0
-msgid "Sales Order"
-msgstr "Pedido de venta"
-
-#. module: sale
-#: field:sale.order.line,product_uos_qty:0
-msgid "Quantity (UoS)"
-msgstr "Cantidad (UdV)"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_packing0
-msgid "The Pick List form is created as soon as the sales order is confirmed, in the same time as the procurement order. It represents the assignment of parts to the sales order. There is 1 pick list by sales order line which evolves with the availability of parts."
-msgstr "La orden se crea tan pronto como se confirma el pedido de venta, a la vez que la orden de abastecimiento. Representa la asignación de los componentes del pedido de venta. Hay una orden por línea del pedido de venta que evoluciona con la disponibilidad de los componentes."
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Confirmed"
-msgstr "Confirmado"
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_confirm0
-msgid "Confirm"
-msgstr "Confirmar"
-
-#. module: sale
-#: constraint:res.company:0
-msgid "Error! You can not create recursive companies."
-msgstr "¡Error! No se pueden crear compañías recursivas."
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_sales_product_total_price
-msgid "Sales by Product's Category in last 90 days"
-msgstr "Ventas por categoría de producto últimos 90 días"
-
-#. module: sale
-#: view:sale.order:0
-#: field:sale.order.line,invoice_lines:0
-msgid "Invoice Lines"
-msgstr "Líneas de factura"
-
-#. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
-msgid "Sales Order Lines"
-msgstr "Líneas pedido de ventas"
-
-#. module: sale
-#: field:sale.order.line,delay:0
-msgid "Delivery Lead Time"
-msgstr "Tiempo inicial entrega"
-
-#. module: sale
-#: view:res.company:0
-msgid "Configuration"
-msgstr "Configuración"
-
-#. module: sale
-#: selection:sale.order,picking_policy:0
-msgid "Complete Delivery"
-msgstr "Envío completo"
-
-#. module: sale
-#: view:sale.report:0
-msgid "    Month-1    "
-msgstr "    Mes-1    "
-
-#. module: sale
-#: help:sale.config.picking_policy,picking_policy:0
-msgid "The Shipping Policy is used to configure per order if you want to deliver as soon as possible when one product is available or you wait that all products are available.."
-msgstr "La política de envío se utiliza para configurar el pedido si debe entregarse tan pronto como sea posible cuando un producto está disponible o debe esperar a que todos los productos están disponibles."
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "August"
-msgstr "Agosto"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:111
-#, python-format
-msgid "Invoice cannot be created for this Sales Order Line due to one of the following reasons:\n"
-"1.The state of this sales order line is either \"draft\" or \"cancel\"!\n"
-"2.The Sales Order Line is Invoiced!"
-msgstr "No se puede crear la factura a partir de esta línea de pedido de venta por las siguientes razones:\n"
-"1. El estado de esta línea del pedido de venta está en estado \"borrador\" o \"cancelada\".\n"
-"2. La línea del pedido de venta está facturada."
-
-#. module: sale
-#: field:sale.order.line,th_weight:0
-msgid "Weight"
-msgstr "Peso"
-
-#. module: sale
-#: view:sale.open.invoice:0
-#: view:sale.order:0
-#: field:sale.order,invoice_ids:0
-msgid "Invoices"
-msgstr "Facturas"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "December"
-msgstr "Diciembre"
-
-#. module: sale
-#: field:sale.config.picking_policy,config_logo:0
-#: field:sale.installer,config_logo:0
-msgid "Image"
-msgstr "Imagen"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_saleprocurement0
-msgid "A procurement order is automatically created as soon as a sales order is confirmed or as the invoice is paid. It drives the purchasing and the production of products regarding to the rules and to the sales order's parameters. "
-msgstr "Se crea automáticamente una orden de abastecimiento tan pronto como se confirma un pedido de venta o se paga la factura. Provoca la compra y la producción de productos según las reglas y los parámetros del pedido de venta. "
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Uninvoiced"
-msgstr "No facturada"
-
-#. module: sale
-#: report:sale.order:0
-#: view:sale.order:0
-#: field:sale.order,user_id:0
-#: view:sale.order.line:0
-#: field:sale.order.line,salesman_id:0
-#: view:sale.report:0
-#: field:sale.report,user_id:0
-msgid "Salesman"
-msgstr "Vendedor"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_saleorder0
-msgid "Drives procurement and invoicing"
-msgstr "Genera abastecimiento y facturación"
-
-#. module: sale
-#: field:sale.order,amount_untaxed:0
-msgid "Untaxed Amount"
-msgstr "Monto sin impuestos"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:163
-#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
-#: view:sale.advance.payment.inv:0
-#: view:sale.order:0
-#, python-format
-msgid "Advance Invoice"
-msgstr "Avanzar factura"
-
-#. module: sale
-#: code:addons/sale/sale.py:591
-#, python-format
-msgid "The sales order '%s' has been cancelled."
-msgstr "El pedido de venta '%s' ha sido cancelado."
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Draft"
-msgstr "Borrador"
-
-#. module: sale
-#: help:sale.order.line,state:0
-msgid "* The 'Draft' state is set when the related sales order in draft state.                     \n"
-"* The 'Confirmed' state is set when the related sales order is confirmed.                     \n"
-"* The 'Exception' state is set when the related sales order is set as exception.                     \n"
-"* The 'Done' state is set when the sales order line has been picked.                     \n"
-"* The 'Cancelled' state is set when a user cancel the sales order related."
-msgstr "* El estado 'Borrador' se establece cuando se crea el pedido de venta.\n"
-"* El estado 'Confirmado' se establece cuando se confirma el pedido de venta.\n"
-"* El estado 'Excepción' se establece cuando el pedido de venta tiene una excepción.\n"
-"* El estado 'Realizado' se establece cuando las líneas del pedido de venta se han enviado.\n"
-"* El estado 'Cancelado' se establece cuando un usuario cancela el pedido de venta."
-
-#. module: sale
-#: help:sale.order,amount_tax:0
-msgid "The tax amount."
-msgstr "El importe de los impuestos."
-
-#. module: sale
-#: view:sale.order:0
-msgid "Packings"
-msgstr "Paquetes"
-
-#. module: sale
-#: field:sale.config.picking_policy,progress:0
-#: field:sale.installer,progress:0
-msgid "Configuration Progress"
-msgstr "Progreso de configuración"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
-msgid "Product sales"
-msgstr "Ventas de producto"
-
-#. module: sale
-#: field:sale.order,date_order:0
-msgid "Ordered Date"
-msgstr "Fecha ordenada"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_form
-#: model:ir.ui.menu,name:sale.menu_sale_order
-#: view:sale.order:0
-msgid "Sales Orders"
-msgstr "Pedidos de ventas"
-
-#. module: sale
-#: selection:sale.config.picking_policy,picking_policy:0
-msgid "Direct Delivery"
-msgstr "Envío directo"
-
-#. module: sale
-#: field:sale.installer,sale_journal:0
-msgid "Invoicing journals"
-msgstr "Diarios de facturación"
-
-#. module: sale
-#: field:sale.advance.payment.inv,product_id:0
-msgid "Advance Product"
-msgstr "Producto avanzado"
-
-#. module: sale
-#: view:sale.report:0
-#: field:sale.report,shipped_qty_1:0
-msgid "Shipped Qty"
-msgstr "Ctdad enviada"
-
-#. module: sale
-#: view:sale.open.invoice:0
-msgid "You invoice has been successfully created!"
-msgstr "¡La factura ha sido creada correctamente!"
-
-#. module: sale
-#: code:addons/sale/sale.py:585
-#, python-format
-msgid "You must first cancel all invoices attached to this sales order."
-msgstr "Primero debe cancelar todas las facturas relacionadas con este pedido de venta."
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "January"
-msgstr "Enero"
-
-#. module: sale
-#: view:sale.installer:0
-msgid "Configure Your Sales Management Application"
-msgstr "Configurar su aplicación de gestión de ventas"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree4
-msgid "Sales Order in Progress"
-msgstr "Pedidos de ventas en proceso"
-
-#. module: sale
-#: field:sale.installer,sale_layout:0
-msgid "Sales Order Layout Improvement"
-msgstr "Mejora plantilla pedido de venta"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:63
-#, python-format
-msgid "Error"
-msgstr "Error"
-
-#. module: sale
-#: view:sale.report:0
-#: field:sale.report,delay:0
-msgid "Commitment Delay"
-msgstr "Retraso realización"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_saleprocurement0
-msgid "One Procurement order for each sales order line and for each of the components."
-msgstr "Una orden de abastecimiento para cada línea del pedido de venta y para cada uno de los componentes."
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_assign0
-msgid "Assign"
-msgstr "Asignar"
-
-#. module: sale
-#: field:sale.report,date:0
-msgid "Date Order"
-msgstr "Fecha pedido"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_order0
-msgid "Confirmed sales order to invoice."
-msgstr "Pedido de venta confirmado a factura."
-
-#. module: sale
-#: code:addons/sale/sale.py:290
-#, python-format
-msgid "Cannot delete Sales Order(s) which are already confirmed !"
-msgstr "¡No se puede eliminar pedido(s) de venta que ya está confirmado!"
-
-#. module: sale
-#: code:addons/sale/sale.py:316
-#, python-format
-msgid "The sales order '%s' has been set in draft state."
-msgstr "El pedido de venta '%s' ha sido cambiado a estado borrador."
-
-#. module: sale
-#: selection:sale.order.line,type:0
-msgid "from stock"
-msgstr "desde stock"
-
-#. module: sale
-#: field:sale.config.picking_policy,order_policy:0
-msgid "Shipping Default Policy"
-msgstr "Política de envío por defecto"
-
-#. module: sale
-#: view:sale.open.invoice:0
-msgid "Close"
-msgstr "Cerrar"
-
-#. module: sale
-#: field:sale.order,shipped:0
-msgid "Delivered"
-msgstr "Entregado"
-
-#. module: sale
-#: code:addons/sale/sale.py:1115
-#, python-format
-msgid "Not enough stock !"
-msgstr "¡No hay stock suficiente!"
-
-#. module: sale
-#: constraint:stock.move:0
-msgid "You must assign a production lot for this product"
-msgstr "Debe asignar un lote de producción para este producto"
-
-#. module: sale
-#: field:sale.order.line,sequence:0
-msgid "Layout Sequence"
-msgstr "Secuencia plantilla"
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.action_shop_form
-msgid "If you have more than one shop reselling your company products, you can create and manage that from here. Whenever you will record a new quotation or sales order, it has to be linked to a shop. The shop also defines the warehouse from which the products will be delivered for each particular sales."
-msgstr "Si tiene más de una tienda donde vende los productos de su compañía, puede crearlas y gestionarlas desde aquí. Cada vez que codifique un nuevo presupuesto o pedido de venta, debe estar vinculado a una tienda. La tienda también define desde que almacén serán entregados los productos para cada venta."
-
-#. module: sale
-#: help:sale.order,invoiced:0
-msgid "It indicates that an invoice has been paid."
-msgstr "Indica que una factura ha sido pagada."
-
-#. module: sale
-#: report:sale.order:0
-#: field:sale.order.line,name:0
-msgid "Description"
-msgstr "Descripción"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "May"
-msgstr "Mayo"
-
-#. module: sale
-#: help:sale.installer,sale_order_dates:0
-msgid "Adds commitment, requested and effective dates on Sales Orders."
-msgstr "Añade fechas de realización, solicitud y efectivo en pedidos de venta."
-
-#. module: sale
-#: view:sale.order:0
-#: field:sale.order,partner_id:0
-#: field:sale.order.line,order_partner_id:0
-msgid "Customer"
-msgstr "Cliente"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "February"
-msgstr "Febrero"
-
-#. module: sale
-#: help:sale.installer,sale_journal:0
-msgid "Allows you to group and invoice your delivery orders according to different invoicing types: daily, weekly, etc."
-msgstr "Permite agrupar y facturar sus ordenes de acuerdo a diferentes tipos de facturación: diaria, semanal, etc."
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "April"
-msgstr "Abril"
-
-#. module: sale
-#: view:sale.shop:0
-msgid "Accounting"
-msgstr "Contabilidad"
-
-#. module: sale
-#: field:sale.config.picking_policy,step:0
-msgid "Steps To Deliver a Sales Order"
-msgstr "Pasos para entregar un pedido de venta"
-
-#. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
-msgid "Search Sales Order"
-msgstr "Buscar pedido de venta"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_saleorderprocurement0
-msgid "Sales Order Requisition"
-msgstr "Solicitud pedido de venta"
-
-#. module: sale
-#: report:sale.order:0
-#: field:sale.order,payment_term:0
-msgid "Payment Term"
-msgstr "Plazo de pago"
-
-#. module: sale
-#: help:sale.installer,sale_layout:0
-msgid "Provides some features to improve the layout of the Sales Order reports."
-msgstr "Proporciona algunas funcionalidades para mejorar la plantilla de los informes de pedidos de ventas."
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.action_order_report_all
-msgid "This report performs analysis on your quotations and sales orders. Analysis check your sales revenues and sort it by different group criteria (salesman, partner, product, etc.) Use this report to perform analysis on sales not having invoiced yet. If you want to analyse your turnover, you should use the Invoice Analysis report in the Accounting application."
-msgstr "Este informe realiza un análisis de sus presupuestos y pedidos de venta. El análisis verifica los ingresos de sus ventas y las ordena por diferentes grupos de criterios (comercial, empresa, producto, etc.). Utilice este informe para realizar un análisis sobre sus ventas todavía no facturadas. Si desea analizar sus ingresos, debería utilizar el informe de análisis de facturas en la aplicación de Contabilidad."
-
-#. module: sale
-#: report:sale.order:0
-msgid "Quotation N°"
-msgstr "Presupuesto Nº"
-
-#. module: sale
-#: field:sale.order,picked_rate:0
-#: view:sale.report:0
-msgid "Picked"
-msgstr "Enviada"
-
-#. module: sale
-#: view:sale.report:0
-#: field:sale.report,year:0
-msgid "Year"
-msgstr "Año"
-
-#. module: sale
-#: selection:sale.config.picking_policy,order_policy:0
-msgid "Invoice Based on Deliveries"
-msgstr "Facturar basado en las entregas"
-
diff --git a/addons/sale/i18n/et.po b/addons/sale/i18n/et.po
index 198da08f9ed..f30ef9345e7 100644
--- a/addons/sale/i18n/et.po
+++ b/addons/sale/i18n/et.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:46+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:57+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: sale
 #: model:process.node,name:sale.process_node_deliveryorder0
@@ -1135,7 +1135,7 @@ msgid "Document of the move to the output or to the customer."
 msgstr ""
 
 #. module: sale
-#: model:email.template,body_text:sale.email_template_edi_sale
+#: model:email.template,body:sale.email_template_edi_sale
 msgid ""
 "\n"
 "Hello${object.partner_order_id.name and ' ' or "
diff --git a/addons/sale/i18n/fi.po b/addons/sale/i18n/fi.po
index b04b35fdfc5..79e723a5861 100644
--- a/addons/sale/i18n/fi.po
+++ b/addons/sale/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:46+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:57+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: sale
 #: field:sale.config.picking_policy,timesheet:0
@@ -1137,7 +1137,7 @@ msgid "Document of the move to the output or to the customer."
 msgstr "Dokumentti siirrosta kohdepaikkaan tai asiakkalle."
 
 #. module: sale
-#: model:email.template,body_text:sale.email_template_edi_sale
+#: model:email.template,body:sale.email_template_edi_sale
 msgid ""
 "\n"
 "Hello${object.partner_order_id.name and ' ' or "
diff --git a/addons/sale/i18n/fr.po b/addons/sale/i18n/fr.po
index cca2f33654c..2b4f026b882 100644
--- a/addons/sale/i18n/fr.po
+++ b/addons/sale/i18n/fr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:46+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:57+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: sale
 #: code:addons/sale/sale.py:655
@@ -1206,7 +1206,7 @@ msgid "Document of the move to the output or to the customer."
 msgstr "Document du mouvement vers la sortie ou vers le client."
 
 #. module: sale
-#: model:email.template,body_text:sale.email_template_edi_sale
+#: model:email.template,body:sale.email_template_edi_sale
 msgid ""
 "\n"
 "Hello${object.partner_order_id.name and ' ' or "
diff --git a/addons/sale/i18n/gl.po b/addons/sale/i18n/gl.po
index bd806b684d3..112ba8ea10c 100644
--- a/addons/sale/i18n/gl.po
+++ b/addons/sale/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:46+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:57+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: sale
 #: field:sale.config.picking_policy,timesheet:0
@@ -1099,7 +1099,7 @@ msgid "Document of the move to the output or to the customer."
 msgstr ""
 
 #. module: sale
-#: model:email.template,body_text:sale.email_template_edi_sale
+#: model:email.template,body:sale.email_template_edi_sale
 msgid ""
 "\n"
 "Hello${object.partner_order_id.name and ' ' or "
diff --git a/addons/sale/i18n/hr.po b/addons/sale/i18n/hr.po
index 43011f01148..d1f6b210386 100644
--- a/addons/sale/i18n/hr.po
+++ b/addons/sale/i18n/hr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:47+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:58+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 "Language: hr\n"
 
 #. module: sale
@@ -1127,7 +1127,7 @@ msgid "Document of the move to the output or to the customer."
 msgstr "Dokument premještaja na izlaz ili kod kupca."
 
 #. module: sale
-#: model:email.template,body_text:sale.email_template_edi_sale
+#: model:email.template,body:sale.email_template_edi_sale
 msgid ""
 "\n"
 "Hello${object.partner_order_id.name and ' ' or "
diff --git a/addons/sale/i18n/hu.po b/addons/sale/i18n/hu.po
index f1971a5bcbc..6e5538893ba 100644
--- a/addons/sale/i18n/hu.po
+++ b/addons/sale/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:46+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:57+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: sale
 #: field:sale.config.picking_policy,timesheet:0
@@ -1145,7 +1145,7 @@ msgid "Document of the move to the output or to the customer."
 msgstr "Dokumentum a gyártásnak vagy a vevőnek irányuló árumozgásról."
 
 #. module: sale
-#: model:email.template,body_text:sale.email_template_edi_sale
+#: model:email.template,body:sale.email_template_edi_sale
 msgid ""
 "\n"
 "Hello${object.partner_order_id.name and ' ' or "
diff --git a/addons/sale/i18n/id.po b/addons/sale/i18n/id.po
index 0989a3fbc5b..221dc70c76a 100644
--- a/addons/sale/i18n/id.po
+++ b/addons/sale/i18n/id.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:47+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:57+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: sale
 #: field:sale.config.picking_policy,timesheet:0
@@ -1137,7 +1137,7 @@ msgid "Document of the move to the output or to the customer."
 msgstr "Dokumen pindah ke output atau kepada pelanggan"
 
 #. module: sale
-#: model:email.template,body_text:sale.email_template_edi_sale
+#: model:email.template,body:sale.email_template_edi_sale
 msgid ""
 "\n"
 "Hello${object.partner_order_id.name and ' ' or "
diff --git a/addons/sale/i18n/is.po b/addons/sale/i18n/is.po
index d873d86fe48..c75b587321a 100644
--- a/addons/sale/i18n/is.po
+++ b/addons/sale/i18n/is.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:46+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:57+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: sale
 #: field:sale.config.picking_policy,timesheet:0
@@ -1109,7 +1109,7 @@ msgid "Document of the move to the output or to the customer."
 msgstr ""
 
 #. module: sale
-#: model:email.template,body_text:sale.email_template_edi_sale
+#: model:email.template,body:sale.email_template_edi_sale
 msgid ""
 "\n"
 "Hello${object.partner_order_id.name and ' ' or "
diff --git a/addons/sale/i18n/it.po b/addons/sale/i18n/it.po
index 4bf25b9b9c9..e45c3253c23 100644
--- a/addons/sale/i18n/it.po
+++ b/addons/sale/i18n/it.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:47+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:57+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: sale
 #: field:sale.config.picking_policy,timesheet:0
@@ -1142,7 +1142,7 @@ msgid "Document of the move to the output or to the customer."
 msgstr "Documento del movimento verso area di uscita o verso area cliente."
 
 #. module: sale
-#: model:email.template,body_text:sale.email_template_edi_sale
+#: model:email.template,body:sale.email_template_edi_sale
 msgid ""
 "\n"
 "Hello${object.partner_order_id.name and ' ' or "
diff --git a/addons/sale/i18n/ja.po b/addons/sale/i18n/ja.po
index 48ae3252c6e..c774975f3a7 100644
--- a/addons/sale/i18n/ja.po
+++ b/addons/sale/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:47+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:57+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: sale
 #: field:sale.config.picking_policy,timesheet:0
@@ -1116,7 +1116,7 @@ msgid "Document of the move to the output or to the customer."
 msgstr "製造品へのあるいは顧客への移動のドキュメント"
 
 #. module: sale
-#: model:email.template,body_text:sale.email_template_edi_sale
+#: model:email.template,body:sale.email_template_edi_sale
 msgid ""
 "\n"
 "Hello${object.partner_order_id.name and ' ' or "
diff --git a/addons/sale/i18n/ko.po b/addons/sale/i18n/ko.po
index 44066f90d4d..ca5a6f9641b 100644
--- a/addons/sale/i18n/ko.po
+++ b/addons/sale/i18n/ko.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:47+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:57+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: sale
 #: field:sale.config.picking_policy,timesheet:0
@@ -1094,7 +1094,7 @@ msgid "Document of the move to the output or to the customer."
 msgstr ""
 
 #. module: sale
-#: model:email.template,body_text:sale.email_template_edi_sale
+#: model:email.template,body:sale.email_template_edi_sale
 msgid ""
 "\n"
 "Hello${object.partner_order_id.name and ' ' or "
diff --git a/addons/sale/i18n/lo.po b/addons/sale/i18n/lo.po
new file mode 100644
index 00000000000..ce13dc2f73b
--- /dev/null
+++ b/addons/sale/i18n/lo.po
@@ -0,0 +1,2158 @@
+# Lao 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-02-08 01:37+0100\n"
+"PO-Revision-Date: 2012-08-20 19:00+0000\n"
+"Last-Translator: Brice Muangkhot ສຸພາ ເມືອງໂຄຕ <bmuangkhot@gmail.com>\n"
+"Language-Team: Lao <lo@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:57+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
+
+#. module: sale
+#: field:sale.config.picking_policy,timesheet:0
+msgid "Based on Timesheet"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid ""
+"Sale Order Lines that are confirmed, done or in exception state and haven't "
+"yet been invoiced"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_sales_by_salesman
+msgid "Sales by Salesman in last 90 days"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,picking_policy:0
+msgid ""
+"If you don't have enough stock available to deliver all at once, do you "
+"accept partial shipments or not?"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "UoS"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,partner_shipping_id:0
+msgid "Shipping address for current sales order."
+msgstr "ທີ່ຢູ່ສຳລັບສົ່ງສິນຄ້າກຳລັງສັ່ງ"
+
+#. module: sale
+#: field:sale.advance.payment.inv,qtty:0 report:sale.order:0
+msgid "Quantity"
+msgstr "ຈຳນວນ"
+
+#. module: sale
+#: view:sale.report:0 field:sale.report,day:0
+msgid "Day"
+msgstr ""
+
+#. module: sale
+#: model:process.transition.action,name:sale.process_transition_action_cancelorder0
+#: view:sale.order:0
+msgid "Cancel Order"
+msgstr "ສລົບລ້າງສັ່ງຊື້"
+
+#. module: sale
+#: code:addons/sale/sale.py:638
+#, python-format
+msgid "The quotation '%s' has been converted to a sales order."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Print Quotation"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice.py:42
+#, python-format
+msgid "Warning !"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Tax"
+msgstr "ອາກອນ"
+
+#. module: sale
+#: model:process.node,note:sale.process_node_saleorderprocurement0
+msgid "Drives procurement orders for every sales order line."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0 field:sale.report,analytic_account_id:0
+#: field:sale.shop,project_id:0
+msgid "Analytic Account"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_order_line_tree2
+msgid ""
+"Here is a list of each sales order line to be invoiced. You can invoice "
+"sales orders partially, by lines of sales order. You do not need this list "
+"if you invoice from the delivery orders or if you invoice sales totally."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:295
+#, python-format
+msgid ""
+"In order to delete a confirmed sale order, you must cancel it before ! To "
+"cancel a sale order, you must first cancel related picking or delivery "
+"orders."
+msgstr ""
+
+#. module: sale
+#: model:process.node,name:sale.process_node_saleprocurement0
+msgid "Procurement Order"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0 field:sale.report,partner_id:0
+msgid "Partner"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "Invoice based on deliveries"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Order Line"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_order_form
+msgid ""
+"Sales Orders help you manage quotations and orders from your customers. "
+"OpenERP suggests that you start by creating a quotation. Once it is "
+"confirmed, the quotation will be converted into a Sales Order. OpenERP can "
+"handle several types of products so that a sales order may trigger tasks, "
+"delivery orders, manufacturing orders, purchases and so on. Based on the "
+"configuration of the sales order, a draft invoice will be generated so that "
+"you just have to confirm it when you want to bill your customer."
+msgstr ""
+
+#. module: sale
+#: help:sale.order,invoice_quantity:0
+msgid ""
+"The sale order will automatically create the invoice proposition (draft "
+"invoice). Ordered and delivered quantities may not be the same. You have to "
+"choose if you want your invoice based on ordered or shipped quantities. If "
+"the product is a service, shipped quantities means hours spent on the "
+"associated tasks."
+msgstr ""
+
+#. module: sale
+#: field:sale.shop,payment_default_id:0
+msgid "Default Payment Term"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.picking_policy,deli_orders:0
+msgid "Based on Delivery Orders"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.picking_policy,time_unit:0
+msgid "Main Working Time Unit"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0 view:sale.order.line:0 field:sale.order.line,state:0
+#: view:sale.report:0
+msgid "State"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Disc.(%)"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0 field:sale.report,price_total:0
+msgid "Total Price"
+msgstr ""
+
+#. module: sale
+#: help:sale.make.invoice,grouped:0
+msgid "Check the box to group the invoices for the same customers"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "My Sale Orders"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,invoice_quantity:0
+msgid "Ordered Quantities"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Sales by Salesman"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,move_ids:0
+msgid "Inventory Moves"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,name:0 field:sale.order.line,order_id:0
+msgid "Order Reference"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Other Information"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Dates"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_invoiceafterdelivery0
+msgid ""
+"The invoice is created automatically if the shipping policy is 'Invoice from "
+"pick' or 'Invoice on order after delivery'."
+msgstr ""
+
+#. module: sale
+#: field:sale.config.picking_policy,task_work:0
+msgid "Based on Tasks' Work"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
+msgid "Quotations and Sales"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_make_invoice
+msgid "Sales Make Invoice"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:330
+#, python-format
+msgid "Pricelist Warning!"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,discount:0
+msgid "Discount (%)"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
+msgid "My Quotations"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.open_board_sales_manager
+#: model:ir.ui.menu,name:sale.menu_board_sales_manager
+msgid "Sales Manager Dashboard"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,product_packaging:0
+msgid "Packaging"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_saleinvoice0
+msgid "From a sales order"
+msgstr ""
+
+#. module: sale
+#: field:sale.shop,name:0
+msgid "Shop Name"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,order_policy:0
+msgid ""
+"The Invoice Policy is used to synchronise invoice and delivery operations.\n"
+"  - The 'Pay before delivery' choice will first generate the invoice and "
+"then generate the picking order after the payment of this invoice.\n"
+"  - The 'Deliver & Invoice on demand' will create the picking order directly "
+"and wait for the user to manually click on the 'Invoice' button to generate "
+"the draft invoice based on the sale order or the sale order lines.\n"
+"  - The 'Invoice on order after delivery' choice will generate the draft "
+"invoice based on sales order after all picking lists have been finished.\n"
+"  - The 'Invoice based on deliveries' choice is used to create an invoice "
+"during the picking process."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:1171
+#, python-format
+msgid "No Customer Defined !"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree2
+msgid "Sales in Exception"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:1158 code:addons/sale/sale.py:1277
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:70
+#, python-format
+msgid "Configuration Error !"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Conditions"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:1034
+#, python-format
+msgid ""
+"There is no income category account defined in default Properties for "
+"Product Category or Fiscal Position is not defined !"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "August"
+msgstr ""
+
+#. module: sale
+#: constraint:stock.move:0
+msgid "You try to assign a lot which is not from the same product"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:655
+#, python-format
+msgid "invalid mode for test_state"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "June"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:617
+#, python-format
+msgid "Could not cancel this sales order !"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_report
+msgid "Sales Orders Statistics"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,project_id:0
+msgid "The analytic account related to a sales order."
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "October"
+msgstr ""
+
+#. module: sale
+#: sql_constraint:stock.picking:0
+msgid "Reference must be unique per Company!"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0 view:sale.order:0 view:sale.report:0
+msgid "Quotations"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,pricelist_id:0
+msgid "Pricelist for current sales order."
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "TVA :"
+msgstr ""
+
+#. module: sale
+#: help:sale.order.line,delay:0
+msgid ""
+"Number of days between the order confirmation the shipping of the products "
+"to the customer"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Quotation Date"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,fiscal_position:0
+msgid "Fiscal Position"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0 view:sale.order.line:0 field:sale.report,product_uom:0
+msgid "UoM"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,number_packages:0
+msgid "Number Packages"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0 selection:sale.report,state:0
+msgid "In Progress"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_confirmquotation0
+msgid ""
+"The salesman confirms the quotation. The state of the sales order becomes "
+"'In progress' or 'Manual in progress'."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:1074
+#, python-format
+msgid "You cannot cancel a sale order line that has already been invoiced!"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:1079
+#, python-format
+msgid "You must first cancel stock moves attached to this sales order line."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:1147
+#, python-format
+msgid "(n/a)"
+msgstr ""
+
+#. module: sale
+#: help:sale.advance.payment.inv,product_id:0
+msgid ""
+"Select a product of type service which is called 'Advance Product'. You may "
+"have to create it and set it as a default value on this field."
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Tel. :"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:64
+#, python-format
+msgid ""
+"You cannot make an advance on a sales order                              "
+"that is defined as 'Automatic Invoice after delivery'."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0 field:sale.order,note:0 view:sale.order.line:0
+#: field:sale.order.line,notes:0
+msgid "Notes"
+msgstr ""
+
+#. module: sale
+#: sql_constraint:res.company:0
+msgid "The company name must be unique !"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,partner_invoice_id:0
+msgid "Invoice address for current sales order."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Month-1"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered month of the sales order"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:504
+#, python-format
+msgid ""
+"You cannot group sales having different currencies for the same partner."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,picking_policy:0
+msgid "Deliver each product when available"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,invoiced_rate:0 field:sale.order.line,invoiced:0
+msgid "Invoiced"
+msgstr ""
+
+#. module: sale
+#: model:process.node,name:sale.process_node_deliveryorder0
+msgid "Delivery Order"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,date_confirm:0
+msgid "Confirmation Date"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,incoterm:0
+msgid "Incoterm"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,address_allotment_id:0
+msgid "Allotment Partner"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "March"
+msgstr ""
+
+#. module: sale
+#: constraint:stock.move:0
+msgid "You can not move products from or to a location of the type view."
+msgstr ""
+
+#. module: sale
+#: field:sale.config.picking_policy,sale_orders:0
+msgid "Based on Sales Orders"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,amount_total:0
+msgid "The total amount."
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,price_subtotal:0
+msgid "Subtotal"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Invoice address :"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,sequence:0
+msgid "Line Sequence"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_saleorderprocurement0
+msgid ""
+"For every sales order line, a procurement order is created to supply the "
+"sold product."
+msgstr ""
+
+#. module: sale
+#: help:sale.order,incoterm:0
+msgid ""
+"Incoterm which stands for 'International Commercial terms' implies its a "
+"series of sales terms which are used in the commercial transaction."
+msgstr ""
+
+#. module: sale
+#: field:sale.order,partner_invoice_id:0
+msgid "Invoice Address"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Search Uninvoiced Lines"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.report.xml,name:sale.report_sale_order
+msgid "Quotation / Order"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0 field:sale.report,nbr:0
+msgid "# of Lines"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_open_invoice
+msgid "Sales Open Invoice"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_order_line
+#: field:stock.move,sale_line_id:0
+msgid "Sales Order Line"
+msgstr ""
+
+#. module: sale
+#: field:sale.shop,warehouse_id:0
+msgid "Warehouse"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Order N°"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,order_line:0
+msgid "Order Lines"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Untaxed amount"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_tree2
+#: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
+msgid "Lines to Invoice"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,product_uom_qty:0
+msgid "Quantity (UoM)"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,create_date:0
+msgid "Creation Date"
+msgstr ""
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.menu_sales_configuration_misc
+msgid "Miscellaneous"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_tree3
+msgid "Uninvoiced and Delivered Lines"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Total :"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "My Sales"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:295 code:addons/sale/sale.py:1074
+#: code:addons/sale/sale.py:1303
+#, python-format
+msgid "Invalid action !"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Extra Info"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,pricelist_id:0 field:sale.report,pricelist_id:0
+#: field:sale.shop,pricelist_id:0
+msgid "Pricelist"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0 field:sale.report,product_uom_qty:0
+msgid "# of Qty"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:1327
+#, python-format
+msgid "Hour"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Order Date"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0 view:sale.report:0 field:sale.report,shipped:0
+#: field:sale.report,shipped_qty_1:0
+msgid "Shipped"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree5
+msgid "All Quotations"
+msgstr ""
+
+#. module: sale
+#: view:sale.config.picking_policy:0
+msgid "Options"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "September"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:632
+#, python-format
+msgid "You cannot confirm a sale order which has no line."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:1259
+#, python-format
+msgid ""
+"You have to select a pricelist or a customer in the sales form !\n"
+"Please set one before choosing a product."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0 field:sale.report,categ_id:0
+msgid "Category of Product"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Taxes :"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Stock Moves"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,state:0 field:sale.report,state:0
+msgid "Order State"
+msgstr ""
+
+#. module: sale
+#: view:sale.make.invoice:0 view:sale.order.line.make.invoice:0
+msgid "Do you really want to create the invoice(s)?"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Sales By Month"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:1078
+#, python-format
+msgid "Could not cancel sales order line!"
+msgstr ""
+
+#. module: sale
+#: field:res.company,security_lead:0
+msgid "Security Days"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_saleorderprocurement0
+msgid "Procurement of sold material"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Create Final Invoice"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,partner_shipping_id:0
+msgid "Shipping Address"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,shipped:0
+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
+#: field:sale.order,date_order:0
+msgid "Date"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Extended Filters..."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order.line,state:0
+msgid "Exception"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_res_company
+msgid "Companies"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,state:0
+msgid ""
+"Gives the state of the quotation or sales order. \n"
+"The exception state is automatically set when a cancel operation occurs in "
+"the invoice validation (Invoice Exception) or in the picking list process "
+"(Shipping Exception). \n"
+"The 'Waiting Schedule' state is set when the invoice is confirmed but "
+"waiting for the scheduler to run on the order date."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:1272
+#, python-format
+msgid "No valid pricelist line found ! :"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "History"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "Invoice on order after delivery"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,invoice_ids:0
+msgid ""
+"This is the list of invoices that have been generated for this sales order. "
+"The same sales order may have been invoiced in several times (by line for "
+"example)."
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Your Reference"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,partner_order_id:0
+msgid ""
+"The name and address of the contact who requested the order or quotation."
+msgstr ""
+
+#. module: sale
+#: help:res.company,security_lead:0
+msgid ""
+"This is the days added to what you promise to customers for security purpose"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Qty"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "References"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "My Sales Order Lines"
+msgstr ""
+
+#. module: sale
+#: model:process.transition.action,name:sale.process_transition_action_cancel0
+#: model:process.transition.action,name:sale.process_transition_action_cancel1
+#: model:process.transition.action,name:sale.process_transition_action_cancel2
+#: view:sale.advance.payment.inv:0 view:sale.make.invoice:0
+#: view:sale.order.line:0 view:sale.order.line.make.invoice:0
+msgid "Cancel"
+msgstr ""
+
+#. module: sale
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique per Company!"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_invoice0
+#: model:process.transition,name:sale.process_transition_invoiceafterdelivery0
+#: model:process.transition.action,name:sale.process_transition_action_createinvoice0
+#: view:sale.advance.payment.inv:0 view:sale.order.line:0
+msgid "Create Invoice"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Total Tax Excluded"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Order reference"
+msgstr ""
+
+#. module: sale
+#: view:sale.open.invoice:0
+msgid "You invoice has been successfully created!"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Sales by Partner"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,partner_order_id:0
+msgid "Ordering Contact"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_view_sale_open_invoice
+#: view:sale.open.invoice:0
+msgid "Open Invoice"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.server,name:sale.ir_actions_server_edi_sale
+msgid "Auto-email confirmed sale orders"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:413
+#, python-format
+msgid "There is no sales journal defined for this company: \"%s\" (id:%d)"
+msgstr ""
+
+#. module: sale
+#: model:process.transition.action,name:sale.process_transition_action_forceassignation0
+msgid "Force Assignation"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order.line,type:0
+msgid "on order"
+msgstr ""
+
+#. module: sale
+#: model:process.node,note:sale.process_node_invoiceafterdelivery0
+msgid "Based on the shipped or on the ordered quantities."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,picking_policy:0
+msgid "Deliver all products at once"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,picking_ids:0
+msgid "Related Picking"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.picking_policy,name:0
+msgid "Name"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Shipping address :"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_sales_by_partner
+msgid "Sales per Customer in last 90 days"
+msgstr ""
+
+#. module: sale
+#: model:process.node,note:sale.process_node_quotation0
+msgid "Draft state of sales order"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_deliver0
+msgid "Create Delivery Order"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:1303
+#, python-format
+msgid "Cannot delete a sales order line which is in state '%s'!"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Qty(UoS)"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Total Tax Included"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_packing0
+msgid "Create Pick List"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered date of the sales order"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Sales by Product Category"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_confirmquotation0
+msgid "Confirm Quotation"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:63
+#, python-format
+msgid "Error"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0 view:sale.order.line:0 view:sale.report:0
+msgid "Group By..."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Recreate Invoice"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.outgoing_picking_list_to_invoice
+#: model:ir.ui.menu,name:sale.menu_action_picking_list_to_invoice
+msgid "Deliveries to Invoice"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0 selection:sale.report,state:0
+msgid "Waiting Schedule"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,type:0
+msgid "Procurement Method"
+msgstr ""
+
+#. module: sale
+#: model:process.node,name:sale.process_node_packinglist0
+msgid "Pick List"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Set to Draft"
+msgstr ""
+
+#. module: sale
+#: model:process.node,note:sale.process_node_packinglist0
+msgid "Document of the move to the output or to the customer."
+msgstr ""
+
+#. module: sale
+#: model:email.template,body:sale.email_template_edi_sale
+msgid ""
+"\n"
+"Hello${object.partner_order_id.name and ' ' or "
+"''}${object.partner_order_id.name or ''},\n"
+"\n"
+"Here is your order confirmation for ${object.partner_id.name}:\n"
+"       | Order number: *${object.name}*\n"
+"       | Order total: *${object.amount_total} "
+"${object.pricelist_id.currency_id.name}*\n"
+"       | Order date: ${object.date_order}\n"
+"       % if object.origin:\n"
+"       | Order reference: ${object.origin}\n"
+"       % endif\n"
+"       % if object.client_order_ref:\n"
+"       | Your reference: ${object.client_order_ref}<br />\n"
+"       % endif\n"
+"       | Your contact: ${object.user_id.name} ${object.user_id.user_email "
+"and '<%s>'%(object.user_id.user_email) or ''}\n"
+"\n"
+"You can view the order confirmation, download it and even pay online using "
+"the following link:\n"
+"    ${ctx.get('edi_web_url_view') or 'n/a'}\n"
+"\n"
+"% if object.order_policy in ('prepaid','manual') and "
+"object.company_id.paypal_account:\n"
+"<% \n"
+"comp_name = quote(object.company_id.name)\n"
+"order_name = quote(object.name)\n"
+"paypal_account = quote(object.company_id.paypal_account)\n"
+"order_amount = quote(str(object.amount_total))\n"
+"cur_name = quote(object.pricelist_id.currency_id.name)\n"
+"paypal_url = \"https://www.paypal.com/cgi-"
+"bin/webscr?cmd=_xclick&business=%s&item_name=%s%%20Order%%20%s&invoice=%s&amo"
+"unt=%s\" \\\n"
+"             "
+"\"&currency_code=%s&button_subtype=services&no_note=1&bn=OpenERP_Order_PayNow"
+"_%s\" % \\\n"
+"             "
+"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
+"e)\n"
+"%>\n"
+"It is also possible to directly pay with Paypal:\n"
+"    ${paypal_url}\n"
+"% endif\n"
+"\n"
+"If you have any question, do not hesitate to contact us.\n"
+"\n"
+"\n"
+"Thank you for choosing ${object.company_id.name}!\n"
+"\n"
+"\n"
+"--\n"
+"${object.user_id.name} ${object.user_id.user_email and "
+"'<%s>'%(object.user_id.user_email) or ''}\n"
+"${object.company_id.name}\n"
+"% if object.company_id.street:\n"
+"${object.company_id.street or ''}\n"
+"% endif\n"
+"% if object.company_id.street2:\n"
+"${object.company_id.street2}\n"
+"% endif\n"
+"% if object.company_id.city or object.company_id.zip:\n"
+"${object.company_id.zip or ''} ${object.company_id.city or ''}\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 ''}\n"
+"% endif\n"
+"% if object.company_id.phone:\n"
+"Phone: ${object.company_id.phone}\n"
+"% endif\n"
+"% if object.company_id.website:\n"
+"${object.company_id.website or ''}\n"
+"% endif\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: model:process.transition.action,name:sale.process_transition_action_validate0
+msgid "Validate"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Confirm Order"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_saleprocurement0
+msgid "Create Procurement Order"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0 field:sale.order,amount_tax:0
+#: field:sale.order.line,tax_id:0
+msgid "Taxes"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Sales Order ready to be invoiced"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,create_date:0
+msgid "Date on which sales order is created."
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_stock_move
+msgid "Stock Move"
+msgstr ""
+
+#. module: sale
+#: view:sale.make.invoice:0 view:sale.order.line.make.invoice:0
+msgid "Create Invoices"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Sales order created in current month"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Fax :"
+msgstr ""
+
+#. module: sale
+#: help:sale.order.line,type:0
+msgid ""
+"If 'on order', it triggers a procurement when the sale order is confirmed to "
+"create a task, purchase order or manufacturing order linked to this sale "
+"order line."
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,amount:0
+msgid "Advance Amount"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.picking_policy,charge_delivery:0
+msgid "Do you charge the delivery?"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,invoice_quantity:0
+msgid "Shipped Quantities"
+msgstr ""
+
+#. module: sale
+#: selection:sale.config.picking_policy,order_policy:0
+msgid "Invoice Based on Sales Orders"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:331
+#, python-format
+msgid ""
+"If you change the pricelist of this order (and eventually the currency), "
+"prices of existing order lines will not be updated."
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_stock_picking
+msgid "Picking List"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:412 code:addons/sale/sale.py:503
+#: code:addons/sale/sale.py:632 code:addons/sale/sale.py:1016
+#: code:addons/sale/sale.py:1033
+#, python-format
+msgid "Error !"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:603
+#, python-format
+msgid "Could not cancel sales order !"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Qty(UoM)"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered Year of the sales order"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "July"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,procurement_id:0
+msgid "Procurement"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0 selection:sale.report,state:0
+msgid "Shipping Exception"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:1156
+#, python-format
+msgid "Picking Information ! : "
+msgstr ""
+
+#. module: sale
+#: field:sale.make.invoice,grouped:0
+msgid "Group the invoices"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,order_policy:0
+msgid "Invoice Policy"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_config_picking_policy
+#: view:sale.config.picking_policy:0
+msgid "Setup your Invoicing Method"
+msgstr ""
+
+#. module: sale
+#: model:process.node,note:sale.process_node_invoice0
+msgid "To be reviewed by the accountant."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Reference UoM"
+msgstr ""
+
+#. module: sale
+#: view:sale.config.picking_policy:0
+msgid ""
+"This tool will help you to install the right module and configure the system "
+"according to the method you use to invoice your customers."
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_order_line_make_invoice
+msgid "Sale OrderLine Make_invoice"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0 selection:sale.report,state:0
+msgid "Invoice Exception"
+msgstr ""
+
+#. module: sale
+#: model:process.node,note:sale.process_node_saleorder0
+msgid "Drives procurement and invoicing"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,invoiced:0
+msgid "Paid"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_report_all
+#: model:ir.ui.menu,name:sale.menu_report_product_all view:sale.report:0
+msgid "Sales Analysis"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:1151
+#, python-format
+msgid ""
+"You selected a quantity of %d Units.\n"
+"But it's not compatible with the selected packaging.\n"
+"Here is a proposition of quantities according to the packaging:\n"
+"EAN: %s Quantity: %s Type of ul: %s"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Recreate Packing"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0 field:sale.order.line,property_ids:0
+msgid "Properties"
+msgstr ""
+
+#. module: sale
+#: model:process.node,name:sale.process_node_quotation0
+#: selection:sale.order,state:0 selection:sale.report,state:0
+msgid "Quotation"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_invoice0
+msgid ""
+"The Salesman creates an invoice manually, if the sales order shipping policy "
+"is 'Shipping and Manual in Progress'. The invoice is created automatically "
+"if the shipping policy is 'Payment before Delivery'."
+msgstr ""
+
+#. module: sale
+#: help:sale.config.picking_policy,order_policy:0
+msgid ""
+"You can generate invoices based on sales orders or based on shippings."
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Confirmed sale order lines, not yet delivered"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:473
+#, python-format
+msgid "Customer Invoices"
+msgstr ""
+
+#. module: sale
+#: model:process.process,name:sale.process_process_salesprocess0
+#: view:sale.order:0 view:sale.report:0
+msgid "Sales"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0 field:sale.order.line,price_unit:0
+msgid "Unit Price"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0 view:sale.order.line:0
+#: selection:sale.order.line,state:0 selection:sale.report,state:0
+msgid "Done"
+msgstr ""
+
+#. module: sale
+#: model:process.node,name:sale.process_node_invoice0
+#: model:process.node,name:sale.process_node_invoiceafterdelivery0
+msgid "Invoice"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:1171
+#, python-format
+msgid ""
+"You have to select a customer in the sales form !\n"
+"Please set one customer before choosing a product."
+msgstr ""
+
+#. module: sale
+#: field:sale.order,origin:0
+msgid "Source Document"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "To Do"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,picking_policy:0
+msgid "Picking Policy"
+msgstr ""
+
+#. module: sale
+#: model:process.node,note:sale.process_node_deliveryorder0
+msgid "Document of the move to the customer."
+msgstr ""
+
+#. module: sale
+#: help:sale.order,amount_untaxed:0
+msgid "The amount without tax."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:604
+#, python-format
+msgid "You must first cancel all picking attached to this sales order."
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_advance_payment_inv
+msgid "Sales Advance Payment Invoice"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0 field:sale.report,month:0
+msgid "Month"
+msgstr ""
+
+#. module: sale
+#: model:email.template,subject:sale.email_template_edi_sale
+msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0 field:sale.order.line,product_id:0
+#: view:sale.report:0 field:sale.report,product_id:0
+msgid "Product"
+msgstr ""
+
+#. module: sale
+#: model:process.transition.action,name:sale.process_transition_action_cancelassignation0
+msgid "Cancel Assignation"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_config_picking_policy
+msgid "sale.config.picking_policy"
+msgstr ""
+
+#. module: sale
+#: view:account.invoice.report:0 view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_turnover_by_month
+msgid "Monthly Turnover"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,invoice_quantity:0
+msgid "Invoice on"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Date Ordered"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,product_uos:0
+msgid "Product UoS"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,state:0
+msgid "Manual In Progress"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,product_uom:0
+msgid "Product UoM"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Logistic"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Order"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:1017
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:71
+#, python-format
+msgid "There is no income account defined for this product: \"%s\" (id:%d)"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Ignore Exception"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_saleinvoice0
+msgid ""
+"Depending on the Invoicing control of the sales order, the invoice can be "
+"based on delivered or on ordered quantities. Thus, a sales order can "
+"generates an invoice or a delivery order as soon as it is confirmed by the "
+"salesman."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:1251
+#, python-format
+msgid ""
+"You plan to sell %.2f %s but you only have %.2f %s available !\n"
+"The real stock is %.2f %s. (without reservations)"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "States"
+msgstr ""
+
+#. module: sale
+#: view:sale.config.picking_policy:0
+msgid "res_config_contents"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,client_order_ref:0
+msgid "Customer Reference"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,amount_total:0 view:sale.order.line:0
+msgid "Total"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0 view:sale.order.line:0
+msgid "Price"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_deliver0
+msgid ""
+"Depending on the configuration of the location Output, the move between the "
+"output area and the customer is done through the Delivery Order manually or "
+"automatically."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "Pay before delivery"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0 model:ir.actions.act_window,name:sale.open_board_sales
+msgid "Sales Dashboard"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
+#: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
+#: view:sale.order:0
+msgid "Make Invoices"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0 selection:sale.order,state:0 view:sale.order.line:0
+msgid "To Invoice"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,date_confirm:0
+msgid "Date on which sales order is confirmed."
+msgstr ""
+
+#. module: sale
+#: field:sale.order,project_id:0
+msgid "Contract/Analytic Account"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,company_id:0 field:sale.order.line,company_id:0
+#: view:sale.report:0 field:sale.report,company_id:0
+#: field:sale.shop,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: sale
+#: field:sale.make.invoice,invoice_date:0
+msgid "Invoice Date"
+msgstr ""
+
+#. module: sale
+#: help:sale.advance.payment.inv,amount:0
+msgid "The amount to be invoiced in advance."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:1269
+#, python-format
+msgid ""
+"Couldn't find a pricelist line matching this product and quantity.\n"
+"You have to change either the product, the quantity or the pricelist."
+msgstr ""
+
+#. module: sale
+#: help:sale.order,picking_ids:0
+msgid ""
+"This is a list of picking that has been generated for this sales order."
+msgstr ""
+
+#. module: sale
+#: view:sale.make.invoice:0 view:sale.order.line.make.invoice:0
+msgid "Create invoices"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Net Total :"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0 selection:sale.order.line,state:0
+#: selection:sale.report,state:0
+msgid "Cancelled"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines related to a Sales Order of mine"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_shop_form
+#: model:ir.ui.menu,name:sale.menu_action_shop_form field:sale.order,shop_id:0
+#: view:sale.report:0 field:sale.report,shop_id:0
+msgid "Shop"
+msgstr ""
+
+#. module: sale
+#: field:sale.report,date_confirm:0
+msgid "Date Confirm"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:113
+#, python-format
+msgid "Warning"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_view_sales_by_month
+msgid "Sales by Month"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_order
+#: model:process.node,name:sale.process_node_order0
+#: model:process.node,name:sale.process_node_saleorder0
+#: model:res.request.link,name:sale.req_link_sale_order view:sale.order:0
+#: field:stock.picking,sale_id:0
+msgid "Sales Order"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,product_uos_qty:0
+msgid "Quantity (UoS)"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sale Order Lines that are in 'done' state"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_packing0
+msgid ""
+"The Pick List form is created as soon as the sales order is confirmed, in "
+"the same time as the procurement order. It represents the assignment of "
+"parts to the sales order. There is 1 pick list by sales order line which "
+"evolves with the availability of parts."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order.line,state:0
+msgid "Confirmed"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.picking_policy,order_policy:0
+msgid "Main Method Based On"
+msgstr ""
+
+#. module: sale
+#: model:process.transition.action,name:sale.process_transition_action_confirm0
+msgid "Confirm"
+msgstr ""
+
+#. module: sale
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_sales_product_total_price
+msgid "Sales by Product's Category in last 90 days"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0 field:sale.order.line,invoice_lines:0
+msgid "Invoice Lines"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
+#: view:sale.order:0 view:sale.order.line:0
+msgid "Sales Order Lines"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,delay:0
+msgid "Delivery Lead Time"
+msgstr ""
+
+#. module: sale
+#: view:res.company:0
+msgid "Configuration"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/edi/sale_order.py:146
+#, python-format
+msgid "EDI Pricelist (%s)"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Print Order"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Sales order created in current year"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:113
+#, python-format
+msgid ""
+"Invoice cannot be created for this Sales Order Line due to one of the "
+"following reasons:\n"
+"1.The state of this sales order line is either \"draft\" or \"cancel\"!\n"
+"2.The Sales Order Line is Invoiced!"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sale order lines done"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,th_weight:0
+msgid "Weight"
+msgstr ""
+
+#. module: sale
+#: view:sale.open.invoice:0 view:sale.order:0 field:sale.order,invoice_ids:0
+msgid "Invoices"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "December"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.picking_policy,config_logo:0
+msgid "Image"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_saleprocurement0
+msgid ""
+"A procurement order is automatically created as soon as a sales order is "
+"confirmed or as the invoice is paid. It drives the purchasing and the "
+"production of products regarding to the rules and to the sales order's "
+"parameters. "
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Uninvoiced"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0 view:sale.order:0 field:sale.order,user_id:0
+#: view:sale.order.line:0 field:sale.order.line,salesman_id:0
+#: view:sale.report:0 field:sale.report,user_id:0
+msgid "Salesman"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree
+msgid "Old Quotations"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,amount_untaxed:0
+msgid "Untaxed Amount"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:170
+#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
+#: view:sale.advance.payment.inv:0 view:sale.order:0
+#, python-format
+msgid "Advance Invoice"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:624
+#, python-format
+msgid "The sales order '%s' has been cancelled."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order.line,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: sale
+#: help:sale.order.line,state:0
+msgid ""
+"* The 'Draft' state is set when the related sales order in draft state.      "
+"               \n"
+"* The 'Confirmed' state is set when the related sales order is confirmed.    "
+"                 \n"
+"* The 'Exception' state is set when the related sales order is set as "
+"exception.                     \n"
+"* The 'Done' state is set when the sales order line has been picked.         "
+"            \n"
+"* The 'Cancelled' state is set when a user cancel the sales order related."
+msgstr ""
+
+#. module: sale
+#: help:sale.order,amount_tax:0
+msgid "The tax amount."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Packings"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sale Order Lines ready to be invoiced"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Sales order created in last month"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_email_templates
+#: model:ir.ui.menu,name:sale.menu_email_templates
+msgid "Email Templates"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_form
+#: model:ir.ui.menu,name:sale.menu_sale_order view:sale.order:0
+msgid "Sales Orders"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_shop view:sale.shop:0
+msgid "Sales Shop"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "November"
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,product_id:0
+msgid "Advance Product"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Compute"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:618
+#, python-format
+msgid "You must first cancel all invoices attached to this sales order."
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "January"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree4
+msgid "Sales Order in Progress"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,origin:0
+msgid "Reference of the document that generated this sales order request."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0 field:sale.report,delay:0
+msgid "Commitment Delay"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "Deliver & invoice on demand"
+msgstr ""
+
+#. module: sale
+#: model:process.node,note:sale.process_node_saleprocurement0
+msgid ""
+"One Procurement order for each sales order line and for each of the "
+"components."
+msgstr ""
+
+#. module: sale
+#: model:process.transition.action,name:sale.process_transition_action_assign0
+msgid "Assign"
+msgstr ""
+
+#. module: sale
+#: field:sale.report,date:0
+msgid "Date Order"
+msgstr ""
+
+#. module: sale
+#: model:process.node,note:sale.process_node_order0
+msgid "Confirmed sales order to invoice."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Sales Order that haven't yet been confirmed"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:322
+#, python-format
+msgid "The sales order '%s' has been set in draft state."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order.line,type:0
+msgid "from stock"
+msgstr ""
+
+#. module: sale
+#: view:sale.open.invoice:0
+msgid "Close"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:1261
+#, python-format
+msgid "No Pricelist ! : "
+msgstr ""
+
+#. module: sale
+#: field:sale.order,shipped:0
+msgid "Delivered"
+msgstr ""
+
+#. module: sale
+#: constraint:stock.move:0
+msgid "You must assign a production lot for this product"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_shop_form
+msgid ""
+"If you have more than one shop reselling your company products, you can "
+"create and manage that from here. Whenever you will record a new quotation "
+"or sales order, it has to be linked to a shop. The shop also defines the "
+"warehouse from which the products will be delivered for each particular "
+"sales."
+msgstr ""
+
+#. module: sale
+#: help:sale.order,invoiced:0
+msgid "It indicates that an invoice has been paid."
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0 field:sale.order.line,name:0
+msgid "Description"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "May"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0 field:sale.order,partner_id:0
+#: field:sale.order.line,order_partner_id:0
+msgid "Customer"
+msgstr ""
+
+#. module: sale
+#: model:product.template,name:sale.advance_product_0_product_template
+msgid "Advance"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "February"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "April"
+msgstr ""
+
+#. module: sale
+#: view:sale.shop:0
+msgid "Accounting"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0 view:sale.order.line:0
+msgid "Search Sales Order"
+msgstr ""
+
+#. module: sale
+#: model:process.node,name:sale.process_node_saleorderprocurement0
+msgid "Sales Order Requisition"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:1255
+#, python-format
+msgid "Not enough stock ! : "
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0 field:sale.order,payment_term:0
+msgid "Payment Term"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_order_report_all
+msgid ""
+"This report performs analysis on your quotations and sales orders. Analysis "
+"check your sales revenues and sort it by different group criteria (salesman, "
+"partner, product, etc.) Use this report to perform analysis on sales not "
+"having invoiced yet. If you want to analyse your turnover, you should use "
+"the Invoice Analysis report in the Accounting application."
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Quotation N°"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,picked_rate:0 view:sale.report:0
+msgid "Picked"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0 field:sale.report,year:0
+msgid "Year"
+msgstr ""
+
+#. module: sale
+#: selection:sale.config.picking_policy,order_policy:0
+msgid "Invoice Based on Deliveries"
+msgstr ""
diff --git a/addons/sale/i18n/lt.po b/addons/sale/i18n/lt.po
index 4c6f9c408c6..b4a73722c78 100644
--- a/addons/sale/i18n/lt.po
+++ b/addons/sale/i18n/lt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:47+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:57+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: sale
 #: field:sale.config.picking_policy,timesheet:0
@@ -1116,7 +1116,7 @@ msgid "Document of the move to the output or to the customer."
 msgstr ""
 
 #. module: sale
-#: model:email.template,body_text:sale.email_template_edi_sale
+#: model:email.template,body:sale.email_template_edi_sale
 msgid ""
 "\n"
 "Hello${object.partner_order_id.name and ' ' or "
diff --git a/addons/sale/i18n/lv.po b/addons/sale/i18n/lv.po
index c9159c0510d..2fc27ce217e 100644
--- a/addons/sale/i18n/lv.po
+++ b/addons/sale/i18n/lv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:47+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:57+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: sale
 #: field:sale.config.picking_policy,timesheet:0
@@ -1094,7 +1094,7 @@ msgid "Document of the move to the output or to the customer."
 msgstr ""
 
 #. module: sale
-#: model:email.template,body_text:sale.email_template_edi_sale
+#: model:email.template,body:sale.email_template_edi_sale
 msgid ""
 "\n"
 "Hello${object.partner_order_id.name and ' ' or "
diff --git a/addons/sale/i18n/mn.po b/addons/sale/i18n/mn.po
index 510ce319a32..b1de7eb2e73 100644
--- a/addons/sale/i18n/mn.po
+++ b/addons/sale/i18n/mn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:47+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:57+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: sale
 #: field:sale.config.picking_policy,timesheet:0
@@ -1156,7 +1156,7 @@ msgid "Document of the move to the output or to the customer."
 msgstr "Гарах байрлал эсвэл захиалагч руу хөдөлгөөний баримт"
 
 #. module: sale
-#: model:email.template,body_text:sale.email_template_edi_sale
+#: model:email.template,body:sale.email_template_edi_sale
 msgid ""
 "\n"
 "Hello${object.partner_order_id.name and ' ' or "
diff --git a/addons/sale/i18n/nb.po b/addons/sale/i18n/nb.po
index ccd13a352f1..5ad4b51a646 100644
--- a/addons/sale/i18n/nb.po
+++ b/addons/sale/i18n/nb.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:47+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:57+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: sale
 #: field:sale.config.picking_policy,timesheet:0
@@ -505,6 +505,8 @@ msgid ""
 "Select a product of type service which is called 'Advance Product'. You may "
 "have to create it and set it as a default value on this field."
 msgstr ""
+"Velg et produkt av typen tjeneste som kalles 'Forhånsfakturert produkt'. Du "
+"må kanskje opprette den og sette den som en standar verdi på dette feltet."
 
 #. module: sale
 #: report:sale.order:0
@@ -518,6 +520,8 @@ msgid ""
 "You cannot make an advance on a sales order                              "
 "that is defined as 'Automatic Invoice after delivery'."
 msgstr ""
+"Du kan ikke lage et forskudd på en salgsordre som er definert som "
+"'Automatisk faktura etter levering'."
 
 #. module: sale
 #: view:sale.order:0 field:sale.order,note:0 view:sale.order.line:0
@@ -856,6 +860,8 @@ msgid ""
 "It indicates that the sales order has been delivered. This field is updated "
 "only after the scheduler(s) have been launched."
 msgstr ""
+"Den indikerer at salgsordren har blitt levert. Dette feltet blir oppdatert "
+"kun etter at planleggeren(e) har blitt lansert."
 
 #. module: sale
 #: field:sale.order,date_order:0
@@ -887,6 +893,11 @@ msgid ""
 "The 'Waiting Schedule' state is set when the invoice is confirmed but "
 "waiting for the scheduler to run on the order date."
 msgstr ""
+"Viser status for forespørsel eller salgsordre.\n"
+"Statusen 'Unntak' settes automatisk når det skjer en avbrytelse ved "
+"fakturering (faktureringsunntak) eller plukking (forsendelsesunntak).\n"
+"Statusen 'Avventer planlegging' settes når faktura er bekreftet men ordren "
+"venter på kjøring av planleggeren."
 
 #. module: sale
 #: code:addons/sale/sale.py:1272
@@ -1003,7 +1014,7 @@ msgstr "Åpne faktura"
 #. module: sale
 #: model:ir.actions.server,name:sale.ir_actions_server_edi_sale
 msgid "Auto-email confirmed sale orders"
-msgstr ""
+msgstr "Auto e-post bekreftede salgsordre"
 
 #. module: sale
 #: code:addons/sale/sale.py:413
@@ -1144,10 +1155,10 @@ msgstr "Sett til forslag"
 #. module: sale
 #: model:process.node,note:sale.process_node_packinglist0
 msgid "Document of the move to the output or to the customer."
-msgstr ""
+msgstr "Dokumentering av bevegelse til utgående lokasjon eller kunde."
 
 #. module: sale
-#: model:email.template,body_text:sale.email_template_edi_sale
+#: model:email.template,body:sale.email_template_edi_sale
 msgid ""
 "\n"
 "Hello${object.partner_order_id.name and ' ' or "
@@ -1405,7 +1416,7 @@ msgstr ""
 #. module: sale
 #: model:ir.model,name:sale.model_sale_order_line_make_invoice
 msgid "Sale OrderLine Make_invoice"
-msgstr ""
+msgstr "Sale OrderLine Make_invoice"
 
 #. module: sale
 #: selection:sale.order,state:0 selection:sale.report,state:0
@@ -1445,7 +1456,7 @@ msgstr ""
 #. module: sale
 #: view:sale.order:0
 msgid "Recreate Packing"
-msgstr ""
+msgstr "Gjenskap pakking"
 
 #. module: sale
 #: view:sale.order:0 field:sale.order.line,property_ids:0
@@ -1537,7 +1548,7 @@ msgstr "Regler for plukking"
 #. module: sale
 #: model:process.node,note:sale.process_node_deliveryorder0
 msgid "Document of the move to the customer."
-msgstr ""
+msgstr "Dokument av forsendelsen til kunden."
 
 #. module: sale
 #: help:sale.order,amount_untaxed:0
@@ -1830,6 +1841,9 @@ msgid ""
 "parts to the sales order. There is 1 pick list by sales order line which "
 "evolves with the availability of parts."
 msgstr ""
+"Plukklisten dannes umiddelbart når en salgsordre bekreftes, samtidig med "
+"anskaffelsesordren. Den tilordner varer til salgsordren. Det dannes en "
+"plukkliste til salgsordren som utvides løpende med tilgjengelige produkter."
 
 #. module: sale
 #: selection:sale.order.line,state:0
@@ -1909,7 +1923,7 @@ msgstr ""
 #. module: sale
 #: view:sale.order.line:0
 msgid "Sale order lines done"
-msgstr ""
+msgstr "Salgsordrelinjer ferdig"
 
 #. module: sale
 #: field:sale.order.line,th_weight:0
@@ -1939,6 +1953,9 @@ msgid ""
 "production of products regarding to the rules and to the sales order's "
 "parameters. "
 msgstr ""
+"En anskaffelsesordre dannes automatisk når en salgsordre bekreftes eller "
+"faktura er betalt. Denne driver innkjøp og/eller produksjon av produktet i "
+"henhold til anskaffelsesregler og parametere på salgsordren. "
 
 #. module: sale
 #: view:sale.order.line:0
@@ -2008,7 +2025,7 @@ msgstr "MVA beløp."
 #. module: sale
 #: view:sale.order:0
 msgid "Packings"
-msgstr ""
+msgstr "Pakkinger"
 
 #. module: sale
 #: view:sale.order.line:0
@@ -2035,7 +2052,7 @@ msgstr "Salgsordre"
 #. module: sale
 #: model:ir.model,name:sale.model_sale_shop view:sale.shop:0
 msgid "Sales Shop"
-msgstr ""
+msgstr "Butikk"
 
 #. module: sale
 #: selection:sale.report,month:0
@@ -2045,7 +2062,7 @@ msgstr "November"
 #. module: sale
 #: field:sale.advance.payment.inv,product_id:0
 msgid "Advance Product"
-msgstr ""
+msgstr "Forhåndsfakturert produkt"
 
 #. module: sale
 #: view:sale.order:0
@@ -2073,16 +2090,17 @@ msgstr "Salgsordre i arbeid"
 #: help:sale.order,origin:0
 msgid "Reference of the document that generated this sales order request."
 msgstr ""
+"Referanse til dokumentet som genererte denne salgsordreforespørselen."
 
 #. module: sale
 #: view:sale.report:0 field:sale.report,delay:0
 msgid "Commitment Delay"
-msgstr ""
+msgstr "Bekreftelsesforsinkelse"
 
 #. module: sale
 #: selection:sale.order,order_policy:0
 msgid "Deliver & invoice on demand"
-msgstr ""
+msgstr "Lever og fakturer på etterspørsel"
 
 #. module: sale
 #: model:process.node,note:sale.process_node_saleprocurement0
@@ -2090,6 +2108,7 @@ msgid ""
 "One Procurement order for each sales order line and for each of the "
 "components."
 msgstr ""
+"En anskaffelsesordre for hver salgsordrelinje og for hver av komponentene."
 
 #. module: sale
 #: model:process.transition.action,name:sale.process_transition_action_assign0
@@ -2152,6 +2171,10 @@ msgid ""
 "warehouse from which the products will be delivered for each particular "
 "sales."
 msgstr ""
+"Hvis du har mer enn en butikk som selger selskapet ditt sine produkter, kan "
+"du opprette og administrere det herfra. Når du vil lage et nytt tilbud eller "
+"en ny salgsordre, må den bli knyttet til en butikk. Butikken definerer også "
+"lageret fra hvilke produkter som vil bli levert for hvert eneste salg."
 
 #. module: sale
 #: help:sale.order,invoiced:0
@@ -2202,13 +2225,13 @@ msgstr "Søk salgsordre"
 #. module: sale
 #: model:process.node,name:sale.process_node_saleorderprocurement0
 msgid "Sales Order Requisition"
-msgstr ""
+msgstr "Salgsordre rekvisisjon"
 
 #. module: sale
 #: code:addons/sale/sale.py:1255
 #, python-format
 msgid "Not enough stock ! : "
-msgstr ""
+msgstr "Ikke nok lager!: "
 
 #. module: sale
 #: report:sale.order:0 field:sale.order,payment_term:0
@@ -2224,6 +2247,11 @@ msgid ""
 "having invoiced yet. If you want to analyse your turnover, you should use "
 "the Invoice Analysis report in the Accounting application."
 msgstr ""
+"Denne rapporten analyserer dine sitater og salgsordrer. Analysen sjekker "
+"salgsinntekter og sorterer de ved annen gruppe kriterier (selger, partner, "
+"produkt, etc.) Bruk denne rapporten til å utføre analyser på salg du ikke "
+"har fakturert enda. Hvis du ønsker å analysere din omsetning, bør du bruke "
+"fakturaen analyserapporten i Regnskap søknaden."
 
 #. module: sale
 #: report:sale.order:0
diff --git a/addons/sale/i18n/nl.po b/addons/sale/i18n/nl.po
index 11b49a91d61..0a443827877 100644
--- a/addons/sale/i18n/nl.po
+++ b/addons/sale/i18n/nl.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 01:37+0100\n"
-"PO-Revision-Date: 2012-05-10 17:57+0000\n"
-"Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
+"PO-Revision-Date: 2012-08-26 14:09+0000\n"
+"Last-Translator: Erwin <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: 2012-08-09 04:46+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:57+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: sale
 #: field:sale.config.picking_policy,timesheet:0
@@ -91,7 +91,7 @@ msgstr "Waarschuwing !"
 #. module: sale
 #: report:sale.order:0
 msgid "Tax"
-msgstr ""
+msgstr "Belasting"
 
 #. module: sale
 #: model:process.node,note:sale.process_node_saleorderprocurement0
@@ -901,9 +901,9 @@ msgid ""
 "waiting for the scheduler to run on the order date."
 msgstr ""
 "Geeft de status van de offerte of verkooporder.\n"
-"De fout staat wordt automatisch ingesteld wanneer een annuleringsopdracht "
-"plaatsvindt bij de factuurvalidatie (Factureerfout) of in het pickinglijst "
-"proces (verzendingsfout).\n"
+"De foutsituatie wordt automatisch ingesteld wanneer een annuleringsopdracht "
+"plaatsvindt bij de factuurvalidatie (Factureerfout) of in het verzamelproces "
+"(verzendingsfout).\n"
 "De 'Wacht op planner' staat wordt ingesteld wanneer de factuur is bevestigd, "
 "maar wacht deze op de planner, als deze start op de orderdatum."
 
@@ -1172,7 +1172,7 @@ msgid "Document of the move to the output or to the customer."
 msgstr "Document van de mutatie naar de expeditie of naar de klant."
 
 #. module: sale
-#: model:email.template,body_text:sale.email_template_edi_sale
+#: model:email.template,body:sale.email_template_edi_sale
 msgid ""
 "\n"
 "Hello${object.partner_order_id.name and ' ' or "
diff --git a/addons/sale/i18n/nl_BE.po b/addons/sale/i18n/nl_BE.po
index aa2d38bb69c..8e13f94c004 100644
--- a/addons/sale/i18n/nl_BE.po
+++ b/addons/sale/i18n/nl_BE.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:47+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:58+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: sale
 #: field:sale.config.picking_policy,timesheet:0
@@ -1165,7 +1165,7 @@ msgid "Document of the move to the output or to the customer."
 msgstr "Document van de verplaatsing naar de verzendzone of naar de klant."
 
 #. module: sale
-#: model:email.template,body_text:sale.email_template_edi_sale
+#: model:email.template,body:sale.email_template_edi_sale
 msgid ""
 "\n"
 "Hello${object.partner_order_id.name and ' ' or "
diff --git a/addons/sale/i18n/oc.po b/addons/sale/i18n/oc.po
index 216b9d3227c..bf3da283f04 100644
--- a/addons/sale/i18n/oc.po
+++ b/addons/sale/i18n/oc.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:47+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:57+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: sale
 #: field:sale.config.picking_policy,timesheet:0
@@ -1094,7 +1094,7 @@ msgid "Document of the move to the output or to the customer."
 msgstr ""
 
 #. module: sale
-#: model:email.template,body_text:sale.email_template_edi_sale
+#: model:email.template,body:sale.email_template_edi_sale
 msgid ""
 "\n"
 "Hello${object.partner_order_id.name and ' ' or "
diff --git a/addons/sale/i18n/pl.po b/addons/sale/i18n/pl.po
index ba2123a2ff9..fb7a4b602ff 100644
--- a/addons/sale/i18n/pl.po
+++ b/addons/sale/i18n/pl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:47+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:57+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: sale
 #: field:sale.config.picking_policy,timesheet:0
@@ -1157,7 +1157,7 @@ msgid "Document of the move to the output or to the customer."
 msgstr "Dokument przesunięcia do klienta."
 
 #. module: sale
-#: model:email.template,body_text:sale.email_template_edi_sale
+#: model:email.template,body:sale.email_template_edi_sale
 msgid ""
 "\n"
 "Hello${object.partner_order_id.name and ' ' or "
diff --git a/addons/sale/i18n/pt.po b/addons/sale/i18n/pt.po
index 474cf20ddae..b01e36597d4 100644
--- a/addons/sale/i18n/pt.po
+++ b/addons/sale/i18n/pt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:47+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:58+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: sale
 #: field:sale.config.picking_policy,timesheet:0
@@ -1165,7 +1165,7 @@ msgid "Document of the move to the output or to the customer."
 msgstr "Documento do movimento para a saída ou para o cliente."
 
 #. module: sale
-#: model:email.template,body_text:sale.email_template_edi_sale
+#: model:email.template,body:sale.email_template_edi_sale
 msgid ""
 "\n"
 "Hello${object.partner_order_id.name and ' ' or "
diff --git a/addons/sale/i18n/pt_BR.po b/addons/sale/i18n/pt_BR.po
index a0da9610357..eea6b03757e 100644
--- a/addons/sale/i18n/pt_BR.po
+++ b/addons/sale/i18n/pt_BR.po
@@ -9,13 +9,14 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 01:37+0100\n"
 "PO-Revision-Date: 2012-07-28 16:28+0000\n"
-"Last-Translator: Fábio Martinelli <webmaster@guaru.net>\n"
+"Last-Translator: Fábio Martinelli - http://zupy.com.br "
+"<webmaster@guaru.net>\n"
 "Language-Team: <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: 2012-08-09 04:47+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:58+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: sale
 #: field:sale.config.picking_policy,timesheet:0
@@ -1170,7 +1171,7 @@ msgid "Document of the move to the output or to the customer."
 msgstr "Documento de movimento para a saída ou para o cliente."
 
 #. module: sale
-#: model:email.template,body_text:sale.email_template_edi_sale
+#: model:email.template,body:sale.email_template_edi_sale
 msgid ""
 "\n"
 "Hello${object.partner_order_id.name and ' ' or "
diff --git a/addons/sale/i18n/ro.po b/addons/sale/i18n/ro.po
index f8cd4e82e01..b8aa0abdf93 100644
--- a/addons/sale/i18n/ro.po
+++ b/addons/sale/i18n/ro.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:47+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:58+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: sale
 #: field:sale.config.picking_policy,timesheet:0
@@ -80,7 +80,7 @@ msgstr "Cotația '%s' a fost schimbata intr-o comanda de vanzare."
 #. module: sale
 #: view:sale.order:0
 msgid "Print Quotation"
-msgstr "Printeaza Cotatia"
+msgstr "Tipareste oferta"
 
 #. module: sale
 #: code:addons/sale/wizard/sale_make_invoice.py:42
@@ -1173,7 +1173,7 @@ msgid "Document of the move to the output or to the customer."
 msgstr "Documentul miscarii catre iesire sau catre client."
 
 #. module: sale
-#: model:email.template,body_text:sale.email_template_edi_sale
+#: model:email.template,body:sale.email_template_edi_sale
 msgid ""
 "\n"
 "Hello${object.partner_order_id.name and ' ' or "
diff --git a/addons/sale/i18n/ru.po b/addons/sale/i18n/ru.po
index 8bbf5997a47..6b4294b5c3c 100644
--- a/addons/sale/i18n/ru.po
+++ b/addons/sale/i18n/ru.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:47+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:58+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: sale
 #: field:sale.config.picking_policy,timesheet:0
@@ -1136,7 +1136,7 @@ msgid "Document of the move to the output or to the customer."
 msgstr "Документ перемещения на выход или заказчику."
 
 #. module: sale
-#: model:email.template,body_text:sale.email_template_edi_sale
+#: model:email.template,body:sale.email_template_edi_sale
 msgid ""
 "\n"
 "Hello${object.partner_order_id.name and ' ' or "
diff --git a/addons/sale/i18n/sale.pot b/addons/sale/i18n/sale.pot
index 2c477d1d7a0..393b3e59db3 100644
--- a/addons/sale/i18n/sale.pot
+++ b/addons/sale/i18n/sale.pot
@@ -1112,7 +1112,7 @@ msgid "Document of the move to the output or to the customer."
 msgstr ""
 
 #. module: sale
-#: model:email.template,body_text:sale.email_template_edi_sale
+#: model:email.template,body:sale.email_template_edi_sale
 msgid ""
 "\n"
 "Hello${object.partner_order_id.name and ' ' or ''}${object.partner_order_id."
diff --git a/addons/sale/i18n/sk.po b/addons/sale/i18n/sk.po
index 6876c36f26f..2f4b6c6c332 100644
--- a/addons/sale/i18n/sk.po
+++ b/addons/sale/i18n/sk.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:47+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:58+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: sale
 #: field:sale.config.picking_policy,timesheet:0
@@ -1105,7 +1105,7 @@ msgid "Document of the move to the output or to the customer."
 msgstr ""
 
 #. module: sale
-#: model:email.template,body_text:sale.email_template_edi_sale
+#: model:email.template,body:sale.email_template_edi_sale
 msgid ""
 "\n"
 "Hello${object.partner_order_id.name and ' ' or "
diff --git a/addons/sale/i18n/sl.po b/addons/sale/i18n/sl.po
index 234ef899e9f..138e96fd061 100644
--- a/addons/sale/i18n/sl.po
+++ b/addons/sale/i18n/sl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:47+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:58+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: sale
 #: field:sale.config.picking_policy,timesheet:0
@@ -1107,7 +1107,7 @@ msgid "Document of the move to the output or to the customer."
 msgstr "Dokument pemika za izhod ali za stranko"
 
 #. module: sale
-#: model:email.template,body_text:sale.email_template_edi_sale
+#: model:email.template,body:sale.email_template_edi_sale
 msgid ""
 "\n"
 "Hello${object.partner_order_id.name and ' ' or "
diff --git a/addons/sale/i18n/sq.po b/addons/sale/i18n/sq.po
index 0f8bb318d32..32ddc7f40d5 100644
--- a/addons/sale/i18n/sq.po
+++ b/addons/sale/i18n/sq.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:46+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:57+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: sale
 #: field:sale.config.picking_policy,timesheet:0
@@ -1094,7 +1094,7 @@ msgid "Document of the move to the output or to the customer."
 msgstr ""
 
 #. module: sale
-#: model:email.template,body_text:sale.email_template_edi_sale
+#: model:email.template,body:sale.email_template_edi_sale
 msgid ""
 "\n"
 "Hello${object.partner_order_id.name and ' ' or "
diff --git a/addons/sale/i18n/sr.po b/addons/sale/i18n/sr.po
index 71582ab9114..bfb6ce674ce 100644
--- a/addons/sale/i18n/sr.po
+++ b/addons/sale/i18n/sr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:47+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:58+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: sale
 #: field:sale.config.picking_policy,timesheet:0
@@ -1108,7 +1108,7 @@ msgid "Document of the move to the output or to the customer."
 msgstr "Dokumenat za pomeranje na izlaz ili za kupca."
 
 #. module: sale
-#: model:email.template,body_text:sale.email_template_edi_sale
+#: model:email.template,body:sale.email_template_edi_sale
 msgid ""
 "\n"
 "Hello${object.partner_order_id.name and ' ' or "
diff --git a/addons/sale/i18n/sr@latin.po b/addons/sale/i18n/sr@latin.po
index d1b42d66fcd..ea9e5039c37 100644
--- a/addons/sale/i18n/sr@latin.po
+++ b/addons/sale/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:47+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:58+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: sale
 #: field:sale.config.picking_policy,timesheet:0
@@ -1108,7 +1108,7 @@ msgid "Document of the move to the output or to the customer."
 msgstr "Dokumenat za pomeranje na izlaz ili za kupca."
 
 #. module: sale
-#: model:email.template,body_text:sale.email_template_edi_sale
+#: model:email.template,body:sale.email_template_edi_sale
 msgid ""
 "\n"
 "Hello${object.partner_order_id.name and ' ' or "
diff --git a/addons/sale/i18n/sv.po b/addons/sale/i18n/sv.po
index 2775773762e..1197192d3fe 100644
--- a/addons/sale/i18n/sv.po
+++ b/addons/sale/i18n/sv.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:47+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:58+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: sale
 #: field:sale.config.picking_policy,timesheet:0
@@ -1159,7 +1159,7 @@ msgstr ""
 "Dokumentation av bokföringstransaktionen till utleveransen eller till kunden"
 
 #. module: sale
-#: model:email.template,body_text:sale.email_template_edi_sale
+#: model:email.template,body:sale.email_template_edi_sale
 msgid ""
 "\n"
 "Hello${object.partner_order_id.name and ' ' or "
diff --git a/addons/sale/i18n/th.po b/addons/sale/i18n/th.po
index ccc722284b6..dcc9781fa1e 100644
--- a/addons/sale/i18n/th.po
+++ b/addons/sale/i18n/th.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:47+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:58+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: sale
 #: field:sale.config.picking_policy,timesheet:0
@@ -1094,7 +1094,7 @@ msgid "Document of the move to the output or to the customer."
 msgstr ""
 
 #. module: sale
-#: model:email.template,body_text:sale.email_template_edi_sale
+#: model:email.template,body:sale.email_template_edi_sale
 msgid ""
 "\n"
 "Hello${object.partner_order_id.name and ' ' or "
diff --git a/addons/sale/i18n/tlh.po b/addons/sale/i18n/tlh.po
index 3d26e3a4394..dc69b3b07c6 100644
--- a/addons/sale/i18n/tlh.po
+++ b/addons/sale/i18n/tlh.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:47+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:58+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: sale
 #: field:sale.config.picking_policy,timesheet:0
@@ -1093,7 +1093,7 @@ msgid "Document of the move to the output or to the customer."
 msgstr ""
 
 #. module: sale
-#: model:email.template,body_text:sale.email_template_edi_sale
+#: model:email.template,body:sale.email_template_edi_sale
 msgid ""
 "\n"
 "Hello${object.partner_order_id.name and ' ' or "
diff --git a/addons/sale/i18n/tr.po b/addons/sale/i18n/tr.po
index 6db99d8458e..b7578a31a2a 100644
--- a/addons/sale/i18n/tr.po
+++ b/addons/sale/i18n/tr.po
@@ -13,13 +13,13 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:47+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:58+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: sale
 #: field:sale.config.picking_policy,timesheet:0
 msgid "Based on Timesheet"
-msgstr ""
+msgstr "Zaman Çizelgesine Bağlı"
 
 #. module: sale
 #: view:sale.order.line:0
@@ -27,6 +27,8 @@ msgid ""
 "Sale Order Lines that are confirmed, done or in exception state and haven't "
 "yet been invoiced"
 msgstr ""
+"Onaylanmış, yapılmış ya da istisna durumundaki ve henüz faturalandırılmamış "
+"Satış Siparişi Satırı"
 
 #. module: sale
 #: view:board.board:0
@@ -46,7 +48,7 @@ msgstr ""
 #. module: sale
 #: view:sale.order:0
 msgid "UoS"
-msgstr ""
+msgstr "Servis Birimi"
 
 #. module: sale
 #: help:sale.order,partner_shipping_id:0
@@ -78,7 +80,7 @@ msgstr "'%s' Teklifi satış siparişine çevrildi."
 #. module: sale
 #: view:sale.order:0
 msgid "Print Quotation"
-msgstr ""
+msgstr "Teklifi Yazdır"
 
 #. module: sale
 #: code:addons/sale/wizard/sale_make_invoice.py:42
@@ -122,6 +124,9 @@ msgid ""
 "cancel a sale order, you must first cancel related picking or delivery "
 "orders."
 msgstr ""
+"Onaylanmış bir satış siparişini silmek için önce onu iptal etmelisiniz! Bir "
+"satış siparişini iptal etmek için önce ilgili toplama ve telimat emirlerini "
+"iptal etmelisiniz."
 
 #. module: sale
 #: model:process.node,name:sale.process_node_saleprocurement0
@@ -136,7 +141,7 @@ msgstr "İş ortağı"
 #. module: sale
 #: selection:sale.order,order_policy:0
 msgid "Invoice based on deliveries"
-msgstr ""
+msgstr "Teslimatlara bağlı fatura"
 
 #. module: sale
 #: view:sale.order:0
@@ -183,12 +188,12 @@ msgstr "Öntanımlı Ödeme Şartı"
 #. module: sale
 #: field:sale.config.picking_policy,deli_orders:0
 msgid "Based on Delivery Orders"
-msgstr ""
+msgstr "Teslimat Emirlerine Bağlı"
 
 #. module: sale
 #: field:sale.config.picking_policy,time_unit:0
 msgid "Main Working Time Unit"
-msgstr ""
+msgstr "Ana Çalışma Süresi Birimi"
 
 #. module: sale
 #: view:sale.order:0 view:sale.order.line:0 field:sale.order.line,state:0
@@ -214,7 +219,7 @@ msgstr "Aynı müşteriye ait faturaları gruplamak için işaretleyin"
 #. module: sale
 #: view:sale.order:0
 msgid "My Sale Orders"
-msgstr ""
+msgstr "Satış Siparişlerim"
 
 #. module: sale
 #: selection:sale.order,invoice_quantity:0
@@ -258,12 +263,12 @@ msgstr ""
 #. module: sale
 #: field:sale.config.picking_policy,task_work:0
 msgid "Based on Tasks' Work"
-msgstr ""
+msgstr "Görevlerin İşine Bağlı"
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
 msgid "Quotations and Sales"
-msgstr ""
+msgstr "Teklifler ve Satışlar"
 
 #. module: sale
 #: model:ir.model,name:sale.model_sale_make_invoice
@@ -274,7 +279,7 @@ msgstr "Satış faturalarını oluştur"
 #: code:addons/sale/sale.py:330
 #, python-format
 msgid "Pricelist Warning!"
-msgstr ""
+msgstr "Fiyat Listesi Uyarısı!"
 
 #. module: sale
 #: field:sale.order.line,discount:0
@@ -323,6 +328,17 @@ msgid ""
 "  - The 'Invoice based on deliveries' choice is used to create an invoice "
 "during the picking process."
 msgstr ""
+"Fatura Politikası fatura ve teslimat işlemlerini senkronize etmek için "
+"kullanılır.\n"
+"  - 'Teslimattan önce öde' seçimi önce faturayı oluşturur ve sonra faturanın "
+"ödenmesi üzerine toplama emrini oluşturur.\n"
+"  - 'Teslim et & istenirse Fatura kes' toplama emrini doğrudan oluşturacak "
+"ve kullanıcının elle 'Fatura' düğmesini tıklayarak satış siparişine ve satış "
+"siparişi satırlarına göre fatura oluşturmasını bekleyecek.\n"
+"  - 'Sipariş tesliminde sonra Fatura' seçimi bütün toplama listeleri "
+"tamamlandıktan sonra satış siparişine göre taslak fatura oluşturacaktır.\n"
+"  - 'Teslimata dayalı fatura' seçimi toplama işlemi sırasında fatura "
+"oluşturmak için kullanılır."
 
 #. module: sale
 #: code:addons/sale/sale.py:1171
@@ -340,7 +356,7 @@ msgstr "İstisnai Satışlar"
 #: code:addons/sale/wizard/sale_make_invoice_advance.py:70
 #, python-format
 msgid "Configuration Error !"
-msgstr ""
+msgstr "Yapılandırma Hatası!"
 
 #. module: sale
 #: view:sale.order:0
@@ -402,7 +418,7 @@ msgstr "Ekim"
 #. module: sale
 #: sql_constraint:stock.picking:0
 msgid "Reference must be unique per Company!"
-msgstr ""
+msgstr "Referans her şirket için benzersiz olmalı!"
 
 #. module: sale
 #: view:board.board:0 view:sale.order:0 view:sale.report:0
@@ -467,6 +483,7 @@ msgstr ""
 #, python-format
 msgid "You cannot cancel a sale order line that has already been invoiced!"
 msgstr ""
+"Halihazırda faturalandırılmış bir satış siparişi satırını iptal edemezsiniz!"
 
 #. module: sale
 #: code:addons/sale/sale.py:1079
@@ -515,7 +532,7 @@ msgstr "Notlar"
 #. module: sale
 #: sql_constraint:res.company:0
 msgid "The company name must be unique !"
-msgstr ""
+msgstr "Şirket adı benzersiz olmalı !"
 
 #. module: sale
 #: help:sale.order,partner_invoice_id:0
@@ -525,12 +542,12 @@ msgstr "Şu anki sipariş için fatura adresi."
 #. module: sale
 #: view:sale.report:0
 msgid "Month-1"
-msgstr ""
+msgstr "Ay-1"
 
 #. module: sale
 #: view:sale.report:0
 msgid "Ordered month of the sales order"
-msgstr ""
+msgstr "Satış siparişlerinin verildiği ay"
 
 #. module: sale
 #: code:addons/sale/sale.py:504
@@ -538,11 +555,12 @@ msgstr ""
 msgid ""
 "You cannot group sales having different currencies for the same partner."
 msgstr ""
+"Aynı paydaş için farklı para birimlerindeki satışları gruplandıramazsınız."
 
 #. module: sale
 #: selection:sale.order,picking_policy:0
 msgid "Deliver each product when available"
-msgstr ""
+msgstr "Her ürün hazır olduğunda teslim et"
 
 #. module: sale
 #: field:sale.order,invoiced_rate:0 field:sale.order.line,invoiced:0
@@ -577,12 +595,12 @@ msgstr "Mart"
 #. module: sale
 #: constraint:stock.move:0
 msgid "You can not move products from or to a location of the type view."
-msgstr ""
+msgstr "Görünüm tipinde bir konuma ürün giriş çıkışı yapamazsınız."
 
 #. module: sale
 #: field:sale.config.picking_policy,sale_orders:0
 msgid "Based on Sales Orders"
-msgstr ""
+msgstr "Satış Siparişlerine bağlı"
 
 #. module: sale
 #: help:sale.order,amount_total:0
@@ -602,7 +620,7 @@ msgstr "Fatura Adresi:"
 #. module: sale
 #: field:sale.order.line,sequence:0
 msgid "Line Sequence"
-msgstr ""
+msgstr "Satır sırası"
 
 #. module: sale
 #: model:process.transition,note:sale.process_transition_saleorderprocurement0
@@ -692,7 +710,7 @@ msgstr "Oluşturulma Tarihi"
 #. module: sale
 #: model:ir.ui.menu,name:sale.menu_sales_configuration_misc
 msgid "Miscellaneous"
-msgstr ""
+msgstr "Çeşitli"
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_order_line_tree3
@@ -736,7 +754,7 @@ msgstr "Adet"
 #: code:addons/sale/sale.py:1327
 #, python-format
 msgid "Hour"
-msgstr ""
+msgstr "Saat"
 
 #. module: sale
 #: view:sale.order:0
@@ -757,7 +775,7 @@ msgstr "Tüm Teklifler"
 #. module: sale
 #: view:sale.config.picking_policy:0
 msgid "Options"
-msgstr ""
+msgstr "Seçenekler"
 
 #. module: sale
 #: selection:sale.report,month:0
@@ -768,7 +786,7 @@ msgstr "Eylül"
 #: code:addons/sale/sale.py:632
 #, python-format
 msgid "You cannot confirm a sale order which has no line."
-msgstr ""
+msgstr "Hiç satırı olmayan bir satış siparişini onaylayamazsınız."
 
 #. module: sale
 #: code:addons/sale/sale.py:1259
@@ -777,6 +795,8 @@ msgid ""
 "You have to select a pricelist or a customer in the sales form !\n"
 "Please set one before choosing a product."
 msgstr ""
+"Satış formunda bir fiyat listesi ya da müşteri seçmelisiniz!\n"
+"Ürünü seçmeden lütfen bir tanesini ayarlayın."
 
 #. module: sale
 #: view:sale.report:0 field:sale.report,categ_id:0
@@ -846,7 +866,7 @@ msgstr ""
 #. module: sale
 #: field:sale.order,date_order:0
 msgid "Date"
-msgstr ""
+msgstr "Tarih"
 
 #. module: sale
 #: view:sale.report:0
@@ -873,12 +893,18 @@ msgid ""
 "The 'Waiting Schedule' state is set when the invoice is confirmed but "
 "waiting for the scheduler to run on the order date."
 msgstr ""
+"Teklifin ya da satış siparişinin durumunu verir. \n"
+"İstisna durumu fatura doğrulamasında (Fatura İstisnası) iptal işlemi "
+"oluşursa otomatikman ayarlanır ya da toplama listesi işleminde (Naklie "
+"İstisnası). \n"
+"'Bekleyen Program) durumu fatura onaylandığında ama programcının sipariş "
+"tarihini çalıştırmasının beklendiğinde ayarlanır."
 
 #. module: sale
 #: code:addons/sale/sale.py:1272
 #, python-format
 msgid "No valid pricelist line found ! :"
-msgstr ""
+msgstr "Hiçbir fiyat listesi satırı bulunamadı!:"
 
 #. module: sale
 #: view:sale.order:0
@@ -888,7 +914,7 @@ msgstr "Geçmiş"
 #. module: sale
 #: selection:sale.order,order_policy:0
 msgid "Invoice on order after delivery"
-msgstr ""
+msgstr "Teslimattan sonra sipariş faturası"
 
 #. module: sale
 #: help:sale.order,invoice_ids:0
@@ -932,7 +958,7 @@ msgstr "Referanslar"
 #. module: sale
 #: view:sale.order.line:0
 msgid "My Sales Order Lines"
-msgstr ""
+msgstr "Satış Siparişlerimin Satırları"
 
 #. module: sale
 #: model:process.transition.action,name:sale.process_transition_action_cancel0
@@ -946,7 +972,7 @@ msgstr "İptal"
 #. module: sale
 #: sql_constraint:sale.order:0
 msgid "Order Reference must be unique per Company!"
-msgstr ""
+msgstr "Sipariş Kaynağı Her Şirket İçin Eşsiz Olmalı!"
 
 #. module: sale
 #: model:process.transition,name:sale.process_transition_invoice0
@@ -964,7 +990,7 @@ msgstr "KDV'siz Toplam"
 #. module: sale
 #: view:sale.order.line:0
 msgid "Order reference"
-msgstr ""
+msgstr "Sipariş Kaynağı"
 
 #. module: sale
 #: view:sale.open.invoice:0
@@ -990,7 +1016,7 @@ msgstr "Açık Fatura"
 #. module: sale
 #: model:ir.actions.server,name:sale.ir_actions_server_edi_sale
 msgid "Auto-email confirmed sale orders"
-msgstr ""
+msgstr "Oto*eposta onaylı satış siparişleri"
 
 #. module: sale
 #: code:addons/sale/sale.py:413
@@ -1016,7 +1042,7 @@ msgstr "Gönderilen ya da sipariş edilen miktar esas alındı."
 #. module: sale
 #: selection:sale.order,picking_policy:0
 msgid "Deliver all products at once"
-msgstr ""
+msgstr "Tüm ürünleri tek seferde teslim et"
 
 #. module: sale
 #: field:sale.order,picking_ids:0
@@ -1053,12 +1079,12 @@ msgstr "Nakliye Siparişi oluştur"
 #: code:addons/sale/sale.py:1303
 #, python-format
 msgid "Cannot delete a sales order line which is in state '%s'!"
-msgstr ""
+msgstr "'%s' durumundaki bir satış siparişi satırı silinemiyor!"
 
 #. module: sale
 #: view:sale.order:0
 msgid "Qty(UoS)"
-msgstr ""
+msgstr "Mik(Hizmet Birimi)"
 
 #. module: sale
 #: view:sale.order:0
@@ -1073,7 +1099,7 @@ msgstr "Paketleme listesi oluştur"
 #. module: sale
 #: view:sale.report:0
 msgid "Ordered date of the sales order"
-msgstr ""
+msgstr "Satış siparişinin veriliş tarihi"
 
 #. module: sale
 #: view:sale.report:0
@@ -1133,7 +1159,7 @@ msgid "Document of the move to the output or to the customer."
 msgstr "Çıkışa ya da müşteriyeyapılan hareket belgesi."
 
 #. module: sale
-#: model:email.template,body_text:sale.email_template_edi_sale
+#: model:email.template,body:sale.email_template_edi_sale
 msgid ""
 "\n"
 "Hello${object.partner_order_id.name and ' ' or "
@@ -1210,6 +1236,80 @@ msgid ""
 "% endif\n"
 "            "
 msgstr ""
+"\n"
+"Merhaba${object.partner_order_id.name and ' ' or "
+"''}${object.partner_order_id.name or ''},\n"
+"\n"
+"Bu siparişiniz için onay ${object.partner_id.name}:\n"
+"       | Sipariş numarası: *${object.name}*\n"
+"       | Sipariş toplamı: *${object.amount_total} "
+"${object.pricelist_id.currency_id.name}*\n"
+"       | Sipariş tarihi: ${object.date_order}\n"
+"       % if object.origin:\n"
+"       | Sipariş referansı: ${object.origin}\n"
+"       % endif\n"
+"       % if object.client_order_ref:\n"
+"       | Referansınız: ${object.client_order_ref}<br />\n"
+"       % endif\n"
+"       | İlgili Kişiniz: ${object.user_id.name} ${object.user_id.user_email "
+"and '<%s>'%(object.user_id.user_email) or ''}\n"
+"\n"
+"Aşağıdaki linkten sipariş onayınızı izleyebilir, indirebilir ve hatta "
+"çevrimiçi ödeme yapabilirsiniz:\n"
+"    ${ctx.get('edi_web_url_view') or 'n/a'}\n"
+"\n"
+"% if object.order_policy in ('prepaid','manual') and "
+"object.company_id.paypal_account:\n"
+"<% \n"
+"comp_name = quote(object.company_id.name)\n"
+"order_name = quote(object.name)\n"
+"paypal_account = quote(object.company_id.paypal_account)\n"
+"order_amount = quote(str(object.amount_total))\n"
+"cur_name = quote(object.pricelist_id.currency_id.name)\n"
+"paypal_url = \"https://www.paypal.com/cgi-"
+"bin/webscr?cmd=_xclick&business=%s&item_name=%s%%20Order%%20%s&invoice=%s&amo"
+"unt=%s\" \\\n"
+"             "
+"\"&currency_code=%s&button_subtype=services&no_note=1&bn=OpenERP_Order_PayNow"
+"_%s\" % \\\n"
+"             "
+"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
+"e)\n"
+"%>\n"
+"Paypal ile doğrudan ödemeniz de olasıdır:\n"
+"    ${paypal_url}\n"
+"% endif\n"
+"\n"
+"Eğer bir sorunuz olursa bize danışmakta tereddüt etmeyin.\n"
+"\n"
+"\n"
+"Firmamız ${object.company_id.name} seçtiğiniz için teşekkür ederiz!\n"
+"\n"
+"\n"
+"--\n"
+"${object.user_id.name} ${object.user_id.user_email and "
+"'<%s>'%(object.user_id.user_email) or ''}\n"
+"${object.company_id.name}\n"
+"% if object.company_id.street:\n"
+"${object.company_id.street or ''}\n"
+"% endif\n"
+"% if object.company_id.street2:\n"
+"${object.company_id.street2}\n"
+"% endif\n"
+"% if object.company_id.city or object.company_id.zip:\n"
+"${object.company_id.zip or ''} ${object.company_id.city or ''}\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 ''}\n"
+"% endif\n"
+"% if object.company_id.phone:\n"
+"Telefon: ${object.company_id.phone}\n"
+"% endif\n"
+"% if object.company_id.website:\n"
+"${object.company_id.website or ''}\n"
+"% endif\n"
+"            "
 
 #. module: sale
 #: model:process.transition.action,name:sale.process_transition_action_validate0
@@ -1235,7 +1335,7 @@ msgstr "Vergiler"
 #. module: sale
 #: view:sale.order:0
 msgid "Sales Order ready to be invoiced"
-msgstr ""
+msgstr "Faturalandırılmak üzere hazır Satış Siparişleri"
 
 #. module: sale
 #: help:sale.order,create_date:0
@@ -1255,7 +1355,7 @@ msgstr "Faturaları Oluştur"
 #. module: sale
 #: view:sale.report:0
 msgid "Sales order created in current month"
-msgstr ""
+msgstr "Geçerli ayda oluşturulan satış siparişleri"
 
 #. module: sale
 #: report:sale.order:0
@@ -1269,6 +1369,9 @@ msgid ""
 "create a task, purchase order or manufacturing order linked to this sale "
 "order line."
 msgstr ""
+"Eğer 'siparişte' ise, satış siparişi bir görev oluşturmak üzere onaylanırsa "
+"bir satınalmayı başlatır, satınalma siparişi ya da üretim emri bu satış "
+"siparişi öğesine bağlantılıdır."
 
 #. module: sale
 #: field:sale.advance.payment.inv,amount:0
@@ -1278,7 +1381,7 @@ msgstr "Peşin Miktar"
 #. module: sale
 #: field:sale.config.picking_policy,charge_delivery:0
 msgid "Do you charge the delivery?"
-msgstr ""
+msgstr "Teslimatı ücretlendiriyor musunuz?"
 
 #. module: sale
 #: selection:sale.order,invoice_quantity:0
@@ -1297,6 +1400,8 @@ msgid ""
 "If you change the pricelist of this order (and eventually the currency), "
 "prices of existing order lines will not be updated."
 msgstr ""
+"Bu siparişin fiyat listesini değiştirirseniz (ve sonunda para birimini), "
+"varolan sipariş satırları fiyatı güncellenmeyecektir."
 
 #. module: sale
 #: model:ir.model,name:sale.model_stock_picking
@@ -1320,12 +1425,12 @@ msgstr "Satış siparişini iptal edemiyor !"
 #. module: sale
 #: view:sale.order:0
 msgid "Qty(UoM)"
-msgstr ""
+msgstr "Mik(ÖB)"
 
 #. module: sale
 #: view:sale.report:0
 msgid "Ordered Year of the sales order"
-msgstr ""
+msgstr "Satış siparişlerinin Veriliş Yıl"
 
 #. module: sale
 #: selection:sale.report,month:0
@@ -1346,7 +1451,7 @@ msgstr "Hatalı Gönderim"
 #: code:addons/sale/sale.py:1156
 #, python-format
 msgid "Picking Information ! : "
-msgstr ""
+msgstr "Toplama Bilgisi ! : "
 
 #. module: sale
 #: field:sale.make.invoice,grouped:0
@@ -1356,13 +1461,13 @@ msgstr "Faturaları Gruplandır"
 #. module: sale
 #: field:sale.order,order_policy:0
 msgid "Invoice Policy"
-msgstr ""
+msgstr "Fatura Politikası"
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_config_picking_policy
 #: view:sale.config.picking_policy:0
 msgid "Setup your Invoicing Method"
-msgstr ""
+msgstr "Fatura Yönteminizi ayarlayın"
 
 #. module: sale
 #: model:process.node,note:sale.process_node_invoice0
@@ -1380,6 +1485,8 @@ msgid ""
 "This tool will help you to install the right module and configure the system "
 "according to the method you use to invoice your customers."
 msgstr ""
+"Bu araç, doğru modülü kurmanıza ve sistemi müşterilerinizi faturalandırmada "
+"kullandığınız yönteme göre yapılandırmanıza yardım edecektir."
 
 #. module: sale
 #: model:ir.model,name:sale.model_sale_order_line_make_invoice
@@ -1416,6 +1523,10 @@ msgid ""
 "Here is a proposition of quantities according to the packaging:\n"
 "EAN: %s Quantity: %s Type of ul: %s"
 msgstr ""
+"%d Biriminde miktar seçtiniz.\n"
+"Ancak bu seçilen paketlemeyle uyumlu değil.\n"
+"Burada paketlemeye uygun olarak önerilen miktarlar var:\n"
+"EAN: %s Miktar: %s ul Türü: %s"
 
 #. module: sale
 #: view:sale.order:0
@@ -1456,13 +1567,13 @@ msgstr ""
 #. module: sale
 #: view:sale.order.line:0
 msgid "Confirmed sale order lines, not yet delivered"
-msgstr ""
+msgstr "Onaylı satış siparişi satırları, ancak henüz teslim edilmemiş"
 
 #. module: sale
 #: code:addons/sale/sale.py:473
 #, python-format
 msgid "Customer Invoices"
-msgstr ""
+msgstr "Müşteri Faturaları"
 
 #. module: sale
 #: model:process.process,name:sale.process_process_salesprocess0
@@ -1542,7 +1653,7 @@ msgstr "Ay"
 #. module: sale
 #: model:email.template,subject:sale.email_template_edi_sale
 msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
-msgstr ""
+msgstr "${object.company_id.name} Satınalma (Ref ${object.name or 'n/a' })"
 
 #. module: sale
 #: view:sale.order.line:0 field:sale.order.line,product_id:0
@@ -1564,7 +1675,7 @@ msgstr "satış.kurulum.paketleme_politikası"
 #: view:account.invoice.report:0 view:board.board:0
 #: model:ir.actions.act_window,name:sale.action_turnover_by_month
 msgid "Monthly Turnover"
-msgstr ""
+msgstr "Aylık Gelir"
 
 #. module: sale
 #: field:sale.order,invoice_quantity:0
@@ -1668,16 +1779,18 @@ msgid ""
 "output area and the customer is done through the Delivery Order manually or "
 "automatically."
 msgstr ""
+"Çıkış konumunun yapılandırmasına bağlı olarak, müşteri ile çıkış konumu "
+"arasındaki hareket Teslimat Emri yoluyla elle ya da otomatik olarak yapılır."
 
 #. module: sale
 #: selection:sale.order,order_policy:0
 msgid "Pay before delivery"
-msgstr ""
+msgstr "Teslimattan önce ödeme"
 
 #. module: sale
 #: view:board.board:0 model:ir.actions.act_window,name:sale.open_board_sales
 msgid "Sales Dashboard"
-msgstr ""
+msgstr "Satış Kontrol Panosu"
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
@@ -1699,7 +1812,7 @@ msgstr "Satış siparişinin onaylandığı tarih."
 #. module: sale
 #: field:sale.order,project_id:0
 msgid "Contract/Analytic Account"
-msgstr ""
+msgstr "Sözleşme/Analis Hesabı"
 
 #. module: sale
 #: field:sale.order,company_id:0 field:sale.order.line,company_id:0
@@ -1725,6 +1838,8 @@ msgid ""
 "Couldn't find a pricelist line matching this product and quantity.\n"
 "You have to change either the product, the quantity or the pricelist."
 msgstr ""
+"Bu ürün ve miktarla eşleşen bir fiyat listesi bulunamadı.\n"
+"Hem ürünü hem de miktarı ya da fiyat listesini değiştirmelisiniz."
 
 #. module: sale
 #: help:sale.order,picking_ids:0
@@ -1752,7 +1867,7 @@ msgstr "İptal edildi"
 #. module: sale
 #: view:sale.order.line:0
 msgid "Sales Order Lines related to a Sales Order of mine"
-msgstr ""
+msgstr "Benim Satış Siparişlerimle ilişkili Satış Siparişi Satırları"
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_shop_form
@@ -1795,7 +1910,7 @@ msgstr "Miktar (2.Br.)"
 #. module: sale
 #: view:sale.order.line:0
 msgid "Sale Order Lines that are in 'done' state"
-msgstr ""
+msgstr "'Yapıldı' durumundaki Satış Siparişş Satırlar"
 
 #. module: sale
 #: model:process.transition,note:sale.process_transition_packing0
@@ -1818,7 +1933,7 @@ msgstr "Onaylandı"
 #. module: sale
 #: field:sale.config.picking_policy,order_policy:0
 msgid "Main Method Based On"
-msgstr ""
+msgstr "Ana Yöntemin dayanağı"
 
 #. module: sale
 #: model:process.transition.action,name:sale.process_transition_action_confirm0
@@ -1861,17 +1976,17 @@ msgstr "Kurulum"
 #: code:addons/sale/edi/sale_order.py:146
 #, python-format
 msgid "EDI Pricelist (%s)"
-msgstr ""
+msgstr "EDI Fiyat Listesi (%s)"
 
 #. module: sale
 #: view:sale.order:0
 msgid "Print Order"
-msgstr ""
+msgstr "Sipariş Yazdır"
 
 #. module: sale
 #: view:sale.report:0
 msgid "Sales order created in current year"
-msgstr ""
+msgstr "Geçerli yldaki satış siparişleri"
 
 #. module: sale
 #: code:addons/sale/wizard/sale_line_invoice.py:113
@@ -1891,7 +2006,7 @@ msgstr ""
 #. module: sale
 #: view:sale.order.line:0
 msgid "Sale order lines done"
-msgstr ""
+msgstr "Yapılan satış siparişi satırları"
 
 #. module: sale
 #: field:sale.order.line,th_weight:0
@@ -2003,18 +2118,18 @@ msgstr "Paketleme"
 #. module: sale
 #: view:sale.order.line:0
 msgid "Sale Order Lines ready to be invoiced"
-msgstr ""
+msgstr "Faturalandırılmaya hazır Satış Siparişi Satırları"
 
 #. module: sale
 #: view:sale.report:0
 msgid "Sales order created in last month"
-msgstr ""
+msgstr "Son ayda oluşturulan satış siparişi"
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_email_templates
 #: model:ir.ui.menu,name:sale.menu_email_templates
 msgid "Email Templates"
-msgstr ""
+msgstr "Eposta Şablonları"
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_order_form
@@ -2072,14 +2187,14 @@ msgstr "Teslimatta gecikme"
 #. module: sale
 #: selection:sale.order,order_policy:0
 msgid "Deliver & invoice on demand"
-msgstr ""
+msgstr "İstek üzerine teslimat & fatura"
 
 #. module: sale
 #: model:process.node,note:sale.process_node_saleprocurement0
 msgid ""
 "One Procurement order for each sales order line and for each of the "
 "components."
-msgstr ""
+msgstr "Her satış siparişi öğesi ve her bileşen için bir Satınalma İşlemi."
 
 #. module: sale
 #: model:process.transition.action,name:sale.process_transition_action_assign0
@@ -2099,7 +2214,7 @@ msgstr "Faturalanacak onaylanmış satış siparişi"
 #. module: sale
 #: view:sale.order:0
 msgid "Sales Order that haven't yet been confirmed"
-msgstr ""
+msgstr "Henüz onaylanmamış Satış Siparişi"
 
 #. module: sale
 #: code:addons/sale/sale.py:322
@@ -2121,7 +2236,7 @@ msgstr "Kapat"
 #: code:addons/sale/sale.py:1261
 #, python-format
 msgid "No Pricelist ! : "
-msgstr ""
+msgstr "Fiyat Listesi yok ! : "
 
 #. module: sale
 #: field:sale.order,shipped:0
@@ -2200,7 +2315,7 @@ msgstr "Satış Siparişi İsteği"
 #: code:addons/sale/sale.py:1255
 #, python-format
 msgid "Not enough stock ! : "
-msgstr ""
+msgstr "Yeterli stok yok !: "
 
 #. module: sale
 #: report:sale.order:0 field:sale.order,payment_term:0
diff --git a/addons/sale/i18n/uk.po b/addons/sale/i18n/uk.po
index a5eda90ccd3..886bab6fdab 100644
--- a/addons/sale/i18n/uk.po
+++ b/addons/sale/i18n/uk.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:47+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:58+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: sale
 #: field:sale.config.picking_policy,timesheet:0
@@ -1093,7 +1093,7 @@ msgid "Document of the move to the output or to the customer."
 msgstr ""
 
 #. module: sale
-#: model:email.template,body_text:sale.email_template_edi_sale
+#: model:email.template,body:sale.email_template_edi_sale
 msgid ""
 "\n"
 "Hello${object.partner_order_id.name and ' ' or "
diff --git a/addons/sale/i18n/vi.po b/addons/sale/i18n/vi.po
index 962cbe75926..982941dc7fa 100644
--- a/addons/sale/i18n/vi.po
+++ b/addons/sale/i18n/vi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:47+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:58+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: sale
 #: field:sale.config.picking_policy,timesheet:0
@@ -1108,7 +1108,7 @@ msgid "Document of the move to the output or to the customer."
 msgstr ""
 
 #. module: sale
-#: model:email.template,body_text:sale.email_template_edi_sale
+#: model:email.template,body:sale.email_template_edi_sale
 msgid ""
 "\n"
 "Hello${object.partner_order_id.name and ' ' or "
diff --git a/addons/sale/i18n/zh_CN.po b/addons/sale/i18n/zh_CN.po
index 3a87ac3c1c1..3ce545e9056 100644
--- a/addons/sale/i18n/zh_CN.po
+++ b/addons/sale/i18n/zh_CN.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:47+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:58+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: sale
 #: field:sale.config.picking_policy,timesheet:0
@@ -1110,7 +1110,7 @@ msgid "Document of the move to the output or to the customer."
 msgstr "调拨出去或调拨给客户的单据"
 
 #. module: sale
-#: model:email.template,body_text:sale.email_template_edi_sale
+#: model:email.template,body:sale.email_template_edi_sale
 msgid ""
 "\n"
 "Hello${object.partner_order_id.name and ' ' or "
diff --git a/addons/sale/i18n/zh_TW.po b/addons/sale/i18n/zh_TW.po
index 5e8213b2fd8..241b0bf84f4 100644
--- a/addons/sale/i18n/zh_TW.po
+++ b/addons/sale/i18n/zh_TW.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:47+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:58+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
 
 #. module: sale
 #: field:sale.config.picking_policy,timesheet:0
@@ -1093,7 +1093,7 @@ msgid "Document of the move to the output or to the customer."
 msgstr ""
 
 #. module: sale
-#: model:email.template,body_text:sale.email_template_edi_sale
+#: model:email.template,body:sale.email_template_edi_sale
 msgid ""
 "\n"
 "Hello${object.partner_order_id.name and ' ' or "
diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index de25012dcf9..988b4d86cf6 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -642,12 +642,12 @@ class sale_order(osv.osv):
             self.message_append_note(cr, uid, [obj.id], body=_("Sale Order for <em>%s</em> has been <b>done</b>") % (obj.partner_id.name), context=context)
 
     def invoice_paid_send_note(self, cr, uid, ids, context=None):
-        self.message_append_note(cr, uid, ids, body=_("Invoice has been <b>paid</b>."), context=context)
+        self.message_post(cr, uid, ids, body=_("Invoice has been <b>paid</b>."), context=context)
 
     def invoice_send_note(self, cr, uid, ids, invoice_id, context=None):
         for order in self.browse(cr, uid, ids, context=context):
             for invoice in (inv for inv in order.invoice_ids if inv.id == invoice_id):
-                self.message_append_note(cr, uid, [order.id], body=_("Draft Invoice of %s %s <b>waiting for validation</b>.") % (invoice.amount_total, invoice.currency_id.symbol), context=context)
+                self.message_post(cr, uid, [order.id], body=_("Draft Invoice of %s %s <b>waiting for validation</b>.") % (invoice.amount_total, invoice.currency_id.symbol), context=context)
 
 sale_order()
 
diff --git a/addons/sale/test/edi_sale_order.yml b/addons/sale/test/edi_sale_order.yml
index 9245cf35520..ab8aa8855c0 100644
--- a/addons/sale/test/edi_sale_order.yml
+++ b/addons/sale/test/edi_sale_order.yml
@@ -107,13 +107,11 @@
     assert order_new.amount_untaxed == 350, "Untaxed amount is wrong"
     assert len(order_new.order_line) == 2, "Sale order lines mismatch"
     for sale_line in order_new.order_line:
-
         if sale_line.name == 'PC Assemble SC234':
             #assert sale_line.delay == 18 , "incorrect delay: got %s, expected 18"%(sale_line.delay,)
             assert sale_line.product_uom.name == "Unit" , "uom is not same"
             assert sale_line.price_unit == 150 , "unit price is not same, got %s, expected 150"%(sale_line.price_unit,)
             assert sale_line.product_uom_qty == 1 , "product qty is not same"
-
         elif sale_line.name == 'PC on Demand':
             #assert sale_line.delay == 3 , "incorrect delay: got %s, expected 3"%(sale_line.delay,)
             assert sale_line.product_uom.name == "Unit" , "uom is not same"
diff --git a/addons/sale_analytic_plans/i18n/ar.po b/addons/sale_analytic_plans/i18n/ar.po
index 7bafc5e44af..994c45f064c 100644
--- a/addons/sale_analytic_plans/i18n/ar.po
+++ b/addons/sale_analytic_plans/i18n/ar.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:25+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: sale_analytic_plans
 #: field:sale.order.line,analytics_id:0
diff --git a/addons/sale_analytic_plans/i18n/bg.po b/addons/sale_analytic_plans/i18n/bg.po
index ec75bfeffba..f91eb70820b 100644
--- a/addons/sale_analytic_plans/i18n/bg.po
+++ b/addons/sale_analytic_plans/i18n/bg.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:25+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: sale_analytic_plans
 #: field:sale.order.line,analytics_id:0
diff --git a/addons/sale_analytic_plans/i18n/bs.po b/addons/sale_analytic_plans/i18n/bs.po
index add4b84a157..05047f79237 100644
--- a/addons/sale_analytic_plans/i18n/bs.po
+++ b/addons/sale_analytic_plans/i18n/bs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:25+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: sale_analytic_plans
 #: field:sale.order.line,analytics_id:0
diff --git a/addons/sale_analytic_plans/i18n/ca.po b/addons/sale_analytic_plans/i18n/ca.po
index 769fea472ba..bf4e80468e4 100644
--- a/addons/sale_analytic_plans/i18n/ca.po
+++ b/addons/sale_analytic_plans/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:25+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: sale_analytic_plans
 #: field:sale.order.line,analytics_id:0
diff --git a/addons/sale_analytic_plans/i18n/cs.po b/addons/sale_analytic_plans/i18n/cs.po
index 4549b254ddb..660e64bb979 100644
--- a/addons/sale_analytic_plans/i18n/cs.po
+++ b/addons/sale_analytic_plans/i18n/cs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:25+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: sale_analytic_plans
 #: field:sale.order.line,analytics_id:0
diff --git a/addons/sale_analytic_plans/i18n/da.po b/addons/sale_analytic_plans/i18n/da.po
index ed725d81bf6..a2ddb86db0a 100644
--- a/addons/sale_analytic_plans/i18n/da.po
+++ b/addons/sale_analytic_plans/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:25+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: sale_analytic_plans
 #: field:sale.order.line,analytics_id:0
diff --git a/addons/sale_analytic_plans/i18n/de.po b/addons/sale_analytic_plans/i18n/de.po
index f8d64b54145..9320480018f 100644
--- a/addons/sale_analytic_plans/i18n/de.po
+++ b/addons/sale_analytic_plans/i18n/de.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:25+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: sale_analytic_plans
 #: field:sale.order.line,analytics_id:0
diff --git a/addons/sale_analytic_plans/i18n/el.po b/addons/sale_analytic_plans/i18n/el.po
index c9ceb24783c..ac7602ec3ba 100644
--- a/addons/sale_analytic_plans/i18n/el.po
+++ b/addons/sale_analytic_plans/i18n/el.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:25+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
 "X-Poedit-SourceCharset: utf-8\n"
diff --git a/addons/sale_analytic_plans/i18n/es.po b/addons/sale_analytic_plans/i18n/es.po
index 31b9815f7fb..428dbb4900b 100644
--- a/addons/sale_analytic_plans/i18n/es.po
+++ b/addons/sale_analytic_plans/i18n/es.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:25+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: sale_analytic_plans
 #: field:sale.order.line,analytics_id:0
diff --git a/addons/sale_analytic_plans/i18n/es_AR.po b/addons/sale_analytic_plans/i18n/es_AR.po
index 9924c89536e..e44ea9aeeb6 100644
--- a/addons/sale_analytic_plans/i18n/es_AR.po
+++ b/addons/sale_analytic_plans/i18n/es_AR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:25+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: sale_analytic_plans
 #: field:sale.order.line,analytics_id:0
diff --git a/addons/sale_analytic_plans/i18n/es_CL.po b/addons/sale_analytic_plans/i18n/es_CL.po
index a12b2ddf644..a77f5483f7c 100644
--- a/addons/sale_analytic_plans/i18n/es_CL.po
+++ b/addons/sale_analytic_plans/i18n/es_CL.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:25+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: sale_analytic_plans
 #: field:sale.order.line,analytics_id:0
diff --git a/addons/sale_analytic_plans/i18n/es_CR.po b/addons/sale_analytic_plans/i18n/es_CR.po
index 46fafca20ba..e0b3223f59f 100644
--- a/addons/sale_analytic_plans/i18n/es_CR.po
+++ b/addons/sale_analytic_plans/i18n/es_CR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:25+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 "Language: \n"
 
 #. module: sale_analytic_plans
diff --git a/addons/sale_analytic_plans/i18n/et.po b/addons/sale_analytic_plans/i18n/et.po
index 8d833e49742..ef2ae563a53 100644
--- a/addons/sale_analytic_plans/i18n/et.po
+++ b/addons/sale_analytic_plans/i18n/et.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:25+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: sale_analytic_plans
 #: field:sale.order.line,analytics_id:0
diff --git a/addons/sale_analytic_plans/i18n/fi.po b/addons/sale_analytic_plans/i18n/fi.po
index 4dcccbd9c7e..25020e01d19 100644
--- a/addons/sale_analytic_plans/i18n/fi.po
+++ b/addons/sale_analytic_plans/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:25+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: sale_analytic_plans
 #: field:sale.order.line,analytics_id:0
diff --git a/addons/sale_analytic_plans/i18n/fr.po b/addons/sale_analytic_plans/i18n/fr.po
index a866b3e0530..1c3bc23bf18 100644
--- a/addons/sale_analytic_plans/i18n/fr.po
+++ b/addons/sale_analytic_plans/i18n/fr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:25+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: sale_analytic_plans
 #: field:sale.order.line,analytics_id:0
diff --git a/addons/sale_analytic_plans/i18n/gl.po b/addons/sale_analytic_plans/i18n/gl.po
index c91ac3cbafc..94aad5963b8 100644
--- a/addons/sale_analytic_plans/i18n/gl.po
+++ b/addons/sale_analytic_plans/i18n/gl.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:25+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: sale_analytic_plans
 #: field:sale.order.line,analytics_id:0
diff --git a/addons/sale_analytic_plans/i18n/hr.po b/addons/sale_analytic_plans/i18n/hr.po
index f76c7dc530b..b59434e7cc4 100644
--- a/addons/sale_analytic_plans/i18n/hr.po
+++ b/addons/sale_analytic_plans/i18n/hr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:25+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 "Language: hr\n"
 
 #. module: sale_analytic_plans
diff --git a/addons/sale_analytic_plans/i18n/hu.po b/addons/sale_analytic_plans/i18n/hu.po
index cef17989856..237fec6f1f1 100644
--- a/addons/sale_analytic_plans/i18n/hu.po
+++ b/addons/sale_analytic_plans/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:25+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: sale_analytic_plans
 #: field:sale.order.line,analytics_id:0
diff --git a/addons/sale_analytic_plans/i18n/id.po b/addons/sale_analytic_plans/i18n/id.po
index 2a94fb10740..b1134cad694 100644
--- a/addons/sale_analytic_plans/i18n/id.po
+++ b/addons/sale_analytic_plans/i18n/id.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:25+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: sale_analytic_plans
 #: field:sale.order.line,analytics_id:0
diff --git a/addons/sale_analytic_plans/i18n/it.po b/addons/sale_analytic_plans/i18n/it.po
index 4f77ca16362..8c0aa60e055 100644
--- a/addons/sale_analytic_plans/i18n/it.po
+++ b/addons/sale_analytic_plans/i18n/it.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:25+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: sale_analytic_plans
 #: field:sale.order.line,analytics_id:0
diff --git a/addons/sale_analytic_plans/i18n/ja.po b/addons/sale_analytic_plans/i18n/ja.po
index e1395c40437..ec867eefb73 100644
--- a/addons/sale_analytic_plans/i18n/ja.po
+++ b/addons/sale_analytic_plans/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:25+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: sale_analytic_plans
 #: field:sale.order.line,analytics_id:0
diff --git a/addons/sale_analytic_plans/i18n/ko.po b/addons/sale_analytic_plans/i18n/ko.po
index 076b4d93f5a..9d3caf02056 100644
--- a/addons/sale_analytic_plans/i18n/ko.po
+++ b/addons/sale_analytic_plans/i18n/ko.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:25+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: sale_analytic_plans
 #: field:sale.order.line,analytics_id:0
diff --git a/addons/sale_analytic_plans/i18n/lt.po b/addons/sale_analytic_plans/i18n/lt.po
index cbb4f9d1347..0850f6af5b9 100644
--- a/addons/sale_analytic_plans/i18n/lt.po
+++ b/addons/sale_analytic_plans/i18n/lt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:25+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: sale_analytic_plans
 #: field:sale.order.line,analytics_id:0
diff --git a/addons/sale_analytic_plans/i18n/mn.po b/addons/sale_analytic_plans/i18n/mn.po
index b5c7595cae9..2dc8be08d9b 100644
--- a/addons/sale_analytic_plans/i18n/mn.po
+++ b/addons/sale_analytic_plans/i18n/mn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:25+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: sale_analytic_plans
 #: field:sale.order.line,analytics_id:0
diff --git a/addons/sale_analytic_plans/i18n/nb.po b/addons/sale_analytic_plans/i18n/nb.po
index 03fa06c2317..f8c8990b413 100644
--- a/addons/sale_analytic_plans/i18n/nb.po
+++ b/addons/sale_analytic_plans/i18n/nb.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:25+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: sale_analytic_plans
 #: field:sale.order.line,analytics_id:0
diff --git a/addons/sale_analytic_plans/i18n/nl.po b/addons/sale_analytic_plans/i18n/nl.po
index 96f48032d34..57107e8d62b 100644
--- a/addons/sale_analytic_plans/i18n/nl.po
+++ b/addons/sale_analytic_plans/i18n/nl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:25+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: sale_analytic_plans
 #: field:sale.order.line,analytics_id:0
diff --git a/addons/sale_analytic_plans/i18n/nl_BE.po b/addons/sale_analytic_plans/i18n/nl_BE.po
index 0ddf17016db..15cf2d6d766 100644
--- a/addons/sale_analytic_plans/i18n/nl_BE.po
+++ b/addons/sale_analytic_plans/i18n/nl_BE.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:25+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: sale_analytic_plans
 #: field:sale.order.line,analytics_id:0
diff --git a/addons/sale_analytic_plans/i18n/oc.po b/addons/sale_analytic_plans/i18n/oc.po
index 96667a9f57a..4c44b9d392c 100644
--- a/addons/sale_analytic_plans/i18n/oc.po
+++ b/addons/sale_analytic_plans/i18n/oc.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:25+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: sale_analytic_plans
 #: field:sale.order.line,analytics_id:0
diff --git a/addons/sale_analytic_plans/i18n/pl.po b/addons/sale_analytic_plans/i18n/pl.po
index a8ca892b352..80bb38afc7f 100644
--- a/addons/sale_analytic_plans/i18n/pl.po
+++ b/addons/sale_analytic_plans/i18n/pl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:25+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: sale_analytic_plans
 #: field:sale.order.line,analytics_id:0
diff --git a/addons/sale_analytic_plans/i18n/pt.po b/addons/sale_analytic_plans/i18n/pt.po
index 75a8ea51ae1..9d326c36303 100644
--- a/addons/sale_analytic_plans/i18n/pt.po
+++ b/addons/sale_analytic_plans/i18n/pt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:25+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: sale_analytic_plans
 #: field:sale.order.line,analytics_id:0
diff --git a/addons/sale_analytic_plans/i18n/pt_BR.po b/addons/sale_analytic_plans/i18n/pt_BR.po
index a4d291d897b..992aa595cc1 100644
--- a/addons/sale_analytic_plans/i18n/pt_BR.po
+++ b/addons/sale_analytic_plans/i18n/pt_BR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:25+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: sale_analytic_plans
 #: field:sale.order.line,analytics_id:0
diff --git a/addons/sale_analytic_plans/i18n/ro.po b/addons/sale_analytic_plans/i18n/ro.po
index 8953127f9aa..2b28d436d7a 100644
--- a/addons/sale_analytic_plans/i18n/ro.po
+++ b/addons/sale_analytic_plans/i18n/ro.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:25+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: sale_analytic_plans
 #: field:sale.order.line,analytics_id:0
diff --git a/addons/sale_analytic_plans/i18n/ru.po b/addons/sale_analytic_plans/i18n/ru.po
index 754c49a7e38..45c59e32182 100644
--- a/addons/sale_analytic_plans/i18n/ru.po
+++ b/addons/sale_analytic_plans/i18n/ru.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:25+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: sale_analytic_plans
 #: field:sale.order.line,analytics_id:0
diff --git a/addons/sale_analytic_plans/i18n/sk.po b/addons/sale_analytic_plans/i18n/sk.po
index 72bc2e7435e..140f83d23aa 100644
--- a/addons/sale_analytic_plans/i18n/sk.po
+++ b/addons/sale_analytic_plans/i18n/sk.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:25+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: sale_analytic_plans
 #: field:sale.order.line,analytics_id:0
diff --git a/addons/sale_analytic_plans/i18n/sl.po b/addons/sale_analytic_plans/i18n/sl.po
index 1a584719f56..5428c58bc60 100644
--- a/addons/sale_analytic_plans/i18n/sl.po
+++ b/addons/sale_analytic_plans/i18n/sl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:25+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: sale_analytic_plans
 #: field:sale.order.line,analytics_id:0
diff --git a/addons/sale_analytic_plans/i18n/sq.po b/addons/sale_analytic_plans/i18n/sq.po
index 75297eca8b9..c843de70a31 100644
--- a/addons/sale_analytic_plans/i18n/sq.po
+++ b/addons/sale_analytic_plans/i18n/sq.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:25+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: sale_analytic_plans
 #: field:sale.order.line,analytics_id:0
diff --git a/addons/sale_analytic_plans/i18n/sr.po b/addons/sale_analytic_plans/i18n/sr.po
index 7735232eddb..567702064fa 100644
--- a/addons/sale_analytic_plans/i18n/sr.po
+++ b/addons/sale_analytic_plans/i18n/sr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:25+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: sale_analytic_plans
 #: field:sale.order.line,analytics_id:0
diff --git a/addons/sale_analytic_plans/i18n/sr@latin.po b/addons/sale_analytic_plans/i18n/sr@latin.po
index ca0d347af78..1af11cd37bc 100644
--- a/addons/sale_analytic_plans/i18n/sr@latin.po
+++ b/addons/sale_analytic_plans/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:25+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: sale_analytic_plans
 #: field:sale.order.line,analytics_id:0
diff --git a/addons/sale_analytic_plans/i18n/sv.po b/addons/sale_analytic_plans/i18n/sv.po
index ffbcd08fa5d..0e7ba581394 100644
--- a/addons/sale_analytic_plans/i18n/sv.po
+++ b/addons/sale_analytic_plans/i18n/sv.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:25+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: sale_analytic_plans
 #: field:sale.order.line,analytics_id:0
diff --git a/addons/sale_analytic_plans/i18n/tlh.po b/addons/sale_analytic_plans/i18n/tlh.po
index 8233fc24200..56cab9f6e74 100644
--- a/addons/sale_analytic_plans/i18n/tlh.po
+++ b/addons/sale_analytic_plans/i18n/tlh.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:25+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: sale_analytic_plans
 #: field:sale.order.line,analytics_id:0
diff --git a/addons/sale_analytic_plans/i18n/tr.po b/addons/sale_analytic_plans/i18n/tr.po
index 02973ed6c7f..e496c087d45 100644
--- a/addons/sale_analytic_plans/i18n/tr.po
+++ b/addons/sale_analytic_plans/i18n/tr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:25+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: sale_analytic_plans
 #: field:sale.order.line,analytics_id:0
diff --git a/addons/sale_analytic_plans/i18n/uk.po b/addons/sale_analytic_plans/i18n/uk.po
index 3b4d31a4067..81af7efa54e 100644
--- a/addons/sale_analytic_plans/i18n/uk.po
+++ b/addons/sale_analytic_plans/i18n/uk.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:25+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: sale_analytic_plans
 #: field:sale.order.line,analytics_id:0
diff --git a/addons/sale_analytic_plans/i18n/vi.po b/addons/sale_analytic_plans/i18n/vi.po
index 575d706c342..e82443ae267 100644
--- a/addons/sale_analytic_plans/i18n/vi.po
+++ b/addons/sale_analytic_plans/i18n/vi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:25+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: sale_analytic_plans
 #: field:sale.order.line,analytics_id:0
diff --git a/addons/sale_analytic_plans/i18n/zh_CN.po b/addons/sale_analytic_plans/i18n/zh_CN.po
index 6d22d64ebdb..fa1ae58ea36 100644
--- a/addons/sale_analytic_plans/i18n/zh_CN.po
+++ b/addons/sale_analytic_plans/i18n/zh_CN.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:25+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: sale_analytic_plans
 #: field:sale.order.line,analytics_id:0
diff --git a/addons/sale_analytic_plans/i18n/zh_TW.po b/addons/sale_analytic_plans/i18n/zh_TW.po
index 3f8fd2aef8c..6c3aec0b70d 100644
--- a/addons/sale_analytic_plans/i18n/zh_TW.po
+++ b/addons/sale_analytic_plans/i18n/zh_TW.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:25+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: sale_analytic_plans
 #: field:sale.order.line,analytics_id:0
diff --git a/addons/sale_crm/i18n/ar.po b/addons/sale_crm/i18n/ar.po
index ebb7cfc88d1..f12d611fdb2 100644
--- a/addons/sale_crm/i18n/ar.po
+++ b/addons/sale_crm/i18n/ar.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:46+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: sale_crm
 #: field:sale.order,categ_id:0
diff --git a/addons/sale_crm/i18n/bg.po b/addons/sale_crm/i18n/bg.po
index 12fcb833815..c5690823422 100644
--- a/addons/sale_crm/i18n/bg.po
+++ b/addons/sale_crm/i18n/bg.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:46+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: sale_crm
 #: field:sale.order,categ_id:0
diff --git a/addons/sale_crm/i18n/bs.po b/addons/sale_crm/i18n/bs.po
index d8f37ce308c..b82a97c02b5 100644
--- a/addons/sale_crm/i18n/bs.po
+++ b/addons/sale_crm/i18n/bs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:46+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: sale_crm
 #: field:sale.order,categ_id:0
diff --git a/addons/sale_crm/i18n/ca.po b/addons/sale_crm/i18n/ca.po
index 6ab0dfff14f..6ab4efd6bb5 100644
--- a/addons/sale_crm/i18n/ca.po
+++ b/addons/sale_crm/i18n/ca.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:46+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: sale_crm
 #: field:sale.order,categ_id:0
diff --git a/addons/sale_crm/i18n/cs.po b/addons/sale_crm/i18n/cs.po
index 5aa0bcfb0c5..58635cc9500 100644
--- a/addons/sale_crm/i18n/cs.po
+++ b/addons/sale_crm/i18n/cs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:46+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 "X-Poedit-Language: Czech\n"
 
 #. module: sale_crm
diff --git a/addons/sale_crm/i18n/da.po b/addons/sale_crm/i18n/da.po
index febe4d257b0..9becd58bba8 100644
--- a/addons/sale_crm/i18n/da.po
+++ b/addons/sale_crm/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:46+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: sale_crm
 #: field:sale.order,categ_id:0
diff --git a/addons/sale_crm/i18n/de.po b/addons/sale_crm/i18n/de.po
index 5204729c093..3a7ef7d9384 100644
--- a/addons/sale_crm/i18n/de.po
+++ b/addons/sale_crm/i18n/de.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:46+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: sale_crm
 #: field:sale.order,categ_id:0
diff --git a/addons/sale_crm/i18n/el.po b/addons/sale_crm/i18n/el.po
index 13c95cae389..76d3c648927 100644
--- a/addons/sale_crm/i18n/el.po
+++ b/addons/sale_crm/i18n/el.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:46+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
 "X-Poedit-SourceCharset: utf-8\n"
diff --git a/addons/sale_crm/i18n/es.po b/addons/sale_crm/i18n/es.po
index 27c2e090448..ce1b7c9581c 100644
--- a/addons/sale_crm/i18n/es.po
+++ b/addons/sale_crm/i18n/es.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:46+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: sale_crm
 #: field:sale.order,categ_id:0
diff --git a/addons/sale_crm/i18n/es_AR.po b/addons/sale_crm/i18n/es_AR.po
index f3116d53b11..64e0a4f2206 100644
--- a/addons/sale_crm/i18n/es_AR.po
+++ b/addons/sale_crm/i18n/es_AR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:46+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: sale_crm
 #: field:sale.order,categ_id:0
diff --git a/addons/sale_crm/i18n/es_CL.po b/addons/sale_crm/i18n/es_CL.po
index 48fdc17bc90..31f2b794f48 100644
--- a/addons/sale_crm/i18n/es_CL.po
+++ b/addons/sale_crm/i18n/es_CL.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:46+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: sale_crm
 #: field:sale.order,categ_id:0
diff --git a/addons/sale_crm/i18n/es_CR.po b/addons/sale_crm/i18n/es_CR.po
index 106965a58d0..8c87b0edd47 100644
--- a/addons/sale_crm/i18n/es_CR.po
+++ b/addons/sale_crm/i18n/es_CR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:46+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 "Language: \n"
 
 #. module: sale_crm
diff --git a/addons/sale_crm/i18n/es_MX.po.moved b/addons/sale_crm/i18n/es_MX.po.moved
deleted file mode 100644
index e834f299d4e..00000000000
--- a/addons/sale_crm/i18n/es_MX.po.moved
+++ /dev/null
@@ -1,167 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* sale_crm
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.2\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2011-07-05 15:46+0000\n"
-"PO-Revision-Date: 2011-07-05 15:46+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: sale_crm
-#: field:crm.make.sale,partner_id:0
-msgid "Customer"
-msgstr "Cliente"
-
-#. module: sale_crm
-#: view:crm.make.sale:0
-msgid "Convert to Quotation"
-msgstr "Convertir a presupuesto"
-
-#. module: sale_crm
-#: code:addons/sale_crm/wizard/crm_make_sale.py:108
-#, python-format
-msgid "is converted to Quotation."
-msgstr "se ha convertido a presupuesto."
-
-#. module: sale_crm
-#: code:addons/sale_crm/wizard/crm_make_sale.py:89
-#, python-format
-msgid "Data Insufficient!"
-msgstr "¡Datos insuficientes!"
-
-#. module: sale_crm
-#: code:addons/sale_crm/wizard/crm_make_sale.py:89
-#, python-format
-msgid "Customer has no addresses defined!"
-msgstr "¡El cliente no tiene definidas direcciones!"
-
-#. module: sale_crm
-#: model:ir.model,name:sale_crm.model_crm_make_sale
-msgid "Make sales"
-msgstr "Crear ventas"
-
-#. module: sale_crm
-#: model:ir.module.module,description:sale_crm.module_meta_information
-msgid "\n"
-"This module adds a shortcut on one or several opportunity cases in the CRM.\n"
-"This shortcut allows you to generate a sales order based on the selected case.\n"
-"If different cases are open (a list), it generates one sale order by\n"
-"case.\n"
-"The case is then closed and linked to the generated sales order.\n"
-"\n"
-"We suggest you to install this module if you installed both the sale and the\n"
-"crm modules.\n"
-"    "
-msgstr "\n"
-"Este módulo añade un acceso directo a uno o varios casos de oportunidades en el CRM.\n"
-"Este acceso directo le permite generar un pedido de venta a partir del caso seleccionado.\n"
-"Si están abiertos distintos casos (una lista), genera un pedido de venta por\n"
-"caso.\n"
-"El caso se cierra y es enlazado al pedido ventas generado.\n"
-"\n"
-"Le sugerimos que instale este módulo si ha instalado ambos módulos sale y crm.\n"
-"    "
-
-#. module: sale_crm
-#: view:crm.make.sale:0
-msgid "_Create"
-msgstr "_Crear"
-
-#. module: sale_crm
-#: sql_constraint:sale.order:0
-msgid "Order Reference must be unique !"
-msgstr "¡La referencia del pedido debe ser única!"
-
-#. module: sale_crm
-#: help:crm.make.sale,close:0
-msgid "Check this to close the opportunity after having created the sale order."
-msgstr "Marque esta opción para cerrar la oportunidad después de haber creado el pedido de venta."
-
-#. module: sale_crm
-#: view:crm.lead:0
-msgid "Convert to Quote"
-msgstr "Convertir a presupuesto"
-
-#. module: sale_crm
-#: view:account.invoice.report:0
-#: view:board.board:0
-msgid "Monthly Turnover"
-msgstr "Volumen mensual"
-
-#. module: sale_crm
-#: code:addons/sale_crm/wizard/crm_make_sale.py:110
-#, python-format
-msgid "Converted to Sales Quotation(id: %s)."
-msgstr "Convertido a presupuesto de venta (id: %s)."
-
-#. module: sale_crm
-#: code:addons/sale_crm/wizard/crm_make_sale.py:108
-#, python-format
-msgid "Opportunity "
-msgstr "Oportunidad "
-
-#. module: sale_crm
-#: code:addons/sale_crm/wizard/crm_make_sale.py:92
-#, python-format
-msgid "Opportunity: %s"
-msgstr "Oportunidad: %s"
-
-#. module: sale_crm
-#: model:ir.module.module,shortdesc:sale_crm.module_meta_information
-msgid "Creates Sales order from Opportunity"
-msgstr "Crea pedido de venta desde oportunidad"
-
-#. module: sale_crm
-#: model:ir.actions.act_window,name:sale_crm.action_quotation_for_sale_crm
-msgid "Quotations"
-msgstr "Presupuestos"
-
-#. module: sale_crm
-#: field:crm.make.sale,shop_id:0
-msgid "Shop"
-msgstr "Tienda"
-
-#. module: sale_crm
-#: view:board.board:0
-msgid "Opportunities by Stage"
-msgstr "Oportunidades por etapa"
-
-#. module: sale_crm
-#: view:board.board:0
-msgid "My Quotations"
-msgstr "Mis presupuestos"
-
-#. module: sale_crm
-#: field:crm.make.sale,close:0
-msgid "Close Opportunity"
-msgstr "Cerrar oportunidad"
-
-#. module: sale_crm
-#: view:sale.order:0
-#: field:sale.order,section_id:0
-msgid "Sales Team"
-msgstr "Equipo de ventas"
-
-#. module: sale_crm
-#: model:ir.actions.act_window,name:sale_crm.action_crm_make_sale
-msgid "Make Quotation"
-msgstr "Realizar un presupuesto"
-
-#. module: sale_crm
-#: view:crm.make.sale:0
-msgid "Cancel"
-msgstr "Cancelar"
-
-#. module: sale_crm
-#: model:ir.model,name:sale_crm.model_sale_order
-msgid "Sales Order"
-msgstr "Pedido de venta"
-
diff --git a/addons/sale_crm/i18n/et.po b/addons/sale_crm/i18n/et.po
index 6efcc05c472..19f135eca82 100644
--- a/addons/sale_crm/i18n/et.po
+++ b/addons/sale_crm/i18n/et.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:46+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: sale_crm
 #: field:sale.order,categ_id:0
diff --git a/addons/sale_crm/i18n/fi.po b/addons/sale_crm/i18n/fi.po
index 1562263ee20..93ae85501c9 100644
--- a/addons/sale_crm/i18n/fi.po
+++ b/addons/sale_crm/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:46+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: sale_crm
 #: field:sale.order,categ_id:0
diff --git a/addons/sale_crm/i18n/fr.po b/addons/sale_crm/i18n/fr.po
index 703d4063ddd..eac4ce9a5b0 100644
--- a/addons/sale_crm/i18n/fr.po
+++ b/addons/sale_crm/i18n/fr.po
@@ -7,30 +7,30 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2011-11-25 14:51+0000\n"
-"Last-Translator: Numérigraphe <Unknown>\n"
+"PO-Revision-Date: 2012-09-03 22:25+0000\n"
+"Last-Translator: Nicolas JEUDY <njeudy@simplee.fr>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:46+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-09-04 04:52+0000\n"
+"X-Generator: Launchpad (build 15890)\n"
 
 #. module: sale_crm
 #: field:sale.order,categ_id:0
 msgid "Category"
-msgstr ""
+msgstr "Catégorie"
 
 #. module: sale_crm
 #: sql_constraint:sale.order:0
 msgid "Order Reference must be unique per Company!"
-msgstr ""
+msgstr "La référence de commande doit être unique par société !"
 
 #. module: sale_crm
 #: code:addons/sale_crm/wizard/crm_make_sale.py:112
 #, python-format
 msgid "Converted to Sales Quotation(%s)."
-msgstr ""
+msgstr "Convertir en devis (%s)"
 
 #. module: sale_crm
 #: view:crm.make.sale:0
@@ -62,7 +62,7 @@ msgstr "_Créer"
 #. module: sale_crm
 #: view:sale.order:0
 msgid "My Sales Team(s)"
-msgstr ""
+msgstr "Mon (mes) équipe(s) de vente"
 
 #. module: sale_crm
 #: help:crm.make.sale,close:0
@@ -75,7 +75,7 @@ msgstr ""
 #. module: sale_crm
 #: view:board.board:0
 msgid "My Opportunities"
-msgstr ""
+msgstr "Mes opportunités"
 
 #. module: sale_crm
 #: view:crm.lead:0
@@ -106,7 +106,7 @@ msgstr "Fermer l'opportunité"
 #. module: sale_crm
 #: view:board.board:0
 msgid "My Planned Revenues by Stage"
-msgstr ""
+msgstr "Mes revenus planifiés par étape"
 
 #. module: sale_crm
 #: code:addons/sale_crm/wizard/crm_make_sale.py:110
@@ -133,7 +133,7 @@ msgstr "Annuler"
 #. module: sale_crm
 #: model:ir.model,name:sale_crm.model_sale_order
 msgid "Sales Order"
-msgstr "Commande de ventes"
+msgstr "Commande client"
 
 #~ msgid "Crm opportunity quotation"
 #~ msgstr "Chiffrage de l'opportunité"
diff --git a/addons/sale_crm/i18n/gl.po b/addons/sale_crm/i18n/gl.po
index a7d83cf68a1..50f104764b8 100644
--- a/addons/sale_crm/i18n/gl.po
+++ b/addons/sale_crm/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:46+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: sale_crm
 #: field:sale.order,categ_id:0
diff --git a/addons/sale_crm/i18n/hr.po b/addons/sale_crm/i18n/hr.po
index a83f765c5ea..24895dc9f19 100644
--- a/addons/sale_crm/i18n/hr.po
+++ b/addons/sale_crm/i18n/hr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:46+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 "Language: hr\n"
 
 #. module: sale_crm
diff --git a/addons/sale_crm/i18n/hu.po b/addons/sale_crm/i18n/hu.po
index e4bf7daf445..6dd065cf24e 100644
--- a/addons/sale_crm/i18n/hu.po
+++ b/addons/sale_crm/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:46+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: sale_crm
 #: field:sale.order,categ_id:0
diff --git a/addons/sale_crm/i18n/id.po b/addons/sale_crm/i18n/id.po
index a8cfc31792c..52dff13a996 100644
--- a/addons/sale_crm/i18n/id.po
+++ b/addons/sale_crm/i18n/id.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:46+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: sale_crm
 #: field:sale.order,categ_id:0
diff --git a/addons/sale_crm/i18n/it.po b/addons/sale_crm/i18n/it.po
index 062fc7e1647..4c13704c374 100644
--- a/addons/sale_crm/i18n/it.po
+++ b/addons/sale_crm/i18n/it.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:46+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: sale_crm
 #: field:sale.order,categ_id:0
diff --git a/addons/sale_crm/i18n/ja.po b/addons/sale_crm/i18n/ja.po
index 0b9e903120c..879bfdc9558 100644
--- a/addons/sale_crm/i18n/ja.po
+++ b/addons/sale_crm/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:46+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: sale_crm
 #: field:sale.order,categ_id:0
diff --git a/addons/sale_crm/i18n/ko.po b/addons/sale_crm/i18n/ko.po
index 4fbb5185dd7..c2a3e8584d4 100644
--- a/addons/sale_crm/i18n/ko.po
+++ b/addons/sale_crm/i18n/ko.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:46+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: sale_crm
 #: field:sale.order,categ_id:0
diff --git a/addons/sale_crm/i18n/lt.po b/addons/sale_crm/i18n/lt.po
index e56560e50ac..f3b5404ee9e 100644
--- a/addons/sale_crm/i18n/lt.po
+++ b/addons/sale_crm/i18n/lt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:46+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: sale_crm
 #: field:sale.order,categ_id:0
diff --git a/addons/sale_crm/i18n/lv.po b/addons/sale_crm/i18n/lv.po
index a5c1311b333..d86cc2351ef 100644
--- a/addons/sale_crm/i18n/lv.po
+++ b/addons/sale_crm/i18n/lv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:46+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: sale_crm
 #: field:sale.order,categ_id:0
diff --git a/addons/sale_crm/i18n/mn.po b/addons/sale_crm/i18n/mn.po
index 2f974753c58..8ef3beb1289 100644
--- a/addons/sale_crm/i18n/mn.po
+++ b/addons/sale_crm/i18n/mn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:46+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: sale_crm
 #: field:sale.order,categ_id:0
diff --git a/addons/sale_crm/i18n/nb.po b/addons/sale_crm/i18n/nb.po
index 77eb84ce625..a9cd135e8bf 100644
--- a/addons/sale_crm/i18n/nb.po
+++ b/addons/sale_crm/i18n/nb.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:46+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: sale_crm
 #: field:sale.order,categ_id:0
diff --git a/addons/sale_crm/i18n/nl.po b/addons/sale_crm/i18n/nl.po
index fef5820e4f9..cd40cd0adcc 100644
--- a/addons/sale_crm/i18n/nl.po
+++ b/addons/sale_crm/i18n/nl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:46+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: sale_crm
 #: field:sale.order,categ_id:0
diff --git a/addons/sale_crm/i18n/nl_BE.po b/addons/sale_crm/i18n/nl_BE.po
index 2a0fc40a3ff..b97c9c259e0 100644
--- a/addons/sale_crm/i18n/nl_BE.po
+++ b/addons/sale_crm/i18n/nl_BE.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:46+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: sale_crm
 #: field:sale.order,categ_id:0
diff --git a/addons/sale_crm/i18n/pl.po b/addons/sale_crm/i18n/pl.po
index 7e74d439032..c1596d6701f 100644
--- a/addons/sale_crm/i18n/pl.po
+++ b/addons/sale_crm/i18n/pl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:46+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: sale_crm
 #: field:sale.order,categ_id:0
diff --git a/addons/sale_crm/i18n/pt.po b/addons/sale_crm/i18n/pt.po
index 761719de6b0..c3d6d51207c 100644
--- a/addons/sale_crm/i18n/pt.po
+++ b/addons/sale_crm/i18n/pt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:46+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: sale_crm
 #: field:sale.order,categ_id:0
diff --git a/addons/sale_crm/i18n/pt_BR.po b/addons/sale_crm/i18n/pt_BR.po
index fc081ffee28..5a2cd6acf61 100644
--- a/addons/sale_crm/i18n/pt_BR.po
+++ b/addons/sale_crm/i18n/pt_BR.po
@@ -8,13 +8,14 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 00:37+0000\n"
 "PO-Revision-Date: 2012-07-28 19:41+0000\n"
-"Last-Translator: Fábio Martinelli <webmaster@guaru.net>\n"
+"Last-Translator: Fábio Martinelli - http://zupy.com.br "
+"<webmaster@guaru.net>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:46+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: sale_crm
 #: field:sale.order,categ_id:0
diff --git a/addons/sale_crm/i18n/ro.po b/addons/sale_crm/i18n/ro.po
index 2fed1b8ca8d..47726224022 100644
--- a/addons/sale_crm/i18n/ro.po
+++ b/addons/sale_crm/i18n/ro.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:46+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: sale_crm
 #: field:sale.order,categ_id:0
diff --git a/addons/sale_crm/i18n/ru.po b/addons/sale_crm/i18n/ru.po
index b15551d7594..8ea191ebae6 100644
--- a/addons/sale_crm/i18n/ru.po
+++ b/addons/sale_crm/i18n/ru.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:46+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: sale_crm
 #: field:sale.order,categ_id:0
diff --git a/addons/sale_crm/i18n/sk.po b/addons/sale_crm/i18n/sk.po
index 3d9d3c94fbb..8c2c07423f6 100644
--- a/addons/sale_crm/i18n/sk.po
+++ b/addons/sale_crm/i18n/sk.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:46+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: sale_crm
 #: field:sale.order,categ_id:0
diff --git a/addons/sale_crm/i18n/sl.po b/addons/sale_crm/i18n/sl.po
index 80716cc09db..b3a2dcbc3de 100644
--- a/addons/sale_crm/i18n/sl.po
+++ b/addons/sale_crm/i18n/sl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:46+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: sale_crm
 #: field:sale.order,categ_id:0
diff --git a/addons/sale_crm/i18n/sq.po b/addons/sale_crm/i18n/sq.po
index c0aa2f0cf58..5ee066718f1 100644
--- a/addons/sale_crm/i18n/sq.po
+++ b/addons/sale_crm/i18n/sq.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:46+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: sale_crm
 #: field:sale.order,categ_id:0
diff --git a/addons/sale_crm/i18n/sv.po b/addons/sale_crm/i18n/sv.po
index ae347c35d50..ca8b47646c9 100644
--- a/addons/sale_crm/i18n/sv.po
+++ b/addons/sale_crm/i18n/sv.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:46+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: sale_crm
 #: field:sale.order,categ_id:0
diff --git a/addons/sale_crm/i18n/tlh.po b/addons/sale_crm/i18n/tlh.po
index f17bb1b4203..d5fc9aaa3a1 100644
--- a/addons/sale_crm/i18n/tlh.po
+++ b/addons/sale_crm/i18n/tlh.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:46+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: sale_crm
 #: field:sale.order,categ_id:0
diff --git a/addons/sale_crm/i18n/tr.po b/addons/sale_crm/i18n/tr.po
index f30231bb343..0f114041da7 100644
--- a/addons/sale_crm/i18n/tr.po
+++ b/addons/sale_crm/i18n/tr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:46+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: sale_crm
 #: field:sale.order,categ_id:0
diff --git a/addons/sale_crm/i18n/uk.po b/addons/sale_crm/i18n/uk.po
index 8542e48f170..df49cfd0c4d 100644
--- a/addons/sale_crm/i18n/uk.po
+++ b/addons/sale_crm/i18n/uk.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:46+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: sale_crm
 #: field:sale.order,categ_id:0
diff --git a/addons/sale_crm/i18n/vi.po b/addons/sale_crm/i18n/vi.po
index 992eeebfb2b..fc70474f8db 100644
--- a/addons/sale_crm/i18n/vi.po
+++ b/addons/sale_crm/i18n/vi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:46+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: sale_crm
 #: field:sale.order,categ_id:0
diff --git a/addons/sale_crm/i18n/zh_CN.po b/addons/sale_crm/i18n/zh_CN.po
index fde349ee41f..6678287c01e 100644
--- a/addons/sale_crm/i18n/zh_CN.po
+++ b/addons/sale_crm/i18n/zh_CN.po
@@ -7,30 +7,30 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2010-08-03 06:06+0000\n"
-"Last-Translator: openerp-china.black-jack <onetimespeed@gmail.com>\n"
+"PO-Revision-Date: 2012-08-31 14:59+0000\n"
+"Last-Translator: ccdos <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: 2012-08-09 04:46+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-09-01 04:55+0000\n"
+"X-Generator: Launchpad (build 15890)\n"
 
 #. module: sale_crm
 #: field:sale.order,categ_id:0
 msgid "Category"
-msgstr ""
+msgstr "分类"
 
 #. module: sale_crm
 #: sql_constraint:sale.order:0
 msgid "Order Reference must be unique per Company!"
-msgstr ""
+msgstr "订单号必须在一个公司范围内唯一"
 
 #. module: sale_crm
 #: code:addons/sale_crm/wizard/crm_make_sale.py:112
 #, python-format
 msgid "Converted to Sales Quotation(%s)."
-msgstr ""
+msgstr "转换为销售报价单(%s)。"
 
 #. module: sale_crm
 #: view:crm.make.sale:0
@@ -62,7 +62,7 @@ msgstr "创建(_C)"
 #. module: sale_crm
 #: view:sale.order:0
 msgid "My Sales Team(s)"
-msgstr ""
+msgstr "我的销售团队"
 
 #. module: sale_crm
 #: help:crm.make.sale,close:0
@@ -73,7 +73,7 @@ msgstr "在生成销售订单后检查是否关闭商机。"
 #. module: sale_crm
 #: view:board.board:0
 msgid "My Opportunities"
-msgstr ""
+msgstr "我的商机"
 
 #. module: sale_crm
 #: view:crm.lead:0
@@ -104,13 +104,13 @@ msgstr "关闭商机"
 #. module: sale_crm
 #: view:board.board:0
 msgid "My Planned Revenues by Stage"
-msgstr ""
+msgstr "这阶段我的计划收入"
 
 #. module: sale_crm
 #: code:addons/sale_crm/wizard/crm_make_sale.py:110
 #, python-format
 msgid "Opportunity  '%s' is converted to Quotation."
-msgstr ""
+msgstr "商机 '%s'  被转换为报价单"
 
 #. module: sale_crm
 #: view:sale.order:0
diff --git a/addons/sale_crm/i18n/zh_TW.po b/addons/sale_crm/i18n/zh_TW.po
index 661dfa863b9..86ec4d8feef 100644
--- a/addons/sale_crm/i18n/zh_TW.po
+++ b/addons/sale_crm/i18n/zh_TW.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:46+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: sale_crm
 #: field:sale.order,categ_id:0
diff --git a/addons/sale_journal/__openerp__.py b/addons/sale_journal/__openerp__.py
index ee625b9c3a9..9ca3858f817 100644
--- a/addons/sale_journal/__openerp__.py
+++ b/addons/sale_journal/__openerp__.py
@@ -51,7 +51,7 @@ Some statistics by journals are provided.
     'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
     'images': ['images/invoice_type.jpeg'],
-    'depends': ['sale_stock'],
+    'depends': ['sale'],
     'data': [
         'security/ir.model.access.csv',
         'sale_journal_view.xml',
diff --git a/addons/sale_journal/i18n/ar.po b/addons/sale_journal/i18n/ar.po
index 10c3410d603..0a73c2cb3da 100644
--- a/addons/sale_journal/i18n/ar.po
+++ b/addons/sale_journal/i18n/ar.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:15+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:20+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: sale_journal
 #: sql_constraint:sale.order:0
diff --git a/addons/sale_journal/i18n/bg.po b/addons/sale_journal/i18n/bg.po
index 3d9878502ab..cf64bb68fab 100644
--- a/addons/sale_journal/i18n/bg.po
+++ b/addons/sale_journal/i18n/bg.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:15+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:20+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: sale_journal
 #: sql_constraint:sale.order:0
diff --git a/addons/sale_journal/i18n/bs.po b/addons/sale_journal/i18n/bs.po
index 6cbd4ab8465..df73d785f53 100644
--- a/addons/sale_journal/i18n/bs.po
+++ b/addons/sale_journal/i18n/bs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:15+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:20+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: sale_journal
 #: sql_constraint:sale.order:0
diff --git a/addons/sale_journal/i18n/ca.po b/addons/sale_journal/i18n/ca.po
index fdf76a3774e..90836f06242 100644
--- a/addons/sale_journal/i18n/ca.po
+++ b/addons/sale_journal/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:15+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:20+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: sale_journal
 #: sql_constraint:sale.order:0
diff --git a/addons/sale_journal/i18n/cs.po b/addons/sale_journal/i18n/cs.po
index 7ce8e8acc39..9aabbbc0986 100644
--- a/addons/sale_journal/i18n/cs.po
+++ b/addons/sale_journal/i18n/cs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:15+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:20+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: sale_journal
 #: sql_constraint:sale.order:0
diff --git a/addons/sale_journal/i18n/da.po b/addons/sale_journal/i18n/da.po
index 039b9f3fa78..97717b2ae71 100644
--- a/addons/sale_journal/i18n/da.po
+++ b/addons/sale_journal/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:15+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:20+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: sale_journal
 #: sql_constraint:sale.order:0
diff --git a/addons/sale_journal/i18n/de.po b/addons/sale_journal/i18n/de.po
index 993cdec4ce9..a1b1bd689fe 100644
--- a/addons/sale_journal/i18n/de.po
+++ b/addons/sale_journal/i18n/de.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:15+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:20+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: sale_journal
 #: sql_constraint:sale.order:0
diff --git a/addons/sale_journal/i18n/el.po b/addons/sale_journal/i18n/el.po
index b9740ba3326..cdbc76d7963 100644
--- a/addons/sale_journal/i18n/el.po
+++ b/addons/sale_journal/i18n/el.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:15+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:20+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: sale_journal
 #: sql_constraint:sale.order:0
diff --git a/addons/sale_journal/i18n/es.po b/addons/sale_journal/i18n/es.po
index adebafed944..4521a3ed375 100644
--- a/addons/sale_journal/i18n/es.po
+++ b/addons/sale_journal/i18n/es.po
@@ -8,13 +8,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 00:37+0000\n"
 "PO-Revision-Date: 2011-01-13 09:28+0000\n"
-"Last-Translator: Carlos @ smile-iberia <Unknown>\n"
+"Last-Translator: Carlos Ch. <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: 2012-08-07 05:15+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:20+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: sale_journal
 #: sql_constraint:sale.order:0
diff --git a/addons/sale_journal/i18n/es_AR.po b/addons/sale_journal/i18n/es_AR.po
index d10e1a08b57..ba79910f5b0 100644
--- a/addons/sale_journal/i18n/es_AR.po
+++ b/addons/sale_journal/i18n/es_AR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:15+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:20+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: sale_journal
 #: sql_constraint:sale.order:0
diff --git a/addons/sale_journal/i18n/es_CL.po b/addons/sale_journal/i18n/es_CL.po
index c3bc8fab26a..deed53a09ac 100644
--- a/addons/sale_journal/i18n/es_CL.po
+++ b/addons/sale_journal/i18n/es_CL.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:15+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:20+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: sale_journal
 #: sql_constraint:sale.order:0
diff --git a/addons/sale_journal/i18n/es_CR.po b/addons/sale_journal/i18n/es_CR.po
index b7fcf534cc2..cceced6032b 100644
--- a/addons/sale_journal/i18n/es_CR.po
+++ b/addons/sale_journal/i18n/es_CR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:15+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:20+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 "Language: \n"
 
 #. module: sale_journal
diff --git a/addons/sale_journal/i18n/et.po b/addons/sale_journal/i18n/et.po
index b8b1228ec4c..66ab34a71f1 100644
--- a/addons/sale_journal/i18n/et.po
+++ b/addons/sale_journal/i18n/et.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:15+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:20+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: sale_journal
 #: sql_constraint:sale.order:0
diff --git a/addons/sale_journal/i18n/fi.po b/addons/sale_journal/i18n/fi.po
index e912db6fb2c..4812c3130c4 100644
--- a/addons/sale_journal/i18n/fi.po
+++ b/addons/sale_journal/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:15+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:20+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: sale_journal
 #: sql_constraint:sale.order:0
diff --git a/addons/sale_journal/i18n/fr.po b/addons/sale_journal/i18n/fr.po
index ccb1dede897..8be418b82cc 100644
--- a/addons/sale_journal/i18n/fr.po
+++ b/addons/sale_journal/i18n/fr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:15+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:20+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: sale_journal
 #: sql_constraint:sale.order:0
diff --git a/addons/sale_journal/i18n/gl.po b/addons/sale_journal/i18n/gl.po
index 2ea43d6ba4f..a4011a8d2b1 100644
--- a/addons/sale_journal/i18n/gl.po
+++ b/addons/sale_journal/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:15+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:20+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: sale_journal
 #: sql_constraint:sale.order:0
diff --git a/addons/sale_journal/i18n/hr.po b/addons/sale_journal/i18n/hr.po
index 7b09d417034..ac02167b5d2 100644
--- a/addons/sale_journal/i18n/hr.po
+++ b/addons/sale_journal/i18n/hr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:15+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:20+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 "Language: hr\n"
 
 #. module: sale_journal
diff --git a/addons/sale_journal/i18n/hu.po b/addons/sale_journal/i18n/hu.po
index f160e644555..1732fc97d6d 100644
--- a/addons/sale_journal/i18n/hu.po
+++ b/addons/sale_journal/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:15+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:20+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: sale_journal
 #: sql_constraint:sale.order:0
diff --git a/addons/sale_journal/i18n/id.po b/addons/sale_journal/i18n/id.po
index 618d4911bca..b289c3b6eff 100644
--- a/addons/sale_journal/i18n/id.po
+++ b/addons/sale_journal/i18n/id.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:15+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:20+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: sale_journal
 #: sql_constraint:sale.order:0
diff --git a/addons/sale_journal/i18n/it.po b/addons/sale_journal/i18n/it.po
index 084b276aa7d..3c92a1b0705 100644
--- a/addons/sale_journal/i18n/it.po
+++ b/addons/sale_journal/i18n/it.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:15+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:20+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: sale_journal
 #: sql_constraint:sale.order:0
diff --git a/addons/sale_journal/i18n/ja.po b/addons/sale_journal/i18n/ja.po
index 33ab13020c6..62e91e37567 100644
--- a/addons/sale_journal/i18n/ja.po
+++ b/addons/sale_journal/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:15+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:20+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: sale_journal
 #: sql_constraint:sale.order:0
diff --git a/addons/sale_journal/i18n/ko.po b/addons/sale_journal/i18n/ko.po
index 7c9a8c7f2dc..1a5018847b6 100644
--- a/addons/sale_journal/i18n/ko.po
+++ b/addons/sale_journal/i18n/ko.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:15+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:20+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: sale_journal
 #: sql_constraint:sale.order:0
diff --git a/addons/sale_journal/i18n/lt.po b/addons/sale_journal/i18n/lt.po
index 7ce8e8acc39..9aabbbc0986 100644
--- a/addons/sale_journal/i18n/lt.po
+++ b/addons/sale_journal/i18n/lt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:15+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:20+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: sale_journal
 #: sql_constraint:sale.order:0
diff --git a/addons/sale_journal/i18n/lv.po b/addons/sale_journal/i18n/lv.po
index 4b95e105c1a..4a605ab97b8 100644
--- a/addons/sale_journal/i18n/lv.po
+++ b/addons/sale_journal/i18n/lv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:15+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:20+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: sale_journal
 #: sql_constraint:sale.order:0
diff --git a/addons/sale_journal/i18n/mn.po b/addons/sale_journal/i18n/mn.po
index 8d690bb5c22..5269c60a9e7 100644
--- a/addons/sale_journal/i18n/mn.po
+++ b/addons/sale_journal/i18n/mn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:15+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:20+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: sale_journal
 #: sql_constraint:sale.order:0
diff --git a/addons/sale_journal/i18n/nb.po b/addons/sale_journal/i18n/nb.po
index f913257447f..6e0d1a64cfd 100644
--- a/addons/sale_journal/i18n/nb.po
+++ b/addons/sale_journal/i18n/nb.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-11 05:45+0000\n"
-"X-Generator: Launchpad (build 15780)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:20+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: sale_journal
 #: sql_constraint:sale.order:0
diff --git a/addons/sale_journal/i18n/nl.po b/addons/sale_journal/i18n/nl.po
index dc54d648e4a..1cbdc2ee449 100644
--- a/addons/sale_journal/i18n/nl.po
+++ b/addons/sale_journal/i18n/nl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:15+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:20+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: sale_journal
 #: sql_constraint:sale.order:0
diff --git a/addons/sale_journal/i18n/nl_BE.po b/addons/sale_journal/i18n/nl_BE.po
index 167b792687c..24e5594ff24 100644
--- a/addons/sale_journal/i18n/nl_BE.po
+++ b/addons/sale_journal/i18n/nl_BE.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:15+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:20+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: sale_journal
 #: sql_constraint:sale.order:0
diff --git a/addons/sale_journal/i18n/pl.po b/addons/sale_journal/i18n/pl.po
index 6d1f886e704..8d2c295179b 100644
--- a/addons/sale_journal/i18n/pl.po
+++ b/addons/sale_journal/i18n/pl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:15+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:20+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: sale_journal
 #: sql_constraint:sale.order:0
diff --git a/addons/sale_journal/i18n/pt.po b/addons/sale_journal/i18n/pt.po
index 2ec265f9d07..0507949709f 100644
--- a/addons/sale_journal/i18n/pt.po
+++ b/addons/sale_journal/i18n/pt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:15+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:20+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: sale_journal
 #: sql_constraint:sale.order:0
diff --git a/addons/sale_journal/i18n/pt_BR.po b/addons/sale_journal/i18n/pt_BR.po
index f0c4114ae53..1b37ec53777 100644
--- a/addons/sale_journal/i18n/pt_BR.po
+++ b/addons/sale_journal/i18n/pt_BR.po
@@ -8,13 +8,14 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 00:37+0000\n"
 "PO-Revision-Date: 2012-07-28 19:50+0000\n"
-"Last-Translator: Fábio Martinelli <webmaster@guaru.net>\n"
+"Last-Translator: Fábio Martinelli - http://zupy.com.br "
+"<webmaster@guaru.net>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:15+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:20+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: sale_journal
 #: sql_constraint:sale.order:0
diff --git a/addons/sale_journal/i18n/ro.po b/addons/sale_journal/i18n/ro.po
index 5205045ef5f..d1fe1b1b220 100644
--- a/addons/sale_journal/i18n/ro.po
+++ b/addons/sale_journal/i18n/ro.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:15+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:20+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: sale_journal
 #: sql_constraint:sale.order:0
diff --git a/addons/sale_journal/i18n/ru.po b/addons/sale_journal/i18n/ru.po
index f1054309649..fb49230e847 100644
--- a/addons/sale_journal/i18n/ru.po
+++ b/addons/sale_journal/i18n/ru.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:15+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:20+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: sale_journal
 #: sql_constraint:sale.order:0
diff --git a/addons/sale_journal/i18n/sk.po b/addons/sale_journal/i18n/sk.po
index a0b36198c32..51832e428cf 100644
--- a/addons/sale_journal/i18n/sk.po
+++ b/addons/sale_journal/i18n/sk.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:15+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:20+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: sale_journal
 #: sql_constraint:sale.order:0
diff --git a/addons/sale_journal/i18n/sl.po b/addons/sale_journal/i18n/sl.po
index 39823f7df0a..0f0a2f9afa7 100644
--- a/addons/sale_journal/i18n/sl.po
+++ b/addons/sale_journal/i18n/sl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:15+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:20+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: sale_journal
 #: sql_constraint:sale.order:0
diff --git a/addons/sale_journal/i18n/sq.po b/addons/sale_journal/i18n/sq.po
index 5cda1093c51..85f643ca205 100644
--- a/addons/sale_journal/i18n/sq.po
+++ b/addons/sale_journal/i18n/sq.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:15+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:20+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: sale_journal
 #: sql_constraint:sale.order:0
diff --git a/addons/sale_journal/i18n/sv.po b/addons/sale_journal/i18n/sv.po
index cc432166d5a..d0be2e6bde8 100644
--- a/addons/sale_journal/i18n/sv.po
+++ b/addons/sale_journal/i18n/sv.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:15+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:20+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: sale_journal
 #: sql_constraint:sale.order:0
diff --git a/addons/sale_journal/i18n/tlh.po b/addons/sale_journal/i18n/tlh.po
index b88634b024b..e9c01efc2b7 100644
--- a/addons/sale_journal/i18n/tlh.po
+++ b/addons/sale_journal/i18n/tlh.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:15+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:20+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: sale_journal
 #: sql_constraint:sale.order:0
diff --git a/addons/sale_journal/i18n/tr.po b/addons/sale_journal/i18n/tr.po
index 1b01d7de9ee..b125d95fd25 100644
--- a/addons/sale_journal/i18n/tr.po
+++ b/addons/sale_journal/i18n/tr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:15+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:20+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: sale_journal
 #: sql_constraint:sale.order:0
diff --git a/addons/sale_journal/i18n/uk.po b/addons/sale_journal/i18n/uk.po
index b26c0fe0387..3506198c06f 100644
--- a/addons/sale_journal/i18n/uk.po
+++ b/addons/sale_journal/i18n/uk.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:15+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:20+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: sale_journal
 #: sql_constraint:sale.order:0
diff --git a/addons/sale_journal/i18n/vi.po b/addons/sale_journal/i18n/vi.po
index e6a3c008129..7083d3768e4 100644
--- a/addons/sale_journal/i18n/vi.po
+++ b/addons/sale_journal/i18n/vi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:15+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:20+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: sale_journal
 #: sql_constraint:sale.order:0
diff --git a/addons/sale_journal/i18n/zh_CN.po b/addons/sale_journal/i18n/zh_CN.po
index 327debed019..a6cca4838f2 100644
--- a/addons/sale_journal/i18n/zh_CN.po
+++ b/addons/sale_journal/i18n/zh_CN.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:15+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:20+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: sale_journal
 #: sql_constraint:sale.order:0
diff --git a/addons/sale_journal/i18n/zh_TW.po b/addons/sale_journal/i18n/zh_TW.po
index ec7e1515f92..00cb6cf7a6f 100644
--- a/addons/sale_journal/i18n/zh_TW.po
+++ b/addons/sale_journal/i18n/zh_TW.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:15+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:20+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: sale_journal
 #: sql_constraint:sale.order:0
diff --git a/addons/sale_margin/__openerp__.py b/addons/sale_margin/__openerp__.py
index 6cacdcda7b4..cb1812b8e9f 100644
--- a/addons/sale_margin/__openerp__.py
+++ b/addons/sale_margin/__openerp__.py
@@ -31,7 +31,7 @@ Price and Cost Price.
     """,
     'author':'OpenERP SA',
     'images':['images/sale_margin.jpeg'],
-    'depends':['sale_stock'],
+    'depends':['sale'],
     'demo':[],
     'test': ['test/sale_margin.yml'],
     'data':['security/ir.model.access.csv','sale_margin_view.xml'],
diff --git a/addons/sale_margin/i18n/ar.po b/addons/sale_margin/i18n/ar.po
index 8b80205514d..76fc4a01c51 100644
--- a/addons/sale_margin/i18n/ar.po
+++ b/addons/sale_margin/i18n/ar.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:33+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: sale_margin
 #: sql_constraint:sale.order:0
diff --git a/addons/sale_margin/i18n/bg.po b/addons/sale_margin/i18n/bg.po
index 8bf679e3f29..0624d754f30 100644
--- a/addons/sale_margin/i18n/bg.po
+++ b/addons/sale_margin/i18n/bg.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:33+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: sale_margin
 #: sql_constraint:sale.order:0
diff --git a/addons/sale_margin/i18n/ca.po b/addons/sale_margin/i18n/ca.po
index c2b5b9efd87..c65320fb52a 100644
--- a/addons/sale_margin/i18n/ca.po
+++ b/addons/sale_margin/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:33+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: sale_margin
 #: sql_constraint:sale.order:0
diff --git a/addons/sale_margin/i18n/da.po b/addons/sale_margin/i18n/da.po
index 448dc07e860..01d395ed605 100644
--- a/addons/sale_margin/i18n/da.po
+++ b/addons/sale_margin/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:33+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: sale_margin
 #: sql_constraint:sale.order:0
diff --git a/addons/sale_margin/i18n/de.po b/addons/sale_margin/i18n/de.po
index 79fb38a2b0a..aca2dc802b2 100644
--- a/addons/sale_margin/i18n/de.po
+++ b/addons/sale_margin/i18n/de.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:33+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: sale_margin
 #: sql_constraint:sale.order:0
diff --git a/addons/sale_margin/i18n/el.po b/addons/sale_margin/i18n/el.po
index 25dd5d13041..627287231f8 100644
--- a/addons/sale_margin/i18n/el.po
+++ b/addons/sale_margin/i18n/el.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:33+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: sale_margin
 #: sql_constraint:sale.order:0
diff --git a/addons/sale_margin/i18n/es.po b/addons/sale_margin/i18n/es.po
index 895fd125eef..7f0926da60d 100644
--- a/addons/sale_margin/i18n/es.po
+++ b/addons/sale_margin/i18n/es.po
@@ -9,13 +9,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:37+0000\n"
 "PO-Revision-Date: 2011-01-13 20:47+0000\n"
-"Last-Translator: Carlos @ smile-iberia <Unknown>\n"
+"Last-Translator: Carlos Ch. <Unknown>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:33+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: sale_margin
 #: sql_constraint:sale.order:0
diff --git a/addons/sale_margin/i18n/es_CL.po b/addons/sale_margin/i18n/es_CL.po
index 34be7f49380..b4005fb1903 100644
--- a/addons/sale_margin/i18n/es_CL.po
+++ b/addons/sale_margin/i18n/es_CL.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:33+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: sale_margin
 #: sql_constraint:sale.order:0
diff --git a/addons/sale_margin/i18n/es_CR.po b/addons/sale_margin/i18n/es_CR.po
index 4c72e1f85eb..4cb0c754679 100644
--- a/addons/sale_margin/i18n/es_CR.po
+++ b/addons/sale_margin/i18n/es_CR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:33+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 "Language: es\n"
 
 #. module: sale_margin
diff --git a/addons/sale_margin/i18n/es_MX.po.moved b/addons/sale_margin/i18n/es_MX.po.moved
deleted file mode 100644
index ac02278b28a..00000000000
--- a/addons/sale_margin/i18n/es_MX.po.moved
+++ /dev/null
@@ -1,335 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* sale_margin
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.2\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2011-07-05 15:57+0000\n"
-"PO-Revision-Date: 2011-07-05 15:57+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: sale_margin
-#: view:report.account.invoice.product:0
-msgid "Category"
-msgstr "Categoría"
-
-#. module: sale_margin
-#: selection:report.account.invoice.product,type:0
-msgid "Customer Refund"
-msgstr "Factura de abono de cliente"
-
-#. module: sale_margin
-#: selection:report.account.invoice.product,type:0
-msgid "Customer Invoice"
-msgstr "Factura de cliente"
-
-#. module: sale_margin
-#: selection:report.account.invoice.product,month:0
-msgid "February"
-msgstr "Febrero"
-
-#. module: sale_margin
-#: view:report.account.invoice.product:0
-msgid "Current"
-msgstr "Actual"
-
-#. module: sale_margin
-#: view:report.account.invoice.product:0
-msgid "Group By..."
-msgstr "Agrupar por..."
-
-#. module: sale_margin
-#: view:report.account.invoice.product:0
-#: field:report.account.invoice.product,state:0
-msgid "State"
-msgstr "Estado"
-
-#. module: sale_margin
-#: model:ir.module.module,description:sale_margin.module_meta_information
-msgid " \n"
-"    This module adds the 'Margin' on sales order,\n"
-"    which gives the profitability by calculating the difference between the Unit Price and Cost Price\n"
-"    "
-msgstr " \n"
-"    Este módulo añade el 'Margen' en el pedido de venta,\n"
-"    que proporciona la rentabilidad calculando la diferencia entre el precio unidad y el precio de coste\n"
-"    "
-
-#. module: sale_margin
-#: view:report.account.invoice.product:0
-#: selection:report.account.invoice.product,state:0
-msgid "Draft"
-msgstr "Borrador"
-
-#. module: sale_margin
-#: selection:report.account.invoice.product,state:0
-msgid "Paid"
-msgstr "Pagado"
-
-#. module: sale_margin
-#: model:ir.model,name:sale_margin.model_stock_picking
-msgid "Picking List"
-msgstr "Lista de Empaque"
-
-#. module: sale_margin
-#: help:sale.order,margin:0
-msgid "It gives profitability by calculating the difference between the Unit Price and Cost Price."
-msgstr "Proporciona la rentabilidad calculando la diferencia entre el precio unidad y el precio de coste."
-
-#. module: sale_margin
-#: field:report.account.invoice.product,type:0
-msgid "Type"
-msgstr "Tipo"
-
-#. module: sale_margin
-#: model:ir.model,name:sale_margin.model_report_account_invoice_product
-msgid "Invoice Statistics"
-msgstr "Estadísticas de facturas"
-
-#. module: sale_margin
-#: view:report.account.invoice.product:0
-#: field:report.account.invoice.product,product_id:0
-msgid "Product"
-msgstr "Producto"
-
-#. module: sale_margin
-#: sql_constraint:sale.order:0
-msgid "Order Reference must be unique !"
-msgstr "¡La referencia del pedido debe ser única!"
-
-#. module: sale_margin
-#: view:report.account.invoice.product:0
-msgid "Invoice by Partner"
-msgstr "Facturas por empresa"
-
-#. module: sale_margin
-#: selection:report.account.invoice.product,month:0
-msgid "August"
-msgstr "Agosto"
-
-#. module: sale_margin
-#: view:report.account.invoice.product:0
-#: selection:report.account.invoice.product,state:0
-msgid "Pro-forma"
-msgstr "Pro-forma"
-
-#. module: sale_margin
-#: selection:report.account.invoice.product,month:0
-msgid "May"
-msgstr "Mayo"
-
-#. module: sale_margin
-#: selection:report.account.invoice.product,month:0
-msgid "June"
-msgstr "Junio"
-
-#. module: sale_margin
-#: view:report.account.invoice.product:0
-msgid "Date Invoiced"
-msgstr "Fecha de facturación"
-
-#. module: sale_margin
-#: model:ir.module.module,shortdesc:sale_margin.module_meta_information
-msgid "Margins in Sales Order"
-msgstr "Márgenes en pedidos de venta"
-
-#. module: sale_margin
-#: view:report.account.invoice.product:0
-msgid "Search Margin"
-msgstr "Buscar margen"
-
-#. module: sale_margin
-#: view:report.account.invoice.product:0
-msgid "This Year"
-msgstr "Este año"
-
-#. module: sale_margin
-#: field:report.account.invoice.product,date:0
-msgid "Date"
-msgstr "Fecha"
-
-#. module: sale_margin
-#: selection:report.account.invoice.product,month:0
-msgid "July"
-msgstr "Julio"
-
-#. module: sale_margin
-#: view:report.account.invoice.product:0
-msgid "Extended Filters..."
-msgstr "Filtros extendidos..."
-
-#. module: sale_margin
-#: view:report.account.invoice.product:0
-msgid "This Month"
-msgstr "Este Mes"
-
-#. module: sale_margin
-#: view:report.account.invoice.product:0
-#: field:report.account.invoice.product,day:0
-msgid "Day"
-msgstr "Día"
-
-#. module: sale_margin
-#: field:report.account.invoice.product,categ_id:0
-msgid "Categories"
-msgstr "Categorias"
-
-#. module: sale_margin
-#: field:account.invoice.line,cost_price:0
-#: field:report.account.invoice.product,cost_price:0
-#: field:sale.order.line,purchase_price:0
-msgid "Cost Price"
-msgstr "Precio coste"
-
-#. module: sale_margin
-#: selection:report.account.invoice.product,month:0
-msgid "October"
-msgstr "Octubre"
-
-#. module: sale_margin
-#: selection:report.account.invoice.product,month:0
-msgid "January"
-msgstr "Enero"
-
-#. module: sale_margin
-#: view:report.account.invoice.product:0
-#: field:report.account.invoice.product,year:0
-msgid "Year"
-msgstr "Año"
-
-#. module: sale_margin
-#: selection:report.account.invoice.product,month:0
-msgid "September"
-msgstr "Septiembre"
-
-#. module: sale_margin
-#: selection:report.account.invoice.product,month:0
-msgid "April"
-msgstr "Abril"
-
-#. module: sale_margin
-#: field:report.account.invoice.product,amount:0
-msgid "Amount"
-msgstr "Importe"
-
-#. module: sale_margin
-#: selection:report.account.invoice.product,type:0
-msgid "Supplier Refund"
-msgstr "Factura de abono de proveedor"
-
-#. module: sale_margin
-#: selection:report.account.invoice.product,month:0
-msgid "March"
-msgstr "Marzo"
-
-#. module: sale_margin
-#: field:report.account.invoice.product,margin:0
-#: field:sale.order,margin:0
-#: field:sale.order.line,margin:0
-msgid "Margin"
-msgstr "Margen"
-
-#. module: sale_margin
-#: selection:report.account.invoice.product,month:0
-msgid "November"
-msgstr "Noviembre"
-
-#. module: sale_margin
-#: field:report.account.invoice.product,quantity:0
-msgid "Quantity"
-msgstr "Cantidad"
-
-#. module: sale_margin
-#: view:report.account.invoice.product:0
-msgid "Invoices by product"
-msgstr "Facturas por producto"
-
-#. module: sale_margin
-#: selection:report.account.invoice.product,type:0
-msgid "Supplier Invoice"
-msgstr "Factura de proveedor"
-
-#. module: sale_margin
-#: field:stock.picking,invoice_ids:0
-msgid "Invoices"
-msgstr "Facturas"
-
-#. module: sale_margin
-#: selection:report.account.invoice.product,month:0
-msgid "December"
-msgstr "Diciembre"
-
-#. module: sale_margin
-#: model:ir.model,name:sale_margin.model_account_invoice_line
-msgid "Invoice Line"
-msgstr "Línea de factura"
-
-#. module: sale_margin
-#: view:report.account.invoice.product:0
-#: field:report.account.invoice.product,month:0
-msgid "Month"
-msgstr "Mes"
-
-#. module: sale_margin
-#: selection:report.account.invoice.product,state:0
-msgid "Canceled"
-msgstr "Cancelada"
-
-#. module: sale_margin
-#: model:ir.actions.act_window,help:sale_margin.action_report_account_invoice_report
-msgid "This report gives you an overview of all the invoices generated by the system. You can sort and group your results by specific selection criteria to quickly find what you are looking for."
-msgstr "Este informe ofrece una visión general de todas las facturas generadas por el sistema. Puede ordenar y agrupar los resultados por criterios específicos de selección para encontrar rápidamente lo que busca."
-
-#. module: sale_margin
-#: model:ir.ui.menu,name:sale_margin.menu_report_account_invoice_product
-msgid "Invoice Report"
-msgstr "Informe de factura"
-
-#. module: sale_margin
-#: view:report.account.invoice.product:0
-msgid "Done"
-msgstr "Realizado"
-
-#. module: sale_margin
-#: model:ir.ui.menu,name:sale_margin.menu_report_account_invoice_reoirt
-msgid "Invoice"
-msgstr "Factura"
-
-#. module: sale_margin
-#: view:stock.picking:0
-msgid "Customer Invoices"
-msgstr "Facturas de cliente"
-
-#. module: sale_margin
-#: view:report.account.invoice.product:0
-#: field:report.account.invoice.product,partner_id:0
-msgid "Partner"
-msgstr "Socio"
-
-#. module: sale_margin
-#: model:ir.model,name:sale_margin.model_sale_order
-msgid "Sales Order"
-msgstr "Pedido de venta"
-
-#. module: sale_margin
-#: selection:report.account.invoice.product,state:0
-msgid "Open"
-msgstr "Abierta"
-
-#. module: sale_margin
-#: model:ir.actions.act_window,name:sale_margin.action_report_account_invoice_report
-msgid "Invoice Analysis"
-msgstr "Análisis de facturas"
-
-#. module: sale_margin
-#: model:ir.model,name:sale_margin.model_sale_order_line
-msgid "Sales Order Line"
-msgstr "Línea pedido de venta"
-
diff --git a/addons/sale_margin/i18n/et.po b/addons/sale_margin/i18n/et.po
index 0ea4e861962..1272319f8ff 100644
--- a/addons/sale_margin/i18n/et.po
+++ b/addons/sale_margin/i18n/et.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:33+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: sale_margin
 #: sql_constraint:sale.order:0
diff --git a/addons/sale_margin/i18n/fi.po b/addons/sale_margin/i18n/fi.po
index 060dc20a483..af425a9db67 100644
--- a/addons/sale_margin/i18n/fi.po
+++ b/addons/sale_margin/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:33+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: sale_margin
 #: sql_constraint:sale.order:0
diff --git a/addons/sale_margin/i18n/fr.po b/addons/sale_margin/i18n/fr.po
index 8e074b7d7ec..b7e18e5195d 100644
--- a/addons/sale_margin/i18n/fr.po
+++ b/addons/sale_margin/i18n/fr.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:33+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: sale_margin
 #: sql_constraint:sale.order:0
diff --git a/addons/sale_margin/i18n/hr.po b/addons/sale_margin/i18n/hr.po
index c5d00f49054..15747cc02d1 100644
--- a/addons/sale_margin/i18n/hr.po
+++ b/addons/sale_margin/i18n/hr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:33+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: sale_margin
 #: sql_constraint:sale.order:0
diff --git a/addons/sale_margin/i18n/hu.po b/addons/sale_margin/i18n/hu.po
index ef670252d26..ae571b8b704 100644
--- a/addons/sale_margin/i18n/hu.po
+++ b/addons/sale_margin/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:33+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: sale_margin
 #: sql_constraint:sale.order:0
diff --git a/addons/sale_margin/i18n/it.po b/addons/sale_margin/i18n/it.po
index 4ef65019d4e..55dbda86da9 100644
--- a/addons/sale_margin/i18n/it.po
+++ b/addons/sale_margin/i18n/it.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:33+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: sale_margin
 #: sql_constraint:sale.order:0
diff --git a/addons/sale_margin/i18n/ja.po b/addons/sale_margin/i18n/ja.po
index 4b9b8e7452f..b1005ed9008 100644
--- a/addons/sale_margin/i18n/ja.po
+++ b/addons/sale_margin/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:33+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: sale_margin
 #: sql_constraint:sale.order:0
diff --git a/addons/sale_margin/i18n/mn.po b/addons/sale_margin/i18n/mn.po
index afde8e42cb4..41a5cb593ee 100644
--- a/addons/sale_margin/i18n/mn.po
+++ b/addons/sale_margin/i18n/mn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:33+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: sale_margin
 #: sql_constraint:sale.order:0
diff --git a/addons/sale_margin/i18n/nb.po b/addons/sale_margin/i18n/nb.po
index da91e79ddbd..fbb51d68391 100644
--- a/addons/sale_margin/i18n/nb.po
+++ b/addons/sale_margin/i18n/nb.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:33+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: sale_margin
 #: sql_constraint:sale.order:0
diff --git a/addons/sale_margin/i18n/nl.po b/addons/sale_margin/i18n/nl.po
index 917f76a5a44..559a614a9e0 100644
--- a/addons/sale_margin/i18n/nl.po
+++ b/addons/sale_margin/i18n/nl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:33+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: sale_margin
 #: sql_constraint:sale.order:0
diff --git a/addons/sale_margin/i18n/pl.po b/addons/sale_margin/i18n/pl.po
index f37d69f2b96..01b3e1a3ba1 100644
--- a/addons/sale_margin/i18n/pl.po
+++ b/addons/sale_margin/i18n/pl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:33+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: sale_margin
 #: sql_constraint:sale.order:0
diff --git a/addons/sale_margin/i18n/pt.po b/addons/sale_margin/i18n/pt.po
index 70f21ac12cc..41d91fb9114 100644
--- a/addons/sale_margin/i18n/pt.po
+++ b/addons/sale_margin/i18n/pt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:33+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: sale_margin
 #: sql_constraint:sale.order:0
diff --git a/addons/sale_margin/i18n/pt_BR.po b/addons/sale_margin/i18n/pt_BR.po
index 0ce36699148..41b8fcf70ac 100644
--- a/addons/sale_margin/i18n/pt_BR.po
+++ b/addons/sale_margin/i18n/pt_BR.po
@@ -9,13 +9,14 @@ msgstr ""
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:37+0000\n"
 "PO-Revision-Date: 2012-07-28 19:50+0000\n"
-"Last-Translator: Fábio Martinelli <webmaster@guaru.net>\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: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:33+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: sale_margin
 #: sql_constraint:sale.order:0
diff --git a/addons/sale_margin/i18n/ro.po b/addons/sale_margin/i18n/ro.po
index a177ae330dc..f6dbd07f6c8 100644
--- a/addons/sale_margin/i18n/ro.po
+++ b/addons/sale_margin/i18n/ro.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:33+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: sale_margin
 #: sql_constraint:sale.order:0
diff --git a/addons/sale_margin/i18n/ru.po b/addons/sale_margin/i18n/ru.po
index efee0e6a377..f4d0138529e 100644
--- a/addons/sale_margin/i18n/ru.po
+++ b/addons/sale_margin/i18n/ru.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:33+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: sale_margin
 #: sql_constraint:sale.order:0
diff --git a/addons/sale_margin/i18n/sk.po b/addons/sale_margin/i18n/sk.po
index f8977e5bf19..6071a355d6b 100644
--- a/addons/sale_margin/i18n/sk.po
+++ b/addons/sale_margin/i18n/sk.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:33+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: sale_margin
 #: sql_constraint:sale.order:0
diff --git a/addons/sale_margin/i18n/sl.po b/addons/sale_margin/i18n/sl.po
index 7cdfc4095a6..c6519567944 100644
--- a/addons/sale_margin/i18n/sl.po
+++ b/addons/sale_margin/i18n/sl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:33+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: sale_margin
 #: sql_constraint:sale.order:0
diff --git a/addons/sale_margin/i18n/sv.po b/addons/sale_margin/i18n/sv.po
index 033a1cd9ce9..bfc072363c2 100644
--- a/addons/sale_margin/i18n/sv.po
+++ b/addons/sale_margin/i18n/sv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:33+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: sale_margin
 #: sql_constraint:sale.order:0
diff --git a/addons/sale_margin/i18n/tr.po b/addons/sale_margin/i18n/tr.po
index d77c2c1e564..ec7d7e58fcd 100644
--- a/addons/sale_margin/i18n/tr.po
+++ b/addons/sale_margin/i18n/tr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:33+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: sale_margin
 #: sql_constraint:sale.order:0
diff --git a/addons/sale_margin/i18n/zh_CN.po b/addons/sale_margin/i18n/zh_CN.po
index 13347cf4059..5b7bad98b6a 100644
--- a/addons/sale_margin/i18n/zh_CN.po
+++ b/addons/sale_margin/i18n/zh_CN.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:33+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: sale_margin
 #: sql_constraint:sale.order:0
diff --git a/addons/sale_mrp/i18n/ar.po b/addons/sale_mrp/i18n/ar.po
index 6a6a0ee630e..4a35287509a 100644
--- a/addons/sale_mrp/i18n/ar.po
+++ b/addons/sale_mrp/i18n/ar.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: sale_mrp
 #: help:mrp.production,sale_ref:0
diff --git a/addons/sale_mrp/i18n/bg.po b/addons/sale_mrp/i18n/bg.po
index b259f6c7cae..a02bb00d1fa 100644
--- a/addons/sale_mrp/i18n/bg.po
+++ b/addons/sale_mrp/i18n/bg.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: sale_mrp
 #: help:mrp.production,sale_ref:0
diff --git a/addons/sale_mrp/i18n/ca.po b/addons/sale_mrp/i18n/ca.po
index 9d3b37fc20d..b71598cf38c 100644
--- a/addons/sale_mrp/i18n/ca.po
+++ b/addons/sale_mrp/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: sale_mrp
 #: help:mrp.production,sale_ref:0
diff --git a/addons/sale_mrp/i18n/da.po b/addons/sale_mrp/i18n/da.po
index e46c9adfee0..14bf15fea9f 100644
--- a/addons/sale_mrp/i18n/da.po
+++ b/addons/sale_mrp/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: sale_mrp
 #: help:mrp.production,sale_ref:0
diff --git a/addons/sale_mrp/i18n/de.po b/addons/sale_mrp/i18n/de.po
index 97de84d9d9b..596cb2faa4e 100644
--- a/addons/sale_mrp/i18n/de.po
+++ b/addons/sale_mrp/i18n/de.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: sale_mrp
 #: help:mrp.production,sale_ref:0
diff --git a/addons/sale_mrp/i18n/es.po b/addons/sale_mrp/i18n/es.po
index 87e9f6072c4..91331b8b118 100644
--- a/addons/sale_mrp/i18n/es.po
+++ b/addons/sale_mrp/i18n/es.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: sale_mrp
 #: help:mrp.production,sale_ref:0
diff --git a/addons/sale_mrp/i18n/es_CL.po b/addons/sale_mrp/i18n/es_CL.po
index 80cb81e5408..8336e19afb8 100644
--- a/addons/sale_mrp/i18n/es_CL.po
+++ b/addons/sale_mrp/i18n/es_CL.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: sale_mrp
 #: help:mrp.production,sale_ref:0
diff --git a/addons/sale_mrp/i18n/es_CR.po b/addons/sale_mrp/i18n/es_CR.po
index 679c078725c..b3bc95f1e76 100644
--- a/addons/sale_mrp/i18n/es_CR.po
+++ b/addons/sale_mrp/i18n/es_CR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 "Language: es\n"
 
 #. module: sale_mrp
diff --git a/addons/sale_mrp/i18n/et.po b/addons/sale_mrp/i18n/et.po
index 1821f1b5802..2c0321ee408 100644
--- a/addons/sale_mrp/i18n/et.po
+++ b/addons/sale_mrp/i18n/et.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: sale_mrp
 #: help:mrp.production,sale_ref:0
diff --git a/addons/sale_mrp/i18n/fi.po b/addons/sale_mrp/i18n/fi.po
index 76b7f05f3f4..eb7e583b01a 100644
--- a/addons/sale_mrp/i18n/fi.po
+++ b/addons/sale_mrp/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: sale_mrp
 #: help:mrp.production,sale_ref:0
diff --git a/addons/sale_mrp/i18n/fr.po b/addons/sale_mrp/i18n/fr.po
index 58390dea150..d0729a1f29f 100644
--- a/addons/sale_mrp/i18n/fr.po
+++ b/addons/sale_mrp/i18n/fr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: sale_mrp
 #: help:mrp.production,sale_ref:0
diff --git a/addons/sale_mrp/i18n/gl.po b/addons/sale_mrp/i18n/gl.po
index a285bb1f153..c23fa8204ef 100644
--- a/addons/sale_mrp/i18n/gl.po
+++ b/addons/sale_mrp/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: sale_mrp
 #: help:mrp.production,sale_ref:0
diff --git a/addons/sale_mrp/i18n/hr.po b/addons/sale_mrp/i18n/hr.po
index a0a94018a4a..d0de8fc4be0 100644
--- a/addons/sale_mrp/i18n/hr.po
+++ b/addons/sale_mrp/i18n/hr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: sale_mrp
 #: help:mrp.production,sale_ref:0
diff --git a/addons/sale_mrp/i18n/hu.po b/addons/sale_mrp/i18n/hu.po
index aff8fa161e0..87f847b0ab3 100644
--- a/addons/sale_mrp/i18n/hu.po
+++ b/addons/sale_mrp/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: sale_mrp
 #: help:mrp.production,sale_ref:0
diff --git a/addons/sale_mrp/i18n/it.po b/addons/sale_mrp/i18n/it.po
index 2bfc50c0d52..9eae142f57b 100644
--- a/addons/sale_mrp/i18n/it.po
+++ b/addons/sale_mrp/i18n/it.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: sale_mrp
 #: help:mrp.production,sale_ref:0
diff --git a/addons/sale_mrp/i18n/ja.po b/addons/sale_mrp/i18n/ja.po
index 64977fe87d5..a8b8d12ac3b 100644
--- a/addons/sale_mrp/i18n/ja.po
+++ b/addons/sale_mrp/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: sale_mrp
 #: help:mrp.production,sale_ref:0
diff --git a/addons/sale_mrp/i18n/mn.po b/addons/sale_mrp/i18n/mn.po
index 10f99a64f3b..7ed518e206f 100644
--- a/addons/sale_mrp/i18n/mn.po
+++ b/addons/sale_mrp/i18n/mn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: sale_mrp
 #: help:mrp.production,sale_ref:0
diff --git a/addons/sale_mrp/i18n/nb.po b/addons/sale_mrp/i18n/nb.po
index d4bc99af576..34e98119623 100644
--- a/addons/sale_mrp/i18n/nb.po
+++ b/addons/sale_mrp/i18n/nb.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: sale_mrp
 #: help:mrp.production,sale_ref:0
diff --git a/addons/sale_mrp/i18n/nl.po b/addons/sale_mrp/i18n/nl.po
index 8da760c2090..9447554ce28 100644
--- a/addons/sale_mrp/i18n/nl.po
+++ b/addons/sale_mrp/i18n/nl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: sale_mrp
 #: help:mrp.production,sale_ref:0
diff --git a/addons/sale_mrp/i18n/nl_BE.po b/addons/sale_mrp/i18n/nl_BE.po
index dabce60f5a8..6f87e3a0498 100644
--- a/addons/sale_mrp/i18n/nl_BE.po
+++ b/addons/sale_mrp/i18n/nl_BE.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: sale_mrp
 #: help:mrp.production,sale_ref:0
diff --git a/addons/sale_mrp/i18n/pl.po b/addons/sale_mrp/i18n/pl.po
index 9c1700b493a..69c4856889a 100644
--- a/addons/sale_mrp/i18n/pl.po
+++ b/addons/sale_mrp/i18n/pl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: sale_mrp
 #: help:mrp.production,sale_ref:0
diff --git a/addons/sale_mrp/i18n/pt.po b/addons/sale_mrp/i18n/pt.po
index c6c6afd1bfa..a8e30f3937f 100644
--- a/addons/sale_mrp/i18n/pt.po
+++ b/addons/sale_mrp/i18n/pt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: sale_mrp
 #: help:mrp.production,sale_ref:0
diff --git a/addons/sale_mrp/i18n/pt_BR.po b/addons/sale_mrp/i18n/pt_BR.po
index 62c0c4e2301..b58b90029ed 100644
--- a/addons/sale_mrp/i18n/pt_BR.po
+++ b/addons/sale_mrp/i18n/pt_BR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: sale_mrp
 #: help:mrp.production,sale_ref:0
diff --git a/addons/sale_mrp/i18n/ro.po b/addons/sale_mrp/i18n/ro.po
index e7aa7eafd7a..2862ce7acb9 100644
--- a/addons/sale_mrp/i18n/ro.po
+++ b/addons/sale_mrp/i18n/ro.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: sale_mrp
 #: help:mrp.production,sale_ref:0
diff --git a/addons/sale_mrp/i18n/ru.po b/addons/sale_mrp/i18n/ru.po
index cdc86a5b56a..fb32f62c137 100644
--- a/addons/sale_mrp/i18n/ru.po
+++ b/addons/sale_mrp/i18n/ru.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: sale_mrp
 #: help:mrp.production,sale_ref:0
diff --git a/addons/sale_mrp/i18n/sl.po b/addons/sale_mrp/i18n/sl.po
index 88dc09d0865..5f541153ac2 100644
--- a/addons/sale_mrp/i18n/sl.po
+++ b/addons/sale_mrp/i18n/sl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: sale_mrp
 #: help:mrp.production,sale_ref:0
diff --git a/addons/sale_mrp/i18n/sr@latin.po b/addons/sale_mrp/i18n/sr@latin.po
index c10a0ae5091..5505e7884cf 100644
--- a/addons/sale_mrp/i18n/sr@latin.po
+++ b/addons/sale_mrp/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: sale_mrp
 #: help:mrp.production,sale_ref:0
diff --git a/addons/sale_mrp/i18n/sv.po b/addons/sale_mrp/i18n/sv.po
index 4ac25dd7e32..acb0a87aaf0 100644
--- a/addons/sale_mrp/i18n/sv.po
+++ b/addons/sale_mrp/i18n/sv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: sale_mrp
 #: help:mrp.production,sale_ref:0
diff --git a/addons/sale_mrp/i18n/tr.po b/addons/sale_mrp/i18n/tr.po
index bfbae6d8395..c61ab9200a9 100644
--- a/addons/sale_mrp/i18n/tr.po
+++ b/addons/sale_mrp/i18n/tr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: sale_mrp
 #: help:mrp.production,sale_ref:0
diff --git a/addons/sale_mrp/i18n/zh_CN.po b/addons/sale_mrp/i18n/zh_CN.po
index 327a6368818..bb04533ef97 100644
--- a/addons/sale_mrp/i18n/zh_CN.po
+++ b/addons/sale_mrp/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-02-08 00:37+0000\n"
-"PO-Revision-Date: 2011-06-28 05:04+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2012-08-31 14:59+0000\n"
+"Last-Translator: ccdos <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: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-09-01 04:55+0000\n"
+"X-Generator: Launchpad (build 15890)\n"
 
 #. module: sale_mrp
 #: help:mrp.production,sale_ref:0
@@ -40,12 +40,12 @@ msgstr "销售名称"
 #. module: sale_mrp
 #: sql_constraint:mrp.production:0
 msgid "Reference must be unique per Company!"
-msgstr ""
+msgstr "编号必须在公司内唯一！"
 
 #. module: sale_mrp
 #: constraint:mrp.production:0
 msgid "Order quantity cannot be negative or zero!"
-msgstr ""
+msgstr "订单数量不能是负数或者0！"
 
 #. module: sale_mrp
 #: help:mrp.production,sale_name:0
diff --git a/addons/sale_order_dates/i18n/ar.po b/addons/sale_order_dates/i18n/ar.po
index af1f71b9a08..27726f34b3b 100644
--- a/addons/sale_order_dates/i18n/ar.po
+++ b/addons/sale_order_dates/i18n/ar.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: sale_order_dates
 #: sql_constraint:sale.order:0
diff --git a/addons/sale_order_dates/i18n/bg.po b/addons/sale_order_dates/i18n/bg.po
index 6fbde9ee6a9..a456e6fdf51 100644
--- a/addons/sale_order_dates/i18n/bg.po
+++ b/addons/sale_order_dates/i18n/bg.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: sale_order_dates
 #: sql_constraint:sale.order:0
diff --git a/addons/sale_order_dates/i18n/ca.po b/addons/sale_order_dates/i18n/ca.po
index a0a452e2966..2f9f0884ed1 100644
--- a/addons/sale_order_dates/i18n/ca.po
+++ b/addons/sale_order_dates/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: sale_order_dates
 #: sql_constraint:sale.order:0
diff --git a/addons/sale_order_dates/i18n/da.po b/addons/sale_order_dates/i18n/da.po
index 37f9ad7c3cc..70b8aa0bff5 100644
--- a/addons/sale_order_dates/i18n/da.po
+++ b/addons/sale_order_dates/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: sale_order_dates
 #: sql_constraint:sale.order:0
diff --git a/addons/sale_order_dates/i18n/de.po b/addons/sale_order_dates/i18n/de.po
index a5abf95643c..9abb6524ebd 100644
--- a/addons/sale_order_dates/i18n/de.po
+++ b/addons/sale_order_dates/i18n/de.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: sale_order_dates
 #: sql_constraint:sale.order:0
diff --git a/addons/sale_order_dates/i18n/el.po b/addons/sale_order_dates/i18n/el.po
index 5c0c2a1294d..bec0fd9579b 100644
--- a/addons/sale_order_dates/i18n/el.po
+++ b/addons/sale_order_dates/i18n/el.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: sale_order_dates
 #: sql_constraint:sale.order:0
diff --git a/addons/sale_order_dates/i18n/es.po b/addons/sale_order_dates/i18n/es.po
index 5cac0e911f8..a8e8dffff6d 100644
--- a/addons/sale_order_dates/i18n/es.po
+++ b/addons/sale_order_dates/i18n/es.po
@@ -9,13 +9,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:37+0000\n"
 "PO-Revision-Date: 2011-01-13 10:05+0000\n"
-"Last-Translator: Carlos @ smile-iberia <Unknown>\n"
+"Last-Translator: Carlos Ch. <Unknown>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: sale_order_dates
 #: sql_constraint:sale.order:0
diff --git a/addons/sale_order_dates/i18n/es_CL.po b/addons/sale_order_dates/i18n/es_CL.po
index c8e3f622073..cdc6b065c08 100644
--- a/addons/sale_order_dates/i18n/es_CL.po
+++ b/addons/sale_order_dates/i18n/es_CL.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: sale_order_dates
 #: sql_constraint:sale.order:0
diff --git a/addons/sale_order_dates/i18n/es_CR.po b/addons/sale_order_dates/i18n/es_CR.po
index fb0d9a9f13e..52bca0dc3b6 100644
--- a/addons/sale_order_dates/i18n/es_CR.po
+++ b/addons/sale_order_dates/i18n/es_CR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 "Language: es\n"
 
 #. module: sale_order_dates
diff --git a/addons/sale_order_dates/i18n/es_MX.po.moved b/addons/sale_order_dates/i18n/es_MX.po.moved
deleted file mode 100644
index b682cb925d7..00000000000
--- a/addons/sale_order_dates/i18n/es_MX.po.moved
+++ /dev/null
@@ -1,71 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* sale_order_dates
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.2\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2011-07-05 16:02+0000\n"
-"PO-Revision-Date: 2011-07-05 16:02+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: sale_order_dates
-#: sql_constraint:sale.order:0
-msgid "Order Reference must be unique !"
-msgstr "¡La referencia del pedido debe ser única!"
-
-#. module: sale_order_dates
-#: help:sale.order,requested_date:0
-msgid "Date on which customer has requested for sales."
-msgstr "Fecha en que el cliente ha solicitado la venta."
-
-#. module: sale_order_dates
-#: field:sale.order,commitment_date:0
-msgid "Commitment Date"
-msgstr "Fecha compromiso"
-
-#. module: sale_order_dates
-#: field:sale.order,effective_date:0
-msgid "Effective Date"
-msgstr "Fecha efectiva"
-
-#. module: sale_order_dates
-#: model:ir.module.module,shortdesc:sale_order_dates.module_meta_information
-msgid "Sales Order Dates"
-msgstr "Fechas en pedidos de venta"
-
-#. module: sale_order_dates
-#: help:sale.order,effective_date:0
-msgid "Date on which picking is created."
-msgstr "Fecha en que la orden ha sido creada."
-
-#. module: sale_order_dates
-#: field:sale.order,requested_date:0
-msgid "Requested Date"
-msgstr "Fecha solicitud"
-
-#. module: sale_order_dates
-#: model:ir.model,name:sale_order_dates.model_sale_order
-msgid "Sales Order"
-msgstr "Pedido de venta"
-
-#. module: sale_order_dates
-#: model:ir.module.module,description:sale_order_dates.module_meta_information
-msgid "\n"
-"Add commitment, requested and effective dates on the sales order.\n"
-""
-msgstr "\n"
-"Añade las fechas de compromiso, solicitada y efectiva en el pedido de venta.\n"
-""
-
-#. module: sale_order_dates
-#: help:sale.order,commitment_date:0
-msgid "Date on which delivery of products is to be made."
-msgstr "Fecha en que la entrega de productos se va a realizar."
-
diff --git a/addons/sale_order_dates/i18n/fi.po b/addons/sale_order_dates/i18n/fi.po
index 8a77d3aef31..8dbb26130bf 100644
--- a/addons/sale_order_dates/i18n/fi.po
+++ b/addons/sale_order_dates/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: sale_order_dates
 #: sql_constraint:sale.order:0
diff --git a/addons/sale_order_dates/i18n/fr.po b/addons/sale_order_dates/i18n/fr.po
index 6297817d891..922dcb48c59 100644
--- a/addons/sale_order_dates/i18n/fr.po
+++ b/addons/sale_order_dates/i18n/fr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: sale_order_dates
 #: sql_constraint:sale.order:0
diff --git a/addons/sale_order_dates/i18n/gl.po b/addons/sale_order_dates/i18n/gl.po
index 949a3c486f4..8fee146c63a 100644
--- a/addons/sale_order_dates/i18n/gl.po
+++ b/addons/sale_order_dates/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: sale_order_dates
 #: sql_constraint:sale.order:0
diff --git a/addons/sale_order_dates/i18n/hr.po b/addons/sale_order_dates/i18n/hr.po
index 937df56fdc0..aabd6cb465e 100644
--- a/addons/sale_order_dates/i18n/hr.po
+++ b/addons/sale_order_dates/i18n/hr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: sale_order_dates
 #: sql_constraint:sale.order:0
diff --git a/addons/sale_order_dates/i18n/hu.po b/addons/sale_order_dates/i18n/hu.po
index bd43061f5ca..29e66a06eda 100644
--- a/addons/sale_order_dates/i18n/hu.po
+++ b/addons/sale_order_dates/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: sale_order_dates
 #: sql_constraint:sale.order:0
diff --git a/addons/sale_order_dates/i18n/id.po b/addons/sale_order_dates/i18n/id.po
index ca452df9bd1..4646bc27a99 100644
--- a/addons/sale_order_dates/i18n/id.po
+++ b/addons/sale_order_dates/i18n/id.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: sale_order_dates
 #: sql_constraint:sale.order:0
diff --git a/addons/sale_order_dates/i18n/it.po b/addons/sale_order_dates/i18n/it.po
index af479bc2af9..000f39f4796 100644
--- a/addons/sale_order_dates/i18n/it.po
+++ b/addons/sale_order_dates/i18n/it.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: sale_order_dates
 #: sql_constraint:sale.order:0
diff --git a/addons/sale_order_dates/i18n/ja.po b/addons/sale_order_dates/i18n/ja.po
index 2afb7076552..043ff7373a5 100644
--- a/addons/sale_order_dates/i18n/ja.po
+++ b/addons/sale_order_dates/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: sale_order_dates
 #: sql_constraint:sale.order:0
diff --git a/addons/sale_order_dates/i18n/mn.po b/addons/sale_order_dates/i18n/mn.po
index cc917468f59..95e80d81562 100644
--- a/addons/sale_order_dates/i18n/mn.po
+++ b/addons/sale_order_dates/i18n/mn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: sale_order_dates
 #: sql_constraint:sale.order:0
diff --git a/addons/sale_order_dates/i18n/nb.po b/addons/sale_order_dates/i18n/nb.po
index 20f6ad533dd..6d7d2a620c5 100644
--- a/addons/sale_order_dates/i18n/nb.po
+++ b/addons/sale_order_dates/i18n/nb.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: sale_order_dates
 #: sql_constraint:sale.order:0
diff --git a/addons/sale_order_dates/i18n/nl.po b/addons/sale_order_dates/i18n/nl.po
index f9ec91c9049..a33bed3ee15 100644
--- a/addons/sale_order_dates/i18n/nl.po
+++ b/addons/sale_order_dates/i18n/nl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: sale_order_dates
 #: sql_constraint:sale.order:0
diff --git a/addons/sale_order_dates/i18n/pl.po b/addons/sale_order_dates/i18n/pl.po
index 3b51442c3e6..73d1d4601a9 100644
--- a/addons/sale_order_dates/i18n/pl.po
+++ b/addons/sale_order_dates/i18n/pl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: sale_order_dates
 #: sql_constraint:sale.order:0
diff --git a/addons/sale_order_dates/i18n/pt.po b/addons/sale_order_dates/i18n/pt.po
index 0314e5b03ff..45aa0eb6840 100644
--- a/addons/sale_order_dates/i18n/pt.po
+++ b/addons/sale_order_dates/i18n/pt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: sale_order_dates
 #: sql_constraint:sale.order:0
diff --git a/addons/sale_order_dates/i18n/pt_BR.po b/addons/sale_order_dates/i18n/pt_BR.po
index b550dd0fd93..729dd70a9b4 100644
--- a/addons/sale_order_dates/i18n/pt_BR.po
+++ b/addons/sale_order_dates/i18n/pt_BR.po
@@ -9,13 +9,14 @@ msgstr ""
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:37+0000\n"
 "PO-Revision-Date: 2012-07-28 19:51+0000\n"
-"Last-Translator: Fábio Martinelli <webmaster@guaru.net>\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: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: sale_order_dates
 #: sql_constraint:sale.order:0
diff --git a/addons/sale_order_dates/i18n/ro.po b/addons/sale_order_dates/i18n/ro.po
index 58d07f776db..f73a6b2aada 100644
--- a/addons/sale_order_dates/i18n/ro.po
+++ b/addons/sale_order_dates/i18n/ro.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: sale_order_dates
 #: sql_constraint:sale.order:0
diff --git a/addons/sale_order_dates/i18n/ru.po b/addons/sale_order_dates/i18n/ru.po
index be7749f99b9..78a1a02f822 100644
--- a/addons/sale_order_dates/i18n/ru.po
+++ b/addons/sale_order_dates/i18n/ru.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: sale_order_dates
 #: sql_constraint:sale.order:0
diff --git a/addons/sale_order_dates/i18n/sk.po b/addons/sale_order_dates/i18n/sk.po
index c9ae55940e3..039204237a0 100644
--- a/addons/sale_order_dates/i18n/sk.po
+++ b/addons/sale_order_dates/i18n/sk.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: sale_order_dates
 #: sql_constraint:sale.order:0
diff --git a/addons/sale_order_dates/i18n/sl.po b/addons/sale_order_dates/i18n/sl.po
index ea3ce46e618..ef0bc9bd89b 100644
--- a/addons/sale_order_dates/i18n/sl.po
+++ b/addons/sale_order_dates/i18n/sl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: sale_order_dates
 #: sql_constraint:sale.order:0
diff --git a/addons/sale_order_dates/i18n/sr@latin.po b/addons/sale_order_dates/i18n/sr@latin.po
index 5b813fb1e0b..ae5859b7b08 100644
--- a/addons/sale_order_dates/i18n/sr@latin.po
+++ b/addons/sale_order_dates/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: sale_order_dates
 #: sql_constraint:sale.order:0
diff --git a/addons/sale_order_dates/i18n/sv.po b/addons/sale_order_dates/i18n/sv.po
index 1c4f9e203d2..28e31361dd2 100644
--- a/addons/sale_order_dates/i18n/sv.po
+++ b/addons/sale_order_dates/i18n/sv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: sale_order_dates
 #: sql_constraint:sale.order:0
diff --git a/addons/sale_order_dates/i18n/tr.po b/addons/sale_order_dates/i18n/tr.po
index 43b90655af5..e197cc53310 100644
--- a/addons/sale_order_dates/i18n/tr.po
+++ b/addons/sale_order_dates/i18n/tr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: sale_order_dates
 #: sql_constraint:sale.order:0
diff --git a/addons/sale_order_dates/i18n/zh_CN.po b/addons/sale_order_dates/i18n/zh_CN.po
index 9db898902ff..2092ed88a5c 100644
--- a/addons/sale_order_dates/i18n/zh_CN.po
+++ b/addons/sale_order_dates/i18n/zh_CN.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: sale_order_dates
 #: sql_constraint:sale.order:0
diff --git a/addons/share/__openerp__.py b/addons/share/__openerp__.py
index f79024fa1c7..87a2f68bb04 100644
--- a/addons/share/__openerp__.py
+++ b/addons/share/__openerp__.py
@@ -22,12 +22,12 @@
 
 
 {
-    "name" : "Share any Document",
-    "version" : "2.0",
-    "depends" : ["base", "mail"],
-    "author" : "OpenERP SA",
-    "category": 'Tools',
-    "description": """
+    'name' : 'Share any Document',
+    'version' : '2.0',
+    'depends' : ['base', 'mail'],
+    'author' : 'OpenERP SA',
+    'category': 'Tools',
+    'description': """
 This module adds generic sharing tools to your current OpenERP database.
 ========================================================================
 
@@ -42,7 +42,7 @@ This is extremely useful for collaborative work, knowledge sharing,
 synchronization with other companies.
     """,
     'website': 'http://www.openerp.com',
-    'demo_xml': ['share_demo.xml'],
+    'demo': ['share_demo.xml'],
     'data': [
         'security/share_security.xml',
         'res_users_view.xml',
@@ -53,9 +53,7 @@ synchronization with other companies.
     'certificate' : '001301246528927038493',
     'js': ['static/src/js/share.js'],
     'css': ['static/src/css/share.css'],
-    'qweb' : [
-        "static/src/xml/*.xml",
-    ],
+    'qweb' : ['static/src/xml/*.xml'],
     'images': ['images/share_wizard.jpeg','images/sharing_wizard_step1.jpeg', 'images/sharing_wizard_step2.jpeg'],
 }
 
diff --git a/addons/share/i18n/ar.po b/addons/share/i18n/ar.po
index 321fac7ad49..28215c8d748 100644
--- a/addons/share/i18n/ar.po
+++ b/addons/share/i18n/ar.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:57+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: share
 #: field:share.wizard,embed_option_title:0
diff --git a/addons/share/i18n/bg.po b/addons/share/i18n/bg.po
index 3123368925a..938f9d261e1 100644
--- a/addons/share/i18n/bg.po
+++ b/addons/share/i18n/bg.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:57+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: share
 #: field:share.wizard,embed_option_title:0
diff --git a/addons/share/i18n/ca.po b/addons/share/i18n/ca.po
index 114b3045288..054c1f60a4d 100644
--- a/addons/share/i18n/ca.po
+++ b/addons/share/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:57+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: share
 #: field:share.wizard,embed_option_title:0
diff --git a/addons/share/i18n/cs.po b/addons/share/i18n/cs.po
index 67b3cb8d2c8..dba7b713420 100644
--- a/addons/share/i18n/cs.po
+++ b/addons/share/i18n/cs.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:57+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 "X-Poedit-Language: Czech\n"
 
 #. module: share
diff --git a/addons/share/i18n/da.po b/addons/share/i18n/da.po
index 8dc5e835007..51032d8f98e 100644
--- a/addons/share/i18n/da.po
+++ b/addons/share/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:57+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: share
 #: field:share.wizard,embed_option_title:0
diff --git a/addons/share/i18n/de.po b/addons/share/i18n/de.po
index a2e31e0c23d..bc52ac6e3ba 100644
--- a/addons/share/i18n/de.po
+++ b/addons/share/i18n/de.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:57+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: share
 #: field:share.wizard,embed_option_title:0
diff --git a/addons/share/i18n/es.po b/addons/share/i18n/es.po
index 7dc14a87663..aa9bfe4d7c7 100644
--- a/addons/share/i18n/es.po
+++ b/addons/share/i18n/es.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:57+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: share
 #: field:share.wizard,embed_option_title:0
diff --git a/addons/share/i18n/es_CR.po b/addons/share/i18n/es_CR.po
index 8954fa8f44c..2bf877605b9 100644
--- a/addons/share/i18n/es_CR.po
+++ b/addons/share/i18n/es_CR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:57+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 "Language: es\n"
 
 #. module: share
diff --git a/addons/share/i18n/fi.po b/addons/share/i18n/fi.po
index fcc6ba40dac..eea21d1c9d7 100644
--- a/addons/share/i18n/fi.po
+++ b/addons/share/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:57+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: share
 #: field:share.wizard,embed_option_title:0
diff --git a/addons/share/i18n/fr.po b/addons/share/i18n/fr.po
index c5c2abaf54f..d349ef9b6c5 100644
--- a/addons/share/i18n/fr.po
+++ b/addons/share/i18n/fr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:57+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: share
 #: field:share.wizard,embed_option_title:0
diff --git a/addons/share/i18n/gl.po b/addons/share/i18n/gl.po
index 021d0f2477f..6a4ed24560d 100644
--- a/addons/share/i18n/gl.po
+++ b/addons/share/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:57+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: share
 #: field:share.wizard,embed_option_title:0
diff --git a/addons/share/i18n/hr.po b/addons/share/i18n/hr.po
index e81fd1bdffb..1dcf560c9aa 100644
--- a/addons/share/i18n/hr.po
+++ b/addons/share/i18n/hr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:57+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: share
 #: field:share.wizard,embed_option_title:0
diff --git a/addons/share/i18n/hu.po b/addons/share/i18n/hu.po
index 418114a4098..471e71866a7 100644
--- a/addons/share/i18n/hu.po
+++ b/addons/share/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:57+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: share
 #: field:share.wizard,embed_option_title:0
diff --git a/addons/share/i18n/it.po b/addons/share/i18n/it.po
index 3e5dfb54fea..2d8d601397e 100644
--- a/addons/share/i18n/it.po
+++ b/addons/share/i18n/it.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:57+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: share
 #: field:share.wizard,embed_option_title:0
diff --git a/addons/share/i18n/ja.po b/addons/share/i18n/ja.po
index 923a964effd..870715ad581 100644
--- a/addons/share/i18n/ja.po
+++ b/addons/share/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:57+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: share
 #: field:share.wizard,embed_option_title:0
diff --git a/addons/share/i18n/mn.po b/addons/share/i18n/mn.po
index c0a35c205f2..3c3196f1ef1 100644
--- a/addons/share/i18n/mn.po
+++ b/addons/share/i18n/mn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:57+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: share
 #: field:share.wizard,embed_option_title:0
diff --git a/addons/share/i18n/nl.po b/addons/share/i18n/nl.po
index 71c2ccd7f48..c0d68268f2c 100644
--- a/addons/share/i18n/nl.po
+++ b/addons/share/i18n/nl.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 01:37+0100\n"
-"PO-Revision-Date: 2012-06-28 12:52+0000\n"
+"PO-Revision-Date: 2012-09-03 17:14+0000\n"
 "Last-Translator: Erwin <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: 2012-08-09 04:57+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-09-04 04:52+0000\n"
+"X-Generator: Launchpad (build 15890)\n"
 
 #. module: share
 #: field:share.wizard,embed_option_title:0
@@ -384,6 +384,7 @@ msgid ""
 "An email notification with instructions has been sent to the following "
 "people:"
 msgstr ""
+"Een e-mail bevestiging met instructies is verzonden naar de volgende mensen:"
 
 #. module: share
 #: model:ir.model,name:share.model_share_wizard_result_line
@@ -415,6 +416,8 @@ msgstr "Kan bewerken"
 msgid ""
 "An optional personal message, to be included in the email notification."
 msgstr ""
+"Een optionele persoonlijk bericht, welke kan worden toegevoegd in de e-mail "
+"bevestiging."
 
 #. module: share
 #: model:ir.model,name:share.model_res_users
@@ -532,6 +535,8 @@ msgid ""
 "You must configure your email address in the user preferences before using "
 "the Share button."
 msgstr ""
+"U dient u e-mail adres in te stellen in uw gebruikersinstellingen, voordat u "
+"de 'share' knop kunt gebruiken."
 
 #. module: share
 #: help:share.wizard,access_mode:0
diff --git a/addons/share/i18n/pl.po b/addons/share/i18n/pl.po
index ee15f1e1391..4e2a18d5c75 100644
--- a/addons/share/i18n/pl.po
+++ b/addons/share/i18n/pl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:57+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: share
 #: field:share.wizard,embed_option_title:0
diff --git a/addons/share/i18n/pt.po b/addons/share/i18n/pt.po
index 815da424225..2d3de69a9c7 100644
--- a/addons/share/i18n/pt.po
+++ b/addons/share/i18n/pt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:57+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: share
 #: field:share.wizard,embed_option_title:0
diff --git a/addons/share/i18n/pt_BR.po b/addons/share/i18n/pt_BR.po
index 803f9f5f29d..d2ac3289d9a 100644
--- a/addons/share/i18n/pt_BR.po
+++ b/addons/share/i18n/pt_BR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:57+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: share
 #: field:share.wizard,embed_option_title:0
diff --git a/addons/share/i18n/ro.po b/addons/share/i18n/ro.po
index 8dfc3ee799e..96610479e6a 100644
--- a/addons/share/i18n/ro.po
+++ b/addons/share/i18n/ro.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:57+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: share
 #: field:share.wizard,embed_option_title:0
diff --git a/addons/share/i18n/ru.po b/addons/share/i18n/ru.po
index f911a18ea17..effec5d5f99 100644
--- a/addons/share/i18n/ru.po
+++ b/addons/share/i18n/ru.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:57+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: share
 #: field:share.wizard,embed_option_title:0
diff --git a/addons/share/i18n/sv.po b/addons/share/i18n/sv.po
index 7e77fff76fb..59519f2ef81 100644
--- a/addons/share/i18n/sv.po
+++ b/addons/share/i18n/sv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:57+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: share
 #: field:share.wizard,embed_option_title:0
diff --git a/addons/share/i18n/tr.po b/addons/share/i18n/tr.po
index f02fd6ae7b6..cb4386ab064 100644
--- a/addons/share/i18n/tr.po
+++ b/addons/share/i18n/tr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:57+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: share
 #: field:share.wizard,embed_option_title:0
diff --git a/addons/share/i18n/zh_CN.po b/addons/share/i18n/zh_CN.po
index 8884b191a48..b92f1933386 100644
--- a/addons/share/i18n/zh_CN.po
+++ b/addons/share/i18n/zh_CN.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:57+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: share
 #: field:share.wizard,embed_option_title:0
diff --git a/addons/share/static/src/js/share.js b/addons/share/static/src/js/share.js
index 6cc12a5bfa8..bab3cac243f 100644
--- a/addons/share/static/src/js/share.js
+++ b/addons/share/static/src/js/share.js
@@ -89,7 +89,7 @@ openerp.share = function(session) {
         start: function() {
             start_res = this._super.apply(this, arguments);
             if (has_action_id) {
-                this.$element.find('button.oe_share_invite').show();
+                this.$el.find('button.oe_share_invite').show();
             }
             return start_res;
         }
@@ -100,7 +100,7 @@ openerp.share = function(session) {
             var self = this;
             this.check_if_action_is_defined();
             has_share(function() {
-                self.$element.delegate('button.oe_share_invite', 'click', self.on_click_share_invite);
+                self.$el.delegate('button.oe_share_invite', 'click', self.on_click_share_invite);
             });
             return this._super.apply(this, arguments);
         },
diff --git a/addons/share/wizard/share_wizard.py b/addons/share/wizard/share_wizard.py
index 598bb085967..375c33b1e8c 100644
--- a/addons/share/wizard/share_wizard.py
+++ b/addons/share/wizard/share_wizard.py
@@ -23,6 +23,7 @@ import random
 import time
 from urllib import quote_plus
 import uuid
+from openerp import SUPERUSER_ID
 
 import simplejson
 
@@ -545,7 +546,7 @@ class share_wizard(osv.TransientModel):
                             _logger.debug("Copying rule %s (%s) on model %s with domain: %s", rule.name, rule.id, model.model, rule.domain_force)
                         else:
                             # otherwise we can simply link the rule to keep it dynamic
-                            rule_obj.write(cr, 1, [rule.id], {
+                            rule_obj.write(cr, SUPERUSER_ID, [rule.id], {
                                     'groups': [(4,group_id)]
                                 })
                             _logger.debug("Linking rule %s (%s) on model %s with domain: %s", rule.name, rule.id, model.model, rule.domain_force)
@@ -774,8 +775,8 @@ class share_wizard(osv.TransientModel):
             if res_id <= 0:
                 raise osv.except_osv(_('Record id not found'), _('The share engine has not been able to fetch a record_id for your invitation.'))
             self.pool.get(model.model).message_subscribe(cr, uid, [res_id], new_ids + existing_ids, context=context)
-            self.send_invite_email(cr, uid, wizard_data, context=context)
-            self.send_invite_note(cr, uid, model.model, res_id, wizard_data, context=context)
+            # self.send_invite_email(cr, uid, wizard_data, context=context)
+            # self.send_invite_note(cr, uid, model.model, res_id, wizard_data, context=context)
         
         # CLOSE
         #  A. Not invite: as before
@@ -819,9 +820,10 @@ class share_wizard(osv.TransientModel):
             elif tmp_idx == len(wizard_data.result_line_ids)-2:
                 body += ' and'
         body += '.'
-        return self.pool.get(model_name).message_append_note(cr, uid, [res_id], _('System Notification'), body, context=context)
+        return self.pool.get(model_name).message_post(cr, uid, [res_id], body=body, context=context)
     
     def send_invite_email(self, cr, uid, wizard_data, context=None):
+        # TDE Note: not updated because will disappear
         message_obj = self.pool.get('mail.message')
         notification_obj = self.pool.get('mail.notification')
         user = self.pool.get('res.users').browse(cr, UID_ROOT, uid)
@@ -854,13 +856,13 @@ class share_wizard(osv.TransientModel):
     
     def send_emails(self, cr, uid, wizard_data, context=None):
         _logger.info('Sending share notifications by email...')
-        mail_message = self.pool.get('mail.message')
+        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.'))
         
         # TODO: also send an HTML version of this mail
-        msg_ids = []
+        mail_ids = []
         for result_line in wizard_data.result_line_ids:
             email_to = result_line.user_id.email
             if not email_to:
@@ -883,10 +885,14 @@ class share_wizard(osv.TransientModel):
             body += "--\n"
             body += _("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.")
-            msg_ids.append(mail_message.schedule_with_attach(cr, uid, user.email, [email_to], subject, body, model='share.wizard', context=context))
+            mail_ids.append(mail_mail.create(cr, uid, {
+                    'email_from': user.email,
+                    'email_to': email_to,
+                    'subject': subject,
+                    'body_html': '<pre>%s</pre>' % body}, context=context))
         # force direct delivery, as users expect instant notification
-        mail_message.send(cr, uid, msg_ids, context=context)
-        _logger.info('%d share notification(s) sent.', len(msg_ids))
+        mail_mail.send(cr, uid, mail_ids, context=context)
+        _logger.info('%d share notification(s) sent.', len(mail_ids))
 
     def onchange_embed_options(self, cr, uid, ids, opt_title, opt_search, context=None):
         wizard = self.browse(cr, uid, ids[0], context)
diff --git a/addons/stock/__openerp__.py b/addons/stock/__openerp__.py
index 55d9c7c6c5a..bc01c2a1b56 100644
--- a/addons/stock/__openerp__.py
+++ b/addons/stock/__openerp__.py
@@ -20,15 +20,16 @@
 ##############################################################################
 
 {
-    "name" : "Warehouse Management",
-    "version" : "1.1",
-    "author" : "OpenERP SA",
-    "summary": "Inventory, Logistic, Storage",
-    "description" : """
+    'name': 'Warehouse Management',
+    'version': '1.1',
+    'author': 'OpenERP SA',
+    'summary': 'Inventory, Logistic, Storage',
+    'description' : """
 OpenERP Inventory Management module can manage multi-warehouses, multi and structured stock locations.
 ======================================================================================================
 
 Thanks to the double entry management, the inventory controlling is powerful and flexible:
+------------------------------------------------------------------------------------------
     * Moves history and planning,
     * Stock valuation (standard or average price, ...)
     * Robustness faced with Inventory differences
@@ -45,44 +46,43 @@ Dashboard for warehouse that includes:
     * Graph : Products to receive in delay (date <= today)
     * Graph : Products to send in delay (date <= today)
     """,
-    "website" : "http://www.openerp.com",
-    "images" : ["images/stock_forecast_report.png", "images/delivery_orders.jpeg", "images/inventory_analysis.jpeg","images/location.jpeg","images/moves_analysis.jpeg","images/physical_inventories.jpeg","images/warehouse_dashboard.jpeg"],
-    "depends" : ["product", "account"],
-    "category" : "Warehouse Management",
-    "sequence": 16,
-    "init_xml" : [],
-    "demo_xml" : [
-        "stock_demo.xml",
-#        "stock_demo.yml",
+    'website': 'http://www.openerp.com',
+    'images': ['images/stock_forecast_report.png', 'images/delivery_orders.jpeg', 'images/inventory_analysis.jpeg','images/location.jpeg','images/moves_analysis.jpeg','images/physical_inventories.jpeg','images/warehouse_dashboard.jpeg'],
+    'depends': ['product', 'account'],
+    'category': 'Warehouse Management',
+    'sequence': 16,
+    'demo': [
+        'stock_demo.xml',
+#        'stock_demo.yml',
     ],
-    "update_xml" : [
-        "security/stock_security.xml",
-        "security/ir.model.access.csv",
-        "stock_data.xml",
-        "wizard/stock_move_view.xml",
-        "wizard/stock_change_product_qty_view.xml",
-        "wizard/stock_partial_picking_view.xml",
-        "wizard/stock_partial_move_view.xml",
-        "wizard/stock_fill_inventory_view.xml",
-        "wizard/stock_invoice_onshipping_view.xml",
-        "wizard/stock_inventory_merge_view.xml",
-        "wizard/stock_location_product_view.xml",
-        "wizard/stock_splitinto_view.xml",
-        "wizard/stock_inventory_line_split_view.xml",
-        "wizard/stock_change_standard_price_view.xml",
+    'data': [
+        'security/stock_security.xml',
+        'security/ir.model.access.csv',
+        'stock_data.xml',
+        'wizard/stock_move_view.xml',
+        'wizard/stock_change_product_qty_view.xml',
+        'wizard/stock_partial_picking_view.xml',
+        'wizard/stock_partial_move_view.xml',
+        'wizard/stock_fill_inventory_view.xml',
+        'wizard/stock_invoice_onshipping_view.xml',
+        'wizard/stock_inventory_merge_view.xml',
+        'wizard/stock_location_product_view.xml',
+        'wizard/stock_splitinto_view.xml',
+        'wizard/stock_inventory_line_split_view.xml',
+        'wizard/stock_change_standard_price_view.xml',
         'wizard/stock_return_picking_view.xml',
-        "stock_workflow.xml",
-        "stock_incoterms.xml",
-        "stock_report.xml",
-        "stock_view.xml",
-        "stock_sequence.xml",
-        "product_data.xml",
-        "product_view.xml",
-        "partner_view.xml",
-        "report/report_stock_move_view.xml",
-        "report/report_stock_view.xml",
-        "board_warehouse_view.xml",
-        "res_config_view.xml",
+        'stock_workflow.xml',
+        'stock_incoterms.xml',
+        'stock_report.xml',
+        'stock_view.xml',
+        'stock_sequence.xml',
+        'product_data.xml',
+        'product_view.xml',
+        'partner_view.xml',
+        'report/report_stock_move_view.xml',
+        'report/report_stock_view.xml',
+        'board_warehouse_view.xml',
+        'res_config_view.xml',
     ],
     'test': [
 #        'test/opening_stock.yml',
@@ -93,7 +93,7 @@ Dashboard for warehouse that includes:
     'application': True,
     'auto_install': False,
     'certificate': '0055421559965',
-    "css": [ 'static/src/css/stock.css' ],
+    'css': [ 'static/src/css/stock.css' ],
 }
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/stock/board_warehouse_view.xml b/addons/stock/board_warehouse_view.xml
index 4258721dc03..b223e731e8f 100644
--- a/addons/stock/board_warehouse_view.xml
+++ b/addons/stock/board_warehouse_view.xml
@@ -14,26 +14,6 @@
             </field>
         </record>
 
-        <record id="action_incoming_product_board" model="ir.actions.act_window">
-            <field name="name">Incoming Shipments</field>
-            <field name="res_model">stock.move</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-            <field name="domain">[('state','in',('confirmed','assigned')),'|','&amp;',('picking_id','=',False),('location_id.usage', 'in', ['customer','supplier']),'&amp;',('picking_id','!=',False),('picking_id.type','=','in')]</field>
-            <field name="view_id" ref="stock.view_move_tree_reception_picking"/>
-        </record>
-
-        <record id="action_outgoing_product_board" model="ir.actions.act_window">
-            <field name="name">Delivery Orders</field>
-            <field name="res_model">stock.move</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-            <field name="domain">[('state','in',('confirmed','assigned')),'|','&amp;',('picking_id','=',False),('location_dest_id.usage', 'in', ['customer','supplier']),'&amp;',('picking_id','!=',False),('picking_id.type','=','out')]</field>
-            <field name="view_id" ref="stock.view_move_tree_reception_picking"/>
-        </record>
-
         <record model="ir.actions.act_window" id="action_stock_incoming_product_delay">
             <field name="name">Incoming Products</field>
             <field name="res_model">report.stock.move</field>
@@ -57,14 +37,11 @@
             <field name="model">board.board</field>
             <field name="arch" type="xml">
                 <form string="Warehouse board" version="7.0">
-                    <board style="2-1">
-                        <column>
-                            <action name="%(action_incoming_product_board)d" string="Incoming Shipments" creatable="true"/>
-                            <action name="%(action_outgoing_product_board)d" string="Delivery Orders" creatable="true"/>
-                        </column>
-
+                    <board style="1-1">
                         <column>
                             <action name="%(action_stock_incoming_product_delay)d" string="Incoming Products"/>
+                        </column>
+                        <column>
                             <action name="%(action_stock_outgoing_product_delay)d" string="Outgoing Products"/>
                         </column>
                     </board>
diff --git a/addons/stock/i18n/ar.po b/addons/stock/i18n/ar.po
index da7ca3992f1..bd50b63a853 100644
--- a/addons/stock/i18n/ar.po
+++ b/addons/stock/i18n/ar.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:40+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:56+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: stock
 #: field:product.product,track_outgoing:0
diff --git a/addons/stock/i18n/bg.po b/addons/stock/i18n/bg.po
index 970065c0bae..0e609c73904 100644
--- a/addons/stock/i18n/bg.po
+++ b/addons/stock/i18n/bg.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:40+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:56+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: stock
 #: field:product.product,track_outgoing:0
diff --git a/addons/stock/i18n/bs.po b/addons/stock/i18n/bs.po
index 506f5440794..ffc77ac76b1 100644
--- a/addons/stock/i18n/bs.po
+++ b/addons/stock/i18n/bs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:40+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:56+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: stock
 #: field:product.product,track_outgoing:0
diff --git a/addons/stock/i18n/ca.po b/addons/stock/i18n/ca.po
index faa6ee31f18..44efa8dceb7 100644
--- a/addons/stock/i18n/ca.po
+++ b/addons/stock/i18n/ca.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:40+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:56+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: stock
 #: field:product.product,track_outgoing:0
diff --git a/addons/stock/i18n/cs.po b/addons/stock/i18n/cs.po
index 0ee7107e283..b546d988779 100644
--- a/addons/stock/i18n/cs.po
+++ b/addons/stock/i18n/cs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:40+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:56+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 "X-Poedit-Language: Czech\n"
 
 #. module: stock
diff --git a/addons/stock/i18n/da.po b/addons/stock/i18n/da.po
index 82b3ded0b73..c736d6f83b9 100644
--- a/addons/stock/i18n/da.po
+++ b/addons/stock/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:40+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:56+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: stock
 #: field:product.product,track_outgoing:0
diff --git a/addons/stock/i18n/de.po b/addons/stock/i18n/de.po
index 50713363d5f..dbd9bb99c67 100644
--- a/addons/stock/i18n/de.po
+++ b/addons/stock/i18n/de.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:41+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:56+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: stock
 #: field:product.product,track_outgoing:0
diff --git a/addons/stock/i18n/el.po b/addons/stock/i18n/el.po
index c0dd7d95f0e..e3ded8d627d 100644
--- a/addons/stock/i18n/el.po
+++ b/addons/stock/i18n/el.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:41+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:56+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
 "X-Poedit-SourceCharset: utf-8\n"
diff --git a/addons/stock/i18n/es.po b/addons/stock/i18n/es.po
index c8908414236..c1966873897 100644
--- a/addons/stock/i18n/es.po
+++ b/addons/stock/i18n/es.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:42+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:57+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: stock
 #: model:ir.actions.todo.category,name:stock.category_stock_management_config
diff --git a/addons/stock/i18n/es_AR.po b/addons/stock/i18n/es_AR.po
index 03f7d54b1c1..85359edf27a 100644
--- a/addons/stock/i18n/es_AR.po
+++ b/addons/stock/i18n/es_AR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:42+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:58+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: stock
 #: field:product.product,track_outgoing:0
diff --git a/addons/stock/i18n/es_CL.po b/addons/stock/i18n/es_CL.po
index b19c6aaf8e4..c77081afec2 100644
--- a/addons/stock/i18n/es_CL.po
+++ b/addons/stock/i18n/es_CL.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:42+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:58+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: stock
 #: field:product.product,track_outgoing:0
diff --git a/addons/stock/i18n/es_CR.po b/addons/stock/i18n/es_CR.po
index d169076cdf1..e5ee226cff0 100644
--- a/addons/stock/i18n/es_CR.po
+++ b/addons/stock/i18n/es_CR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:43+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:58+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 "Language: \n"
 
 #. module: stock
diff --git a/addons/stock/i18n/es_DO.po b/addons/stock/i18n/es_DO.po
index f80352c3511..5e9637c18d8 100644
--- a/addons/stock/i18n/es_DO.po
+++ b/addons/stock/i18n/es_DO.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:42+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:58+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: stock
 #: field:product.product,track_outgoing:0
diff --git a/addons/stock/i18n/es_EC.po b/addons/stock/i18n/es_EC.po
index 3c49f31799d..5d185f690ab 100644
--- a/addons/stock/i18n/es_EC.po
+++ b/addons/stock/i18n/es_EC.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:43+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:58+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: stock
 #: field:product.product,track_outgoing:0
diff --git a/addons/stock/i18n/es_MX.po.moved b/addons/stock/i18n/es_MX.po.moved
deleted file mode 100644
index 419b2cb95f5..00000000000
--- a/addons/stock/i18n/es_MX.po.moved
+++ /dev/null
@@ -1,3696 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* stock
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.2\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2011-07-05 16:05+0000\n"
-"PO-Revision-Date: 2011-07-05 16: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: stock
-#: field:product.product,track_outgoing:0
-msgid "Track Outgoing Lots"
-msgstr "Lotes de seguimiento en salida"
-
-#. module: stock
-#: model:ir.model,name:stock.model_stock_ups_upload
-msgid "Stock ups upload"
-msgstr "Stock ups carga"
-
-#. module: stock
-#: code:addons/stock/product.py:76
-#, python-format
-msgid "Variation Account is not specified for Product Category: %s"
-msgstr "No se ha especificado la cuenta de variación para la categoría de producto: %s"
-
-#. module: stock
-#: field:stock.location,chained_location_id:0
-msgid "Chained Location If Fixed"
-msgstr "Ubicación encadenada si fija"
-
-#. module: stock
-#: view:stock.inventory:0
-#: view:stock.move:0
-#: view:stock.picking:0
-msgid "Put in a new pack"
-msgstr "Poner en un paquete nuevo"
-
-#. module: stock
-#: field:stock.move.split.lines,action:0
-msgid "Action"
-msgstr "Acción"
-
-#. module: stock
-#: view:stock.production.lot:0
-msgid "Upstream Traceability"
-msgstr "Trazabilidad hacia arriba"
-
-#. module: stock
-#: model:ir.actions.act_window,name:stock.action_stock_line_date
-#: model:ir.ui.menu,name:stock.menu_report_stock_line_date
-msgid "Last Product Inventories"
-msgstr "Último inventario de productos"
-
-#. module: stock
-#: view:stock.move:0
-msgid "Today"
-msgstr "Hoy"
-
-#. module: stock
-#: field:stock.production.lot.revision,indice:0
-msgid "Revision Number"
-msgstr "Número de revisión"
-
-#. module: stock
-#: view:stock.move.memory.in:0
-#: view:stock.move.memory.out:0
-msgid "Product Moves"
-msgstr "Movimientos de productos"
-
-#. module: stock
-#: model:ir.actions.act_window,name:stock.action_stock_move_report
-#: model:ir.ui.menu,name:stock.menu_action_stock_move_report
-#: view:report.stock.move:0
-msgid "Moves Analysis"
-msgstr "Análisis de movimientos"
-
-#. module: stock
-#: help:stock.production.lot,ref:0
-msgid "Internal reference number in case it differs from the manufacturer's serial number"
-msgstr "Número interno de referencia en caso de que sea diferente del número de serie del fabricante."
-
-#. module: stock
-#: model:ir.actions.act_window,help:stock.action_inventory_form
-msgid "Periodical Inventories are used to count the number of products available per location. You can use it once a year when you do the general inventory or whenever you need it, to correct the current stock level of a product."
-msgstr "Los inventarios periódicos se utilizan para contar el número de productos disponibles por ubicación. Lo puede utilizar una vez al año cuando realice el inventario general, o cuando lo necesite, para corregir el nivel actual de stock de un producto."
-
-#. module: stock
-#: view:stock.picking:0
-msgid "Picking list"
-msgstr "Lista de empaque"
-
-#. module: stock
-#: report:lot.stock.overview:0
-#: report:lot.stock.overview_all:0
-#: field:report.stock.inventory,product_qty:0
-#: field:report.stock.move,product_qty:0
-#: field:stock.change.product.qty,new_quantity:0
-#: field:stock.inventory.line,product_qty:0
-#: field:stock.inventory.line.split,qty:0
-#: report:stock.inventory.move:0
-#: field:stock.move,product_qty:0
-#: field:stock.move.consume,product_qty:0
-#: field:stock.move.memory.in,quantity:0
-#: field:stock.move.memory.out,quantity:0
-#: field:stock.move.scrap,product_qty:0
-#: field:stock.move.split,qty:0
-#: field:stock.move.split.lines,quantity:0
-#: field:stock.move.split.lines.exist,quantity:0
-#: report:stock.picking.list:0
-#: field:stock.report.prodlots,qty:0
-#: field:stock.report.tracklots,name:0
-#: field:stock.split.into,quantity:0
-msgid "Quantity"
-msgstr "Cantidad"
-
-#. module: stock
-#: model:ir.actions.act_window,help:stock.action_picking_tree
-msgid "This is the list of all delivery orders that have to be prepared, according to your different sales orders and your logistics rules."
-msgstr "Esta es la lista de ordenes de salida que deben ser preparados, en función de sus pedidos de venta y sus reglas logísticas."
-
-#. module: stock
-#: view:report.stock.move:0
-#: field:report.stock.move,day:0
-msgid "Day"
-msgstr "Día"
-
-#. module: stock
-#: view:stock.inventory:0
-#: field:stock.inventory.line.split,product_uom:0
-#: view:stock.move:0
-#: field:stock.move.split,product_uom:0
-#: view:stock.picking:0
-#: view:stock.production.lot:0
-msgid "UoM"
-msgstr "UdM"
-
-#. module: stock
-#: field:product.category,property_stock_journal:0
-#: view:report.stock.move:0
-#: field:stock.change.standard.price,stock_journal:0
-msgid "Stock journal"
-msgstr "Diario de inventario"
-
-#. module: stock
-#: view:report.stock.move:0
-msgid "Incoming"
-msgstr "Entrada"
-
-#. module: stock
-#: help:product.category,property_stock_account_output_categ:0
-msgid "When doing real-time inventory valuation, counterpart Journal Items for all outgoing stock moves will be posted in this account. This is the default value for all products in this category, it can also directly be set on each product."
-msgstr "Al hacer la valoración de inventario en tiempo real, la contrapartida de los asientos del diario para todos los movimientos de stock de salida se creará en esta cuenta. Este es el valor por defecto para todos los productos de esta categoría, también puede indicarse directamente en cada producto."
-
-#. module: stock
-#: code:addons/stock/stock.py:1170
-#: code:addons/stock/stock.py:2412
-#, python-format
-msgid "Missing partial picking data for move #%s"
-msgstr "Faltan datos de la orden parcial para el movimiento #%s"
-
-#. module: stock
-#: model:ir.actions.server,name:stock.action_partial_move_server
-msgid "Deliver/Receive Products"
-msgstr "Entrega/Recepcion de Productos"
-
-#. module: stock
-#: code:addons/stock/report/report_stock.py:78
-#: code:addons/stock/report/report_stock.py:135
-#, python-format
-msgid "You cannot delete any record!"
-msgstr "¡No puede eliminar ningún registro!"
-
-#. module: stock
-#: code:addons/stock/wizard/stock_splitinto.py:49
-#, python-format
-msgid "The current move line is already assigned to a pack, please remove it first if you really want to change it '             #                        'for this product: \"%s\" (id: %d)"
-msgstr "La línea de movimiento actual ya está asignada a una orden, elimínela primero si realmente quiere cambiarla ' # 'para este este producto: \"%s\" (id: %d)"
-
-#. module: stock
-#: selection:stock.picking,invoice_state:0
-msgid "Not Applicable"
-msgstr "No aplicable"
-
-#. module: stock
-#: help:stock.tracking,serial:0
-msgid "Other reference or serial number"
-msgstr "Otra referencia o número de serie."
-
-#. module: stock
-#: field:stock.move,origin:0
-#: view:stock.picking:0
-#: field:stock.picking,origin:0
-msgid "Origin"
-msgstr "Origen"
-
-#. module: stock
-#: view:report.stock.lines.date:0
-msgid "Non Inv"
-msgstr "No factura"
-
-#. module: stock
-#: view:stock.tracking:0
-msgid "Pack Identification"
-msgstr "Identificación de paquete"
-
-#. module: stock
-#: view:stock.move:0
-#: field:stock.move,picking_id:0
-#: field:stock.picking,name:0
-#: view:stock.production.lot:0
-msgid "Reference"
-msgstr "Referencia"
-
-#. module: stock
-#: code:addons/stock/stock.py:666
-#: code:addons/stock/stock.py:1472
-#, python-format
-msgid "Products to Process"
-msgstr "Productos a procesar"
-
-#. module: stock
-#: constraint:product.category:0
-msgid "Error ! You can not create recursive categories."
-msgstr "¡Error! No puede crear categorías recursivas."
-
-#. module: stock
-#: help:stock.fill.inventory,set_stock_zero:0
-msgid "If checked, all product quantities will be set to zero to help ensure a real physical inventory is done"
-msgstr "Si se marca, todas las cantidades de producto se ponen a cero para ayudar a realizar un inventario físico real."
-
-#. module: stock
-#: model:ir.model,name:stock.model_stock_move_split_lines
-msgid "Split lines"
-msgstr "Dividir líneas"
-
-#. module: stock
-#: code:addons/stock/stock.py:1120
-#, python-format
-msgid "You cannot cancel picking because stock move is in done state !"
-msgstr "¡No puede cancelar la lista de empaque porqué el movimiento de stock está en estado realizado!"
-
-#. module: stock
-#: code:addons/stock/stock.py:2230
-#: code:addons/stock/stock.py:2271
-#: code:addons/stock/stock.py:2331
-#, python-format
-msgid "Warning!"
-msgstr "¡Aviso!"
-
-#. module: stock
-#: field:stock.invoice.onshipping,group:0
-msgid "Group by partner"
-msgstr "Agrupar por empresa"
-
-#. module: stock
-#: model:ir.model,name:stock.model_res_partner
-#: view:report.stock.inventory:0
-#: field:report.stock.inventory,partner_id:0
-#: view:report.stock.move:0
-#: field:report.stock.move,partner_id:0
-#: view:stock.move:0
-#: field:stock.move,partner_id:0
-#: view:stock.picking:0
-#: field:stock.picking,partner_id:0
-msgid "Partner"
-msgstr "Empresa"
-
-#. module: stock
-#: help:stock.move.memory.in,currency:0
-#: help:stock.move.memory.out,currency:0
-msgid "Currency in which Unit cost is expressed"
-msgstr "Moneda en la que se expresa el coste unidad."
-
-#. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:126
-#, python-format
-msgid "No invoicing"
-msgstr "No facturación"
-
-#. module: stock
-#: help:stock.location,valuation_out_account_id:0
-msgid "This account will be used to value stock moves that have this location as source, instead of the stock input account from the product."
-msgstr "Esta cuenta sera usada para valorar los movimientos de stock que tengan este lugar como origen, en lugar de la cuenta de stock de entrada del producto."
-
-#. module: stock
-#: model:ir.model,name:stock.model_stock_production_lot
-#: field:stock.production.lot.revision,lot_id:0
-#: field:stock.report.prodlots,prodlot_id:0
-msgid "Production lot"
-msgstr "Lote de producción"
-
-#. module: stock
-#: model:ir.ui.menu,name:stock.menu_stock_uom_categ_form_action
-msgid "Units of Measure Categories"
-msgstr "Categorías de unidades de medida"
-
-#. module: stock
-#: help:stock.incoterms,code:0
-msgid "Code for Incoterms"
-msgstr "Código para Incoterms"
-
-#. module: stock
-#: field:stock.tracking,move_ids:0
-msgid "Moves for this pack"
-msgstr "Movimientos para este paquete"
-
-#. module: stock
-#: selection:report.stock.inventory,location_type:0
-#: selection:stock.location,usage:0
-msgid "Internal Location"
-msgstr "Ubicación interna"
-
-#. module: stock
-#: view:stock.inventory:0
-msgid "Confirm Inventory"
-msgstr "Confirmar el inventario"
-
-#. module: stock
-#: view:report.stock.inventory:0
-#: field:report.stock.inventory,state:0
-#: view:report.stock.move:0
-#: field:report.stock.move,state:0
-#: view:stock.inventory:0
-#: field:stock.inventory,state:0
-#: field:stock.inventory.line,state:0
-#: view:stock.move:0
-#: field:stock.move,state:0
-#: view:stock.picking:0
-#: field:stock.picking,state:0
-#: report:stock.picking.list:0
-msgid "State"
-msgstr "Estado"
-
-#. module: stock
-#: view:stock.location:0
-msgid "Accounting Information"
-msgstr "Informacion Contable"
-
-#. module: stock
-#: field:stock.location,stock_real_value:0
-msgid "Real Stock Value"
-msgstr "Valor stock real"
-
-#. module: stock
-#: field:report.stock.move,day_diff2:0
-msgid "Lag (Days)"
-msgstr "Retraso (días)"
-
-#. module: stock
-#: model:ir.model,name:stock.model_action_traceability
-msgid "Action traceability "
-msgstr "Acción trazabilidad "
-
-#. module: stock
-#: view:stock.move:0
-msgid "UOM"
-msgstr "UdM"
-
-#. module: stock
-#: selection:report.stock.inventory,state:0
-#: selection:report.stock.move,state:0
-#: view:stock.move:0
-#: selection:stock.move,state:0
-#: view:stock.picking:0
-#: selection:stock.picking,state:0
-#: view:stock.production.lot:0
-#: field:stock.production.lot,stock_available:0
-msgid "Available"
-msgstr "Reservado"
-
-#. module: stock
-#: view:stock.picking:0
-#: field:stock.picking,min_date:0
-msgid "Expected Date"
-msgstr "Fecha prevista"
-
-#. module: stock
-#: view:board.board:0
-#: model:ir.actions.act_window,name:stock.action_outgoing_product_board
-msgid "Outgoing Product"
-msgstr "Orden de salida"
-
-#. module: stock
-#: model:ir.actions.act_window,help:stock.action_warehouse_form
-msgid "Create and manage your warehouses and assign them a location from here"
-msgstr "Cree y gestione sus almacenes y asígneles una ubicación desde aquí."
-
-#. module: stock
-#: field:report.stock.move,product_qty_in:0
-msgid "In Qty"
-msgstr "En cantidad"
-
-#. module: stock
-#: code:addons/stock/wizard/stock_fill_inventory.py:115
-#, python-format
-msgid "No product in this location."
-msgstr "No hay producto en esta ubicación."
-
-#. module: stock
-#: field:stock.warehouse,lot_output_id:0
-msgid "Location Output"
-msgstr "Ubicación de salida"
-
-#. module: stock
-#: model:ir.actions.act_window,name:stock.split_into
-#: model:ir.model,name:stock.model_stock_split_into
-msgid "Split into"
-msgstr "Dividir en"
-
-#. module: stock
-#: field:stock.move,price_currency_id:0
-msgid "Currency for average price"
-msgstr "Moneda para precio promedio"
-
-#. module: stock
-#: help:product.template,property_stock_account_input:0
-msgid "When doing real-time inventory valuation, counterpart Journal Items for all incoming stock moves will be posted in this account. If not set on the product, the one from the product category is used."
-msgstr "Al hacer la valoración de inventario en tiempo real, la contrapartida de los asientos del diario para todos los movimientos de stock de entrada se creará en esta cuenta. Si no se indica en el producto, se utilizará la definida en la categoría del producto."
-
-#. module: stock
-#: field:report.stock.inventory,location_type:0
-#: field:stock.location,usage:0
-msgid "Location Type"
-msgstr "Tipo de ubicación"
-
-#. module: stock
-#: help:report.stock.move,type:0
-#: help:stock.picking,type:0
-msgid "Shipping type specify, goods coming in or going out."
-msgstr "Indica el tipo de envío, recepción o envío de mercancías."
-
-#. module: stock
-#: model:ir.actions.report.xml,name:stock.report_move_labels
-msgid "Item Labels"
-msgstr "Etiquetas artículos"
-
-#. module: stock
-#: model:ir.model,name:stock.model_report_stock_move
-msgid "Moves Statistics"
-msgstr "Estadísticas de movimientos"
-
-#. module: stock
-#: view:stock.production.lot:0
-msgid "Product Lots Filter"
-msgstr "Filtro lotes de producto"
-
-#. module: stock
-#: code:addons/stock/stock.py:2615
-#, python-format
-msgid "You can not cancel inventory which has any account move with posted state."
-msgstr "No podra cancelar el inventario que tenga algun movimiento de cuenta con lo ultimo publicado."
-
-#. module: stock
-#: report:lot.stock.overview:0
-#: report:lot.stock.overview_all:0
-#: report:stock.inventory.move:0
-#: report:stock.picking.list:0
-msgid "["
-msgstr "["
-
-#. module: stock
-#: help:stock.production.lot,stock_available:0
-msgid "Current quantity of products with this Production Lot Number available in company warehouses"
-msgstr "Cantidad actual de productos con este número de lote de producción disponible en almacenes de la compañía."
-
-#. module: stock
-#: field:stock.move,move_history_ids:0
-msgid "Move History (child moves)"
-msgstr "Historial movimientos (movimientos hijos)"
-
-#. module: stock
-#: code:addons/stock/stock.py:2015
-#, python-format
-msgid "There is no stock output account defined for this product or its category: \"%s\" (id: %d)"
-msgstr "No se ha definido una cuenta de salida de stock para este producto o su categoría: \"%s\" (id: %d)"
-
-#. module: stock
-#: model:ir.actions.act_window,name:stock.action_picking_tree6
-#: model:ir.ui.menu,name:stock.menu_action_picking_tree6
-#: field:stock.picking,move_lines:0
-msgid "Internal Moves"
-msgstr "Movimientos internos"
-
-#. module: stock
-#: field:stock.move,location_dest_id:0
-msgid "Destination Location"
-msgstr "Ubicación destino"
-
-#. module: stock
-#: code:addons/stock/stock.py:754
-#, python-format
-msgid "You can not process picking without stock moves"
-msgstr "No puede procesar una orden sin movimientos de stock"
-
-#. module: stock
-#: model:ir.ui.menu,name:stock.menu_product_packaging_stock_action
-#: field:stock.move,product_packaging:0
-msgid "Packaging"
-msgstr "Empaquetado"
-
-#. module: stock
-#: report:stock.picking.list:0
-msgid "Order(Origin)"
-msgstr "Pedido (origen)"
-
-#. module: stock
-#: report:lot.stock.overview:0
-#: report:lot.stock.overview_all:0
-msgid "Grand Total:"
-msgstr "Total:"
-
-#. module: stock
-#: model:ir.actions.act_window,help:stock.action_out_picking_move
-msgid "You will find in this list all products you have to deliver to your customers. You can process the deliveries directly from this list using the buttons on the right of each line. You can filter the products to deliver by customer, products or sale order (using the Origin field)."
-msgstr "En esta lista encontrará todos los productos que ha de entregar a sus clientes. Puede procesar las entregas directamente desde esta lista usando los botones a la derecha de cada línea. Puede filtrar los productos a entregar por cliente, producto o pedido de venta (utilizando el campo origen)."
-
-#. module: stock
-#: model:ir.ui.menu,name:stock.menu_stock_inventory_control
-msgid "Inventory Control"
-msgstr "Control inventario"
-
-#. module: stock
-#: view:stock.location:0
-#: field:stock.location,comment:0
-msgid "Additional Information"
-msgstr "Información adicional"
-
-#. module: stock
-#: report:lot.stock.overview:0
-#: report:lot.stock.overview_all:0
-msgid "Location / Product"
-msgstr "Ubicación / Producto"
-
-#. module: stock
-#: code:addons/stock/stock.py:1303
-#, python-format
-msgid "Reception"
-msgstr "Recepción"
-
-#. module: stock
-#: field:stock.tracking,serial:0
-msgid "Additional Reference"
-msgstr "Referencia adicional"
-
-#. module: stock
-#: view:stock.production.lot.revision:0
-msgid "Production Lot Revisions"
-msgstr "Revisiones de lote de producción"
-
-#. module: stock
-#: help:product.product,track_outgoing:0
-msgid "Forces to specify a Production Lot for all moves containing this product and going to a Customer Location"
-msgstr "Fuerza a indicar un lote de producción para todos los movimientos que contienen este producto y van a una ubicación del cliente."
-
-#. module: stock
-#: model:ir.actions.act_window,help:stock.action_stock_journal_form
-msgid "The stock journal system allows you to assign each stock operation to a specific journal according to the type of operation to perform or the worker/team that should perform the operation. Examples of stock journals may be: quality control, pick lists, packing, etc."
-msgstr "El sistema de existencias diarias le permite asignar a cada operación de existencias a un diario específico según el tipo de operación a realizar por el trabajador/equipo que debe realizar la operación. Ejemplos de diarios de existencias pueden ser: control de calidad, listas de selección, embalaje, etc."
-
-#. module: stock
-#: field:stock.location,complete_name:0
-#: field:stock.location,name:0
-msgid "Location Name"
-msgstr "Nombre ubicación"
-
-#. module: stock
-#: view:stock.inventory:0
-msgid "Posted Inventory"
-msgstr "Inventario enviado"
-
-#. module: stock
-#: view:stock.move:0
-#: view:stock.picking:0
-msgid "Move Information"
-msgstr "Información de movimiento"
-
-#. module: stock
-#: view:report.stock.move:0
-msgid "Outgoing"
-msgstr "Salida"
-
-#. module: stock
-#: selection:report.stock.move,month:0
-msgid "August"
-msgstr "Agosto"
-
-#. module: stock
-#: model:ir.actions.act_window,name:stock.action_tracking_form
-#: model:ir.model,name:stock.model_stock_tracking
-#: model:ir.ui.menu,name:stock.menu_action_tracking_form
-#: view:stock.tracking:0
-msgid "Packs"
-msgstr "Paquetes"
-
-#. module: stock
-#: constraint:stock.move:0
-msgid "You try to assign a lot which is not from the same product"
-msgstr "Está intentando asignar un lote que no es del mismo producto"
-
-#. module: stock
-#: model:ir.actions.act_window,name:stock.action_picking_tree4
-#: model:ir.ui.menu,name:stock.menu_action_picking_tree4
-#: view:stock.picking:0
-msgid "Incoming Shipments"
-msgstr "Ordenes de entrada"
-
-#. module: stock
-#: selection:report.stock.move,month:0
-msgid "June"
-msgstr "Junio"
-
-#. module: stock
-#: field:product.template,property_stock_procurement:0
-msgid "Procurement Location"
-msgstr "Ubicación de abastecimiento"
-
-#. module: stock
-#: model:ir.actions.act_window,name:stock.action_production_lot_form
-#: model:ir.ui.menu,name:stock.menu_action_production_lot_form
-#: field:stock.inventory.line.split,line_exist_ids:0
-#: field:stock.inventory.line.split,line_ids:0
-#: field:stock.move.split,line_exist_ids:0
-#: field:stock.move.split,line_ids:0
-msgid "Production Lots"
-msgstr "Lotes de producción"
-
-#. module: stock
-#: report:stock.picking.list:0
-msgid "Recipient"
-msgstr "Destinatario"
-
-#. module: stock
-#: model:ir.actions.act_window,name:stock.action_location_tree
-#: model:ir.ui.menu,name:stock.menu_action_location_tree
-msgid "Location Structure"
-msgstr "Estructura ubicaciones"
-
-#. module: stock
-#: selection:report.stock.move,month:0
-msgid "October"
-msgstr "Octubre"
-
-#. module: stock
-#: model:ir.model,name:stock.model_stock_inventory_line
-msgid "Inventory Line"
-msgstr "Línea inventario"
-
-#. module: stock
-#: help:product.category,property_stock_journal:0
-msgid "When doing real-time inventory valuation, this is the Accounting Journal in which entries will be automatically posted when stock moves are processed."
-msgstr "Al hacer la valoración de inventario en tiempo real, este es el diario contable donde los asientos se crearán automáticamente cuando los movimientos de stock se procesen."
-
-#. module: stock
-#: model:ir.actions.act_window,name:stock.action_partial_picking
-msgid "Process Picking"
-msgstr "Procesar Lista de empaque"
-
-#. module: stock
-#: code:addons/stock/product.py:355
-#, python-format
-msgid "Future Receptions"
-msgstr "Recepciones futuras"
-
-#. module: stock
-#: help:stock.inventory.line.split,use_exist:0
-#: help:stock.move.split,use_exist:0
-msgid "Check this option to select existing lots in the list below, otherwise you should enter new ones line by line."
-msgstr "Marque esta opción para seleccionar lotes existentes en la lista inferior, de lo contrario debe introducir otros de nuevos línea por la línea."
-
-#. module: stock
-#: field:stock.move,move_dest_id:0
-msgid "Destination Move"
-msgstr "Movimiento destino"
-
-#. module: stock
-#: view:stock.move:0
-#: view:stock.picking:0
-msgid "Process Now"
-msgstr "Procesar ahora"
-
-#. module: stock
-#: field:stock.location,address_id:0
-msgid "Location Address"
-msgstr "Dirección ubicación"
-
-#. module: stock
-#: code:addons/stock/stock.py:2382
-#, python-format
-msgid "is consumed with"
-msgstr "es consumido con"
-
-#. module: stock
-#: help:stock.move,prodlot_id:0
-msgid "Production lot is used to put a serial number on the production"
-msgstr "Lote de producción se utiliza para poner un número de serie a la producción."
-
-#. module: stock
-#: field:stock.warehouse,lot_input_id:0
-msgid "Location Input"
-msgstr "Ubicación de entrada"
-
-#. module: stock
-#: help:stock.picking,date:0
-msgid "Date of Order"
-msgstr "Fecha de la orden."
-
-#. module: stock
-#: selection:product.product,valuation:0
-msgid "Periodical (manual)"
-msgstr "Periódico (manual)"
-
-#. module: stock
-#: model:stock.location,name:stock.location_procurement
-msgid "Procurements"
-msgstr "Abastecimientos"
-
-#. module: stock
-#: model:ir.actions.act_window,name:stock.action_inventory_form_draft
-msgid "Draft Physical Inventories"
-msgstr "Inventarios físicos borrador"
-
-#. module: stock
-#: selection:report.stock.inventory,location_type:0
-#: selection:stock.location,usage:0
-msgid "Transit Location for Inter-Companies Transfers"
-msgstr "Ubicación de tránsito para transferencias inter-compañías"
-
-#. module: stock
-#: model:ir.actions.act_window,name:stock.action_view_change_product_quantity
-#: model:ir.model,name:stock.model_stock_change_product_qty
-#: view:stock.change.product.qty:0
-msgid "Change Product Quantity"
-msgstr "Cambiar cantidad producto"
-
-#. module: stock
-#: model:ir.model,name:stock.model_stock_inventory_merge
-msgid "Merge Inventory"
-msgstr "Fusionar inventario"
-
-#. module: stock
-#: code:addons/stock/product.py:371
-#, python-format
-msgid "Future P&L"
-msgstr "P&L futuras"
-
-#. module: stock
-#: model:stock.location,name:stock.stock_location_company
-msgid "Grupo Pessah Textil SA de CV"
-msgstr "Grupo Pessah Textil SA de CV"
-
-#. module: stock
-#: view:report.stock.inventory:0
-#: view:stock.move:0
-#: view:stock.picking:0
-msgid "Scrap"
-msgstr "Desecho"
-
-#. module: stock
-#: field:stock.location,child_ids:0
-msgid "Contains"
-msgstr "Contiene"
-
-#. module: stock
-#: view:board.board:0
-msgid "Incoming Products Delay"
-msgstr "Retraso ordenes entrada"
-
-#. module: stock
-#: code:addons/stock/product.py:377
-#, python-format
-msgid "Future Qty"
-msgstr "Ctdad futura"
-
-#. module: stock
-#: view:stock.location:0
-msgid "Stock Locations"
-msgstr "Ubicaciones stock"
-
-#. module: stock
-#: report:lot.stock.overview:0
-#: report:lot.stock.overview_all:0
-#: field:stock.move,price_unit:0
-msgid "Unit Price"
-msgstr "Precio un."
-
-#. module: stock
-#: model:ir.model,name:stock.model_stock_move_split_lines_exist
-msgid "Exist Split lines"
-msgstr "Dividir líneas existentes"
-
-#. module: stock
-#: field:stock.move,date_expected:0
-msgid "Scheduled Date"
-msgstr "Fecha prevista"
-
-#. module: stock
-#: view:stock.tracking:0
-msgid "Pack Search"
-msgstr "Buscar paquete"
-
-#. module: stock
-#: selection:stock.move,priority:0
-msgid "Urgent"
-msgstr "Urgente"
-
-#. module: stock
-#: view:stock.picking:0
-#: report:stock.picking.list:0
-msgid "Journal"
-msgstr "Diario"
-
-#. module: stock
-#: help:stock.picking,location_id:0
-msgid "Keep empty if you produce at the location where the finished products are needed.Set a location if you produce at a fixed location. This can be a partner location if you subcontract the manufacturing operations."
-msgstr "Déjelo vacío si produce en la ubicación donde los productos terminados son necesarios. Indique un lugar si produce en una ubicación fija. Esto puede ser una ubicación de empresa si subcontrata las operaciones de fabricación."
-
-#. module: stock
-#: view:res.partner:0
-msgid "Inventory Properties"
-msgstr "Propiedades inventario"
-
-#. module: stock
-#: field:report.stock.move,day_diff:0
-msgid "Execution Lead Time (Days)"
-msgstr "Tiempo inicial de ejecución (días)"
-
-#. module: stock
-#: model:ir.actions.act_window,name:stock.act_stock_product_location_open
-msgid "Stock by Location"
-msgstr "Existencias por ubicacion"
-
-#. module: stock
-#: help:stock.move,address_id:0
-msgid "Optional address where goods are to be delivered, specifically used for allotment"
-msgstr "Dirección opcional cuando las mercancías deben ser entregadas, utilizado específicamente para lotes."
-
-#. module: stock
-#: view:report.stock.move:0
-msgid "Month-1"
-msgstr "Mes-1"
-
-#. module: stock
-#: help:stock.location,active:0
-msgid "By unchecking the active field, you may hide a location without deleting it."
-msgstr "Si el campo activo se desmarca, permite ocultar la ubicación sin eliminarla."
-
-#. module: stock
-#: model:ir.actions.report.xml,name:stock.report_picking_list
-msgid "Packing list"
-msgstr "Packing List"
-
-#. module: stock
-#: field:stock.location,stock_virtual:0
-msgid "Virtual Stock"
-msgstr "Stock virtual"
-
-#. module: stock
-#: selection:report.stock.inventory,location_type:0
-#: selection:stock.location,usage:0
-msgid "View"
-msgstr "Vista"
-
-#. module: stock
-#: field:stock.location,parent_left:0
-msgid "Left Parent"
-msgstr "Padre izquierdo"
-
-#. module: stock
-#: code:addons/stock/wizard/stock_partial_move.py:132
-#, python-format
-msgid "Delivery Information"
-msgstr "Información de envío"
-
-#. module: stock
-#: code:addons/stock/wizard/stock_fill_inventory.py:48
-#, python-format
-msgid "Stock Inventory is done"
-msgstr "Inventario de stock realizado"
-
-#. module: stock
-#: constraint:product.product:0
-msgid "Error: Invalid ean code"
-msgstr "Error: Código EAN erróneo"
-
-#. module: stock
-#: code:addons/stock/product.py:148
-#, python-format
-msgid "There is no stock output account defined for this product: \"%s\" (id: %d)"
-msgstr "No se ha definido una cuenta de salida de stock para este producto: \"%s\" (id: %d)"
-
-#. module: stock
-#: field:product.template,property_stock_production:0
-msgid "Production Location"
-msgstr "Ubicación de producción"
-
-#. module: stock
-#: help:stock.picking,address_id:0
-msgid "Address of partner"
-msgstr "Dirección de la empresa."
-
-#. module: stock
-#: field:report.stock.lines.date,date:0
-msgid "Latest Inventory Date"
-msgstr "Fecha último inventario"
-
-#. module: stock
-#: help:stock.location,usage:0
-msgid "* Supplier Location: Virtual location representing the source location for products coming from your suppliers\n"
-"                       \n"
-"* View: Virtual location used to create a hierarchical structures for your warehouse, aggregating its child locations ; can't directly contain products\n"
-"                       \n"
-"* Internal Location: Physical locations inside your own warehouses,\n"
-"                       \n"
-"* Customer Location: Virtual location representing the destination location for products sent to your customers\n"
-"                       \n"
-"* Inventory: Virtual location serving as counterpart for inventory operations used to correct stock levels (Physical inventories)\n"
-"                       \n"
-"* Procurement: Virtual location serving as temporary counterpart for procurement operations when the source (supplier or production) is not known yet. This location should be empty when the procurement scheduler has finished running.\n"
-"                       \n"
-"* Production: Virtual counterpart location for production operations: this location consumes the raw material and produces finished products\n"
-"                      "
-msgstr "* Ubicación proveedor: Ubicación virtual que representa la ubicación de origen para los productos procedentes de sus proveedores.\n"
-"\n"
-"* Vista: Ubicación virtual para crear una estructura jerárquica de su almacén, agregando sus ubicaciones hijas. No puede contener los productos directamente.\n"
-"\n"
-"* Ubicación interna: Ubicación física dentro de su propios almacenes.\n"
-"\n"
-"* Ubicación cliente: Ubicación virtual que representa la ubicación de destino para los productos enviados a sus clientes.\n"
-"\n"
-"* Inventario: Ubicación virtual que actúa como contrapartida de las operaciones de inventario utilizadas para corregir los niveles de existencias (inventarios físicos).\n"
-"\n"
-"* Abastecimiento: Ubicación virtual que actúa como contrapartida temporal de las operaciones de abastecimiento cuando el origen (proveedor o producción) no se conoce todavía. Esta ubicación debe estar vacía cuando el planificador de abastecimientos haya terminado de ejecutarse.\n"
-"\n"
-"* Producción: Ubicación virtual de contrapartida para operaciones de producción: esta ubicación consume la materia prima y produce los productos terminados.\n"
-"                      "
-
-#. module: stock
-#: field:stock.production.lot.revision,author_id:0
-msgid "Author"
-msgstr "Autor"
-
-#. module: stock
-#: code:addons/stock/stock.py:1302
-#, python-format
-msgid "Delivery Order"
-msgstr "Orden de salida"
-
-#. module: stock
-#: model:ir.model,name:stock.model_stock_move_memory_in
-msgid "stock.move.memory.in"
-msgstr "stock.movimiento.memoria.entrada"
-
-#. module: stock
-#: selection:stock.location,chained_auto_packing:0
-msgid "Manual Operation"
-msgstr "Operación manual"
-
-#. module: stock
-#: view:stock.location:0
-#: view:stock.move:0
-msgid "Supplier"
-msgstr "Proveedor"
-
-#. module: stock
-#: field:stock.picking,date_done:0
-msgid "Date Done"
-msgstr "Fecha realizado"
-
-#. module: stock
-#: report:stock.picking.list:0
-msgid "Expected Shipping Date"
-msgstr "Fecha de envío prevista"
-
-#. module: stock
-#: selection:stock.move,state:0
-msgid "Not Available"
-msgstr "No disponible"
-
-#. module: stock
-#: selection:report.stock.move,month:0
-msgid "March"
-msgstr "Marzo"
-
-#. module: stock
-#: model:ir.actions.act_window,name:stock.action_view_stock_inventory_line_split
-#: model:ir.model,name:stock.model_stock_inventory_line_split
-#: view:stock.inventory:0
-#: view:stock.inventory.line:0
-msgid "Split inventory lines"
-msgstr "Dividir líneas de inventario"
-
-#. module: stock
-#: view:stock.inventory:0
-msgid "Physical Inventory"
-msgstr "Inventario físico"
-
-#. module: stock
-#: help:stock.location,chained_company_id:0
-msgid "The company the Picking List containing the chained move will belong to (leave empty to use the default company determination rules"
-msgstr "La compañía a la que pertenece la orden que contiene el movimiento encadenado (dejarlo vacío para utilizar las reglas por defecto para determinar la compañía)."
-
-#. module: stock
-#: help:stock.location,chained_picking_type:0
-msgid "Shipping Type of the Picking List that will contain the chained move (leave empty to automatically detect the type based on the source and destination locations)."
-msgstr "Tipo de envío de la orden que va a contener el movimiento encadenado (dejar vacío para detectar automáticamente el tipo basado en las ubicaciones de origen y destino)."
-
-#. module: stock
-#: view:stock.move.split:0
-msgid "Lot number"
-msgstr "Número de lote"
-
-#. module: stock
-#: field:stock.inventory.line,product_uom:0
-#: field:stock.move.consume,product_uom:0
-#: field:stock.move.scrap,product_uom:0
-msgid "Product UOM"
-msgstr "UdM del producto"
-
-#. module: stock
-#: model:stock.location,name:stock.stock_location_locations_partner
-msgid "Partner Locations"
-msgstr "Ubicaciones de empresas"
-
-#. module: stock
-#: view:report.stock.inventory:0
-#: view:report.stock.move:0
-msgid "Total quantity"
-msgstr "Cantidad total"
-
-#. module: stock
-#: model:ir.actions.act_window,name:stock.move_consume
-#: view:stock.move.consume:0
-msgid "Consume Move"
-msgstr "Movimiento consumo"
-
-#. module: stock
-#: model:stock.location,name:stock.stock_location_suppliers
-msgid "Suppliers"
-msgstr "Proveedores"
-
-#. module: stock
-#: help:stock.location,chained_delay:0
-msgid "Delay between original move and chained move in days"
-msgstr "Retraso entre movimiento original y movimiento encadenado en días."
-
-#. module: stock
-#: view:stock.fill.inventory:0
-msgid "Import current product inventory from the following location"
-msgstr "Importar inventario de productos actual para la siguiente ubicación"
-
-#. module: stock
-#: help:stock.location,chained_auto_packing:0
-msgid "This is used only if you select a chained location type.\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 "Se utiliza sólo si selecciona un tipo de ubicación encadenada.\n"
-"La opción 'Movimiento automático' creará un movimiento de stock después del actual que se validará automáticamente. Con 'Operación manual', el movimiento de stock debe ser validado por un trabajador. Con 'Mov. automático, paso no añadido', la ubicación se reemplaza en el movimiento original."
-
-#. module: stock
-#: view:stock.production.lot:0
-msgid "Downstream Traceability"
-msgstr "Trazabilidad hacia abajo"
-
-#. module: stock
-#: help:product.template,property_stock_production:0
-msgid "For the current product, this stock location will be used, instead of the default one, as the source location for stock moves generated by production orders"
-msgstr "Para los productos actuales, esta ubicación de stock se utilizará, en lugar de la de por defecto, como la ubicación de origen para los movimientos de stock generados por las órdenes de producción."
-
-#. module: stock
-#: code:addons/stock/stock.py:2006
-#, python-format
-msgid "Can not create Journal Entry, Output Account defined on this product and Variant account on category of this product are same."
-msgstr "No se puede crear el asiento, la cuenta de salida definida en este producto y la cuenta variante de la categoría de producto son la misma."
-
-#. module: stock
-#: code:addons/stock/stock.py:1319
-#, python-format
-msgid "is in draft state."
-msgstr "está en estado borrador."
-
-#. module: stock
-#: model:ir.actions.act_window,help:stock.action_tracking_form
-msgid "This is the list of all your packs. When you select a Pack, you can get the upstream or downstream traceability of the products contained in the pack."
-msgstr "Esta es la lista de todas sus ordenes. Cuando selecciona una orden, puede obtener la trazabilidad hacia arriba o hacia abajo de los productos que forman este paquete."
-
-#. module: stock
-#: model:ir.model,name:stock.model_stock_ups_final
-msgid "Stock ups final"
-msgstr "Stock ups final"
-
-#. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:126
-#, python-format
-msgid "To be refunded/invoiced"
-msgstr "Para ser abonado/facturado"
-
-#. module: stock
-#: code:addons/stock/stock.py:2207
-#, python-format
-msgid "You can only delete draft moves."
-msgstr "Sólo puede eliminar movimientos borrador."
-
-#. module: stock
-#: view:stock.change.product.qty:0
-#: view:stock.change.standard.price:0
-#: view:stock.fill.inventory:0
-#: view:stock.inventory.merge:0
-#: view:stock.invoice.onshipping:0
-#: view:stock.location.product:0
-#: view:stock.move:0
-#: view:stock.move.track:0
-#: view:stock.picking:0
-#: view:stock.split.into:0
-msgid "_Cancel"
-msgstr "_Cancelar"
-
-#. module: stock
-#: view:stock.move:0
-msgid "Ready"
-msgstr "Preparado"
-
-#. module: stock
-#: view:stock.picking:0
-msgid "Calendar View"
-msgstr "Vista calendario"
-
-#. module: stock
-#: view:stock.picking:0
-msgid "Additional Info"
-msgstr "Información adicional"
-
-#. module: stock
-#: code:addons/stock/stock.py:1619
-#, python-format
-msgid "Operation forbidden"
-msgstr "Operación prohibida"
-
-#. module: stock
-#: field:stock.location.product,from_date:0
-msgid "From"
-msgstr "Desde"
-
-#. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:77
-#, python-format
-msgid "You may only return pickings that are Confirmed, Available or Done!"
-msgstr "¡Sólo puede devolver ordenes que estén confirmadas, reservadas o realizadas!"
-
-#. module: stock
-#: view:stock.picking:0
-#: field:stock.picking,invoice_state:0
-msgid "Invoice Control"
-msgstr "Control factura"
-
-#. module: stock
-#: model:ir.model,name:stock.model_stock_production_lot_revision
-msgid "Production lot revisions"
-msgstr "Revisiones de lote de producción"
-
-#. module: stock
-#: view:stock.picking:0
-msgid "Internal Picking List"
-msgstr "Lista de empaque interno"
-
-#. module: stock
-#: selection:report.stock.inventory,state:0
-#: selection:report.stock.move,state:0
-#: selection:stock.move,state:0
-#: selection:stock.picking,state:0
-msgid "Waiting"
-msgstr "En espera"
-
-#. module: stock
-#: view:stock.move:0
-#: selection:stock.move.split.lines,action:0
-#: view:stock.picking:0
-msgid "Split"
-msgstr "Dividir"
-
-#. module: stock
-#: view:stock.picking:0
-msgid "Search Stock Picking"
-msgstr "Buscar empaque stock"
-
-#. module: stock
-#: code:addons/stock/product.py:93
-#, python-format
-msgid "Company is not specified in Location"
-msgstr "No se ha especificado una compañía en la ubicación"
-
-#. module: stock
-#: view:report.stock.move:0
-#: field:stock.partial.move,type:0
-msgid "Type"
-msgstr "Tipo"
-
-#. module: stock
-#: report:stock.picking.list:0
-msgid "Picking List:"
-msgstr "Lista de empaque:"
-
-#. module: stock
-#: field:stock.inventory,date:0
-#: field:stock.move,create_date:0
-#: field:stock.production.lot,date:0
-#: field:stock.tracking,date:0
-msgid "Creation Date"
-msgstr "Fecha creación"
-
-#. module: stock
-#: field:report.stock.lines.date,id:0
-msgid "Inventory Line Id"
-msgstr "Id línea de inventario"
-
-#. module: stock
-#: help:stock.location,address_id:0
-msgid "Address of  customer or supplier."
-msgstr "Dirección del cliente o proveedor."
-
-#. module: stock
-#: view:report.stock.move:0
-#: field:report.stock.move,picking_id:0
-msgid "Packing"
-msgstr "Empaque"
-
-#. module: stock
-#: selection:report.stock.inventory,location_type:0
-#: field:res.partner,property_stock_customer:0
-#: selection:stock.location,usage:0
-msgid "Customer Location"
-msgstr "Ubicación del cliente"
-
-#. module: stock
-#: code:addons/stock/wizard/stock_partial_move.py:85
-#, python-format
-msgid "Invalid action !"
-msgstr "¡Acción no válida!"
-
-#. module: stock
-#: code:addons/stock/wizard/stock_partial_move.py:139
-#, python-format
-msgid "Receive Information"
-msgstr "Información de recepción"
-
-#. module: stock
-#: model:ir.actions.report.xml,name:stock.report_location_overview
-#: report:lot.stock.overview:0
-msgid "Location Inventory Overview"
-msgstr "Resumen inventario ubicación"
-
-#. module: stock
-#: model:ir.model,name:stock.model_stock_replacement
-msgid "Stock Replacement"
-msgstr "Reemplazo stock"
-
-#. module: stock
-#: view:stock.inventory:0
-msgid "General Informations"
-msgstr "Información general"
-
-#. module: stock
-#: selection:stock.location,chained_location_type:0
-msgid "None"
-msgstr "Ninguno"
-
-#. module: stock
-#: model:ir.actions.act_window,name:stock.action3
-#: view:stock.tracking:0
-msgid "Downstream traceability"
-msgstr "Trazabilidad hacia abajo"
-
-#. module: stock
-#: code:addons/stock/wizard/stock_invoice_onshipping.py:101
-#, python-format
-msgid "No Invoices were created"
-msgstr "No se han creado facturas"
-
-#. module: stock
-#: field:stock.location,posy:0
-msgid "Shelves (Y)"
-msgstr "Estantería (Y)"
-
-#. module: stock
-#: code:addons/stock/wizard/stock_partial_move.py:140
-#, python-format
-msgid "Receive"
-msgstr "Recibir"
-
-#. module: stock
-#: help:stock.incoterms,active:0
-msgid "By unchecking the active field, you may hide an INCOTERM without deleting it."
-msgstr "Si el campo activo se desmarca, permite ocultar un INCOTERM sin eliminarlo."
-
-#. module: stock
-#: view:stock.move:0
-#: view:stock.picking:0
-#: field:stock.picking,date:0
-msgid "Order Date"
-msgstr "Fecha orden"
-
-#. module: stock
-#: field:stock.location,location_id:0
-msgid "Parent Location"
-msgstr "Ubicación padre"
-
-#. module: stock
-#: help:stock.picking,state:0
-msgid "* Draft: not confirmed yet and will not be scheduled until confirmed\n"
-"* Confirmed: still waiting for the availability of products\n"
-"* Available: products reserved, simply waiting for confirmation.\n"
-"* Waiting: waiting for another move to proceed before it becomes automatically available (e.g. in Make-To-Order flows)\n"
-"* Done: has been processed, can't be modified or cancelled anymore\n"
-"* Cancelled: has been cancelled, can't be confirmed anymore"
-msgstr "* Borrador: No se ha confirmado todavía y no se planificará hasta que se confirme.\n"
-"* Confirmado: A la espera de la disponibilidad de productos.\n"
-"* Reservado: Productos reservados, esperando la confirmación del envío.\n"
-"* En espera: Esperando que otro movimiento se realice antes de que sea disponible de forma automática (por ejemplo, en flujos Obtener_bajo_pedido).\n"
-"* Realizado: Ha sido procesado, no se puede modificar o cancelar nunca más.\n"
-"* Cancelado: Se ha cancelado, no se puede confirmar nunca más."
-
-#. module: stock
-#: help:stock.location,company_id:0
-msgid "Let this field empty if this location is shared between all companies"
-msgstr "Deje este campo vacío si esta ubicación está compartida entre todas las compañías."
-
-#. module: stock
-#: code:addons/stock/stock.py:2230
-#, python-format
-msgid "Please provide a positive quantity to scrap!"
-msgstr "¡Introduzca una cantidad positiva a desechar!"
-
-#. module: stock
-#: field:stock.location,chained_delay:0
-msgid "Chaining Lead Time"
-msgstr "Tiempo inicial encadenado"
-
-#. module: stock
-#: code:addons/stock/wizard/stock_partial_move.py:85
-#, python-format
-msgid "Cannot deliver products which are already delivered !"
-msgstr "¡No se pueden enviar productos que ya están enviados!"
-
-#. module: stock
-#: model:ir.model,name:stock.model_stock_invoice_onshipping
-msgid "Stock Invoice Onshipping"
-msgstr "Stock factura en el envío"
-
-#. module: stock
-#: help:stock.move,state:0
-msgid "When the stock move is created it is in the 'Draft' state.\n"
-" After that, it is set to 'Not Available' state if the scheduler did not find the products.\n"
-" When products are reserved it is set to 'Available'.\n"
-" When the picking is done the state is 'Done'.              \n"
-"The state is 'Waiting' if the move is waiting for another one."
-msgstr "Cuando se crea un movimiento de stock está en estado 'Borrador'.\n"
-" Después se establece en estado 'No disponible' si el planificador no ha encontrado los productos.\n"
-" Cuando los productos están reservados se establece como 'Reservado'.\n"
-" Cuando la orden se envía el estado es 'Realizado'.              \n"
-"El estado es 'En espera' si el movimiento está a la espera de otro."
-
-#. module: stock
-#: selection:report.stock.inventory,location_type:0
-#: field:res.partner,property_stock_supplier:0
-#: selection:stock.location,usage:0
-msgid "Supplier Location"
-msgstr "Ubicación del proveedor"
-
-#. module: stock
-#: code:addons/stock/stock.py:2251
-#, python-format
-msgid "were scrapped"
-msgstr "estaban desechados"
-
-#. module: stock
-#: view:stock.move:0
-#: view:stock.picking:0
-msgid "Partial"
-msgstr "Parcial"
-
-#. module: stock
-#: selection:report.stock.move,month:0
-msgid "September"
-msgstr "Septiembre"
-
-#. module: stock
-#: help:stock.picking,backorder_id:0
-msgid "If this picking was split this field links to the picking that contains the other part that has been processed already."
-msgstr "Si este empaque se dividió, este campo enlaza con el empaque que contiene la otra parte que ya ha sido procesada."
-
-#. module: stock
-#: model:ir.model,name:stock.model_report_stock_inventory
-msgid "Stock Statistics"
-msgstr "Estadísticas de stock"
-
-#. module: stock
-#: field:stock.move.memory.in,currency:0
-#: field:stock.move.memory.out,currency:0
-msgid "Currency"
-msgstr "Moneda"
-
-#. module: stock
-#: field:product.product,track_production:0
-msgid "Track Manufacturing Lots"
-msgstr "Lotes seguimiento de fabricación"
-
-#. module: stock
-#: code:addons/stock/wizard/stock_inventory_merge.py:44
-#, python-format
-msgid "Please select multiple physical inventories to merge in the list view."
-msgstr "Seleccione varios inventarios físicos para fusionar en la vista lista."
-
-#. module: stock
-#: model:ir.actions.act_window,name:stock.act_product_stock_move_open
-#: model:ir.actions.act_window,name:stock.action_move_form2
-#: model:ir.ui.menu,name:stock.menu_action_move_form2
-#: view:stock.inventory:0
-#: view:stock.move:0
-#: view:stock.picking:0
-#: view:stock.production.lot:0
-#: view:stock.tracking:0
-msgid "Stock Moves"
-msgstr "Movimientos de stock"
-
-#. module: stock
-#: selection:report.stock.move,type:0
-#: selection:stock.location,chained_picking_type:0
-#: selection:stock.picking,type:0
-msgid "Sending Goods"
-msgstr "Envío de mercancías"
-
-#. module: stock
-#: view:stock.picking:0
-msgid "Cancel Availability"
-msgstr "Cancelar disponibilidad"
-
-#. module: stock
-#: help:stock.move,date_expected:0
-msgid "Scheduled date for the processing of this move"
-msgstr "Fecha planificada para el procesado de este movimiento."
-
-#. module: stock
-#: field:stock.inventory,move_ids:0
-msgid "Created Moves"
-msgstr "Movimientos creados"
-
-#. module: stock
-#: field:stock.report.tracklots,tracking_id:0
-msgid "Tracking lot"
-msgstr "Lote seguimiento"
-
-#. module: stock
-#: view:stock.picking:0
-msgid "Back Orders"
-msgstr "Ordenes pendientes"
-
-#. module: stock
-#: view:product.product:0
-#: view:product.template:0
-msgid "Counter-Part Locations Properties"
-msgstr "Propiedades de las ubicaciones parte recíproca"
-
-#. module: stock
-#: view:stock.location:0
-msgid "Localization"
-msgstr "Ubicación"
-
-#. module: stock
-#: model:ir.model,name:stock.model_stock_report_tracklots
-msgid "Stock report by tracking lots"
-msgstr "Informe de stock por lotes de seguimiento"
-
-#. module: stock
-#: code:addons/stock/product.py:367
-#, python-format
-msgid "Delivered Qty"
-msgstr "Ctdad enviada"
-
-#. module: stock
-#: model:ir.actions.act_window,name:stock.track_line
-#: view:stock.inventory.line.split:0
-#: view:stock.move.split:0
-msgid "Split in lots"
-msgstr "Dividir en lotes"
-
-#. module: stock
-#: view:stock.move.split:0
-msgid "Production Lot Numbers"
-msgstr "Números lote de producción"
-
-#. module: stock
-#: view:report.stock.inventory:0
-#: field:report.stock.inventory,date:0
-#: field:report.stock.move,date:0
-#: view:stock.inventory:0
-#: report:stock.inventory.move:0
-#: view:stock.move:0
-#: field:stock.move,date:0
-#: field:stock.partial.move,date:0
-#: field:stock.partial.picking,date:0
-#: view:stock.picking:0
-msgid "Date"
-msgstr "Fecha"
-
-#. module: stock
-#: view:report.stock.inventory:0
-#: view:report.stock.move:0
-#: view:stock.move:0
-#: view:stock.picking:0
-msgid "Extended Filters..."
-msgstr "Filtros extendidos..."
-
-#. module: stock
-#: field:stock.warehouse,lot_stock_id:0
-msgid "Location Stock"
-msgstr "Ubicación stock"
-
-#. module: stock
-#: code:addons/stock/wizard/stock_inventory_merge.py:64
-#, python-format
-msgid "Merging is only allowed on draft inventories."
-msgstr "La fusión sólo es permitida en inventarios borrador."
-
-#. module: stock
-#: model:ir.ui.menu,name:stock.menu_dashboard_stock
-msgid "Dashboard"
-msgstr "Tablero"
-
-#. module: stock
-#: model:ir.model,name:stock.model_stock_move_track
-msgid "Track moves"
-msgstr "Movimientos seguimiento"
-
-#. module: stock
-#: field:stock.incoterms,code:0
-msgid "Code"
-msgstr "Código"
-
-#. module: stock
-#: view:stock.inventory.line.split:0
-msgid "Lots Number"
-msgstr "Número lotes"
-
-#. module: stock
-#: model:ir.actions.act_window,name:stock.open_board_warehouse
-#: model:ir.ui.menu,name:stock.menu_board_warehouse
-msgid "Warehouse Dashboard"
-msgstr "Tablero almacén"
-
-#. module: stock
-#: code:addons/stock/stock.py:512
-#, python-format
-msgid "You can not remove a lot line !"
-msgstr "¡No puede eliminar una línea de lote!"
-
-#. module: stock
-#: model:ir.model,name:stock.model_stock_move_scrap
-#: view:stock.move:0
-#: view:stock.move.scrap:0
-#: view:stock.picking:0
-msgid "Scrap Products"
-msgstr "Desechar productos"
-
-#. module: stock
-#: code:addons/stock/stock.py:1128
-#, python-format
-msgid "You cannot remove the picking which is in %s state !"
-msgstr "¡No puede eliminar la orden que está en estado %s!"
-
-#. module: stock
-#: view:stock.inventory.line.split:0
-#: view:stock.move.consume:0
-#: view:stock.move.scrap:0
-#: view:stock.move.split:0
-#: view:stock.picking:0
-msgid "Cancel"
-msgstr "Cancelar"
-
-#. module: stock
-#: model:ir.actions.act_window,name:stock.act_stock_return_picking
-#: model:ir.model,name:stock.model_stock_return_picking
-msgid "Return Picking"
-msgstr "Devolver orden"
-
-#. module: stock
-#: view:stock.inventory:0
-#: view:stock.move:0
-#: view:stock.picking:0
-msgid "Split in production lots"
-msgstr "Dividir en lotes de producción"
-
-#. module: stock
-#: model:ir.model,name:stock.model_stock_location
-#: view:report.stock.inventory:0
-#: field:report.stock.inventory,location_id:0
-#: field:stock.change.product.qty,location_id:0
-#: field:stock.fill.inventory,location_id:0
-#: field:stock.inventory.line,location_id:0
-#: report:stock.inventory.move:0
-#: view:stock.location:0
-#: view:stock.move:0
-#: field:stock.move.consume,location_id:0
-#: field:stock.move.scrap,location_id:0
-#: field:stock.picking,location_id:0
-#: report:stock.picking.list:0
-#: field:stock.report.prodlots,location_id:0
-#: field:stock.report.tracklots,location_id:0
-msgid "Location"
-msgstr "Ubicación"
-
-#. module: stock
-#: view:product.template:0
-msgid "Information"
-msgstr "Información"
-
-#. module: stock
-#: report:stock.picking.list:0
-msgid "Shipping Address :"
-msgstr "Dirección de envío:"
-
-#. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:115
-#, python-format
-msgid "Provide the quantities of the returned products."
-msgstr "Indique las cantidades de los productos devueltos."
-
-#. module: stock
-#: code:addons/stock/stock.py:2009
-#, python-format
-msgid "Can not create Journal Entry, Input Account defined on this product and Variant account on category of this product are same."
-msgstr "No se puede crear el asiento, la cuenta de entrada definido en este producto y la cuenta variante en la categoría del producto son la misma."
-
-#. module: stock
-#: view:stock.change.standard.price:0
-msgid "Cost Price"
-msgstr "Precio coste"
-
-#. module: stock
-#: view:product.product:0
-#: field:product.product,valuation:0
-msgid "Inventory Valuation"
-msgstr "Valoración inventario"
-
-#. module: stock
-#: view:stock.picking:0
-msgid "Create Invoice"
-msgstr "Crear factura"
-
-#. module: stock
-#: view:stock.move:0
-#: view:stock.picking:0
-msgid "Process Later"
-msgstr "Procesar más tarde"
-
-#. module: stock
-#: help:res.partner,property_stock_supplier:0
-msgid "This stock location will be used, instead of the default one, as the source location for goods you receive from the current partner"
-msgstr "Esta ubicación de stock será utilizada, en lugar de la ubicación por defecto, como la ubicación de origen para recibir mercancías desde esta empresa"
-
-#. module: stock
-#: field:stock.warehouse,partner_address_id:0
-msgid "Owner Address"
-msgstr "Dirección propietario"
-
-#. module: stock
-#: help:stock.move,price_unit:0
-msgid "Technical field used to record the product cost set by the user during a picking confirmation (when average price costing method is used)"
-msgstr "Campo técnico utilizado para registrar el coste del producto indicado por el usuario durante una confirmación de orden (cuando se utiliza el método del precio medio de coste)."
-
-#. module: stock
-#: model:ir.actions.act_window,help:stock.action_stock_move_report
-msgid "Moves Analysis allows you to easily check and analyse your company stock moves. Use this report when you want to analyse the different routes taken by your products and inventory management performance."
-msgstr "El análisis de movimientos le permite analizar y verificar fácilmente los movimientos de stock de su compañía. Utilice este informe cuando quiera analizar las diferentes rutas tomadas por sus productos y el rendimiento de la gestión de su inventario."
-
-#. module: stock
-#: field:report.stock.move,day_diff1:0
-msgid "Planned Lead Time (Days)"
-msgstr "Tiempo inicial planificado (días)"
-
-#. module: stock
-#: field:stock.change.standard.price,new_price:0
-msgid "Price"
-msgstr "Precio"
-
-#. module: stock
-#: view:stock.inventory:0
-msgid "Search Inventory"
-msgstr "Buscar inventario"
-
-#. module: stock
-#: field:stock.move.track,quantity:0
-msgid "Quantity per lot"
-msgstr "Cantidad por lote"
-
-#. module: stock
-#: code:addons/stock/stock.py:2012
-#, python-format
-msgid "There is no stock input account defined for this product or its category: \"%s\" (id: %d)"
-msgstr "No se ha definido una cuenta de entrada de stock para este producto o su categoría: \"%s\" (id: %d)"
-
-#. module: stock
-#: code:addons/stock/product.py:357
-#, python-format
-msgid "Received Qty"
-msgstr "Ctdad recibida"
-
-#. module: stock
-#: field:stock.production.lot,ref:0
-msgid "Internal Reference"
-msgstr "Referencia interna"
-
-#. module: stock
-#: help:stock.production.lot,prefix:0
-msgid "Optional prefix to prepend when displaying this serial number: PREFIX/SERIAL [INT_REF]"
-msgstr "Prefijo opcional a añadir cuando se muestre el número de serie: PREFIJO/SERIE [REF_INT]"
-
-#. module: stock
-#: model:ir.actions.act_window,name:stock.action_view_stock_fill_inventory
-#: model:ir.model,name:stock.model_stock_fill_inventory
-#: view:stock.fill.inventory:0
-msgid "Import Inventory"
-msgstr "Importar inventario"
-
-#. module: stock
-#: field:stock.incoterms,name:0
-#: field:stock.move,name:0
-#: field:stock.warehouse,name:0
-msgid "Name"
-msgstr "Nombre"
-
-#. module: stock
-#: view:product.product:0
-msgid "Stocks"
-msgstr "Stocks"
-
-#. module: stock
-#: model:ir.module.module,description:stock.module_meta_information
-msgid "OpenERP Inventory Management module can manage multi-warehouses, multi and structured stock locations.\n"
-"Thanks to the double entry management, the inventory controlling is powerful and flexible:\n"
-"* Moves history and planning,\n"
-"* Different inventory methods (FIFO, LIFO, ...)\n"
-"* Stock valuation (standard or average price, ...)\n"
-"* Robustness faced with Inventory differences\n"
-"* Automatic reordering rules (stock level, JIT, ...)\n"
-"* Bar code supported\n"
-"* Rapid detection of mistakes through double entry system\n"
-"* Traceability (upstream/downstream, production lots, serial number, ...)\n"
-"* Dashboard for warehouse that includes:\n"
-"    * Products to receive in delay (date < = today)\n"
-"    * Procurement in exception\n"
-"    * Graph : Number of Receive products vs planned (bar graph on week par day)\n"
-"    * Graph : Number of Delivery products vs planned (bar graph on week par day)\n"
-"    "
-msgstr "El módulo de OpenERP de gestión de inventario puede gestionar múltiples almacenes, y varias ubicaciones estructuradas.\n"
-"Gracias a la gestión de doble entrada, el control de inventario es potente y flexible:\n"
-"* Historial de movimientos y planificación,\n"
-"* Diferentes métodos de inventario (FIFO, LIFO, ...)\n"
-"* Valoración de existencias (precio estándar o medio, ...)\n"
-"* Robustez frente a las diferencias de inventario\n"
-"* Normas de reordenación automática (nivel de existencias, JIT, ...)\n"
-"* Código de barras soportado\n"
-"* Detección rápida de errores a través del sistema de entrada doble\n"
-"* Trazabilidad (hacia arriba/hacia abajo, lotes de producción, número de serie, ...)\n"
-"* Panel de almacén que incluye:\n"
-"    * Productos a recibir con retraso (fecha <= hoy)\n"
-"    * Compras en excepción\n"
-"    * Gráfico: Número de productos Recibidos frente al previsto (gráfico de barras semanal por día)\n"
-"    * Gráfico: Número de productos Entregados frente al previsto (gráfico de barras semanal por día)\n"
-"    "
-
-#. module: stock
-#: help:product.template,property_stock_inventory:0
-msgid "For the current product, 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 "Para los productos actuales, esta ubicación de stock se utilizará, en lugar de la por defecto, como la ubicación de origen para los movimientos de stock generados cuando realiza un inventario."
-
-#. module: stock
-#: view:report.stock.lines.date:0
-msgid "Stockable"
-msgstr "Almacenable"
-
-#. module: stock
-#: selection:product.product,valuation:0
-msgid "Real Time (automated)"
-msgstr "Tiempo real (automatizado)"
-
-#. module: stock
-#: help:stock.move,tracking_id:0
-msgid "Logistical shipping unit: pallet, box, pack ..."
-msgstr "Unidad de envío logística: Palet, caja, paquete, ..."
-
-#. module: stock
-#: view:stock.change.product.qty:0
-#: view:stock.change.standard.price:0
-msgid "_Apply"
-msgstr "_Aplicar"
-
-#. module: stock
-#: report:lot.stock.overview:0
-#: report:lot.stock.overview_all:0
-#: report:stock.inventory.move:0
-#: report:stock.picking.list:0
-msgid "]"
-msgstr "]"
-
-#. module: stock
-#: field:product.template,property_stock_inventory:0
-msgid "Inventory Location"
-msgstr "Ubicación de inventario"
-
-#. module: stock
-#: view:report.stock.inventory:0
-#: view:report.stock.move:0
-msgid "Total value"
-msgstr "Valor total"
-
-#. module: stock
-#: help:stock.location,chained_journal_id:0
-msgid "Inventory Journal in which the chained move will be written, if the Chaining Type is not Transparent (no journal is used if left empty)"
-msgstr "Diario de inventario en el que el movimiento encadenado será escrito, si el tipo de encadenamiento no es transparente (no se utiliza ningún diario si se deja vacío)."
-
-#. module: stock
-#: view:board.board:0
-#: model:ir.actions.act_window,name:stock.action_incoming_product_board
-msgid "Incoming Product"
-msgstr "Orden de entrada"
-
-#. module: stock
-#: view:stock.move:0
-msgid "Creation"
-msgstr "Creación"
-
-#. module: stock
-#: field:stock.move.memory.in,cost:0
-#: field:stock.move.memory.out,cost:0
-msgid "Cost"
-msgstr "Coste"
-
-#. module: stock
-#: field:product.category,property_stock_account_input_categ:0
-#: field:product.template,property_stock_account_input:0
-#: field:stock.change.standard.price,stock_account_input:0
-#: field:stock.location,valuation_in_account_id:0
-msgid "Stock Input Account"
-msgstr "Cuenta entrada stock"
-
-#. module: stock
-#: model:ir.ui.menu,name:stock.menu_stock_warehouse_mgmt
-#: model:ir.ui.menu,name:stock.menu_warehouse_config
-msgid "Warehouse Management"
-msgstr "Gestión de almacenes"
-
-#. module: stock
-#: selection:stock.picking,move_type:0
-msgid "Partial Delivery"
-msgstr "Entrega parcial"
-
-#. module: stock
-#: selection:stock.location,chained_auto_packing:0
-msgid "Automatic No Step Added"
-msgstr "Mov. automático, paso no añadido"
-
-#. module: stock
-#: code:addons/stock/stock.py:2382
-#, python-format
-msgid "Product "
-msgstr "Producto "
-
-#. module: stock
-#: view:stock.location.product:0
-msgid "Stock Location Analysis"
-msgstr "Análisis ubicación stock"
-
-#. module: stock
-#: help:stock.move,date:0
-msgid "Move date: scheduled date until move is done, then date of actual move processing"
-msgstr "Fecha del movimiento: Fecha planificada hasta que el movimiento esté realizado, después fecha real en que el movimiento ha sido procesado."
-
-#. module: stock
-#: model:ir.model,name:stock.model_stock_move_memory_out
-msgid "stock.move.memory.out"
-msgstr "stock.movimiento.memoria.salida"
-
-#. module: stock
-#: view:report.stock.inventory:0
-#: view:report.stock.move:0
-#: view:stock.inventory:0
-#: view:stock.move:0
-#: view:stock.picking:0
-#: view:stock.production.lot:0
-msgid "Group By..."
-msgstr "Agrupar por..."
-
-#. module: stock
-#: view:stock.location:0
-msgid "Chained Locations"
-msgstr "Ubicaciones encadenadas"
-
-#. module: stock
-#: model:stock.location,name:stock.location_inventory
-msgid "Inventory loss"
-msgstr "Pérdidas de inventario"
-
-#. module: stock
-#: code:addons/stock/stock.py:1311
-#, python-format
-msgid "Document"
-msgstr "Documento"
-
-#. module: stock
-#: view:stock.picking:0
-msgid "Input Picking List"
-msgstr "Lista de empaque de entrada"
-
-#. module: stock
-#: field:stock.move,product_uom:0
-#: field:stock.move.memory.in,product_uom:0
-#: field:stock.move.memory.out,product_uom:0
-msgid "Unit of Measure"
-msgstr "Unidad de medida"
-
-#. module: stock
-#: code:addons/stock/product.py:176
-#, python-format
-msgid "Products: "
-msgstr "Productos: "
-
-#. module: stock
-#: help:product.product,track_production:0
-msgid "Forces to specify a Production Lot for all moves containing this product and generated by a Manufacturing Order"
-msgstr "Fuerza a especificar un lote de producción para todos los movimientos que contienen este producto y generados por una orden de fabricación."
-
-#. module: stock
-#: model:ir.actions.act_window,name:stock.track_line_old
-#: view:stock.move.track:0
-msgid "Tracking a move"
-msgstr "Seguimiento de un movimiento"
-
-#. module: stock
-#: view:product.product:0
-msgid "Update"
-msgstr "Actualizar"
-
-#. module: stock
-#: view:stock.inventory:0
-msgid "Set to Draft"
-msgstr "Cambiar a borrador"
-
-#. module: stock
-#: model:ir.actions.act_window,name:stock.action_stock_journal_form
-#: model:ir.ui.menu,name:stock.menu_action_stock_journal_form
-msgid "Stock Journals"
-msgstr "Diarios de stock"
-
-#. module: stock
-#: selection:report.stock.move,type:0
-msgid "Others"
-msgstr "Otros"
-
-#. module: stock
-#: code:addons/stock/product.py:90
-#, python-format
-msgid "Could not find any difference between standard price and new price!"
-msgstr "¡No se puede encontrar ninguna diferencia entre precio estándar y precio nuevo!"
-
-#. module: stock
-#: model:ir.model,name:stock.model_stock_partial_picking
-msgid "Partial Picking"
-msgstr "Empaquetado parcial"
-
-#. module: stock
-#: model:stock.location,name:stock.stock_location_scrapped
-#: field:stock.move,scrapped:0
-msgid "Scrapped"
-msgstr "Desechado"
-
-#. module: stock
-#: view:stock.inventory:0
-msgid "Products "
-msgstr "Productos "
-
-#. module: stock
-#: field:product.product,track_incoming:0
-msgid "Track Incoming Lots"
-msgstr "Lotes de seguimiento de entrada"
-
-#. module: stock
-#: view:board.board:0
-msgid "Warehouse board"
-msgstr "Tablero almacén"
-
-#. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:104
-#: model:ir.actions.act_window,name:stock.action_inventory_form
-#: model:ir.ui.menu,name:stock.menu_action_inventory_form
-#, python-format
-msgid "Physical Inventories"
-msgstr "Inventarios físicos"
-
-#. module: stock
-#: field:product.category,property_stock_variation:0
-msgid "Stock Variation Account"
-msgstr "Cuenta variación stock"
-
-#. module: stock
-#: field:stock.move,note:0
-#: view:stock.picking:0
-#: field:stock.picking,note:0
-msgid "Notes"
-msgstr "Notas"
-
-#. module: stock
-#: report:lot.stock.overview:0
-#: report:lot.stock.overview_all:0
-msgid "Value"
-msgstr "Valor"
-
-#. module: stock
-#: field:report.stock.move,type:0
-#: field:stock.location,chained_picking_type:0
-#: field:stock.picking,type:0
-msgid "Shipping Type"
-msgstr "Tipo de envío"
-
-#. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:97
-#: model:ir.actions.act_window,name:stock.act_product_location_open
-#: model:ir.ui.menu,name:stock.menu_stock_products_menu
-#: view:stock.inventory:0
-#: view:stock.picking:0
-#, python-format
-msgid "Products"
-msgstr "Productos"
-
-#. module: stock
-#: view:stock.change.standard.price:0
-msgid "Change Price"
-msgstr "Cambiar precio"
-
-#. module: stock
-#: field:stock.picking,move_type:0
-msgid "Delivery Method"
-msgstr "Método entrega"
-
-#. module: stock
-#: help:report.stock.move,location_dest_id:0
-#: help:stock.move,location_dest_id:0
-#: help:stock.picking,location_dest_id:0
-msgid "Location where the system will stock the finished products."
-msgstr "Ubicación donde el sistema almacenará los productos finalizados."
-
-#. module: stock
-#: help:product.category,property_stock_variation:0
-msgid "When real-time inventory valuation is enabled on a product, this account will hold the current value of the products."
-msgstr "Cuando está activada una valoración de inventario en tiempo real de un producto, esta cuenta contiene el valor actual de los productos."
-
-#. module: stock
-#: model:ir.actions.act_window,help:stock.action_reception_picking_move
-msgid "Here you can receive individual products, no matter what purchase order or picking order they come from. You will find the list of all products you are waiting for. Once you receive an order, you can filter based on the name of the supplier or the purchase order reference. Then you can confirm all products received using the buttons on the right of each line."
-msgstr "Aquí podrá recibir los productos individuales, sin importar de que pedido de compra u orden de entrada provienen. Encontrará la lista de todos los productos que está esperando. Una vez recibida la orden, puede filtrar basándose en el nombre del proveedor o en la referencia del pedido de compra. Entonces, puede confirmar todos los productos recibidos usando los botones a la derecha de cada línea."
-
-#. module: stock
-#: model:ir.model,name:stock.model_stock_move
-msgid "Stock Move"
-msgstr "Movimiento de stock"
-
-#. module: stock
-#: view:report.stock.move:0
-msgid "Delay(Days)"
-msgstr "Retraso (días)"
-
-#. module: stock
-#: field:stock.move.memory.in,move_id:0
-#: field:stock.move.memory.out,move_id:0
-msgid "Move"
-msgstr "Movimiento"
-
-#. module: stock
-#: help:stock.picking,min_date:0
-msgid "Expected date for the picking to be processed"
-msgstr "Fecha prevista para procesar el empaque."
-
-#. module: stock
-#: code:addons/stock/product.py:373
-#, python-format
-msgid "P&L Qty"
-msgstr "Ctdad P&L"
-
-#. module: stock
-#: view:stock.production.lot:0
-#: field:stock.production.lot,revisions:0
-msgid "Revisions"
-msgstr "Revisiones"
-
-#. module: stock
-#: view:stock.picking:0
-msgid "This operation will cancel the shipment. Do you want to continue?"
-msgstr "Esta operación cancelará el envío. ¿Desea continuar?"
-
-#. module: stock
-#: help:product.product,valuation:0
-msgid "If real-time valuation is enabled for a product, the system will automatically write journal entries corresponding to stock moves.The inventory variation account set on the product category will represent the current inventory value, and the stock input and stock output account will hold the counterpart moves for incoming and outgoing products."
-msgstr "Si la valoración en tiempo real está habilitada para un producto, el sistema automáticamente escribirá asientos en el diario correspondientes a los movimientos de stock. La cuenta de variación de inventario especificada en la categoría del producto representará el valor de inventario actual, y la cuenta de entrada y salida de stock contendrán las contrapartidas para los productos entrantes y salientes."
-
-#. module: stock
-#: model:ir.actions.act_window,help:stock.action_stock_inventory_report
-msgid "Inventory Analysis allows you to easily check and analyse your company stock levels. Sort and group by selection criteria in order to better analyse and manage your company  activities."
-msgstr "El análisis de inventario le permite verificar y analizar fácilmente los niveles de stock de su compañia. Ordene y agrupe por criterios de selección para analizar y gestionar mejor las actividades de su empresa."
-
-#. module: stock
-#: help:report.stock.move,location_id:0
-#: help:stock.move,location_id:0
-msgid "Sets a location if you produce at a fixed location. This can be a partner location if you subcontract the manufacturing operations."
-msgstr "Indica una ubicación si se producen en una ubicación fija. Puede ser una ubicación de empresa si subcontrata las operaciones de fabricación."
-
-#. module: stock
-#: model:ir.actions.act_window,help:stock.action_location_form
-msgid "Define your locations to reflect your warehouse structure and organization. OpenERP is able to manage physical locations (warehouses, shelves, bin, etc), partner locations (customers, suppliers) and virtual locations which are the counterpart of the stock operations like the manufacturing orders consumptions, inventories, etc. Every stock operation in OpenERP moves the products from one location to another one. For instance, if you receive products from a supplier, OpenERP will move products from the Supplier location to the Stock location. Each report can be performed on physical, partner or virtual locations."
-msgstr "Defina sus ubicaciones para reflejar la estructura de su almacén y organización. OpenERP es capaz de manejar ubicaciones físicas (almacén, estante, caja, etc.), ubicaciones de empresa (clientes, proveedores) y ubicaciones virtuales que son la contrapartida de las operaciones de stock como los consumos por órdenes de la fabricación, inventarios, etc. Cada operación de stock en OpenERP mueve los productos de una ubicación a otra. Por ejemplo, si recibe productos de un proveedor, OpenERP moverá productos desde la ubicación del proveedor a la ubicación del stock. Cada informe puede ser realizado sobre ubicaciones físicas, de empresa o virtuales."
-
-#. module: stock
-#: view:stock.invoice.onshipping:0
-msgid "Create"
-msgstr "Crear"
-
-#. module: stock
-#: view:stock.move:0
-#: view:stock.picking:0
-msgid "Dates"
-msgstr "Fechas"
-
-#. module: stock
-#: field:stock.move,priority:0
-msgid "Priority"
-msgstr "Prioridad"
-
-#. module: stock
-#: view:stock.move:0
-msgid "Source"
-msgstr "Origen"
-
-#. module: stock
-#: code:addons/stock/stock.py:2586
-#: model:ir.model,name:stock.model_stock_inventory
-#: selection:report.stock.inventory,location_type:0
-#: field:stock.inventory.line,inventory_id:0
-#: report:stock.inventory.move:0
-#: selection:stock.location,usage:0
-#, python-format
-msgid "Inventory"
-msgstr "Inventario"
-
-#. module: stock
-#: model:ir.model,name:stock.model_stock_picking
-msgid "Picking List"
-msgstr "Lista de empaque"
-
-#. module: stock
-#: sql_constraint:stock.production.lot:0
-msgid "The combination of serial number and internal reference must be unique !"
-msgstr "¡La combinación de número de serie y referencia interna debe ser única!"
-
-#. module: stock
-#: model:ir.model,name:stock.model_stock_ups
-msgid "Stock ups"
-msgstr "Stock ups"
-
-#. module: stock
-#: view:stock.inventory:0
-msgid "Cancel Inventory"
-msgstr "Cancelar el inventario"
-
-#. module: stock
-#: field:stock.move.split.lines,name:0
-#: field:stock.move.split.lines.exist,name:0
-msgid "Tracking serial"
-msgstr "Seguimiento nº serie"
-
-#. module: stock
-#: code:addons/stock/report/report_stock.py:78
-#: code:addons/stock/report/report_stock.py:135
-#: code:addons/stock/stock.py:754
-#, python-format
-msgid "Error !"
-msgstr "¡Error!"
-
-#. module: stock
-#: model:ir.model,name:stock.model_stock_replacement_result
-msgid "Stock Replacement result"
-msgstr "Resultado reemplazo stock"
-
-#. module: stock
-#: model:ir.ui.menu,name:stock.menu_stock_unit_measure_stock
-#: model:ir.ui.menu,name:stock.menu_stock_uom_form_action
-msgid "Units of Measure"
-msgstr "Unidades de medida"
-
-#. module: stock
-#: selection:stock.location,chained_location_type:0
-msgid "Fixed Location"
-msgstr "Ubicaciones fijas"
-
-#. module: stock
-#: selection:report.stock.move,month:0
-msgid "July"
-msgstr "Julio"
-
-#. module: stock
-#: view:report.stock.lines.date:0
-msgid "Consumable"
-msgstr "Consumible"
-
-#. module: stock
-#: model:ir.actions.act_window,help:stock.action_stock_line_date
-msgid "Display the last inventories done on your products and easily sort them with specific filtering criteria. If you do frequent and partial inventories, you need this report in order to ensure that the stock of each product is controlled at least once a year."
-msgstr "Muestra los últimos inventarios realizados sobre sus productos y los ordena fácilmente con filtros específicos. Si realiza inventarios parciales frecuentemente, necesita este informe para asegurar que el stock de cada producto ha sido controlado al menos una vez al año."
-
-#. module: stock
-#: model:ir.actions.report.xml,name:stock.report_product_history
-msgid "Stock Level Forecast"
-msgstr "Previsión nivel de stock"
-
-#. module: stock
-#: model:ir.model,name:stock.model_stock_journal
-#: field:report.stock.move,stock_journal:0
-#: view:stock.journal:0
-#: field:stock.journal,name:0
-#: field:stock.picking,stock_journal_id:0
-msgid "Stock Journal"
-msgstr "Diario de inventario"
-
-#. module: stock
-#: selection:report.stock.inventory,location_type:0
-#: selection:stock.location,usage:0
-msgid "Procurement"
-msgstr "Abastecimiento"
-
-#. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:80
-#: code:addons/stock/wizard/stock_change_standard_price.py:106
-#, python-format
-msgid "Active ID is not set in Context"
-msgstr "No se ha establecido el ID activo en el Contexto"
-
-#. module: stock
-#: view:stock.picking:0
-msgid "Force Availability"
-msgstr "Forzar disponibilidad"
-
-#. module: stock
-#: model:ir.actions.act_window,name:stock.move_scrap
-#: view:stock.move.scrap:0
-msgid "Scrap Move"
-msgstr "Movimiento desecho"
-
-#. module: stock
-#: code:addons/stock/wizard/stock_partial_move.py:138
-#: model:ir.actions.act_window,name:stock.action_reception_picking_move
-#: model:ir.ui.menu,name:stock.menu_action_pdct_in
-#: view:stock.move:0
-#, python-format
-msgid "Receive Products"
-msgstr "Recibir productos"
-
-#. module: stock
-#: code:addons/stock/wizard/stock_partial_move.py:131
-#: model:ir.actions.act_window,name:stock.action_out_picking_move
-#: model:ir.ui.menu,name:stock.menu_action_pdct_out
-#, python-format
-msgid "Deliver Products"
-msgstr "Enviar productos"
-
-#. module: stock
-#: view:stock.location.product:0
-msgid "View Stock of Products"
-msgstr "Ver stock de productos"
-
-#. module: stock
-#: view:stock.picking:0
-msgid "Internal Picking List"
-msgstr "Lista de empaque interna"
-
-#. module: stock
-#: view:report.stock.move:0
-#: field:report.stock.move,month:0
-msgid "Month"
-msgstr "Mes"
-
-#. module: stock
-#: help:stock.picking,date_done:0
-msgid "Date of Completion"
-msgstr "Fecha de realización."
-
-#. module: stock
-#: help:stock.production.lot,name:0
-msgid "Unique production lot, will be displayed as: PREFIX/SERIAL [INT_REF]"
-msgstr "Lote de producción único, se mostrará como: PREFIJO/SERIE [REF_INT]"
-
-#. module: stock
-#: help:stock.tracking,active:0
-msgid "By unchecking the active field, you may hide a pack without deleting it."
-msgstr "Si el campo activo se desmarca, permite ocultar un paquete sin eliminarlo."
-
-#. module: stock
-#: view:stock.inventory.merge:0
-msgid "Yes"
-msgstr "Sí"
-
-#. module: stock
-#: field:stock.inventory,inventory_line_id:0
-msgid "Inventories"
-msgstr "Inventarios"
-
-#. module: stock
-#: view:report.stock.move:0
-msgid "Todo"
-msgstr "Por hacer"
-
-#. module: stock
-#: view:report.stock.inventory:0
-#: field:report.stock.inventory,company_id:0
-#: view:report.stock.move:0
-#: field:report.stock.move,company_id:0
-#: field:stock.inventory,company_id:0
-#: field:stock.inventory.line,company_id:0
-#: field:stock.location,company_id:0
-#: field:stock.move,company_id:0
-#: field:stock.picking,company_id:0
-#: field:stock.production.lot,company_id:0
-#: field:stock.production.lot.revision,company_id:0
-#: field:stock.warehouse,company_id:0
-msgid "Company"
-msgstr "Compañía"
-
-#. module: stock
-#: view:stock.move:0
-#: view:stock.picking:0
-msgid "Unit Of Measure"
-msgstr "Unidad de medida"
-
-#. module: stock
-#: code:addons/stock/product.py:122
-#, python-format
-msgid "There is no stock input account defined for this product: \"%s\" (id: %d)"
-msgstr "No se ha definido una cuenta de entrada de stock para este producto: \"%s\" (id: %d)"
-
-#. module: stock
-#: code:addons/stock/stock.py:2336
-#, python-format
-msgid "Can not consume a move with negative or zero quantity !"
-msgstr "¡No se puede consumir un movimiento con una cantidad negativa o cero!"
-
-#. module: stock
-#: field:stock.location,stock_real:0
-msgid "Real Stock"
-msgstr "Stock real"
-
-#. module: stock
-#: view:stock.fill.inventory:0
-msgid "Fill Inventory"
-msgstr "Rellenar inventario"
-
-#. module: stock
-#: constraint:product.template:0
-msgid "Error: The default UOM and the purchase UOM must be in the same category."
-msgstr "Error: La UdM por defecto y la UdM de compra deben estar en la misma categoría."
-
-#. module: stock
-#: help:product.category,property_stock_account_input_categ:0
-msgid "When doing real-time inventory valuation, counterpart Journal Items for all incoming stock moves will be posted in this account. This is the default value for all products in this category, it can also directly be set on each product."
-msgstr "Al hacer la valoración de inventario en tiempo real, la contrapartida de los asientos del diario para todos los movimientos de stock de entrada se creará en esta cuenta. Este es el valor por defecto para todos los productos de esta categoría, también puede indicarse directamente en cada producto."
-
-#. module: stock
-#: field:stock.production.lot.revision,date:0
-msgid "Revision Date"
-msgstr "Fecha de revisión"
-
-#. module: stock
-#: view:report.stock.inventory:0
-#: field:report.stock.inventory,prodlot_id:0
-#: view:stock.move:0
-#: field:stock.move.split.lines,lot_id:0
-#: field:stock.move.split.lines.exist,lot_id:0
-#: report:stock.picking.list:0
-msgid "Lot"
-msgstr "Lote"
-
-#. module: stock
-#: view:stock.move.split:0
-msgid "Production Lot Number"
-msgstr "Número lote de producción"
-
-#. module: stock
-#: field:stock.move,product_uos_qty:0
-msgid "Quantity (UOS)"
-msgstr "Cantidad (UdV)"
-
-#. module: stock
-#: code:addons/stock/stock.py:1664
-#, python-format
-msgid "You are moving %.2f %s products but only %.2f %s available in this lot."
-msgstr "Está moviendo %.2f %s productos pero sólo %.2f %s están disponibles en este lote."
-
-#. module: stock
-#: view:stock.move:0
-msgid "Set Available"
-msgstr "Reservar"
-
-#. module: stock
-#: report:stock.picking.list:0
-msgid "Contact Address :"
-msgstr "Dirección de contacto :"
-
-#. module: stock
-#: field:stock.move,backorder_id:0
-msgid "Back Order"
-msgstr "Orden pendiente"
-
-#. module: stock
-#: field:stock.incoterms,active:0
-#: field:stock.location,active:0
-#: field:stock.tracking,active:0
-msgid "Active"
-msgstr "Activo"
-
-#. module: stock
-#: model:ir.module.module,shortdesc:stock.module_meta_information
-msgid "Inventory Management"
-msgstr "Almacenes y logística"
-
-#. module: stock
-#: view:product.template:0
-msgid "Properties"
-msgstr "Propiedades"
-
-#. module: stock
-#: code:addons/stock/stock.py:974
-#, python-format
-msgid "Error, no partner !"
-msgstr "¡Error, sin empresa!"
-
-#. module: stock
-#: model:ir.actions.act_window,name:stock.action_incoterms_tree
-#: model:ir.model,name:stock.model_stock_incoterms
-#: model:ir.ui.menu,name:stock.menu_action_incoterm_open
-#: view:stock.incoterms:0
-msgid "Incoterms"
-msgstr "Incoterms"
-
-#. module: stock
-#: report:lot.stock.overview:0
-#: report:lot.stock.overview_all:0
-#: report:stock.inventory.move:0
-msgid "Total:"
-msgstr "Total:"
-
-#. module: stock
-#: help:stock.incoterms,name:0
-msgid "Incoterms are series of sales terms.They are used to divide transaction costs and responsibilities between buyer and seller and reflect state-of-the-art transportation practices."
-msgstr "Los Incoterms son una serie de términos de ventas. Se utilizan para dividir los costes de transacción y las responsabilidades entre el comprador y el vendedor, y reflejan las prácticas de transporte más recientes."
-
-#. module: stock
-#: help:stock.fill.inventory,recursive:0
-msgid "If checked, products contained in child locations of selected location will be included as well."
-msgstr "Si se marca, los productos que figuran en las ubicaciones hijas de la ubicación seleccionada se incluirán también."
-
-#. module: stock
-#: field:stock.move.track,tracking_prefix:0
-msgid "Tracking prefix"
-msgstr "Prefijo seguimiento"
-
-#. module: stock
-#: field:stock.inventory,name:0
-msgid "Inventory Reference"
-msgstr "Referencia inventario"
-
-#. module: stock
-#: code:addons/stock/stock.py:1304
-#, python-format
-msgid "Internal picking"
-msgstr "Empaque interno"
-
-#. module: stock
-#: view:stock.location.product:0
-msgid "Open Product"
-msgstr "Abrir producto"
-
-#. module: stock
-#: field:stock.location.product,to_date:0
-msgid "To"
-msgstr "Hasta"
-
-#. module: stock
-#: view:stock.move:0
-#: view:stock.picking:0
-msgid "Process"
-msgstr "Procesar"
-
-#. module: stock
-#: field:stock.production.lot.revision,name:0
-msgid "Revision Name"
-msgstr "Nombre de revisión"
-
-#. module: stock
-#: model:ir.model,name:stock.model_stock_warehouse
-#: model:ir.ui.menu,name:stock.menu_stock_root
-#: view:stock.warehouse:0
-msgid "Warehouse"
-msgstr "Almacén"
-
-#. module: stock
-#: view:stock.location.product:0
-msgid "(Keep empty to open the current situation. Adjust HH:MM:SS to 00:00:00 to filter all resources of the day for the 'From' date and 23:59:59 for the 'To' date)"
-msgstr "(Déjelo vacío para abrir la situación actual. Ponga HH:MM:SS a 00:00:00 para filtrar todos los recursos del día en el campo fecha 'Desde' y 23:59:59 en el campo fecha 'Hasta'.)"
-
-#. module: stock
-#: view:product.category:0
-msgid "Accounting Stock Properties"
-msgstr "Propiedades contables del stock"
-
-#. module: stock
-#: model:ir.actions.act_window,name:stock.action_picking_tree_out
-msgid "Customers Packings"
-msgstr "Paquetes cliente"
-
-#. module: stock
-#: selection:report.stock.inventory,state:0
-#: view:report.stock.move:0
-#: selection:report.stock.move,state:0
-#: selection:stock.inventory,state:0
-#: view:stock.move:0
-#: selection:stock.move,state:0
-#: view:stock.picking:0
-#: selection:stock.picking,state:0
-msgid "Done"
-msgstr "Realizado"
-
-#. module: stock
-#: model:ir.actions.act_window,name:stock.action_view_change_standard_price
-#: model:ir.model,name:stock.model_stock_change_standard_price
-#: view:stock.change.standard.price:0
-msgid "Change Standard Price"
-msgstr "Cambiar precio estándar"
-
-#. module: stock
-#: model:stock.location,name:stock.stock_location_locations_virtual
-msgid "Virtual Locations"
-msgstr "Ubicaciones virtuales"
-
-#. module: stock
-#: selection:stock.picking,invoice_state:0
-msgid "To Be Invoiced"
-msgstr "Para facturar"
-
-#. module: stock
-#: field:stock.inventory,date_done:0
-msgid "Date done"
-msgstr "Fecha realización"
-
-#. module: stock
-#: code:addons/stock/stock.py:975
-#, python-format
-msgid "Please put a partner on the picking list if you want to generate invoice."
-msgstr "Por favor indique una empresa en la orden si desea generar factura."
-
-#. module: stock
-#: selection:stock.move,priority:0
-msgid "Not urgent"
-msgstr "No urgente"
-
-#. module: stock
-#: view:stock.move:0
-msgid "To Do"
-msgstr "Para hacer"
-
-#. module: stock
-#: model:ir.actions.act_window,name:stock.action_warehouse_form
-#: model:ir.ui.menu,name:stock.menu_action_warehouse_form
-msgid "Warehouses"
-msgstr "Almacenes"
-
-#. module: stock
-#: field:stock.journal,user_id:0
-msgid "Responsible"
-msgstr "Responsable"
-
-#. module: stock
-#: model:ir.actions.act_window,name:stock.action_stock_inventory_report
-#: model:ir.ui.menu,name:stock.menu_action_stock_inventory_report
-#: view:report.stock.inventory:0
-msgid "Inventory Analysis"
-msgstr "Análisis inventario"
-
-#. module: stock
-#: field:stock.invoice.onshipping,journal_id:0
-msgid "Destination Journal"
-msgstr "Diario de destino"
-
-#. module: stock
-#: model:ir.actions.act_window,name:stock.act_stock_tracking_lot_2_stock_report_tracklots
-#: model:stock.location,name:stock.stock_location_stock
-msgid "Stock"
-msgstr "Stock"
-
-#. module: stock
-#: model:ir.model,name:stock.model_product_product
-#: model:ir.ui.menu,name:stock.menu_product_in_config_stock
-#: model:ir.ui.menu,name:stock.menu_stock_product
-#: view:report.stock.inventory:0
-#: field:report.stock.inventory,product_id:0
-#: field:report.stock.lines.date,product_id:0
-#: view:report.stock.move:0
-#: field:report.stock.move,product_id:0
-#: field:stock.change.product.qty,product_id:0
-#: field:stock.inventory.line,product_id:0
-#: field:stock.inventory.line.split,product_id:0
-#: report:stock.inventory.move:0
-#: view:stock.move:0
-#: field:stock.move,product_id:0
-#: field:stock.move.consume,product_id:0
-#: field:stock.move.memory.in,product_id:0
-#: field:stock.move.memory.out,product_id:0
-#: field:stock.move.scrap,product_id:0
-#: field:stock.move.split,product_id:0
-#: view:stock.production.lot:0
-#: field:stock.production.lot,product_id:0
-#: field:stock.report.prodlots,product_id:0
-#: field:stock.report.tracklots,product_id:0
-msgid "Product"
-msgstr "Producto"
-
-#. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:126
-#, python-format
-msgid "Invoicing"
-msgstr "Facturación"
-
-#. module: stock
-#: code:addons/stock/stock.py:2271
-#: code:addons/stock/stock.py:2331
-#, python-format
-msgid "Please provide Proper Quantity !"
-msgstr "¡Indique cantidad correcta!"
-
-#. module: stock
-#: field:stock.move,product_uos:0
-msgid "Product UOS"
-msgstr "UdV del producto"
-
-#. module: stock
-#: field:stock.location,posz:0
-msgid "Height (Z)"
-msgstr "Altura (Z)"
-
-#. module: stock
-#: field:stock.ups,weight:0
-msgid "Lot weight"
-msgstr "Peso lote"
-
-#. module: stock
-#: model:ir.model,name:stock.model_stock_move_consume
-#: view:stock.move.consume:0
-msgid "Consume Products"
-msgstr "Consumir productos"
-
-#. module: stock
-#: code:addons/stock/stock.py:1663
-#, python-format
-msgid "Insufficient Stock in Lot !"
-msgstr "¡Stock insuficiente en el lote!"
-
-#. module: stock
-#: field:stock.location,parent_right:0
-msgid "Right Parent"
-msgstr "Padre derecho"
-
-#. module: stock
-#: field:stock.picking,address_id:0
-msgid "Address"
-msgstr "Dirección"
-
-#. module: stock
-#: report:lot.stock.overview:0
-#: report:lot.stock.overview_all:0
-msgid "Variants"
-msgstr "Variantes"
-
-#. module: stock
-#: field:stock.location,posx:0
-msgid "Corridor (X)"
-msgstr "Pasillo (X)"
-
-#. module: stock
-#: field:report.stock.inventory,value:0
-#: field:report.stock.move,value:0
-msgid "Total Value"
-msgstr "Valor total"
-
-#. module: stock
-#: model:ir.ui.menu,name:stock.menu_product_by_category_stock_form
-msgid "Products by Category"
-msgstr "Productos por categoría"
-
-#. module: stock
-#: model:ir.ui.menu,name:stock.menu_product_category_config_stock
-msgid "Products Categories"
-msgstr "Categorías de productos"
-
-#. module: stock
-#: field:stock.move.memory.in,wizard_id:0
-#: field:stock.move.memory.out,wizard_id:0
-msgid "Wizard"
-msgstr "Asistente"
-
-#. module: stock
-#: model:ir.actions.act_window,name:stock.action_view_stock_location_product
-#: model:ir.model,name:stock.model_stock_location_product
-msgid "Products by Location"
-msgstr "Productos por ubicación"
-
-#. module: stock
-#: field:stock.fill.inventory,recursive:0
-msgid "Include children"
-msgstr "Incluir hijos"
-
-#. module: stock
-#: model:ir.actions.act_window,help:stock.action_picking_tree6
-msgid "Internal Moves display all inventory operations you have to perform in your warehouse. All operations can be categorized into stock journals, so that each worker has his own list of operations to perform in his own journal. Most operations are prepared automatically by OpenERP according to your preconfigured logistics rules, but you can also record manual stock operations."
-msgstr "Los movimientos internos muestran todas las operaciones de inventario que se deben realizar en su almacén. Todas las operaciones pueden ser clasificadas en diarios de stock, para que cada trabajador tenga su propia lista de operaciones a realizar en su propio diario. La mayor parte de operaciones son preparadas automáticamente por OpenERP según sus reglas de logística preconfiguradas, pero también puede registrar operaciones de stock de forma manual."
-
-#. module: stock
-#: view:stock.move:0
-msgid "Order"
-msgstr "Orden"
-
-#. module: stock
-#: field:stock.tracking,name:0
-msgid "Pack Reference"
-msgstr "Referencia de paquete"
-
-#. module: stock
-#: view:report.stock.move:0
-#: field:report.stock.move,location_id:0
-#: field:stock.move,location_id:0
-msgid "Source Location"
-msgstr "Ubicación de origen"
-
-#. module: stock
-#: view:product.template:0
-msgid "Accounting Entries"
-msgstr "Asientos contables"
-
-#. module: stock
-#: report:stock.picking.list:0
-msgid "Total"
-msgstr "Total"
-
-#. module: stock
-#: field:stock.change.standard.price,enable_stock_in_out_acc:0
-msgid "Enable Related Account"
-msgstr "Activa cuenta relacionada"
-
-#. module: stock
-#: field:stock.location,stock_virtual_value:0
-msgid "Virtual Stock Value"
-msgstr "Valor stock virtual"
-
-#. module: stock
-#: view:product.product:0
-#: view:stock.inventory.line.split:0
-#: view:stock.move.split:0
-msgid "Lots"
-msgstr "Lotes"
-
-#. module: stock
-#: view:stock.move:0
-#: view:stock.picking:0
-msgid "New Pack"
-msgstr "Nuevo paquete"
-
-#. module: stock
-#: view:stock.move:0
-msgid "Destination"
-msgstr "Destino"
-
-#. module: stock
-#: selection:stock.picking,move_type:0
-msgid "All at once"
-msgstr "Todo junto"
-
-#. module: stock
-#: code:addons/stock/stock.py:1620
-#, python-format
-msgid "Quantities, UoMs, Products and Locations cannot be modified on stock moves that have already been processed (except by the Administrator)"
-msgstr "Las cantidades, UdM, productos y ubicaciones no se pueden modificar en los movimientos de stock que ya han sido procesados (excepto por el administrador)"
-
-#. module: stock
-#: code:addons/stock/product.py:383
-#, python-format
-msgid "Future Productions"
-msgstr "Producciones futuras"
-
-#. module: stock
-#: view:stock.picking:0
-msgid "To Invoice"
-msgstr "Para facturar"
-
-#. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:115
-#, python-format
-msgid "Return lines"
-msgstr "Líneas de devolución"
-
-#. module: stock
-#: model:ir.model,name:stock.model_report_stock_lines_date
-#: view:report.stock.lines.date:0
-msgid "Dates of Inventories"
-msgstr "Fechas de inventarios"
-
-#. module: stock
-#: view:report.stock.move:0
-msgid "Total incoming quantity"
-msgstr "Cantidad de entrada total"
-
-#. module: stock
-#: field:report.stock.move,product_qty_out:0
-msgid "Out Qty"
-msgstr "Ctdad salida"
-
-#. module: stock
-#: field:stock.production.lot,move_ids:0
-msgid "Moves for this production lot"
-msgstr "Movimientos para este lote de producción"
-
-#. module: stock
-#: code:addons/stock/wizard/stock_fill_inventory.py:115
-#, python-format
-msgid "Message !"
-msgstr "¡ Mensaje !"
-
-#. module: stock
-#: view:stock.move:0
-#: view:stock.picking:0
-msgid "Put in current pack"
-msgstr "Poner en el paquete actual"
-
-#. module: stock
-#: view:stock.inventory:0
-msgid "Lot Inventory"
-msgstr "Regularización de inventario"
-
-#. module: stock
-#: view:stock.move:0
-msgid "Reason"
-msgstr "Motivo"
-
-#. module: stock
-#: report:stock.picking.list:0
-msgid "Delivery Order:"
-msgstr "Orden de salida:"
-
-#. module: stock
-#: model:ir.actions.act_window,help:stock.action_production_lot_form
-msgid "This is the list of all the production lots (serial numbers) you recorded. When you select a lot, you can get the upstream or downstream traceability of the products contained in lot. By default, the list is filtred on the serial numbers that are available in your warehouse but you can uncheck the 'Available' button to get all the lots you produced, received or delivered to customers."
-msgstr "Esta es la lista de todos los lotes de producción (números de serie) que registró. Cuando selecciona un lote, puede obtener la trazabilidad hacia arriba o hacia abajo de los productos que componen el lote. Por defecto, la lista es filtrada según los números de serie disponibles en su almacén, pero puede desmarcar el botón 'Disponible' para obtener todos los lotes que produjo, recibió o entregó a sus clientes."
-
-#. module: stock
-#: field:stock.location,icon:0
-msgid "Icon"
-msgstr "Icono"
-
-#. module: stock
-#: code:addons/stock/stock.py:2206
-#: code:addons/stock/stock.py:2614
-#, python-format
-msgid "UserError"
-msgstr "Error de usuario"
-
-#. module: stock
-#: view:stock.inventory.line.split:0
-#: view:stock.move.consume:0
-#: view:stock.move.scrap:0
-#: view:stock.move.split:0
-#: view:stock.move.track:0
-#: view:stock.split.into:0
-msgid "Ok"
-msgstr "Aceptar"
-
-#. module: stock
-#: code:addons/stock/product.py:76
-#: code:addons/stock/product.py:90
-#: code:addons/stock/product.py:93
-#: code:addons/stock/product.py:100
-#: code:addons/stock/product.py:121
-#: code:addons/stock/product.py:147
-#: code:addons/stock/stock.py:2006
-#: code:addons/stock/stock.py:2009
-#: code:addons/stock/stock.py:2012
-#: code:addons/stock/stock.py:2015
-#: code:addons/stock/stock.py:2018
-#: code:addons/stock/stock.py:2021
-#: code:addons/stock/stock.py:2336
-#: code:addons/stock/wizard/stock_fill_inventory.py:48
-#: code:addons/stock/wizard/stock_splitinto.py:49
-#: code:addons/stock/wizard/stock_splitinto.py:53
-#, python-format
-msgid "Error!"
-msgstr "¡Error!"
-
-#. module: stock
-#: code:addons/stock/stock.py:2021
-#, python-format
-msgid "There is no inventory variation account defined on the product category: \"%s\" (id: %d)"
-msgstr "No se ha definido una cuenta de variación de inventario en la categoría del producto: \"%s\" (id: %d)"
-
-#. module: stock
-#: view:stock.inventory.merge:0
-msgid "Do you want to merge theses inventories?"
-msgstr "¿Desea fusionar estos inventarios?"
-
-#. module: stock
-#: selection:report.stock.inventory,state:0
-#: selection:report.stock.move,state:0
-#: selection:stock.inventory,state:0
-#: selection:stock.move,state:0
-#: selection:stock.picking,state:0
-msgid "Cancelled"
-msgstr "Cancelado"
-
-#. module: stock
-#: field:stock.location,chained_location_type:0
-msgid "Chained Location Type"
-msgstr "Tipo ubicaciones encadenadas"
-
-#. module: stock
-#: help:stock.picking,move_type:0
-msgid "It specifies goods to be delivered all at once or by direct delivery"
-msgstr "Indica si las mercancías se enviarán todas a la vez o directamente."
-
-#. module: stock
-#: code:addons/stock/wizard/stock_invoice_onshipping.py:85
-#, python-format
-msgid "This picking list does not require invoicing."
-msgstr "Esta orden no requiere facturación."
-
-#. module: stock
-#: selection:report.stock.move,type:0
-#: selection:stock.location,chained_picking_type:0
-#: selection:stock.picking,type:0
-msgid "Getting Goods"
-msgstr "Recepción mercancías"
-
-#. module: stock
-#: help:stock.location,chained_location_type:0
-msgid "Determines whether this location is chained to another location, i.e. any incoming product in this location \n"
-"should next go to the chained location. The chained location is determined according to the type :\n"
-"* None: No chaining at all\n"
-"* Customer: The chained location will be taken from the Customer Location field on the Partner form of the Partner that is specified in the Picking list of the incoming products.\n"
-"* Fixed Location: The chained location is taken from the next field: Chained Location if Fixed."
-msgstr "Determina si esta ubicación está encadenada a otra, por ejemplo cualquier producto que entre en esta ubicación debe ir a la siguiente ubicación encadenada. La ubicación encadenada se determina en función del tipo: \n"
-"*Ninguna: No se encadena con ninguna.\n"
-"*Cliente: Se utiliza la ubicación encadenada definida en el campo Ubicación del cliente del formulario del cliente especificado en la orden de los productos entrantes.\n"
-"*Ubicación fija: Se utiliza la ubicación encadenada del siguiente campo: Ubicación encadenada si fija."
-
-#. module: stock
-#: code:addons/stock/wizard/stock_inventory_merge.py:43
-#: code:addons/stock/wizard/stock_inventory_merge.py:63
-#, python-format
-msgid "Warning"
-msgstr "Advertencia"
-
-#. module: stock
-#: code:addons/stock/stock.py:1318
-#: code:addons/stock/stock.py:2586
-#, python-format
-msgid "is done."
-msgstr "está realizado."
-
-#. module: stock
-#: model:ir.actions.act_window,name:stock.action_picking_tree
-#: model:ir.ui.menu,name:stock.menu_action_picking_tree
-#: view:stock.picking:0
-msgid "Delivery Orders"
-msgstr "Ordenes de salida"
-
-#. module: stock
-#: help:res.partner,property_stock_customer:0
-msgid "This stock location will be used, instead of the default one, as the destination location for goods you send to this partner"
-msgstr "Esta ubicación de stock será utilizada, en lugar de la ubicación por defecto, como la ubicación de destino para enviar mercancías a esta empresa"
-
-#. module: stock
-#: selection:report.stock.inventory,state:0
-#: selection:report.stock.move,state:0
-#: selection:stock.inventory,state:0
-#: view:stock.picking:0
-#: selection:stock.picking,state:0
-msgid "Confirmed"
-msgstr "Confirmado"
-
-#. module: stock
-#: view:stock.picking:0
-msgid "Confirm"
-msgstr "Confirmar"
-
-#. module: stock
-#: help:stock.location,icon:0
-msgid "Icon show in  hierarchical tree view"
-msgstr "Icono mostrado en la vista de árbol jerárquica."
-
-#. module: stock
-#: model:ir.actions.act_window,name:stock.action_view_stock_merge_inventories
-#: view:stock.inventory.merge:0
-msgid "Merge Inventories"
-msgstr "Fusionar inventarios"
-
-#. module: stock
-#: help:stock.change.product.qty,new_quantity:0
-msgid "This quantity is expressed in the Default UoM of the product."
-msgstr "Esta cantidad está expresada en la UdM por defecto del producto."
-
-#. module: stock
-#: report:stock.picking.list:0
-msgid "Reception:"
-msgstr "Recepción:"
-
-#. module: stock
-#: help:stock.location,scrap_location:0
-msgid "Check this box to allow using this location to put scrapped/damaged goods."
-msgstr "Marque esta opción para permitir utilizar esta ubicación para poner mercancías desechadas/defectuosas."
-
-#. module: stock
-#: model:ir.actions.act_window,name:stock.act_relate_picking
-msgid "Related Picking"
-msgstr "Empaques relacionados"
-
-#. module: stock
-#: view:report.stock.move:0
-msgid "Total outgoing quantity"
-msgstr "Cantidad de salida total"
-
-#. module: stock
-#: field:stock.picking,backorder_id:0
-msgid "Back Order of"
-msgstr "Orden pendiente de"
-
-#. module: stock
-#: help:stock.move.memory.in,cost:0
-#: help:stock.move.memory.out,cost:0
-msgid "Unit Cost for this product line"
-msgstr "Coste unidad para esta línea de producto"
-
-#. module: stock
-#: model:ir.model,name:stock.model_product_category
-#: view:report.stock.inventory:0
-#: field:report.stock.inventory,product_categ_id:0
-#: view:report.stock.move:0
-#: field:report.stock.move,categ_id:0
-msgid "Product Category"
-msgstr "Categoría de producto"
-
-#. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:88
-#, python-format
-msgid "INV: "
-msgstr "INV: "
-
-#. module: stock
-#: model:ir.ui.menu,name:stock.next_id_61
-msgid "Reporting"
-msgstr "Informes"
-
-#. module: stock
-#: code:addons/stock/stock.py:1313
-#, python-format
-msgid " for the "
-msgstr " para el "
-
-#. module: stock
-#: view:stock.split.into:0
-msgid "Quantity to Leave in the Current Pack"
-msgstr "Cantidad a dejar en el paquete actual"
-
-#. module: stock
-#: model:ir.actions.act_window,name:stock.action_stock_invoice_onshipping
-#: view:stock.invoice.onshipping:0
-msgid "Create invoice"
-msgstr "Crear factura"
-
-#. module: stock
-#: model:ir.ui.menu,name:stock.menu_stock_configuration
-msgid "Configuration"
-msgstr "Configuración"
-
-#. module: stock
-#: field:stock.inventory.line.split,use_exist:0
-#: field:stock.move.split,use_exist:0
-msgid "Existing Lots"
-msgstr "Lotes existentes"
-
-#. module: stock
-#: field:product.product,location_id:0
-#: view:stock.location:0
-msgid "Stock Location"
-msgstr "Ubicación de stock"
-
-#. module: stock
-#: help:stock.change.standard.price,new_price:0
-msgid "If cost price is increased, stock variation account will be debited and stock output account will be credited with the value = (difference of amount * quantity available).\n"
-"If cost price is decreased, stock variation account will be creadited and stock input account will be debited."
-msgstr "Si el precio de coste se incrementa, la cuenta la variación de existencias irá al debe y la cuenta de salida de stock irá al haber con el valor = (diferencia de cantidad * cantidad disponible).\n"
-"Si el precio de coste se reduce, la cuenta la variación de existencias irá al haber y la cuenta de entrada de stock irá al debe."
-
-#. module: stock
-#: field:stock.location,chained_journal_id:0
-msgid "Chaining Journal"
-msgstr "Diario encadenamiento"
-
-#. module: stock
-#: code:addons/stock/stock.py:732
-#, python-format
-msgid "Not enough stock, unable to reserve the products."
-msgstr "No suficiente stock, no ha sido posible reservar los productos."
-
-#. module: stock
-#: model:stock.location,name:stock.stock_location_customers
-msgid "Customers"
-msgstr "Clientes"
-
-#. module: stock
-#: code:addons/stock/stock.py:1317
-#, python-format
-msgid "is cancelled."
-msgstr "está cancelado."
-
-#. module: stock
-#: view:stock.inventory.line:0
-msgid "Stock Inventory Lines"
-msgstr "Líneas regularización de inventario"
-
-#. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:97
-#, python-format
-msgid "Process Document"
-msgstr "Procesar documento"
-
-#. module: stock
-#: code:addons/stock/product.py:365
-#, python-format
-msgid "Future Deliveries"
-msgstr "Entregas futuras"
-
-#. module: stock
-#: view:stock.picking:0
-msgid "Additional info"
-msgstr "Información adicional"
-
-#. module: stock
-#: view:stock.move:0
-#: field:stock.move,tracking_id:0
-msgid "Pack"
-msgstr "Paquete"
-
-#. module: stock
-#: view:stock.move:0
-#: view:stock.picking:0
-msgid "Date Expected"
-msgstr "Fecha prevista"
-
-#. module: stock
-#: model:ir.actions.act_window,help:stock.action_picking_tree4
-msgid "The Incoming Shipments is the list of all orders you will receive from your supplier. An incoming shipment contains a list of products to be received according to the original purchase order. You can validate the shipment totally or partially."
-msgstr "Las ordenes de entrada son la lista de todos los pedidos que va a recibir de su proveedor. Una orden de entrada contiene la lista de productos a recibir en función del pedido de compra original. Puede validar el envío totalmente o parcialmente."
-
-#. module: stock
-#: field:stock.move,auto_validate:0
-msgid "Auto Validate"
-msgstr "Auto validar"
-
-#. module: stock
-#: report:stock.picking.list:0
-msgid "Weight"
-msgstr "Peso"
-
-#. module: stock
-#: model:ir.model,name:stock.model_product_template
-msgid "Product Template"
-msgstr "Plantilla de producto"
-
-#. module: stock
-#: selection:report.stock.move,month:0
-msgid "December"
-msgstr "Diciembre"
-
-#. module: stock
-#: selection:stock.location,chained_auto_packing:0
-msgid "Automatic Move"
-msgstr "Movimiento automático"
-
-#. module: stock
-#: model:ir.actions.act_window,help:stock.action_move_form2
-msgid "This menu gives you the full traceability of inventory operations on a specific product. You can filter on the product to see all the past or future movements for the product."
-msgstr "Este menú le da la trazabilidad completa de las operaciones de inventario sobre un producto específico. Puede filtrar sobre el producto para ver todos los movimientos pasados o futuros para el producto."
-
-#. module: stock
-#: view:stock.picking:0
-msgid "Return Products"
-msgstr "Devolver productos"
-
-#. module: stock
-#: view:stock.inventory:0
-msgid "Validate Inventory"
-msgstr "Validar inventario"
-
-#. module: stock
-#: help:stock.move,price_currency_id:0
-msgid "Technical field used to record the currency chosen by the user during a picking confirmation (when average price costing method is used)"
-msgstr "Campo técnico utilizado para registrar la moneda elegida por el usuario durante una confirmación de orden (cuando se utiliza el método de precio medio de coste)."
-
-#. module: stock
-#: model:ir.ui.menu,name:stock.menu_stock_products_moves
-msgid "Products Moves"
-msgstr "Movimientos de productos"
-
-#. module: stock
-#: selection:stock.picking,invoice_state:0
-msgid "Invoiced"
-msgstr "Facturado"
-
-#. module: stock
-#: field:stock.move,address_id:0
-msgid "Destination Address"
-msgstr "Dirección destino"
-
-#. module: stock
-#: field:stock.picking,max_date:0
-msgid "Max. Expected Date"
-msgstr "Fecha prevista máx."
-
-#. module: stock
-#: field:stock.picking,auto_picking:0
-msgid "Auto-Picking"
-msgstr "Auto-Orden"
-
-#. module: stock
-#: field:stock.location,chained_auto_packing:0
-msgid "Chaining Type"
-msgstr "Tipo encadenado"
-
-#. module: stock
-#: view:report.stock.inventory:0
-#: view:report.stock.move:0
-#: selection:report.stock.move,type:0
-#: view:stock.location:0
-#: selection:stock.location,chained_picking_type:0
-#: selection:stock.picking,type:0
-msgid "Internal"
-msgstr "Interno"
-
-#. module: stock
-#: selection:report.stock.inventory,state:0
-#: selection:report.stock.move,state:0
-#: selection:stock.inventory,state:0
-#: selection:stock.move,state:0
-#: selection:stock.picking,state:0
-msgid "Draft"
-msgstr "Borrador"
-
-#. module: stock
-#: model:ir.actions.report.xml,name:stock.report_stock_inventory_move
-#: report:stock.inventory.move:0
-msgid "Stock Inventory"
-msgstr "Inventario stock"
-
-#. module: stock
-#: help:report.stock.inventory,state:0
-msgid "When the stock move is created it is in the 'Draft' state.\n"
-" After that it is set to 'Confirmed' state.\n"
-" If stock is available state is set to 'Avaiable'.\n"
-" When the picking it done the state is 'Done'.              \n"
-"The state is 'Waiting' if the move is waiting for another one."
-msgstr "Cuando se crea un movimiento de stock está en estado 'Borrador'.\n"
-" Después se establece en estado 'Confirmado'.\n"
-" Si está reservado en stock se establece como 'Reservado'.\n"
-" Cuando la orden se envía el estado es 'Realizado'.              \n"
-"El estado es 'En espera' si el movimiento está a la espera de otro."
-
-#. module: stock
-#: view:board.board:0
-msgid "Outgoing Products Delay"
-msgstr "Retraso ordenes salida"
-
-#. module: stock
-#: field:stock.move.split.lines,use_exist:0
-msgid "Existing Lot"
-msgstr "Lote existente"
-
-#. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:194
-#, python-format
-msgid "Please specify at least one non-zero quantity!"
-msgstr "¡Introduzca por lo menos una cantidad que no sea cero!"
-
-#. module: stock
-#: help:product.template,property_stock_procurement:0
-msgid "For the current product, this stock location will be used, instead of the default one, as the source location for stock moves generated by procurements"
-msgstr "Para los productos actuales, esta ubicación de stock se utilizará, en lugar de la por defecto, como la ubicación de origen para los movimientos de stock generados por los abastecimientos."
-
-#. module: stock
-#: code:addons/stock/stock.py:1316
-#, python-format
-msgid "is ready to process."
-msgstr "preparado para procesar."
-
-#. module: stock
-#: help:stock.picking,origin:0
-msgid "Reference of the document that produced this picking."
-msgstr "Referencia del documento que ha generado esta orden."
-
-#. module: stock
-#: field:stock.fill.inventory,set_stock_zero:0
-msgid "Set to zero"
-msgstr "Inicializar a cero"
-
-#. module: stock
-#: code:addons/stock/wizard/stock_invoice_onshipping.py:87
-#, python-format
-msgid "None of these picking lists require invoicing."
-msgstr "Ninguno de estas ordenes requiere facturación."
-
-#. module: stock
-#: selection:report.stock.move,month:0
-msgid "November"
-msgstr "Noviembre"
-
-#. module: stock
-#: code:addons/stock/product.py:101
-#: code:addons/stock/stock.py:2018
-#, python-format
-msgid "There is no journal defined on the product category: \"%s\" (id: %d)"
-msgstr "No se ha definido un diario en la categoría de producto: \"%s\" (id: %d)"
-
-#. module: stock
-#: code:addons/stock/product.py:379
-#, python-format
-msgid "Unplanned Qty"
-msgstr "Ctdad no planificada"
-
-#. module: stock
-#: code:addons/stock/stock.py:1315
-#, python-format
-msgid "is scheduled"
-msgstr "está planificado"
-
-#. module: stock
-#: field:stock.location,chained_company_id:0
-msgid "Chained Company"
-msgstr "Compañía encadenada"
-
-#. module: stock
-#: view:stock.picking:0
-msgid "Check Availability"
-msgstr "Comprobar disponibilidad"
-
-#. module: stock
-#: selection:report.stock.move,month:0
-msgid "January"
-msgstr "Enero"
-
-#. module: stock
-#: help:product.product,track_incoming:0
-msgid "Forces to specify a Production Lot for all moves containing this product and coming from a Supplier Location"
-msgstr "Fuerza a introducir un lote de producción para todos los movimientos que contiene este producto y procedente de una ubicación de proveedores."
-
-#. module: stock
-#: model:ir.actions.act_window,name:stock.act_product_stock_move_futur_open
-msgid "Future Stock Moves"
-msgstr "Movimientos de stock futuros"
-
-#. module: stock
-#: field:stock.move,move_history_ids2:0
-msgid "Move History (parent moves)"
-msgstr "Historial movimientos (mov. padres)"
-
-#. module: stock
-#: code:addons/stock/product.py:361
-#, python-format
-msgid "Future Stock"
-msgstr "Stock futuro"
-
-#. module: stock
-#: code:addons/stock/stock.py:512
-#: code:addons/stock/stock.py:1120
-#: code:addons/stock/stock.py:1128
-#: code:addons/stock/wizard/stock_invoice_onshipping.py:101
-#, python-format
-msgid "Error"
-msgstr "Error"
-
-#. module: stock
-#: field:stock.ups.final,xmlfile:0
-msgid "XML File"
-msgstr "Fichero XML"
-
-#. module: stock
-#: view:stock.change.product.qty:0
-msgid "Select Quantity"
-msgstr "Seleccionar cantidad"
-
-#. module: stock
-#: model:ir.actions.act_window,help:stock.action_location_tree
-msgid "This is the structure of your company's warehouses and locations. You can click on a location to get the list of the products and their stock level in this particular location and all its children."
-msgstr "Esta es la estructura de los almacenes y ubicaciones de su compañía. Puede pulsar sobre una ubicación para obtener la lista de los productos y su nivel de stock en esta ubicación específica y todos sus hijas."
-
-#. module: stock
-#: model:res.request.link,name:stock.req_link_tracking
-#: field:stock.change.product.qty,prodlot_id:0
-#: field:stock.inventory.line,prod_lot_id:0
-#: report:stock.inventory.move:0
-#: field:stock.move,prodlot_id:0
-#: field:stock.move.memory.in,prodlot_id:0
-#: field:stock.move.memory.out,prodlot_id:0
-#: field:stock.move.split.lines.exist,prodlot_id:0
-#: view:stock.production.lot:0
-#: field:stock.production.lot,name:0
-msgid "Production Lot"
-msgstr "Lote de producción"
-
-#. module: stock
-#: model:ir.ui.menu,name:stock.menu_traceability
-#: view:stock.move:0
-#: view:stock.picking:0
-#: view:stock.production.lot:0
-#: view:stock.tracking:0
-msgid "Traceability"
-msgstr "Trazabilidad"
-
-#. module: stock
-#: view:stock.picking:0
-msgid "To invoice"
-msgstr "Para facturar"
-
-#. module: stock
-#: model:ir.actions.act_window,name:stock.action_location_form
-#: model:ir.ui.menu,name:stock.menu_action_location_form
-#: view:stock.picking:0
-msgid "Locations"
-msgstr "Ubicaciones"
-
-#. module: stock
-#: view:stock.picking:0
-msgid "General Information"
-msgstr "Información general"
-
-#. module: stock
-#: field:stock.production.lot,prefix:0
-msgid "Prefix"
-msgstr "Prefijo"
-
-#. module: stock
-#: code:addons/stock/wizard/stock_splitinto.py:53
-#, python-format
-msgid "Total quantity after split exceeds the quantity to split for this product: \"%s\" (id: %d)"
-msgstr "Cantidad total después de que la división exceda la cantidad para dividir para este producto: \"%s\" (id: %d)"
-
-#. module: stock
-#: view:stock.move:0
-#: field:stock.partial.move,product_moves_in:0
-#: field:stock.partial.move,product_moves_out:0
-#: field:stock.partial.picking,product_moves_in:0
-#: field:stock.partial.picking,product_moves_out:0
-msgid "Moves"
-msgstr "Movimientos"
-
-#. module: stock
-#: view:report.stock.move:0
-#: field:report.stock.move,location_dest_id:0
-#: field:stock.picking,location_dest_id:0
-msgid "Dest. Location"
-msgstr "Ubicación destino"
-
-#. module: stock
-#: help:stock.move,product_packaging:0
-msgid "It specifies attributes of packaging like type, quantity of packaging,etc."
-msgstr "Indica los atributos del empaquetado como el tipo, la cantidad de paquetes, etc."
-
-#. module: stock
-#: code:addons/stock/stock.py:2382
-#, python-format
-msgid "quantity."
-msgstr "cantidad."
-
-#. module: stock
-#: constraint:stock.move:0
-msgid "You must assign a production lot for this product"
-msgstr "Debe asignar un lote de producción para este producto"
-
-#. module: stock
-#: view:stock.move:0
-msgid "Expected"
-msgstr "Previsto"
-
-#. module: stock
-#: selection:report.stock.inventory,location_type:0
-#: model:stock.location,name:stock.location_production
-#: selection:stock.location,usage:0
-msgid "Production"
-msgstr "Producción"
-
-#. module: stock
-#: view:stock.split.into:0
-msgid "Split Move"
-msgstr "Dividir movimiento"
-
-#. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:92
-#, python-format
-msgid "There are no products to return (only lines in Done state and not fully returned yet can be returned)!"
-msgstr "¡No hay productos para devolver (sólo las líneas en estado Realizado y todavía no devueltas totalmente pueden ser devueltas)!"
-
-#. module: stock
-#: help:stock.location,valuation_in_account_id:0
-msgid "This account will be used to value stock moves that have this location as destination, instead of the stock output account from the product."
-msgstr "Esta cuenta sera usada para valorar movimientos de stock que tengan esta ubicacion como destino, en lugar de la cuenta de stock de salida del producto."
-
-#. module: stock
-#: model:ir.model,name:stock.model_stock_move_split
-msgid "Split in Production lots"
-msgstr "Dividir en lotes de producción"
-
-#. module: stock
-#: view:report.stock.inventory:0
-msgid "Real"
-msgstr "Real"
-
-#. module: stock
-#: report:stock.picking.list:0
-#: view:stock.production.lot.revision:0
-#: field:stock.production.lot.revision,description:0
-msgid "Description"
-msgstr "Descripción"
-
-#. module: stock
-#: selection:report.stock.move,month:0
-msgid "May"
-msgstr "Mayo"
-
-#. module: stock
-#: code:addons/stock/wizard/stock_partial_move.py:133
-#, python-format
-msgid "Deliver"
-msgstr "Enviar"
-
-#. module: stock
-#: help:product.template,property_stock_account_output:0
-msgid "When doing real-time inventory valuation, counterpart Journal Items for all outgoing stock moves will be posted in this account. If not set on the product, the one from the product category is used."
-msgstr "Al hacer la valoración de inventario en tiempo real, la contrapartida de los asientos del diario para todos los movimientos de stock de salida se creará en esta cuenta. Si no se indica en el producto, se utilizará la cuenta de la categoría del producto."
-
-#. module: stock
-#: model:ir.actions.act_window,name:stock.action5
-#: view:stock.tracking:0
-msgid "Upstream traceability"
-msgstr "Trazabilidad hacia arriba"
-
-#. module: stock
-#: model:ir.actions.report.xml,name:stock.report_location_overview_all
-#: report:lot.stock.overview_all:0
-msgid "Location Content"
-msgstr "Contenido ubicación"
-
-#. module: stock
-#: code:addons/stock/product.py:385
-#, python-format
-msgid "Produced Qty"
-msgstr "Ctdad producida"
-
-#. module: stock
-#: field:product.category,property_stock_account_output_categ:0
-#: field:product.template,property_stock_account_output:0
-#: field:stock.change.standard.price,stock_account_output:0
-#: field:stock.location,valuation_out_account_id:0
-msgid "Stock Output Account"
-msgstr "Cuenta salida stock"
-
-#. module: stock
-#: view:stock.move:0
-msgid "Picking"
-msgstr "Empaque"
-
-#. module: stock
-#: model:ir.model,name:stock.model_stock_report_prodlots
-msgid "Stock report by production lots"
-msgstr "Reporte de inventario por lotes de producción"
-
-#. module: stock
-#: view:stock.location:0
-#: selection:stock.location,chained_location_type:0
-#: view:stock.move:0
-msgid "Customer"
-msgstr "Cliente"
-
-#. module: stock
-#: selection:report.stock.move,month:0
-msgid "February"
-msgstr "Febrero"
-
-#. module: stock
-#: view:stock.production.lot:0
-msgid "Production Lot Identification"
-msgstr "Identificación lote de producción"
-
-#. module: stock
-#: field:stock.location,scrap_location:0
-#: view:stock.move.scrap:0
-msgid "Scrap Location"
-msgstr "Ubicación desecho"
-
-#. module: stock
-#: selection:report.stock.move,month:0
-msgid "April"
-msgstr "Abril"
-
-#. module: stock
-#: view:report.stock.inventory:0
-#: view:stock.move:0
-msgid "Future"
-msgstr "Futuro"
-
-#. module: stock
-#: field:stock.invoice.onshipping,invoice_date:0
-msgid "Invoiced date"
-msgstr "Fecha facturado"
-
-#. module: stock
-#: code:addons/stock/stock.py:732
-#: code:addons/stock/wizard/stock_invoice_onshipping.py:85
-#: code:addons/stock/wizard/stock_invoice_onshipping.py:87
-#: code:addons/stock/wizard/stock_return_picking.py:77
-#: code:addons/stock/wizard/stock_return_picking.py:92
-#: code:addons/stock/wizard/stock_return_picking.py:194
-#, python-format
-msgid "Warning !"
-msgstr "¡Aviso!"
-
-#. module: stock
-#: model:stock.location,name:stock.stock_location_output
-msgid "Output"
-msgstr "Salida"
-
-#. module: stock
-#: view:res.partner:0
-msgid "Sales & Purchases"
-msgstr "Ventas & Compras"
-
-#. module: stock
-#: selection:stock.move.split.lines,action:0
-msgid "Keep in one lot"
-msgstr "Mantener en un lote"
-
-#. module: stock
-#: view:product.product:0
-msgid "Cost Price:"
-msgstr "Precio coste:"
-
-#. module: stock
-#: help:stock.move,move_dest_id:0
-msgid "Optional: next stock move when chaining them"
-msgstr "Opcional: Siguiente movimiento de stock cuando se encadenan."
-
-#. module: stock
-#: view:report.stock.move:0
-#: field:report.stock.move,year:0
-msgid "Year"
-msgstr "Año"
-
-#. module: stock
-#: model:stock.location,name:stock.stock_location_locations
-msgid "Physical Locations"
-msgstr "Ubicaciones físicas"
-
-#. module: stock
-#: model:ir.model,name:stock.model_stock_partial_move
-msgid "Partial Move"
-msgstr "Movimiento parcial"
-
-#. module: stock
-#: help:stock.location,posx:0
-#: help:stock.location,posy:0
-#: help:stock.location,posz:0
-msgid "Optional localization details, for information purpose only"
-msgstr "Detalles de ubicación opcionales, sólo para fines de información."
-
diff --git a/addons/stock/i18n/es_VE.po b/addons/stock/i18n/es_VE.po
index 0151719fab8..75a380434b1 100644
--- a/addons/stock/i18n/es_VE.po
+++ b/addons/stock/i18n/es_VE.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:42+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:58+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: stock
 #: field:product.product,track_outgoing:0
diff --git a/addons/stock/i18n/et.po b/addons/stock/i18n/et.po
index 7d9a997eb10..6ec9dc8b774 100644
--- a/addons/stock/i18n/et.po
+++ b/addons/stock/i18n/et.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:40+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:56+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: stock
 #: field:product.product,track_outgoing:0
diff --git a/addons/stock/i18n/fi.po b/addons/stock/i18n/fi.po
index de51e97f59f..22a62308a85 100644
--- a/addons/stock/i18n/fi.po
+++ b/addons/stock/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:41+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:56+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: stock
 #: field:product.product,track_outgoing:0
diff --git a/addons/stock/i18n/fr.po b/addons/stock/i18n/fr.po
index d503ac66654..614a6461b1f 100644
--- a/addons/stock/i18n/fr.po
+++ b/addons/stock/i18n/fr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:41+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:56+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: stock
 #: field:stock.inventory.line,product_uom:0
diff --git a/addons/stock/i18n/gl.po b/addons/stock/i18n/gl.po
index 99d22e8c9ff..4fe236c0b01 100644
--- a/addons/stock/i18n/gl.po
+++ b/addons/stock/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:41+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:56+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: stock
 #: field:product.product,track_outgoing:0
diff --git a/addons/stock/i18n/hr.po b/addons/stock/i18n/hr.po
index ae60973f770..3a6a64ab2aa 100644
--- a/addons/stock/i18n/hr.po
+++ b/addons/stock/i18n/hr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:42+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:57+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: stock
 #: field:product.product,track_outgoing:0
diff --git a/addons/stock/i18n/hu.po b/addons/stock/i18n/hu.po
index 4cbb63817b2..28f1d465c68 100644
--- a/addons/stock/i18n/hu.po
+++ b/addons/stock/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:41+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:56+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: stock
 #: field:product.product,track_outgoing:0
diff --git a/addons/stock/i18n/id.po b/addons/stock/i18n/id.po
index b004eb0c7dd..a1eb14394e5 100644
--- a/addons/stock/i18n/id.po
+++ b/addons/stock/i18n/id.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:41+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:56+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: stock
 #: field:product.product,track_outgoing:0
diff --git a/addons/stock/i18n/it.po b/addons/stock/i18n/it.po
index 88563f1fca8..dd72530b8a7 100644
--- a/addons/stock/i18n/it.po
+++ b/addons/stock/i18n/it.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:41+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:57+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: stock
 #: field:product.product,track_outgoing:0
diff --git a/addons/stock/i18n/ja.po b/addons/stock/i18n/ja.po
index b8df8c1826f..2c6b6c7ad23 100644
--- a/addons/stock/i18n/ja.po
+++ b/addons/stock/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:41+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:57+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: stock
 #: field:product.product,track_outgoing:0
diff --git a/addons/stock/i18n/ko.po b/addons/stock/i18n/ko.po
index 5baef13e47a..5f4b235c6e9 100644
--- a/addons/stock/i18n/ko.po
+++ b/addons/stock/i18n/ko.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:41+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:57+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: stock
 #: field:product.product,track_outgoing:0
diff --git a/addons/stock/i18n/lt.po b/addons/stock/i18n/lt.po
index 0882da20799..2807bf21c13 100644
--- a/addons/stock/i18n/lt.po
+++ b/addons/stock/i18n/lt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:41+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:57+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 "Language: lt\n"
 
 #. module: stock
diff --git a/addons/stock/i18n/lv.po b/addons/stock/i18n/lv.po
index 1a5eb5ccc2e..ec17852300d 100644
--- a/addons/stock/i18n/lv.po
+++ b/addons/stock/i18n/lv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:41+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:57+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: stock
 #: field:product.product,track_outgoing:0
diff --git a/addons/stock/i18n/mk.po b/addons/stock/i18n/mk.po
index 97f95e20679..42d64ad8df1 100644
--- a/addons/stock/i18n/mk.po
+++ b/addons/stock/i18n/mk.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:41+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:57+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: stock
 #: field:product.product,track_outgoing:0
diff --git a/addons/stock/i18n/mn.po b/addons/stock/i18n/mn.po
index 8eccf7a4739..5d47b0763c3 100644
--- a/addons/stock/i18n/mn.po
+++ b/addons/stock/i18n/mn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:41+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:57+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: stock
 #: field:product.product,track_outgoing:0
diff --git a/addons/stock/i18n/nb.po b/addons/stock/i18n/nb.po
index 8b5ec3b7181..63af9ac0973 100644
--- a/addons/stock/i18n/nb.po
+++ b/addons/stock/i18n/nb.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:41+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:57+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: stock
 #: field:product.product,track_outgoing:0
@@ -36,11 +36,16 @@ msgid ""
 "value for all products in this category. It can also directly be set on each "
 "product"
 msgstr ""
+"Når du gjør real-time beholdningsvurdering vil motpart journal elementer for "
+"alle innkommende aksjen beveger seg bli postet i denne kontoen, med mindre "
+"det er en konkret vurdering konto sett på kildeplasseringen. Dette er "
+"standardverdien for alle produkter i denne kategorien. Det kan også direkte "
+"settes på hvert produkt"
 
 #. module: stock
 #: field:stock.location,chained_location_id:0
 msgid "Chained Location If Fixed"
-msgstr ""
+msgstr "Lenket plassering Hvis Fixed"
 
 #. module: stock
 #: view:stock.inventory:0 view:stock.move:0 view:stock.picking:0
@@ -161,6 +166,8 @@ msgid ""
 "This is the list of all delivery orders that have to be prepared, according "
 "to your different sales orders and your logistics rules."
 msgstr ""
+"Dette er listen over alle leveringsordre som må være forberedt, i henhold "
+"til dine forskjellige salgsordrer og logistikkregler."
 
 #. module: stock
 #: view:report.stock.move:0 field:report.stock.move,day:0
@@ -195,13 +202,13 @@ msgstr "Inneværende måned"
 #: code:addons/stock/wizard/stock_move.py:222
 #, python-format
 msgid "Unable to assign all lots to this move!"
-msgstr ""
+msgstr "Kan ikke tildele alle partier i denne farten!"
 
 #. module: stock
 #: code:addons/stock/stock.py:2516
 #, python-format
 msgid "Missing partial picking data for move #%s"
-msgstr ""
+msgstr "Mangler delvis plukking data for trekk #% s"
 
 #. module: stock
 #: model:ir.actions.server,name:stock.action_partial_move_server
@@ -223,7 +230,7 @@ msgstr "Plukkordre klar til fakturering"
 #. module: stock
 #: view:stock.picking:0
 msgid "Assigned Delivery Orders"
-msgstr ""
+msgstr "Tildelte levering Bestillinger"
 
 #. module: stock
 #: field:stock.partial.move.line,update_cost:0
@@ -239,6 +246,9 @@ msgid ""
 "if you really want to change it '             #                        'for "
 "this product: \"%s\" (id: %d)"
 msgstr ""
+"Det gjeldende trekk linjen er allerede tildelt en pakke, må du fjerne det "
+"først hvis du virkelig ønsker å forandre det '#' for dette produktet: \"% "
+"s\" (id:%d)"
 
 #. module: stock
 #: selection:stock.picking,invoice_state:0
@@ -297,7 +307,7 @@ msgstr ""
 #. module: stock
 #: view:stock.partial.move:0 view:stock.partial.picking:0
 msgid "_Validate"
-msgstr ""
+msgstr "_Validere"
 
 #. module: stock
 #: code:addons/stock/stock.py:1149
@@ -337,6 +347,9 @@ msgid ""
 "Can not create Journal Entry, Input Account defined on this product and "
 "Valuation account on category of this product are same."
 msgstr ""
+"Kan ikke opprette bilagsregistrering, inngangskontoen definert på dette "
+"produktet og verdivurderingskontoen på kategorien av dette produktet er "
+"samme."
 
 #. module: stock
 #: selection:stock.return.picking,invoice_state:0
@@ -414,7 +427,7 @@ msgstr "Forsinkelse (dager)"
 #. module: stock
 #: model:ir.model,name:stock.model_action_traceability
 msgid "Action traceability "
-msgstr ""
+msgstr "handling sporbarhet "
 
 #. module: stock
 #: view:stock.move:0
@@ -478,6 +491,8 @@ msgid ""
 "When real-time inventory valuation is enabled on a product, this account "
 "will hold the current value of the products."
 msgstr ""
+"Når sanntid beholdningsvurdering er aktivert på et produkt, vil denne "
+"kontoen holde den aktuelle verdien av produktene."
 
 #. module: stock
 #: field:report.stock.inventory,location_type:0 field:stock.location,usage:0
@@ -487,7 +502,7 @@ msgstr "Lokasjonstype"
 #. module: stock
 #: help:report.stock.move,type:0 help:stock.picking,type:0
 msgid "Shipping type specify, goods coming in or going out."
-msgstr ""
+msgstr "Angi frakttypen, varer kommer eller sendes."
 
 #. module: stock
 #: model:ir.actions.report.xml,name:stock.report_move_labels
@@ -502,7 +517,7 @@ msgstr "Bevegelsesstatistikk"
 #. module: stock
 #: view:stock.production.lot:0
 msgid "Product Lots Filter"
-msgstr ""
+msgstr "Sorter produktmasse"
 
 #. module: stock
 #: report:lot.stock.overview:0 report:lot.stock.overview_all:0
@@ -516,11 +531,13 @@ msgid ""
 "Current quantity of products with this Production Lot Number available in "
 "company warehouses"
 msgstr ""
+"Gjeldende mengde av produkter med denne produksjonen. Varenummer er "
+"tilgjengelig i selskapets varehus"
 
 #. module: stock
 #: field:stock.move,move_history_ids:0
 msgid "Move History (child moves)"
-msgstr ""
+msgstr "Flyttelogg (underordnedes flytting)"
 
 #. module: stock
 #: code:addons/stock/stock.py:2125
@@ -529,6 +546,8 @@ msgid ""
 "There is no stock output account defined for this product or its category: "
 "\"%s\" (id: %d)"
 msgstr ""
+"Det er ingen lager utgang konto definert for dette produktet eller kategori: "
+"\"% s\" (id:% d)"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_picking_tree6
@@ -545,7 +564,7 @@ msgstr "Bestemmelseslokasjon"
 #. module: stock
 #: model:ir.model,name:stock.model_stock_partial_move_line
 msgid "stock.partial.move.line"
-msgstr ""
+msgstr "lager delvis flytte linjen"
 
 #. module: stock
 #: code:addons/stock/stock.py:760
@@ -577,6 +596,10 @@ msgid ""
 "buttons on the right of each line. You can filter the products to deliver by "
 "customer, products or sale order (using the Origin field)."
 msgstr ""
+"Du vil finne i denne listen alle produkter du har å levere til kundene dine. "
+"Du kan behandle leveransene direkte fra denne listen ved hjelp av knappene "
+"på høyre side av hver linje. Du kan filtrere produkter levere etter kundens, "
+"produkter eller salgsordre (ved hjelp av Origin feltet)."
 
 #. module: stock
 #: model:ir.ui.menu,name:stock.menu_stock_inventory_control
@@ -622,6 +645,10 @@ msgid ""
 "worker/team that should perform the operation. Examples of stock journals "
 "may be: quality control, pick lists, packing, etc."
 msgstr ""
+"Aksjen journal-systemet lar deg tilordne hver aksje operasjon til et bestemt "
+"tidsskrift i henhold til type operasjon å utføre eller arbeideren / laget "
+"som skal utføre operasjonen. Eksempler på lager tidsskrifter kan være: "
+"kvalitetskontroll, plukklister, pakking, osv."
 
 #. module: stock
 #: field:stock.location,complete_name:0 field:stock.location,name:0
@@ -639,6 +666,11 @@ msgid ""
 "queries regarding your account, please contact us.\n"
 "Thank you in advance.\n"
 msgstr ""
+"Våre rapporter viser at følgende betalinger fremdeles forfaller. Dersom "
+"beløpet\n"
+"allerede er betalt, se bort fra denne kunngjøringen. Men hvis du har noen\n"
+"spørsmål angående din konto, vennligst kontakt oss.\n"
+"Takk på forhånd.\n"
 
 #. module: stock
 #: view:stock.inventory:0
@@ -653,11 +685,15 @@ msgid ""
 "according to the original purchase order. You can validate the shipment "
 "totally or partially."
 msgstr ""
+"Den inngående leveransen er listen over alle ordrer du vil motta fra dine "
+"leverandører. En innkommende forsendelse inneholder en liste over produkter "
+"som skal mottas i henhold til den opprinnelige bestillingen. Du kan bekrefte "
+"forsendelsen helt eller delvis."
 
 #. module: stock
 #: field:stock.move.split.lines,wizard_exist_id:0
 msgid "Parent Wizard (for existing lines)"
-msgstr ""
+msgstr "Overordnet veiviser (for eksisterende linjer)"
 
 #. module: stock
 #: view:stock.move:0 view:stock.picking:0
@@ -671,6 +707,8 @@ msgid ""
 "There is no inventory Valuation account defined on the product category: "
 "\"%s\" (id: %d)"
 msgstr ""
+"Det er ingen beholdningsvurderingskonto definert på produktkategori: \"% s\" "
+"(id:% d)"
 
 #. module: stock
 #: view:report.stock.move:0
@@ -752,6 +790,8 @@ msgid ""
 "When doing real-time inventory valuation, this is the Accounting Journal in "
 "which entries will be automatically posted when stock moves are processed."
 msgstr ""
+"Når du gjør real-time beholdningsvurdering, er dette regnskap Journal som "
+"oppføringene vil bli automatisk lagt når aksjekursene trekk er behandlet."
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_partial_picking
@@ -781,17 +821,19 @@ msgid ""
 "Check this option to select existing lots in the list below, otherwise you "
 "should enter new ones line by line."
 msgstr ""
+"Kontroller dette alternativet for å velge eksisterende produkter i listen "
+"nedenfor, ellers må du skrive inn nye produkter linje for linje."
 
 #. module: stock
 #: code:addons/stock/product.py:75
 #, python-format
 msgid "Valuation Account is not specified for Product Category: %s"
-msgstr ""
+msgstr "Vurderingskonto er ikke spesifisert for produktkategori: %s"
 
 #. module: stock
 #: field:stock.move,move_dest_id:0
 msgid "Destination Move"
-msgstr ""
+msgstr "Flytting over distanse"
 
 #. module: stock
 #: view:stock.move:0 view:stock.picking:0
@@ -843,7 +885,7 @@ msgstr "Utkast fysisk telling"
 #: selection:report.stock.inventory,location_type:0
 #: selection:stock.location,usage:0
 msgid "Transit Location for Inter-Companies Transfers"
-msgstr ""
+msgstr "Transportlokasjon for konserninterne overføringer"
 
 #. module: stock
 #: selection:stock.location,chained_auto_packing:0
@@ -865,7 +907,7 @@ msgstr "ukjent"
 #. module: stock
 #: model:ir.model,name:stock.model_stock_inventory_merge
 msgid "Merge Inventory"
-msgstr ""
+msgstr "Flett varelager"
 
 #. module: stock
 #: code:addons/stock/product.py:433
@@ -915,12 +957,12 @@ msgstr "Planlagt dato"
 #. module: stock
 #: view:stock.tracking:0
 msgid "Pack Search"
-msgstr ""
+msgstr "Pakkesøk"
 
 #. module: stock
 #: view:stock.picking:0
 msgid "Pickings already processed"
-msgstr ""
+msgstr "Bytter allerede behandlet"
 
 #. module: stock
 #: field:stock.partial.move.line,currency:0
@@ -937,7 +979,7 @@ msgstr "Journal"
 #: code:addons/stock/stock.py:1345
 #, python-format
 msgid "is scheduled %s."
-msgstr ""
+msgstr "er planlagt% s."
 
 #. module: stock
 #: help:stock.picking,location_id:0
@@ -946,6 +988,10 @@ msgid ""
 "needed.Set a location if you produce at a fixed location. This can be a "
 "partner location if you subcontract the manufacturing operations."
 msgstr ""
+"Lå stå tomt hvis du produserer på samme lokasjon som det ferdige produktet "
+"treng. Set en lokasjon hvis du produserer på en fast lokasjon. Dette kan "
+"være en partner dersom du benytter underleverandører til produksjons "
+"prosesser."
 
 #. module: stock
 #: view:res.partner:0
@@ -955,12 +1001,12 @@ msgstr "Lagerbeholdning egenskaper"
 #. module: stock
 #: field:report.stock.move,day_diff:0
 msgid "Execution Lead Time (Days)"
-msgstr ""
+msgstr "Gjennomføring ledetid(dager)"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_partial_move
 msgid "Partial Move Processing Wizard"
-msgstr ""
+msgstr "Delvis Flytte lastet veiviseren"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.act_stock_product_location_open
@@ -973,6 +1019,7 @@ msgid ""
 "Optional address where goods are to be delivered, specifically used for "
 "allotment"
 msgstr ""
+"Valgfri adresse der varene skal leveres, spesielt brukt for tildeling"
 
 #. module: stock
 #: view:report.stock.inventory:0 view:report.stock.move:0
@@ -984,13 +1031,14 @@ msgstr "Måned-1"
 msgid ""
 "By unchecking the active field, you may hide a location without deleting it."
 msgstr ""
+"Ved å fjerne det aktive feltet, kan du skjule et varehus uten å slette det."
 
 #. module: stock
 #: code:addons/stock/wizard/stock_inventory_merge.py:44
 #, python-format
 msgid ""
 "Please select multiple physical inventories to merge in the list view."
-msgstr ""
+msgstr "Velg flere fysiske lager å slå sammen i listevisningen."
 
 #. module: stock
 #: view:stock.picking:0
@@ -1016,12 +1064,12 @@ msgstr "Forrige måned"
 #. module: stock
 #: field:stock.location,parent_left:0
 msgid "Left Parent"
-msgstr ""
+msgstr "venstre forelder"
 
 #. module: stock
 #: field:product.category,property_stock_valuation_account_id:0
 msgid "Stock Valuation Account"
-msgstr ""
+msgstr "Lager verdivurdering konto"
 
 #. module: stock
 #: code:addons/stock/stock.py:1349
@@ -1040,6 +1088,7 @@ msgstr "Feil: Ugyldig ean kode"
 msgid ""
 "There is no stock output account defined for this product: \"%s\" (id: %d)"
 msgstr ""
+"Det er ingen vareutgangskonto definert til dette produktet: \"%s\" (id: %d)"
 
 #. module: stock
 #: field:product.template,property_stock_production:0
@@ -1083,6 +1132,29 @@ msgid ""
 "location consumes the raw material and produces finished products\n"
 "                      "
 msgstr ""
+"* Leverandør Sted: Virtuell beliggenhet representerer kildeplasseringen for "
+"produkter som kommer fra leverandører\n"
+"                       \n"
+"* Vis: Virtuell sted brukes til å lage en hierarkiske strukturer for "
+"varehuset, samles underordnede steder, kan ikke direkte inneholder "
+"produkter\n"
+"                       \n"
+"* Internt Sted: Fysiske steder inne dine egne varehus,\n"
+"                       \n"
+"* Kunden Sted: Virtuell beliggenhet representerer målplassering for "
+"produkter sendes til kunder.\n"
+"                       \n"
+"* Inventar: Virtual sted som tjener som motpart for inventar operasjoner "
+"brukes til å korrigere lagernivåer (Fysiske varelager)\n"
+"                       \n"
+"* Innkjøp: Virtuell sted som tjener som midlertidig motpart for innkjøp "
+"operasjoner når kilden (leverandør eller produksjon) er ikke kjent ennå. "
+"Denne plasseringen skal være tom når anskaffelsen planleggeren har kjørt "
+"ferdig.\n"
+"                       \n"
+"* Produksjon: Virtuell motstykke sted for produksjonsvirksomhet: dette "
+"stedet forbruker råstoff og produserer ferdige produkter\n"
+"                      "
 
 #. module: stock
 #: field:stock.production.lot.revision,author_id:0
@@ -1112,6 +1184,8 @@ msgid ""
 "In order to cancel this inventory, you must first unpost related journal "
 "entries."
 msgstr ""
+"For å avbryte denne lagerbeholdingen, må du først unposte relaterte "
+"loggoppføringer."
 
 #. module: stock
 #: field:stock.picking,date_done:0
@@ -1125,11 +1199,13 @@ msgid ""
 "The uom rounding does not allow you to ship \"%s %s\", only roundings of "
 "\"%s %s\" is accepted by the uom."
 msgstr ""
+"Den enhetsavrundingen tillater deg ikke å sende \"%s %s\", bare avrundinger "
+"av \"%s %s\" blir godtatt av enheten."
 
 #. module: stock
 #: view:stock.move:0
 msgid "Stock moves that are Available (Ready to process)"
-msgstr ""
+msgstr "Lagerflyttinger som er ledige (klar for prosess)"
 
 #. module: stock
 #: report:stock.picking.list:0
@@ -1168,6 +1244,8 @@ msgid ""
 "empty to automatically detect the type based on the source and destination "
 "locations)."
 msgstr ""
+"Frakt Type av plukkliste som skal inneholde lenket flytte (la stå tomt for å "
+"automatisk oppdage hvilken type basert på kilden og målet steder)."
 
 #. module: stock
 #: view:stock.move.split:0
@@ -1209,12 +1287,12 @@ msgstr "Europeiske kunder"
 #. module: stock
 #: help:stock.location,chained_delay:0
 msgid "Delay between original move and chained move in days"
-msgstr ""
+msgstr "Forsinkelse mellom original flytting og lenket flytting i dager"
 
 #. module: stock
 #: view:stock.fill.inventory:0
 msgid "Import current product inventory from the following location"
-msgstr ""
+msgstr "Importer nåværende produktinventar fra følgende plassering"
 
 #. module: stock
 #: help:stock.location,chained_auto_packing:0
@@ -1225,11 +1303,16 @@ msgid ""
 "move has to be validated by a worker. With 'Automatic No Step Added', the "
 "location is replaced in the original move."
 msgstr ""
+"Dette brukes kun hvis du velger en kjedet plassering type.\n"
+"'Automatisk flytte' verdi vil skape en aksje beveger seg etter gjeldende en "
+"som vil bli validert automatisk. Med 'Manuell drift \", har aksjen flytte "
+"for å bli godkjent av en arbeidstaker. Med \"Automatisk Ingen Step Lagt ', "
+"plasseringen erstattet i den opprinnelige trekk."
 
 #. module: stock
 #: view:stock.tracking:0
 msgid "Pack Identification"
-msgstr ""
+msgstr "Pakkeidentifikasjon"
 
 #. module: stock
 #: report:stock.picking.list:0
@@ -1239,7 +1322,7 @@ msgstr "Pakkseddel:"
 #. module: stock
 #: selection:stock.move,state:0
 msgid "Waiting Another Move"
-msgstr ""
+msgstr "Venter på en annen flytting"
 
 #. module: stock
 #: help:product.template,property_stock_production:0
@@ -1248,11 +1331,14 @@ msgid ""
 "default one, as the source location for stock moves generated by production "
 "orders"
 msgstr ""
+"For det gjeldene produktet, vil dette varehuset bli brukt, i stedet for "
+"standarden, som kildested for lagerbevegelser som genereres av "
+"produksjonsordrer"
 
 #. module: stock
 #: view:product.product:0
 msgid "Expected Stock Variations"
-msgstr ""
+msgstr "Ventede lagervariasjoner"
 
 #. module: stock
 #: help:stock.move,price_unit:0
@@ -1260,12 +1346,15 @@ msgid ""
 "Technical field used to record the product cost set by the user during a "
 "picking confirmation (when average price costing method is used)"
 msgstr ""
+"Det Teknisk feltet som brukes til å registrere produktet koster satt av "
+"brukeren under en plukke bekreftelse (når gjennomsnittlig pris koster "
+"metoden brukes)"
 
 #. module: stock
 #: code:addons/stock/stock.py:1350
 #, python-format
 msgid "is in draft state."
-msgstr ""
+msgstr "er i utkast."
 
 #. module: stock
 #: model:ir.actions.act_window,help:stock.action_tracking_form
@@ -1273,11 +1362,13 @@ msgid ""
 "This is the list of all your packs. When you select a Pack, you can get the "
 "upstream or downstream traceability of the products contained in the pack."
 msgstr ""
+"Dette er listen over alle pakkene dine. Når du velger en pakke, kan du få "
+"oppstrøms- eller nedstrømssporbarhet av produktene som finnes i pakken."
 
 #. module: stock
 #: selection:stock.return.picking,invoice_state:0
 msgid "To be refunded/invoiced"
-msgstr ""
+msgstr "Skal få refundert/faktura"
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_shop0
@@ -1323,13 +1414,13 @@ msgstr "Fra"
 #. module: stock
 #: view:stock.picking:0
 msgid "Incoming Shipments already processed"
-msgstr ""
+msgstr "Innkommende leveranse er allerede behandlet"
 
 #. module: stock
 #: code:addons/stock/wizard/stock_return_picking.py:99
 #, python-format
 msgid "You may only return pickings that are Confirmed, Available or Done!"
-msgstr ""
+msgstr "Du kan bare returnere bytter som er bekreftet, ledige eller ferdige!"
 
 #. module: stock
 #: view:stock.picking:0 field:stock.picking,invoice_state:0
@@ -1360,13 +1451,13 @@ msgstr "Splitt"
 #. module: stock
 #: view:stock.picking:0
 msgid "Search Stock Picking"
-msgstr ""
+msgstr "Søk lager Plukking"
 
 #. module: stock
 #: code:addons/stock/product.py:92
 #, python-format
 msgid "Company is not specified in Location"
-msgstr ""
+msgstr "Kompaniet er ikke spesifisert i lageret."
 
 #. module: stock
 #: view:report.stock.move:0
@@ -1376,17 +1467,17 @@ msgstr "Type"
 #. module: stock
 #: view:stock.picking:0
 msgid "Available Pickings"
-msgstr ""
+msgstr "Tilgjengelig Plukking"
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_5
 msgid "Generic IT Suppliers"
-msgstr ""
+msgstr "Generiske IT leverandører"
 
 #. module: stock
 #: view:stock.move:0
 msgid "Stock to be receive"
-msgstr ""
+msgstr "Varer som kommer"
 
 #. module: stock
 #: help:stock.location,valuation_out_account_id:0
@@ -1397,6 +1488,11 @@ msgid ""
 "the generic Stock Output Account set on the product. This has no effect for "
 "internal locations."
 msgstr ""
+"Brukes for ektetid beholdningsvurdering. Når sett på en virtuell plassering "
+"(ikke intern type), vil denne kontoen bli brukt til å holde verdien av "
+"produkter som blir flyttet ut av denne plasseringen og inn i en intern "
+"beliggenhet, i stedet for den generiske Stock Output kontoen satt på "
+"produktet. Dette har ingen effekt for interne steder."
 
 #. module: stock
 #: report:stock.picking.list:0
@@ -1440,13 +1536,13 @@ msgstr "Du kan bare slette forslag til bevegelser"
 #. module: stock
 #: model:ir.model,name:stock.model_stock_inventory_line_split_lines
 msgid "Inventory Split lines"
-msgstr ""
+msgstr "Inventar Split linjer"
 
 #. module: stock
 #: model:ir.actions.report.xml,name:stock.report_location_overview
 #: report:lot.stock.overview:0
 msgid "Location Inventory Overview"
-msgstr ""
+msgstr "Plassering Varelager Oversikt"
 
 #. module: stock
 #: view:stock.inventory:0
@@ -1456,7 +1552,7 @@ msgstr "Generell informasjon"
 #. module: stock
 #: view:report.stock.inventory:0
 msgid "Analysis including future moves (similar to virtual stock)"
-msgstr ""
+msgstr "Analyse inkludert fremtidige trekk (ligner virtuell lager)"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action3 view:stock.tracking:0
@@ -1479,6 +1575,7 @@ msgstr "Hyller (Y)"
 msgid ""
 "By unchecking the active field, you may hide an INCOTERM without deleting it."
 msgstr ""
+"Ved å fjerne det aktive feltet, kan du skjule en INCOTERM uten å slette den."
 
 #. module: stock
 #: view:stock.move:0 view:stock.picking:0 field:stock.picking,date:0
@@ -1489,7 +1586,7 @@ msgstr "Ordredato"
 #: code:addons/stock/wizard/stock_change_product_qty.py:88
 #, python-format
 msgid "INV: %s"
-msgstr ""
+msgstr "INV: %s"
 
 #. module: stock
 #: view:stock.location:0 field:stock.location,location_id:0
@@ -1507,6 +1604,13 @@ msgid ""
 "* Done: has been processed, can't be modified or cancelled anymore\n"
 "* Cancelled: has been cancelled, can't be confirmed anymore"
 msgstr ""
+"Utkast: ikke bekreftet ennå, og vil ikke bli planlagt før den er bekreftet\n"
+"* Bekreftet: venter fortsatt på tilgjengeligheten av produkter\n"
+"* Tilgjengelig: produkter reservert, bare venter på bekreftelse.\n"
+"* Venter: venter på en annen flytte for å gå videre før det blir automatisk "
+"tilgjengelig (f.eks lag-to-ordrestrømmer)\n"
+"* Ferdig: er behandlet, kan ikke endres eller avbestilles lenger\n"
+"* Avlyst: har blitt kansellert, kan ikke bekreftes lenger"
 
 #. module: stock
 #: help:stock.location,company_id:0
@@ -1522,7 +1626,7 @@ msgstr "Vennligst angi et positivt antall for skraping!"
 #. module: stock
 #: field:stock.location,chained_delay:0
 msgid "Chaining Lead Time"
-msgstr ""
+msgstr "Kjeding Leveringstid"
 
 #. module: stock
 #: help:product.product,track_outgoing:0
@@ -1530,11 +1634,13 @@ msgid ""
 "Forces to specify a Production Lot for all moves containing this product and "
 "going to a Customer Location"
 msgstr ""
+"Styrker for å angi en produksjon Lot ved all forflytning inneholder dette "
+"produktet og gå til en kunde Plassering."
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_invoice_onshipping
 msgid "Stock Invoice Onshipping"
-msgstr ""
+msgstr "lager faktura på Shipping"
 
 #. module: stock
 #: help:stock.move,state:0
@@ -1546,6 +1652,12 @@ msgid ""
 " When the picking is done the state is 'Done'.              \n"
 "The state is 'Waiting' if the move is waiting for another one."
 msgstr ""
+"Når aksjen beveger seg er opprettet er det i \"Kladd\" tilstand.\n"
+"Etter det, er det satt til \"Ikke tilgjengelig\" stat hvis planleggeren ikke "
+"finne produkter.\n"
+"Når produktene er reservert det er satt til 'tilgjengelig'.\n"
+"Når plukking er gjort staten Ferdig.\n"
+"Staten er \"Venter\" hvis farten venter på en annen."
 
 #. module: stock
 #: selection:report.stock.inventory,location_type:0
@@ -1558,13 +1670,13 @@ msgstr "Leverandørlokasjon"
 #: code:addons/stock/stock.py:2358
 #, python-format
 msgid "were scrapped"
-msgstr ""
+msgstr "Ble vraket"
 
 #. module: stock
 #: help:stock.partial.move.line,currency:0
 #: help:stock.partial.picking.line,currency:0
 msgid "Currency in which Unit cost is expressed"
-msgstr ""
+msgstr "Valutaen som enhetskostnaden uttrykkes"
 
 #. module: stock
 #: selection:report.stock.inventory,month:0
@@ -1578,6 +1690,8 @@ msgid ""
 "If this picking was split this field links to the picking that contains the "
 "other part that has been processed already."
 msgstr ""
+"Hvis dette plukke ble delt, dette feltet linker til plukking som inneholder "
+"den andre delen som har blitt behandlet allerede."
 
 #. module: stock
 #: model:ir.model,name:stock.model_report_stock_inventory
@@ -1587,22 +1701,22 @@ msgstr "Lager statistikker"
 #. module: stock
 #: view:report.stock.move:0
 msgid "Month Planned"
-msgstr ""
+msgstr "Månedplanlagt"
 
 #. module: stock
 #: field:product.product,track_production:0
 msgid "Track Manufacturing Lots"
-msgstr ""
+msgstr "Spor Produksjon Massen"
 
 #. module: stock
 #: view:stock.picking:0
 msgid "Is a Back Order"
-msgstr ""
+msgstr "Er en restordre"
 
 #. module: stock
 #: field:stock.location,valuation_out_account_id:0
 msgid "Stock Valuation Account (Outgoing)"
-msgstr ""
+msgstr "Lagervurderingskonto (utgående)"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.act_product_stock_move_open
@@ -1623,7 +1737,7 @@ msgstr "Vareforsendelse"
 #. module: stock
 #: model:ir.ui.menu,name:stock.menu_product_category_config_stock
 msgid "Product Categories"
-msgstr ""
+msgstr "Produktkategorier"
 
 #. module: stock
 #: view:stock.picking:0
@@ -1633,7 +1747,7 @@ msgstr "Kanseller tilgjengelighet"
 #. module: stock
 #: help:stock.move,date_expected:0
 msgid "Scheduled date for the processing of this move"
-msgstr ""
+msgstr "Planlagt dato for behandling av dette trekket"
 
 #. module: stock
 #: field:stock.inventory,move_ids:0
@@ -1643,32 +1757,32 @@ msgstr "Dann bevegelser"
 #. module: stock
 #: field:stock.location,valuation_in_account_id:0
 msgid "Stock Valuation Account (Incoming)"
-msgstr ""
+msgstr "Lagervurderingskonto (innkommende)"
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_14
 msgid "Shelf 2"
-msgstr ""
+msgstr "Hylle 2"
 
 #. module: stock
 #: field:stock.report.tracklots,tracking_id:0
 msgid "Tracking lot"
-msgstr ""
+msgstr "Sporingsrekke"
 
 #. module: stock
 #: view:stock.picking:0
 msgid "Back Orders"
-msgstr ""
+msgstr "Tilbake ordnene"
 
 #. module: stock
 #: view:product.product:0 view:product.template:0
 msgid "Counter-Part Locations Properties"
-msgstr ""
+msgstr "Motpart Steder Egenskaper"
 
 #. module: stock
 #: view:stock.location:0
 msgid "Localization"
-msgstr ""
+msgstr "Lokalisering"
 
 #. module: stock
 #: code:addons/stock/product.py:429
@@ -1680,12 +1794,12 @@ msgstr "Levert kvantum"
 #: model:ir.actions.act_window,name:stock.track_line
 #: view:stock.inventory.line.split:0 view:stock.move.split:0
 msgid "Split in lots"
-msgstr ""
+msgstr "Delt i varer"
 
 #. module: stock
 #: view:stock.move.split:0
 msgid "Production Lot Numbers"
-msgstr ""
+msgstr "Produksjonsvarenummer"
 
 #. module: stock
 #: help:product.template,property_stock_account_output:0
@@ -1695,11 +1809,15 @@ msgid ""
 "specific valuation account set on the destination location. When not set on "
 "the product, the one from the product category is used."
 msgstr ""
+"Når du gjør ektetid beholdningsvurdering vil motpart journal elementer for "
+"alle utgående aksjen beveger seg bli postet i denne kontoen, med mindre det "
+"er en konkret vurdering konto sett på målplassering. Når den ikke er satt på "
+"produktet, er en fra produktkategori brukes."
 
 #. module: stock
 #: view:report.stock.move:0
 msgid "Day Planned"
-msgstr ""
+msgstr "Dag planlagt"
 
 #. module: stock
 #: view:report.stock.inventory:0 field:report.stock.inventory,date:0
@@ -1713,7 +1831,7 @@ msgstr "Dato"
 #. module: stock
 #: view:report.stock.inventory:0 view:report.stock.move:0
 msgid "Extended Filters..."
-msgstr ""
+msgstr "Utvidet Filtere ..."
 
 #. module: stock
 #: field:stock.warehouse,lot_stock_id:0
@@ -1729,7 +1847,7 @@ msgstr "Samkjørimg er bare tillatt for fakturautkast."
 #. module: stock
 #: model:ir.ui.menu,name:stock.menu_dashboard_stock
 msgid "Dashboard"
-msgstr ""
+msgstr "Kontrollpanel"
 
 #. module: stock
 #: field:stock.incoterms,code:0
@@ -1739,13 +1857,13 @@ msgstr "Kode"
 #. module: stock
 #: view:stock.inventory.line.split:0
 msgid "Lots Number"
-msgstr ""
+msgstr "masse Antall"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.open_board_warehouse
 #: model:ir.ui.menu,name:stock.menu_board_warehouse
 msgid "Warehouse Dashboard"
-msgstr ""
+msgstr "Varehusets kontrollpanel"
 
 #. module: stock
 #: code:addons/stock/stock.py:513
@@ -1757,7 +1875,7 @@ msgstr "Du kan ikke fjerne en lot-linje!"
 #: model:ir.model,name:stock.model_stock_move_scrap view:stock.move:0
 #: view:stock.move.scrap:0 view:stock.picking:0
 msgid "Scrap Products"
-msgstr ""
+msgstr "Svinn Produkter"
 
 #. module: stock
 #: code:addons/stock/stock.py:1157
@@ -1775,7 +1893,7 @@ msgstr "Avbryt"
 #: model:ir.actions.act_window,name:stock.act_stock_return_picking
 #: model:ir.model,name:stock.model_stock_return_picking
 msgid "Return Picking"
-msgstr ""
+msgstr "Returner Plukke"
 
 #. module: stock
 #: view:stock.inventory:0 view:stock.move:0 view:stock.picking:0
@@ -1807,7 +1925,7 @@ msgstr "Informasjon"
 #. module: stock
 #: report:stock.picking.list:0
 msgid "Shipping Address :"
-msgstr ""
+msgstr "Leveringsadresse:"
 
 #. module: stock
 #: help:stock.location,valuation_in_account_id:0
@@ -1818,6 +1936,11 @@ msgid ""
 "generic Stock Output Account set on the product. This has no effect for "
 "internal locations."
 msgstr ""
+"Brukes for ektetid beholdningsvurdering. Når sett på en virtuell plassering "
+"(ikke intern type), vil denne kontoen bli brukt til å holde verdien av "
+"produkter som blir flyttet fra en intern sted inn denne plasseringen, stedet "
+"for den generiske lager Utgang kontoen satt på produktet. Dette har ingen "
+"effekt for interne steder."
 
 #. module: stock
 #: view:stock.return.picking:0
@@ -1837,7 +1960,7 @@ msgstr "Lagerbeholdingverdi"
 #. module: stock
 #: view:stock.move:0
 msgid "Orders planned for today"
-msgstr ""
+msgstr "Ordre planlagt for i dag"
 
 #. module: stock
 #: view:stock.move:0 view:stock.picking:0
@@ -1865,6 +1988,9 @@ msgid ""
 "moves. Use this report when you want to analyse the different routes taken "
 "by your products and inventory management performance."
 msgstr ""
+"Flytter Analyse kan du enkelt sjekke og analysere bedriftens lager trekk. "
+"Bruk denne rapporten når du vil analysere de ulike rutene tatt av dine "
+"produkter og lagerstyring ytels"
 
 #. module: stock
 #: code:addons/stock/stock.py:2116
@@ -1873,11 +1999,13 @@ msgid ""
 "Can not create Journal Entry, Output Account defined on this product and "
 "Valuation account on category of this product are same."
 msgstr ""
+"Kan ikke opprette Bilagsregistrering, Utgang konto definert på dette "
+"produktet og Verdsettelse konto på kategori av dette produktet er samme."
 
 #. module: stock
 #: field:report.stock.move,day_diff1:0
 msgid "Planned Lead Time (Days)"
-msgstr ""
+msgstr "Planlagt Ledelse (dager)"
 
 #. module: stock
 #: field:stock.change.standard.price,new_price:0
@@ -1887,7 +2015,7 @@ msgstr "Pris"
 #. module: stock
 #: model:ir.model,name:stock.model_stock_return_picking_memory
 msgid "stock.return.picking.memory"
-msgstr ""
+msgstr "lager.retur.plukking.minne"
 
 #. module: stock
 #: view:stock.inventory:0
@@ -1897,7 +2025,7 @@ msgstr "Søk lagerbeholdning"
 #. module: stock
 #: model:ir.model,name:stock.model_stock_report_tracklots
 msgid "Stock report by tracking lots"
-msgstr ""
+msgstr "Lager rapport ved å spore mye"
 
 #. module: stock
 #: code:addons/stock/stock.py:2122
@@ -1906,6 +2034,8 @@ msgid ""
 "There is no stock input account defined for this product or its category: "
 "\"%s\" (id: %d)"
 msgstr ""
+"Det er ingen lagerinngangskonto definert for dette produktet eller denne "
+"kategorien: \"%s\" (id: %d)"
 
 #. module: stock
 #: code:addons/stock/product.py:419
@@ -1924,13 +2054,15 @@ msgid ""
 "Optional prefix to prepend when displaying this serial number: PREFIX/SERIAL "
 "[INT_REF]"
 msgstr ""
+"Valgfri prefiks til foranstille når som viser dette serienummeret: PREFIX / "
+"SERIAL [INT_REF]"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_view_stock_fill_inventory
 #: model:ir.model,name:stock.model_stock_fill_inventory
 #: view:stock.fill.inventory:0
 msgid "Import Inventory"
-msgstr ""
+msgstr "Import Varelager"
 
 #. module: stock
 #: field:stock.incoterms,name:0 field:stock.move,name:0
@@ -1950,6 +2082,8 @@ msgid ""
 "This field is for internal purpose. It is used to decide if the column "
 "prodlot has to be shown on the move_ids field or not"
 msgstr ""
+"Dette feltet er for intern formål. Den brukes til å avgjøre om kolonnen "
+"prodlot må vises på move_ids feltet eller ikke"
 
 #. module: stock
 #: help:product.template,property_stock_inventory:0
@@ -1958,31 +2092,34 @@ msgid ""
 "default one, as the source location for stock moves generated when you do an "
 "inventory"
 msgstr ""
+"For det gjeldene produktet, vil dette varelageret blir brukt, i stedet for "
+"standaren, som kilde sted for lager bevegelser som genereres når du gjør en "
+"opptelling"
 
 #. module: stock
 #: view:report.stock.lines.date:0
 msgid "Stockable"
-msgstr ""
+msgstr "Lagringsbare"
 
 #. module: stock
 #: selection:product.product,valuation:0
 msgid "Real Time (automated)"
-msgstr ""
+msgstr "Realtid (automatisert)"
 
 #. module: stock
 #: help:stock.move,tracking_id:0
 msgid "Logistical shipping unit: pallet, box, pack ..."
-msgstr ""
+msgstr "Logistisk skipsfartenhet: pall, boks, pakke ..."
 
 #. module: stock
 #: view:stock.location:0
 msgid "Customer Locations"
-msgstr ""
+msgstr "Kundelokasjon"
 
 #. module: stock
 #: view:stock.change.product.qty:0 view:stock.change.standard.price:0
 msgid "_Apply"
-msgstr ""
+msgstr "_Bruk"
 
 #. module: stock
 #: report:lot.stock.overview:0 report:lot.stock.overview_all:0
@@ -1998,7 +2135,7 @@ msgstr "Lagerlokasjon"
 #. module: stock
 #: view:report.stock.inventory:0 view:report.stock.move:0
 msgid "Total value"
-msgstr ""
+msgstr "Totalsum"
 
 #. module: stock
 #: help:stock.location,chained_journal_id:0
@@ -2006,35 +2143,37 @@ msgid ""
 "Inventory Journal in which the chained move will be written, if the Chaining "
 "Type is not Transparent (no journal is used if left empty)"
 msgstr ""
+"Inventar Journal der lenket trekk vil bli skrevet, hvis Sammenkjeding Type "
+"er ikke Transparent (ingen journal brukes hvis venstre tom)"
 
 #. module: stock
 #: view:stock.move:0
 msgid "Creation"
-msgstr ""
+msgstr "Opprettet"
 
 #. module: stock
 #: view:report.stock.inventory:0
 msgid ""
 "Analysis of current inventory (only moves that have already been processed)"
-msgstr ""
+msgstr "Analyse av dagens beholdning (kun trekk som allerede er behandlet)"
 
 #. module: stock
 #: field:stock.partial.move.line,cost:0
 #: field:stock.partial.picking.line,cost:0
 msgid "Cost"
-msgstr ""
+msgstr "Kostnad"
 
 #. module: stock
 #: field:product.category,property_stock_account_input_categ:0
 #: field:product.template,property_stock_account_input:0
 #: field:stock.change.standard.price,stock_account_input:0
 msgid "Stock Input Account"
-msgstr ""
+msgstr "Lager Input-konto"
 
 #. module: stock
 #: view:report.stock.move:0
 msgid "Shipping type specify, goods coming in or going out"
-msgstr ""
+msgstr "Spesifiser frakttypen, varer kommer inn eller går ut"
 
 #. module: stock
 #: model:ir.ui.menu,name:stock.menu_stock_warehouse_mgmt
@@ -2050,12 +2189,12 @@ msgstr "Delvis levering"
 #. module: stock
 #: selection:stock.location,chained_auto_packing:0
 msgid "Automatic No Step Added"
-msgstr ""
+msgstr "Automatisk Ingen Trinn Lagt til."
 
 #. module: stock
 #: view:stock.location.product:0
 msgid "Stock Location Analysis"
-msgstr ""
+msgstr "Lager Sted Analyse"
 
 #. module: stock
 #: help:stock.move,date:0
@@ -2063,18 +2202,20 @@ msgid ""
 "Move date: scheduled date until move is done, then date of actual move "
 "processing"
 msgstr ""
+"Flytt dato: planlagte datoen til flyttingen er gjort, så datoen for selve "
+"flyttingen behandling."
 
 #. module: stock
 #: view:report.stock.inventory:0 view:report.stock.move:0
 #: view:stock.inventory:0 view:stock.move:0 view:stock.picking:0
 #: view:stock.production.lot:0
 msgid "Group By..."
-msgstr ""
+msgstr "Grupper etter ..."
 
 #. module: stock
 #: view:stock.location:0
 msgid "Chained Locations"
-msgstr ""
+msgstr "Knyttede lokasjoner"
 
 #. module: stock
 #: model:stock.location,name:stock.location_inventory
@@ -2090,13 +2231,13 @@ msgstr "Dokument"
 #. module: stock
 #: view:stock.picking:0
 msgid "Input Picking List"
-msgstr ""
+msgstr "Inngang plukkliste"
 
 #. module: stock
 #: field:stock.move,product_uom:0 field:stock.partial.move.line,product_uom:0
 #: field:stock.partial.picking.line,product_uom:0
 msgid "Unit of Measure"
-msgstr ""
+msgstr "Enhet"
 
 #. module: stock
 #: code:addons/stock/product.py:175
@@ -2110,6 +2251,8 @@ msgid ""
 "Forces to specify a Production Lot for all moves containing this product and "
 "generated by a Manufacturing Order"
 msgstr ""
+"Styrker for å angi en produksjon Vare ved all forflytning inneholder dette "
+"produktet og generert av en Fremstilling bestilling"
 
 #. module: stock
 #: view:product.product:0
@@ -2142,7 +2285,7 @@ msgstr "Kan ikke finne differanse mellom standardpris og ny pris!"
 #: model:stock.location,name:stock.stock_location_scrapped
 #: field:stock.move,scrapped:0
 msgid "Scrapped"
-msgstr ""
+msgstr "Skrotet"
 
 #. module: stock
 #: view:stock.inventory:0
@@ -2152,18 +2295,18 @@ msgstr "Produkter "
 #. module: stock
 #: field:product.product,track_incoming:0
 msgid "Track Incoming Lots"
-msgstr ""
+msgstr "Spor innkommende varer"
 
 #. module: stock
 #: view:board.board:0
 msgid "Warehouse board"
-msgstr ""
+msgstr "varehus styret"
 
 #. module: stock
 #: code:addons/stock/product.py:439
 #, python-format
 msgid "Future Qty"
-msgstr ""
+msgstr "fremtidig Antall"
 
 #. module: stock
 #: field:stock.move,note:0 view:stock.picking:0 field:stock.picking,note:0
@@ -2184,7 +2327,7 @@ msgstr "Forsendelestype"
 #. module: stock
 #: view:stock.move:0
 msgid "Stock moves that are Confirmed, Available or Waiting"
-msgstr ""
+msgstr "Vareflyttinger som er godkjente, ledige eller ventende"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.act_product_location_open
@@ -2214,18 +2357,18 @@ msgstr "Leveringsmåte"
 #: help:report.stock.move,location_dest_id:0
 #: help:stock.move,location_dest_id:0 help:stock.picking,location_dest_id:0
 msgid "Location where the system will stock the finished products."
-msgstr ""
+msgstr "Lokasjon hvor systemet vil plassere de ferdige produktene."
 
 #. module: stock
 #: view:stock.move:0
 msgid "Stock to be delivered (Available or not)"
-msgstr ""
+msgstr "Varer som skal leveres (ledige eller ikke)"
 
 #. module: stock
 #: view:board.board:0
 #: model:ir.actions.act_window,name:stock.action_stock_outgoing_product_delay
 msgid "Outgoing Products"
-msgstr ""
+msgstr "Utgående produkter"
 
 #. module: stock
 #: model:ir.actions.act_window,help:stock.action_reception_picking_move
@@ -2236,6 +2379,11 @@ msgid ""
 "the supplier or the purchase order reference. Then you can confirm all "
 "products received using the buttons on the right of each line."
 msgstr ""
+"Her kan du motta individuelle produkter, uansett hva slags kjøpsordre eller "
+"plukkeordre de kommer fra. Du finner listen over alle produktene du venter "
+"på. Med en gang du får en ordre, kan du filtrere den basert på navnet til "
+"leverandøren eller kjøpsordrens referanse. Deretter kan du godkjenne alle "
+"produktene du har fått ved bruk av knappene til høyre for hver linje."
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_move
@@ -2245,29 +2393,29 @@ msgstr "Lagerbevegelse"
 #. module: stock
 #: view:report.stock.move:0
 msgid "Delay(Days)"
-msgstr ""
+msgstr "Forsinkelse (dager)"
 
 #. module: stock
 #: code:addons/stock/stock.py:1697
 #, python-format
 msgid "Operation forbidden"
-msgstr ""
+msgstr "Drift forbudt"
 
 #. module: stock
 #: help:stock.picking,min_date:0
 msgid "Expected date for the picking to be processed"
-msgstr ""
+msgstr "Forventet dato for plukkingen som skal behandles"
 
 #. module: stock
 #: code:addons/stock/product.py:435
 #, python-format
 msgid "P&L Qty"
-msgstr ""
+msgstr "P & L Antall"
 
 #. module: stock
 #: view:stock.picking:0
 msgid "Internal Pickings to invoice"
-msgstr ""
+msgstr "Intern plukking til faktura."
 
 #. module: stock
 #: view:stock.production.lot:0 field:stock.production.lot,revisions:0
@@ -2277,7 +2425,7 @@ msgstr "Revisjoner"
 #. module: stock
 #: view:stock.picking:0
 msgid "This operation will cancel the shipment. Do you want to continue?"
-msgstr ""
+msgstr "Denne driften vil avbryte transporten. Vil du fortsette?"
 
 #. module: stock
 #: help:product.product,valuation:0
@@ -2288,6 +2436,11 @@ msgid ""
 "current inventory value, and the stock input and stock output account will "
 "hold the counterpart moves for incoming and outgoing products."
 msgstr ""
+"Hvis sanntidsbeskyttelse verdivurdering er aktivert for et produkt, vil "
+"systemet automatisk skrive posteringer tilsvarende lager move. Inventar "
+"variasjon kontoen satt på produktkategori vil representere den aktuelle "
+"beholdningen, og aksjen inngang og lager utgang konto vil holde motpart "
+"trekk for innkommende og utgående produkter."
 
 #. module: stock
 #: model:ir.actions.act_window,help:stock.action_stock_inventory_report
@@ -2296,6 +2449,9 @@ msgid ""
 "levels. Sort and group by selection criteria in order to better analyse and "
 "manage your company  activities."
 msgstr ""
+"Inventar Analyse kan du enkelt sjekke og analysere bedriftens "
+"lagerbeholdning. Sortere og gruppere etter utvelgelseskriterier for å bedre "
+"analysere og administrere selskapets aktiviteter."
 
 #. module: stock
 #: help:report.stock.move,location_id:0 help:stock.move,location_id:0
@@ -2303,6 +2459,8 @@ msgid ""
 "Sets a location if you produce at a fixed location. This can be a partner "
 "location if you subcontract the manufacturing operations."
 msgstr ""
+"Angir et varehus hvis du produserer på et fast sted. Dette kan være et "
+"samarbeidssted hvis du setter bort produksjonsoperasjonene."
 
 #. module: stock
 #: model:ir.actions.act_window,help:stock.action_location_form
@@ -2317,6 +2475,14 @@ msgid ""
 "location to the Stock location. Each report can be performed on physical, "
 "partner or virtual locations."
 msgstr ""
+"Definer dine steder å reflektere lageret struktur og organisering. OpenERP "
+"er i stand til å håndtere fysiske steder (varehus, hyller, bin, etc), "
+"partner steder (kunder, leverandører) og virtuelle steder som er motstykket "
+"til aksjen operasjoner som produksjonskostnadene bestillinger forbruk, "
+"varelager etc. Hver aksje drift i OpenERP flytter produkter fra ett sted til "
+"et annet. For eksempel, hvis du mottar produkter fra en leverandør, vil "
+"OpenERP flytte produkter fra Leverandør beliggenhet til Lager plassering. "
+"Hver rapport kan utføres på fysisk, partner eller virtuelle steder."
 
 #. module: stock
 #: view:stock.invoice.onshipping:0
@@ -2326,7 +2492,7 @@ msgstr "Opprett"
 #. module: stock
 #: view:stock.move:0 view:stock.picking:0
 msgid "Dates"
-msgstr ""
+msgstr "Datoer"
 
 #. module: stock
 #: field:stock.move,priority:0
@@ -2336,7 +2502,7 @@ msgstr "Prioritet"
 #. module: stock
 #: view:stock.move:0
 msgid "Source"
-msgstr ""
+msgstr "Kilde"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_inventory
@@ -2355,7 +2521,7 @@ msgstr "Plukkliste"
 #: sql_constraint:stock.production.lot:0
 msgid ""
 "The combination of serial number and internal reference must be unique !"
-msgstr ""
+msgstr "Kombinasjonen av serienummer og intern referanse må være unikt!"
 
 #. module: stock
 #: view:stock.inventory:0
@@ -2373,7 +2539,7 @@ msgstr "Feil !"
 #: model:ir.ui.menu,name:stock.menu_stock_unit_measure_stock
 #: model:ir.ui.menu,name:stock.menu_stock_uom_form_action
 msgid "Units of Measure"
-msgstr ""
+msgstr "Enheter"
 
 #. module: stock
 #: selection:stock.location,chained_location_type:0
@@ -2384,7 +2550,7 @@ msgstr "Fast lokasjon"
 #: code:addons/stock/stock.py:2486
 #, python-format
 msgid "Product  '%s' is consumed with '%s' quantity."
-msgstr ""
+msgstr "Produkt '%s' er fortært med '%s' mengde."
 
 #. module: stock
 #: model:product.template,description:stock.product_icecream_product_template
@@ -2395,6 +2561,11 @@ msgid ""
 "ice cream shops, convenience stores, and milk bars, and in individual "
 "servings from small carts or vans at public events."
 msgstr ""
+"Iskrem kan bli masseprodusert og dermed er allment tilgjengelig i utviklede "
+"deler av verden. Iskrem kan kjøpes i store kartonger (vats og squrounds) fra "
+"supermarkeder og dagligvarebutikker, i mindre mengder fra iskrem butikker, "
+"kiosker og melk barer, og i enkelte porsjoner fra små vogner eller varebiler "
+"på offentlige arrangementer."
 
 #. module: stock
 #: selection:report.stock.inventory,month:0
@@ -2405,7 +2576,7 @@ msgstr "Juli"
 #. module: stock
 #: view:report.stock.lines.date:0
 msgid "Consumable"
-msgstr ""
+msgstr "Forbruksmateriell"
 
 #. module: stock
 #: model:ir.actions.act_window,help:stock.action_stock_line_date
@@ -2415,11 +2586,15 @@ msgid ""
 "need this report in order to ensure that the stock of each product is "
 "controlled at least once a year."
 msgstr ""
+"Vise de siste varelager gjort på dine produkter og enkelt sortere dem med "
+"spesifikke filtreringskriterier. Hvis du gjør hyppige og delvis varelager, "
+"trenger du denne rapporten for å sikre at bestanden av hvert produkt er "
+"kontrollert minst en gang i året."
 
 #. module: stock
 #: model:stock.location,name:stock.location_opening
 msgid "opening"
-msgstr ""
+msgstr "åpning"
 
 #. module: stock
 #: model:ir.actions.report.xml,name:stock.report_product_history
@@ -2442,24 +2617,24 @@ msgstr "Innkjøp"
 #. module: stock
 #: model:stock.location,name:stock.stock_location_4
 msgid "Maxtor Suppliers"
-msgstr ""
+msgstr "Maxtor leverandører"
 
 #. module: stock
 #: code:addons/stock/wizard/stock_change_product_qty.py:78
 #: code:addons/stock/wizard/stock_change_standard_price.py:107
 #, python-format
 msgid "Active ID is not set in Context"
-msgstr ""
+msgstr "Aktiv ID er ikke satt i sammenheng."
 
 #. module: stock
 #: view:stock.picking:0
 msgid "Force Availability"
-msgstr ""
+msgstr "Kraft Tilgjengelighet"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.move_scrap view:stock.move.scrap:0
 msgid "Scrap Move"
-msgstr ""
+msgstr "skrap Flytt"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_reception_picking_move
@@ -2471,7 +2646,7 @@ msgstr "Motta produkter"
 #: model:ir.actions.act_window,name:stock.action_out_picking_move
 #: model:ir.ui.menu,name:stock.menu_action_pdct_out
 msgid "Deliver Products"
-msgstr ""
+msgstr "Lever produkter"
 
 #. module: stock
 #: view:stock.location.product:0
@@ -2492,23 +2667,24 @@ msgstr "Dato for ferdigstillelse"
 #. module: stock
 #: help:stock.production.lot,name:0
 msgid "Unique production lot, will be displayed as: PREFIX/SERIAL [INT_REF]"
-msgstr ""
+msgstr "Unike produksjon mye, vil bli vist som: PREFIX / SERIAL [INT_REF]"
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_company
 msgid "Your Company"
-msgstr ""
+msgstr "Ditt selskap"
 
 #. module: stock
 #: constraint:stock.move:0
 msgid "You can not move products from or to a location of the type view."
-msgstr ""
+msgstr "Kan ikke flytte produkter til eller fra en lokasjon av typen view."
 
 #. module: stock
 #: help:stock.tracking,active:0
 msgid ""
 "By unchecking the active field, you may hide a pack without deleting it."
 msgstr ""
+"Ved å fjerne det aktive feltet, kan du skjule en pakke uten å slette den."
 
 #. module: stock
 #: view:stock.inventory.merge:0
@@ -2539,7 +2715,7 @@ msgstr "Firma"
 #. module: stock
 #: view:stock.move:0 view:stock.picking:0
 msgid "Unit Of Measure"
-msgstr ""
+msgstr "Enhet"
 
 #. module: stock
 #: code:addons/stock/product.py:121
@@ -2547,12 +2723,13 @@ msgstr ""
 msgid ""
 "There is no stock input account defined for this product: \"%s\" (id: %d)"
 msgstr ""
+"Det er ingen lagerinngangskonto definert med dette produktet :\"%s\" (id: %d)"
 
 #. module: stock
 #: code:addons/stock/stock.py:2445
 #, python-format
 msgid "Can not consume a move with negative or zero quantity !"
-msgstr ""
+msgstr "Kan ikke forbruke et trekk med negativ eller null kvantitet!"
 
 #. module: stock
 #: field:stock.location,stock_real:0
@@ -2562,18 +2739,19 @@ msgstr "Virkelig lager"
 #. module: stock
 #: view:stock.fill.inventory:0
 msgid "Fill Inventory"
-msgstr ""
+msgstr "Fyll Varelager"
 
 #. module: stock
 #: constraint:product.template:0
 msgid ""
 "Error: The default UOM and the purchase UOM must be in the same category."
 msgstr ""
+"Feil: Standard målenheter og kjøp målenheter må være i samme kategori."
 
 #. module: stock
 #: model:stock.location,name:stock.location_delivery_counter
 msgid "Delivery Counter"
-msgstr ""
+msgstr "Leveringsskranke"
 
 #. module: stock
 #: view:report.stock.inventory:0 field:report.stock.inventory,prodlot_id:0
@@ -2584,13 +2762,13 @@ msgstr "Lot"
 #. module: stock
 #: view:stock.move.split:0
 msgid "Production Lot Number"
-msgstr ""
+msgstr "Produksjonsvarenummer"
 
 #. module: stock
 #: code:addons/stock/stock.py:2697
 #, python-format
 msgid "Inventory '%s' is done."
-msgstr ""
+msgstr "Varelager '%s' er ferdig."
 
 #. module: stock
 #: field:stock.move,product_uos_qty:0
@@ -2603,6 +2781,7 @@ msgstr "Kvantum (salgsenhet)"
 msgid ""
 "You are moving %.2f %s products but only %.2f %s available in this lot."
 msgstr ""
+"Du flytter %.2f %s prudukter, men bare %.2f %s er ledige i dette produktet."
 
 #. module: stock
 #: view:stock.move:0
@@ -2612,12 +2791,12 @@ msgstr "Gjør tilgjengelig"
 #. module: stock
 #: report:stock.picking.list:0
 msgid "Contact Address :"
-msgstr ""
+msgstr "Kontaktadresse:"
 
 #. module: stock
 #: field:stock.move,backorder_id:0
 msgid "Back Order"
-msgstr ""
+msgstr "Tilbakeordre"
 
 #. module: stock
 #: field:stock.incoterms,active:0 field:stock.location,active:0
@@ -2641,7 +2820,7 @@ msgstr "Feil, ingen klient !"
 #: field:stock.inventory.line.split.lines,wizard_id:0
 #: field:stock.move.split.lines,wizard_id:0
 msgid "Parent Wizard"
-msgstr ""
+msgstr "Overordnet veiviser"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_incoterms_tree
@@ -2654,7 +2833,7 @@ msgstr "Incoterms"
 #. module: stock
 #: model:ir.model,name:stock.model_stock_partial_picking_line
 msgid "stock.partial.picking.line"
-msgstr ""
+msgstr "lager delvis plukke linje"
 
 #. module: stock
 #: report:lot.stock.overview:0 report:lot.stock.overview_all:0
@@ -2676,22 +2855,24 @@ msgid ""
 "If checked, products contained in child locations of selected location will "
 "be included as well."
 msgstr ""
+"Hvis det er merket, vil produkter som finnes i barnets steder av valgte "
+"plasseringen være inkludert."
 
 #. module: stock
 #: field:stock.inventory,name:0
 msgid "Inventory Reference"
-msgstr ""
+msgstr "Inventar Referanse."
 
 #. module: stock
 #: code:addons/stock/stock.py:1334
 #, python-format
 msgid "Internal picking"
-msgstr ""
+msgstr "Intern plukking"
 
 #. module: stock
 #: view:stock.location.product:0
 msgid "Open Product"
-msgstr ""
+msgstr "Åpne produkt"
 
 #. module: stock
 #: field:stock.location.product,to_date:0
@@ -2701,7 +2882,7 @@ msgstr "Til"
 #. module: stock
 #: view:stock.move:0 view:stock.picking:0
 msgid "Process"
-msgstr ""
+msgstr "Prosess"
 
 #. module: stock
 #: field:stock.production.lot.revision,name:0
@@ -2723,12 +2904,12 @@ msgstr "Bekreft beholdning"
 #. module: stock
 #: view:product.category:0
 msgid "Accounting Stock Properties"
-msgstr ""
+msgstr "Regnskapsmessige Lager Egenskaper"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_picking_tree_out
 msgid "Customers Packings"
-msgstr ""
+msgstr "Kunder Pakninger"
 
 #. module: stock
 #: selection:report.stock.inventory,state:0 view:report.stock.move:0
@@ -2782,19 +2963,19 @@ msgstr "Lager"
 #. module: stock
 #: field:stock.journal,user_id:0
 msgid "Responsible"
-msgstr ""
+msgstr "Ansvarlig"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_stock_inventory_report
 #: model:ir.ui.menu,name:stock.menu_action_stock_inventory_report
 #: view:report.stock.inventory:0
 msgid "Inventory Analysis"
-msgstr ""
+msgstr "Inventar Analyse"
 
 #. module: stock
 #: field:stock.invoice.onshipping,journal_id:0
 msgid "Destination Journal"
-msgstr ""
+msgstr "Destinasjon Journal"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.act_stock_tracking_lot_2_stock_report_tracklots
@@ -2830,19 +3011,19 @@ msgstr "Retur"
 #. module: stock
 #: field:stock.return.picking,invoice_state:0
 msgid "Invoicing"
-msgstr ""
+msgstr "Fakturering"
 
 #. module: stock
 #: view:stock.picking:0
 msgid "Assigned Internal Moves"
-msgstr ""
+msgstr "Tildelte Intern trekk"
 
 #. module: stock
 #: code:addons/stock/stock.py:2379 code:addons/stock/stock.py:2440
 #: code:addons/stock/wizard/stock_partial_picking.py:141
 #, python-format
 msgid "Please provide Proper Quantity !"
-msgstr ""
+msgstr "Vennligst gi riktig mengde!"
 
 #. module: stock
 #: field:stock.move,product_uos:0
@@ -2858,18 +3039,18 @@ msgstr "Høyde (Z)"
 #: model:ir.model,name:stock.model_stock_move_consume
 #: view:stock.move.consume:0
 msgid "Consume Products"
-msgstr ""
+msgstr "Forbruk Produkter"
 
 #. module: stock
 #: code:addons/stock/stock.py:1742
 #, python-format
 msgid "Insufficient Stock in Lot !"
-msgstr ""
+msgstr "Utilstrekkelig lager i Vare!"
 
 #. module: stock
 #: field:stock.location,parent_right:0
 msgid "Right Parent"
-msgstr ""
+msgstr "høyere Overordnet"
 
 #. module: stock
 #: field:stock.picking,address_id:0
@@ -2894,7 +3075,7 @@ msgstr "Leverandører"
 #. module: stock
 #: field:report.stock.inventory,value:0 field:report.stock.move,value:0
 msgid "Total Value"
-msgstr ""
+msgstr "Total kostnad"
 
 #. module: stock
 #: model:ir.ui.menu,name:stock.menu_product_by_category_stock_form
@@ -2904,24 +3085,24 @@ msgstr "Produkter per produktgruppe"
 #. module: stock
 #: selection:stock.picking,state:0
 msgid "Waiting Another Operation"
-msgstr ""
+msgstr "Venter på en ny operasjon"
 
 #. module: stock
 #: view:stock.location:0
 msgid "Supplier Locations"
-msgstr ""
+msgstr "Leverandørlokasjoner"
 
 #. module: stock
 #: field:stock.partial.move.line,wizard_id:0
 #: field:stock.partial.picking.line,wizard_id:0
 #: field:stock.return.picking.memory,wizard_id:0
 msgid "Wizard"
-msgstr ""
+msgstr "Veiviser"
 
 #. module: stock
 #: view:report.stock.move:0
 msgid "Completed Stock-Moves"
-msgstr ""
+msgstr "Fullførte lagerflyttinger"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_view_stock_location_product
@@ -2932,12 +3113,12 @@ msgstr "Produkter per lokasjon"
 #. module: stock
 #: field:stock.fill.inventory,recursive:0
 msgid "Include children"
-msgstr ""
+msgstr "Inkluder underordede"
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_components
 msgid "Shelf 1"
-msgstr ""
+msgstr "Hylle 1"
 
 #. module: stock
 #: model:ir.actions.act_window,help:stock.action_picking_tree6
@@ -2949,11 +3130,17 @@ msgid ""
 "preconfigured logistics rules, but you can also record manual stock "
 "operations."
 msgstr ""
+"Intern trekk viser alle Inventare operasjoner du må utføre i varehuset. Alle "
+"operasjoner kan kategoriseres i lager tidsskrifter, slik at hver enkelt "
+"arbeidstaker har sin egen liste over operasjoner for å utføre i sitt eget "
+"tidsskrift. De fleste operasjoner er forberedt automatisk av OpenERP henhold "
+"til forhåndskonfigurerte logistikk regler, men du kan også spille manuelle "
+"lager operasjoner."
 
 #. module: stock
 #: view:stock.move:0
 msgid "Order"
-msgstr ""
+msgstr "Ordre"
 
 #. module: stock
 #: view:product.product:0
@@ -2963,7 +3150,7 @@ msgstr "Kostpris :"
 #. module: stock
 #: field:stock.tracking,name:0
 msgid "Pack Reference"
-msgstr ""
+msgstr "Pakkereferanse"
 
 #. module: stock
 #: view:report.stock.move:0 field:report.stock.move,location_id:0
@@ -2975,37 +3162,37 @@ msgstr "Kildelokasjon"
 #. module: stock
 #: view:stock.move:0
 msgid " Waiting"
-msgstr ""
+msgstr " Venter"
 
 #. module: stock
 #: view:product.template:0
 msgid "Accounting Entries"
-msgstr ""
+msgstr "Regnskapspostene"
 
 #. module: stock
 #: model:res.groups,name:stock.group_stock_manager
 msgid "Manager"
-msgstr ""
+msgstr "Manager"
 
 #. module: stock
 #: report:stock.picking.list:0
 msgid "Total"
-msgstr ""
+msgstr "Totalt"
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_intermediatelocation0
 msgid "Internal Shippings"
-msgstr ""
+msgstr "Intern frakt"
 
 #. module: stock
 #: field:stock.change.standard.price,enable_stock_in_out_acc:0
 msgid "Enable Related Account"
-msgstr ""
+msgstr "Aktiver relatert konto"
 
 #. module: stock
 #: field:stock.location,stock_virtual_value:0
 msgid "Virtual Stock Value"
-msgstr ""
+msgstr "Virtuell Lager Verdi"
 
 #. module: stock
 #: view:product.product:0 view:stock.inventory.line.split:0
@@ -3021,7 +3208,7 @@ msgstr ""
 #. module: stock
 #: view:stock.move:0
 msgid "Destination"
-msgstr ""
+msgstr "Destinasjon"
 
 #. module: stock
 #: selection:stock.picking,move_type:0
@@ -3035,17 +3222,19 @@ msgid ""
 "Quantities, UoMs, Products and Locations cannot be modified on stock moves "
 "that have already been processed (except by the Administrator)"
 msgstr ""
+"Mengder, enheter, produkter og steder kan ikke endres på lager trekk som "
+"allerede er behandlet (med unntak av Administrator)"
 
 #. module: stock
 #: code:addons/stock/product.py:445
 #, python-format
 msgid "Future Productions"
-msgstr ""
+msgstr "Fremtidige produkter"
 
 #. module: stock
 #: view:stock.picking:0
 msgid "To Invoice"
-msgstr ""
+msgstr "Å fakturere"
 
 #. module: stock
 #: view:stock.return.picking:0
@@ -3061,42 +3250,42 @@ msgstr "Dato for lagerverdi"
 #. module: stock
 #: view:report.stock.move:0
 msgid "Total incoming quantity"
-msgstr ""
+msgstr "Totalt innkommende mengde."
 
 #. module: stock
 #: field:report.stock.move,product_qty_out:0
 msgid "Out Qty"
-msgstr ""
+msgstr "ut Antall"
 
 #. module: stock
 #: field:stock.production.lot,move_ids:0
 msgid "Moves for this production lot"
-msgstr ""
+msgstr "Flyttinger for denne produksjonsvaren"
 
 #. module: stock
 #: view:stock.move:0 view:stock.picking:0
 msgid "Put in current pack"
-msgstr ""
+msgstr "Sett in gjeldende pakke"
 
 #. module: stock
 #: view:stock.inventory:0
 msgid "Lot Inventory"
-msgstr ""
+msgstr "Varelager"
 
 #. module: stock
 #: view:stock.move:0
 msgid "Reason"
-msgstr ""
+msgstr "Grunn"
 
 #. module: stock
 #: model:product.template,name:stock.product_icecream_product_template
 msgid "Ice Cream"
-msgstr ""
+msgstr "Iskrem"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_partial_picking
 msgid "Partial Picking Processing Wizard"
-msgstr ""
+msgstr "Delvis plukking Siden lastet veiviseren"
 
 #. module: stock
 #: model:ir.actions.act_window,help:stock.action_production_lot_form
@@ -3108,6 +3297,11 @@ msgid ""
 "'Available' button to get all the lots you produced, received or delivered "
 "to customers."
 msgstr ""
+"Dette er listen over alle produksjonen (serienumre) du har tatt opp. Når du "
+"velger en , kan du få oppstrøms eller nedstrøms sporbarhet av produktene som "
+"finnes i mye. Som standard er listen filtreres på serienumrene som er "
+"tilgjengelige på lageret, men du kan avmerk 'Tilgjengelig' knappen for å få "
+"alle tomtene du produserte, mottatt eller levert til kunden."
 
 #. module: stock
 #: field:stock.location,icon:0
@@ -3143,11 +3337,16 @@ msgid ""
 "default value for all products in this category. It can also directly be set "
 "on each product"
 msgstr ""
+"Når du gjør ektetid beholdningsvurdering vil motpart journal elementer for "
+"alle utgående aksjen beveger seg bli postet i denne kontoen, med mindre det "
+"er en konkret vurdering konto sett på målplassering. Dette er "
+"standardverdien for alle produkter i denne kategorien. Det kan også direkte "
+"settes på hvert produkt."
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_8
 msgid "Non European Customers"
-msgstr ""
+msgstr "Kunder som ikke er fra Europa"
 
 #. module: stock
 #: code:addons/stock/product.py:75 code:addons/stock/product.py:89
@@ -3179,31 +3378,31 @@ msgstr "Kansellert"
 #. module: stock
 #: view:stock.picking:0
 msgid "Confirmed Delivery Orders"
-msgstr ""
+msgstr "Godkjente leveringsordre"
 
 #. module: stock
 #: view:stock.move:0 field:stock.partial.move,picking_id:0
 #: field:stock.partial.picking,picking_id:0
 msgid "Picking"
-msgstr ""
+msgstr "Plukker"
 
 #. module: stock
 #: help:stock.picking,move_type:0
 msgid "It specifies goods to be delivered all at once or by direct delivery"
-msgstr ""
+msgstr "Den angir varer skal leveres på en gang eller ved direkte levering"
 
 #. module: stock
 #: code:addons/stock/wizard/stock_invoice_onshipping.py:96
 #, python-format
 msgid "This picking list does not require invoicing."
-msgstr ""
+msgstr "Denne plukklisten krever ikke fakturering."
 
 #. module: stock
 #: selection:report.stock.move,type:0
 #: selection:stock.location,chained_picking_type:0
 #: selection:stock.picking,type:0
 msgid "Getting Goods"
-msgstr ""
+msgstr "Får produkter"
 
 #. module: stock
 #: help:stock.location,chained_location_type:0
@@ -3219,6 +3418,16 @@ msgid ""
 "* Fixed Location: The chained location is taken from the next field: Chained "
 "Location if Fixed."
 msgstr ""
+"Avgjør om denne plasseringen er lenket til et annet sted, det vil si alle "
+"innkommende produkt i denne plasseringen\n"
+"bør neste gå til lenket plassering. Den lenket posisjonen beregnes i henhold "
+"til typen:\n"
+"* Ingen: Ingen kjeding i det hele tatt\n"
+"* Kunde: Den lenket plasseringen vil bli tatt fra Kunden Location-feltet på "
+"Partner form av Partner som er angitt i Plukkliste av innkommende "
+"produkter.\n"
+"* Fast Beliggenhet: lenket beliggenhet er hentet fra det neste feltet: "
+"Lenket Plassering hvis den er fikset."
 
 #. module: stock
 #: code:addons/stock/wizard/stock_inventory_merge.py:43
@@ -3233,7 +3442,7 @@ msgstr "Advarsel"
 #: code:addons/stock/stock.py:1348
 #, python-format
 msgid "is done."
-msgstr ""
+msgstr "er ferdig."
 
 #. module: stock
 #: field:stock.production.lot.revision,date:0
@@ -3251,7 +3460,7 @@ msgstr "Leveringsordre"
 #. module: stock
 #: view:stock.picking:0
 msgid "Delivery orders already processed"
-msgstr ""
+msgstr "Leveringsordre er allerede behandlet"
 
 #. module: stock
 #: help:res.partner,property_stock_customer:0
@@ -3259,6 +3468,8 @@ msgid ""
 "This stock location will be used, instead of the default one, as the "
 "destination location for goods you send to this partner"
 msgstr ""
+"Denne lagerlokasjonen vil bli brukt, i stedet for en standard en, som "
+"målplassering for varer du sender til denne partneren"
 
 #. module: stock
 #: selection:report.stock.inventory,state:0
@@ -3286,18 +3497,20 @@ msgstr ""
 #. module: stock
 #: help:stock.change.product.qty,new_quantity:0
 msgid "This quantity is expressed in the Default UoM of the product."
-msgstr ""
+msgstr "Dette kvantumet er uttrykt i Standard målenheter av produktet."
 
 #. module: stock
 #: report:stock.picking.list:0
 msgid "Reception:"
-msgstr ""
+msgstr "Resepsjon:"
 
 #. module: stock
 #: help:stock.location,scrap_location:0
 msgid ""
 "Check this box to allow using this location to put scrapped/damaged goods."
 msgstr ""
+"Kryss av i denne boksen for å tillate å bruke dette stedet til å sette "
+"ødelagte/skadede varer."
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.act_relate_picking
@@ -3312,17 +3525,17 @@ msgstr "Planlagt år"
 #. module: stock
 #: view:report.stock.move:0
 msgid "Total outgoing quantity"
-msgstr ""
+msgstr "Totalt utgående mengde"
 
 #. module: stock
 #: selection:stock.move,state:0 selection:stock.picking,state:0
 msgid "New"
-msgstr ""
+msgstr "Ny"
 
 #. module: stock
 #: help:stock.partial.move.line,cost:0 help:stock.partial.picking.line,cost:0
 msgid "Unit Cost for this product line"
-msgstr ""
+msgstr "Enhetskostnaden for denne produkt linjen."
 
 #. module: stock
 #: model:ir.model,name:stock.model_product_category
@@ -3330,7 +3543,7 @@ msgstr ""
 #: field:report.stock.inventory,product_categ_id:0 view:report.stock.move:0
 #: field:report.stock.move,categ_id:0
 msgid "Product Category"
-msgstr ""
+msgstr "Produktkategori"
 
 #. module: stock
 #: model:ir.ui.menu,name:stock.next_id_61
@@ -3341,7 +3554,7 @@ msgstr "Rapportering"
 #: code:addons/stock/stock.py:1343
 #, python-format
 msgid " for the "
-msgstr ""
+msgstr " for "
 
 #. module: stock
 #: view:stock.split.into:0
@@ -3351,7 +3564,7 @@ msgstr ""
 #. module: stock
 #: view:stock.move:0
 msgid "Stock available to be delivered"
-msgstr ""
+msgstr "Lager tilgjengelig til å bli levert"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_stock_invoice_onshipping
@@ -3362,7 +3575,7 @@ msgstr "Lag faktura"
 #. module: stock
 #: view:stock.picking:0
 msgid "Confirmed Internal Moves"
-msgstr ""
+msgstr "Bekreftet Intern trekk"
 
 #. module: stock
 #: model:ir.ui.menu,name:stock.menu_stock_configuration
@@ -3373,7 +3586,7 @@ msgstr "Konfigurasjon"
 #: field:stock.inventory.line.split,use_exist:0
 #: field:stock.move.split,use_exist:0
 msgid "Existing Lots"
-msgstr ""
+msgstr "Eksisterende produkter"
 
 #. module: stock
 #: view:stock.location:0
@@ -3389,11 +3602,16 @@ msgid ""
 "If cost price is decreased, stock variation account will be creadited and "
 "stock input account will be debited."
 msgstr ""
+"Hvis kostprisen økes, vil lager variasjon konto bli belastet og lager utgang "
+"konto vil bli kreditert med verdi = (forskjell på mengden * mengde "
+"tilgjengelig).\n"
+"Hvis kostprisen er redusert, vil lager variasjon kontoen creadited og lager "
+"innspill konto vil bli belastet."
 
 #. module: stock
 #: field:stock.location,chained_journal_id:0
 msgid "Chaining Journal"
-msgstr ""
+msgstr "Kjeding Journal"
 
 #. module: stock
 #: model:ir.actions.report.xml,name:stock.report_picking_list
@@ -3404,7 +3622,7 @@ msgstr "Pakkseddel"
 #: code:addons/stock/stock.py:738
 #, python-format
 msgid "Not enough stock, unable to reserve the products."
-msgstr ""
+msgstr "Ikke nok lager, ute av stand til å reservere produktene."
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_customers
@@ -3414,13 +3632,13 @@ msgstr "Kunder"
 #. module: stock
 #: selection:stock.move,state:0 selection:stock.picking,state:0
 msgid "Waiting Availability"
-msgstr ""
+msgstr "Venter Tilgjengelighet"
 
 #. module: stock
 #: code:addons/stock/stock.py:1347
 #, python-format
 msgid "is cancelled."
-msgstr ""
+msgstr "er avbrutt"
 
 #. module: stock
 #: view:stock.inventory.line:0
@@ -3430,33 +3648,33 @@ msgstr "Lagerbeholdningslinje"
 #. module: stock
 #: view:stock.move:0
 msgid "Waiting "
-msgstr ""
+msgstr "Venter "
 
 #. module: stock
 #: code:addons/stock/product.py:427
 #, python-format
 msgid "Future Deliveries"
-msgstr ""
+msgstr "Fremtidige leveranser"
 
 #. module: stock
 #: view:stock.picking:0
 msgid "Additional info"
-msgstr ""
+msgstr "Ytterligere info"
 
 #. module: stock
 #: view:stock.move:0 field:stock.move,tracking_id:0
 msgid "Pack"
-msgstr ""
+msgstr "Pakk"
 
 #. module: stock
 #: view:stock.move:0 view:stock.picking:0
 msgid "Date Expected"
-msgstr ""
+msgstr "Forventet dato"
 
 #. module: stock
 #: field:stock.move,auto_validate:0
 msgid "Auto Validate"
-msgstr ""
+msgstr "Automatisk Valider"
 
 #. module: stock
 #: report:stock.picking.list:0
@@ -3466,17 +3684,17 @@ msgstr "Vekt"
 #. module: stock
 #: model:ir.model,name:stock.model_product_template
 msgid "Product Template"
-msgstr ""
+msgstr "Produktmal"
 
 #. module: stock
 #: selection:report.stock.move,month:0
 msgid "December"
-msgstr ""
+msgstr "Desember"
 
 #. module: stock
 #: view:stock.production.lot:0
 msgid "Available Product Lots"
-msgstr ""
+msgstr "Tilgjengelig produkt Masse"
 
 #. module: stock
 #: model:ir.actions.act_window,help:stock.action_move_form2
@@ -3485,16 +3703,19 @@ msgid ""
 "specific product. You can filter on the product to see all the past or "
 "future movements for the product."
 msgstr ""
+"Denne menyen gir deg full sporbarhet av inventar operasjoner på et bestemt "
+"produkt. Du kan filtrere på produktet for å se alle de tidligere eller "
+"fremtidige bevegelser for produktet."
 
 #. module: stock
 #: view:stock.picking:0
 msgid "Return Products"
-msgstr ""
+msgstr "returnere produkter"
 
 #. module: stock
 #: view:stock.inventory:0
 msgid "Validate Inventory"
-msgstr ""
+msgstr "Valider Varelager"
 
 #. module: stock
 #: help:stock.move,price_currency_id:0
@@ -3502,17 +3723,19 @@ msgid ""
 "Technical field used to record the currency chosen by the user during a "
 "picking confirmation (when average price costing method is used)"
 msgstr ""
+"Det Teknisk feltet som brukes til å registrere valutaen valgt av brukeren "
+"under en plukke bekreftelse (når gjennomsnittlig pris koster metoden brukes)"
 
 #. module: stock
 #: code:addons/stock/wizard/stock_fill_inventory.py:53
 #, python-format
 msgid "Stock Inventory is already Validated."
-msgstr ""
+msgstr "Lagerrutiner er allerede godkjent."
 
 #. module: stock
 #: model:ir.ui.menu,name:stock.menu_stock_products_moves
 msgid "Products Moves"
-msgstr ""
+msgstr "Produkter Beveger seg."
 
 #. module: stock
 #: selection:stock.picking,invoice_state:0
@@ -3522,22 +3745,22 @@ msgstr "Fakturert"
 #. module: stock
 #: field:stock.picking,max_date:0
 msgid "Max. Expected Date"
-msgstr ""
+msgstr "Maks. forventet dato"
 
 #. module: stock
 #: field:stock.picking,auto_picking:0
 msgid "Auto-Picking"
-msgstr ""
+msgstr "Automatisk - plukking"
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_shop1
 msgid "Shop 2"
-msgstr ""
+msgstr "Butikk 2"
 
 #. module: stock
 #: field:stock.location,chained_auto_packing:0
 msgid "Chaining Type"
-msgstr ""
+msgstr "Kjeding type"
 
 #. module: stock
 #: view:report.stock.inventory:0 view:report.stock.move:0
@@ -3557,7 +3780,7 @@ msgstr "Utkast"
 #: model:ir.actions.report.xml,name:stock.report_stock_inventory_move
 #: report:stock.inventory.move:0
 msgid "Stock Inventory"
-msgstr ""
+msgstr "Lagerrutiner"
 
 #. module: stock
 #: help:report.stock.inventory,state:0
@@ -3568,6 +3791,11 @@ msgid ""
 " When the picking it done the state is 'Done'.              \n"
 "The state is 'Waiting' if the move is waiting for another one."
 msgstr ""
+"Når aksjen beveger seg er opprettet er det i \"Kladd\" tilstand.\n"
+"Etter at det er satt til 'Bekreftet' tilstand.\n"
+"Hvis aksjen er tilgjengelige stat er satt til 'ledig'.\n"
+"Når plukking det gjort staten Ferdig.\n"
+"Staten er \"Venter\" hvis farten venter på en annen."
 
 #. module: stock
 #: view:stock.picking:0
@@ -3578,7 +3806,7 @@ msgstr "Opprett faktura"
 #: code:addons/stock/wizard/stock_return_picking.py:189
 #, python-format
 msgid "Please specify at least one non-zero quantity!"
-msgstr ""
+msgstr "Vennligst oppgi minst én ikke-null kvantitet!"
 
 #. module: stock
 #: help:product.template,property_stock_procurement:0
@@ -3586,17 +3814,19 @@ msgid ""
 "For the current product, this stock location will be used, instead of the "
 "default one, as the source location for stock moves generated by procurements"
 msgstr ""
+"For det aktuelle produktet, vil dette lager posisjon brukt, i stedet for "
+"standard ett slik kildeplasseringen for lager beveger generert av innkjøp"
 
 #. module: stock
 #: code:addons/stock/stock.py:1346
 #, python-format
 msgid "is ready to process."
-msgstr ""
+msgstr "Er klar til å behandle."
 
 #. module: stock
 #: help:stock.picking,origin:0
 msgid "Reference of the document that produced this picking."
-msgstr ""
+msgstr "Referanse til dokumentet som produserte denne plukking."
 
 #. module: stock
 #: field:stock.fill.inventory,set_stock_zero:0
@@ -3606,24 +3836,24 @@ msgstr "Sett til null"
 #. module: stock
 #: model:res.groups,name:stock.group_stock_user
 msgid "User"
-msgstr ""
+msgstr "Bruker"
 
 #. module: stock
 #: code:addons/stock/wizard/stock_invoice_onshipping.py:98
 #, python-format
 msgid "None of these picking lists require invoicing."
-msgstr ""
+msgstr "Ingen av disse plukklistene krever fakturering."
 
 #. module: stock
 #: selection:report.stock.move,month:0
 msgid "November"
-msgstr ""
+msgstr "November"
 
 #. module: stock
 #: code:addons/stock/product.py:100 code:addons/stock/stock.py:2128
 #, python-format
 msgid "There is no journal defined on the product category: \"%s\" (id: %d)"
-msgstr ""
+msgstr "Det er ingen journal definert på produktkategori: \"% s\" (id:% d)"
 
 #. module: stock
 #: code:addons/stock/product.py:441
@@ -3634,18 +3864,18 @@ msgstr "Uplanlagt kvantum"
 #. module: stock
 #: field:stock.location,chained_company_id:0
 msgid "Chained Company"
-msgstr ""
+msgstr "Lenket Selvskap"
 
 #. module: stock
 #: help:stock.location,icon:0
 msgid "Icon show in  hierarchical tree view"
-msgstr ""
+msgstr "Ikon Vises i hierarkisk trevisning"
 
 #. module: stock
 #: selection:report.stock.inventory,month:0
 #: selection:report.stock.move,month:0
 msgid "January"
-msgstr ""
+msgstr "Januar"
 
 #. module: stock
 #: help:product.product,track_incoming:0
@@ -3653,6 +3883,8 @@ msgid ""
 "Forces to specify a Production Lot for all moves containing this product and "
 "coming from a Supplier Location"
 msgstr ""
+"Styrker for å angi en produksjon Vare ved all forflytning inneholder dette "
+"produktet og kommer fra en leverandør Sted."
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.act_product_stock_move_futur_open
@@ -3662,13 +3894,13 @@ msgstr "Framtidige lagerbevegelser"
 #. module: stock
 #: field:stock.move,move_history_ids2:0
 msgid "Move History (parent moves)"
-msgstr ""
+msgstr "Flytte Historie (foreldre trekk)"
 
 #. module: stock
 #: code:addons/stock/product.py:423
 #, python-format
 msgid "Future Stock"
-msgstr ""
+msgstr "Fremtidig lager"
 
 #. module: stock
 #: code:addons/stock/stock.py:513 code:addons/stock/stock.py:1149
@@ -3690,6 +3922,9 @@ msgid ""
 "click on a location to get the list of the products and their stock level in "
 "this particular location and all its children."
 msgstr ""
+"Dette er strukturen i bedriftens lagerbygninger og steder. Du kan klikke på "
+"et sted for å få en liste over hvilke produkter og deres lager nivå i dette "
+"bestemte stedet og alle sine barn."
 
 #. module: stock
 #: model:res.request.link,name:stock.req_link_tracking
@@ -3715,7 +3950,7 @@ msgstr "Sporbarhet"
 #. module: stock
 #: view:stock.picking:0
 msgid "To invoice"
-msgstr ""
+msgstr "til faktura"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_location_form
@@ -3731,7 +3966,7 @@ msgstr "Generell informasjon"
 #. module: stock
 #: field:stock.production.lot,prefix:0
 msgid "Prefix"
-msgstr ""
+msgstr "Prefiks"
 
 #. module: stock
 #: code:addons/stock/wizard/stock_splitinto.py:53
@@ -3740,6 +3975,8 @@ msgid ""
 "Total quantity after split exceeds the quantity to split for this product: "
 "\"%s\" (id: %d)"
 msgstr ""
+"Total mengde etter splitt overskrider antallet å splitte for dette "
+"produktet: \"% s\" (id:% d)"
 
 #. module: stock
 #: help:product.template,property_stock_account_input:0
@@ -3749,6 +3986,10 @@ msgid ""
 "specific valuation account set on the source location. When not set on the "
 "product, the one from the product category is used."
 msgstr ""
+"Når du gjør ektetid beholdningsvurdering vil motpart journal elementer for "
+"alle innkommende aksjen beveger seg bli postet i denne kontoen, med mindre "
+"det er en konkret vurdering konto sett på kildeplasseringen. Når den ikke er "
+"satt på produktet, er en fra produktkategori brukes."
 
 #. module: stock
 #: view:stock.move:0 field:stock.partial.move,move_ids:0
@@ -3762,23 +4003,24 @@ msgstr "Bevegelser"
 #: field:stock.partial.picking.line,location_dest_id:0
 #: field:stock.picking,location_dest_id:0
 msgid "Dest. Location"
-msgstr ""
+msgstr "Dest. plassering"
 
 #. module: stock
 #: help:stock.move,product_packaging:0
 msgid ""
 "It specifies attributes of packaging like type, quantity of packaging,etc."
 msgstr ""
+"Den angir attributter for emballasje som type, mengde emballasje, etc."
 
 #. module: stock
 #: constraint:stock.move:0
 msgid "You must assign a production lot for this product"
-msgstr ""
+msgstr "Du må velge en produksjonslot/batch for dette produktet"
 
 #. module: stock
 #: view:stock.move:0
 msgid "Expected"
-msgstr ""
+msgstr "Forventet"
 
 #. module: stock
 #: selection:report.stock.inventory,location_type:0
@@ -3790,12 +4032,12 @@ msgstr "Produksjon"
 #. module: stock
 #: view:stock.split.into:0
 msgid "Split Move"
-msgstr ""
+msgstr "Delt Flytte"
 
 #. module: stock
 #: field:stock.picking,backorder_id:0
 msgid "Back Order of"
-msgstr ""
+msgstr "Restordre av"
 
 #. module: stock
 #: code:addons/stock/wizard/stock_return_picking.py:106
@@ -3804,27 +4046,29 @@ msgid ""
 "There are no products to return (only lines in Done state and not fully "
 "returned yet can be returned)!"
 msgstr ""
+"Det er ingen produkter å returnere (bare linjer i Ferdig staten og ikke "
+"fullt returnert ennå kan returneres)!"
 
 #. module: stock
 #: view:report.stock.move:0
 msgid "Future Stock-Moves"
-msgstr ""
+msgstr "Fremtidig lager-flyttes"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_move_split
 msgid "Split in Production lots"
-msgstr ""
+msgstr "Split i produksjonslot/batch"
 
 #. module: stock
 #: code:addons/stock/wizard/stock_move.py:213
 #, python-format
 msgid "Processing Error"
-msgstr ""
+msgstr "Lastet Feil"
 
 #. module: stock
 #: view:report.stock.inventory:0
 msgid "Real"
-msgstr ""
+msgstr "Ekte"
 
 #. module: stock
 #: report:stock.picking.list:0 view:stock.production.lot.revision:0
@@ -3836,7 +4080,7 @@ msgstr "Beskrivelse"
 #: selection:report.stock.inventory,month:0
 #: selection:report.stock.move,month:0
 msgid "May"
-msgstr ""
+msgstr "Mai"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action5 view:stock.tracking:0
@@ -3847,7 +4091,7 @@ msgstr "Overliggende sporbarhet"
 #: model:ir.actions.report.xml,name:stock.report_location_overview_all
 #: report:lot.stock.overview_all:0
 msgid "Location Content"
-msgstr ""
+msgstr "Plassering innhold"
 
 #. module: stock
 #: code:addons/stock/product.py:447
@@ -3865,7 +4109,7 @@ msgstr "Konto for utgående lager"
 #. module: stock
 #: field:stock.location,chained_location_type:0
 msgid "Chained Location Type"
-msgstr ""
+msgstr "Lenket Type beliggenhet"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_report_prodlots
@@ -3882,38 +4126,38 @@ msgstr "Kunde"
 #: selection:report.stock.inventory,month:0
 #: selection:report.stock.move,month:0
 msgid "February"
-msgstr ""
+msgstr "Februar"
 
 #. module: stock
 #: view:stock.production.lot:0
 msgid "Production Lot Identification"
-msgstr ""
+msgstr "Produksjon Vare Identifikasjon"
 
 #. module: stock
 #: model:stock.location,name:stock.location_refrigerator_small
 msgid "Small Refrigerator"
-msgstr ""
+msgstr "Lite kjøleskap"
 
 #. module: stock
 #: model:stock.location,name:stock.location_convenience_shop
 msgid "Convenient Store"
-msgstr ""
+msgstr "praktisk butikk"
 
 #. module: stock
 #: field:stock.location,scrap_location:0 view:stock.move.scrap:0
 msgid "Scrap Location"
-msgstr ""
+msgstr "skrap Beliggenhet"
 
 #. module: stock
 #: selection:report.stock.inventory,month:0
 #: selection:report.stock.move,month:0
 msgid "April"
-msgstr ""
+msgstr "April"
 
 #. module: stock
 #: view:report.stock.inventory:0 view:stock.move:0
 msgid "Future"
-msgstr ""
+msgstr "Fremtid"
 
 #. module: stock
 #: field:stock.invoice.onshipping,invoice_date:0
@@ -3935,7 +4179,7 @@ msgstr "Advarsel !"
 #. module: stock
 #: model:stock.location,name:stock.stock_location_output
 msgid "Output"
-msgstr ""
+msgstr "Utgang"
 
 #. module: stock
 #: help:stock.tracking,name:0
@@ -3943,11 +4187,13 @@ msgid ""
 "By default, the pack reference is generated following the sscc standard. "
 "(Serial number + 1 check digit)"
 msgstr ""
+"Som standard er pakken referansen generert etter SSCC standarden. "
+"(Serienummer + 1 kontrollsiffer)"
 
 #. module: stock
 #: constraint:res.partner:0
 msgid "Error ! You cannot create recursive associated members."
-msgstr ""
+msgstr "Feil! Du kan ikke opprette rekursive tilknyttede medlemmer."
 
 #. module: stock
 #: code:addons/stock/wizard/stock_partial_picking.py:159
@@ -3957,6 +4203,9 @@ msgid ""
 "would let a quantity of \"%s %s\" to ship and only roundings of \"%s %s\" is "
 "accepted by the uom."
 msgstr ""
+"Avrunding av den første målenheter tillater ikke at du umiddelbart \"% s% "
+"s\", som det ville la en mengde \"% s% s\" til frakt og bare avrundinger av "
+"\"% s% s\" er akseptert av målenheter"
 
 #. module: stock
 #: code:addons/stock/wizard/stock_move.py:213
@@ -3964,16 +4213,17 @@ msgstr ""
 msgid ""
 "Production lot quantity %d of %s is larger than available quantity (%d) !"
 msgstr ""
+"Produserer mye mengder% d av% s er større enn tilgjengelig mengde (% d)!"
 
 #. module: stock
 #: constraint:product.category:0
 msgid "Error ! You cannot create recursive categories."
-msgstr ""
+msgstr "Feil! Du kan ikke lage uendelig struktur med uendelige kategorier."
 
 #. module: stock
 #: help:stock.move,move_dest_id:0
 msgid "Optional: next stock move when chaining them"
-msgstr ""
+msgstr "Valgfritt: neste lager trekk når du endrer dem"
 
 #. module: stock
 #: view:report.stock.inventory:0 field:report.stock.inventory,year:0
@@ -3989,13 +4239,13 @@ msgstr "Fysiske lokasjoner"
 #. module: stock
 #: view:stock.picking:0 selection:stock.picking,state:0
 msgid "Ready to Process"
-msgstr ""
+msgstr "Klar til å behandle"
 
 #. module: stock
 #: help:stock.location,posx:0 help:stock.location,posy:0
 #: help:stock.location,posz:0
 msgid "Optional localization details, for information purpose only"
-msgstr ""
+msgstr "Valgfrie lokalisering detaljer, for informasjonens hensikt bare"
 
 #~ msgid "Outgoing Product"
 #~ msgstr "Outgoing Product"
@@ -4513,3 +4763,15 @@ msgstr ""
 
 #~ msgid "STOCK_REDO"
 #~ msgstr "STOCK_REDO"
+
+#~ msgid "New pack"
+#~ msgstr "Ny pakke"
+
+#~ msgid "Do you want to merge theses inventories ?"
+#~ msgstr "Vil du slå sammen disse varelagerene?"
+
+#~ msgid "Merge inventories"
+#~ msgstr "Flett varelager"
+
+#~ msgid "Quantity to leave in the current pack"
+#~ msgstr "Antall å forlate i dagens pakke."
diff --git a/addons/stock/i18n/nl.po b/addons/stock/i18n/nl.po
index 64d2d899e2c..04c3875df25 100644
--- a/addons/stock/i18n/nl.po
+++ b/addons/stock/i18n/nl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:40+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:56+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: stock
 #: field:product.product,track_outgoing:0
@@ -936,7 +936,7 @@ msgstr "Inkomende leveringen"
 #. module: stock
 #: view:report.stock.inventory:0 view:stock.move:0 view:stock.picking:0
 msgid "Scrap"
-msgstr "Afval"
+msgstr "Afgekeurd"
 
 #. module: stock
 #: field:stock.location,child_ids:0
@@ -1646,7 +1646,7 @@ msgstr "Laat dit veld leeg als deze locatie wordt gedeeld tussen bedrijven"
 #: code:addons/stock/stock.py:2337
 #, python-format
 msgid "Please provide a positive quantity to scrap!"
-msgstr "Geef een positieve hoeveelheid voor afval in!"
+msgstr "Geef een positieve hoeveelheid om af te keuren!"
 
 #. module: stock
 #: field:stock.location,chained_delay:0
@@ -1699,7 +1699,7 @@ msgstr "Leveranciers locatie"
 #: code:addons/stock/stock.py:2358
 #, python-format
 msgid "were scrapped"
-msgstr "zijn naar afval"
+msgstr "zijn afgekeurd"
 
 #. module: stock
 #: help:stock.partial.move.line,currency:0
@@ -1905,7 +1905,7 @@ msgstr "Een eenheidsregel kan niet worden verwijderd!"
 #: model:ir.model,name:stock.model_stock_move_scrap view:stock.move:0
 #: view:stock.move.scrap:0 view:stock.picking:0
 msgid "Scrap Products"
-msgstr "Afval producten"
+msgstr "Producten afkeuren"
 
 #. module: stock
 #: code:addons/stock/stock.py:1157
@@ -2319,7 +2319,7 @@ msgstr "Er is geen verschil tussen de standaard prijs en de nieuwe prijs!"
 #: model:stock.location,name:stock.stock_location_scrapped
 #: field:stock.move,scrapped:0
 msgid "Scrapped"
-msgstr "Afval"
+msgstr "Afgekeurd"
 
 #. module: stock
 #: view:stock.inventory:0
@@ -2672,7 +2672,7 @@ msgstr "Forceer beschikbaarheid"
 #. module: stock
 #: model:ir.actions.act_window,name:stock.move_scrap view:stock.move.scrap:0
 msgid "Scrap Move"
-msgstr "Afvalmutatie"
+msgstr "Afkeur mutatie"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_reception_picking_move
@@ -3563,7 +3563,7 @@ msgstr "Ontvangst:"
 msgid ""
 "Check this box to allow using this location to put scrapped/damaged goods."
 msgstr ""
-"Vink deze optie aan om deze locatie te gebruiken voor afval en/of "
+"Vink deze optie aan om deze locatie te gebruiken voor afgekeurde en/of "
 "beschadigde producten."
 
 #. module: stock
@@ -4208,7 +4208,7 @@ msgstr "Warenhuis"
 #. module: stock
 #: field:stock.location,scrap_location:0 view:stock.move.scrap:0
 msgid "Scrap Location"
-msgstr "Afvallocatie"
+msgstr "Afkeurlocatie"
 
 #. module: stock
 #: selection:report.stock.inventory,month:0
diff --git a/addons/stock/i18n/nl_BE.po b/addons/stock/i18n/nl_BE.po
index df5f491d1d9..82dadd9bd80 100644
--- a/addons/stock/i18n/nl_BE.po
+++ b/addons/stock/i18n/nl_BE.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:42+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:58+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: stock
 #: field:product.product,track_outgoing:0
diff --git a/addons/stock/i18n/pl.po b/addons/stock/i18n/pl.po
index 990ff503e32..f66c8d67677 100644
--- a/addons/stock/i18n/pl.po
+++ b/addons/stock/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-02-08 01:37+0100\n"
-"PO-Revision-Date: 2012-05-10 18:31+0000\n"
+"PO-Revision-Date: 2012-08-26 10:20+0000\n"
 "Last-Translator: Grzegorz Grzelak (OpenGLOBE.pl) <grzegorz@openglobe.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: 2012-08-09 04:41+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:57+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: stock
 #: field:product.product,track_outgoing:0
@@ -3602,7 +3602,7 @@ msgstr "Klienci"
 #. module: stock
 #: selection:stock.move,state:0 selection:stock.picking,state:0
 msgid "Waiting Availability"
-msgstr "Oczekują na dostępność"
+msgstr "Oczekiwanie na dostępność"
 
 #. module: stock
 #: code:addons/stock/stock.py:1347
diff --git a/addons/stock/i18n/pt.po b/addons/stock/i18n/pt.po
index 54981d6e4de..7866a210fb1 100644
--- a/addons/stock/i18n/pt.po
+++ b/addons/stock/i18n/pt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:41+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:57+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: stock
 #: field:product.product,track_outgoing:0
diff --git a/addons/stock/i18n/pt_BR.po b/addons/stock/i18n/pt_BR.po
index d20f1fa0d59..50dddd1c615 100644
--- a/addons/stock/i18n/pt_BR.po
+++ b/addons/stock/i18n/pt_BR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:42+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:58+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: stock
 #: field:product.product,track_outgoing:0
diff --git a/addons/stock/i18n/ro.po b/addons/stock/i18n/ro.po
index 21bd27472f3..03bfcd91962 100644
--- a/addons/stock/i18n/ro.po
+++ b/addons/stock/i18n/ro.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:42+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:57+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: stock
 #: field:product.product,track_outgoing:0
diff --git a/addons/stock/i18n/ru.po b/addons/stock/i18n/ru.po
index 104c6ca334f..65846a6b84d 100644
--- a/addons/stock/i18n/ru.po
+++ b/addons/stock/i18n/ru.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:42+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:57+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: stock
 #: field:product.product,track_outgoing:0
diff --git a/addons/stock/i18n/sl.po b/addons/stock/i18n/sl.po
index 2befa53408c..8bd9f7ee866 100644
--- a/addons/stock/i18n/sl.po
+++ b/addons/stock/i18n/sl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:42+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:57+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: stock
 #: field:product.product,track_outgoing:0
diff --git a/addons/stock/i18n/sq.po b/addons/stock/i18n/sq.po
index 03b8ec71b3c..7a5488a3765 100644
--- a/addons/stock/i18n/sq.po
+++ b/addons/stock/i18n/sq.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:40+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:56+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: stock
 #: field:product.product,track_outgoing:0
diff --git a/addons/stock/i18n/sr.po b/addons/stock/i18n/sr.po
index 210eaa97983..b1f1c456e28 100644
--- a/addons/stock/i18n/sr.po
+++ b/addons/stock/i18n/sr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:42+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:57+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: stock
 #: field:product.product,track_outgoing:0
diff --git a/addons/stock/i18n/sr@latin.po b/addons/stock/i18n/sr@latin.po
index 3b429038d23..2bed3efca4f 100644
--- a/addons/stock/i18n/sr@latin.po
+++ b/addons/stock/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:43+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:58+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: stock
 #: field:product.product,track_outgoing:0
diff --git a/addons/stock/i18n/sv.po b/addons/stock/i18n/sv.po
index 80f95257290..f52b7188e30 100644
--- a/addons/stock/i18n/sv.po
+++ b/addons/stock/i18n/sv.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:42+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:57+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: stock
 #: field:product.product,track_outgoing:0
diff --git a/addons/stock/i18n/th.po b/addons/stock/i18n/th.po
index 471d28d629f..bc55fe510df 100644
--- a/addons/stock/i18n/th.po
+++ b/addons/stock/i18n/th.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:42+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:57+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: stock
 #: field:product.product,track_outgoing:0
diff --git a/addons/stock/i18n/tlh.po b/addons/stock/i18n/tlh.po
index 883dc0d2178..a7d71bf2949 100644
--- a/addons/stock/i18n/tlh.po
+++ b/addons/stock/i18n/tlh.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:42+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:57+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: stock
 #: field:product.product,track_outgoing:0
diff --git a/addons/stock/i18n/tr.po b/addons/stock/i18n/tr.po
index 3437b0b598e..0d984175d4f 100644
--- a/addons/stock/i18n/tr.po
+++ b/addons/stock/i18n/tr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:42+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:57+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: stock
 #: field:product.product,track_outgoing:0
@@ -24,7 +24,7 @@ msgstr "Giden Lotları İzle"
 #. module: stock
 #: model:ir.model,name:stock.model_stock_move_split_lines
 msgid "Stock move Split lines"
-msgstr ""
+msgstr "Stok hareketi Bölünmüş satırları"
 
 #. module: stock
 #: help:product.category,property_stock_account_input_categ:0
@@ -77,7 +77,7 @@ msgstr "Revizyon Numarası"
 #. module: stock
 #: view:stock.move:0
 msgid "Orders processed Today or planned for Today"
-msgstr ""
+msgstr "Bugün işlenen ya da Bugün için planlanan Siparişler"
 
 #. module: stock
 #: view:stock.partial.move.line:0 view:stock.partial.picking:0
@@ -89,7 +89,7 @@ msgstr "Ürün Hareketleri"
 #. module: stock
 #: model:ir.ui.menu,name:stock.menu_stock_uom_categ_form_action
 msgid "UoM Categories"
-msgstr ""
+msgstr "Ölçü Birimi Kategorileri"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_stock_move_report
@@ -128,7 +128,7 @@ msgstr ""
 #: code:addons/stock/wizard/stock_change_product_qty.py:87
 #, python-format
 msgid "Quantity cannot be negative."
-msgstr ""
+msgstr "Miktar eksi olamaz"
 
 #. module: stock
 #: view:stock.picking:0
@@ -196,7 +196,7 @@ msgstr "Bu ay"
 #: code:addons/stock/wizard/stock_move.py:222
 #, python-format
 msgid "Unable to assign all lots to this move!"
-msgstr ""
+msgstr "Bu harekete bütün partiler atanamıyor."
 
 #. module: stock
 #: code:addons/stock/stock.py:2516
@@ -219,18 +219,18 @@ msgstr "Hehangi bir kaydı silemezsiniz!"
 #. module: stock
 #: view:stock.picking:0
 msgid "Delivery orders to invoice"
-msgstr ""
+msgstr "Faturalanacak teslimat emirleri"
 
 #. module: stock
 #: view:stock.picking:0
 msgid "Assigned Delivery Orders"
-msgstr ""
+msgstr "Atanmış Teslimat Emirleri"
 
 #. module: stock
 #: field:stock.partial.move.line,update_cost:0
 #: field:stock.partial.picking.line,update_cost:0
 msgid "Need cost update"
-msgstr ""
+msgstr "Maliyein güncellenmesi gerekiyor"
 
 #. module: stock
 #: code:addons/stock/wizard/stock_splitinto.py:49
@@ -349,7 +349,7 @@ msgstr "Faturalama yok"
 #. module: stock
 #: view:stock.move:0
 msgid "Stock moves that have been processed"
-msgstr ""
+msgstr "İşlenen stok hareketleri"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_production_lot
@@ -371,7 +371,7 @@ msgstr "Bu pakete ait hareketler"
 #. module: stock
 #: view:stock.picking:0
 msgid "Incoming Shipments Available"
-msgstr ""
+msgstr "Mevcut Gelen Sevkiyatlar"
 
 #. module: stock
 #: selection:report.stock.inventory,location_type:0
@@ -470,7 +470,7 @@ msgstr "Böl"
 #. module: stock
 #: view:stock.location:0
 msgid "Internal Locations"
-msgstr ""
+msgstr "İç Konumlar"
 
 #. module: stock
 #: field:stock.move,price_currency_id:0
@@ -554,7 +554,7 @@ msgstr "Hedef Lokasyon"
 #. module: stock
 #: model:ir.model,name:stock.model_stock_partial_move_line
 msgid "stock.partial.move.line"
-msgstr ""
+msgstr "stok.kısmi.hareket.satır"
 
 #. module: stock
 #: code:addons/stock/stock.py:760
@@ -609,7 +609,7 @@ msgstr "Lokasyon / Ürün"
 #. module: stock
 #: field:stock.move,address_id:0
 msgid "Destination Address "
-msgstr ""
+msgstr "Varış Adresi "
 
 #. module: stock
 #: code:addons/stock/stock.py:1333
@@ -674,7 +674,7 @@ msgstr ""
 #. module: stock
 #: field:stock.move.split.lines,wizard_exist_id:0
 msgid "Parent Wizard (for existing lines)"
-msgstr ""
+msgstr "Ana Sihirbaz (varolan satırlar için="
 
 #. module: stock
 #: view:stock.move:0 view:stock.picking:0
@@ -745,7 +745,7 @@ msgstr "Alıcı"
 #. module: stock
 #: model:stock.location,name:stock.location_refrigerator
 msgid "Refrigerator"
-msgstr ""
+msgstr "Buzdolabı"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_location_tree
@@ -808,7 +808,7 @@ msgstr ""
 #: code:addons/stock/product.py:75
 #, python-format
 msgid "Valuation Account is not specified for Product Category: %s"
-msgstr ""
+msgstr "Değerleme Hesabının tanımlanmadığı Ürün Kategorisi: %s"
 
 #. module: stock
 #: field:stock.move,move_dest_id:0
@@ -941,7 +941,7 @@ msgstr "Paket Arama"
 #. module: stock
 #: view:stock.picking:0
 msgid "Pickings already processed"
-msgstr ""
+msgstr "Toplama zaten yürütülmüş"
 
 #. module: stock
 #: field:stock.partial.move.line,currency:0
@@ -984,7 +984,7 @@ msgstr "İcra Tamamlama Süresi (Gün)"
 #. module: stock
 #: model:ir.model,name:stock.model_stock_partial_move
 msgid "Partial Move Processing Wizard"
-msgstr ""
+msgstr "Kısmi Hareket İşleme Sihirbazı"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.act_stock_product_location_open
@@ -1024,7 +1024,7 @@ msgstr ""
 #. module: stock
 #: view:stock.picking:0
 msgid "Confirmed Pickings"
-msgstr ""
+msgstr "Onaylanmış Toplamalar"
 
 #. module: stock
 #: field:stock.location,stock_virtual:0
@@ -1050,13 +1050,13 @@ msgstr "Sol Üst Öğe"
 #. module: stock
 #: field:product.category,property_stock_valuation_account_id:0
 msgid "Stock Valuation Account"
-msgstr ""
+msgstr "Stok Değerleme Hesabı"
 
 #. module: stock
 #: code:addons/stock/stock.py:1349
 #, python-format
 msgid "is waiting."
-msgstr ""
+msgstr "bekliyor."
 
 #. module: stock
 #: constraint:product.product:0
@@ -1162,6 +1162,8 @@ msgid ""
 "In order to cancel this inventory, you must first unpost related journal "
 "entries."
 msgstr ""
+"Bu envanteri silmek için önce ilişkili günlük girişlerinin işlenmesini "
+"kaldırmalısınız."
 
 #. module: stock
 #: field:stock.picking,date_done:0
@@ -1179,7 +1181,7 @@ msgstr ""
 #. module: stock
 #: view:stock.move:0
 msgid "Stock moves that are Available (Ready to process)"
-msgstr ""
+msgstr "Mevcut stok hareketleri (İşlenmeye hazır)"
 
 #. module: stock
 #: report:stock.picking.list:0
@@ -1300,7 +1302,7 @@ msgstr "Çeki Listesi:"
 #. module: stock
 #: selection:stock.move,state:0
 msgid "Waiting Another Move"
-msgstr ""
+msgstr "Balka bir Hareket Bekliyor"
 
 #. module: stock
 #: help:product.template,property_stock_production:0
@@ -1315,7 +1317,7 @@ msgstr ""
 #. module: stock
 #: view:product.product:0
 msgid "Expected Stock Variations"
-msgstr ""
+msgstr "Umulan Stok Çeşitlilikleri"
 
 #. module: stock
 #: help:stock.move,price_unit:0
@@ -1446,7 +1448,7 @@ msgstr "Tipi"
 #. module: stock
 #: view:stock.picking:0
 msgid "Available Pickings"
-msgstr ""
+msgstr "Mevcut Toplamalar"
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_5
@@ -1456,7 +1458,7 @@ msgstr "Genel IT Tedarikçileri"
 #. module: stock
 #: view:stock.move:0
 msgid "Stock to be receive"
-msgstr ""
+msgstr "Alınacak stok"
 
 #. module: stock
 #: help:stock.location,valuation_out_account_id:0
@@ -1510,7 +1512,7 @@ msgstr "Sadece taslak hareketlerini silebilirsiniz."
 #. module: stock
 #: model:ir.model,name:stock.model_stock_inventory_line_split_lines
 msgid "Inventory Split lines"
-msgstr ""
+msgstr "Bölünmüş Envanter Satırları"
 
 #. module: stock
 #: model:ir.actions.report.xml,name:stock.report_location_overview
@@ -1678,7 +1680,7 @@ msgstr "Stok İstatistikleri"
 #. module: stock
 #: view:report.stock.move:0
 msgid "Month Planned"
-msgstr ""
+msgstr "Planlanan Ay"
 
 #. module: stock
 #: field:product.product,track_production:0
@@ -1693,7 +1695,7 @@ msgstr "Birikmiş Sipariş mi (backorder)"
 #. module: stock
 #: field:stock.location,valuation_out_account_id:0
 msgid "Stock Valuation Account (Outgoing)"
-msgstr ""
+msgstr "Stok Değerleme Hesabı (Çıkan)"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.act_product_stock_move_open
@@ -1734,7 +1736,7 @@ msgstr "Oluşan Hareketler"
 #. module: stock
 #: field:stock.location,valuation_in_account_id:0
 msgid "Stock Valuation Account (Incoming)"
-msgstr ""
+msgstr "Stok Değerleme Hesabı (Girenn)"
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_14
@@ -1790,7 +1792,7 @@ msgstr ""
 #. module: stock
 #: view:report.stock.move:0
 msgid "Day Planned"
-msgstr ""
+msgstr "Planlanan Gün"
 
 #. module: stock
 #: view:report.stock.inventory:0 field:report.stock.inventory,date:0
@@ -1928,7 +1930,7 @@ msgstr "Envanter Değerlendirmesi"
 #. module: stock
 #: view:stock.move:0
 msgid "Orders planned for today"
-msgstr ""
+msgstr "Bugün için planlanan Siparişler"
 
 #. module: stock
 #: view:stock.move:0 view:stock.picking:0
@@ -1981,7 +1983,7 @@ msgstr "Fiyat"
 #. module: stock
 #: model:ir.model,name:stock.model_stock_return_picking_memory
 msgid "stock.return.picking.memory"
-msgstr ""
+msgstr "stok.dönüş.toplama.bellek"
 
 #. module: stock
 #: view:stock.inventory:0
@@ -2078,7 +2080,7 @@ msgstr "Lojistik sevikayat ünitesi: palet, kutu, paket ..."
 #. module: stock
 #: view:stock.location:0
 msgid "Customer Locations"
-msgstr ""
+msgstr "Müşteri Konumları"
 
 #. module: stock
 #: view:stock.change.product.qty:0 view:stock.change.standard.price:0
@@ -2292,7 +2294,7 @@ msgstr "Sevkiyat Tipi"
 #. module: stock
 #: view:stock.move:0
 msgid "Stock moves that are Confirmed, Available or Waiting"
-msgstr ""
+msgstr "Onaylanmış stok hareketleri, Mevcut ya da Bekleyen"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.act_product_location_open
@@ -2327,7 +2329,7 @@ msgstr "Sistemin tamamlanan ürünleri stoklayacağı lokasyon."
 #. module: stock
 #: view:stock.move:0
 msgid "Stock to be delivered (Available or not)"
-msgstr ""
+msgstr "Teslim edilecek stok (Mevcut ya da değil)"
 
 #. module: stock
 #: view:board.board:0
@@ -2380,7 +2382,7 @@ msgstr "Kâr ve Zarar Miktarı"
 #. module: stock
 #: view:stock.picking:0
 msgid "Internal Pickings to invoice"
-msgstr ""
+msgstr "Faturalanacak İç Toplamalar"
 
 #. module: stock
 #: view:stock.production.lot:0 field:stock.production.lot,revisions:0
@@ -2632,7 +2634,7 @@ msgstr "Özgün ürün lotu PREFIX/SERIAL [INT_REF] olarak görüntülenecektir"
 #. module: stock
 #: model:stock.location,name:stock.stock_location_company
 msgid "Your Company"
-msgstr ""
+msgstr "Firmanız"
 
 #. module: stock
 #: constraint:stock.move:0
@@ -2711,7 +2713,7 @@ msgstr "Hata: Varsayılan UOM ve satınalma UOM aynı kategoride olmalıdır."
 #. module: stock
 #: model:stock.location,name:stock.location_delivery_counter
 msgid "Delivery Counter"
-msgstr ""
+msgstr "Teslimat Sayacı"
 
 #. module: stock
 #: view:report.stock.inventory:0 field:report.stock.inventory,prodlot_id:0
@@ -2780,7 +2782,7 @@ msgstr "Hata, hiç ortak yok!"
 #: field:stock.inventory.line.split.lines,wizard_id:0
 #: field:stock.move.split.lines,wizard_id:0
 msgid "Parent Wizard"
-msgstr ""
+msgstr "Ana Sihirbaz"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_incoterms_tree
@@ -2793,7 +2795,7 @@ msgstr "Teslim Sekilleri"
 #. module: stock
 #: model:ir.model,name:stock.model_stock_partial_picking_line
 msgid "stock.partial.picking.line"
-msgstr ""
+msgstr "stok.kısmi.toplama.satır"
 
 #. module: stock
 #: report:lot.stock.overview:0 report:lot.stock.overview_all:0
@@ -2979,7 +2981,7 @@ msgstr "Faturalandırma"
 #. module: stock
 #: view:stock.picking:0
 msgid "Assigned Internal Moves"
-msgstr ""
+msgstr "Atanmış İç Hareketler"
 
 #. module: stock
 #: code:addons/stock/stock.py:2379 code:addons/stock/stock.py:2440
@@ -3048,12 +3050,12 @@ msgstr "Kategoriye Göre Ürün"
 #. module: stock
 #: selection:stock.picking,state:0
 msgid "Waiting Another Operation"
-msgstr ""
+msgstr "Başka bir İşlem Bekliyor"
 
 #. module: stock
 #: view:stock.location:0
 msgid "Supplier Locations"
-msgstr ""
+msgstr "Tedarikçi Konumları"
 
 #. module: stock
 #: field:stock.partial.move.line,wizard_id:0
@@ -3065,7 +3067,7 @@ msgstr "Sihirbaz"
 #. module: stock
 #: view:report.stock.move:0
 msgid "Completed Stock-Moves"
-msgstr ""
+msgstr "Tamamlanan Stok-Hareketleri"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_view_stock_location_product
@@ -3108,7 +3110,7 @@ msgstr "Sipariş"
 #. module: stock
 #: view:product.product:0
 msgid "Cost Price :"
-msgstr ""
+msgstr "Maliyet Bedeli :"
 
 #. module: stock
 #: field:stock.tracking,name:0
@@ -3125,7 +3127,7 @@ msgstr "Kaynak Lokasyon"
 #. module: stock
 #: view:stock.move:0
 msgid " Waiting"
-msgstr ""
+msgstr " Bekliyor"
 
 #. module: stock
 #: view:product.template:0
@@ -3337,7 +3339,7 @@ msgstr "İptal edildi"
 #. module: stock
 #: view:stock.picking:0
 msgid "Confirmed Delivery Orders"
-msgstr ""
+msgstr "Onaylanmış Teslimat Emirleri"
 
 #. module: stock
 #: view:stock.move:0 field:stock.partial.move,picking_id:0
@@ -3419,7 +3421,7 @@ msgstr "Teslimat Siparişleri"
 #. module: stock
 #: view:stock.picking:0
 msgid "Delivery orders already processed"
-msgstr ""
+msgstr "Halihazırda işlenmiş teslimat emirleri"
 
 #. module: stock
 #: help:res.partner,property_stock_customer:0
@@ -3479,7 +3481,7 @@ msgstr "Bağlı Toplama"
 #. module: stock
 #: view:report.stock.move:0
 msgid "Year Planned"
-msgstr ""
+msgstr "Planlanan Yıl"
 
 #. module: stock
 #: view:report.stock.move:0
@@ -3523,7 +3525,7 @@ msgstr "Mevcut pakette bırakılacak miktar"
 #. module: stock
 #: view:stock.move:0
 msgid "Stock available to be delivered"
-msgstr ""
+msgstr "Teslim edilecek mevcut stok"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_stock_invoice_onshipping
@@ -3534,7 +3536,7 @@ msgstr "Fatura Oluştur"
 #. module: stock
 #: view:stock.picking:0
 msgid "Confirmed Internal Moves"
-msgstr ""
+msgstr "Onaylanmış İç Hareketler"
 
 #. module: stock
 #: model:ir.ui.menu,name:stock.menu_stock_configuration
@@ -3590,7 +3592,7 @@ msgstr "Müşteriler"
 #. module: stock
 #: selection:stock.move,state:0 selection:stock.picking,state:0
 msgid "Waiting Availability"
-msgstr ""
+msgstr "Uygunluk Bekliyor"
 
 #. module: stock
 #: code:addons/stock/stock.py:1347
@@ -3606,7 +3608,7 @@ msgstr "Stok Envanter Kalemleri"
 #. module: stock
 #: view:stock.move:0
 msgid "Waiting "
-msgstr ""
+msgstr "Bekliyor "
 
 #. module: stock
 #: code:addons/stock/product.py:427
@@ -3652,7 +3654,7 @@ msgstr "Aralık"
 #. module: stock
 #: view:stock.production.lot:0
 msgid "Available Product Lots"
-msgstr ""
+msgstr "Mevcut Ürün Partileri"
 
 #. module: stock
 #: model:ir.actions.act_window,help:stock.action_move_form2
@@ -4007,7 +4009,7 @@ msgstr ""
 #. module: stock
 #: view:report.stock.move:0
 msgid "Future Stock-Moves"
-msgstr ""
+msgstr "Gelecek Stok-Hareketleri"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_move_split
@@ -4091,12 +4093,12 @@ msgstr "Üretim Lotu Tanımlaması"
 #. module: stock
 #: model:stock.location,name:stock.location_refrigerator_small
 msgid "Small Refrigerator"
-msgstr ""
+msgstr "Küçük Buzdolabı"
 
 #. module: stock
 #: model:stock.location,name:stock.location_convenience_shop
 msgid "Convenient Store"
-msgstr ""
+msgstr "Elverişli Depo"
 
 #. module: stock
 #: field:stock.location,scrap_location:0 view:stock.move.scrap:0
diff --git a/addons/stock/i18n/uk.po b/addons/stock/i18n/uk.po
index 58cc1dca17e..3beb9ac11f3 100644
--- a/addons/stock/i18n/uk.po
+++ b/addons/stock/i18n/uk.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:42+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:57+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: stock
 #: field:product.product,track_outgoing:0
diff --git a/addons/stock/i18n/vi.po b/addons/stock/i18n/vi.po
index dd3ba405278..1ded1f7c91e 100644
--- a/addons/stock/i18n/vi.po
+++ b/addons/stock/i18n/vi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:42+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:57+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: stock
 #: field:product.product,track_outgoing:0
diff --git a/addons/stock/i18n/zh_CN.po b/addons/stock/i18n/zh_CN.po
index 6369af93d36..3a4a946310c 100644
--- a/addons/stock/i18n/zh_CN.po
+++ b/addons/stock/i18n/zh_CN.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:43+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:58+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: stock
 #: field:product.product,track_outgoing:0
diff --git a/addons/stock/i18n/zh_TW.po b/addons/stock/i18n/zh_TW.po
index 62ef6054749..97e52c7baa1 100644
--- a/addons/stock/i18n/zh_TW.po
+++ b/addons/stock/i18n/zh_TW.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:43+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:58+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: stock
 #: field:product.product,track_outgoing:0
diff --git a/addons/stock/product.py b/addons/stock/product.py
index e0e55594eca..2016e25a5f6 100644
--- a/addons/stock/product.py
+++ b/addons/stock/product.py
@@ -32,7 +32,7 @@ class product_product(osv.osv):
         moves = move_pool.read_group(cr, uid, [
             ('product_id', 'in', ids),
             ('picking_id.type', '=', 'in'),
-            ('state','in',('draft','confirmed','assigned','pending'))
+            ('state','in',('confirmed','assigned','pending'))
         ], ['product_id'], ['product_id'])
         for move in moves:
             product_id = move['product_id'][0]
@@ -40,11 +40,11 @@ class product_product(osv.osv):
         moves = move_pool.read_group(cr, uid, [
             ('product_id', 'in', ids),
             ('picking_id.type', '=', 'out'),
-            ('state','in',('draft','confirmed','assigned','pending'))
+            ('state','in',('confirmed','assigned','pending'))
         ], ['product_id'], ['product_id'])
         for move in moves:
             product_id = move['product_id'][0]
-            res[product_id]['reception_count'] = move['product_id_count']
+            res[product_id]['delivery_count'] = move['product_id_count']
         return res
 
     def get_product_accounts(self, cr, uid, product_id, context=None):
@@ -373,7 +373,7 @@ class product_product(osv.osv):
                  "typed as 'internal'."),
         'virtual_available': fields.function(_product_available, multi='qty_available',
             type='float',  digits_compute=dp.get_precision('Product Unit of Measure'),
-            string='Quantity Available',
+            string='Future Quantity',
             help="Forecast quantity (computed as Quantity On Hand "
                  "- Outgoing + Incoming)\n"
                  "In a context with a single Stock Location, this includes "
diff --git a/addons/stock/product_view.xml b/addons/stock/product_view.xml
index 1efc552bfa6..2e0eef44da9 100644
--- a/addons/stock/product_view.xml
+++ b/addons/stock/product_view.xml
@@ -51,6 +51,30 @@
             </field>
         </record>
 
+        <record id="view_normal_procurement_locations_form" model="ir.ui.view">
+            <field name="name">product.normal.procurement.locations.inherit</field>
+            <field name="model">product.product</field>
+            <field name="inherit_id" ref="product.product_normal_form_view"/>
+            <field name="arch" type="xml">
+                <group name="procurement" position="inside">
+                    <group name="delay" string="Delays">
+                        <label for="produce_delay" attrs="{'invisible':[('type','=','service')]}"/>
+                        <div attrs="{'invisible':[('type','=','service')]}">
+                            <field name="produce_delay" class="oe_inline"/> days
+                        </div>
+                        <field name="active"/>
+                    </group>
+                </group>
+                <group name="inventory" position="inside">
+                    <group name="store" groups="stock.group_locations" string="Counter-Part Locations Properties">
+                        <field name="property_stock_procurement" attrs="{'readonly':[('type','=','service')]}" domain="[('usage','=','procurement')]"/>
+                        <field name="property_stock_production" attrs="{'readonly':[('type','=','service')]}" domain="[('usage','=','production')]"/>
+                        <field name="property_stock_inventory"  attrs="{'readonly':[('type','=','service')]}" domain="[('usage','=','inventory')]"/>
+                    </group>
+                </group>
+            </field>
+        </record>
+
         <record id="view_product_standard_price_form" model="ir.ui.view">
             <field name="name">product.product.standard.price.form.inherit</field>
             <field name="model">product.product</field>
@@ -59,8 +83,8 @@
                 <field name="standard_price" position="replace" version="7.0">
                     <label string="Cost Price" for="standard_price" align="1.0" groups="base.group_user"/>
                     <div groups="base.group_user">
-                        <field name="standard_price" attrs="{'readonly':[('cost_method','=','average')]}" nolabel="1"/> - 
-                        <button name="%(action_view_change_standard_price)d" string="update"
+                        <field name="standard_price" attrs="{'readonly':[('cost_method','=','average')]}" nolabel="1"/>
+                        <button name="%(action_view_change_standard_price)d" string="- update"
                             type="action" attrs="{'invisible':[('cost_method','&lt;&gt;','average')]}"
                             class="oe_link"/>
                     </div>
@@ -81,9 +105,9 @@
                             <field name="valuation" attrs="{'readonly':[('type', '=', 'service')]}"/>
                         </group>
                         <group colspan="2" col="2">
-                            <field name="property_stock_account_input" attrs="{'readonly':[('valuation', '!=', 'real_time')]}"
+                            <field name="property_stock_account_input" attrs="{'invisible':[('valuation', '!=', 'real_time')]}"
                                 domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
-                            <field name="property_stock_account_output" attrs="{'readonly':[('valuation', '!=', 'real_time')]}"
+                            <field name="property_stock_account_output" attrs="{'invisible':[('valuation', '!=', 'real_time')]}"
                                 domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
                         </group>
                     </group>
@@ -98,19 +122,17 @@
             <field name="inherit_id" ref="product.product_normal_form_view"/>
             <field name="arch" type="xml">
                 <group name="status" position="before" version="7.0">
-                    <group string="Stock and Expected Variations" attrs="{'invisible': [('type', '=', 'service')]}">
+                    <group string="Stock and Expected Variations" attrs="{'invisible': [('type', '=', 'service')]}" groups="base.group_user">
                         <label for="qty_available"/>
                         <div>
                             <field name="qty_available" class="oe_inline"/>
                             <button name="%(action_view_change_product_quantity)d" string="update"
-                                type="action" groups="stock.group_stock_manager,stock.group_stock_user"
+                                type="action"
                                 class="oe_link"/>
                         </div>
-                        <label for="virtual_available" groups="base.group_user"/>
-                        <div groups="base.group_user">
-                            <field name="virtual_available" class="oe_inline"/>
-                            (+<field name="incoming_qty" class="oe_inline"/> -<field name="outgoing_qty" class="oe_inline"/>)
-                        </div>
+                        <field name="incoming_qty" class="oe_inline"/>
+                        <field name="outgoing_qty" class="oe_inline"/>
+                        <field name="virtual_available" class="oe_inline"/>
                     </group>
                     <group name="lot" groups="stock.group_tracking_lot,stock.group_production_lot" string="Lots">
                         <field name="track_production" groups="stock.group_production_lot"/>
@@ -130,7 +152,6 @@
             <field name="domain">[('picking_id.type','=','in')]</field>
             <field name="view_id" ref="view_move_tree_reception_picking"/>
             <field name="context" eval="'{\'search_default_product_id\': [active_id]}'"/>
-            <field name="search_view_id" ref="view_move_search_reception_incoming_picking"/>
             <field name="help" type="html">
               <p class="oe_view_nocontent_create">
                 Click to register a reception for this product. 
@@ -151,7 +172,6 @@
             <field name="domain">[('picking_id.type','=','out')]</field>
             <field name="view_id" ref="view_move_tree_reception_picking"/>
             <field name="context" eval="'{\'search_default_product_id\': [active_id]}'"/>
-            <field name="search_view_id" ref="view_move_search_reception_outcoming_picking"/>
             <field name="help" type="html">
               <p class="oe_view_nocontent_create">
                 Click to add a delivery order for this product.
@@ -163,66 +183,27 @@
             </field>
         </record>
 
-        <record model="ir.ui.view" id="product.product_kanban_view">
-            <field name="name">Product Kanban</field>
+        <record model="ir.ui.view" id="product_kanban_stock_view">
+            <field name="name">Product Kanban Stock</field>
             <field name="model">product.product</field>
+            <field name="inherit_id" ref="product.product_kanban_view"/>
             <field name="arch" type="xml">
-                <kanban>
-                    <field name="color"/>
-                    <field name="type"/>
-                    <field name="image_medium"/>
-                    <field name="list_price"/>
+                <field name="list_price" position="after">
                     <field name="reception_count"/>
                     <field name="delivery_count"/>
-                    <templates>
-                        <t t-name="kanban-box">
-                            <div class="oe_product_vignette">
-                                <div class="oe_product_img">
-                                <a type="edit"><img t-att-src="kanban_image('product.product', 'image_medium', record.id.value)" class="oe_product_photo"/></a>
-                                </div>
-                                <div class="oe_product_desc">
-                                    <h4><a type="edit"><field name="name"></field></a></h4>
-                                    <ul>
-                                        <li t-if="record.code.raw_value">Code: <field name="code"/></li>
-                                        <li t-if="record.type.raw_value != 'service'">Stock on hand: <field name="qty_available"/> <field name="uom_id"/></li>
-                                        <li t-if="record.type.raw_value != 'service'">Stock available: <field name="virtual_available"/> <field name="uom_id"/></li>
-                                        <li>Price: <field name="lst_price"></field></li>
-                                        <!-- TODO the 'groups' attribute doesn't work in kanban views -->
-                                        <li groups="base.group_user">Cost: <field name="standard_price"></field></li>
-                                    </ul>
-                                    <div groups="base.group_user">
-                                        <a name="%(action_receive_move)d" type="action">
-                                            <t t-if="record.reception_count.value">Receptions(<t t-esc="record.reception_count.value"/>)</t>
-                                        </a>
-                                        <a name="%(action_deliver_move)d" type="action">
-                                            <t t-if="record.delivery_count.value">Deliveries(<t t-esc="record.delivery_count.value"/>)</t>
-                                        </a>
-                                    </div>
-                                </div>
-                            </div>
-                            <script>
-                                $('.oe_product_photo').load(function() { if($(this).width() > $(this).height()) { $(this).addClass('oe_product_photo_wide') } });
-                            </script>
-                            <div></div>
-                        </t>
-                    </templates>
-                </kanban>
-            </field>
-        </record>
-
-        <record id="view_normal_property_form" model="ir.ui.view">
-            <field name="name">product.normal.stock.property.form.inherit</field>
-            <field name="model">product.product</field>
-            <field name="inherit_id" ref="product.product_normal_form_view"/>
-            <field name="arch" type="xml">
-                <group name="store" position="after">
-                    <group name="store" groups="stock.group_locations">
-                        <separator string="Counter-Part Locations Properties" colspan="2"/>
-                        <field name="property_stock_procurement" attrs="{'readonly':[('type','=','service')]}" domain="[('usage','=','procurement')]"/>
-                        <field name="property_stock_production" attrs="{'readonly':[('type','=','service')]}" domain="[('usage','=','production')]"/>
-                        <field name="property_stock_inventory"  attrs="{'readonly':[('type','=','service')]}" domain="[('usage','=','inventory')]"/>
-                    </group>
-                </group>
+                </field>
+                <xpath expr="//div[@name='tags']" position="inside">
+                    <a name="%(action_receive_move)d" type="action" t-if="record.reception_count.raw_value>0">
+                        <t t-esc="record.reception_count.value"/> Receptions
+                    </a>
+                    <a name="%(action_deliver_move)d" type="action" t-if="record.delivery_count.raw_value>0">
+                        <t t-esc="record.delivery_count.value"/> Deliveries
+                    </a>
+                </xpath>
+                <ul position="inside">
+                    <li t-if="record.type.raw_value != 'service'">On hand: <field name="qty_available"/> <field name="uom_id"/></li>
+                    <li t-if="record.type.raw_value != 'service'">Available: <field name="virtual_available"/> <field name="uom_id"/></li>
+                </ul>
             </field>
         </record>
 
diff --git a/addons/stock/report/picking.py b/addons/stock/report/picking.py
index 27141c917a9..29a53fba7a2 100644
--- a/addons/stock/report/picking.py
+++ b/addons/stock/report/picking.py
@@ -29,14 +29,7 @@ class picking(report_sxw.rml_parse):
         super(picking, self).__init__(cr, uid, name, context=context)
         self.localcontext.update({
             'time': time,
-            'get_qtytotal':self._get_qtytotal
         })
-    def _get_qtytotal(self,move_lines):
-        total = 0.0
-        uom = move_lines[0].product_uom.name
-        for move in move_lines:
-            total+=move.product_qty
-        return {'quantity':total,'uom':uom}
 
 report_sxw.report_sxw('report.stock.picking.list','stock.picking','addons/stock/report/picking.rml',parser=picking)
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/stock/report/picking.rml b/addons/stock/report/picking.rml
index 898c078157d..5f395c9f005 100644
--- a/addons/stock/report/picking.rml
+++ b/addons/stock/report/picking.rml
@@ -299,21 +299,6 @@
         </tr>
       </blockTable>
     </section>
-    <blockTable colWidths="388.0,56.0,77.0" style="Table2">
-      <tr>
-        <td>
-          <para style="terp_default_9">
-            <font color="white"> </font>
-          </para>
-        </td>
-        <td>
-          <para style="terp_tblheader_Details_Centre">Total</para>
-        </td>
-        <td>
-          <para style="terp_tblheader_Details_Right">[[ formatLang(get_qtytotal(picking.move_lines)['quantity']) ]] [[ get_qtytotal(picking.move_lines)['uom'] ]]</para>
-        </td>
-      </tr>
-    </blockTable>
     <para style="terp_default_2">
       <font color="white"> </font>
     </para>
diff --git a/addons/stock/report/report_stock_move.py b/addons/stock/report/report_stock_move.py
index afd6bd4d1f4..aeb34d4265e 100644
--- a/addons/stock/report/report_stock_move.py
+++ b/addons/stock/report/report_stock_move.py
@@ -153,7 +153,8 @@ class report_stock_inventory(osv.osv):
         'date': fields.datetime('Date', readonly=True),
         'year': fields.char('Year', size=4, readonly=True),
         'month':fields.selection([('01','January'), ('02','February'), ('03','March'), ('04','April'),
-            ('05','May'), ('06','June'), ('07','July'), ('08','August'), ('09','September')]),
+            ('05','May'), ('06','June'), ('07','July'), ('08','August'), ('09','September'),
+            ('10','October'), ('11','November'), ('12','December')], 'Month', readonly=True),
         'partner_id':fields.many2one('res.partner', 'Partner', readonly=True),
         'product_id':fields.many2one('product.product', 'Product', readonly=True),
         'product_categ_id':fields.many2one('product.category', 'Product Category', readonly=True),
@@ -173,6 +174,8 @@ class report_stock_inventory(osv.osv):
 CREATE OR REPLACE view report_stock_inventory AS (
     (SELECT
         min(m.id) as id, m.date as date,
+        to_char(m.date, 'YYYY') as year,
+        to_char(m.date, 'MM') as month,
         m.partner_id as partner_id, m.location_id as location_id,
         m.product_id as product_id, pt.categ_id as product_categ_id, l.usage as location_type,
         m.company_id,
@@ -191,10 +194,12 @@ CREATE OR REPLACE view report_stock_inventory AS (
             LEFT JOIN stock_location l ON (m.location_id=l.id)
     GROUP BY
         m.id, m.product_id, m.product_uom, pt.categ_id, m.partner_id, m.location_id,  m.location_dest_id,
-        m.prodlot_id, m.date, m.state, l.usage, m.company_id, pt.uom_id
+        m.prodlot_id, m.date, m.state, l.usage, m.company_id, pt.uom_id, to_char(m.date, 'YYYY'), to_char(m.date, 'MM')
 ) UNION ALL (
     SELECT
         -m.id as id, m.date as date,
+        to_char(m.date, 'YYYY') as year,
+        to_char(m.date, 'MM') as month,
         m.partner_id as partner_id, m.location_dest_id as location_id,
         m.product_id as product_id, pt.categ_id as product_categ_id, l.usage as location_type,
         m.company_id,
@@ -212,7 +217,7 @@ CREATE OR REPLACE view report_stock_inventory AS (
             LEFT JOIN stock_location l ON (m.location_dest_id=l.id)
     GROUP BY
         m.id, m.product_id, m.product_uom, pt.categ_id, m.partner_id, m.location_id, m.location_dest_id,
-        m.prodlot_id, m.date, m.state, l.usage, m.company_id, pt.uom_id
+        m.prodlot_id, m.date, m.state, l.usage, m.company_id, pt.uom_id, to_char(m.date, 'YYYY'), to_char(m.date, 'MM')
     )
 );
         """)
diff --git a/addons/stock/report/report_stock_move_view.xml b/addons/stock/report/report_stock_move_view.xml
index a0227788d97..a78a506cefe 100644
--- a/addons/stock/report/report_stock_move_view.xml
+++ b/addons/stock/report/report_stock_move_view.xml
@@ -163,8 +163,10 @@
                     <filter name="group_lot" string="Lot" icon="terp-accessories-archiver" context="{'group_by':'prodlot_id'}"/>
                     <filter name="group_company" string="Company" groups="base.group_multi_company" icon="terp-go-home" context="{'group_by':'company_id'}"/>
                     <filter name="group_location" string="Location" icon="terp-go-home" context="{'group_by':'location_id'}"/>
-                    <filter string="Date" icon="terp-go-month" context="{'group_by':'date'}"/>
                     <filter string="Status" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
+                    <filter string="Date" icon="terp-go-today" context="{'group_by':'date'}"/>
+                    <filter string="Month" icon="terp-go-month" context="{'group_by':'month'}"/>
+                    <filter string="Year" icon="terp-go-year" context="{'group_by':'year'}"/>
                 </group>
             </search>
         </field>
diff --git a/addons/stock/report/stock_graph.py b/addons/stock/report/stock_graph.py
index 5ee58bb9d2c..d92de2805b5 100644
--- a/addons/stock/report/stock_graph.py
+++ b/addons/stock/report/stock_graph.py
@@ -22,6 +22,7 @@ from pychart import *
 import pychart.legend
 import time
 from report.misc import choice_colors
+import tools
 
 #
 # Draw a graph for stocks
@@ -41,7 +42,7 @@ class stock_graph(object):
             product_name=product_name.replace('/', '//')
         if product_id not in self._datas:
             self._datas[product_id] = {}
-        self._names[product_id] = product_name
+        self._names[product_id] = tools.ustr(product_name)
         for (dt,stock) in datas:
             if not dt in self._datas[product_id]:
                 self._datas[product_id][dt]=0
diff --git a/addons/stock/static/src/css/stock.css b/addons/stock/static/src/css/stock.css
index 449c1102fce..1efbaf5e3c4 100644
--- a/addons/stock/static/src/css/stock.css
+++ b/addons/stock/static/src/css/stock.css
@@ -9,8 +9,8 @@
 }
 
 .oe_product_img {
-    width: 150px;
-    height: 150px;
+    width: 80px;
+    height: 80px;
     text-align: center;
     overflow: hidden;
     -moz-border-radius: 3px;
@@ -25,15 +25,15 @@
 }
 
 .oe_product_photo {
-    width: 150px;
+    width: 80px;
     height: auto;
-    clip: rect(5px, 100px, 105px, 0px);
+    clip: rect(5px, 70px, 75px, 0px);
 }
 
 .oe_product_photo_wide {
-    height: 150px;
+    height: 80px;
     width: auto;
-    clip: rect(0px, 110px, 100px, 10px);
+    clip: rect(0px, 80px, 70px, 10px);
 }
 
 .oe_product_desc {
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index b770712429c..006af587c1f 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -1379,13 +1379,13 @@ class stock_picking(osv.osv):
 
     def create_send_note(self, cr, uid, ids, context=None):
         for obj in self.browse(cr, uid, ids, context=context):
-            self.message_append_note(cr, uid, [obj.id], body=_("%s has been <b>created</b>.") % (self._get_document_type(obj.type)), context=context)
+            self.message_post(cr, uid, [obj.id], body=_("%s has been <b>created</b>.") % (self._get_document_type(obj.type)), context=context)
 
     def scrap_send_note(self, cr, uid, ids, quantity, uom, name, context=None):
-        return self.message_append_note(cr, uid, ids, body= _("%s %s %s has been <b>moved to</b> scrap.") % (quantity, uom, name), context=context)
+        return self.message_post(cr, uid, ids, body= _("%s %s %s has been <b>moved to</b> scrap.") % (quantity, uom, name), context=context)
 
     def back_order_send_note(self, cr, uid, ids, back_name, context=None):
-        return self.message_append_note(cr, uid, ids, body=_("Back order <em>%s</em> has been <b>created</b>.") % (back_name), context=context)
+        return self.message_post(cr, uid, ids, body=_("Back order <em>%s</em> has been <b>created</b>.") % (back_name), context=context)
 
     def ship_done_send_note(self, cr, uid, ids, context=None):
         type_dict = {
@@ -1394,11 +1394,11 @@ class stock_picking(osv.osv):
                 'internal': 'moved',
         }
         for obj in self.browse(cr, uid, ids, context=context):
-            self.message_append_note(cr, uid, [obj.id], body=_("Products have been <b>%s</b>.") % (type_dict.get(obj.type, 'move done')), context=context)
+            self.message_post(cr, uid, [obj.id], body=_("Products have been <b>%s</b>.") % (type_dict.get(obj.type, 'move done')), context=context)
 
     def ship_cancel_send_note(self, cr, uid, ids, context=None):
         for obj in self.browse(cr, uid, ids, context=context):
-            self.message_append_note(cr, uid, [obj.id], body=_("%s has been <b>cancelled</b>.") % (self._get_document_type(obj.type)), context=context)
+            self.message_post(cr, uid, [obj.id], body=_("%s has been <b>cancelled</b>.") % (self._get_document_type(obj.type)), context=context)
 
 
 stock_picking()
@@ -2087,11 +2087,12 @@ class stock_move(osv.osv):
                     done.append(move.id)
                     pickings[move.picking_id.id] = 1
                     r = res.pop(0)
-                    cr.execute('update stock_move set location_id=%s, product_qty=%s where id=%s', (r[1], r[0], move.id))
+                    product_uos_qty = self.pool.get('stock.move').onchange_quantity(cr, uid, ids, move.product_id.id, r[0], move.product_id.uom_id.id, move.product_id.uos_id.id)['value']['product_uos_qty']
+                    cr.execute('update stock_move set location_id=%s, product_qty=%s, product_uos_qty=%s where id=%s', (r[1], r[0],product_uos_qty, move.id))
 
                     while res:
                         r = res.pop(0)
-                        move_id = self.copy(cr, uid, move.id, {'product_qty': r[0], 'location_id': r[1]})
+                        move_id = self.copy(cr, uid, move.id, {'product_uos_qty': product_uos_qty, 'product_qty': r[0], 'location_id': r[1]})
                         done.append(move_id)
         if done:
             count += len(done)
@@ -2541,7 +2542,7 @@ class stock_move(osv.osv):
         product_obj = self.pool.get('product.product')
         for new_move in self.browse(cr, uid, res, context=context):
             message = _("Product has been consumed with '%s' quantity.") % (new_move.product_qty)
-            product_obj.message_append_note(cr, uid, [new_move.product_id.id], body=message, context=context)
+            product_obj.message_post(cr, uid, [new_move.product_id.id], body=message, context=context)
 
         self.action_done(cr, uid, res, context=context)
 
diff --git a/addons/stock/stock_data.xml b/addons/stock/stock_data.xml
index f4b3ab90d9c..77c82989a21 100644
--- a/addons/stock/stock_data.xml
+++ b/addons/stock/stock_data.xml
@@ -2,12 +2,14 @@
 <openerp>
     <data noupdate="1">
         <!-- notify all employees of module installation -->
-        <function model="mail.group" name="message_append_note">
-            <!-- ids, subject, body, parent_id=False, type='notification', content_subtype='html' -->
-            <value eval="[ref('mail.group_all_employees')]"/>
-            <value>Module Warehouse Management has been installed</value>
-            <value>Manage your product inventoy and stock locations.  You can control your stock moves history and planning, perform stock valuation, and trace product lots upstream and downstream (based on serial numbers.)</value>
-        </function>
+        <record model="mail.message" id="module_install_notification">
+            <field name="model">mail.group</field>
+            <field name="res_id" ref="mail.group_all_employees"/>
+            <field name="type">notification</field>
+            <field name="subject">Warehouse Management application installed!</field>
+            <field name="body">Manage your product inventoy and stock locations: you can control stock moves history and planning,
+watch your stock valuation, and track production lots upstream and downstream (based on serial numbers).</field>
+        </record>
 
         <record id="stock_journal_sequence" model="ir.sequence">
             <field name="name">Stock Journal Sequence</field>
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 6927bf68c25..3560b255ab5 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -113,13 +113,14 @@
                     <field name="state" widget="statusbar" statusbar_visible="draft,confirm"/>
                 </header>
                 <sheet>
-                    <div>
-                        <label for="name" class="oe_edit_only"/>
-                        <field name="name" placeholder="e.g. Annual inventory" class="oe_inline"/> -
-                        <field name="date" class="oe_inline"/>
-                    </div>
                     <group>
-                        <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                        <group>
+                            <field name="name" placeholder="e.g. Annual inventory"/>
+                        </group>
+                        <group>
+                            <field name="date"/>
+                            <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                        </group>
                     </group>
                     <notebook>
                     <page string="General Informations">
@@ -267,7 +268,8 @@
               </p>
             </field>
         </record>
-        <menuitem id="menu_traceability" name="Traceability" parent="menu_stock_root" sequence="3"/>
+        <menuitem id="menu_traceability" name="Traceability" parent="menu_stock_root" 
+            sequence="3" groups="stock.group_tracking_lot,stock.group_production_lot"/>
         <menuitem action="action_tracking_form" id="menu_action_tracking_form"
             groups="product.group_stock_packaging"
             sequence="6"
@@ -1333,10 +1335,11 @@
             <field eval="3" name="priority"/>
             <field name="arch" type="xml">
                 <search string="Stock Moves">
-                    <field name="origin" string="Stock Moves"/>
+                    <field name="origin" domain="['|',('origin','ilike',self),('picking_id','ilike',self)]" string="Reference"/>
                     <field name="date" groups="base.group_no_one"/>
+
                     <filter icon="terp-camera_test" string="Ready" name="ready" domain="[('state','=','assigned')]" help="Stock moves that are Available (Ready to process)"/>
-                    <filter icon="terp-stock" string="Future" name="future" domain="[('state','in',('assigned','confirmed','waiting'))]" help="Stock moves that are Confirmed, Available or Waiting"/>
+                    <filter icon="terp-stock" string="To Do" name="future" domain="[('state','in',('assigned','confirmed','waiting'))]" help="Stock moves that are Confirmed, Available or Waiting"/>
                     <filter icon="terp-dialog-close" string="Done" name="done" domain="[('state','=','done')]" help="Stock moves that have been processed"/>
                     <separator/>
                     <filter icon="terp-go-today" string="Today" domain="[('date','&lt;=',time.strftime('%%Y-%%m-%%d 23:59:59')),('date','&gt;=',time.strftime('%%Y-%%m-%%d 00:00:00'))]" help="Orders processed Today or planned for Today"/>
@@ -1389,8 +1392,10 @@
             <field name="priority" eval="6"/>
             <field name="arch" type="xml">
                 <tree colors="grey:state == 'cancel'" string="Moves">
-                    <field name="picking_id" string="Reference"/>
+                    <field name="date" widget="date"/>
+                    <field name="picking_id" string="Reference" invisible="1"/>
                     <field name="origin"/>
+                    <field name="partner_id" string="Supplier"/>
                     <field name="product_id"/>
                     <field name="product_qty"/>
                     <field name="product_uom" string="Unit of Measure" groups="product.group_uom"/>
@@ -1413,8 +1418,13 @@
                         groups="product.group_stock_packaging"
                         icon="terp-stock_effects-object-colorize"
                         states="draft,assigned,confirmed,done"/>
-                    <field name="date" groups="base.group_no_one"/>
                     <field name="state"/>
+                    <button name="%(action_partial_move_server)d"
+                        icon="terp-stock_effects-object-colorize" type="action"
+                        states="assigned" class="oe_highlight"/>
+                    <button name="action_done" states="draft,assigned,confirmed"
+                        icon="gtk-go-forward" type="object"
+                        class="oe_highlight"/>
                 </tree>
             </field>
         </record>
@@ -1435,54 +1445,6 @@
             </field>
         </record>
 
-        <record id="view_move_search_reception_incoming_picking" model="ir.ui.view">
-            <field name="name">stock.move.incoming.search2</field>
-            <field name="model">stock.move</field>
-            <field eval="6" name="priority"/>
-            <field name="arch" type="xml">
-                <search string="Stock Moves">
-                    <field name="origin" string="Stock Moves"/>
-                    <filter icon="terp-gtk-go-back-rtl" name="receive" string="Waiting " domain="[('state','in',('confirmed','assigned'))]" help="Stock to be receive"/>
-                    <filter icon="terp-check" name="available" string="Available" domain="[('state','in',('assigned',))]" help="Stock available to be delivered"/>
-                    <filter icon="terp-dialog-close" name="done" string="Done" domain="[('state', '=', 'done')]"/>
-                    <separator/>
-                    <filter icon="terp-go-today" string="Today" domain="[('date','&lt;=',time.strftime('%%Y-%%m-%%d 23:59:59')),('date','&gt;=',time.strftime('%%Y-%%m-%%d 00:00:00'))]" help="Orders planned for today"/>
-                    <field name="product_id"/>
-                    <field name="prodlot_id"/>
-                    <group expand="0" string="Group By...">
-                        <filter string="Product" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'product_id'}"/>
-                        <filter string="Order" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'origin'}"/>
-                        <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
-                        <filter string="Order Date" icon="terp-go-month" domain="[]" context="{'group_by':'date'}" groups="base.group_no_one"/>
-                    </group>
-                </search>
-            </field>
-        </record>
-
-        <record id="view_move_search_reception_outcoming_picking" model="ir.ui.view">
-            <field name="name">stock.move.outgoing.search2</field>
-            <field name="model">stock.move</field>
-            <field eval="6" name="priority"/>
-            <field name="arch" type="xml">
-                <search string="Stock Moves">
-                    <field name="origin" string="Stock Moves"/>
-                    <filter icon="terp-gtk-go-back-rtl" name="receive" string="Waiting" domain="[('state','in',('confirmed','assigned'))]" help="Stock to be delivered (Available or not)"/>
-                    <filter icon="terp-check" name="available" string="Available" domain="[('state','in',('assigned',))]" help="Stock available to be delivered"/>
-                    <filter icon="terp-dialog-close" name="received" string="Done" domain="[('state','=','done')]"/>
-                    <separator/>
-                    <filter icon="terp-go-today" string="Today" domain="[('date','&lt;=',time.strftime('%%Y-%%m-%%d 23:59:59')),('date','&gt;=',time.strftime('%%Y-%%m-%%d 00:00:00'))]" help="Orders planned for today"/>
-                    <field name="product_id"/>
-                    <field name="prodlot_id"/>
-                    <group expand="0" string="Group By...">
-                        <filter string="Product" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'product_id'}"/>
-                        <filter string="Order" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'origin'}"/>
-                        <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
-                        <filter string="Order Date" icon="terp-go-month" domain="[]" context="{'group_by':'date'}" groups="base.group_no_one"/>
-                    </group>
-                </search>
-            </field>
-        </record>
-
         <record id="action_reception_picking_move" model="ir.actions.act_window">
             <field name="name">Receive Products</field>
             <field name="res_model">stock.move</field>
@@ -1491,8 +1453,7 @@
             <field name="view_mode">tree,form</field>
             <field name="domain">['|','&amp;',('picking_id','=',False),('location_id.usage', 'in', ['customer','supplier']),'&amp;',('picking_id','!=',False),('picking_id.type','=','in')]</field>
             <field name="view_id" ref="view_move_tree_reception_picking"/>
-            <field name="context" eval="'{\'product_receive\' : True, \'default_location_id\':%d, \'default_location_dest_id\':%d}' % (ref('stock_location_suppliers'),ref('stock_location_stock') )"/>
-            <field name="search_view_id" ref="view_move_search_reception_incoming_picking"/>
+            <field name="context" eval="'{\'product_receive\' : True, \'default_location_id\':%d, \'default_location_dest_id\':%d, \'search_default_future\': 1}' % (ref('stock_location_suppliers'),ref('stock_location_stock') )"/>
             <field name="help" type="html">
               <p>
                 Click to register a product reception. 
@@ -1627,8 +1588,7 @@
             <field name="view_mode">tree,form</field>
             <field name="domain">['|','&amp;',('picking_id','=',False),('location_dest_id.usage', 'in', ['customer','supplier']),'&amp;',('picking_id','!=',False),('picking_id.type','=','out')]</field>
             <field name="view_id" ref="view_move_tree_reception_picking"/>
-            <field name="context" eval="'{\'default_location_id\':%d, \'default_location_dest_id\':%d}' % (ref('stock_location_stock'),ref('stock_location_customers'))"/>
-            <field name="search_view_id" ref="view_move_search_reception_outcoming_picking"/>
+            <field name="context" eval="'{\'default_location_id\':%d, \'default_location_dest_id\':%d, \'search_default_future\': 1}' % (ref('stock_location_stock'),ref('stock_location_customers'))"/>
             <field name="help" type="html">
               <p>
                 You will find in this list all products you have to deliver to
diff --git a/addons/stock/wizard/stock_change_product_qty.py b/addons/stock/wizard/stock_change_product_qty.py
index 0cc97e10298..5aa4649af02 100644
--- a/addons/stock/wizard/stock_change_product_qty.py
+++ b/addons/stock/wizard/stock_change_product_qty.py
@@ -113,7 +113,7 @@ class stock_change_product_qty(osv.osv_memory):
         for data in self.browse(cr, uid, ids, context=context):
             location_name = location_obj.browse(cr, uid, data.location_id.id, context=context).name
             message = _("<b>Quantity has been changed</b> to <em>%s %s </em> for <em>%s</em> location.") % (data.new_quantity, data.product_id.uom_id.name, location_name)
-            prod_obj.message_append_note(cr, uid, [data.product_id.id], body=message, context=context)
+            prod_obj.message_post(cr, uid, [data.product_id.id], body=message, context=context)
 
 stock_change_product_qty()
 
diff --git a/addons/stock_invoice_directly/__openerp__.py b/addons/stock_invoice_directly/__openerp__.py
index c7c87af7ee0..57b4f8e38bb 100644
--- a/addons/stock_invoice_directly/__openerp__.py
+++ b/addons/stock_invoice_directly/__openerp__.py
@@ -23,7 +23,7 @@
 {
     'name': 'Invoice Picking Directly',
     'version': '1.0',
-    "category" : "Warehouse Management",
+    'category' : 'Warehouse Management',
     'description': """
 Invoice Wizard for Delivery.
 ============================
@@ -35,9 +35,8 @@ wizard if the delivery is to be invoiced.
     'website': 'http://www.openerp.com',
     'images': ['images/create_invoice.jpeg'],
     'depends': ['delivery', 'stock'],
-    'init_xml': [],
-    'update_xml': [],
-    'demo_xml': [],
+    'data': [],
+    'demo': [],
     'test': ['test/stock_invoice_directly.yml'],
     'installable': True,
     'auto_install': False,
diff --git a/addons/stock_invoice_directly/i18n/ar.po b/addons/stock_invoice_directly/i18n/ar.po
index 6803bb5532d..c28be824f03 100644
--- a/addons/stock_invoice_directly/i18n/ar.po
+++ b/addons/stock_invoice_directly/i18n/ar.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:29+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: stock_invoice_directly
 #: model:ir.model,name:stock_invoice_directly.model_stock_partial_picking
diff --git a/addons/stock_invoice_directly/i18n/bg.po b/addons/stock_invoice_directly/i18n/bg.po
index 56f5ba39397..80b5fba0bb2 100644
--- a/addons/stock_invoice_directly/i18n/bg.po
+++ b/addons/stock_invoice_directly/i18n/bg.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:29+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: stock_invoice_directly
 #: model:ir.model,name:stock_invoice_directly.model_stock_partial_picking
diff --git a/addons/stock_invoice_directly/i18n/bs.po b/addons/stock_invoice_directly/i18n/bs.po
index e5566a0ff4b..787fe4d1bb3 100644
--- a/addons/stock_invoice_directly/i18n/bs.po
+++ b/addons/stock_invoice_directly/i18n/bs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:29+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: stock_invoice_directly
 #: model:ir.model,name:stock_invoice_directly.model_stock_partial_picking
diff --git a/addons/stock_invoice_directly/i18n/ca.po b/addons/stock_invoice_directly/i18n/ca.po
index 0179454ed0f..6dae68c6dfa 100644
--- a/addons/stock_invoice_directly/i18n/ca.po
+++ b/addons/stock_invoice_directly/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:29+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: stock_invoice_directly
 #: model:ir.model,name:stock_invoice_directly.model_stock_partial_picking
diff --git a/addons/stock_invoice_directly/i18n/cs.po b/addons/stock_invoice_directly/i18n/cs.po
index bd30b7e11ea..be54ef606d5 100644
--- a/addons/stock_invoice_directly/i18n/cs.po
+++ b/addons/stock_invoice_directly/i18n/cs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:29+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: stock_invoice_directly
 #: model:ir.model,name:stock_invoice_directly.model_stock_partial_picking
diff --git a/addons/stock_invoice_directly/i18n/da.po b/addons/stock_invoice_directly/i18n/da.po
index 225d7ba8cf8..32714f931bb 100644
--- a/addons/stock_invoice_directly/i18n/da.po
+++ b/addons/stock_invoice_directly/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:29+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: stock_invoice_directly
 #: model:ir.model,name:stock_invoice_directly.model_stock_partial_picking
diff --git a/addons/stock_invoice_directly/i18n/de.po b/addons/stock_invoice_directly/i18n/de.po
index e50d866c835..3e04fea7db6 100644
--- a/addons/stock_invoice_directly/i18n/de.po
+++ b/addons/stock_invoice_directly/i18n/de.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:29+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: stock_invoice_directly
 #: model:ir.model,name:stock_invoice_directly.model_stock_partial_picking
diff --git a/addons/stock_invoice_directly/i18n/el.po b/addons/stock_invoice_directly/i18n/el.po
index 30fd9b95ded..852b08c920e 100644
--- a/addons/stock_invoice_directly/i18n/el.po
+++ b/addons/stock_invoice_directly/i18n/el.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:29+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: stock_invoice_directly
 #: model:ir.model,name:stock_invoice_directly.model_stock_partial_picking
diff --git a/addons/stock_invoice_directly/i18n/es.po b/addons/stock_invoice_directly/i18n/es.po
index 7f620f8567e..67fe818aa53 100644
--- a/addons/stock_invoice_directly/i18n/es.po
+++ b/addons/stock_invoice_directly/i18n/es.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:29+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: stock_invoice_directly
 #: model:ir.model,name:stock_invoice_directly.model_stock_partial_picking
diff --git a/addons/stock_invoice_directly/i18n/es_AR.po b/addons/stock_invoice_directly/i18n/es_AR.po
index 4692b98ca89..6af8391534a 100644
--- a/addons/stock_invoice_directly/i18n/es_AR.po
+++ b/addons/stock_invoice_directly/i18n/es_AR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:29+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: stock_invoice_directly
 #: model:ir.model,name:stock_invoice_directly.model_stock_partial_picking
diff --git a/addons/stock_invoice_directly/i18n/es_CL.po b/addons/stock_invoice_directly/i18n/es_CL.po
index bdcbeeea96d..b2383406fc6 100644
--- a/addons/stock_invoice_directly/i18n/es_CL.po
+++ b/addons/stock_invoice_directly/i18n/es_CL.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:29+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: stock_invoice_directly
 #: model:ir.model,name:stock_invoice_directly.model_stock_partial_picking
diff --git a/addons/stock_invoice_directly/i18n/es_CR.po b/addons/stock_invoice_directly/i18n/es_CR.po
index 9a6eca86b07..8c48f9cab53 100644
--- a/addons/stock_invoice_directly/i18n/es_CR.po
+++ b/addons/stock_invoice_directly/i18n/es_CR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:29+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 "Language: \n"
 
 #. module: stock_invoice_directly
diff --git a/addons/stock_invoice_directly/i18n/et.po b/addons/stock_invoice_directly/i18n/et.po
index d5ba0f1a355..7019ae4e013 100644
--- a/addons/stock_invoice_directly/i18n/et.po
+++ b/addons/stock_invoice_directly/i18n/et.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:29+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: stock_invoice_directly
 #: model:ir.model,name:stock_invoice_directly.model_stock_partial_picking
diff --git a/addons/stock_invoice_directly/i18n/fi.po b/addons/stock_invoice_directly/i18n/fi.po
index 518a326ac6e..93bf190a88f 100644
--- a/addons/stock_invoice_directly/i18n/fi.po
+++ b/addons/stock_invoice_directly/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:29+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: stock_invoice_directly
 #: model:ir.model,name:stock_invoice_directly.model_stock_partial_picking
diff --git a/addons/stock_invoice_directly/i18n/fr.po b/addons/stock_invoice_directly/i18n/fr.po
index a60f8ba9b48..a2c7c23d448 100644
--- a/addons/stock_invoice_directly/i18n/fr.po
+++ b/addons/stock_invoice_directly/i18n/fr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:29+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: stock_invoice_directly
 #: model:ir.model,name:stock_invoice_directly.model_stock_partial_picking
diff --git a/addons/stock_invoice_directly/i18n/gl.po b/addons/stock_invoice_directly/i18n/gl.po
index a5b68525864..9864a8d5c7b 100644
--- a/addons/stock_invoice_directly/i18n/gl.po
+++ b/addons/stock_invoice_directly/i18n/gl.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:29+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: stock_invoice_directly
 #: model:ir.model,name:stock_invoice_directly.model_stock_partial_picking
diff --git a/addons/stock_invoice_directly/i18n/hr.po b/addons/stock_invoice_directly/i18n/hr.po
index 51341a659ec..84e3c691c71 100644
--- a/addons/stock_invoice_directly/i18n/hr.po
+++ b/addons/stock_invoice_directly/i18n/hr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:29+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: stock_invoice_directly
 #: model:ir.model,name:stock_invoice_directly.model_stock_partial_picking
diff --git a/addons/stock_invoice_directly/i18n/hu.po b/addons/stock_invoice_directly/i18n/hu.po
index bcfcd41bbee..c297e3908b0 100644
--- a/addons/stock_invoice_directly/i18n/hu.po
+++ b/addons/stock_invoice_directly/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:29+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: stock_invoice_directly
 #: model:ir.model,name:stock_invoice_directly.model_stock_partial_picking
diff --git a/addons/stock_invoice_directly/i18n/id.po b/addons/stock_invoice_directly/i18n/id.po
index 079bdf91982..29a24d37aa7 100644
--- a/addons/stock_invoice_directly/i18n/id.po
+++ b/addons/stock_invoice_directly/i18n/id.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:29+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: stock_invoice_directly
 #: model:ir.model,name:stock_invoice_directly.model_stock_partial_picking
diff --git a/addons/stock_invoice_directly/i18n/it.po b/addons/stock_invoice_directly/i18n/it.po
index 681159929b1..4baecfb2141 100644
--- a/addons/stock_invoice_directly/i18n/it.po
+++ b/addons/stock_invoice_directly/i18n/it.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:29+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: stock_invoice_directly
 #: model:ir.model,name:stock_invoice_directly.model_stock_partial_picking
diff --git a/addons/stock_invoice_directly/i18n/ja.po b/addons/stock_invoice_directly/i18n/ja.po
index d170240e7a1..f9956a466d3 100644
--- a/addons/stock_invoice_directly/i18n/ja.po
+++ b/addons/stock_invoice_directly/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:29+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: stock_invoice_directly
 #: model:ir.model,name:stock_invoice_directly.model_stock_partial_picking
diff --git a/addons/stock_invoice_directly/i18n/ko.po b/addons/stock_invoice_directly/i18n/ko.po
index bb8550a8ea9..660d4f3d289 100644
--- a/addons/stock_invoice_directly/i18n/ko.po
+++ b/addons/stock_invoice_directly/i18n/ko.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:29+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: stock_invoice_directly
 #: model:ir.model,name:stock_invoice_directly.model_stock_partial_picking
diff --git a/addons/stock_invoice_directly/i18n/lt.po b/addons/stock_invoice_directly/i18n/lt.po
index db809c21160..4a1da869d95 100644
--- a/addons/stock_invoice_directly/i18n/lt.po
+++ b/addons/stock_invoice_directly/i18n/lt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:29+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: stock_invoice_directly
 #: model:ir.model,name:stock_invoice_directly.model_stock_partial_picking
diff --git a/addons/stock_invoice_directly/i18n/lv.po b/addons/stock_invoice_directly/i18n/lv.po
index dd31b23a580..da1a330d955 100644
--- a/addons/stock_invoice_directly/i18n/lv.po
+++ b/addons/stock_invoice_directly/i18n/lv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:29+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: stock_invoice_directly
 #: model:ir.model,name:stock_invoice_directly.model_stock_partial_picking
diff --git a/addons/stock_invoice_directly/i18n/mk.po b/addons/stock_invoice_directly/i18n/mk.po
index 8c0824cf142..9d8ac5a51b1 100644
--- a/addons/stock_invoice_directly/i18n/mk.po
+++ b/addons/stock_invoice_directly/i18n/mk.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:29+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: stock_invoice_directly
 #: model:ir.model,name:stock_invoice_directly.model_stock_partial_picking
diff --git a/addons/stock_invoice_directly/i18n/mn.po b/addons/stock_invoice_directly/i18n/mn.po
index 9d59ef24c4b..c8b89a63705 100644
--- a/addons/stock_invoice_directly/i18n/mn.po
+++ b/addons/stock_invoice_directly/i18n/mn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:29+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: stock_invoice_directly
 #: model:ir.model,name:stock_invoice_directly.model_stock_partial_picking
diff --git a/addons/stock_invoice_directly/i18n/nb.po b/addons/stock_invoice_directly/i18n/nb.po
index 599e9c826bc..7e207905549 100644
--- a/addons/stock_invoice_directly/i18n/nb.po
+++ b/addons/stock_invoice_directly/i18n/nb.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:29+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: stock_invoice_directly
 #: model:ir.model,name:stock_invoice_directly.model_stock_partial_picking
diff --git a/addons/stock_invoice_directly/i18n/nl.po b/addons/stock_invoice_directly/i18n/nl.po
index 5f91b36777c..517d62553f7 100644
--- a/addons/stock_invoice_directly/i18n/nl.po
+++ b/addons/stock_invoice_directly/i18n/nl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:29+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: stock_invoice_directly
 #: model:ir.model,name:stock_invoice_directly.model_stock_partial_picking
diff --git a/addons/stock_invoice_directly/i18n/nl_BE.po b/addons/stock_invoice_directly/i18n/nl_BE.po
index 792ea3b6ca5..434a177d960 100644
--- a/addons/stock_invoice_directly/i18n/nl_BE.po
+++ b/addons/stock_invoice_directly/i18n/nl_BE.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:29+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: stock_invoice_directly
 #: model:ir.model,name:stock_invoice_directly.model_stock_partial_picking
diff --git a/addons/stock_invoice_directly/i18n/oc.po b/addons/stock_invoice_directly/i18n/oc.po
index 3530a5686a4..30e36cccf62 100644
--- a/addons/stock_invoice_directly/i18n/oc.po
+++ b/addons/stock_invoice_directly/i18n/oc.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:29+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: stock_invoice_directly
 #: model:ir.model,name:stock_invoice_directly.model_stock_partial_picking
diff --git a/addons/stock_invoice_directly/i18n/pl.po b/addons/stock_invoice_directly/i18n/pl.po
index 89857ae81e9..22dba22f83b 100644
--- a/addons/stock_invoice_directly/i18n/pl.po
+++ b/addons/stock_invoice_directly/i18n/pl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:29+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: stock_invoice_directly
 #: model:ir.model,name:stock_invoice_directly.model_stock_partial_picking
diff --git a/addons/stock_invoice_directly/i18n/pt.po b/addons/stock_invoice_directly/i18n/pt.po
index 431a59a1c59..480e5734ace 100644
--- a/addons/stock_invoice_directly/i18n/pt.po
+++ b/addons/stock_invoice_directly/i18n/pt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:29+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: stock_invoice_directly
 #: model:ir.model,name:stock_invoice_directly.model_stock_partial_picking
diff --git a/addons/stock_invoice_directly/i18n/pt_BR.po b/addons/stock_invoice_directly/i18n/pt_BR.po
index fcdfc5acc8b..8520cf443d9 100644
--- a/addons/stock_invoice_directly/i18n/pt_BR.po
+++ b/addons/stock_invoice_directly/i18n/pt_BR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:29+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: stock_invoice_directly
 #: model:ir.model,name:stock_invoice_directly.model_stock_partial_picking
diff --git a/addons/stock_invoice_directly/i18n/ro.po b/addons/stock_invoice_directly/i18n/ro.po
index 7f900c8e1fd..5eeb5941e06 100644
--- a/addons/stock_invoice_directly/i18n/ro.po
+++ b/addons/stock_invoice_directly/i18n/ro.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:29+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: stock_invoice_directly
 #: model:ir.model,name:stock_invoice_directly.model_stock_partial_picking
diff --git a/addons/stock_invoice_directly/i18n/ru.po b/addons/stock_invoice_directly/i18n/ru.po
index 45130dc8218..2370c0aee33 100644
--- a/addons/stock_invoice_directly/i18n/ru.po
+++ b/addons/stock_invoice_directly/i18n/ru.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:29+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: stock_invoice_directly
 #: model:ir.model,name:stock_invoice_directly.model_stock_partial_picking
diff --git a/addons/stock_invoice_directly/i18n/sl.po b/addons/stock_invoice_directly/i18n/sl.po
index 716104c6d6e..ae7bac999ef 100644
--- a/addons/stock_invoice_directly/i18n/sl.po
+++ b/addons/stock_invoice_directly/i18n/sl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:29+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: stock_invoice_directly
 #: model:ir.model,name:stock_invoice_directly.model_stock_partial_picking
diff --git a/addons/stock_invoice_directly/i18n/sq.po b/addons/stock_invoice_directly/i18n/sq.po
index 01f0fdb5209..2aa986ca8b6 100644
--- a/addons/stock_invoice_directly/i18n/sq.po
+++ b/addons/stock_invoice_directly/i18n/sq.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:29+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: stock_invoice_directly
 #: model:ir.model,name:stock_invoice_directly.model_stock_partial_picking
diff --git a/addons/stock_invoice_directly/i18n/sr.po b/addons/stock_invoice_directly/i18n/sr.po
index 5efec9e759d..485c8432bc1 100644
--- a/addons/stock_invoice_directly/i18n/sr.po
+++ b/addons/stock_invoice_directly/i18n/sr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:29+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: stock_invoice_directly
 #: model:ir.model,name:stock_invoice_directly.model_stock_partial_picking
diff --git a/addons/stock_invoice_directly/i18n/sr@latin.po b/addons/stock_invoice_directly/i18n/sr@latin.po
index 14033be4705..2cccec61057 100644
--- a/addons/stock_invoice_directly/i18n/sr@latin.po
+++ b/addons/stock_invoice_directly/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:29+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: stock_invoice_directly
 #: model:ir.model,name:stock_invoice_directly.model_stock_partial_picking
diff --git a/addons/stock_invoice_directly/i18n/sv.po b/addons/stock_invoice_directly/i18n/sv.po
index 7f8c198140e..80baa295842 100644
--- a/addons/stock_invoice_directly/i18n/sv.po
+++ b/addons/stock_invoice_directly/i18n/sv.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:29+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: stock_invoice_directly
 #: model:ir.model,name:stock_invoice_directly.model_stock_partial_picking
diff --git a/addons/stock_invoice_directly/i18n/tr.po b/addons/stock_invoice_directly/i18n/tr.po
index 2401b87748e..b8047cd6517 100644
--- a/addons/stock_invoice_directly/i18n/tr.po
+++ b/addons/stock_invoice_directly/i18n/tr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:29+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: stock_invoice_directly
 #: model:ir.model,name:stock_invoice_directly.model_stock_partial_picking
diff --git a/addons/stock_invoice_directly/i18n/uk.po b/addons/stock_invoice_directly/i18n/uk.po
index 92288212e9e..685ae9ba191 100644
--- a/addons/stock_invoice_directly/i18n/uk.po
+++ b/addons/stock_invoice_directly/i18n/uk.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:29+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: stock_invoice_directly
 #: model:ir.model,name:stock_invoice_directly.model_stock_partial_picking
diff --git a/addons/stock_invoice_directly/i18n/vi.po b/addons/stock_invoice_directly/i18n/vi.po
index 1c7c4c96010..6a4083a4213 100644
--- a/addons/stock_invoice_directly/i18n/vi.po
+++ b/addons/stock_invoice_directly/i18n/vi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:29+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: stock_invoice_directly
 #: model:ir.model,name:stock_invoice_directly.model_stock_partial_picking
diff --git a/addons/stock_invoice_directly/i18n/zh_CN.po b/addons/stock_invoice_directly/i18n/zh_CN.po
index 93e92e35a9f..4eedf93bcb6 100644
--- a/addons/stock_invoice_directly/i18n/zh_CN.po
+++ b/addons/stock_invoice_directly/i18n/zh_CN.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:29+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: stock_invoice_directly
 #: model:ir.model,name:stock_invoice_directly.model_stock_partial_picking
diff --git a/addons/stock_invoice_directly/i18n/zh_TW.po b/addons/stock_invoice_directly/i18n/zh_TW.po
index db809c21160..4a1da869d95 100644
--- a/addons/stock_invoice_directly/i18n/zh_TW.po
+++ b/addons/stock_invoice_directly/i18n/zh_TW.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:29+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: stock_invoice_directly
 #: model:ir.model,name:stock_invoice_directly.model_stock_partial_picking
diff --git a/addons/stock_location/__openerp__.py b/addons/stock_location/__openerp__.py
index db2858bb44a..8cc1790e7de 100644
--- a/addons/stock_location/__openerp__.py
+++ b/addons/stock_location/__openerp__.py
@@ -29,12 +29,13 @@ This module supplements the Warehouse application by effectively implementing Pu
 ============================================================================================================
 
 Typically this could be used to:
+--------------------------------
     * Manage product manufacturing chains
     * Manage default locations per product
     * Define routes within your warehouse according to business needs, such as:
-       - Quality Control
-       - After Sales Services
-       - Supplier Returns
+        - Quality Control
+        - After Sales Services
+        - Supplier Returns
 
     * Help rental management, by generating automated return moves for rented products
 
@@ -77,16 +78,17 @@ all the way between the Customer and Supplier.
 
 Technically, Pull flows allow to process procurement orders differently, not
 only depending on the product being considered, but also depending on which
-location holds the "need" for that product (i.e. the destination location of
+location holds the 'need' for that product (i.e. the destination location of
 that procurement order).
 
 Use-Case:
 ---------
 
 You can use the demo data as follow:
-  CPU1: Sell some CPU1 from Chicago Shop and run the scheduler
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  **CPU1:** Sell some CPU1 from Chicago Shop and run the scheduler
      - Warehouse: delivery order, Chicago Shop: reception
-  CPU3:
+  **CPU3:**
      - When receiving the product, it goes to Quality Control location then
        stored to shelf 2.
      - When delivering the customer: Pick List -> Packing -> Delivery Order from Gate A
@@ -94,16 +96,15 @@ You can use the demo data as follow:
     'author': 'OpenERP SA',
     'images': ['images/pulled_flow.jpeg','images/pushed_flow.jpeg'],
     'depends': ['procurement','stock','sale'],
-    'init_xml': [],
-    'update_xml': ['stock_location_view.xml', "security/stock_location_security.xml", 'security/ir.model.access.csv', 'procurement_pull_workflow.xml'],
-    'demo_xml': [
+    'data': ['stock_location_view.xml', 'security/stock_location_security.xml', 'security/ir.model.access.csv', 'procurement_pull_workflow.xml'],
+    'demo': [
         'stock_location_demo_cpu1.xml',
         'stock_location_demo_cpu3.yml',
     ],
     'installable': True,
-    'test':[
-            'test/stock_location_pull_flow.yml',
-            'test/stock_location_push_flow.yml',
+    'test': [
+        'test/stock_location_pull_flow.yml',
+        'test/stock_location_push_flow.yml',
     ],
     'auto_install': False,
     'certificate': '0046505115101',
diff --git a/addons/stock_location/i18n/ar.po b/addons/stock_location/i18n/ar.po
index 66ec8c68949..7d084d6751d 100644
--- a/addons/stock_location/i18n/ar.po
+++ b/addons/stock_location/i18n/ar.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:23+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:28+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: stock_location
 #: selection:product.pulled.flow,picking_type:0
diff --git a/addons/stock_location/i18n/bg.po b/addons/stock_location/i18n/bg.po
index 08c14be3a10..ef29eb63182 100644
--- a/addons/stock_location/i18n/bg.po
+++ b/addons/stock_location/i18n/bg.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:23+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:28+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: stock_location
 #: selection:product.pulled.flow,picking_type:0
diff --git a/addons/stock_location/i18n/bs.po b/addons/stock_location/i18n/bs.po
index d2570e83eb3..ac3e5b2f795 100644
--- a/addons/stock_location/i18n/bs.po
+++ b/addons/stock_location/i18n/bs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:23+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:28+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: stock_location
 #: selection:product.pulled.flow,picking_type:0
diff --git a/addons/stock_location/i18n/ca.po b/addons/stock_location/i18n/ca.po
index 16028281334..44acced2a8a 100644
--- a/addons/stock_location/i18n/ca.po
+++ b/addons/stock_location/i18n/ca.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:23+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:28+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: stock_location
 #: selection:product.pulled.flow,picking_type:0
diff --git a/addons/stock_location/i18n/cs.po b/addons/stock_location/i18n/cs.po
index b199c0130fc..afe495d8364 100644
--- a/addons/stock_location/i18n/cs.po
+++ b/addons/stock_location/i18n/cs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:23+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:28+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: stock_location
 #: selection:product.pulled.flow,picking_type:0
diff --git a/addons/stock_location/i18n/da.po b/addons/stock_location/i18n/da.po
index 135433dd243..b6e35fa278a 100644
--- a/addons/stock_location/i18n/da.po
+++ b/addons/stock_location/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:23+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:28+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: stock_location
 #: selection:product.pulled.flow,picking_type:0
diff --git a/addons/stock_location/i18n/de.po b/addons/stock_location/i18n/de.po
index 58e0be05d26..ca5408b18df 100644
--- a/addons/stock_location/i18n/de.po
+++ b/addons/stock_location/i18n/de.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:23+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:28+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: stock_location
 #: selection:product.pulled.flow,picking_type:0
diff --git a/addons/stock_location/i18n/el.po b/addons/stock_location/i18n/el.po
index ab82c9b7246..ba88f6ed76a 100644
--- a/addons/stock_location/i18n/el.po
+++ b/addons/stock_location/i18n/el.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:23+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:28+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
 "X-Poedit-SourceCharset: utf-8\n"
diff --git a/addons/stock_location/i18n/es.po b/addons/stock_location/i18n/es.po
index 8e517525bbc..d54a3cef9c2 100644
--- a/addons/stock_location/i18n/es.po
+++ b/addons/stock_location/i18n/es.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:23+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:28+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: stock_location
 #: selection:product.pulled.flow,picking_type:0
diff --git a/addons/stock_location/i18n/es_AR.po b/addons/stock_location/i18n/es_AR.po
index 0f17a7651aa..604008146dd 100644
--- a/addons/stock_location/i18n/es_AR.po
+++ b/addons/stock_location/i18n/es_AR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:23+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:28+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: stock_location
 #: selection:product.pulled.flow,picking_type:0
diff --git a/addons/stock_location/i18n/es_CL.po b/addons/stock_location/i18n/es_CL.po
index d54e7c85878..ae22f6b5510 100644
--- a/addons/stock_location/i18n/es_CL.po
+++ b/addons/stock_location/i18n/es_CL.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:23+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:28+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: stock_location
 #: selection:product.pulled.flow,picking_type:0
diff --git a/addons/stock_location/i18n/es_CR.po b/addons/stock_location/i18n/es_CR.po
index 14475084728..4e117006a7d 100644
--- a/addons/stock_location/i18n/es_CR.po
+++ b/addons/stock_location/i18n/es_CR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:23+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:28+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 "Language: \n"
 
 #. module: stock_location
diff --git a/addons/stock_location/i18n/et.po b/addons/stock_location/i18n/et.po
index 448062c874e..e7bcc115060 100644
--- a/addons/stock_location/i18n/et.po
+++ b/addons/stock_location/i18n/et.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:23+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:28+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: stock_location
 #: selection:product.pulled.flow,picking_type:0
diff --git a/addons/stock_location/i18n/fi.po b/addons/stock_location/i18n/fi.po
index b58564561e6..079c7b2d046 100644
--- a/addons/stock_location/i18n/fi.po
+++ b/addons/stock_location/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:23+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:28+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: stock_location
 #: selection:product.pulled.flow,picking_type:0
diff --git a/addons/stock_location/i18n/fr.po b/addons/stock_location/i18n/fr.po
index 0202ea37426..07b99ed04d7 100644
--- a/addons/stock_location/i18n/fr.po
+++ b/addons/stock_location/i18n/fr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:23+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:28+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: stock_location
 #: selection:product.pulled.flow,picking_type:0
diff --git a/addons/stock_location/i18n/gl.po b/addons/stock_location/i18n/gl.po
index 34b587bb842..57d7db9b09e 100644
--- a/addons/stock_location/i18n/gl.po
+++ b/addons/stock_location/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:23+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:28+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: stock_location
 #: selection:product.pulled.flow,picking_type:0
diff --git a/addons/stock_location/i18n/hr.po b/addons/stock_location/i18n/hr.po
index d3a4de33ba4..872c5ad75f2 100644
--- a/addons/stock_location/i18n/hr.po
+++ b/addons/stock_location/i18n/hr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:23+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:28+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: stock_location
 #: selection:product.pulled.flow,picking_type:0
diff --git a/addons/stock_location/i18n/hu.po b/addons/stock_location/i18n/hu.po
index 9f4419ff9be..585c99ae08c 100644
--- a/addons/stock_location/i18n/hu.po
+++ b/addons/stock_location/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:23+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:28+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: stock_location
 #: selection:product.pulled.flow,picking_type:0
diff --git a/addons/stock_location/i18n/id.po b/addons/stock_location/i18n/id.po
index 91fb3829c3f..0e2634baeec 100644
--- a/addons/stock_location/i18n/id.po
+++ b/addons/stock_location/i18n/id.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:23+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:28+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: stock_location
 #: selection:product.pulled.flow,picking_type:0
diff --git a/addons/stock_location/i18n/it.po b/addons/stock_location/i18n/it.po
index 8bc72a39124..305b50ceccc 100644
--- a/addons/stock_location/i18n/it.po
+++ b/addons/stock_location/i18n/it.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:23+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:28+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: stock_location
 #: selection:product.pulled.flow,picking_type:0
diff --git a/addons/stock_location/i18n/ja.po b/addons/stock_location/i18n/ja.po
index 29c22a7f507..ed1c1b96cc8 100644
--- a/addons/stock_location/i18n/ja.po
+++ b/addons/stock_location/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:23+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:28+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: stock_location
 #: selection:product.pulled.flow,picking_type:0
diff --git a/addons/stock_location/i18n/ko.po b/addons/stock_location/i18n/ko.po
index 2492e6da439..4ad43eb95c0 100644
--- a/addons/stock_location/i18n/ko.po
+++ b/addons/stock_location/i18n/ko.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:23+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:28+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: stock_location
 #: selection:product.pulled.flow,picking_type:0
diff --git a/addons/stock_location/i18n/lt.po b/addons/stock_location/i18n/lt.po
index 85d3ffb2510..c52ed28e597 100644
--- a/addons/stock_location/i18n/lt.po
+++ b/addons/stock_location/i18n/lt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:23+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:28+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: stock_location
 #: selection:product.pulled.flow,picking_type:0
diff --git a/addons/stock_location/i18n/lv.po b/addons/stock_location/i18n/lv.po
index b6719c5a3ee..609f49ad441 100644
--- a/addons/stock_location/i18n/lv.po
+++ b/addons/stock_location/i18n/lv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:23+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:28+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: stock_location
 #: selection:product.pulled.flow,picking_type:0
diff --git a/addons/stock_location/i18n/mk.po b/addons/stock_location/i18n/mk.po
index 785e4dc22fd..c07437d8a91 100644
--- a/addons/stock_location/i18n/mk.po
+++ b/addons/stock_location/i18n/mk.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:23+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:28+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: stock_location
 #: selection:product.pulled.flow,picking_type:0
diff --git a/addons/stock_location/i18n/mn.po b/addons/stock_location/i18n/mn.po
index 76408a9309a..373177ea4e1 100644
--- a/addons/stock_location/i18n/mn.po
+++ b/addons/stock_location/i18n/mn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:23+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:28+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: stock_location
 #: selection:product.pulled.flow,picking_type:0
diff --git a/addons/stock_location/i18n/nb.po b/addons/stock_location/i18n/nb.po
index d118aae6097..3db35dfca81 100644
--- a/addons/stock_location/i18n/nb.po
+++ b/addons/stock_location/i18n/nb.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:23+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:28+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: stock_location
 #: selection:product.pulled.flow,picking_type:0
diff --git a/addons/stock_location/i18n/nl.po b/addons/stock_location/i18n/nl.po
index 49ab2d33d56..ec285837b30 100644
--- a/addons/stock_location/i18n/nl.po
+++ b/addons/stock_location/i18n/nl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:23+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:28+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: stock_location
 #: selection:product.pulled.flow,picking_type:0
diff --git a/addons/stock_location/i18n/nl_BE.po b/addons/stock_location/i18n/nl_BE.po
index 9a0a3fe4e1a..48c47a64a1a 100644
--- a/addons/stock_location/i18n/nl_BE.po
+++ b/addons/stock_location/i18n/nl_BE.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:23+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:28+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: stock_location
 #: selection:product.pulled.flow,picking_type:0
diff --git a/addons/stock_location/i18n/pl.po b/addons/stock_location/i18n/pl.po
index 827e37bda92..fec012436e5 100644
--- a/addons/stock_location/i18n/pl.po
+++ b/addons/stock_location/i18n/pl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:23+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:28+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: stock_location
 #: selection:product.pulled.flow,picking_type:0
diff --git a/addons/stock_location/i18n/pt.po b/addons/stock_location/i18n/pt.po
index 0f6237916f9..cbfba19f4af 100644
--- a/addons/stock_location/i18n/pt.po
+++ b/addons/stock_location/i18n/pt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:23+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:28+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: stock_location
 #: selection:product.pulled.flow,picking_type:0
diff --git a/addons/stock_location/i18n/pt_BR.po b/addons/stock_location/i18n/pt_BR.po
index 4de0b0ced38..77008ada5a6 100644
--- a/addons/stock_location/i18n/pt_BR.po
+++ b/addons/stock_location/i18n/pt_BR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:23+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:28+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: stock_location
 #: selection:product.pulled.flow,picking_type:0
@@ -243,6 +243,7 @@ msgstr ""
 #: constraint:stock.move:0
 msgid "You can not move products from or to a location of the type view."
 msgstr ""
+"Você não pode mover os produtos de/para um Local do tipo Visualização"
 
 #. module: stock_location
 #: selection:stock.location.path,auto:0
diff --git a/addons/stock_location/i18n/ro.po b/addons/stock_location/i18n/ro.po
index 486d20c806a..e959bb059ab 100644
--- a/addons/stock_location/i18n/ro.po
+++ b/addons/stock_location/i18n/ro.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:23+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:28+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: stock_location
 #: selection:product.pulled.flow,picking_type:0
diff --git a/addons/stock_location/i18n/ru.po b/addons/stock_location/i18n/ru.po
index c722dcde968..c060535634e 100644
--- a/addons/stock_location/i18n/ru.po
+++ b/addons/stock_location/i18n/ru.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:23+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:28+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: stock_location
 #: selection:product.pulled.flow,picking_type:0
diff --git a/addons/stock_location/i18n/sl.po b/addons/stock_location/i18n/sl.po
index c319106ea0f..cb8c7c47536 100644
--- a/addons/stock_location/i18n/sl.po
+++ b/addons/stock_location/i18n/sl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:23+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:28+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: stock_location
 #: selection:product.pulled.flow,picking_type:0
diff --git a/addons/stock_location/i18n/sq.po b/addons/stock_location/i18n/sq.po
index 7d509c1c234..0c38213786b 100644
--- a/addons/stock_location/i18n/sq.po
+++ b/addons/stock_location/i18n/sq.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:23+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:28+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: stock_location
 #: selection:product.pulled.flow,picking_type:0
diff --git a/addons/stock_location/i18n/sv.po b/addons/stock_location/i18n/sv.po
index 89ec0d62228..0deaa094779 100644
--- a/addons/stock_location/i18n/sv.po
+++ b/addons/stock_location/i18n/sv.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:23+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:28+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: stock_location
 #: selection:product.pulled.flow,picking_type:0
diff --git a/addons/stock_location/i18n/tlh.po b/addons/stock_location/i18n/tlh.po
index 842d3285744..5acb738de05 100644
--- a/addons/stock_location/i18n/tlh.po
+++ b/addons/stock_location/i18n/tlh.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:23+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:28+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: stock_location
 #: selection:product.pulled.flow,picking_type:0
diff --git a/addons/stock_location/i18n/tr.po b/addons/stock_location/i18n/tr.po
index 00c6dd0d581..3f5664ece78 100644
--- a/addons/stock_location/i18n/tr.po
+++ b/addons/stock_location/i18n/tr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:23+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:28+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: stock_location
 #: selection:product.pulled.flow,picking_type:0
diff --git a/addons/stock_location/i18n/uk.po b/addons/stock_location/i18n/uk.po
index f6f689be874..66afbf9258e 100644
--- a/addons/stock_location/i18n/uk.po
+++ b/addons/stock_location/i18n/uk.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:23+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:28+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: stock_location
 #: selection:product.pulled.flow,picking_type:0
diff --git a/addons/stock_location/i18n/vi.po b/addons/stock_location/i18n/vi.po
index 889143ffea6..a292d89b426 100644
--- a/addons/stock_location/i18n/vi.po
+++ b/addons/stock_location/i18n/vi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:23+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:28+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: stock_location
 #: selection:product.pulled.flow,picking_type:0
diff --git a/addons/stock_location/i18n/zh_CN.po b/addons/stock_location/i18n/zh_CN.po
index a066ceda1a9..e0325962240 100644
--- a/addons/stock_location/i18n/zh_CN.po
+++ b/addons/stock_location/i18n/zh_CN.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:23+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:28+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: stock_location
 #: selection:product.pulled.flow,picking_type:0
diff --git a/addons/stock_location/i18n/zh_TW.po b/addons/stock_location/i18n/zh_TW.po
index 73bb284eb51..76159c0a3aa 100644
--- a/addons/stock_location/i18n/zh_TW.po
+++ b/addons/stock_location/i18n/zh_TW.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:23+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:28+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: stock_location
 #: selection:product.pulled.flow,picking_type:0
diff --git a/addons/stock_location/stock_location_view.xml b/addons/stock_location/stock_location_view.xml
index 720c7753df6..ddb2efc21e5 100644
--- a/addons/stock_location/stock_location_view.xml
+++ b/addons/stock_location/stock_location_view.xml
@@ -38,62 +38,59 @@
             <field name="model">product.product</field>
             <field name="inherit_id" ref="product.product_normal_form_view"/>
             <field name="arch" type="xml">
-                <notebook position="inside">
-                    <page string="Logistics Flows">
-                        <field name="flow_pull_ids" colspan="4" nolabel="1">
-                            <tree string="Pulled flows">
-                                <field name="name"/>
-                                <field name="location_id" attrs="{'required': [('type_proc', '=', 'move')]}"/>
-                                <field name="type_proc"/>
-                                <field name="journal_id"/>
-                                <field name="company_id" groups="base.group_multi_company"/>
-                            </tree>
-                            <form string="Pulled Paths">
-                                <group>
-                                    <group string="Conditions">
-                                        <field name="name" placeholder="Fulfill needs on location X from location Y "/>
-                                        <field name="location_id"/>
-                                    </group>
-                                    <group string="Action Type">
-                                        <field name="type_proc"/>
-                                        <field name="company_id"/>
-                                    </group>
+                <group name="inventory" position="after">
+                    <field name="flow_pull_ids" colspan="4" nolabel="1">
+                        <tree string="Pulled flows">
+                            <field name="name"/>
+                            <field name="location_id" attrs="{'required': [('type_proc', '=', 'move')]}"/>
+                            <field name="type_proc"/>
+                            <field name="journal_id"/>
+                            <field name="company_id" groups="base.group_multi_company"/>
+                        </tree>
+                        <form string="Pulled Paths">
+                            <group>
+                                <group string="Conditions">
+                                    <field name="name" placeholder="Fulfill needs on location X from location Y "/>
+                                    <field name="location_id"/>
                                 </group>
-                                <group attrs="{'invisible':[('type_proc','!=','move')]}">
-                                    <field name="location_src_id" attrs="{'required': [('type_proc', '=', 'move')]}"/>
-                                    <field name="picking_type"/>
-                                    <field name="partner_address_id"/>
-                                    <field name="procure_method"/>
-                                    <field name="cancel_cascade"/>
-                                    <field name="invoice_state"/>
-                                    <field name="journal_id"/>
+                                <group string="Action Type">
+                                    <field name="type_proc"/>
+                                    <field name="company_id"/>
                                 </group>
-                            </form>
-                        </field>
-                        <field name="path_ids">
-                        <field name="name"/>
-                            <tree string="Pushed flows">
-                                <field name="location_from_id"/>
-                                <field name="location_dest_id"/>
-                                <field name="auto"/>
-                                <field name="name"/>
-                                <field name="invoice_state"/>
-                                <field name="company_id" groups="base.group_multi_company"/>
-                            </tree>
-                            <form string="Pushed flows">
-                                <field name="name" placeholder="When receiving at location X, move to location Y"/>
-                                <field name="location_from_id"/>
-                                <field name="location_dest_id"/>
-                                <field name="auto"/>
-                                <field name="delay"/>
-                                <field name="journal_id"/>
+                            </group>
+                            <group attrs="{'invisible':[('type_proc','!=','move')]}">
+                                <field name="location_src_id" attrs="{'required': [('type_proc', '=', 'move')]}"/>
                                 <field name="picking_type"/>
+                                <field name="partner_address_id"/>
+                                <field name="procure_method"/>
+                                <field name="cancel_cascade"/>
                                 <field name="invoice_state"/>
-                                <field name="company_id" groups="base.group_multi_company"/>
-                            </form>
-                        </field>
-                    </page>
-                </notebook>
+                                <field name="journal_id"/>
+                            </group>
+                        </form>
+                    </field>
+                    <field name="path_ids">
+                        <tree string="Pushed flows">
+                            <field name="location_from_id"/>
+                            <field name="location_dest_id"/>
+                            <field name="auto"/>
+                            <field name="name"/>
+                            <field name="invoice_state"/>
+                            <field name="company_id" groups="base.group_multi_company"/>
+                        </tree>
+                        <form string="Pushed flows">
+                            <field name="name" placeholder="When receiving at location X, move to location Y"/>
+                            <field name="location_from_id"/>
+                            <field name="location_dest_id"/>
+                            <field name="auto"/>
+                            <field name="delay"/>
+                            <field name="journal_id"/>
+                            <field name="picking_type"/>
+                            <field name="invoice_state"/>
+                            <field name="company_id" groups="base.group_multi_company"/>
+                        </form>
+                    </field>
+                </group>
             </field>
        </record>
     </data>
diff --git a/addons/stock_no_autopicking/__openerp__.py b/addons/stock_no_autopicking/__openerp__.py
index 7d9b84276d6..d8fbb44d8bf 100644
--- a/addons/stock_no_autopicking/__openerp__.py
+++ b/addons/stock_no_autopicking/__openerp__.py
@@ -23,21 +23,21 @@
 {
     'name': 'Picking Before Manufacturing',
     'version': '1.0',
-    "category" : "Warehouse Management",
+    'category' : 'Warehouse Management',
     'description': """
 This module allows an intermediate picking process to provide raw materials to production orders.
 =================================================================================================
 
 One example of usage of this module is to manage production made by your
 suppliers (sub-contracting). To achieve this, set the assembled product which is
-sub-contracted to "No Auto-Picking" and put the location of the supplier in the
+sub-contracted to 'No Auto-Picking' and put the location of the supplier in the
 routing of the assembly operation.
     """,
     'author': 'OpenERP SA',
     'depends': ['mrp'],
     'images': ['images/auto_picking.jpeg'],
-    'update_xml': ['stock_no_autopicking_view.xml'],
-    'demo_xml': [],
+    'data': ['stock_no_autopicking_view.xml'],
+    'demo': [],
     'test': ['test/stock_no_autopicking.yml'],
     'installable': True,
     'auto_install': False,
diff --git a/addons/stock_no_autopicking/i18n/ar.po b/addons/stock_no_autopicking/i18n/ar.po
index 78f016f2f51..529ebcbd1b2 100644
--- a/addons/stock_no_autopicking/i18n/ar.po
+++ b/addons/stock_no_autopicking/i18n/ar.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:25+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: stock_no_autopicking
 #: model:ir.model,name:stock_no_autopicking.model_product_product
diff --git a/addons/stock_no_autopicking/i18n/bg.po b/addons/stock_no_autopicking/i18n/bg.po
index fe4a42cc6f8..72de230cb8c 100644
--- a/addons/stock_no_autopicking/i18n/bg.po
+++ b/addons/stock_no_autopicking/i18n/bg.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:25+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: stock_no_autopicking
 #: model:ir.model,name:stock_no_autopicking.model_product_product
diff --git a/addons/stock_no_autopicking/i18n/bs.po b/addons/stock_no_autopicking/i18n/bs.po
index 6dadceeeb4b..6d9369d2641 100644
--- a/addons/stock_no_autopicking/i18n/bs.po
+++ b/addons/stock_no_autopicking/i18n/bs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:25+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: stock_no_autopicking
 #: model:ir.model,name:stock_no_autopicking.model_product_product
diff --git a/addons/stock_no_autopicking/i18n/ca.po b/addons/stock_no_autopicking/i18n/ca.po
index 033c8e8fe29..d1dde518776 100644
--- a/addons/stock_no_autopicking/i18n/ca.po
+++ b/addons/stock_no_autopicking/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:25+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: stock_no_autopicking
 #: model:ir.model,name:stock_no_autopicking.model_product_product
diff --git a/addons/stock_no_autopicking/i18n/cs.po b/addons/stock_no_autopicking/i18n/cs.po
index b8d41662266..37805c220a3 100644
--- a/addons/stock_no_autopicking/i18n/cs.po
+++ b/addons/stock_no_autopicking/i18n/cs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:25+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: stock_no_autopicking
 #: model:ir.model,name:stock_no_autopicking.model_product_product
diff --git a/addons/stock_no_autopicking/i18n/da.po b/addons/stock_no_autopicking/i18n/da.po
index 9b5dd540819..3c7d45fa5b4 100644
--- a/addons/stock_no_autopicking/i18n/da.po
+++ b/addons/stock_no_autopicking/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:25+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: stock_no_autopicking
 #: model:ir.model,name:stock_no_autopicking.model_product_product
diff --git a/addons/stock_no_autopicking/i18n/de.po b/addons/stock_no_autopicking/i18n/de.po
index 33f2aa9bc82..0ae3617b859 100644
--- a/addons/stock_no_autopicking/i18n/de.po
+++ b/addons/stock_no_autopicking/i18n/de.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:26+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: stock_no_autopicking
 #: model:ir.model,name:stock_no_autopicking.model_product_product
diff --git a/addons/stock_no_autopicking/i18n/el.po b/addons/stock_no_autopicking/i18n/el.po
index 6721faf08fa..6038e2253e0 100644
--- a/addons/stock_no_autopicking/i18n/el.po
+++ b/addons/stock_no_autopicking/i18n/el.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:26+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
 "X-Poedit-SourceCharset: utf-8\n"
diff --git a/addons/stock_no_autopicking/i18n/es.po b/addons/stock_no_autopicking/i18n/es.po
index 71454a3f847..d33b0410a48 100644
--- a/addons/stock_no_autopicking/i18n/es.po
+++ b/addons/stock_no_autopicking/i18n/es.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:26+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: stock_no_autopicking
 #: model:ir.model,name:stock_no_autopicking.model_product_product
diff --git a/addons/stock_no_autopicking/i18n/es_AR.po b/addons/stock_no_autopicking/i18n/es_AR.po
index 1cb00c27445..6be609c237e 100644
--- a/addons/stock_no_autopicking/i18n/es_AR.po
+++ b/addons/stock_no_autopicking/i18n/es_AR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:26+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: stock_no_autopicking
 #: model:ir.model,name:stock_no_autopicking.model_product_product
diff --git a/addons/stock_no_autopicking/i18n/es_CL.po b/addons/stock_no_autopicking/i18n/es_CL.po
index 06a07bef26d..ddbc52200cd 100644
--- a/addons/stock_no_autopicking/i18n/es_CL.po
+++ b/addons/stock_no_autopicking/i18n/es_CL.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:26+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: stock_no_autopicking
 #: model:ir.model,name:stock_no_autopicking.model_product_product
diff --git a/addons/stock_no_autopicking/i18n/es_CR.po b/addons/stock_no_autopicking/i18n/es_CR.po
index 03b241c4699..133bf05dd97 100644
--- a/addons/stock_no_autopicking/i18n/es_CR.po
+++ b/addons/stock_no_autopicking/i18n/es_CR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:26+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 "Language: \n"
 
 #. module: stock_no_autopicking
diff --git a/addons/stock_no_autopicking/i18n/et.po b/addons/stock_no_autopicking/i18n/et.po
index 85aabaa9dfc..64739d66bce 100644
--- a/addons/stock_no_autopicking/i18n/et.po
+++ b/addons/stock_no_autopicking/i18n/et.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:26+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: stock_no_autopicking
 #: model:ir.model,name:stock_no_autopicking.model_product_product
diff --git a/addons/stock_no_autopicking/i18n/fi.po b/addons/stock_no_autopicking/i18n/fi.po
index 5ed92f3fa39..b57a72816f8 100644
--- a/addons/stock_no_autopicking/i18n/fi.po
+++ b/addons/stock_no_autopicking/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:26+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: stock_no_autopicking
 #: model:ir.model,name:stock_no_autopicking.model_product_product
diff --git a/addons/stock_no_autopicking/i18n/fr.po b/addons/stock_no_autopicking/i18n/fr.po
index 0d3681c0911..881ac717d13 100644
--- a/addons/stock_no_autopicking/i18n/fr.po
+++ b/addons/stock_no_autopicking/i18n/fr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:26+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: stock_no_autopicking
 #: model:ir.model,name:stock_no_autopicking.model_product_product
diff --git a/addons/stock_no_autopicking/i18n/gl.po b/addons/stock_no_autopicking/i18n/gl.po
index 2af0d9e4f8f..af46e86fa48 100644
--- a/addons/stock_no_autopicking/i18n/gl.po
+++ b/addons/stock_no_autopicking/i18n/gl.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:26+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: stock_no_autopicking
 #: model:ir.model,name:stock_no_autopicking.model_product_product
diff --git a/addons/stock_no_autopicking/i18n/hr.po b/addons/stock_no_autopicking/i18n/hr.po
index 790bed4564e..4f3368c08c2 100644
--- a/addons/stock_no_autopicking/i18n/hr.po
+++ b/addons/stock_no_autopicking/i18n/hr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:26+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: stock_no_autopicking
 #: model:ir.model,name:stock_no_autopicking.model_product_product
diff --git a/addons/stock_no_autopicking/i18n/hu.po b/addons/stock_no_autopicking/i18n/hu.po
index 931cdc4601e..03b0e6df6b4 100644
--- a/addons/stock_no_autopicking/i18n/hu.po
+++ b/addons/stock_no_autopicking/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:26+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: stock_no_autopicking
 #: model:ir.model,name:stock_no_autopicking.model_product_product
diff --git a/addons/stock_no_autopicking/i18n/id.po b/addons/stock_no_autopicking/i18n/id.po
index 5b64d60aa5c..74c6b851c28 100644
--- a/addons/stock_no_autopicking/i18n/id.po
+++ b/addons/stock_no_autopicking/i18n/id.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:26+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: stock_no_autopicking
 #: model:ir.model,name:stock_no_autopicking.model_product_product
diff --git a/addons/stock_no_autopicking/i18n/it.po b/addons/stock_no_autopicking/i18n/it.po
index 625c9e6a848..9d9f038e24d 100644
--- a/addons/stock_no_autopicking/i18n/it.po
+++ b/addons/stock_no_autopicking/i18n/it.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:26+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: stock_no_autopicking
 #: model:ir.model,name:stock_no_autopicking.model_product_product
diff --git a/addons/stock_no_autopicking/i18n/ja.po b/addons/stock_no_autopicking/i18n/ja.po
index a2eed55e5b8..24725adc109 100644
--- a/addons/stock_no_autopicking/i18n/ja.po
+++ b/addons/stock_no_autopicking/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:26+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: stock_no_autopicking
 #: model:ir.model,name:stock_no_autopicking.model_product_product
diff --git a/addons/stock_no_autopicking/i18n/ko.po b/addons/stock_no_autopicking/i18n/ko.po
index 0332f4056c2..94c6ea37a98 100644
--- a/addons/stock_no_autopicking/i18n/ko.po
+++ b/addons/stock_no_autopicking/i18n/ko.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:26+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: stock_no_autopicking
 #: model:ir.model,name:stock_no_autopicking.model_product_product
diff --git a/addons/stock_no_autopicking/i18n/lt.po b/addons/stock_no_autopicking/i18n/lt.po
index 2851c0d2fc1..e292476c14b 100644
--- a/addons/stock_no_autopicking/i18n/lt.po
+++ b/addons/stock_no_autopicking/i18n/lt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:26+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: stock_no_autopicking
 #: model:ir.model,name:stock_no_autopicking.model_product_product
diff --git a/addons/stock_no_autopicking/i18n/lv.po b/addons/stock_no_autopicking/i18n/lv.po
index df5c16d92d2..092dab405e9 100644
--- a/addons/stock_no_autopicking/i18n/lv.po
+++ b/addons/stock_no_autopicking/i18n/lv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:26+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: stock_no_autopicking
 #: model:ir.model,name:stock_no_autopicking.model_product_product
diff --git a/addons/stock_no_autopicking/i18n/mk.po b/addons/stock_no_autopicking/i18n/mk.po
index eceb2429485..0f527e7819f 100644
--- a/addons/stock_no_autopicking/i18n/mk.po
+++ b/addons/stock_no_autopicking/i18n/mk.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:26+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: stock_no_autopicking
 #: model:ir.model,name:stock_no_autopicking.model_product_product
diff --git a/addons/stock_no_autopicking/i18n/mn.po b/addons/stock_no_autopicking/i18n/mn.po
index 8d11d8fd6a7..1cbf6e44ab0 100644
--- a/addons/stock_no_autopicking/i18n/mn.po
+++ b/addons/stock_no_autopicking/i18n/mn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:26+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: stock_no_autopicking
 #: model:ir.model,name:stock_no_autopicking.model_product_product
diff --git a/addons/stock_no_autopicking/i18n/nl.po b/addons/stock_no_autopicking/i18n/nl.po
index f457df9f923..e614cec9073 100644
--- a/addons/stock_no_autopicking/i18n/nl.po
+++ b/addons/stock_no_autopicking/i18n/nl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:25+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: stock_no_autopicking
 #: model:ir.model,name:stock_no_autopicking.model_product_product
diff --git a/addons/stock_no_autopicking/i18n/nl_BE.po b/addons/stock_no_autopicking/i18n/nl_BE.po
index f2a62949034..a302ee0ff10 100644
--- a/addons/stock_no_autopicking/i18n/nl_BE.po
+++ b/addons/stock_no_autopicking/i18n/nl_BE.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:26+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: stock_no_autopicking
 #: model:ir.model,name:stock_no_autopicking.model_product_product
diff --git a/addons/stock_no_autopicking/i18n/oc.po b/addons/stock_no_autopicking/i18n/oc.po
index f628d52b9fb..82d1dceb18f 100644
--- a/addons/stock_no_autopicking/i18n/oc.po
+++ b/addons/stock_no_autopicking/i18n/oc.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:26+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: stock_no_autopicking
 #: model:ir.model,name:stock_no_autopicking.model_product_product
diff --git a/addons/stock_no_autopicking/i18n/pl.po b/addons/stock_no_autopicking/i18n/pl.po
index 3677da2e179..9784a70dd6f 100644
--- a/addons/stock_no_autopicking/i18n/pl.po
+++ b/addons/stock_no_autopicking/i18n/pl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:26+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: stock_no_autopicking
 #: model:ir.model,name:stock_no_autopicking.model_product_product
diff --git a/addons/stock_no_autopicking/i18n/pt.po b/addons/stock_no_autopicking/i18n/pt.po
index f759ab9b392..6c8741f5fac 100644
--- a/addons/stock_no_autopicking/i18n/pt.po
+++ b/addons/stock_no_autopicking/i18n/pt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:26+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: stock_no_autopicking
 #: model:ir.model,name:stock_no_autopicking.model_product_product
diff --git a/addons/stock_no_autopicking/i18n/pt_BR.po b/addons/stock_no_autopicking/i18n/pt_BR.po
index 4a338eaa5fe..afd9a7a06d1 100644
--- a/addons/stock_no_autopicking/i18n/pt_BR.po
+++ b/addons/stock_no_autopicking/i18n/pt_BR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:26+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: stock_no_autopicking
 #: model:ir.model,name:stock_no_autopicking.model_product_product
diff --git a/addons/stock_no_autopicking/i18n/ro.po b/addons/stock_no_autopicking/i18n/ro.po
index 06dc4124781..06d989be1c1 100644
--- a/addons/stock_no_autopicking/i18n/ro.po
+++ b/addons/stock_no_autopicking/i18n/ro.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:26+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: stock_no_autopicking
 #: model:ir.model,name:stock_no_autopicking.model_product_product
diff --git a/addons/stock_no_autopicking/i18n/ru.po b/addons/stock_no_autopicking/i18n/ru.po
index 00e8d8562dd..f54c11c7cf4 100644
--- a/addons/stock_no_autopicking/i18n/ru.po
+++ b/addons/stock_no_autopicking/i18n/ru.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:26+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: stock_no_autopicking
 #: model:ir.model,name:stock_no_autopicking.model_product_product
diff --git a/addons/stock_no_autopicking/i18n/sl.po b/addons/stock_no_autopicking/i18n/sl.po
index 93b3782d73a..39235edb4eb 100644
--- a/addons/stock_no_autopicking/i18n/sl.po
+++ b/addons/stock_no_autopicking/i18n/sl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:26+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: stock_no_autopicking
 #: model:ir.model,name:stock_no_autopicking.model_product_product
diff --git a/addons/stock_no_autopicking/i18n/sq.po b/addons/stock_no_autopicking/i18n/sq.po
index 7407047f8b2..e65c04f4449 100644
--- a/addons/stock_no_autopicking/i18n/sq.po
+++ b/addons/stock_no_autopicking/i18n/sq.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:25+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: stock_no_autopicking
 #: model:ir.model,name:stock_no_autopicking.model_product_product
diff --git a/addons/stock_no_autopicking/i18n/sr@latin.po b/addons/stock_no_autopicking/i18n/sr@latin.po
index e0928ec2aae..da07be2f79d 100644
--- a/addons/stock_no_autopicking/i18n/sr@latin.po
+++ b/addons/stock_no_autopicking/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:26+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: stock_no_autopicking
 #: model:ir.model,name:stock_no_autopicking.model_product_product
diff --git a/addons/stock_no_autopicking/i18n/sv.po b/addons/stock_no_autopicking/i18n/sv.po
index b272a4a28d8..50f8610b3c6 100644
--- a/addons/stock_no_autopicking/i18n/sv.po
+++ b/addons/stock_no_autopicking/i18n/sv.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:26+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: stock_no_autopicking
 #: model:ir.model,name:stock_no_autopicking.model_product_product
diff --git a/addons/stock_no_autopicking/i18n/tlh.po b/addons/stock_no_autopicking/i18n/tlh.po
index 3d0d0420c61..d2344aefd2b 100644
--- a/addons/stock_no_autopicking/i18n/tlh.po
+++ b/addons/stock_no_autopicking/i18n/tlh.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:26+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: stock_no_autopicking
 #: model:ir.model,name:stock_no_autopicking.model_product_product
diff --git a/addons/stock_no_autopicking/i18n/tr.po b/addons/stock_no_autopicking/i18n/tr.po
index 45db5887393..098e8523371 100644
--- a/addons/stock_no_autopicking/i18n/tr.po
+++ b/addons/stock_no_autopicking/i18n/tr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:26+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: stock_no_autopicking
 #: model:ir.model,name:stock_no_autopicking.model_product_product
diff --git a/addons/stock_no_autopicking/i18n/uk.po b/addons/stock_no_autopicking/i18n/uk.po
index 7026556b5e2..83cbcdc8c59 100644
--- a/addons/stock_no_autopicking/i18n/uk.po
+++ b/addons/stock_no_autopicking/i18n/uk.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:26+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: stock_no_autopicking
 #: model:ir.model,name:stock_no_autopicking.model_product_product
diff --git a/addons/stock_no_autopicking/i18n/vi.po b/addons/stock_no_autopicking/i18n/vi.po
index bb7f3cc85df..79133326e64 100644
--- a/addons/stock_no_autopicking/i18n/vi.po
+++ b/addons/stock_no_autopicking/i18n/vi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:26+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: stock_no_autopicking
 #: model:ir.model,name:stock_no_autopicking.model_product_product
diff --git a/addons/stock_no_autopicking/i18n/zh_CN.po b/addons/stock_no_autopicking/i18n/zh_CN.po
index ba4123fab2c..fb8125db896 100644
--- a/addons/stock_no_autopicking/i18n/zh_CN.po
+++ b/addons/stock_no_autopicking/i18n/zh_CN.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:26+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: stock_no_autopicking
 #: model:ir.model,name:stock_no_autopicking.model_product_product
diff --git a/addons/stock_no_autopicking/i18n/zh_TW.po b/addons/stock_no_autopicking/i18n/zh_TW.po
index 2537bafb0f6..10d0aad045a 100644
--- a/addons/stock_no_autopicking/i18n/zh_TW.po
+++ b/addons/stock_no_autopicking/i18n/zh_TW.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:26+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: stock_no_autopicking
 #: model:ir.model,name:stock_no_autopicking.model_product_product
diff --git a/addons/stock_planning/__openerp__.py b/addons/stock_planning/__openerp__.py
index f83aa11ef63..7e38019e3f3 100644
--- a/addons/stock_planning/__openerp__.py
+++ b/addons/stock_planning/__openerp__.py
@@ -20,13 +20,13 @@
 ##############################################################################
 
 {
-    "name": "Master Procurement Schedule",
-    "version": "1.2",
-    "author": "OpenERP SA and Grzegorz Grzelak (OpenGLOBE)",
-    "category" : "Manufacturing",
-    "images": ["images/master_procurement_schedule.jpeg","images/sales_forecast.jpeg","images/stock_planning_line.jpeg","images/stock_sales_period.jpeg"],
-    "depends": ["crm", "stock","sale"],
-    "description": """
+    'name': 'Master Procurement Schedule',
+    'version': '1.2',
+    'author': 'OpenERP SA and Grzegorz Grzelak (OpenGLOBE)',
+    'category' : 'Manufacturing',
+    'images': ['images/master_procurement_schedule.jpeg','images/sales_forecast.jpeg','images/stock_planning_line.jpeg','images/stock_sales_period.jpeg'],
+    'depends': ['crm', 'stock','sale'],
+    'description': """
 MPS allows to create a manual procurement plan apart of the normal MRP scheduling, which works automatically based on minimum stock rules.
 ==========================================================================================================================================
 
@@ -40,33 +40,37 @@ Quick Glossary:
       for the related Stock Period.
 
 To avoid confusion with the terms used by the ``sale_forecast`` module,
-("Sales Forecast" and "Planning" are amounts) we use terms "Stock and Sales
-Forecast" and "Stock Planning" to emphasize that we use quantity values.
+('Sales Forecast' and 'Planning' are amounts) we use terms 'Stock and Sales
+Forecast' and 'Stock Planning' to emphasize that we use quantity values.
 
 Where to begin:
 ---------------
 Using this module is done in three steps:
-    * Create Stock Periods via the Warehouse>Configuration>Stock Periods menu
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    * Create Stock Periods via the **Warehouse** > **Configuration** > **Stock Periods** menu
       (Mandatory step)
     * Create Sale Forecasts fill them with forecast quantities, via the
-      Sales > Sales Forecast menu. (Optional step but useful for further planning)
+      **Sales** > **Sales Forecast** menu. (Optional step but useful for further planning)
     * Create the actual MPS plan, check the balance and trigger the procurements
       as required. The actual procurement is the final step for the Stock Period.
 
 Stock Period configuration:
 ---------------------------
-You have two menu items for Periods in "Warehouse > Configuration > Stock Periods".
+You have two menu items for Periods in "**Warehouse** > **Configuration** > **Stock Periods**".
+
 There are:
+~~~~~~~~~~
     * "Create Stock Periods" - can automatically creating daily, weekly or
       monthly periods.
-    * "Stock Periods" - allows to create any type of periods, change the dates
+    * 'Stock Periods' - allows to create any type of periods, change the dates
       and change the state of period.
 
-Creating periods is the first step. You can create custom periods using the "New"
-button in "Stock Periods", but it is recommended to use the automatic assistant
-"Create Stock Periods".
+Creating periods is the first step. You can create custom periods using the 'New'
+button in 'Stock Periods', but it is recommended to use the automatic assistant
+'Create Stock Periods'.
 
 Remarks:
+++++++++
     - These periods (Stock Periods) are completely distinct from Financial or
       other periods in the system.
     - Periods are not assigned to companies (when you use multicompany). Module
@@ -86,33 +90,35 @@ Remarks:
 
 Sales Forecasts configuration:
 ------------------------------
-You have few menus for Sales forecast in "Sales > Sales Forecasts":
+You have few menus for Sales forecast in "**Sales** > **Sales Forecasts**":
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     - "Create Sales Forecasts" - can automatically create forecast lines
       according to your needs
-    - "Sales Forecasts" - for managing the Sales forecasts
+    - 'Sales Forecasts' - for managing the Sales forecasts
 
-Menu "Create Sales Forecasts" creates Forecasts for products from selected
+Menu 'Create Sales Forecasts' creates Forecasts for products from selected
 Category, for selected Period and for selected Warehouse.
 It is also possible to copy the previous forecast.
 
 Remarks:
+++++++++
     - This tool doesn't duplicate lines if you already have an entry for the same
       Product, Period, Warehouse, created or validated by the same user. If you
       wish to create another forecast, if relevant lines exists you have to do it
       manually as described below.
     - When created lines are validated by someone else you can use this tool to
       create another line for the same Period, Product and Warehouse.
-    - When you choose "Copy Last Forecast", created line take quantity and other
+    - When you choose 'Copy Last Forecast', created line take quantity and other
       settings from your (validated by you or created by you if not validated yet)
       forecast which is for last period before period of created forecast.
 
-On "Sales Forecast" form mainly you have to enter a forecast quantity in
-"Product Quantity". Further calculation can work for draft forecasts. But
+On 'Sales Forecast' form mainly you have to enter a forecast quantity in
+'Product Quantity'. Further calculation can work for draft forecasts. But
 validation can save your data against any accidental changes. You can click
-"Validate" button but it is not mandatory.
+'Validate' button but it is not mandatory.
 
 Instead of forecast quantity you may enter the amount of forecast sales via the
-"Product Amount" field. The system will count quantity from amount according to
+'Product Amount' field. The system will count quantity from amount according to
 Sale price of the Product.
 
 All values on the form are expressed in unit of measure selected on form. You can
@@ -120,7 +126,7 @@ select a unit of measure from the default category or from secondary category.
 When you change unit of measure the forecast product quantity will be re-computed
 according to new UoM.
 
-To work out your Sale Forecast you can use the "Sales History" of the product.
+To work out your Sale Forecast you can use the 'Sales History' of the product.
 You have to enter parameters to the top and left of this table and system will
 count sale quantities according to these parameters. So you can get results for
 a given sales team or period.
@@ -130,72 +136,71 @@ MPS or Procurement Planning:
 ----------------------------
 An MPS planning consists in Stock Planning lines, used to analyze and possibly
 drive the procurement of products for each relevant Stock Period and Warehouse.
-The menu is located in "Warehouse > Schedulers > Master Procurement Schedule":
 
+The menu is located in "**Warehouse** > **Schedulers** > **Master Procurement Schedule**":
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     - "Create Stock Planning Lines" - a wizard to help automatically create many
       planning lines
-    - "Master Procurement Schedule" - management of your planning lines
+    - 'Master Procurement Schedule' - management of your planning lines
 
 Similarly to the way Sales forecast serves to define your sales planning, the MPS
 lets you plan your procurements (Purchase/Manufacturing).You can quickly populate
-the MPS with the "Create Stock Planning Lines" wizard, and then proceed to review
-them via the "Master Procurement Schedule" menu.
+the MPS with the 'Create Stock Planning Lines' wizard, and then proceed to review
+them via the 'Master Procurement Schedule' menu.
 
-The "Create Stock Planning Lines" wizard lets you to quickly create all MPS lines
+The 'Create Stock Planning Lines' wizard lets you to quickly create all MPS lines
 for a given Product Category, and a given Period and Warehouse.When you enable
-the "All Products with Forecast" option of the wizard, the system creates lines
+the 'All Products with Forecast' option of the wizard, the system creates lines
 for all products having sales forecast for selected Period and Warehouse (the
 selected Category will be ignored in this case).
 
-Under menu "Master Procurement Schedule" you will usually change the "Planned Out"
-and "Planned In" quantities and observe the resulting "Stock Simulation" value
-to decide if you need to procure more products for the given Period. "Planned Out"
-will be initially based on "Warehouse Forecast" which is the sum of all outgoing
+Under menu 'Master Procurement Schedule' you will usually change the 'Planned Out'
+and 'Planned In' quantities and observe the resulting 'Stock Simulation' value
+to decide if you need to procure more products for the given Period. 'Planned Out'
+will be initially based on 'Warehouse Forecast' which is the sum of all outgoing
 stock moves already planned for the Period and Warehouse. Of course you can alter
 this value to provide your own quantities. It is not necessary to have any forecast.
-"Planned In" quantity is used to calculate field "Incoming Left" which is the
-quantity to be procured to reach the "Stock Simulation" at the end of Period. You
-can compare "Stock Simulation" quantity to minimum stock rules visible on the form.
+'Planned In' quantity is used to calculate field 'Incoming Left' which is the
+quantity to be procured to reach the 'Stock Simulation' at the end of Period. You
+can compare 'Stock Simulation' quantity to minimum stock rules visible on the form.
 And you can plan different quantity than in Minimum Stock Rules. Calculations are
 done for whole Warehouse by default, if you want to see values for Stock location
-of calculated warehouse you can check "Stock Location Only".
+of calculated warehouse you can check 'Stock Location Only'.
 
-When you are satisfied with the "Planned Out", "Planned In" and end of period
-"Stock Simulation", you can click on "Procure Incoming Left" to create a
-procurement for the "Incoming Left" quantity. You can decide if procurement will
+When you are satisfied with the 'Planned Out', 'Planned In' and end of period
+'Stock Simulation', you can click on 'Procure Incoming Left' to create a
+procurement for the 'Incoming Left' quantity. You can decide if procurement will
 go to the to Stock or Input location of the Warehouse.
 
 If you don't want to Produce or Buy the product but just transfer the calculated
-quantity from another warehouse you can click "Supply from Another Warehouse"
-(instead of "Procure Incoming Left") and the system will create the appropriate
+quantity from another warehouse you can click 'Supply from Another Warehouse'
+(instead of 'Procure Incoming Left') and the system will create the appropriate
 picking list (stock moves). You can choose to take the goods from the Stock or
 the Output location of the source warehouse. Destination location (Stock or Input)
 in the destination warehouse will be taken as for the procurement case.
 
-To see update the quantities of "Confirmed In", "Confirmed Out", "Confirmed In
-Before", "Planned Out Before" and "Stock Simulation" you can press "Calculate
-Planning".
+To see update the quantities of 'Confirmed In', 'Confirmed Out', 'Confirmed In
+Before', 'Planned Out Before' and 'Stock Simulation' you can press 'Calculate
+Planning'.
 
 All values on the form are expressed in unit of measure selected on form. You can
 select one of unit of measure from default category or from secondary category.
 When you change unit of measure the editable quantities will be re-computed
-according to new UoM. The others will be updated after pressing "Calculate Planning".
+according to new UoM. The others will be updated after pressing 'Calculate Planning'.
 
 Computation of Stock Simulation quantities:
 -------------------------------------------
 The Stock Simulation value is the estimated stock quantity at the end of the
 period. The calculation always starts with the real stock on hand at the beginning
 of the current period, then adds or subtracts the computed quantities.
-When you are in the same period (current period is the same as calculated) Stock
-Simulation is calculated as follows:
 
-Stock Simulation = Stock of beginning of current Period - Planned Out + Planned In
+When you are in the same period (current period is the same as calculated) Stock Simulation is calculated as follows:
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+**Stock Simulation =** Stock of beginning of current Period - Planned Out + Planned In
 
 When you calculate period next to current:
-
-Stock Simulation = Stock of beginning of current Period - Planned Out of current Period
-    + Confirmed In of current Period  (incl. Already In) - Planned Out of calculated Period
-    + Planned In of calculated Period .
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+**Stock Simulation =** Stock of beginning of current Period - Planned Out of current Period + Confirmed In of current Period  (incl. Already In) - Planned Out of calculated Period + Planned In of calculated Period .
 
 As you see the calculated Period is taken the same way as in previous case, but
 the calculation in the current Period is a little bit different. First you should
@@ -204,18 +209,14 @@ that you should complete the planning and procurement of the current Period befo
 going to the next one.
 
 When you plan for future Periods:
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+**Stock Simulation =** Stock of beginning of current Period - Sum of Planned Out of Periods before calculated + Sum of Confirmed In of Periods before calculated (incl. Already In) - Planned Out of calculated Period + Planned In of calculated Period.
 
-Stock Simulation = Stock of beginning of current Period
-    - Sum of Planned Out of Periods before calculated
-    + Sum of Confirmed In of Periods before calculated (incl. Already In) 
-    - Planned Out of calculated Period
-    + Planned In of calculated Period.
-
-Here "Periods before calculated" designates all periods starting with the current
+Here 'Periods before calculated' designates all periods starting with the current
 until the period before the one being calculated.
 
 Remarks:
-
+++++++++
     - Remember to make the proceed with the planning of each period in chronological
       order, otherwise the numbers will not reflect the reality
     - If you planned for future periods and find that real Confirmed Out is larger
@@ -231,18 +232,18 @@ Remarks:
       product, warehouse and company because results can be unpredictable. The
       same applies to Forecasts lines.
 """,
-    "data": [
-        "security/stock_planning_security.xml",
-        "security/ir.model.access.csv",
-        "stock_planning_view.xml",
-        "wizard/stock_planning_create_periods_view.xml",
-        "wizard/stock_planning_forecast_view.xml",
-        "wizard/stock_planning_createlines_view.xml",
+    'data': [
+        'security/stock_planning_security.xml',
+        'security/ir.model.access.csv',
+        'stock_planning_view.xml',
+        'wizard/stock_planning_create_periods_view.xml',
+        'wizard/stock_planning_forecast_view.xml',
+        'wizard/stock_planning_createlines_view.xml',
     ],
-    "test": ["test/stock_planning.yml"],
-    "auto_install": False,
-    "installable": True,
-    "certificate" : "00872589676639788061",
+    'test': ['test/stock_planning.yml'],
+    'auto_install': False,
+    'installable': True,
+    'certificate' : '00872589676639788061',
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/stock_planning/i18n/ar.po b/addons/stock_planning/i18n/ar.po
index 4e214a9d7e0..6ec29e417a5 100644
--- a/addons/stock_planning/i18n/ar.po
+++ b/addons/stock_planning/i18n/ar.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:32+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:36+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: stock_planning
 #: code:addons/stock_planning/wizard/stock_planning_createlines.py:73
diff --git a/addons/stock_planning/i18n/bg.po b/addons/stock_planning/i18n/bg.po
index 1ebcfd8b23b..3a5951263c2 100644
--- a/addons/stock_planning/i18n/bg.po
+++ b/addons/stock_planning/i18n/bg.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:32+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:36+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: stock_planning
 #: code:addons/stock_planning/wizard/stock_planning_createlines.py:73
diff --git a/addons/stock_planning/i18n/ca.po b/addons/stock_planning/i18n/ca.po
index 8202ca9e0e6..59ae7ba0b2a 100644
--- a/addons/stock_planning/i18n/ca.po
+++ b/addons/stock_planning/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:32+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:36+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: stock_planning
 #: code:addons/stock_planning/wizard/stock_planning_createlines.py:73
diff --git a/addons/stock_planning/i18n/da.po b/addons/stock_planning/i18n/da.po
index f233f8111c0..663f578c845 100644
--- a/addons/stock_planning/i18n/da.po
+++ b/addons/stock_planning/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:32+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:36+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: stock_planning
 #: code:addons/stock_planning/wizard/stock_planning_createlines.py:73
diff --git a/addons/stock_planning/i18n/de.po b/addons/stock_planning/i18n/de.po
index f8488ade805..e782868fad5 100644
--- a/addons/stock_planning/i18n/de.po
+++ b/addons/stock_planning/i18n/de.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:32+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:36+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: stock_planning
 #: code:addons/stock_planning/wizard/stock_planning_createlines.py:73
diff --git a/addons/stock_planning/i18n/el.po b/addons/stock_planning/i18n/el.po
index be687818557..7845bfb1dae 100644
--- a/addons/stock_planning/i18n/el.po
+++ b/addons/stock_planning/i18n/el.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:32+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:36+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: stock_planning
 #: code:addons/stock_planning/wizard/stock_planning_createlines.py:73
diff --git a/addons/stock_planning/i18n/es.po b/addons/stock_planning/i18n/es.po
index 34f996a136f..ad1ffb5da11 100644
--- a/addons/stock_planning/i18n/es.po
+++ b/addons/stock_planning/i18n/es.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:32+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:36+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: stock_planning
 #: code:addons/stock_planning/wizard/stock_planning_createlines.py:73
diff --git a/addons/stock_planning/i18n/es_CL.po b/addons/stock_planning/i18n/es_CL.po
index adb36196647..a969635ee68 100644
--- a/addons/stock_planning/i18n/es_CL.po
+++ b/addons/stock_planning/i18n/es_CL.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:32+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:36+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: stock_planning
 #: code:addons/stock_planning/wizard/stock_planning_createlines.py:73
diff --git a/addons/stock_planning/i18n/es_CR.po b/addons/stock_planning/i18n/es_CR.po
index 295b2f20579..26c8d99ba5e 100644
--- a/addons/stock_planning/i18n/es_CR.po
+++ b/addons/stock_planning/i18n/es_CR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:32+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:37+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 "Language: es\n"
 
 #. module: stock_planning
diff --git a/addons/stock_planning/i18n/fi.po b/addons/stock_planning/i18n/fi.po
index 4b5620f2f77..4c935a9912c 100644
--- a/addons/stock_planning/i18n/fi.po
+++ b/addons/stock_planning/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:32+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:36+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: stock_planning
 #: code:addons/stock_planning/wizard/stock_planning_createlines.py:73
diff --git a/addons/stock_planning/i18n/fr.po b/addons/stock_planning/i18n/fr.po
index a16cfe1d6af..eb04689116b 100644
--- a/addons/stock_planning/i18n/fr.po
+++ b/addons/stock_planning/i18n/fr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:32+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:36+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: stock_planning
 #: code:addons/stock_planning/wizard/stock_planning_createlines.py:73
diff --git a/addons/stock_planning/i18n/gl.po b/addons/stock_planning/i18n/gl.po
index 9ee3ac37964..282cd94e80c 100644
--- a/addons/stock_planning/i18n/gl.po
+++ b/addons/stock_planning/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:32+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:36+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: stock_planning
 #: code:addons/stock_planning/wizard/stock_planning_createlines.py:73
diff --git a/addons/stock_planning/i18n/hr.po b/addons/stock_planning/i18n/hr.po
index 3b3b28029bb..9e2dbec6a22 100644
--- a/addons/stock_planning/i18n/hr.po
+++ b/addons/stock_planning/i18n/hr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:32+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:36+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: stock_planning
 #: code:addons/stock_planning/wizard/stock_planning_createlines.py:73
diff --git a/addons/stock_planning/i18n/hu.po b/addons/stock_planning/i18n/hu.po
index c017525670f..6f263c1c72e 100644
--- a/addons/stock_planning/i18n/hu.po
+++ b/addons/stock_planning/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:32+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:36+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: stock_planning
 #: code:addons/stock_planning/wizard/stock_planning_createlines.py:73
diff --git a/addons/stock_planning/i18n/it.po b/addons/stock_planning/i18n/it.po
index e82bf9cc481..7a4632f20a2 100644
--- a/addons/stock_planning/i18n/it.po
+++ b/addons/stock_planning/i18n/it.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:32+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:36+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: stock_planning
 #: code:addons/stock_planning/wizard/stock_planning_createlines.py:73
diff --git a/addons/stock_planning/i18n/ja.po b/addons/stock_planning/i18n/ja.po
index 8a870c907e4..2eebbe1a143 100644
--- a/addons/stock_planning/i18n/ja.po
+++ b/addons/stock_planning/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:32+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:36+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: stock_planning
 #: code:addons/stock_planning/wizard/stock_planning_createlines.py:73
diff --git a/addons/stock_planning/i18n/lv.po b/addons/stock_planning/i18n/lv.po
index f0f74501807..071eb83d445 100644
--- a/addons/stock_planning/i18n/lv.po
+++ b/addons/stock_planning/i18n/lv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:32+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:36+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: stock_planning
 #: code:addons/stock_planning/wizard/stock_planning_createlines.py:73
diff --git a/addons/stock_planning/i18n/mn.po b/addons/stock_planning/i18n/mn.po
index c45722a8b20..2d292c27002 100644
--- a/addons/stock_planning/i18n/mn.po
+++ b/addons/stock_planning/i18n/mn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:32+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:36+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: stock_planning
 #: code:addons/stock_planning/wizard/stock_planning_createlines.py:73
diff --git a/addons/stock_planning/i18n/nb.po b/addons/stock_planning/i18n/nb.po
index f018ef92c0f..daf90548b62 100644
--- a/addons/stock_planning/i18n/nb.po
+++ b/addons/stock_planning/i18n/nb.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:32+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:36+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: stock_planning
 #: code:addons/stock_planning/wizard/stock_planning_createlines.py:73
diff --git a/addons/stock_planning/i18n/nl.po b/addons/stock_planning/i18n/nl.po
index c1b903c2e6c..7df4ecde940 100644
--- a/addons/stock_planning/i18n/nl.po
+++ b/addons/stock_planning/i18n/nl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:32+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:36+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: stock_planning
 #: code:addons/stock_planning/wizard/stock_planning_createlines.py:73
@@ -70,6 +70,8 @@ msgid ""
 "Planned Out in periods before calculated. Between start date of current "
 "period and one day before start of calculated period."
 msgstr ""
+"Gepland uitgaand in periodes voor de berekening. Tussen startdatum van de "
+"huidige periode en één dag voor de start van de berekende periode."
 
 #. module: stock_planning
 #: help:stock.sale.forecast.createlines,warehouse_id:0
@@ -77,6 +79,8 @@ msgid ""
 "Warehouse which forecasts will concern. If during stock planning you will "
 "need sales forecast for all warehouses choose any warehouse now."
 msgstr ""
+"Magazijn waarvoor de prognose geldt. Tijdens het plannen heeft u "
+"verkoopprognoses nodig van alle magazijnen. Kies een magazijn."
 
 #. module: stock_planning
 #: field:stock.planning,outgoing_left:0
@@ -168,6 +172,10 @@ msgid ""
 "are independent of financial periods. If you need periods other than day-, "
 "week- or month-based, you may also add then manually."
 msgstr ""
+"Deze wizzard helpt u bij het maken van voorraadplanning periodes. Deze "
+"periodes zijn onafhankelijk van de financiële periodes. Indien u periodes "
+"nodig hebt, anders dan een dag, week of maand, dan dient u deze handmatig "
+"aan te maken."
 
 #. module: stock_planning
 #: view:stock.period.createlines:0
@@ -207,6 +215,9 @@ msgid ""
 "Check to make procurement to stock location of selected warehouse. If not "
 "selected procurement will be made into input location of warehouse."
 msgstr ""
+"Vink dit aan om een verwerving te maken naar het geselecteerde magazijn. "
+"Indien niet aangevinkt, wordt de verwerving gemaakt naar de inkomende "
+"locatie van het magazijn."
 
 #. module: stock_planning
 #: help:stock.planning,already_in:0
@@ -252,6 +263,9 @@ msgid ""
 "Between start date of current period and one day before start of calculated "
 "period."
 msgstr ""
+"Bevestigde ontvangsten in de periode voor de berekening (inclusief wat al "
+"binnen is). Tussen de startdatum van de huidige periode en één dag voor de "
+"start van de berekende periode."
 
 #. module: stock_planning
 #: view:stock.sale.forecast:0
@@ -332,7 +346,7 @@ msgstr "Status"
 #. module: stock_planning
 #: help:stock.sale.forecast.createlines,product_categ_id:0
 msgid "Product Category of products which created forecasts will concern."
-msgstr ""
+msgstr "Productcategorie van producten waarover de prognose gaat."
 
 #. module: stock_planning
 #: model:ir.model,name:stock_planning.model_stock_period
@@ -405,6 +419,23 @@ msgid ""
 "  \n"
 " Stock Simulation: %s    Minimum stock: %s"
 msgstr ""
+" Verwerving aangemaakt door MPS voor gebruiker: %s, aanmaakdatum: %s         "
+"                                \n"
+" Voor periode: %s                                         \n"
+" Volgens status:                                          \n"
+" Magazijn prognose: %s                                         \n"
+" Begin voorraad: %s                                         \n"
+" Gepland uitgaand: %s, gepland inkomend: %s                                  "
+"       \n"
+" Reeds uitgaand: %s, reeds ingekomen: %s                                     "
+"    \n"
+" Bevestigd uitgaand: %s, bevestigd inkomend: %s                              "
+"           \n"
+" Gepland uitgaand voor: %s, Gepland inkomend voor: %s                        "
+"                 \n"
+" Verwacht uitgaand: %s, verwacht inkomend: %s                                "
+"         \n"
+" Voorraad simulatie: %s, minimale voorraad: %s"
 
 #. module: stock_planning
 #: code:addons/stock_planning/stock_planning.py:626
@@ -459,6 +490,9 @@ msgid ""
 "Unit of Measure used to show the quantities of stock calculation.You can use "
 "units from default category or from second category (UoS category)."
 msgstr ""
+"De maateenheid, welke wordt gebruikt om de hoeveelheden weer te geven in de "
+"voorraadberekening. U kunt standaard maateenheden gebruiken, of een tweede "
+"maateenheid (de voorraad maateenheid)."
 
 #. module: stock_planning
 #: view:stock.period.createlines:0
@@ -472,6 +506,9 @@ msgid ""
 "account periods. You can use wizard for creating periods and review them "
 "here."
 msgstr ""
+"Voorraadperiodes worden gebruikt voor de voorraadplanning. De periodes zijn "
+"onafhankelijk van de financiële periodes. U kunt de wizzard gebruiken voor "
+"het aanamaken van periodes."
 
 #. module: stock_planning
 #: view:stock.planning:0
@@ -531,6 +568,8 @@ msgid ""
 "You must specify a Source Warehouse different than calculated (destination) "
 "Warehouse !"
 msgstr ""
+"U dient een bronlocatie aan te geven, welke anders is dan de berekende "
+"bestemmingslocatie."
 
 #. module: stock_planning
 #: code:addons/stock_planning/stock_planning.py:146
@@ -585,6 +624,9 @@ msgid ""
 "Planning will be created for products from Product Category selected by this "
 "field. This field is ignored when you check \"All Forecasted Product\" box."
 msgstr ""
+"De planning zal worden samengesteld van producten van de productcategorie, "
+"geselecteerd door dit veld. Dit veld wordt genegeerd, wanneer u de optie "
+"\"Alle geprognotiseerde producten\" aanvinkt."
 
 #. module: stock_planning
 #: field:stock.planning,planned_outgoing:0
@@ -625,6 +667,9 @@ msgid ""
 "Unit of Measure used to show the quantities of stock calculation.You can use "
 "units form default category or from second category (UoS category)."
 msgstr ""
+"De maateenheid, welke wordt gebruikt om de hoeveelheden weer te geven in de "
+"voorraadberekening. U kunt standaard maateenheden gebruiken, of een tweede "
+"maateenheid (de voorraad maateenheid)."
 
 #. module: stock_planning
 #: view:stock.planning:0
@@ -638,6 +683,10 @@ msgid ""
 "Period of selected Product. To plan this value look at Confirmed Out or "
 "Sales Forecasts. This value should be equal or greater than Confirmed Out."
 msgstr ""
+"Geef de geplande hoeveelheid van het geselecteerde magazijn in voor de "
+"geselecteerde periode en producten. Om deze waarde te plannen, kijkt u naar "
+"de bevestigd uit of de verkoopprognose. deze waarde zou gelijk of groter "
+"moeten zijn dan bevestigd uit."
 
 #. module: stock_planning
 #: view:stock.period:0
@@ -694,6 +743,10 @@ msgid ""
 "warehouse, so you don't have to create them one by one. The wizard doesn't "
 "duplicate lines if they already exist for this selection."
 msgstr ""
+"Deze wizzard helpt u bij het maken van MPS planningsregels voor een "
+"geselecteerde periode en magazijn, zo hoeft u deze niet één voor één te "
+"maken. de wizzard dupliceert geen regels, als deze al bestaan voor deze "
+"selectie."
 
 #. module: stock_planning
 #: field:stock.planning,outgoing:0
@@ -753,6 +806,9 @@ msgid ""
 "Check this box to create planning for all products having any forecast for "
 "selected Warehouse and Period. Product Category field will be ignored."
 msgstr ""
+"Vink deze optie aan om een planning te maken voor alle producten met een "
+"prognose, voor het geselecteerde magazijn en periode. Het productcategorie "
+"veld wordt genegeerd."
 
 #. module: stock_planning
 #: code:addons/stock_planning/stock_planning.py:632
@@ -815,6 +871,22 @@ msgid ""
 " Expected Out: %s   Incoming Left: %s                                     \n"
 " Stock Simulation: %s   Minimum stock: %s "
 msgstr ""
+"Verzamelopdracht aangemaakt door MPS voor gebruiker: %s, aanmaakdatum: %s    "
+"                                     \n"
+"Voor periode: %s, volgens status:                                     \n"
+" Magazijn prognose: %s                                         \n"
+" Begin voorraad: %s                                         \n"
+" Gepland uitgaand: %s, gepland inkomend: %s                                  "
+"       \n"
+" Reeds uitgaand: %s, reeds ingekomen: %s                                     "
+"    \n"
+" Bevestigd uitgaand: %s, bevestigd inkomend: %s                              "
+"           \n"
+" Gepland uitgaand voor: %s, Gepland inkomend voor: %s                        "
+"                 \n"
+" Verwacht uitgaand: %s, verwacht inkomend: %s                                "
+"         \n"
+" Voorraad simulatie: %s, minimale voorraad: %s "
 
 #. module: stock_planning
 #: field:stock.planning,period_id:0
@@ -932,6 +1004,10 @@ msgid ""
 "supply will be made from Output location of Supply Warehouse. Used in "
 "'Supply from Another Warehouse' with Supply Warehouse."
 msgstr ""
+"Vink deze optie aan om te leveren vanuit voorraad van het leverende "
+"magazijn. Indien niet aangevinkt wordt de levering gedaan vanuit de "
+"uitgaande locatie van het magazijn. Wordt gebruikt in 'lever vanuit ander "
+"magazijn' met lever magazijn."
 
 #. module: stock_planning
 #: field:stock.sale.forecast,create_uid:0
@@ -1126,6 +1202,8 @@ msgid ""
 "Period for this planning. Requisition will be created for beginning of the "
 "period."
 msgstr ""
+"Periode voor deze planning. Bestellingen worden aangemaakt op het begin van "
+"de periode."
 
 #. module: stock_planning
 #: code:addons/stock_planning/stock_planning.py:631
@@ -1149,6 +1227,8 @@ msgid ""
 "Check to take validated forecasts only. If not checked system takes "
 "validated and draft forecasts."
 msgstr ""
+"Vink aan om alleen bevestigde prognose mee te nemen. Indien niet aangevinkt, "
+"worden bevestigde en concept prognoses meegenomen."
 
 #. module: stock_planning
 #: field:stock.sale.forecast,analyzed_period5_id:0
@@ -1198,6 +1278,10 @@ msgid ""
 "you only have to fill in the forecast quantities. The wizard doesn't "
 "duplicate the line when another one exist for the same selection."
 msgstr ""
+"Deze wizard helpt u bij het maken van meerdere prognoseregels tegelijk. "
+"Nadat deze zijn aangemaakt hoeft u alleen de prognose hoeveelheden in te "
+"voeren. De wizard dupliceert geen regels wanneer er reeds een regel bestaat "
+"voor dezelfde selectie."
 
 #~ msgid "This Copmany Period1"
 #~ msgstr "Dit bedrijf periode 1"
diff --git a/addons/stock_planning/i18n/pl.po b/addons/stock_planning/i18n/pl.po
index 84c811ad19c..107c458f410 100644
--- a/addons/stock_planning/i18n/pl.po
+++ b/addons/stock_planning/i18n/pl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:32+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:36+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: stock_planning
 #: code:addons/stock_planning/wizard/stock_planning_createlines.py:73
diff --git a/addons/stock_planning/i18n/pt.po b/addons/stock_planning/i18n/pt.po
index dce79d7fb03..a0717d9eebf 100644
--- a/addons/stock_planning/i18n/pt.po
+++ b/addons/stock_planning/i18n/pt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:32+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:36+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: stock_planning
 #: code:addons/stock_planning/wizard/stock_planning_createlines.py:73
diff --git a/addons/stock_planning/i18n/pt_BR.po b/addons/stock_planning/i18n/pt_BR.po
index a351bbe4477..f805f0b1c20 100644
--- a/addons/stock_planning/i18n/pt_BR.po
+++ b/addons/stock_planning/i18n/pt_BR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:32+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:36+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: stock_planning
 #: code:addons/stock_planning/wizard/stock_planning_createlines.py:73
diff --git a/addons/stock_planning/i18n/ro.po b/addons/stock_planning/i18n/ro.po
index 63b1aba0387..4b853215ed2 100644
--- a/addons/stock_planning/i18n/ro.po
+++ b/addons/stock_planning/i18n/ro.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:32+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:36+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: stock_planning
 #: code:addons/stock_planning/wizard/stock_planning_createlines.py:73
diff --git a/addons/stock_planning/i18n/ru.po b/addons/stock_planning/i18n/ru.po
index fa1fad8c44d..e487b799dd0 100644
--- a/addons/stock_planning/i18n/ru.po
+++ b/addons/stock_planning/i18n/ru.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:32+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:36+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: stock_planning
 #: code:addons/stock_planning/wizard/stock_planning_createlines.py:73
diff --git a/addons/stock_planning/i18n/sv.po b/addons/stock_planning/i18n/sv.po
index 3a86414a488..c3058b08c28 100644
--- a/addons/stock_planning/i18n/sv.po
+++ b/addons/stock_planning/i18n/sv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:32+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:36+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: stock_planning
 #: code:addons/stock_planning/wizard/stock_planning_createlines.py:73
diff --git a/addons/stock_planning/i18n/tr.po b/addons/stock_planning/i18n/tr.po
index 694608531c0..31c2a459b08 100644
--- a/addons/stock_planning/i18n/tr.po
+++ b/addons/stock_planning/i18n/tr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:32+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:36+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: stock_planning
 #: code:addons/stock_planning/wizard/stock_planning_createlines.py:73
diff --git a/addons/stock_planning/i18n/zh_CN.po b/addons/stock_planning/i18n/zh_CN.po
index 44847c778ae..e5b605902f1 100644
--- a/addons/stock_planning/i18n/zh_CN.po
+++ b/addons/stock_planning/i18n/zh_CN.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:32+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:37+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: stock_planning
 #: code:addons/stock_planning/wizard/stock_planning_createlines.py:73
diff --git a/addons/subscription/__openerp__.py b/addons/subscription/__openerp__.py
index 3a4220efe52..d644daa15e6 100644
--- a/addons/subscription/__openerp__.py
+++ b/addons/subscription/__openerp__.py
@@ -31,15 +31,15 @@ Create recurring documents.
 This module allows to create new documents and add subscriptions on that document.
 
 e.g. To have an invoice generated automatically periodically:
+-------------------------------------------------------------
     * Define a document type based on Invoice object
     * Define a subscription whose source document is the document defined as
       above. Specify the interval information and partner to be invoice.
     """,
     'author': 'OpenERP SA',
     'depends': ['base_tools'],
-    'init_xml': [],
-    'update_xml': ['security/subcription_security.xml', 'security/ir.model.access.csv', 'subscription_view.xml'],
-    'demo_xml': ['subscription_demo.xml',],
+    'data': ['security/subcription_security.xml', 'security/ir.model.access.csv', 'subscription_view.xml'],
+    'demo': ['subscription_demo.xml',],
     'installable': True,
     'auto_install': False,
     'certificate': '0029454782573',
diff --git a/addons/subscription/i18n/ar.po b/addons/subscription/i18n/ar.po
index 4f9bdb47b5d..b9b341e5889 100644
--- a/addons/subscription/i18n/ar.po
+++ b/addons/subscription/i18n/ar.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:51+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:58+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: subscription
 #: field:subscription.subscription,doc_source:0
diff --git a/addons/subscription/i18n/bg.po b/addons/subscription/i18n/bg.po
index 419b4d03e27..068d209eba1 100644
--- a/addons/subscription/i18n/bg.po
+++ b/addons/subscription/i18n/bg.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:51+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:58+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: subscription
 #: field:subscription.subscription,doc_source:0
diff --git a/addons/subscription/i18n/bs.po b/addons/subscription/i18n/bs.po
index 9c50ee4dce2..0e1d251f76b 100644
--- a/addons/subscription/i18n/bs.po
+++ b/addons/subscription/i18n/bs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:51+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:58+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: subscription
 #: field:subscription.subscription,doc_source:0
diff --git a/addons/subscription/i18n/ca.po b/addons/subscription/i18n/ca.po
index 55d3824baaf..62eeb1bd5a3 100644
--- a/addons/subscription/i18n/ca.po
+++ b/addons/subscription/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:51+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:58+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: subscription
 #: field:subscription.subscription,doc_source:0
diff --git a/addons/subscription/i18n/cs.po b/addons/subscription/i18n/cs.po
index b01d8a8053e..34833e5e959 100644
--- a/addons/subscription/i18n/cs.po
+++ b/addons/subscription/i18n/cs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:51+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:58+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: subscription
 #: field:subscription.subscription,doc_source:0
diff --git a/addons/subscription/i18n/da.po b/addons/subscription/i18n/da.po
index 56cb44be775..eba3aaf4c3f 100644
--- a/addons/subscription/i18n/da.po
+++ b/addons/subscription/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:51+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:58+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: subscription
 #: field:subscription.subscription,doc_source:0
diff --git a/addons/subscription/i18n/de.po b/addons/subscription/i18n/de.po
index bc104f81fcd..a01454e6674 100644
--- a/addons/subscription/i18n/de.po
+++ b/addons/subscription/i18n/de.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:51+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:58+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: subscription
 #: field:subscription.subscription,doc_source:0
diff --git a/addons/subscription/i18n/es.po b/addons/subscription/i18n/es.po
index 3217c56d46d..439cfc3c2ff 100644
--- a/addons/subscription/i18n/es.po
+++ b/addons/subscription/i18n/es.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:51+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:58+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: subscription
 #: field:subscription.subscription,doc_source:0
diff --git a/addons/subscription/i18n/es_AR.po b/addons/subscription/i18n/es_AR.po
index 8eb40f81418..c557274777a 100644
--- a/addons/subscription/i18n/es_AR.po
+++ b/addons/subscription/i18n/es_AR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:51+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:58+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: subscription
 #: field:subscription.subscription,doc_source:0
diff --git a/addons/subscription/i18n/es_CR.po b/addons/subscription/i18n/es_CR.po
index ed16153a390..98835f96e24 100644
--- a/addons/subscription/i18n/es_CR.po
+++ b/addons/subscription/i18n/es_CR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:51+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:58+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 "Language: \n"
 
 #. module: subscription
diff --git a/addons/subscription/i18n/et.po b/addons/subscription/i18n/et.po
index d78616b6b98..e4b04832197 100644
--- a/addons/subscription/i18n/et.po
+++ b/addons/subscription/i18n/et.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:51+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:58+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: subscription
 #: field:subscription.subscription,doc_source:0
diff --git a/addons/subscription/i18n/fi.po b/addons/subscription/i18n/fi.po
index 38409585cdf..009419d2b19 100644
--- a/addons/subscription/i18n/fi.po
+++ b/addons/subscription/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:51+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:58+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: subscription
 #: field:subscription.subscription,doc_source:0
diff --git a/addons/subscription/i18n/fr.po b/addons/subscription/i18n/fr.po
index 2f98ea78770..0baa3074684 100644
--- a/addons/subscription/i18n/fr.po
+++ b/addons/subscription/i18n/fr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:51+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:58+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: subscription
 #: field:subscription.subscription,doc_source:0
diff --git a/addons/subscription/i18n/gl.po b/addons/subscription/i18n/gl.po
index 0845920e139..93cf96e195a 100644
--- a/addons/subscription/i18n/gl.po
+++ b/addons/subscription/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:51+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:58+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: subscription
 #: field:subscription.subscription,doc_source:0
diff --git a/addons/subscription/i18n/hr.po b/addons/subscription/i18n/hr.po
index 3f6c7ef49e8..33ecef2055b 100644
--- a/addons/subscription/i18n/hr.po
+++ b/addons/subscription/i18n/hr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:51+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:58+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: subscription
 #: field:subscription.subscription,doc_source:0
diff --git a/addons/subscription/i18n/hu.po b/addons/subscription/i18n/hu.po
index cf8f3962e22..6e7ee232a6f 100644
--- a/addons/subscription/i18n/hu.po
+++ b/addons/subscription/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:51+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:58+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: subscription
 #: field:subscription.subscription,doc_source:0
diff --git a/addons/subscription/i18n/id.po b/addons/subscription/i18n/id.po
index c290b5cc596..364ebf62336 100644
--- a/addons/subscription/i18n/id.po
+++ b/addons/subscription/i18n/id.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:51+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:58+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: subscription
 #: field:subscription.subscription,doc_source:0
diff --git a/addons/subscription/i18n/it.po b/addons/subscription/i18n/it.po
index 862d3ca075c..de9d0321c45 100644
--- a/addons/subscription/i18n/it.po
+++ b/addons/subscription/i18n/it.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:51+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:58+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: subscription
 #: field:subscription.subscription,doc_source:0
diff --git a/addons/subscription/i18n/ja.po b/addons/subscription/i18n/ja.po
index a9774f4b156..2b8fc482486 100644
--- a/addons/subscription/i18n/ja.po
+++ b/addons/subscription/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:51+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:58+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: subscription
 #: field:subscription.subscription,doc_source:0
diff --git a/addons/subscription/i18n/ko.po b/addons/subscription/i18n/ko.po
index 4eda73fa924..3bfb2df6eeb 100644
--- a/addons/subscription/i18n/ko.po
+++ b/addons/subscription/i18n/ko.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:51+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:58+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: subscription
 #: field:subscription.subscription,doc_source:0
@@ -36,7 +36,7 @@ msgstr ""
 #. module: subscription
 #: view:subscription.subscription:0
 msgid "Search Subscription"
-msgstr ""
+msgstr "검색 구독"
 
 #. module: subscription
 #: field:subscription.subscription,date_init:0
@@ -100,7 +100,7 @@ msgstr "인터벌 수량"
 #. module: subscription
 #: view:subscription.subscription:0
 msgid "Stop"
-msgstr "중단"
+msgstr "끝나기"
 
 #. module: subscription
 #: view:subscription.subscription:0
diff --git a/addons/subscription/i18n/lt.po b/addons/subscription/i18n/lt.po
index 51b14626662..b6207023126 100644
--- a/addons/subscription/i18n/lt.po
+++ b/addons/subscription/i18n/lt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:51+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:58+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: subscription
 #: field:subscription.subscription,doc_source:0
diff --git a/addons/subscription/i18n/nl.po b/addons/subscription/i18n/nl.po
index 9821bd76a52..c96f5f4380c 100644
--- a/addons/subscription/i18n/nl.po
+++ b/addons/subscription/i18n/nl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:51+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:58+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: subscription
 #: field:subscription.subscription,doc_source:0
diff --git a/addons/subscription/i18n/nl_BE.po b/addons/subscription/i18n/nl_BE.po
index 2eaba75b635..a5f1eea9c64 100644
--- a/addons/subscription/i18n/nl_BE.po
+++ b/addons/subscription/i18n/nl_BE.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:51+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:58+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: subscription
 #: field:subscription.subscription,doc_source:0
diff --git a/addons/subscription/i18n/pl.po b/addons/subscription/i18n/pl.po
index 2c335d06a76..bd0fe64c2c1 100644
--- a/addons/subscription/i18n/pl.po
+++ b/addons/subscription/i18n/pl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:51+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:58+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: subscription
 #: field:subscription.subscription,doc_source:0
diff --git a/addons/subscription/i18n/pt.po b/addons/subscription/i18n/pt.po
index 4ad1ad07207..881df7a646f 100644
--- a/addons/subscription/i18n/pt.po
+++ b/addons/subscription/i18n/pt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:51+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:58+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: subscription
 #: field:subscription.subscription,doc_source:0
diff --git a/addons/subscription/i18n/pt_BR.po b/addons/subscription/i18n/pt_BR.po
index 293af628b7b..a2bb2657677 100644
--- a/addons/subscription/i18n/pt_BR.po
+++ b/addons/subscription/i18n/pt_BR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:51+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:58+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: subscription
 #: field:subscription.subscription,doc_source:0
@@ -157,7 +157,7 @@ msgstr "Nome"
 #: code:addons/subscription/subscription.py:136
 #, python-format
 msgid "You cannot delete an active subscription !"
-msgstr ""
+msgstr "Você não pode excluir uma inscrição ativa!"
 
 #. module: subscription
 #: field:subscription.document,field_ids:0
diff --git a/addons/subscription/i18n/ro.po b/addons/subscription/i18n/ro.po
index 94b2b0862c6..8002abfb2fc 100644
--- a/addons/subscription/i18n/ro.po
+++ b/addons/subscription/i18n/ro.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:51+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:58+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: subscription
 #: field:subscription.subscription,doc_source:0
diff --git a/addons/subscription/i18n/ru.po b/addons/subscription/i18n/ru.po
index 9d9c1742f38..cba10c138ed 100644
--- a/addons/subscription/i18n/ru.po
+++ b/addons/subscription/i18n/ru.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:51+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:58+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: subscription
 #: field:subscription.subscription,doc_source:0
diff --git a/addons/subscription/i18n/sl.po b/addons/subscription/i18n/sl.po
index 0f57f703100..db688c86264 100644
--- a/addons/subscription/i18n/sl.po
+++ b/addons/subscription/i18n/sl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:51+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:58+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: subscription
 #: field:subscription.subscription,doc_source:0
diff --git a/addons/subscription/i18n/sq.po b/addons/subscription/i18n/sq.po
index 7b2b1d262f2..01700f1f7e4 100644
--- a/addons/subscription/i18n/sq.po
+++ b/addons/subscription/i18n/sq.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:51+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:58+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: subscription
 #: field:subscription.subscription,doc_source:0
diff --git a/addons/subscription/i18n/sv.po b/addons/subscription/i18n/sv.po
index 2f4d5268764..163fcbebc54 100644
--- a/addons/subscription/i18n/sv.po
+++ b/addons/subscription/i18n/sv.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:51+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:58+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: subscription
 #: field:subscription.subscription,doc_source:0
diff --git a/addons/subscription/i18n/tlh.po b/addons/subscription/i18n/tlh.po
index a9d620ae671..6e4d7b12562 100644
--- a/addons/subscription/i18n/tlh.po
+++ b/addons/subscription/i18n/tlh.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:51+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:58+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: subscription
 #: field:subscription.subscription,doc_source:0
diff --git a/addons/subscription/i18n/tr.po b/addons/subscription/i18n/tr.po
index 05ae29ebb15..723733d0a9c 100644
--- a/addons/subscription/i18n/tr.po
+++ b/addons/subscription/i18n/tr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:51+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:58+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: subscription
 #: field:subscription.subscription,doc_source:0
diff --git a/addons/subscription/i18n/uk.po b/addons/subscription/i18n/uk.po
index 764e2a13743..1ee9854678a 100644
--- a/addons/subscription/i18n/uk.po
+++ b/addons/subscription/i18n/uk.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:51+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:58+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: subscription
 #: field:subscription.subscription,doc_source:0
diff --git a/addons/subscription/i18n/vi.po b/addons/subscription/i18n/vi.po
index dad2d180a3e..3f29ab596e8 100644
--- a/addons/subscription/i18n/vi.po
+++ b/addons/subscription/i18n/vi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:51+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:58+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: subscription
 #: field:subscription.subscription,doc_source:0
diff --git a/addons/subscription/i18n/zh_CN.po b/addons/subscription/i18n/zh_CN.po
index 54f418b58e1..8adc56ebd2b 100644
--- a/addons/subscription/i18n/zh_CN.po
+++ b/addons/subscription/i18n/zh_CN.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:51+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:58+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: subscription
 #: field:subscription.subscription,doc_source:0
diff --git a/addons/subscription/i18n/zh_TW.po b/addons/subscription/i18n/zh_TW.po
index a880ce4a6a5..767214cf911 100644
--- a/addons/subscription/i18n/zh_TW.po
+++ b/addons/subscription/i18n/zh_TW.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:51+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 05:58+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: subscription
 #: field:subscription.subscription,doc_source:0
diff --git a/addons/survey/__openerp__.py b/addons/survey/__openerp__.py
index 150623b0db7..1470754cb03 100644
--- a/addons/survey/__openerp__.py
+++ b/addons/survey/__openerp__.py
@@ -35,19 +35,21 @@ user name and password for the invitation of the survey.
     """,
     'author': 'OpenERP SA',
     'depends': ['base_tools', 'mail'],
-    'update_xml': ['survey_report.xml',
-                   'survey_data.xml',
-                   'wizard/survey_selection.xml',
-                   'wizard/survey_answer.xml',
-                   'security/survey_security.xml',
-                   'security/ir.model.access.csv',
-                   'survey_view.xml',
-                   'wizard/survey_print_statistics.xml',
-                   'wizard/survey_print_answer.xml',
-                   'wizard/survey_browse_answer.xml',
-                   'wizard/survey_print.xml',
-                   'wizard/survey_send_invitation.xml'],
-    'demo_xml': ['survey_demo.xml'],
+    'data': [
+        'survey_report.xml',
+        'survey_data.xml',
+        'wizard/survey_selection.xml',
+        'wizard/survey_answer.xml',
+        'security/survey_security.xml',
+        'security/ir.model.access.csv',
+        'survey_view.xml',
+        'wizard/survey_print_statistics.xml',
+        'wizard/survey_print_answer.xml',
+        'wizard/survey_browse_answer.xml',
+        'wizard/survey_print.xml',
+        'wizard/survey_send_invitation.xml'
+    ],
+    'demo': ['survey_demo.xml'],
     'test': [
         'test/draft2open2close_survey.yml',
         'test/draft2open2close_request.yml',
diff --git a/addons/survey/i18n/ar.po b/addons/survey/i18n/ar.po
index 90b9f947584..c5bed2f9b22 100644
--- a/addons/survey/i18n/ar.po
+++ b/addons/survey/i18n/ar.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:30+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: survey
 #: view:survey.print:0
diff --git a/addons/survey/i18n/bg.po b/addons/survey/i18n/bg.po
index 49368b05023..4344e75dc5f 100644
--- a/addons/survey/i18n/bg.po
+++ b/addons/survey/i18n/bg.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:30+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: survey
 #: view:survey.print:0
diff --git a/addons/survey/i18n/ca.po b/addons/survey/i18n/ca.po
index 5d87a6b1e99..262845a2e64 100644
--- a/addons/survey/i18n/ca.po
+++ b/addons/survey/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:30+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: survey
 #: view:survey.print:0
diff --git a/addons/survey/i18n/cs.po b/addons/survey/i18n/cs.po
index 603426b10c8..e5c26ea2bb4 100644
--- a/addons/survey/i18n/cs.po
+++ b/addons/survey/i18n/cs.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:30+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: survey
 #: view:survey.print:0
diff --git a/addons/survey/i18n/da.po b/addons/survey/i18n/da.po
index 7d0f6916030..63e196ad6f8 100644
--- a/addons/survey/i18n/da.po
+++ b/addons/survey/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:30+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: survey
 #: view:survey.print:0
diff --git a/addons/survey/i18n/de.po b/addons/survey/i18n/de.po
index 59d4c0b231e..8c1f446d71a 100644
--- a/addons/survey/i18n/de.po
+++ b/addons/survey/i18n/de.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:30+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: survey
 #: view:survey.print:0
diff --git a/addons/survey/i18n/es.po b/addons/survey/i18n/es.po
index 542e8dba498..49d3883f412 100644
--- a/addons/survey/i18n/es.po
+++ b/addons/survey/i18n/es.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:26+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:31+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: survey
 #: view:survey.print:0
diff --git a/addons/survey/i18n/es_CR.po b/addons/survey/i18n/es_CR.po
index c751c1245be..6dc7b03dbb0 100644
--- a/addons/survey/i18n/es_CR.po
+++ b/addons/survey/i18n/es_CR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:26+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:31+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 "Language: es\n"
 
 #. module: survey
diff --git a/addons/survey/i18n/et.po b/addons/survey/i18n/et.po
index 5ee32250d64..7be1742ee39 100644
--- a/addons/survey/i18n/et.po
+++ b/addons/survey/i18n/et.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:30+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: survey
 #: view:survey.print:0
diff --git a/addons/survey/i18n/fi.po b/addons/survey/i18n/fi.po
index 6a4ab67cee6..fa69f273263 100644
--- a/addons/survey/i18n/fi.po
+++ b/addons/survey/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:30+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: survey
 #: view:survey.print:0
diff --git a/addons/survey/i18n/fr.po b/addons/survey/i18n/fr.po
index 5c382abec0b..8de1698ee93 100644
--- a/addons/survey/i18n/fr.po
+++ b/addons/survey/i18n/fr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:30+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: survey
 #: view:survey.print:0
diff --git a/addons/survey/i18n/gl.po b/addons/survey/i18n/gl.po
index 24f9660fdb8..59d728a23df 100644
--- a/addons/survey/i18n/gl.po
+++ b/addons/survey/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:30+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: survey
 #: view:survey.print:0
diff --git a/addons/survey/i18n/hr.po b/addons/survey/i18n/hr.po
index db5e01173cb..4d72570d259 100644
--- a/addons/survey/i18n/hr.po
+++ b/addons/survey/i18n/hr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:26+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:31+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 "Language: hr\n"
 
 #. module: survey
diff --git a/addons/survey/i18n/hu.po b/addons/survey/i18n/hu.po
index b6d8d13b24e..68f48d81b3b 100644
--- a/addons/survey/i18n/hu.po
+++ b/addons/survey/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:30+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: survey
 #: view:survey.print:0
diff --git a/addons/survey/i18n/it.po b/addons/survey/i18n/it.po
index 421d2796cc1..ab179a1186c 100644
--- a/addons/survey/i18n/it.po
+++ b/addons/survey/i18n/it.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:30+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: survey
 #: view:survey.print:0
diff --git a/addons/survey/i18n/ja.po b/addons/survey/i18n/ja.po
index 3fd844147f1..38d632b1642 100644
--- a/addons/survey/i18n/ja.po
+++ b/addons/survey/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:30+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: survey
 #: view:survey.print:0
diff --git a/addons/survey/i18n/mn.po b/addons/survey/i18n/mn.po
index 3462e0a73dc..f4b024fccee 100644
--- a/addons/survey/i18n/mn.po
+++ b/addons/survey/i18n/mn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:26+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:30+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: survey
 #: view:survey.print:0
diff --git a/addons/survey/i18n/nl.po b/addons/survey/i18n/nl.po
index dffbd08800b..faa919aeb14 100644
--- a/addons/survey/i18n/nl.po
+++ b/addons/survey/i18n/nl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:30+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: survey
 #: view:survey.print:0
diff --git a/addons/survey/i18n/pl.po b/addons/survey/i18n/pl.po
index 870b76cd9f5..b24c30bcbdf 100644
--- a/addons/survey/i18n/pl.po
+++ b/addons/survey/i18n/pl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:26+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:30+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: survey
 #: view:survey.print:0
diff --git a/addons/survey/i18n/pt.po b/addons/survey/i18n/pt.po
index 815394a20db..8b4791f361d 100644
--- a/addons/survey/i18n/pt.po
+++ b/addons/survey/i18n/pt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:26+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:30+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: survey
 #: view:survey.print:0
diff --git a/addons/survey/i18n/pt_BR.po b/addons/survey/i18n/pt_BR.po
index bf587481f21..8887d858b8c 100644
--- a/addons/survey/i18n/pt_BR.po
+++ b/addons/survey/i18n/pt_BR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:26+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:31+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: survey
 #: view:survey.print:0
diff --git a/addons/survey/i18n/ro.po b/addons/survey/i18n/ro.po
index a87e24a2c81..1343575dc4e 100644
--- a/addons/survey/i18n/ro.po
+++ b/addons/survey/i18n/ro.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:26+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:30+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: survey
 #: view:survey.print:0
diff --git a/addons/survey/i18n/ru.po b/addons/survey/i18n/ru.po
index 5236db3c6de..4b9275267fb 100644
--- a/addons/survey/i18n/ru.po
+++ b/addons/survey/i18n/ru.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:26+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:31+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: survey
 #: view:survey.print:0
diff --git a/addons/survey/i18n/sl.po b/addons/survey/i18n/sl.po
index bb7167c85c2..44030f461ce 100644
--- a/addons/survey/i18n/sl.po
+++ b/addons/survey/i18n/sl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:26+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:31+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: survey
 #: view:survey.print:0
diff --git a/addons/survey/i18n/sr.po b/addons/survey/i18n/sr.po
index c5d09693c3b..ab3d1f46f93 100644
--- a/addons/survey/i18n/sr.po
+++ b/addons/survey/i18n/sr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:26+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:31+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: survey
 #: view:survey.print:0
diff --git a/addons/survey/i18n/sr@latin.po b/addons/survey/i18n/sr@latin.po
index c32513bfd12..ff518c67a5d 100644
--- a/addons/survey/i18n/sr@latin.po
+++ b/addons/survey/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:26+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:31+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: survey
 #: view:survey.print:0
diff --git a/addons/survey/i18n/sv.po b/addons/survey/i18n/sv.po
index 7b705966817..ba40cffaac8 100644
--- a/addons/survey/i18n/sv.po
+++ b/addons/survey/i18n/sv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:26+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:31+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: survey
 #: view:survey.print:0
diff --git a/addons/survey/i18n/tr.po b/addons/survey/i18n/tr.po
index fcd6aeed244..3c40d60555a 100644
--- a/addons/survey/i18n/tr.po
+++ b/addons/survey/i18n/tr.po
@@ -14,14 +14,14 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:26+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:31+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: survey
 #: view:survey.print:0
 #: view:survey.print.answer:0
 msgid "Print Option"
-msgstr ""
+msgstr "Yazdırma Seçenekleri"
 
 #. module: survey
 #: code:addons/survey/survey.py:417
@@ -35,13 +35,13 @@ msgstr ""
 #. module: survey
 #: view:survey.question.wiz:0
 msgid "Your Messages"
-msgstr ""
+msgstr "Mesajlarınız"
 
 #. module: survey
 #: field:survey.question,comment_valid_type:0
 #: field:survey.question,validation_type:0
 msgid "Text Validation"
-msgstr ""
+msgstr "Karakter Kontrolü"
 
 #. module: survey
 #: code:addons/survey/survey.py:429
@@ -56,12 +56,12 @@ msgstr ""
 #: view:survey:0
 #: field:survey,invited_user_ids:0
 msgid "Invited User"
-msgstr ""
+msgstr "Davetli Kullanıcı"
 
 #. module: survey
 #: selection:survey.answer,type:0
 msgid "Character"
-msgstr ""
+msgstr "Karakter"
 
 #. module: survey
 #: model:ir.actions.act_window,name:survey.action_survey_form1
@@ -70,12 +70,12 @@ msgstr ""
 #: model:ir.ui.menu,name:survey.menu_survey_form
 #: model:ir.ui.menu,name:survey.menu_surveys
 msgid "Surveys"
-msgstr ""
+msgstr "Anketler"
 
 #. module: survey
 #: field:survey.question,in_visible_answer_type:0
 msgid "Is Answer Type Invisible?"
-msgstr ""
+msgstr "Anket Türü gizli mi?"
 
 #. module: survey
 #: view:survey:0
@@ -93,27 +93,27 @@ msgstr "Sonuçlar :"
 #. module: survey
 #: view:survey.request:0
 msgid "Survey Request"
-msgstr ""
+msgstr "Anket İsteği"
 
 #. module: survey
 #: selection:survey.question,required_type:0
 msgid "A Range"
-msgstr ""
+msgstr "Aralık"
 
 #. module: survey
 #: view:survey.response.line:0
 msgid "Table Answer"
-msgstr ""
+msgstr "Tablo Cevabı"
 
 #. module: survey
 #: field:survey.history,date:0
 msgid "Date started"
-msgstr ""
+msgstr "Başlangıç Tarihi"
 
 #. module: survey
 #: field:survey,history:0
 msgid "History Lines"
-msgstr ""
+msgstr "Geçmiş Satırlar"
 
 #. module: survey
 #: code:addons/survey/survey.py:443
@@ -122,63 +122,65 @@ msgid ""
 "You must enter one or more menu                                 choices in "
 "column heading (white spaces not allowed)"
 msgstr ""
+"Kolon başlığında bir veya birden fazla seçenek girmelisiniz (Boşluk "
+"kullanamazsınız)"
 
 #. module: survey
 #: field:survey.question.column.heading,in_visible_menu_choice:0
 msgid "Is Menu Choice Invisible??"
-msgstr ""
+msgstr "Menü seçeneği görünmez olacak mı?"
 
 #. module: survey
 #: field:survey.send.invitation,mail:0
 msgid "Body"
-msgstr ""
+msgstr "Gövde"
 
 #. module: survey
 #: field:survey.question,allow_comment:0
 msgid "Allow Comment Field"
-msgstr ""
+msgstr "Yorum Alanına İzin Ver"
 
 #. module: survey
 #: selection:survey.print,paper_size:0
 #: selection:survey.print.answer,paper_size:0
 msgid "A4 (210mm x 297mm)"
-msgstr ""
+msgstr "A4 (210mm x 297mm)"
 
 #. module: survey
 #: field:survey.question,comment_maximum_date:0
 #: field:survey.question,validation_maximum_date:0
 msgid "Maximum date"
-msgstr ""
+msgstr "Maksimum Tarih"
 
 #. module: survey
 #: field:survey.question,in_visible_menu_choice:0
 msgid "Is Menu Choice Invisible?"
-msgstr ""
+msgstr "Menü Seçeneği Görünmez mi?"
 
 #. module: survey
 #: view:survey:0
 msgid "Completed"
-msgstr ""
+msgstr "Tamamlandı"
 
 #. module: survey
 #: selection:survey.question,required_type:0
 msgid "Exactly"
-msgstr ""
+msgstr "Tam olarak"
 
 #. module: survey
 #: view:survey:0
 msgid "Open Date"
-msgstr ""
+msgstr "Başlangıç Tarihi"
 
 #. module: survey
 #: view:survey.request:0
 msgid "Set to Draft"
-msgstr ""
+msgstr "Taslak Olarak Kaydet"
 
 #. module: survey
 #: field:survey.question,is_comment_require:0
 msgid "Add Comment Field"
-msgstr ""
+msgstr "Yorum Alanı Ekle"
 
 #. module: survey
 #: code:addons/survey/survey.py:396
@@ -192,12 +194,12 @@ msgstr ""
 #. module: survey
 #: field:survey.question,tot_resp:0
 msgid "Total Answer"
-msgstr ""
+msgstr "Toplam Cevap"
 
 #. module: survey
 #: field:survey.tbl.column.heading,name:0
 msgid "Row Number"
-msgstr ""
+msgstr "Satır Numarası"
 
 #. module: survey
 #: model:ir.model,name:survey.model_survey_name_wiz
@@ -207,12 +209,12 @@ msgstr ""
 #. module: survey
 #: model:ir.actions.act_window,name:survey.action_survey_question_form
 msgid "Survey Questions"
-msgstr ""
+msgstr "Anket Soruları"
 
 #. module: survey
 #: selection:survey.question,type:0
 msgid "Matrix of Choices (Only One Answers Per Row)"
-msgstr ""
+msgstr "Seçenekler Matrisi (Satır başına bir cevap)"
 
 #. module: survey
 #: code:addons/survey/survey.py:470
@@ -229,78 +231,78 @@ msgstr ""
 #: view:survey.page:0
 #: view:survey.question:0
 msgid "Survey Question"
-msgstr ""
+msgstr "Anket Sorusu"
 
 #. module: survey
 #: view:survey.question.column.heading:0
 msgid "Use if question type is rating_scale"
-msgstr ""
+msgstr "Soru ölçülebilir (rating scale) ise seçiniz"
 
 #. module: survey
 #: field:survey.print,page_number:0
 #: field:survey.print.answer,page_number:0
 msgid "Include Page Number"
-msgstr ""
+msgstr "Sayfa Numarası Dahil"
 
 #. module: survey
 #: view:survey.page:0
 #: view:survey.question:0
 msgid "Ok"
-msgstr ""
+msgstr "Tamam"
 
 #. module: survey
 #: field:survey.page,title:0
 msgid "Page Title"
-msgstr ""
+msgstr "Sayfa Başlığı"
 
 #. module: survey
 #: model:ir.ui.menu,name:survey.menu_define_survey
 msgid "Define Surveys"
-msgstr ""
+msgstr "Anket Tanımla"
 
 #. module: survey
 #: model:ir.model,name:survey.model_survey_history
 msgid "Survey History"
-msgstr ""
+msgstr "Anket Geçmişi"
 
 #. module: survey
 #: field:survey.response.answer,comment:0
 #: field:survey.response.line,comment:0
 msgid "Notes"
-msgstr ""
+msgstr "Notlar"
 
 #. module: survey
 #: view:survey:0
 #: view:survey.request:0
 msgid "Search Survey"
-msgstr ""
+msgstr "Anket Ara"
 
 #. module: survey
 #: field:survey.response.answer,answer:0
 #: field:survey.tbl.column.heading,value:0
 msgid "Value"
-msgstr ""
+msgstr "Değer"
 
 #. module: survey
 #: field:survey.question,column_heading_ids:0
 msgid " Column heading"
-msgstr ""
+msgstr " Sütun Başlığı"
 
 #. module: survey
 #: model:ir.ui.menu,name:survey.menu_run_survey_form
 msgid "Answer a Survey"
-msgstr ""
+msgstr "Anket Cevapla"
 
 #. module: survey
 #: code:addons/survey/wizard/survey_answer.py:87
 #, python-format
 msgid "Error!"
-msgstr ""
+msgstr "Hata!"
 
 #. module: survey
 #: field:survey,tot_comp_survey:0
 msgid "Total Completed Survey"
-msgstr ""
+msgstr "Toplam Cevaplanan Anket"
 
 #. module: survey
 #: view:survey.response.answer:0
@@ -310,24 +312,24 @@ msgstr ""
 #. module: survey
 #: model:ir.actions.report.xml,name:survey.survey_analysis
 msgid "Survey Statistics"
-msgstr ""
+msgstr "Anket İstatistiği"
 
 #. module: survey
 #: selection:survey,state:0
 #: view:survey.request:0
 #: selection:survey.request,state:0
 msgid "Cancelled"
-msgstr ""
+msgstr "İptal Edildi"
 
 #. module: survey
 #: selection:survey.question,type:0
 msgid "Rating Scale"
-msgstr ""
+msgstr "Ölçüm Skalası (Rating Scale)"
 
 #. module: survey
 #: field:survey.question,comment_field_type:0
 msgid "Comment Field Type"
-msgstr ""
+msgstr "Yorum Alanı Türü"
 
 #. module: survey
 #: code:addons/survey/survey.py:370
@@ -375,12 +377,12 @@ msgstr ""
 #: code:addons/survey/wizard/survey_send_invitation.py:74
 #, python-format
 msgid "Warning !"
-msgstr ""
+msgstr "Uyarı!"
 
 #. module: survey
 #: selection:survey.question,comment_field_type:0
 msgid "Single Line Of Text"
-msgstr ""
+msgstr "Yazının tek satırı"
 
 #. module: survey
 #: view:survey.send.invitation:0
@@ -391,108 +393,108 @@ msgstr ""
 #. module: survey
 #: selection:survey.question,type:0
 msgid "Multiple Choice (Multiple Answer)"
-msgstr ""
+msgstr "Çoktan Seçmeli"
 
 #. module: survey
 #: view:survey:0
 msgid "Edit Survey"
-msgstr ""
+msgstr "Anket Düzenle"
 
 #. module: survey
 #: view:survey.response.line:0
 msgid "Survey Answer Line"
-msgstr ""
+msgstr "Anket Cevap Satırı"
 
 #. module: survey
 #: field:survey.question.column.heading,menu_choice:0
 msgid "Menu Choice"
-msgstr ""
+msgstr "Menü Seçeneği"
 
 #. module: survey
 #: selection:survey.question,required_type:0
 msgid "At Most"
-msgstr ""
+msgstr "En Çok"
 
 #. module: survey
 #: view:survey:0
 msgid "My Survey(s)"
-msgstr ""
+msgstr "Anketlerim"
 
 #. module: survey
 #: field:survey.question,is_validation_require:0
 msgid "Validate Text"
-msgstr ""
+msgstr "Metnin geçerliliğini denetle"
 
 #. module: survey
 #: view:survey.send.invitation:0
 msgid "_Cancel"
-msgstr ""
+msgstr "İptal Et"
 
 #. module: survey
 #: field:survey.response.line,single_text:0
 msgid "Text"
-msgstr ""
+msgstr "Metin"
 
 #. module: survey
 #: constraint:res.users:0
 msgid "The chosen company is not in the allowed companies for this user"
-msgstr ""
+msgstr "Bu kullanıcının seçilen şirkete erişim hakkı yok"
 
 #. module: survey
 #: selection:survey.print,paper_size:0
 #: selection:survey.print.answer,paper_size:0
 msgid "Letter (8.5\" x 11\")"
-msgstr ""
+msgstr "Mektup (8.5\" x 11\")"
 
 #. module: survey
 #: view:survey:0
 #: field:survey,responsible_id:0
 msgid "Responsible"
-msgstr ""
+msgstr "Sorumlu"
 
 #. module: survey
 #: model:ir.model,name:survey.model_survey_request
 msgid "survey.request"
-msgstr ""
+msgstr "İstek"
 
 #. module: survey
 #: field:survey.send.invitation,mail_subject:0
 #: field:survey.send.invitation,mail_subject_existing:0
 msgid "Subject"
-msgstr ""
+msgstr "Konu"
 
 #. module: survey
 #: field:survey.question,comment_maximum_float:0
 #: field:survey.question,validation_maximum_float:0
 msgid "Maximum decimal number"
-msgstr ""
+msgstr "Maksimum ondalık sayı"
 
 #. module: survey
 #: model:ir.model,name:survey.model_survey_tbl_column_heading
 msgid "survey.tbl.column.heading"
-msgstr ""
+msgstr "Başlık"
 
 #. module: survey
 #: sql_constraint:res.users:0
 msgid "You can not have two users with the same login !"
-msgstr ""
+msgstr "Aynı kullanıcı adı ile iki kullanıcı oluşturamazsınız !"
 
 #. module: survey
 #: field:survey.send.invitation,mail_from:0
 msgid "From"
-msgstr ""
+msgstr "Gönderen"
 
 #. module: survey
 #: selection:survey.question,comment_valid_type:0
 #: selection:survey.question,validation_type:0
 msgid "Don't Validate Comment Text."
-msgstr ""
+msgstr "Metnin geçerliliğini kontrol etme"
 
 #. module: survey
 #: selection:survey.question,comment_valid_type:0
 #: selection:survey.question,validation_type:0
 msgid "Must Be A Whole Number"
-msgstr ""
+msgstr "Bütün bir numara olmalı"
 
 #. module: survey
 #: field:survey.answer,question_id:0
@@ -501,17 +503,17 @@ msgstr ""
 #: field:survey.question.column.heading,question_id:0
 #: field:survey.response.line,question_id:0
 msgid "Question"
-msgstr ""
+msgstr "Soru"
 
 #. module: survey
 #: view:survey.page:0
 msgid "Search Survey Page"
-msgstr ""
+msgstr "Anket Sayfası Ara"
 
 #. module: survey
 #: field:survey.question.wiz,name:0
 msgid "Number"
-msgstr ""
+msgstr "Sayı"
 
 #. module: survey
 #: code:addons/survey/survey.py:439
@@ -519,7 +521,7 @@ msgstr ""
 msgid ""
 "You must enter one or more menu choices                                 in "
 "column heading"
-msgstr ""
+msgstr "Sütun başlığında bir veya daha fazla seçenek girmelisiniz."
 
 #. module: survey
 #: model:ir.actions.act_window,help:survey.action_survey_form1
@@ -536,106 +538,106 @@ msgstr ""
 #: view:survey.request:0
 #: field:survey.request,state:0
 msgid "State"
-msgstr ""
+msgstr "Durum"
 
 #. module: survey
 #: view:survey.request:0
 msgid "Evaluation Plan Phase"
-msgstr ""
+msgstr "Eleme Planı Fazı"
 
 #. module: survey
 #: view:survey:0
 #: view:survey.page:0
 #: view:survey.question:0
 msgid "Between"
-msgstr ""
+msgstr "Arasında"
 
 #. module: survey
 #: view:survey.print:0
 #: view:survey.print.answer:0
 #: view:survey.print.statistics:0
 msgid "Print"
-msgstr ""
+msgstr "Yazdır"
 
 #. module: survey
 #: view:survey:0
 msgid "New"
-msgstr ""
+msgstr "Yeni"
 
 #. module: survey
 #: field:survey.question,make_comment_field:0
 msgid "Make Comment Field an Answer Choice"
-msgstr ""
+msgstr "Yorum Alanını Seçeneklerden Biri Yap"
 
 #. module: survey
 #: view:survey:0
 #: field:survey,type:0
 msgid "Type"
-msgstr ""
+msgstr "Tür"
 
 #. module: survey
 #: selection:survey.answer,type:0
 msgid "Email"
-msgstr ""
+msgstr "Email"
 
 #. module: survey
 #: model:ir.ui.menu,name:survey.menu_answer_surveys
 msgid "Answer Surveys"
-msgstr ""
+msgstr "Anket Yanıtla"
 
 #. module: survey
 #: selection:survey.response,state:0
 msgid "Not Finished"
-msgstr ""
+msgstr "Bitmedi"
 
 #. module: survey
 #: view:survey.print:0
 msgid "Survey Print"
-msgstr ""
+msgstr "Anket Yazdır"
 
 #. module: survey
 #: view:survey.send.invitation:0
 msgid "Select Partner"
-msgstr ""
+msgstr "Ortak Seç"
 
 #. module: survey
 #: field:survey.question,type:0
 msgid "Question Type"
-msgstr ""
+msgstr "Soru Tipi"
 
 #. module: survey
 #: code:addons/survey/wizard/survey_answer.py:126
 #, python-format
 msgid "You can not answer this survey more than %s times"
-msgstr ""
+msgstr "Bu anketi %s kereden fazla yanıtlayamazsınız."
 
 #. module: survey
 #: model:ir.actions.act_window,name:survey.act_survey_answer
 msgid "Answers"
-msgstr ""
+msgstr "Cevaplar"
 
 #. module: survey
 #: code:addons/survey/wizard/survey_answer.py:119
 #, python-format
 msgid "You can not answer because the survey is not open"
-msgstr ""
+msgstr "Anket aktif değil, yanıtlayamazsınız."
 
 #. module: survey
 #: selection:survey.response,response_type:0
 msgid "Link"
-msgstr ""
+msgstr "Bağlantı"
 
 #. module: survey
 #: model:ir.actions.act_window,name:survey.action_survey_type_form
 #: model:ir.model,name:survey.model_survey_type
 #: view:survey.type:0
 msgid "Survey Type"
-msgstr ""
+msgstr "Anket Türü"
 
 #. module: survey
 #: field:survey.page,sequence:0
 msgid "Page Nr"
-msgstr ""
+msgstr "Sayfa No"
 
 #. module: survey
 #: view:survey:0
@@ -644,12 +646,12 @@ msgstr ""
 #: field:survey.question,descriptive_text:0
 #: selection:survey.question,type:0
 msgid "Descriptive Text"
-msgstr ""
+msgstr "Açıklayıcı Metin"
 
 #. module: survey
 #: field:survey.question,minimum_req_ans:0
 msgid "Minimum Required Answer"
-msgstr ""
+msgstr "Gerekli Minimum Cevap Sayısı"
 
 #. module: survey
 #: code:addons/survey/survey.py:479
@@ -658,74 +660,76 @@ msgid ""
 "You must enter one or more menu choices in column heading (white spaces not "
 "allowed)"
 msgstr ""
+"Sütun başılığında bir veya daha fazla seçenek girmelisiniz (Boşluk "
+"kullanamazsınız)"
 
 #. module: survey
 #: field:survey.question,req_error_msg:0
 msgid "Error Message"
-msgstr ""
+msgstr "Hata Mesajı"
 
 #. module: survey
 #: code:addons/survey/survey.py:477
 #, python-format
 msgid "You must enter one or more menu choices in column heading"
-msgstr ""
+msgstr "Sütun başılığında bir veya daha fazla seçenek girmelisiniz"
 
 #. module: survey
 #: field:survey.request,date_deadline:0
 msgid "Deadline date"
-msgstr ""
+msgstr "Bitiş Tarihi"
 
 #. module: survey
 #: selection:survey.question,comment_valid_type:0
 #: selection:survey.question,validation_type:0
 msgid "Must Be A Date"
-msgstr ""
+msgstr "Tarih olmalı"
 
 #. module: survey
 #: model:ir.model,name:survey.model_survey_print
 msgid "survey.print"
-msgstr ""
+msgstr "Yazdır"
 
 #. module: survey
 #: view:survey.question.column.heading:0
 #: field:survey.question.column.heading,title:0
 msgid "Column Heading"
-msgstr ""
+msgstr "Sütun Başlığı"
 
 #. module: survey
 #: field:survey.question,is_require_answer:0
 msgid "Require Answer to Question"
-msgstr ""
+msgstr "Cevap zorunlu olsun"
 
 #. module: survey
 #: model:ir.actions.act_window,name:survey.action_survey_request_tree
 #: model:ir.ui.menu,name:survey.menu_survey_type_form1
 msgid "Survey Requests"
-msgstr ""
+msgstr "Anket İstekleri"
 
 #. module: survey
 #: code:addons/survey/survey.py:370
 #: code:addons/survey/survey.py:457
 #, python-format
 msgid "You must enter one or more column heading."
-msgstr ""
+msgstr "Sütun başılığında bir veya daha fazla seçenek girmelisiniz"
 
 #. module: survey
 #: code:addons/survey/wizard/survey_answer.py:745
 #: code:addons/survey/wizard/survey_answer.py:940
 #, python-format
 msgid "Please enter an integer value"
-msgstr ""
+msgstr "Lütfen bir Tamsayı değer girin"
 
 #. module: survey
 #: model:ir.model,name:survey.model_survey_browse_answer
 msgid "survey.browse.answer"
-msgstr ""
+msgstr "Cevap"
 
 #. module: survey
 #: selection:survey.question,comment_field_type:0
 msgid "Paragraph of Text"
-msgstr ""
+msgstr "Metnin Paragrafı"
 
 #. module: survey
 #: code:addons/survey/survey.py:423
@@ -741,30 +745,30 @@ msgstr ""
 #: view:survey.page:0
 #: view:survey.question:0
 msgid "When the question is not answered, display this error message:"
-msgstr ""
+msgstr "Bu soruya cevap vermediniz."
 
 #. module: survey
 #: view:survey:0
 #: view:survey.page:0
 #: view:survey.question:0
 msgid "Options"
-msgstr ""
+msgstr "Seçenekler"
 
 #. module: survey
 #: view:survey.send.invitation.log:0
 msgid "_Ok"
-msgstr ""
+msgstr "_Tamam"
 
 #. module: survey
 #: model:ir.ui.menu,name:survey.menu_browse_survey_response
 msgid "Browse Answers"
-msgstr ""
+msgstr "Cevapları İncele"
 
 #. module: survey
 #: field:survey.response.answer,comment_field:0
 #: view:survey.response.line:0
 msgid "Comment"
-msgstr ""
+msgstr "Açıklama"
 
 #. module: survey
 #: model:ir.model,name:survey.model_survey_answer
@@ -774,70 +778,70 @@ msgstr ""
 #: view:survey.response.answer:0
 #: view:survey.response.line:0
 msgid "Survey Answer"
-msgstr ""
+msgstr "Anket Cevabı"
 
 #. module: survey
 #: selection:survey.answer,type:0
 msgid "Selection"
-msgstr ""
+msgstr "Seçim"
 
 #. module: survey
 #: model:ir.actions.act_window,name:survey.action_browse_survey_response
 #: view:survey:0
 msgid "Answer Survey"
-msgstr ""
+msgstr "Anket Cevapları"
 
 #. module: survey
 #: view:survey:0
 #: view:survey.page:0
 #: view:survey.question:0
 msgid "Comment Field"
-msgstr ""
+msgstr "Yorum Alanı"
 
 #. module: survey
 #: selection:survey.response,response_type:0
 msgid "Manually"
-msgstr ""
+msgstr "El ile"
 
 #. module: survey
 #: view:survey.send.invitation:0
 msgid "_Send"
-msgstr ""
+msgstr "_Gönder"
 
 #. module: survey
 #: help:survey,responsible_id:0
 msgid "User responsible for survey"
-msgstr ""
+msgstr "Anket sorumlu kullanıcı"
 
 #. module: survey
 #: field:survey,page_ids:0
 #: view:survey.question:0
 #: field:survey.response.line,page_id:0
 msgid "Page"
-msgstr ""
+msgstr "Sayfa"
 
 #. module: survey
 #: field:survey.question,comment_column:0
 msgid "Add comment column in matrix"
-msgstr ""
+msgstr "Matrise Yorum Alanı Ekle"
 
 #. module: survey
 #: field:survey.answer,response:0
 msgid "#Answer"
-msgstr ""
+msgstr "#Cevap"
 
 #. module: survey
 #: field:survey.print,without_pagebreak:0
 #: field:survey.print.answer,without_pagebreak:0
 msgid "Print Without Page Breaks"
-msgstr ""
+msgstr "Sayfa Aralıksız Yazdır"
 
 #. module: survey
 #: view:survey:0
 #: view:survey.page:0
 #: view:survey.question:0
 msgid "When the comment is an invalid format, display this error message"
-msgstr ""
+msgstr "Girdiğiniz metnin formatı yanlış, düzeltiniz."
 
 #. module: survey
 #: code:addons/survey/wizard/survey_selection.py:83
@@ -845,28 +849,28 @@ msgstr ""
 msgid ""
 "You can not give more response. Please contact the author of this survey for "
 "further assistance."
-msgstr ""
+msgstr "Daha fazla cevap veremezsiniz. Anket sahibi ile iletişime geçiniz."
 
 #. module: survey
 #: model:ir.actions.act_window,name:survey.act_survey_page_question
 #: model:ir.actions.act_window,name:survey.act_survey_question
 msgid "Questions"
-msgstr ""
+msgstr "Sorular"
 
 #. module: survey
 #: help:survey,response_user:0
 msgid "Set to one if  you require only one Answer per user"
-msgstr ""
+msgstr "Eğer kullanıcı başına bir cevap gerekiyorsa seçiniz"
 
 #. module: survey
 #: field:survey,users:0
 msgid "Users"
-msgstr ""
+msgstr "Kullanıcılar"
 
 #. module: survey
 #: view:survey.send.invitation:0
 msgid "Message"
-msgstr ""
+msgstr "Mesaj"
 
 #. module: survey
 #: view:survey:0
@@ -877,82 +881,82 @@ msgstr ""
 #. module: survey
 #: field:survey.question,maximum_req_ans:0
 msgid "Maximum Required Answer"
-msgstr ""
+msgstr "Maksimum Gerekli Cevap"
 
 #. module: survey
 #: field:survey.name.wiz,page_no:0
 msgid "Page Number"
-msgstr ""
+msgstr "Sayfa Numarası"
 
 #. module: survey
 #: code:addons/survey/wizard/survey_answer.py:87
 #, python-format
 msgid "Cannot locate survey for the question wizard!"
-msgstr ""
+msgstr "Soru sihirbazı için anket yüklenemiyor."
 
 #. module: survey
 #: view:survey:0
 #: view:survey.page:0
 #: view:survey.question:0
 msgid "and"
-msgstr ""
+msgstr "ve"
 
 #. module: survey
 #: model:ir.actions.act_window,name:survey.action_view_survey_print_statistics
 #: view:survey.print.statistics:0
 msgid "Survey Print Statistics"
-msgstr ""
+msgstr "Anket Yazdırma İstatistiği"
 
 #. module: survey
 #: field:survey.send.invitation.log,note:0
 msgid "Log"
-msgstr ""
+msgstr "Log"
 
 #. module: survey
 #: view:survey:0
 #: view:survey.page:0
 #: view:survey.question:0
 msgid "When the choices do not add up correctly, display this error message"
-msgstr ""
+msgstr "Girdiğiniz seçenek düzgün eklenemedi!"
 
 #. module: survey
 #: field:survey,date_close:0
 msgid "Survey Close Date"
-msgstr ""
+msgstr "Anket Bitiş Tarihi"
 
 #. module: survey
 #: field:survey,date_open:0
 msgid "Survey Open Date"
-msgstr ""
+msgstr "Anket Başlangıç Tarihi"
 
 #. module: survey
 #: field:survey.question.column.heading,in_visible_rating_weight:0
 msgid "Is Rating Scale Invisible ??"
-msgstr ""
+msgstr "Öçlüm skalası (rating scale) görünmez mi?"
 
 #. module: survey
 #: view:survey.browse.answer:0
 #: view:survey.name.wiz:0
 msgid "Start"
-msgstr ""
+msgstr "Başla"
 
 #. module: survey
 #: code:addons/survey/survey.py:472
 #, python-format
 msgid "Maximum Required Answer is greater than Minimum Required Answer"
-msgstr ""
+msgstr "Maksimum gerekli cevap sayısı minimumdan daha fazla"
 
 #. module: survey
 #: field:survey.question,comment_maximum_no:0
 #: field:survey.question,validation_maximum_no:0
 msgid "Maximum number"
-msgstr ""
+msgstr "Maksimum Numara"
 
 #. module: survey
 #: selection:survey.request,state:0
 #: selection:survey.response.line,state:0
 msgid "Draft"
-msgstr ""
+msgstr "Taslak"
 
 #. module: survey
 #: model:ir.model,name:survey.model_survey_print_statistics
@@ -962,12 +966,12 @@ msgstr ""
 #. module: survey
 #: selection:survey,state:0
 msgid "Closed"
-msgstr ""
+msgstr "Kapatıldı"
 
 #. module: survey
 #: selection:survey.question,type:0
 msgid "Matrix of Drop-down Menus"
-msgstr ""
+msgstr "Açılır Menü Matrisi"
 
 #. module: survey
 #: view:survey:0
@@ -989,133 +993,133 @@ msgstr ""
 #: field:survey.send.invitation,partner_ids:0
 #: field:survey.tbl.column.heading,response_table_id:0
 msgid "Answer"
-msgstr ""
+msgstr "Cevap"
 
 #. module: survey
 #: field:survey,max_response_limit:0
 msgid "Maximum Answer Limit"
-msgstr ""
+msgstr "Maksimum Cevap Limiti"
 
 #. module: survey
 #: model:ir.actions.act_window,name:survey.action_act_view_survey_send_invitation
 msgid "Send Invitations"
-msgstr ""
+msgstr "Davetiyeleri Gönder"
 
 #. module: survey
 #: field:survey.name.wiz,store_ans:0
 msgid "Store Answer"
-msgstr ""
+msgstr "Cevapları Sakla"
 
 #. module: survey
 #: selection:survey.question,type:0
 msgid "Date and Time"
-msgstr ""
+msgstr "Tarih ve Zaman"
 
 #. module: survey
 #: field:survey,state:0
 #: field:survey.response,state:0
 #: field:survey.response.line,state:0
 msgid "Status"
-msgstr ""
+msgstr "Durum"
 
 #. module: survey
 #: model:ir.actions.act_window,name:survey.action_view_survey_print
 msgid "Print Survey"
-msgstr ""
+msgstr "Anketi Yazdır"
 
 #. module: survey
 #: field:survey,send_response:0
 msgid "E-mail Notification on Answer"
-msgstr ""
+msgstr "Cevaplandığında Email ile Uyar"
 
 #. module: survey
 #: field:survey.response.answer,value_choice:0
 msgid "Value Choice"
-msgstr ""
+msgstr "Seçenek Ederi (Değeri)"
 
 #. module: survey
 #: view:survey:0
 msgid "Started"
-msgstr ""
+msgstr "Başlanmış"
 
 #. module: survey
 #: model:ir.actions.act_window,name:survey.action_view_survey_print_answer
 #: view:survey:0
 #: view:survey.print.answer:0
 msgid "Print Answer"
-msgstr ""
+msgstr "Cevap Yazdır"
 
 #. module: survey
 #: selection:survey.question,type:0
 msgid "Multiple Textboxes"
-msgstr ""
+msgstr "Birden fazla metin kutucuğu"
 
 #. module: survey
 #: selection:survey.print,orientation:0
 #: selection:survey.print.answer,orientation:0
 msgid "Landscape(Horizontal)"
-msgstr ""
+msgstr "Yatay"
 
 #. module: survey
 #: field:survey.question,no_of_rows:0
 msgid "No of Rows"
-msgstr ""
+msgstr "Satır Sayısı"
 
 #. module: survey
 #: view:survey:0
 #: view:survey.name.wiz:0
 msgid "Survey Details"
-msgstr ""
+msgstr "Anket Hakkında"
 
 #. module: survey
 #: selection:survey.question,type:0
 msgid "Multiple Textboxes With Different Type"
-msgstr ""
+msgstr "Birden fazla değişik tipte metin kutucuğu"
 
 #. module: survey
 #: view:survey.question.column.heading:0
 msgid "Menu Choices (each choice on separate lines)"
-msgstr ""
+msgstr "Menü Seçenekleri (Her seçenek farklı satırda)"
 
 #. module: survey
 #: field:survey.response,response_type:0
 msgid "Answer Type"
-msgstr ""
+msgstr "Cevap Türü"
 
 #. module: survey
 #: view:survey:0
 #: view:survey.page:0
 #: view:survey.question:0
 msgid "Validation"
-msgstr ""
+msgstr "Validation"
 
 #. module: survey
 #: view:survey.request:0
 #: selection:survey.request,state:0
 msgid "Waiting Answer"
-msgstr ""
+msgstr "Cevap Bekliyor"
 
 #. module: survey
 #: selection:survey.question,comment_valid_type:0
 #: selection:survey.question,validation_type:0
 msgid "Must Be A Decimal Number"
-msgstr ""
+msgstr "Ondalık Sayı Olmalı"
 
 #. module: survey
 #: field:res.users,survey_id:0
 msgid "Groups"
-msgstr ""
+msgstr "Gruplar"
 
 #. module: survey
 #: selection:survey.answer,type:0
 #: selection:survey.question,type:0
 msgid "Date"
-msgstr ""
+msgstr "Tarih"
 
 #. module: survey
 #: view:survey:0
 msgid "All New Survey"
-msgstr ""
+msgstr "Tüm Yeni Anketler"
 
 #. module: survey
 #: model:ir.model,name:survey.model_survey_send_invitation
@@ -1128,12 +1132,12 @@ msgstr ""
 #: field:survey.request,user_id:0
 #: field:survey.response,user_id:0
 msgid "User"
-msgstr ""
+msgstr "Kullanıcı"
 
 #. module: survey
 #: field:survey.name.wiz,transfer:0
 msgid "Page Transfer"
-msgstr ""
+msgstr "Sayfa Transferi"
 
 #. module: survey
 #: selection:survey.response.line,state:0
@@ -1144,24 +1148,24 @@ msgstr ""
 #: field:survey.print,paper_size:0
 #: field:survey.print.answer,paper_size:0
 msgid "Paper Size"
-msgstr ""
+msgstr "Kağıt Boyutu"
 
 #. module: survey
 #: field:survey.response.answer,column_id:0
 #: field:survey.tbl.column.heading,column_id:0
 msgid "Column"
-msgstr ""
+msgstr "Sütun"
 
 #. module: survey
 #: model:ir.model,name:survey.model_survey_response_line
 msgid "Survey Response Line"
-msgstr ""
+msgstr "Anket Cevap Hattı"
 
 #. module: survey
 #: code:addons/survey/wizard/survey_selection.py:80
 #, python-format
 msgid "You can not give response for this survey more than %s times"
-msgstr ""
+msgstr "Bu ankete %s kereden fazla cevap veremezsiniz"
 
 #. module: survey
 #: model:ir.actions.report.xml,name:survey.report_survey_form
@@ -1182,22 +1186,22 @@ msgstr ""
 #: field:survey.request,survey_id:0
 #: field:survey.response,survey_id:0
 msgid "Survey"
-msgstr ""
+msgstr "Anket"
 
 #. module: survey
 #: field:survey.question,in_visible_rating_weight:0
 msgid "Is Rating Scale Invisible?"
-msgstr ""
+msgstr "Ölçüm skalası (rating scale) görünmez mi?"
 
 #. module: survey
 #: selection:survey.answer,type:0
 msgid "Integer"
-msgstr ""
+msgstr "Tamsayı"
 
 #. module: survey
 #: selection:survey.question,type:0
 msgid "Numerical Textboxes"
-msgstr ""
+msgstr "Nümerik Kutucuk"
 
 #. module: survey
 #: model:ir.model,name:survey.model_survey_question_wiz
@@ -1207,28 +1211,28 @@ msgstr ""
 #. module: survey
 #: view:survey:0
 msgid "History"
-msgstr ""
+msgstr "Geçmiş Bilgisi"
 
 #. module: survey
 #: view:survey.request:0
 msgid "Late"
-msgstr ""
+msgstr "Geçmiş Anketler"
 
 #. module: survey
 #: field:survey.type,code:0
 msgid "Code"
-msgstr ""
+msgstr "Kod"
 
 #. module: survey
 #: model:ir.ui.menu,name:survey.menu_print_survey_statistics
 msgid "Surveys Statistics"
-msgstr ""
+msgstr "Anket İstatistiği"
 
 #. module: survey
 #: field:survey.print,orientation:0
 #: field:survey.print.answer,orientation:0
 msgid "Orientation"
-msgstr ""
+msgstr "Sayfa yönü"
 
 #. module: survey
 #: view:survey:0
@@ -1236,55 +1240,55 @@ msgstr ""
 #: view:survey.page:0
 #: view:survey.question:0
 msgid "Seq"
-msgstr ""
+msgstr "Sıra"
 
 #. module: survey
 #: field:survey.request,email:0
 msgid "E-mail"
-msgstr ""
+msgstr "E-mail"
 
 #. module: survey
 #: field:survey.question,comment_minimum_no:0
 #: field:survey.question,validation_minimum_no:0
 msgid "Minimum number"
-msgstr ""
+msgstr "Minimum Sayı"
 
 #. module: survey
 #: field:survey.question,req_ans:0
 msgid "#Required Answer"
-msgstr ""
+msgstr "#Boş geçemezsiniz"
 
 #. module: survey
 #: field:survey.answer,sequence:0
 #: field:survey.question,sequence:0
 msgid "Sequence"
-msgstr ""
+msgstr "Sıra"
 
 #. module: survey
 #: field:survey.question,comment_label:0
 msgid "Field Label"
-msgstr ""
+msgstr "Alan İsmi"
 
 #. module: survey
 #: view:survey:0
 msgid "Other"
-msgstr ""
+msgstr "Diğeri"
 
 #. module: survey
 #: view:survey.request:0
 #: selection:survey.request,state:0
 msgid "Done"
-msgstr ""
+msgstr "Tamamlandı"
 
 #. module: survey
 #: view:survey:0
 msgid "Test Survey"
-msgstr ""
+msgstr "Test Anketi"
 
 #. module: survey
 #: field:survey.question,rating_allow_one_column_require:0
 msgid "Allow Only One Answer per Column (Forced Ranking)"
-msgstr ""
+msgstr "Sütun Başına Sadece Bir Cevaba İzin ver"
 
 #. module: survey
 #: view:survey:0
@@ -1294,29 +1298,29 @@ msgstr ""
 #: view:survey.print.answer:0
 #: view:survey.print.statistics:0
 msgid "Cancel"
-msgstr ""
+msgstr "İptal"
 
 #. module: survey
 #: view:survey:0
 msgid "Close"
-msgstr ""
+msgstr "Kapat"
 
 #. module: survey
 #: field:survey.question,comment_minimum_float:0
 #: field:survey.question,validation_minimum_float:0
 msgid "Minimum decimal number"
-msgstr ""
+msgstr "Minimum Ondalık Sayı"
 
 #. module: survey
 #: view:survey:0
 #: selection:survey,state:0
 msgid "Open"
-msgstr ""
+msgstr "Açık"
 
 #. module: survey
 #: field:survey,tot_start_survey:0
 msgid "Total Started Survey"
-msgstr ""
+msgstr "Toplam Başlatılmış Anket"
 
 #. module: survey
 #: code:addons/survey/survey.py:462
@@ -1324,7 +1328,7 @@ msgstr ""
 msgid ""
 "#Required Answer you entered is greater than the number of answer. Please "
 "use a number that is smaller than %d."
-msgstr ""
+msgstr "#Lütfen %d sayısından daha küçük sayı giriniz."
 
 #. module: survey
 #: help:survey,max_response_limit:0
@@ -1334,7 +1338,7 @@ msgstr ""
 #. module: survey
 #: selection:survey.response,state:0
 msgid "Finished "
-msgstr ""
+msgstr "Bitti "
 
 #. module: survey
 #: model:ir.model,name:survey.model_survey_question_column_heading
@@ -1344,81 +1348,81 @@ msgstr ""
 #. module: survey
 #: field:survey.answer,average:0
 msgid "#Avg"
-msgstr ""
+msgstr "#Ort"
 
 #. module: survey
 #: selection:survey.question,type:0
 msgid "Matrix of Choices (Multiple Answers Per Row)"
-msgstr ""
+msgstr "Seçenekler Matrisi (Satır başına birden çok cevap)"
 
 #. module: survey
 #: model:ir.actions.act_window,name:survey.action_view_survey_name
 msgid "Give Survey Answer"
-msgstr ""
+msgstr "Anket Cevapla"
 
 #. module: survey
 #: model:ir.model,name:survey.model_res_users
 msgid "res.users"
-msgstr ""
+msgstr "res.users"
 
 #. module: survey
 #: help:survey.browse.answer,response_id:0
 msgid ""
 "If this field is empty, all answers of the selected survey will be print."
-msgstr ""
+msgstr "Eğer bu alan boş ise, seçili anketin tüm cevapları yazdırılır."
 
 #. module: survey
 #: selection:survey.response.line,state:0
 msgid "Answered"
-msgstr ""
+msgstr "Cevaplanmış"
 
 #. module: survey
 #: code:addons/survey/wizard/survey_answer.py:425
 #, python-format
 msgid "Complete Survey Answer"
-msgstr ""
+msgstr "Anketi Yanıtlar"
 
 #. module: survey
 #: selection:survey.question,type:0
 msgid "Comment/Essay Box"
-msgstr ""
+msgstr "Yorum Kutusu"
 
 #. module: survey
 #: field:survey.answer,type:0
 msgid "Type of Answer"
-msgstr ""
+msgstr "Cevap Türü"
 
 #. module: survey
 #: field:survey.question,required_type:0
 msgid "Respondent must answer"
-msgstr ""
+msgstr "Mutlaka cevaplanmalı"
 
 #. module: survey
 #: model:ir.actions.act_window,name:survey.action_view_survey_send_invitation
 #: view:survey.send.invitation:0
 msgid "Send Invitation"
-msgstr ""
+msgstr "Davetiye Gönder"
 
 #. module: survey
 #: code:addons/survey/wizard/survey_answer.py:779
 #, python-format
 msgid "You cannot select the same answer more than one time"
-msgstr ""
+msgstr "Aynı cevabı birden fazla kez seçemezsiniz"
 
 #. module: survey
 #: view:survey.question:0
 msgid "Search Question"
-msgstr ""
+msgstr "Cevaplarda Ara"
 
 #. module: survey
 #: field:survey,title:0
 msgid "Survey Title"
-msgstr ""
+msgstr "Anket Başlığı"
 
 #. module: survey
 #: selection:survey.question,type:0
 msgid "Single Textbox"
-msgstr ""
+msgstr "Tek Metin Kutusu"
 
 #. module: survey
 #: view:survey:0
@@ -1428,49 +1432,49 @@ msgstr ""
 #: field:survey.page,note:0
 #: view:survey.response.line:0
 msgid "Description"
-msgstr ""
+msgstr "Tanım"
 
 #. module: survey
 #: view:survey.name.wiz:0
 msgid "Select Survey"
-msgstr ""
+msgstr "Anket Seç"
 
 #. module: survey
 #: selection:survey.question,required_type:0
 msgid "At Least"
-msgstr ""
+msgstr "En Az"
 
 #. module: survey
 #: model:ir.actions.act_window,name:survey.action_view_survey_send_invitation_log
 #: model:ir.model,name:survey.model_survey_send_invitation_log
 msgid "survey.send.invitation.log"
-msgstr ""
+msgstr "survey.send.invitation.log"
 
 #. module: survey
 #: selection:survey.print,orientation:0
 #: selection:survey.print.answer,orientation:0
 msgid "Portrait(Vertical)"
-msgstr ""
+msgstr "Dikey"
 
 #. module: survey
 #: selection:survey.question,comment_valid_type:0
 #: selection:survey.question,validation_type:0
 msgid "Must Be Specific Length"
-msgstr ""
+msgstr "Belirtilen Uzunlukta Olmalı"
 
 #. module: survey
 #: view:survey:0
 #: view:survey.page:0
 #: field:survey.question,page_id:0
 msgid "Survey Page"
-msgstr ""
+msgstr "Anket Sayfası"
 
 #. module: survey
 #: view:survey:0
 #: view:survey.page:0
 #: view:survey.question:0
 msgid "Required Answer"
-msgstr ""
+msgstr "Boş geçemezsiniz"
 
 #. module: survey
 #: code:addons/survey/survey.py:468
@@ -1479,23 +1483,25 @@ msgid ""
 "Minimum Required Answer you entered is greater than the number of answer. "
 "Please use a number that is smaller than %d."
 msgstr ""
+"Girdiğiniz minimum cevap sayısı verdiğiniz cevaplardan fazladır. Lütfen %d "
+"sayısından küçük bir sayı giriniz"
 
 #. module: survey
 #: code:addons/survey/survey.py:453
 #, python-format
 msgid "You must enter one or more answer."
-msgstr ""
+msgstr "Bir veya daha fazla cevap girmelisiniz"
 
 #. module: survey
 #: view:survey:0
 msgid "All Open Survey"
-msgstr ""
+msgstr "Tüm Açık Anketler"
 
 #. module: survey
 #: model:ir.actions.report.xml,name:survey.survey_browse_response
 #: field:survey.browse.answer,response_id:0
 msgid "Survey Answers"
-msgstr ""
+msgstr "Anket Cevaplarında"
 
 #. module: survey
 #: view:survey.browse.answer:0
@@ -1505,12 +1511,12 @@ msgstr ""
 #. module: survey
 #: model:ir.ui.menu,name:survey.menu_print_survey_answer
 msgid "Surveys Answers"
-msgstr ""
+msgstr "Anketlerin Cevapları"
 
 #. module: survey
 #: model:ir.actions.act_window,name:survey.act_survey_pages
 msgid "Pages"
-msgstr ""
+msgstr "Sayfalar"
 
 #. module: survey
 #: code:addons/survey/survey.py:401
@@ -1520,33 +1526,35 @@ msgid ""
 "than the number of answer.                                    Please use a "
 "number that is smaller than %d."
 msgstr ""
+"Girdiğiniz cevap sayısı verdiğiniz cevaplardan fazladır. Lütfen %d "
+"sayısından küçük bir sayı giriniz"
 
 #. module: survey
 #: code:addons/survey/wizard/survey_answer.py:971
 #, python-format
 msgid "You cannot select same answer more than one time'"
-msgstr ""
+msgstr "Aynı cevabı birden fazla kez seçemezsiniz"
 
 #. module: survey
 #: selection:survey.print,paper_size:0
 #: selection:survey.print.answer,paper_size:0
 msgid "Legal (8.5\" x 14\")"
-msgstr ""
+msgstr "Legal (8.5\" x 14\")"
 
 #. module: survey
 #: field:survey.type,name:0
 msgid "Name"
-msgstr ""
+msgstr "Adı"
 
 #. module: survey
 #: view:survey.page:0
 msgid "#Questions"
-msgstr ""
+msgstr "#Sorular"
 
 #. module: survey
 #: model:ir.model,name:survey.model_survey_response
 msgid "survey.response"
-msgstr ""
+msgstr "survey.response"
 
 #. module: survey
 #: field:survey.question,comment_valid_err_msg:0
@@ -1554,7 +1562,7 @@ msgstr ""
 #: field:survey.question,numeric_required_sum_err_msg:0
 #: field:survey.question,validation_valid_err_msg:0
 msgid "Error message"
-msgstr ""
+msgstr "Hata mesajı"
 
 #. module: survey
 #: view:survey.send.invitation:0
@@ -1566,7 +1574,7 @@ msgstr ""
 #: code:addons/survey/survey.py:382
 #, python-format
 msgid "You must enter one or more Answer."
-msgstr ""
+msgstr "En az bir veya daha fazla cevap girmelisiniz"
 
 #. module: survey
 #: code:addons/survey/survey.py:411
@@ -1580,12 +1588,12 @@ msgstr ""
 #. module: survey
 #: field:survey.answer,menu_choice:0
 msgid "Menu Choices"
-msgstr ""
+msgstr "Menü Seçenekleri"
 
 #. module: survey
 #: field:survey,id:0
 msgid "ID"
-msgstr ""
+msgstr "ID"
 
 #. module: survey
 #: code:addons/survey/survey.py:433
@@ -1593,43 +1601,43 @@ msgstr ""
 msgid ""
 "Maximum Required Answer is greater                                     than "
 "Minimum Required Answer"
-msgstr ""
+msgstr "Maksimum gerekli cevap sayısı minimum gerekliden daha fazla."
 
 #. module: survey
 #: view:survey.send.invitation.log:0
 msgid "User creation"
-msgstr ""
+msgstr "Kullanıcı Tarafından Yaratılmış"
 
 #. module: survey
 #: selection:survey.question,required_type:0
 msgid "All"
-msgstr ""
+msgstr "Hepsi"
 
 #. module: survey
 #: selection:survey.question,comment_valid_type:0
 #: selection:survey.question,validation_type:0
 msgid "Must Be An Email Address"
-msgstr ""
+msgstr "Email Adresi olmalı."
 
 #. module: survey
 #: selection:survey.question,type:0
 msgid "Multiple Choice (Only One Answer)"
-msgstr ""
+msgstr "Çoktan Seçmeli (Sadece Bir Cevap)"
 
 #. module: survey
 #: field:survey.answer,in_visible_answer_type:0
 msgid "Is Answer Type Invisible??"
-msgstr ""
+msgstr "Cevap Tipi Görünmez mi?"
 
 #. module: survey
 #: model:ir.model,name:survey.model_survey_print_answer
 msgid "survey.print.answer"
-msgstr ""
+msgstr "Anketi Yazdır"
 
 #. module: survey
 #: view:survey.answer:0
 msgid "Menu Choices (each choice on separate by lines)"
-msgstr ""
+msgstr "Menü Seçenekleri (Her seçenek satır ile ayrı)"
 
 #. module: survey
 #: selection:survey.answer,type:0
@@ -1639,34 +1647,34 @@ msgstr ""
 #. module: survey
 #: view:survey.response.line:0
 msgid "Single Textboxes"
-msgstr ""
+msgstr "Tek metin Kutucuğu"
 
 #. module: survey
 #: code:addons/survey/wizard/survey_send_invitation.py:74
 #, python-format
 msgid "%sSurvey is not in open state"
-msgstr ""
+msgstr "%s anket aktif durumda değil."
 
 #. module: survey
 #: field:survey.question.column.heading,rating_weight:0
 msgid "Weight"
-msgstr ""
+msgstr "Etki"
 
 #. module: survey
 #: selection:survey.answer,type:0
 msgid "Date & Time"
-msgstr ""
+msgstr "Tarih ve Zaman"
 
 #. module: survey
 #: field:survey.response,date_create:0
 #: field:survey.response.line,date_create:0
 msgid "Create Date"
-msgstr ""
+msgstr "Oluşturulma Tarihi"
 
 #. module: survey
 #: field:survey.question,column_name:0
 msgid "Column Name"
-msgstr ""
+msgstr "Sütun Adı"
 
 #. module: survey
 #: model:ir.actions.act_window,name:survey.action_survey_page_form
@@ -1674,37 +1682,46 @@ msgstr ""
 #: model:ir.ui.menu,name:survey.menu_survey_page_form1
 #: view:survey.page:0
 msgid "Survey Pages"
-msgstr ""
+msgstr "Anket Sayfaları"
 
 #. module: survey
 #: field:survey.question,numeric_required_sum:0
 msgid "Sum of all choices"
-msgstr ""
+msgstr "Bütün tercihlerin toplamı"
 
 #. module: survey
 #: selection:survey.question,type:0
 #: view:survey.response.line:0
 msgid "Table"
-msgstr ""
+msgstr "Tablo"
 
 #. module: survey
 #: code:addons/survey/survey.py:630
 #, python-format
 msgid "You cannot duplicate the resource!"
-msgstr ""
+msgstr "Kaynağın bir eşini kopyalayamazsınız(duplicate)"
 
 #. module: survey
 #: field:survey.question,comment_minimum_date:0
 #: field:survey.question,validation_minimum_date:0
 msgid "Minimum date"
-msgstr ""
+msgstr "Minimum Tarih"
 
 #. module: survey
 #: field:survey,response_user:0
 msgid "Maximum Answer per User"
-msgstr ""
+msgstr "Kullanıcı başına maksimum cevap sayısı"
 
 #. module: survey
 #: field:survey.name.wiz,page:0
 msgid "Page Position"
-msgstr ""
+msgstr "Sayfa Pozisyonu"
+
+#~ msgid "Send reminder for existing user"
+#~ msgstr "Mevcut Kullanıcılara Uyarıcı Gönder"
+
+#~ msgid "Select Survey and related answer"
+#~ msgstr "Anketi ve ilgili cevapları seç"
+
+#~ msgid "Send mail for new user"
+#~ msgstr "Yeni Kullanıcıya Email GÖnder"
diff --git a/addons/survey/i18n/zh_CN.po b/addons/survey/i18n/zh_CN.po
index 618ef6fd827..30ac67fe4b5 100644
--- a/addons/survey/i18n/zh_CN.po
+++ b/addons/survey/i18n/zh_CN.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:26+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:31+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: survey
 #: view:survey.print:0
diff --git a/addons/survey/survey_view.xml b/addons/survey/survey_view.xml
index b8c6f97e45b..8b49b89df65 100644
--- a/addons/survey/survey_view.xml
+++ b/addons/survey/survey_view.xml
@@ -302,8 +302,8 @@
                                 <div class="oe_dropdown_toggle oe_dropdown_kanban">
                                     <span class="oe_e">i</span>
                                     <ul class="oe_dropdown_menu">
-                                        <li><a type="edit">Edit...</a></li>
-                                        <li><a type="delete">Delete</a></li>
+                                        <t t-if="widget.view.is_action_enabled('edit')"><li><a type="edit">Edit...</a></li></t>
+                                        <t t-if="widget.view.is_action_enabled('delete')"><li><a type="delete">Delete</a></li></t>
                                         <li><ul class="oe_kanban_colorpicker" data-field="color"/></li>
                                     </ul>
                                 </div>
diff --git a/addons/survey/wizard/survey_answer.py b/addons/survey/wizard/survey_answer.py
index 66098b45fa8..e2216ea8389 100644
--- a/addons/survey/wizard/survey_answer.py
+++ b/addons/survey/wizard/survey_answer.py
@@ -420,7 +420,17 @@ class survey_question_wiz(osv.osv_memory):
                         if user_email and resp_email:
                             user_name = user_obj.browse(cr, uid, uid, context=context).name
                             mail = "Hello " + survey_data.responsible_id.name + ",\n\n " + str(user_name) + " has given the Response Of " + survey_data.title + " Survey.\nThe Response has been attached herewith.\n\n Thanks."
-                            mail_message.schedule_with_attach(cr, uid, user_email, [resp_email], "Survey Answer Of " + str(user_name) , mail, attachments=attachments, context=context)
+                            vals = {'state': 'outgoing',
+                                    'subject': "Survey Answer Of " + user_name,
+                                    'body_html': '<pre>%s</pre>' % mail,
+                                    'email_to': [resp_email],
+                                    'email_from': user_email}
+                            if attachments:
+                                vals['attachment_ids'] = [(0,0,{'name': a_name,
+                                                                'datas_fname': a_name,
+                                                                'datas': str(a_content).encode('base64')})
+                                                                for a_name, a_content in attachments]
+                            self.pool.get('mail.mail').create(cr, uid, vals, context=context)
 
                     xml_form = etree.Element('form', {'string': _('Complete Survey Answer')})
                     etree.SubElement(xml_form, 'separator', {'string': 'Complete Survey', 'colspan': "4"})
diff --git a/addons/survey/wizard/survey_send_invitation.py b/addons/survey/wizard/survey_send_invitation.py
index da439959ec5..5677a985e09 100644
--- a/addons/survey/wizard/survey_send_invitation.py
+++ b/addons/survey/wizard/survey_send_invitation.py
@@ -116,7 +116,6 @@ class survey_send_invitation(osv.osv_memory):
         existing = ""
         created = ""
         error = ""
-        user_exists = False
         new_user = []
         attachments = {}
         current_sur = survey_ref.browse(cr, uid, context.get('active_id'), context=context)
@@ -150,8 +149,14 @@ class survey_send_invitation(osv.osv_memory):
                 mail = record['mail']%{'login':partner.email, 'passwd':user.password, \
                                             'name' : partner.name}
                 if record['send_mail_existing']:
-                    mail_message.schedule_with_attach(cr, uid, record['mail_from'], [partner.email] , \
-                                     record['mail_subject_existing'] , mail, context=context)
+                    vals = {
+                        'state': 'outgoing',
+                        'subject': record['mail_subject_existing'],
+                        'body_html': '<pre>%s</pre>' % mail,
+                        'email_to': partner.email,
+                        'email_from': record['mail_from'],
+                    }
+                    self.pool.get('mail.mail').create(cr, uid, vals, context=context)
                     existing+= "- %s (Login: %s,  Password: %s)\n" % (user.name, partner.email, \
                                                                       user.password)
                 continue
@@ -160,8 +165,19 @@ class survey_send_invitation(osv.osv_memory):
             out+= partner.email + ',' + passwd + '\n'
             mail= record['mail'] % {'login' : partner.email, 'passwd' : passwd, 'name' : partner.name}
             if record['send_mail']:
-                ans = mail_message.schedule_with_attach(cr, uid, record['mail_from'], [partner.email], \
-                                       record['mail_subject'], mail, attachments=attachments, context=context)
+                vals = {
+                        'state': 'outgoing',
+                        'subject': record['mail_subject'],
+                        'body_html': '<pre>%s</pre>' % mail,
+                        'email_to': partner.email,
+                        'email_from': record['mail_from'],
+                }
+                if attachments:
+                    vals['attachment_ids'] = [(0,0,{'name': a_name,
+                                                    'datas_fname': a_name,
+                                                    'datas': str(a_content).encode('base64')})
+                                                    for a_name, a_content in attachments]
+                ans = self.pool.get('mail.mail').create(cr, uid, vals, context=context)
                 if ans:
                     res_data = {'name': partner.name or _('Unknown'),
                                 'login': partner.email,
diff --git a/addons/users_ldap/i18n/ar.po b/addons/users_ldap/i18n/ar.po
new file mode 100644
index 00000000000..0cebc0baf00
--- /dev/null
+++ b/addons/users_ldap/i18n/ar.po
@@ -0,0 +1,177 @@
+# 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-02-08 00:37+0000\n"
+"PO-Revision-Date: 2012-01-14 23:45+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: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
+
+#. module: users_ldap
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr "خطأ! لا يمكنك إنشاء شركات متداخلة (شركات تستخدم نفسها)."
+
+#. module: users_ldap
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr ""
+"الشركة المختارة غير مدرجة ضمن قائمة الشركات المسموح بها لهذا المستخدم"
+
+#. module: users_ldap
+#: help:res.company.ldap,ldap_tls:0
+msgid ""
+"Request secure TLS/SSL encryption when connecting to the LDAP server. This "
+"option requires a server with STARTTLS enabled, otherwise all authentication "
+"attempts will fail."
+msgstr ""
+
+#. module: users_ldap
+#: view:res.company:0
+#: view:res.company.ldap:0
+msgid "LDAP Configuration"
+msgstr ""
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_binddn:0
+msgid "LDAP binddn"
+msgstr ""
+
+#. module: users_ldap
+#: help:res.company.ldap,create_user:0
+msgid "Create the user if not in database"
+msgstr ""
+
+#. module: users_ldap
+#: help:res.company.ldap,user:0
+msgid "Model used for user creation"
+msgstr ""
+
+#. module: users_ldap
+#: field:res.company.ldap,company:0
+msgid "Company"
+msgstr "شركة"
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_server:0
+msgid "LDAP Server address"
+msgstr ""
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_server_port:0
+msgid "LDAP Server port"
+msgstr ""
+
+#. module: users_ldap
+#: help:res.company.ldap,ldap_binddn:0
+msgid ""
+"The user account on the LDAP server that is used to query the directory. "
+"Leave empty to connect anonymously."
+msgstr ""
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_base:0
+msgid "LDAP base"
+msgstr ""
+
+#. module: users_ldap
+#: view:res.company.ldap:0
+msgid "User Information"
+msgstr "معلومات المستخدم"
+
+#. module: users_ldap
+#: sql_constraint:res.company:0
+msgid "The company name must be unique !"
+msgstr "اسم الشركة يجب أن يكون فريداً !"
+
+#. module: users_ldap
+#: model:ir.model,name:users_ldap.model_res_company
+msgid "Companies"
+msgstr "الشركات"
+
+#. module: users_ldap
+#: view:res.company.ldap:0
+msgid "Process Parameter"
+msgstr "متغير العملية"
+
+#. module: users_ldap
+#: model:ir.model,name:users_ldap.model_res_company_ldap
+msgid "res.company.ldap"
+msgstr ""
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_tls:0
+msgid "Use TLS"
+msgstr "استخدم TLS"
+
+#. module: users_ldap
+#: field:res.company.ldap,sequence:0
+msgid "Sequence"
+msgstr "مسلسل"
+
+#. module: users_ldap
+#: view:res.company.ldap:0
+msgid "Login Information"
+msgstr "معلومات تسجيل الدخول"
+
+#. module: users_ldap
+#: view:res.company.ldap:0
+msgid "Server Information"
+msgstr "معلومات الخادم"
+
+#. module: users_ldap
+#: model:ir.actions.act_window,name:users_ldap.action_ldap_installer
+msgid "Setup your LDAP Server"
+msgstr ""
+
+#. module: users_ldap
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr "لا يمكن ان يكون هناك مستخدمان بنفس اسم الدخول!"
+
+#. module: users_ldap
+#: field:res.company,ldaps:0
+msgid "LDAP Parameters"
+msgstr ""
+
+#. module: users_ldap
+#: help:res.company.ldap,ldap_password:0
+msgid ""
+"The password of the user account on the LDAP server that is used to query "
+"the directory."
+msgstr ""
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_password:0
+msgid "LDAP password"
+msgstr ""
+
+#. module: users_ldap
+#: field:res.company.ldap,user:0
+msgid "Model User"
+msgstr ""
+
+#. module: users_ldap
+#: model:ir.model,name:users_ldap.model_res_users
+msgid "res.users"
+msgstr "res.users"
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_filter:0
+msgid "LDAP filter"
+msgstr ""
+
+#. module: users_ldap
+#: field:res.company.ldap,create_user:0
+msgid "Create user"
+msgstr "إنشاء مستخدم"
diff --git a/addons/users_ldap/i18n/bg.po b/addons/users_ldap/i18n/bg.po
new file mode 100644
index 00000000000..c2381897935
--- /dev/null
+++ b/addons/users_ldap/i18n/bg.po
@@ -0,0 +1,176 @@
+# Bulgarian translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:37+0000\n"
+"PO-Revision-Date: 2011-03-28 20:23+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: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
+
+#. module: users_ldap
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr "Грешка! НЕ може да създавате рекурсивни фирми"
+
+#. module: users_ldap
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr "Избраната фирма не е измежду разрешените фирми за този потребител"
+
+#. module: users_ldap
+#: help:res.company.ldap,ldap_tls:0
+msgid ""
+"Request secure TLS/SSL encryption when connecting to the LDAP server. This "
+"option requires a server with STARTTLS enabled, otherwise all authentication "
+"attempts will fail."
+msgstr ""
+
+#. module: users_ldap
+#: view:res.company:0
+#: view:res.company.ldap:0
+msgid "LDAP Configuration"
+msgstr "LDAP Настройки"
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_binddn:0
+msgid "LDAP binddn"
+msgstr ""
+
+#. module: users_ldap
+#: help:res.company.ldap,create_user:0
+msgid "Create the user if not in database"
+msgstr ""
+
+#. module: users_ldap
+#: help:res.company.ldap,user:0
+msgid "Model used for user creation"
+msgstr ""
+
+#. module: users_ldap
+#: field:res.company.ldap,company:0
+msgid "Company"
+msgstr "Фирма"
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_server:0
+msgid "LDAP Server address"
+msgstr ""
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_server_port:0
+msgid "LDAP Server port"
+msgstr ""
+
+#. module: users_ldap
+#: help:res.company.ldap,ldap_binddn:0
+msgid ""
+"The user account on the LDAP server that is used to query the directory. "
+"Leave empty to connect anonymously."
+msgstr ""
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_base:0
+msgid "LDAP base"
+msgstr ""
+
+#. module: users_ldap
+#: view:res.company.ldap:0
+msgid "User Information"
+msgstr ""
+
+#. module: users_ldap
+#: sql_constraint:res.company:0
+msgid "The company name must be unique !"
+msgstr ""
+
+#. module: users_ldap
+#: model:ir.model,name:users_ldap.model_res_company
+msgid "Companies"
+msgstr "Фирми"
+
+#. module: users_ldap
+#: view:res.company.ldap:0
+msgid "Process Parameter"
+msgstr ""
+
+#. module: users_ldap
+#: model:ir.model,name:users_ldap.model_res_company_ldap
+msgid "res.company.ldap"
+msgstr ""
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_tls:0
+msgid "Use TLS"
+msgstr ""
+
+#. module: users_ldap
+#: field:res.company.ldap,sequence:0
+msgid "Sequence"
+msgstr "Последователност"
+
+#. module: users_ldap
+#: view:res.company.ldap:0
+msgid "Login Information"
+msgstr ""
+
+#. module: users_ldap
+#: view:res.company.ldap:0
+msgid "Server Information"
+msgstr ""
+
+#. module: users_ldap
+#: model:ir.actions.act_window,name:users_ldap.action_ldap_installer
+msgid "Setup your LDAP Server"
+msgstr ""
+
+#. module: users_ldap
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr "Не може да има двама потребитела с един и същ \"логин\"!"
+
+#. module: users_ldap
+#: field:res.company,ldaps:0
+msgid "LDAP Parameters"
+msgstr "LDAP Параметри"
+
+#. module: users_ldap
+#: help:res.company.ldap,ldap_password:0
+msgid ""
+"The password of the user account on the LDAP server that is used to query "
+"the directory."
+msgstr ""
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_password:0
+msgid "LDAP password"
+msgstr ""
+
+#. module: users_ldap
+#: field:res.company.ldap,user:0
+msgid "Model User"
+msgstr ""
+
+#. module: users_ldap
+#: model:ir.model,name:users_ldap.model_res_users
+msgid "res.users"
+msgstr ""
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_filter:0
+msgid "LDAP filter"
+msgstr ""
+
+#. module: users_ldap
+#: field:res.company.ldap,create_user:0
+msgid "Create user"
+msgstr "Създаване на потребител"
diff --git a/addons/users_ldap/i18n/ca.po b/addons/users_ldap/i18n/ca.po
new file mode 100644
index 00000000000..d40302c8a15
--- /dev/null
+++ b/addons/users_ldap/i18n/ca.po
@@ -0,0 +1,181 @@
+# Catalan translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:37+0000\n"
+"PO-Revision-Date: 2011-03-05 23:46+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Catalan <ca@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
+
+#. module: users_ldap
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr "Error! No podeu crear companyies recursives."
+
+#. module: users_ldap
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr ""
+"La companyia seleccionada no està en les companyies permeses per a aquest "
+"usuari"
+
+#. module: users_ldap
+#: help:res.company.ldap,ldap_tls:0
+msgid ""
+"Request secure TLS/SSL encryption when connecting to the LDAP server. This "
+"option requires a server with STARTTLS enabled, otherwise all authentication "
+"attempts will fail."
+msgstr ""
+
+#. module: users_ldap
+#: view:res.company:0
+#: view:res.company.ldap:0
+msgid "LDAP Configuration"
+msgstr "Configuració LDAP"
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_binddn:0
+msgid "LDAP binddn"
+msgstr "binddn LDAP"
+
+#. module: users_ldap
+#: help:res.company.ldap,create_user:0
+msgid "Create the user if not in database"
+msgstr "Crea l'usuari si no està en la base de dades."
+
+#. module: users_ldap
+#: help:res.company.ldap,user:0
+msgid "Model used for user creation"
+msgstr "Model utilitzat per a la creació d'usuaris."
+
+#. module: users_ldap
+#: field:res.company.ldap,company:0
+msgid "Company"
+msgstr "Companyia"
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_server:0
+msgid "LDAP Server address"
+msgstr "Adreça del servidor LDAP"
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_server_port:0
+msgid "LDAP Server port"
+msgstr "Port del servidor LDAP"
+
+#. module: users_ldap
+#: help:res.company.ldap,ldap_binddn:0
+msgid ""
+"The user account on the LDAP server that is used to query the directory. "
+"Leave empty to connect anonymously."
+msgstr ""
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_base:0
+msgid "LDAP base"
+msgstr "Base LDAP"
+
+#. module: users_ldap
+#: view:res.company.ldap:0
+msgid "User Information"
+msgstr ""
+
+#. module: users_ldap
+#: sql_constraint:res.company:0
+msgid "The company name must be unique !"
+msgstr ""
+
+#. module: users_ldap
+#: model:ir.model,name:users_ldap.model_res_company
+msgid "Companies"
+msgstr "Companyies"
+
+#. module: users_ldap
+#: view:res.company.ldap:0
+msgid "Process Parameter"
+msgstr ""
+
+#. module: users_ldap
+#: model:ir.model,name:users_ldap.model_res_company_ldap
+msgid "res.company.ldap"
+msgstr "res.empresa.ldap"
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_tls:0
+msgid "Use TLS"
+msgstr ""
+
+#. module: users_ldap
+#: field:res.company.ldap,sequence:0
+msgid "Sequence"
+msgstr "Seqüència"
+
+#. module: users_ldap
+#: view:res.company.ldap:0
+msgid "Login Information"
+msgstr ""
+
+#. module: users_ldap
+#: view:res.company.ldap:0
+msgid "Server Information"
+msgstr ""
+
+#. module: users_ldap
+#: model:ir.actions.act_window,name:users_ldap.action_ldap_installer
+msgid "Setup your LDAP Server"
+msgstr ""
+
+#. module: users_ldap
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr "No podeu tenir dos usuaris amb el mateix identificador d'usuari!"
+
+#. module: users_ldap
+#: field:res.company,ldaps:0
+msgid "LDAP Parameters"
+msgstr "Paràmetres LDAP"
+
+#. module: users_ldap
+#: help:res.company.ldap,ldap_password:0
+msgid ""
+"The password of the user account on the LDAP server that is used to query "
+"the directory."
+msgstr ""
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_password:0
+msgid "LDAP password"
+msgstr "Contrasenya LDAP"
+
+#. module: users_ldap
+#: field:res.company.ldap,user:0
+msgid "Model User"
+msgstr "Model usuari"
+
+#. module: users_ldap
+#: model:ir.model,name:users_ldap.model_res_users
+msgid "res.users"
+msgstr "res.usuaris"
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_filter:0
+msgid "LDAP filter"
+msgstr "Filtre LDAP"
+
+#. module: users_ldap
+#: field:res.company.ldap,create_user:0
+msgid "Create user"
+msgstr "Crea usuari/a"
+
+#~ msgid "Authenticate users with ldap server"
+#~ msgstr "Autentifica els usuaris amb un servidor LDAP"
diff --git a/addons/users_ldap/i18n/da.po b/addons/users_ldap/i18n/da.po
new file mode 100644
index 00000000000..9bb8bfafafa
--- /dev/null
+++ b/addons/users_ldap/i18n/da.po
@@ -0,0 +1,176 @@
+# Danish 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-02-08 00:37+0000\n"
+"PO-Revision-Date: 2012-01-27 06:45+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: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
+
+#. module: users_ldap
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr ""
+
+#. module: users_ldap
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr ""
+
+#. module: users_ldap
+#: help:res.company.ldap,ldap_tls:0
+msgid ""
+"Request secure TLS/SSL encryption when connecting to the LDAP server. This "
+"option requires a server with STARTTLS enabled, otherwise all authentication "
+"attempts will fail."
+msgstr ""
+
+#. module: users_ldap
+#: view:res.company:0
+#: view:res.company.ldap:0
+msgid "LDAP Configuration"
+msgstr ""
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_binddn:0
+msgid "LDAP binddn"
+msgstr ""
+
+#. module: users_ldap
+#: help:res.company.ldap,create_user:0
+msgid "Create the user if not in database"
+msgstr ""
+
+#. module: users_ldap
+#: help:res.company.ldap,user:0
+msgid "Model used for user creation"
+msgstr ""
+
+#. module: users_ldap
+#: field:res.company.ldap,company:0
+msgid "Company"
+msgstr ""
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_server:0
+msgid "LDAP Server address"
+msgstr ""
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_server_port:0
+msgid "LDAP Server port"
+msgstr ""
+
+#. module: users_ldap
+#: help:res.company.ldap,ldap_binddn:0
+msgid ""
+"The user account on the LDAP server that is used to query the directory. "
+"Leave empty to connect anonymously."
+msgstr ""
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_base:0
+msgid "LDAP base"
+msgstr ""
+
+#. module: users_ldap
+#: view:res.company.ldap:0
+msgid "User Information"
+msgstr ""
+
+#. module: users_ldap
+#: sql_constraint:res.company:0
+msgid "The company name must be unique !"
+msgstr ""
+
+#. module: users_ldap
+#: model:ir.model,name:users_ldap.model_res_company
+msgid "Companies"
+msgstr ""
+
+#. module: users_ldap
+#: view:res.company.ldap:0
+msgid "Process Parameter"
+msgstr ""
+
+#. module: users_ldap
+#: model:ir.model,name:users_ldap.model_res_company_ldap
+msgid "res.company.ldap"
+msgstr ""
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_tls:0
+msgid "Use TLS"
+msgstr ""
+
+#. module: users_ldap
+#: field:res.company.ldap,sequence:0
+msgid "Sequence"
+msgstr ""
+
+#. module: users_ldap
+#: view:res.company.ldap:0
+msgid "Login Information"
+msgstr ""
+
+#. module: users_ldap
+#: view:res.company.ldap:0
+msgid "Server Information"
+msgstr ""
+
+#. module: users_ldap
+#: model:ir.actions.act_window,name:users_ldap.action_ldap_installer
+msgid "Setup your LDAP Server"
+msgstr ""
+
+#. module: users_ldap
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr ""
+
+#. module: users_ldap
+#: field:res.company,ldaps:0
+msgid "LDAP Parameters"
+msgstr ""
+
+#. module: users_ldap
+#: help:res.company.ldap,ldap_password:0
+msgid ""
+"The password of the user account on the LDAP server that is used to query "
+"the directory."
+msgstr ""
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_password:0
+msgid "LDAP password"
+msgstr ""
+
+#. module: users_ldap
+#: field:res.company.ldap,user:0
+msgid "Model User"
+msgstr ""
+
+#. module: users_ldap
+#: model:ir.model,name:users_ldap.model_res_users
+msgid "res.users"
+msgstr ""
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_filter:0
+msgid "LDAP filter"
+msgstr ""
+
+#. module: users_ldap
+#: field:res.company.ldap,create_user:0
+msgid "Create user"
+msgstr ""
diff --git a/addons/users_ldap/i18n/de.po b/addons/users_ldap/i18n/de.po
new file mode 100644
index 00000000000..7d7cf590170
--- /dev/null
+++ b/addons/users_ldap/i18n/de.po
@@ -0,0 +1,186 @@
+# German translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:37+0000\n"
+"PO-Revision-Date: 2012-01-14 14:56+0000\n"
+"Last-Translator: Ferdinand @ Camptocamp <Unknown>\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: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
+
+#. module: users_ldap
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr "Fehler! Sie können keine rekursiven Unternehmen erzeugen."
+
+#. module: users_ldap
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr ""
+"Das ausgewählte Unternehmen gehört nicht zu den zulässigen Unternehmen für "
+"diesen Benutzer"
+
+#. module: users_ldap
+#: help:res.company.ldap,ldap_tls:0
+msgid ""
+"Request secure TLS/SSL encryption when connecting to the LDAP server. This "
+"option requires a server with STARTTLS enabled, otherwise all authentication "
+"attempts will fail."
+msgstr ""
+"Anforderung einer sicheren TLS/SSL Verschlüsseelung für die Verbindung zum "
+"LDAP Server. STARTTLS muss aktiviert sein, sonst werden "
+"Authentifizierungsversuche fehlschlagen."
+
+#. module: users_ldap
+#: view:res.company:0
+#: view:res.company.ldap:0
+msgid "LDAP Configuration"
+msgstr "LDAP-Konfiguration"
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_binddn:0
+msgid "LDAP binddn"
+msgstr "LDAP binddn"
+
+#. module: users_ldap
+#: help:res.company.ldap,create_user:0
+msgid "Create the user if not in database"
+msgstr "Erstelle diesen Benutzer, wenn er auf der DB nicht vorhanden ist."
+
+#. module: users_ldap
+#: help:res.company.ldap,user:0
+msgid "Model used for user creation"
+msgstr "Modul für effektive Benutzer Verwaltung"
+
+#. module: users_ldap
+#: field:res.company.ldap,company:0
+msgid "Company"
+msgstr "Unternehmen"
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_server:0
+msgid "LDAP Server address"
+msgstr "LDAP Server"
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_server_port:0
+msgid "LDAP Server port"
+msgstr "LDAP Server Port"
+
+#. module: users_ldap
+#: help:res.company.ldap,ldap_binddn:0
+msgid ""
+"The user account on the LDAP server that is used to query the directory. "
+"Leave empty to connect anonymously."
+msgstr ""
+"Des benutzerkonto für die Identifizierung auf dem LDAP Server. Leer für "
+"anonymen Zugang."
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_base:0
+msgid "LDAP base"
+msgstr "LDAP base"
+
+#. module: users_ldap
+#: view:res.company.ldap:0
+msgid "User Information"
+msgstr "Benutzer Information"
+
+#. module: users_ldap
+#: sql_constraint:res.company:0
+msgid "The company name must be unique !"
+msgstr "Der Name der Firma darf nur einmal vorkommen!"
+
+#. module: users_ldap
+#: model:ir.model,name:users_ldap.model_res_company
+msgid "Companies"
+msgstr "Unternehmen"
+
+#. module: users_ldap
+#: view:res.company.ldap:0
+msgid "Process Parameter"
+msgstr "Prozessparameter"
+
+#. module: users_ldap
+#: model:ir.model,name:users_ldap.model_res_company_ldap
+msgid "res.company.ldap"
+msgstr "res.company.ldap"
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_tls:0
+msgid "Use TLS"
+msgstr "TLS verwenden"
+
+#. module: users_ldap
+#: field:res.company.ldap,sequence:0
+msgid "Sequence"
+msgstr "Sequenz"
+
+#. module: users_ldap
+#: view:res.company.ldap:0
+msgid "Login Information"
+msgstr "Login Information"
+
+#. module: users_ldap
+#: view:res.company.ldap:0
+msgid "Server Information"
+msgstr "Server Information"
+
+#. module: users_ldap
+#: model:ir.actions.act_window,name:users_ldap.action_ldap_installer
+msgid "Setup your LDAP Server"
+msgstr "Einrichtung Ihres LDAP Servers"
+
+#. module: users_ldap
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr "Sie können nicht zwei identische Benutzeranmeldungen definieren!"
+
+#. module: users_ldap
+#: field:res.company,ldaps:0
+msgid "LDAP Parameters"
+msgstr "LDAP Parameter"
+
+#. module: users_ldap
+#: help:res.company.ldap,ldap_password:0
+msgid ""
+"The password of the user account on the LDAP server that is used to query "
+"the directory."
+msgstr "Das Passwort des Benutzers, der die LDAP Anfragen durchführt"
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_password:0
+msgid "LDAP password"
+msgstr "LDAP Passwort"
+
+#. module: users_ldap
+#: field:res.company.ldap,user:0
+msgid "Model User"
+msgstr "LDAP Benutzer Modul"
+
+#. module: users_ldap
+#: model:ir.model,name:users_ldap.model_res_users
+msgid "res.users"
+msgstr "res.users"
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_filter:0
+msgid "LDAP filter"
+msgstr "LDAP Filter"
+
+#. module: users_ldap
+#: field:res.company.ldap,create_user:0
+msgid "Create user"
+msgstr "Erzeuge Benutzer"
+
+#~ msgid "Authenticate users with ldap server"
+#~ msgstr "Authentifiziere LDAP Benutzer an LDAP Server"
diff --git a/addons/users_ldap/i18n/es.po b/addons/users_ldap/i18n/es.po
new file mode 100644
index 00000000000..9b174a2e2ad
--- /dev/null
+++ b/addons/users_ldap/i18n/es.po
@@ -0,0 +1,188 @@
+# Spanish translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:37+0000\n"
+"PO-Revision-Date: 2012-02-10 19:45+0000\n"
+"Last-Translator: Omar (Pexego) <bronxkds@hotmail.com>\n"
+"Language-Team: Spanish <es@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
+
+#. module: users_ldap
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr "¡Error! No puede crear compañías recursivas."
+
+#. module: users_ldap
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr ""
+"La compañía seleccionada no está en las compañías permitidas para este "
+"usuario"
+
+#. module: users_ldap
+#: help:res.company.ldap,ldap_tls:0
+msgid ""
+"Request secure TLS/SSL encryption when connecting to the LDAP server. This "
+"option requires a server with STARTTLS enabled, otherwise all authentication "
+"attempts will fail."
+msgstr ""
+"Solicitar un encriptación segura TLS/SSL cuando conecte con el servidor "
+"LDAP. Esta opción requiere un servidor con STARTTLS activado, de lo "
+"contrario todos los intentos de autenticación fallarán."
+
+#. module: users_ldap
+#: view:res.company:0
+#: view:res.company.ldap:0
+msgid "LDAP Configuration"
+msgstr "Configuración LDAP"
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_binddn:0
+msgid "LDAP binddn"
+msgstr "binddn LDAP"
+
+#. module: users_ldap
+#: help:res.company.ldap,create_user:0
+msgid "Create the user if not in database"
+msgstr "Crea el usuario si no está en la base de datos."
+
+#. module: users_ldap
+#: help:res.company.ldap,user:0
+msgid "Model used for user creation"
+msgstr "Modelo utilizado para la creación de usuarios."
+
+#. module: users_ldap
+#: field:res.company.ldap,company:0
+msgid "Company"
+msgstr "Compañía"
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_server:0
+msgid "LDAP Server address"
+msgstr "Dirección servidor LDAP"
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_server_port:0
+msgid "LDAP Server port"
+msgstr "Puerto servidor LDAP"
+
+#. module: users_ldap
+#: help:res.company.ldap,ldap_binddn:0
+msgid ""
+"The user account on the LDAP server that is used to query the directory. "
+"Leave empty to connect anonymously."
+msgstr ""
+"La cuenta de usuario en el servidor LDAP que es usada para acceder al "
+"directorio. Dejar vacío para conectar de forma anónima."
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_base:0
+msgid "LDAP base"
+msgstr "Base LDAP"
+
+#. module: users_ldap
+#: view:res.company.ldap:0
+msgid "User Information"
+msgstr "Información usuario"
+
+#. module: users_ldap
+#: sql_constraint:res.company:0
+msgid "The company name must be unique !"
+msgstr "¡El nombre de la compañía debe ser único!"
+
+#. module: users_ldap
+#: model:ir.model,name:users_ldap.model_res_company
+msgid "Companies"
+msgstr "Compañías"
+
+#. module: users_ldap
+#: view:res.company.ldap:0
+msgid "Process Parameter"
+msgstr ""
+
+#. module: users_ldap
+#: model:ir.model,name:users_ldap.model_res_company_ldap
+msgid "res.company.ldap"
+msgstr "res.compañía.ldap"
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_tls:0
+msgid "Use TLS"
+msgstr "Usar TLS"
+
+#. module: users_ldap
+#: field:res.company.ldap,sequence:0
+msgid "Sequence"
+msgstr "Secuencia"
+
+#. module: users_ldap
+#: view:res.company.ldap:0
+msgid "Login Information"
+msgstr "Información conexión"
+
+#. module: users_ldap
+#: view:res.company.ldap:0
+msgid "Server Information"
+msgstr "Información servidor"
+
+#. module: users_ldap
+#: model:ir.actions.act_window,name:users_ldap.action_ldap_installer
+msgid "Setup your LDAP Server"
+msgstr "Configurar servidor LDAP"
+
+#. module: users_ldap
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr "¡No puede tener dos usuarios con el mismo identificador de usuario!"
+
+#. module: users_ldap
+#: field:res.company,ldaps:0
+msgid "LDAP Parameters"
+msgstr "Parámetros LDAP"
+
+#. module: users_ldap
+#: help:res.company.ldap,ldap_password:0
+msgid ""
+"The password of the user account on the LDAP server that is used to query "
+"the directory."
+msgstr ""
+"La contraseña de la cuenta de usuario en el servidor LDAP que es usada para "
+"acceder al directorio"
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_password:0
+msgid "LDAP password"
+msgstr "Contraseña LDAP"
+
+#. module: users_ldap
+#: field:res.company.ldap,user:0
+msgid "Model User"
+msgstr "Modelo usuario"
+
+#. module: users_ldap
+#: model:ir.model,name:users_ldap.model_res_users
+msgid "res.users"
+msgstr "res.usuarios"
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_filter:0
+msgid "LDAP filter"
+msgstr "Filtro LDAP"
+
+#. module: users_ldap
+#: field:res.company.ldap,create_user:0
+msgid "Create user"
+msgstr "Crear usuario"
+
+#~ msgid "Authenticate users with ldap server"
+#~ msgstr "Autentifica los usuarios con un servidor LDAP"
diff --git a/addons/users_ldap/i18n/es_CR.po b/addons/users_ldap/i18n/es_CR.po
new file mode 100644
index 00000000000..5f29c66fcac
--- /dev/null
+++ b/addons/users_ldap/i18n/es_CR.po
@@ -0,0 +1,189 @@
+# Spanish translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-02-08 00:37+0000\n"
+"PO-Revision-Date: 2012-02-20 01:19+0000\n"
+"Last-Translator: Freddy Gonzalez <freddy.gonzalez.contreras@gmail.com>\n"
+"Language-Team: Spanish <es@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
+"Language: es\n"
+
+#. module: users_ldap
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr "¡Error! No puede crear compañías recursivas."
+
+#. module: users_ldap
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr ""
+"La compañía seleccionada no está en las compañías permitidas para este "
+"usuario"
+
+#. module: users_ldap
+#: help:res.company.ldap,ldap_tls:0
+msgid ""
+"Request secure TLS/SSL encryption when connecting to the LDAP server. This "
+"option requires a server with STARTTLS enabled, otherwise all authentication "
+"attempts will fail."
+msgstr ""
+"Solicitar un encriptación segura TLS/SSL cuando conecte con el servidor "
+"LDAP. Esta opción requiere un servidor con STARTTLS activado, de lo "
+"contrario todos los intentos de autenticación fallarán."
+
+#. module: users_ldap
+#: view:res.company:0
+#: view:res.company.ldap:0
+msgid "LDAP Configuration"
+msgstr "Configuración LDAP"
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_binddn:0
+msgid "LDAP binddn"
+msgstr "binddn LDAP"
+
+#. module: users_ldap
+#: help:res.company.ldap,create_user:0
+msgid "Create the user if not in database"
+msgstr "Crea el usuario si no está en la base de datos."
+
+#. module: users_ldap
+#: help:res.company.ldap,user:0
+msgid "Model used for user creation"
+msgstr "Modelo utilizado para la creación de usuarios."
+
+#. module: users_ldap
+#: field:res.company.ldap,company:0
+msgid "Company"
+msgstr "Compañía"
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_server:0
+msgid "LDAP Server address"
+msgstr "Dirección servidor LDAP"
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_server_port:0
+msgid "LDAP Server port"
+msgstr "Puerto servidor LDAP"
+
+#. module: users_ldap
+#: help:res.company.ldap,ldap_binddn:0
+msgid ""
+"The user account on the LDAP server that is used to query the directory. "
+"Leave empty to connect anonymously."
+msgstr ""
+"La cuenta de usuario en el servidor LDAP que es usada para acceder al "
+"directorio. Dejar vacío para conectar de forma anónima."
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_base:0
+msgid "LDAP base"
+msgstr "Base LDAP"
+
+#. module: users_ldap
+#: view:res.company.ldap:0
+msgid "User Information"
+msgstr "Información de Usuario"
+
+#. module: users_ldap
+#: sql_constraint:res.company:0
+msgid "The company name must be unique !"
+msgstr "¡El nombre de la compañía debe ser único!"
+
+#. module: users_ldap
+#: model:ir.model,name:users_ldap.model_res_company
+msgid "Companies"
+msgstr "Compañías"
+
+#. module: users_ldap
+#: view:res.company.ldap:0
+msgid "Process Parameter"
+msgstr "Parámetro proceso"
+
+#. module: users_ldap
+#: model:ir.model,name:users_ldap.model_res_company_ldap
+msgid "res.company.ldap"
+msgstr "res.compañía.ldap"
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_tls:0
+msgid "Use TLS"
+msgstr "Usar TLS"
+
+#. module: users_ldap
+#: field:res.company.ldap,sequence:0
+msgid "Sequence"
+msgstr "Secuencia"
+
+#. module: users_ldap
+#: view:res.company.ldap:0
+msgid "Login Information"
+msgstr "Información de inicio de sesión"
+
+#. module: users_ldap
+#: view:res.company.ldap:0
+msgid "Server Information"
+msgstr "Información del servidor"
+
+#. module: users_ldap
+#: model:ir.actions.act_window,name:users_ldap.action_ldap_installer
+msgid "Setup your LDAP Server"
+msgstr "Configurar servidor LDAP"
+
+#. module: users_ldap
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr "¡No puede tener dos usuarios con el mismo identificador de usuario!"
+
+#. module: users_ldap
+#: field:res.company,ldaps:0
+msgid "LDAP Parameters"
+msgstr "Parámetros LDAP"
+
+#. module: users_ldap
+#: help:res.company.ldap,ldap_password:0
+msgid ""
+"The password of the user account on the LDAP server that is used to query "
+"the directory."
+msgstr ""
+"La contraseña de la cuenta de usuario en el servidor LDAP que es usada para "
+"acceder al directorio"
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_password:0
+msgid "LDAP password"
+msgstr "Contraseña LDAP"
+
+#. module: users_ldap
+#: field:res.company.ldap,user:0
+msgid "Model User"
+msgstr "Modelo usuario"
+
+#. module: users_ldap
+#: model:ir.model,name:users_ldap.model_res_users
+msgid "res.users"
+msgstr "res.usuarios"
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_filter:0
+msgid "LDAP filter"
+msgstr "Filtro LDAP"
+
+#. module: users_ldap
+#: field:res.company.ldap,create_user:0
+msgid "Create user"
+msgstr "Crear usuario"
+
+#~ msgid "Authenticate users with ldap server"
+#~ msgstr "Autentifica los usuarios con un servidor LDAP"
diff --git a/addons/users_ldap/i18n/fi.po b/addons/users_ldap/i18n/fi.po
new file mode 100644
index 00000000000..4ca70e2598b
--- /dev/null
+++ b/addons/users_ldap/i18n/fi.po
@@ -0,0 +1,182 @@
+# Finnish translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:37+0000\n"
+"PO-Revision-Date: 2011-06-13 09:14+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Finnish <fi@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
+
+#. module: users_ldap
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr "Virhe! Et voi luoda sisäkkäisiä yrityksiä."
+
+#. module: users_ldap
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr "Valittu yritys ei ole sallittu tälle käyttäjälle"
+
+#. module: users_ldap
+#: help:res.company.ldap,ldap_tls:0
+msgid ""
+"Request secure TLS/SSL encryption when connecting to the LDAP server. This "
+"option requires a server with STARTTLS enabled, otherwise all authentication "
+"attempts will fail."
+msgstr ""
+
+#. module: users_ldap
+#: view:res.company:0
+#: view:res.company.ldap:0
+msgid "LDAP Configuration"
+msgstr "LDAP konfiguraatio"
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_binddn:0
+msgid "LDAP binddn"
+msgstr ""
+
+#. module: users_ldap
+#: help:res.company.ldap,create_user:0
+msgid "Create the user if not in database"
+msgstr "Luo käyttäjä jos ei ole tietokannassa"
+
+#. module: users_ldap
+#: help:res.company.ldap,user:0
+msgid "Model used for user creation"
+msgstr "Mallikäyttäjä käyttäjän luontia varten"
+
+#. module: users_ldap
+#: field:res.company.ldap,company:0
+msgid "Company"
+msgstr "Yritys"
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_server:0
+msgid "LDAP Server address"
+msgstr "LDAP palvelimen osoite"
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_server_port:0
+msgid "LDAP Server port"
+msgstr "LDAP palvelimen portti"
+
+#. module: users_ldap
+#: help:res.company.ldap,ldap_binddn:0
+msgid ""
+"The user account on the LDAP server that is used to query the directory. "
+"Leave empty to connect anonymously."
+msgstr ""
+"Käyttäjätunnus, jota käytetään LDAP hakemistokyselyihin. Jätä tyhjäksi niin "
+"otetaan yhteyttä anonyymisti."
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_base:0
+msgid "LDAP base"
+msgstr ""
+
+#. module: users_ldap
+#: view:res.company.ldap:0
+msgid "User Information"
+msgstr "Käyttäjän tiedot"
+
+#. module: users_ldap
+#: sql_constraint:res.company:0
+msgid "The company name must be unique !"
+msgstr "Yrityksen nimen pitää olla uniikki!"
+
+#. module: users_ldap
+#: model:ir.model,name:users_ldap.model_res_company
+msgid "Companies"
+msgstr "Yritykset"
+
+#. module: users_ldap
+#: view:res.company.ldap:0
+msgid "Process Parameter"
+msgstr "Prosessin parametri"
+
+#. module: users_ldap
+#: model:ir.model,name:users_ldap.model_res_company_ldap
+msgid "res.company.ldap"
+msgstr ""
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_tls:0
+msgid "Use TLS"
+msgstr "Käytä TLSää"
+
+#. module: users_ldap
+#: field:res.company.ldap,sequence:0
+msgid "Sequence"
+msgstr "Sekvenssi"
+
+#. module: users_ldap
+#: view:res.company.ldap:0
+msgid "Login Information"
+msgstr "Kirjautumistiedot"
+
+#. module: users_ldap
+#: view:res.company.ldap:0
+msgid "Server Information"
+msgstr "Palvelimen tiedot"
+
+#. module: users_ldap
+#: model:ir.actions.act_window,name:users_ldap.action_ldap_installer
+msgid "Setup your LDAP Server"
+msgstr "Määrittele LDAP palvelin"
+
+#. module: users_ldap
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr "Kahdella eri käyttäjällä ei voi olla samaa käyttäjätunnusta!"
+
+#. module: users_ldap
+#: field:res.company,ldaps:0
+msgid "LDAP Parameters"
+msgstr "LDAP parametrit"
+
+#. module: users_ldap
+#: help:res.company.ldap,ldap_password:0
+msgid ""
+"The password of the user account on the LDAP server that is used to query "
+"the directory."
+msgstr ""
+"Salasana LDAP käyttäjätunnukselle jota käytetään hakuihin LDAP hakemistosta."
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_password:0
+msgid "LDAP password"
+msgstr "LDAP salasana"
+
+#. module: users_ldap
+#: field:res.company.ldap,user:0
+msgid "Model User"
+msgstr "Mallikäyttäjä"
+
+#. module: users_ldap
+#: model:ir.model,name:users_ldap.model_res_users
+msgid "res.users"
+msgstr ""
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_filter:0
+msgid "LDAP filter"
+msgstr "LDAP suodin"
+
+#. module: users_ldap
+#: field:res.company.ldap,create_user:0
+msgid "Create user"
+msgstr "Luo käyttäjä"
+
+#~ msgid "Authenticate users with ldap server"
+#~ msgstr "Autentikoi käyttäjät LDAP palvelimen kanssa"
diff --git a/addons/users_ldap/i18n/fr.po b/addons/users_ldap/i18n/fr.po
new file mode 100644
index 00000000000..1e1a66b1f5b
--- /dev/null
+++ b/addons/users_ldap/i18n/fr.po
@@ -0,0 +1,188 @@
+# French translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:37+0000\n"
+"PO-Revision-Date: 2011-01-13 12:55+0000\n"
+"Last-Translator: Quentin THEURET <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: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
+
+#. module: users_ldap
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr "Erreur ! Vous ne pouvez pas créer de sociétés récursives"
+
+#. module: users_ldap
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr ""
+"La société choisie ne fait pas partie des sociétés autorisées pour cet "
+"utilisateur"
+
+#. module: users_ldap
+#: help:res.company.ldap,ldap_tls:0
+msgid ""
+"Request secure TLS/SSL encryption when connecting to the LDAP server. This "
+"option requires a server with STARTTLS enabled, otherwise all authentication "
+"attempts will fail."
+msgstr ""
+"Demander un cryptage sécurisé TLS/SSL  lors de la connexion au serveur LDAP. "
+"Cette option nécessite un serveur avec STARTTLS activé, sinon toutes les "
+"tentatives d'authentification échoueront."
+
+#. module: users_ldap
+#: view:res.company:0
+#: view:res.company.ldap:0
+msgid "LDAP Configuration"
+msgstr "Configuration LDAP"
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_binddn:0
+msgid "LDAP binddn"
+msgstr "LDAP binddn"
+
+#. module: users_ldap
+#: help:res.company.ldap,create_user:0
+msgid "Create the user if not in database"
+msgstr "Créer l'utilisateur s'il n'est pas dans la base de données"
+
+#. module: users_ldap
+#: help:res.company.ldap,user:0
+msgid "Model used for user creation"
+msgstr "Modèle utilisé pour créer les utilisateurs"
+
+#. module: users_ldap
+#: field:res.company.ldap,company:0
+msgid "Company"
+msgstr "Société"
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_server:0
+msgid "LDAP Server address"
+msgstr "Adresse du serveur LDAP"
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_server_port:0
+msgid "LDAP Server port"
+msgstr "Port du serveur LDAP"
+
+#. module: users_ldap
+#: help:res.company.ldap,ldap_binddn:0
+msgid ""
+"The user account on the LDAP server that is used to query the directory. "
+"Leave empty to connect anonymously."
+msgstr ""
+"Compte utilisateur sur le serveur LDAP qui est utilisé pour interroger "
+"l'annuaire. Laisser vide pour se connecter anonymement."
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_base:0
+msgid "LDAP base"
+msgstr "Base LDAP"
+
+#. module: users_ldap
+#: view:res.company.ldap:0
+msgid "User Information"
+msgstr "Information utilisateur"
+
+#. module: users_ldap
+#: sql_constraint:res.company:0
+msgid "The company name must be unique !"
+msgstr "Le nom de la société doit être unique !"
+
+#. module: users_ldap
+#: model:ir.model,name:users_ldap.model_res_company
+msgid "Companies"
+msgstr "Sociétés"
+
+#. module: users_ldap
+#: view:res.company.ldap:0
+msgid "Process Parameter"
+msgstr "Paramètre du processus"
+
+#. module: users_ldap
+#: model:ir.model,name:users_ldap.model_res_company_ldap
+msgid "res.company.ldap"
+msgstr "res.company.ldap"
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_tls:0
+msgid "Use TLS"
+msgstr "Utiliser TLS"
+
+#. module: users_ldap
+#: field:res.company.ldap,sequence:0
+msgid "Sequence"
+msgstr "Séquence"
+
+#. module: users_ldap
+#: view:res.company.ldap:0
+msgid "Login Information"
+msgstr "Information de connexion"
+
+#. module: users_ldap
+#: view:res.company.ldap:0
+msgid "Server Information"
+msgstr "Information sur le serveur"
+
+#. module: users_ldap
+#: model:ir.actions.act_window,name:users_ldap.action_ldap_installer
+msgid "Setup your LDAP Server"
+msgstr "Configurer votre serveur LDAP"
+
+#. module: users_ldap
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr "Vous ne pouvez pas avoir deux utilisateurs avec le même login !"
+
+#. module: users_ldap
+#: field:res.company,ldaps:0
+msgid "LDAP Parameters"
+msgstr "Paramètres LDAP"
+
+#. module: users_ldap
+#: help:res.company.ldap,ldap_password:0
+msgid ""
+"The password of the user account on the LDAP server that is used to query "
+"the directory."
+msgstr ""
+"Le mot de passe du compte d'utilisateur sur le serveur LDAP qui est utilisé "
+"pour interroger l'annuaire."
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_password:0
+msgid "LDAP password"
+msgstr "Mot de passe LDAP"
+
+#. module: users_ldap
+#: field:res.company.ldap,user:0
+msgid "Model User"
+msgstr "Modèle utilisateur"
+
+#. module: users_ldap
+#: model:ir.model,name:users_ldap.model_res_users
+msgid "res.users"
+msgstr "res.users"
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_filter:0
+msgid "LDAP filter"
+msgstr "Filtre LDAP"
+
+#. module: users_ldap
+#: field:res.company.ldap,create_user:0
+msgid "Create user"
+msgstr "Créer un utilisateur"
+
+#~ msgid "Authenticate users with ldap server"
+#~ msgstr "Authentifier les utilisateurs avec le serveur LDAP"
diff --git a/addons/users_ldap/i18n/gl.po b/addons/users_ldap/i18n/gl.po
new file mode 100644
index 00000000000..6a72c78a3ec
--- /dev/null
+++ b/addons/users_ldap/i18n/gl.po
@@ -0,0 +1,180 @@
+# Galician translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:37+0000\n"
+"PO-Revision-Date: 2011-03-05 01:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Galician <gl@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
+
+#. module: users_ldap
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr "Erro! Non pode crear compañías recorrentes."
+
+#. module: users_ldap
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr ""
+"A compañía seleccionada non é unha compañía admitida para este usuario"
+
+#. module: users_ldap
+#: help:res.company.ldap,ldap_tls:0
+msgid ""
+"Request secure TLS/SSL encryption when connecting to the LDAP server. This "
+"option requires a server with STARTTLS enabled, otherwise all authentication "
+"attempts will fail."
+msgstr ""
+
+#. module: users_ldap
+#: view:res.company:0
+#: view:res.company.ldap:0
+msgid "LDAP Configuration"
+msgstr "Configuración LDAP"
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_binddn:0
+msgid "LDAP binddn"
+msgstr "binddn LDAP"
+
+#. module: users_ldap
+#: help:res.company.ldap,create_user:0
+msgid "Create the user if not in database"
+msgstr "Crea o usuario se non está na base de datos."
+
+#. module: users_ldap
+#: help:res.company.ldap,user:0
+msgid "Model used for user creation"
+msgstr "Modelo utilizado para a creación de usuarios."
+
+#. module: users_ldap
+#: field:res.company.ldap,company:0
+msgid "Company"
+msgstr "Compañía"
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_server:0
+msgid "LDAP Server address"
+msgstr "Enderezo servidor LDAP"
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_server_port:0
+msgid "LDAP Server port"
+msgstr "Porto servidor LDAP"
+
+#. module: users_ldap
+#: help:res.company.ldap,ldap_binddn:0
+msgid ""
+"The user account on the LDAP server that is used to query the directory. "
+"Leave empty to connect anonymously."
+msgstr ""
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_base:0
+msgid "LDAP base"
+msgstr "Base LDAP"
+
+#. module: users_ldap
+#: view:res.company.ldap:0
+msgid "User Information"
+msgstr ""
+
+#. module: users_ldap
+#: sql_constraint:res.company:0
+msgid "The company name must be unique !"
+msgstr ""
+
+#. module: users_ldap
+#: model:ir.model,name:users_ldap.model_res_company
+msgid "Companies"
+msgstr "Compañías"
+
+#. module: users_ldap
+#: view:res.company.ldap:0
+msgid "Process Parameter"
+msgstr ""
+
+#. module: users_ldap
+#: model:ir.model,name:users_ldap.model_res_company_ldap
+msgid "res.company.ldap"
+msgstr "res.compañía.ldap"
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_tls:0
+msgid "Use TLS"
+msgstr ""
+
+#. module: users_ldap
+#: field:res.company.ldap,sequence:0
+msgid "Sequence"
+msgstr "Secuencia"
+
+#. module: users_ldap
+#: view:res.company.ldap:0
+msgid "Login Information"
+msgstr ""
+
+#. module: users_ldap
+#: view:res.company.ldap:0
+msgid "Server Information"
+msgstr ""
+
+#. module: users_ldap
+#: model:ir.actions.act_window,name:users_ldap.action_ldap_installer
+msgid "Setup your LDAP Server"
+msgstr ""
+
+#. module: users_ldap
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr "Non pode ter dous usuarios co mesmo identificador!"
+
+#. module: users_ldap
+#: field:res.company,ldaps:0
+msgid "LDAP Parameters"
+msgstr "Parámetros LDAP"
+
+#. module: users_ldap
+#: help:res.company.ldap,ldap_password:0
+msgid ""
+"The password of the user account on the LDAP server that is used to query "
+"the directory."
+msgstr ""
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_password:0
+msgid "LDAP password"
+msgstr "Contrasinal LDAP"
+
+#. module: users_ldap
+#: field:res.company.ldap,user:0
+msgid "Model User"
+msgstr "Modelo usuario"
+
+#. module: users_ldap
+#: model:ir.model,name:users_ldap.model_res_users
+msgid "res.users"
+msgstr "res.usuarios"
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_filter:0
+msgid "LDAP filter"
+msgstr "Filtro LDAP"
+
+#. module: users_ldap
+#: field:res.company.ldap,create_user:0
+msgid "Create user"
+msgstr "Crear usuario"
+
+#~ msgid "Authenticate users with ldap server"
+#~ msgstr "Autentifica os usuarios cun servidor LDAP"
diff --git a/addons/users_ldap/i18n/hr.po b/addons/users_ldap/i18n/hr.po
new file mode 100644
index 00000000000..4b03ec54875
--- /dev/null
+++ b/addons/users_ldap/i18n/hr.po
@@ -0,0 +1,177 @@
+# Croatian translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:37+0000\n"
+"PO-Revision-Date: 2011-12-21 14:58+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: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
+
+#. module: users_ldap
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr "Pogreška! Ne možete kreirati rekurzivne organizacije."
+
+#. module: users_ldap
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr ""
+"Odabrana organizacija nije među dozvoljenim organizacijama za ovog korisnika"
+
+#. module: users_ldap
+#: help:res.company.ldap,ldap_tls:0
+msgid ""
+"Request secure TLS/SSL encryption when connecting to the LDAP server. This "
+"option requires a server with STARTTLS enabled, otherwise all authentication "
+"attempts will fail."
+msgstr ""
+
+#. module: users_ldap
+#: view:res.company:0
+#: view:res.company.ldap:0
+msgid "LDAP Configuration"
+msgstr "LDAP konfiguracija"
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_binddn:0
+msgid "LDAP binddn"
+msgstr "LDAP binddn"
+
+#. module: users_ldap
+#: help:res.company.ldap,create_user:0
+msgid "Create the user if not in database"
+msgstr "kreiraj korisnika ako ne postoji u bazi podataka"
+
+#. module: users_ldap
+#: help:res.company.ldap,user:0
+msgid "Model used for user creation"
+msgstr "Model za kreiranje korisnika"
+
+#. module: users_ldap
+#: field:res.company.ldap,company:0
+msgid "Company"
+msgstr "Organizacija"
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_server:0
+msgid "LDAP Server address"
+msgstr "Adresa LDAP servera"
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_server_port:0
+msgid "LDAP Server port"
+msgstr "Port LDAP servera"
+
+#. module: users_ldap
+#: help:res.company.ldap,ldap_binddn:0
+msgid ""
+"The user account on the LDAP server that is used to query the directory. "
+"Leave empty to connect anonymously."
+msgstr ""
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_base:0
+msgid "LDAP base"
+msgstr "LDAP base"
+
+#. module: users_ldap
+#: view:res.company.ldap:0
+msgid "User Information"
+msgstr ""
+
+#. module: users_ldap
+#: sql_constraint:res.company:0
+msgid "The company name must be unique !"
+msgstr ""
+
+#. module: users_ldap
+#: model:ir.model,name:users_ldap.model_res_company
+msgid "Companies"
+msgstr "Organizacije"
+
+#. module: users_ldap
+#: view:res.company.ldap:0
+msgid "Process Parameter"
+msgstr ""
+
+#. module: users_ldap
+#: model:ir.model,name:users_ldap.model_res_company_ldap
+msgid "res.company.ldap"
+msgstr ""
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_tls:0
+msgid "Use TLS"
+msgstr ""
+
+#. module: users_ldap
+#: field:res.company.ldap,sequence:0
+msgid "Sequence"
+msgstr "Sekvenca"
+
+#. module: users_ldap
+#: view:res.company.ldap:0
+msgid "Login Information"
+msgstr ""
+
+#. module: users_ldap
+#: view:res.company.ldap:0
+msgid "Server Information"
+msgstr ""
+
+#. module: users_ldap
+#: model:ir.actions.act_window,name:users_ldap.action_ldap_installer
+msgid "Setup your LDAP Server"
+msgstr ""
+
+#. module: users_ldap
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr "Ne možete imati dva korisnika sa istim korisničkim imenom !"
+
+#. module: users_ldap
+#: field:res.company,ldaps:0
+msgid "LDAP Parameters"
+msgstr "LDAP Parametri"
+
+#. module: users_ldap
+#: help:res.company.ldap,ldap_password:0
+msgid ""
+"The password of the user account on the LDAP server that is used to query "
+"the directory."
+msgstr ""
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_password:0
+msgid "LDAP password"
+msgstr "LDAP lozinka"
+
+#. module: users_ldap
+#: field:res.company.ldap,user:0
+msgid "Model User"
+msgstr ""
+
+#. module: users_ldap
+#: model:ir.model,name:users_ldap.model_res_users
+msgid "res.users"
+msgstr ""
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_filter:0
+msgid "LDAP filter"
+msgstr "LDAP filtar"
+
+#. module: users_ldap
+#: field:res.company.ldap,create_user:0
+msgid "Create user"
+msgstr "Kreiraj korisnika"
diff --git a/addons/users_ldap/i18n/hu.po b/addons/users_ldap/i18n/hu.po
new file mode 100644
index 00000000000..6081bae6e52
--- /dev/null
+++ b/addons/users_ldap/i18n/hu.po
@@ -0,0 +1,177 @@
+# Hungarian translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:37+0000\n"
+"PO-Revision-Date: 2011-01-27 12:31+0000\n"
+"Last-Translator: NOVOTRADE RENDSZERHÁZ ( novotrade.hu ) "
+"<openerp@novotrade.hu>\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: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
+
+#. module: users_ldap
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr "Hiba! Nem hozhat létre rekurzív vállalatokat."
+
+#. module: users_ldap
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr ""
+
+#. module: users_ldap
+#: help:res.company.ldap,ldap_tls:0
+msgid ""
+"Request secure TLS/SSL encryption when connecting to the LDAP server. This "
+"option requires a server with STARTTLS enabled, otherwise all authentication "
+"attempts will fail."
+msgstr ""
+
+#. module: users_ldap
+#: view:res.company:0
+#: view:res.company.ldap:0
+msgid "LDAP Configuration"
+msgstr "LDAP konfiguráció"
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_binddn:0
+msgid "LDAP binddn"
+msgstr ""
+
+#. module: users_ldap
+#: help:res.company.ldap,create_user:0
+msgid "Create the user if not in database"
+msgstr ""
+
+#. module: users_ldap
+#: help:res.company.ldap,user:0
+msgid "Model used for user creation"
+msgstr ""
+
+#. module: users_ldap
+#: field:res.company.ldap,company:0
+msgid "Company"
+msgstr "Vállalat"
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_server:0
+msgid "LDAP Server address"
+msgstr "LDAP szervercím"
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_server_port:0
+msgid "LDAP Server port"
+msgstr "LDAP szerverport"
+
+#. module: users_ldap
+#: help:res.company.ldap,ldap_binddn:0
+msgid ""
+"The user account on the LDAP server that is used to query the directory. "
+"Leave empty to connect anonymously."
+msgstr ""
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_base:0
+msgid "LDAP base"
+msgstr "LDAP alap"
+
+#. module: users_ldap
+#: view:res.company.ldap:0
+msgid "User Information"
+msgstr ""
+
+#. module: users_ldap
+#: sql_constraint:res.company:0
+msgid "The company name must be unique !"
+msgstr ""
+
+#. module: users_ldap
+#: model:ir.model,name:users_ldap.model_res_company
+msgid "Companies"
+msgstr "Vállalatok"
+
+#. module: users_ldap
+#: view:res.company.ldap:0
+msgid "Process Parameter"
+msgstr ""
+
+#. module: users_ldap
+#: model:ir.model,name:users_ldap.model_res_company_ldap
+msgid "res.company.ldap"
+msgstr "res.company.ldap"
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_tls:0
+msgid "Use TLS"
+msgstr ""
+
+#. module: users_ldap
+#: field:res.company.ldap,sequence:0
+msgid "Sequence"
+msgstr "Sorszám"
+
+#. module: users_ldap
+#: view:res.company.ldap:0
+msgid "Login Information"
+msgstr ""
+
+#. module: users_ldap
+#: view:res.company.ldap:0
+msgid "Server Information"
+msgstr ""
+
+#. module: users_ldap
+#: model:ir.actions.act_window,name:users_ldap.action_ldap_installer
+msgid "Setup your LDAP Server"
+msgstr ""
+
+#. module: users_ldap
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr "Nem létezhet két felhasználó ugyanazzal a felhasználói névvel !"
+
+#. module: users_ldap
+#: field:res.company,ldaps:0
+msgid "LDAP Parameters"
+msgstr "LDAP paraméterek"
+
+#. module: users_ldap
+#: help:res.company.ldap,ldap_password:0
+msgid ""
+"The password of the user account on the LDAP server that is used to query "
+"the directory."
+msgstr ""
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_password:0
+msgid "LDAP password"
+msgstr "LDAP jelszó"
+
+#. module: users_ldap
+#: field:res.company.ldap,user:0
+msgid "Model User"
+msgstr "Modell felhasználó"
+
+#. module: users_ldap
+#: model:ir.model,name:users_ldap.model_res_users
+msgid "res.users"
+msgstr "res.users"
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_filter:0
+msgid "LDAP filter"
+msgstr "LDAP szűrő"
+
+#. module: users_ldap
+#: field:res.company.ldap,create_user:0
+msgid "Create user"
+msgstr "Felhasználó létrehozása"
diff --git a/addons/users_ldap/i18n/it.po b/addons/users_ldap/i18n/it.po
new file mode 100644
index 00000000000..916ff063b13
--- /dev/null
+++ b/addons/users_ldap/i18n/it.po
@@ -0,0 +1,181 @@
+# Italian translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:37+0000\n"
+"PO-Revision-Date: 2011-01-13 03:44+0000\n"
+"Last-Translator: Nicola Riolini - Micronaet <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: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
+
+#. module: users_ldap
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr "Errore! Non è possibile creare aziende ricorsive."
+
+#. module: users_ldap
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr "L'azienda scelta non è fra la aziende abilitate per questo utente"
+
+#. module: users_ldap
+#: help:res.company.ldap,ldap_tls:0
+msgid ""
+"Request secure TLS/SSL encryption when connecting to the LDAP server. This "
+"option requires a server with STARTTLS enabled, otherwise all authentication "
+"attempts will fail."
+msgstr ""
+
+#. module: users_ldap
+#: view:res.company:0
+#: view:res.company.ldap:0
+msgid "LDAP Configuration"
+msgstr "Configurazione LDAP"
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_binddn:0
+msgid "LDAP binddn"
+msgstr "LDAP binddn"
+
+#. module: users_ldap
+#: help:res.company.ldap,create_user:0
+msgid "Create the user if not in database"
+msgstr "Crea l'utente se non è nel database"
+
+#. module: users_ldap
+#: help:res.company.ldap,user:0
+msgid "Model used for user creation"
+msgstr "Modello usato per la creazione utente"
+
+#. module: users_ldap
+#: field:res.company.ldap,company:0
+msgid "Company"
+msgstr "Azienda"
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_server:0
+msgid "LDAP Server address"
+msgstr "Indirizzo server LDAP"
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_server_port:0
+msgid "LDAP Server port"
+msgstr "Porta server LDAP"
+
+#. module: users_ldap
+#: help:res.company.ldap,ldap_binddn:0
+msgid ""
+"The user account on the LDAP server that is used to query the directory. "
+"Leave empty to connect anonymously."
+msgstr ""
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_base:0
+msgid "LDAP base"
+msgstr "LDAP base"
+
+#. module: users_ldap
+#: view:res.company.ldap:0
+msgid "User Information"
+msgstr "Informazioni Utente"
+
+#. module: users_ldap
+#: sql_constraint:res.company:0
+msgid "The company name must be unique !"
+msgstr "Il nome azienda deve essere unico!"
+
+#. module: users_ldap
+#: model:ir.model,name:users_ldap.model_res_company
+msgid "Companies"
+msgstr "Aziende"
+
+#. module: users_ldap
+#: view:res.company.ldap:0
+msgid "Process Parameter"
+msgstr "Parametro Processo"
+
+#. module: users_ldap
+#: model:ir.model,name:users_ldap.model_res_company_ldap
+msgid "res.company.ldap"
+msgstr "res.company.ldap"
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_tls:0
+msgid "Use TLS"
+msgstr "Usa TLS"
+
+#. module: users_ldap
+#: field:res.company.ldap,sequence:0
+msgid "Sequence"
+msgstr "Sequenza"
+
+#. module: users_ldap
+#: view:res.company.ldap:0
+msgid "Login Information"
+msgstr "Informazioni di accesso"
+
+#. module: users_ldap
+#: view:res.company.ldap:0
+msgid "Server Information"
+msgstr "Informazioni sul server"
+
+#. module: users_ldap
+#: model:ir.actions.act_window,name:users_ldap.action_ldap_installer
+msgid "Setup your LDAP Server"
+msgstr "Crea il tuo server LDAP"
+
+#. module: users_ldap
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr "Non è possibile avere due utenti con lo stesso login!"
+
+#. module: users_ldap
+#: field:res.company,ldaps:0
+msgid "LDAP Parameters"
+msgstr "Parametri LDAP"
+
+#. module: users_ldap
+#: help:res.company.ldap,ldap_password:0
+msgid ""
+"The password of the user account on the LDAP server that is used to query "
+"the directory."
+msgstr ""
+"La password dell'account utente sul server LDAP che viene utilizzata per "
+"interrogare la directory."
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_password:0
+msgid "LDAP password"
+msgstr "Password LDAP"
+
+#. module: users_ldap
+#: field:res.company.ldap,user:0
+msgid "Model User"
+msgstr "Utente modello"
+
+#. module: users_ldap
+#: model:ir.model,name:users_ldap.model_res_users
+msgid "res.users"
+msgstr "res.users"
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_filter:0
+msgid "LDAP filter"
+msgstr "Filtro LDAP"
+
+#. module: users_ldap
+#: field:res.company.ldap,create_user:0
+msgid "Create user"
+msgstr "Crea utente"
+
+#~ msgid "Authenticate users with ldap server"
+#~ msgstr "Autentica utenti con server LDAP"
diff --git a/addons/users_ldap/i18n/ja.po b/addons/users_ldap/i18n/ja.po
new file mode 100644
index 00000000000..95b4eec145a
--- /dev/null
+++ b/addons/users_ldap/i18n/ja.po
@@ -0,0 +1,178 @@
+# Japanese 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-02-08 00:37+0000\n"
+"PO-Revision-Date: 2012-06-16 22:21+0000\n"
+"Last-Translator: Akira Hiyama <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: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
+
+#. module: users_ldap
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr "エラー。再帰的な関係となる会社を作ることはできません。"
+
+#. module: users_ldap
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr "選択した会社は、このユーザに許された会社ではありません。"
+
+#. module: users_ldap
+#: help:res.company.ldap,ldap_tls:0
+msgid ""
+"Request secure TLS/SSL encryption when connecting to the LDAP server. This "
+"option requires a server with STARTTLS enabled, otherwise all authentication "
+"attempts will fail."
+msgstr ""
+"LDAPサーバへの接続時に安全なTLS/SSL暗号化を要求します。このオプションはサーバがSTARTTLSが使用可能であることを要求します。そうでない場合"
+"は全ての認証要求は失敗します。"
+
+#. module: users_ldap
+#: view:res.company:0
+#: view:res.company.ldap:0
+msgid "LDAP Configuration"
+msgstr "LDAP設定"
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_binddn:0
+msgid "LDAP binddn"
+msgstr "LDAPバインディング"
+
+#. module: users_ldap
+#: help:res.company.ldap,create_user:0
+msgid "Create the user if not in database"
+msgstr "データベースにない場合、ユーザを作成します。"
+
+#. module: users_ldap
+#: help:res.company.ldap,user:0
+msgid "Model used for user creation"
+msgstr "ユーザ作成のために使用するモデル"
+
+#. module: users_ldap
+#: field:res.company.ldap,company:0
+msgid "Company"
+msgstr "会社"
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_server:0
+msgid "LDAP Server address"
+msgstr "LDAPサーバアドレス"
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_server_port:0
+msgid "LDAP Server port"
+msgstr "LDAPサーバポート"
+
+#. module: users_ldap
+#: help:res.company.ldap,ldap_binddn:0
+msgid ""
+"The user account on the LDAP server that is used to query the directory. "
+"Leave empty to connect anonymously."
+msgstr "LDAPサーバ上のユーザアカウントはディレクトリへのクエリーのために使用されます。匿名接続する場合は空のままにして下さい。"
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_base:0
+msgid "LDAP base"
+msgstr "LDAPベース"
+
+#. module: users_ldap
+#: view:res.company.ldap:0
+msgid "User Information"
+msgstr "ユーザー情報"
+
+#. module: users_ldap
+#: sql_constraint:res.company:0
+msgid "The company name must be unique !"
+msgstr "会社名は固有でなければいけません。"
+
+#. module: users_ldap
+#: model:ir.model,name:users_ldap.model_res_company
+msgid "Companies"
+msgstr "会社"
+
+#. module: users_ldap
+#: view:res.company.ldap:0
+msgid "Process Parameter"
+msgstr "処理パラメータ"
+
+#. module: users_ldap
+#: model:ir.model,name:users_ldap.model_res_company_ldap
+msgid "res.company.ldap"
+msgstr ""
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_tls:0
+msgid "Use TLS"
+msgstr "TLS を使用"
+
+#. module: users_ldap
+#: field:res.company.ldap,sequence:0
+msgid "Sequence"
+msgstr "順序"
+
+#. module: users_ldap
+#: view:res.company.ldap:0
+msgid "Login Information"
+msgstr "ログイン情報"
+
+#. module: users_ldap
+#: view:res.company.ldap:0
+msgid "Server Information"
+msgstr "サーバー情報"
+
+#. module: users_ldap
+#: model:ir.actions.act_window,name:users_ldap.action_ldap_installer
+msgid "Setup your LDAP Server"
+msgstr "LDAPサーバの設定"
+
+#. module: users_ldap
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr "同じログインでは２つのユーザを持てません。"
+
+#. module: users_ldap
+#: field:res.company,ldaps:0
+msgid "LDAP Parameters"
+msgstr "LDAPパラメータ"
+
+#. module: users_ldap
+#: help:res.company.ldap,ldap_password:0
+msgid ""
+"The password of the user account on the LDAP server that is used to query "
+"the directory."
+msgstr "LDAPサーバのユーザアカウントのパスワードはディレクトリへのクエリー使用されます。"
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_password:0
+msgid "LDAP password"
+msgstr "LDAPパスワード"
+
+#. module: users_ldap
+#: field:res.company.ldap,user:0
+msgid "Model User"
+msgstr "モデルユーザ"
+
+#. module: users_ldap
+#: model:ir.model,name:users_ldap.model_res_users
+msgid "res.users"
+msgstr ""
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_filter:0
+msgid "LDAP filter"
+msgstr "LDAPフィルタ"
+
+#. module: users_ldap
+#: field:res.company.ldap,create_user:0
+msgid "Create user"
+msgstr "ユーザの作成"
diff --git a/addons/users_ldap/i18n/mn.po b/addons/users_ldap/i18n/mn.po
new file mode 100644
index 00000000000..d67fad6519a
--- /dev/null
+++ b/addons/users_ldap/i18n/mn.po
@@ -0,0 +1,187 @@
+# Mongolian translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:37+0000\n"
+"PO-Revision-Date: 2010-12-21 13:53+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\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: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
+
+#. module: users_ldap
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr "Алдаа! Рекурсив компани үүсгэж болохгүй."
+
+#. module: users_ldap
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr ""
+"Энэ хэрэглэгчийн сонгосон компани зөвшөөрөгдсөн компаниуд дунд алга байна."
+
+#. module: users_ldap
+#: help:res.company.ldap,ldap_tls:0
+msgid ""
+"Request secure TLS/SSL encryption when connecting to the LDAP server. This "
+"option requires a server with STARTTLS enabled, otherwise all authentication "
+"attempts will fail."
+msgstr ""
+"LDAP сервертэй холбогдоход TLS/SSL нууцлагдсан кодчлолыг ашиглана. Энэ "
+"сонголт нь STARTTLS зөвшөөрөгдсөн байхыг шаардах бөгөөд үгүй бол бүх эрх "
+"шалгах оролдлого бүтэлгүй болно."
+
+#. module: users_ldap
+#: view:res.company:0
+#: view:res.company.ldap:0
+msgid "LDAP Configuration"
+msgstr "LDAP Тохиргоо"
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_binddn:0
+msgid "LDAP binddn"
+msgstr "LDAP binddn"
+
+#. module: users_ldap
+#: help:res.company.ldap,create_user:0
+msgid "Create the user if not in database"
+msgstr "Хэрэглэгч өгөгдлийн санд бүртгэгдээгүй бол үүсгэх"
+
+#. module: users_ldap
+#: help:res.company.ldap,user:0
+msgid "Model used for user creation"
+msgstr "Хэрэглэгчийг үүсгэхэд ашиглагдсан модель"
+
+#. module: users_ldap
+#: field:res.company.ldap,company:0
+msgid "Company"
+msgstr "Компани"
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_server:0
+msgid "LDAP Server address"
+msgstr "LDAP сервер хаяг"
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_server_port:0
+msgid "LDAP Server port"
+msgstr "LDAP сервер порт"
+
+#. module: users_ldap
+#: help:res.company.ldap,ldap_binddn:0
+msgid ""
+"The user account on the LDAP server that is used to query the directory. "
+"Leave empty to connect anonymously."
+msgstr ""
+"LDAP сервер дээр хэрэглэгчийн жагсаалтыг авахад хэрэглэгдэх хэрэглэгчийн "
+"нэр. Хоосон үлдээвэл anonymous байдлаар холбогдоно."
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_base:0
+msgid "LDAP base"
+msgstr "LDAP сан"
+
+#. module: users_ldap
+#: view:res.company.ldap:0
+msgid "User Information"
+msgstr "Хэрэглэгчийн мэдээлэл"
+
+#. module: users_ldap
+#: sql_constraint:res.company:0
+msgid "The company name must be unique !"
+msgstr "Компаний нэр үл давхцах байх ёстой !"
+
+#. module: users_ldap
+#: model:ir.model,name:users_ldap.model_res_company
+msgid "Companies"
+msgstr "Компаниуд"
+
+#. module: users_ldap
+#: view:res.company.ldap:0
+msgid "Process Parameter"
+msgstr "Парамтерийг Боловсруулах"
+
+#. module: users_ldap
+#: model:ir.model,name:users_ldap.model_res_company_ldap
+msgid "res.company.ldap"
+msgstr "res.company.ldap"
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_tls:0
+msgid "Use TLS"
+msgstr "TLS-г хэрэглэх"
+
+#. module: users_ldap
+#: field:res.company.ldap,sequence:0
+msgid "Sequence"
+msgstr "Дараалал"
+
+#. module: users_ldap
+#: view:res.company.ldap:0
+msgid "Login Information"
+msgstr "Нэвтрэх мэдээлэл"
+
+#. module: users_ldap
+#: view:res.company.ldap:0
+msgid "Server Information"
+msgstr "Серверийн мэдээлэл"
+
+#. module: users_ldap
+#: model:ir.actions.act_window,name:users_ldap.action_ldap_installer
+msgid "Setup your LDAP Server"
+msgstr "Өөрийн LDAP серверийг тохируулах"
+
+#. module: users_ldap
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr "Ижил нэвтрэх кодтой хоёр хэрэглэгч байж болохгүй!"
+
+#. module: users_ldap
+#: field:res.company,ldaps:0
+msgid "LDAP Parameters"
+msgstr "LDAP параметрүүд"
+
+#. module: users_ldap
+#: help:res.company.ldap,ldap_password:0
+msgid ""
+"The password of the user account on the LDAP server that is used to query "
+"the directory."
+msgstr ""
+"LDAP сервер дээр хэрэглэгчийн жагсаалтыг авахад хэрэглэгдэх хэрэглэгчийн "
+"нууц үг."
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_password:0
+msgid "LDAP password"
+msgstr "LDAP нууц үг"
+
+#. module: users_ldap
+#: field:res.company.ldap,user:0
+msgid "Model User"
+msgstr "Модель Хэрэглэгч"
+
+#. module: users_ldap
+#: model:ir.model,name:users_ldap.model_res_users
+msgid "res.users"
+msgstr "res.users"
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_filter:0
+msgid "LDAP filter"
+msgstr "LDAP шүүлтүүр"
+
+#. module: users_ldap
+#: field:res.company.ldap,create_user:0
+msgid "Create user"
+msgstr "Хэрэглэгч үүсгэх"
+
+#~ msgid "Authenticate users with ldap server"
+#~ msgstr "LDAP серверээр хэрэглэгчдийг баталгаажуулах"
diff --git a/addons/users_ldap/i18n/nl.po b/addons/users_ldap/i18n/nl.po
new file mode 100644
index 00000000000..56b9b09fbe9
--- /dev/null
+++ b/addons/users_ldap/i18n/nl.po
@@ -0,0 +1,186 @@
+# Dutch translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:37+0000\n"
+"PO-Revision-Date: 2012-02-09 07:06+0000\n"
+"Last-Translator: Erwin <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: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
+
+#. module: users_ldap
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr "Fout ! U kunt geen recursieve bedrijven maken."
+
+#. module: users_ldap
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr "Het gekozen bedrijf is geen toegestaan bedrijf voor deze gebruiker"
+
+#. module: users_ldap
+#: help:res.company.ldap,ldap_tls:0
+msgid ""
+"Request secure TLS/SSL encryption when connecting to the LDAP server. This "
+"option requires a server with STARTTLS enabled, otherwise all authentication "
+"attempts will fail."
+msgstr ""
+"Vraag beveiligde TLS / SSL-codering bij het verbinden met de LDAP-server. "
+"Deze optie vereist een server met ingeschakeld STARTTLS, anders zullen alle "
+"authenticatie pogingen mislukken."
+
+#. module: users_ldap
+#: view:res.company:0
+#: view:res.company.ldap:0
+msgid "LDAP Configuration"
+msgstr "LDAP instellingen"
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_binddn:0
+msgid "LDAP binddn"
+msgstr "LDAP bind DN"
+
+#. module: users_ldap
+#: help:res.company.ldap,create_user:0
+msgid "Create the user if not in database"
+msgstr "Onbekende gebruikers aanmaken in de database"
+
+#. module: users_ldap
+#: help:res.company.ldap,user:0
+msgid "Model used for user creation"
+msgstr "Model voor nieuw aan te maken gebruikers"
+
+#. module: users_ldap
+#: field:res.company.ldap,company:0
+msgid "Company"
+msgstr "Bedrijf"
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_server:0
+msgid "LDAP Server address"
+msgstr "LDAP Server adres"
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_server_port:0
+msgid "LDAP Server port"
+msgstr "Poortnummer LDAP-server"
+
+#. module: users_ldap
+#: help:res.company.ldap,ldap_binddn:0
+msgid ""
+"The user account on the LDAP server that is used to query the directory. "
+"Leave empty to connect anonymously."
+msgstr ""
+"De gebruikersaccount op de LDAP-server die wordt gebruikt om de map te "
+"verkennen. Laat leeg om verbinding anoniem."
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_base:0
+msgid "LDAP base"
+msgstr "LDAP basis-DN"
+
+#. module: users_ldap
+#: view:res.company.ldap:0
+msgid "User Information"
+msgstr "Gebruikersinformatie"
+
+#. module: users_ldap
+#: sql_constraint:res.company:0
+msgid "The company name must be unique !"
+msgstr "De naam van het bedrijf moet uniek zijn!"
+
+#. module: users_ldap
+#: model:ir.model,name:users_ldap.model_res_company
+msgid "Companies"
+msgstr "Bedrijven"
+
+#. module: users_ldap
+#: view:res.company.ldap:0
+msgid "Process Parameter"
+msgstr "Proces parameter"
+
+#. module: users_ldap
+#: model:ir.model,name:users_ldap.model_res_company_ldap
+msgid "res.company.ldap"
+msgstr "res.company.ldap"
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_tls:0
+msgid "Use TLS"
+msgstr "TLS gebruiken"
+
+#. module: users_ldap
+#: field:res.company.ldap,sequence:0
+msgid "Sequence"
+msgstr "Volgnummer"
+
+#. module: users_ldap
+#: view:res.company.ldap:0
+msgid "Login Information"
+msgstr "Aanmeldingsinformatie"
+
+#. module: users_ldap
+#: view:res.company.ldap:0
+msgid "Server Information"
+msgstr "Serverinformatie"
+
+#. module: users_ldap
+#: model:ir.actions.act_window,name:users_ldap.action_ldap_installer
+msgid "Setup your LDAP Server"
+msgstr "Stel uw LDAP server in"
+
+#. module: users_ldap
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr "U kunt niet twee gebruikers hebben met dezelfde gebruikersnaam !"
+
+#. module: users_ldap
+#: field:res.company,ldaps:0
+msgid "LDAP Parameters"
+msgstr "LDAP parameters"
+
+#. module: users_ldap
+#: help:res.company.ldap,ldap_password:0
+msgid ""
+"The password of the user account on the LDAP server that is used to query "
+"the directory."
+msgstr ""
+"Het wachtwoord van de gebruikersaccount op de LDAP-server die wordt gebruikt "
+"om de map te verkennen."
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_password:0
+msgid "LDAP password"
+msgstr "Wachtwoord LDAP-server"
+
+#. module: users_ldap
+#: field:res.company.ldap,user:0
+msgid "Model User"
+msgstr "Modelgebruiker"
+
+#. module: users_ldap
+#: model:ir.model,name:users_ldap.model_res_users
+msgid "res.users"
+msgstr "res.users"
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_filter:0
+msgid "LDAP filter"
+msgstr "LDAP-filter"
+
+#. module: users_ldap
+#: field:res.company.ldap,create_user:0
+msgid "Create user"
+msgstr "Gebruiker maken"
+
+#~ msgid "Authenticate users with ldap server"
+#~ msgstr "Gebruikers authentificeren via LDAP server"
diff --git a/addons/users_ldap/i18n/pl.po b/addons/users_ldap/i18n/pl.po
new file mode 100644
index 00000000000..713ab82c321
--- /dev/null
+++ b/addons/users_ldap/i18n/pl.po
@@ -0,0 +1,179 @@
+# Polish translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:37+0000\n"
+"PO-Revision-Date: 2010-12-28 09:09+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\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: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
+
+#. module: users_ldap
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr "Błąd! Nie możesz tworzyć firm rekurencyjnych."
+
+#. module: users_ldap
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr "Wybrana firma jest niedozwolona dla tego użytkownika"
+
+#. module: users_ldap
+#: help:res.company.ldap,ldap_tls:0
+msgid ""
+"Request secure TLS/SSL encryption when connecting to the LDAP server. This "
+"option requires a server with STARTTLS enabled, otherwise all authentication "
+"attempts will fail."
+msgstr ""
+
+#. module: users_ldap
+#: view:res.company:0
+#: view:res.company.ldap:0
+msgid "LDAP Configuration"
+msgstr "Konfiguracja LDAP"
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_binddn:0
+msgid "LDAP binddn"
+msgstr ""
+
+#. module: users_ldap
+#: help:res.company.ldap,create_user:0
+msgid "Create the user if not in database"
+msgstr "Utwórz użytkownika, jeśli nie ma w bazie"
+
+#. module: users_ldap
+#: help:res.company.ldap,user:0
+msgid "Model used for user creation"
+msgstr "Model stosowany do tworzenia użytkownika"
+
+#. module: users_ldap
+#: field:res.company.ldap,company:0
+msgid "Company"
+msgstr "Firma"
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_server:0
+msgid "LDAP Server address"
+msgstr "Adres serwera LDAP"
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_server_port:0
+msgid "LDAP Server port"
+msgstr "Port serwera LDAP"
+
+#. module: users_ldap
+#: help:res.company.ldap,ldap_binddn:0
+msgid ""
+"The user account on the LDAP server that is used to query the directory. "
+"Leave empty to connect anonymously."
+msgstr ""
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_base:0
+msgid "LDAP base"
+msgstr "Baza LDAP"
+
+#. module: users_ldap
+#: view:res.company.ldap:0
+msgid "User Information"
+msgstr ""
+
+#. module: users_ldap
+#: sql_constraint:res.company:0
+msgid "The company name must be unique !"
+msgstr ""
+
+#. module: users_ldap
+#: model:ir.model,name:users_ldap.model_res_company
+msgid "Companies"
+msgstr "Firmy"
+
+#. module: users_ldap
+#: view:res.company.ldap:0
+msgid "Process Parameter"
+msgstr ""
+
+#. module: users_ldap
+#: model:ir.model,name:users_ldap.model_res_company_ldap
+msgid "res.company.ldap"
+msgstr ""
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_tls:0
+msgid "Use TLS"
+msgstr ""
+
+#. module: users_ldap
+#: field:res.company.ldap,sequence:0
+msgid "Sequence"
+msgstr "Numeracja"
+
+#. module: users_ldap
+#: view:res.company.ldap:0
+msgid "Login Information"
+msgstr ""
+
+#. module: users_ldap
+#: view:res.company.ldap:0
+msgid "Server Information"
+msgstr ""
+
+#. module: users_ldap
+#: model:ir.actions.act_window,name:users_ldap.action_ldap_installer
+msgid "Setup your LDAP Server"
+msgstr ""
+
+#. module: users_ldap
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr "Nie możesz mieć dwóch użytkowników z tym samym loginem !"
+
+#. module: users_ldap
+#: field:res.company,ldaps:0
+msgid "LDAP Parameters"
+msgstr "Parametry LDAP"
+
+#. module: users_ldap
+#: help:res.company.ldap,ldap_password:0
+msgid ""
+"The password of the user account on the LDAP server that is used to query "
+"the directory."
+msgstr ""
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_password:0
+msgid "LDAP password"
+msgstr "Hasło LDAP"
+
+#. module: users_ldap
+#: field:res.company.ldap,user:0
+msgid "Model User"
+msgstr "Model użytkownika"
+
+#. module: users_ldap
+#: model:ir.model,name:users_ldap.model_res_users
+msgid "res.users"
+msgstr ""
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_filter:0
+msgid "LDAP filter"
+msgstr "Filtr LDAP"
+
+#. module: users_ldap
+#: field:res.company.ldap,create_user:0
+msgid "Create user"
+msgstr "Utwórz użytkownika"
+
+#~ msgid "Authenticate users with ldap server"
+#~ msgstr "Autentykuj użytkowników serwerem LDAP"
diff --git a/addons/users_ldap/i18n/pt.po b/addons/users_ldap/i18n/pt.po
new file mode 100644
index 00000000000..9bd98327bb0
--- /dev/null
+++ b/addons/users_ldap/i18n/pt.po
@@ -0,0 +1,182 @@
+# Portuguese translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:37+0000\n"
+"PO-Revision-Date: 2010-12-12 09:24+0000\n"
+"Last-Translator: OpenERP Administrators <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: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
+
+#. module: users_ldap
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr "Erro! Não pode criar empresas recursivas."
+
+#. module: users_ldap
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr ""
+"A empresa escolhida não está entre as permitidas para este utilizador"
+
+#. module: users_ldap
+#: help:res.company.ldap,ldap_tls:0
+msgid ""
+"Request secure TLS/SSL encryption when connecting to the LDAP server. This "
+"option requires a server with STARTTLS enabled, otherwise all authentication "
+"attempts will fail."
+msgstr ""
+
+#. module: users_ldap
+#: view:res.company:0
+#: view:res.company.ldap:0
+msgid "LDAP Configuration"
+msgstr "Configuração do LDAP"
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_binddn:0
+msgid "LDAP binddn"
+msgstr "LDAP binddn"
+
+#. module: users_ldap
+#: help:res.company.ldap,create_user:0
+msgid "Create the user if not in database"
+msgstr "Criar utilizador se não existir na base de dados"
+
+#. module: users_ldap
+#: help:res.company.ldap,user:0
+msgid "Model used for user creation"
+msgstr "Modelo usado na criação de utilizadores"
+
+#. module: users_ldap
+#: field:res.company.ldap,company:0
+msgid "Company"
+msgstr "Empresa"
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_server:0
+msgid "LDAP Server address"
+msgstr "Endereço do servidor de LDAP"
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_server_port:0
+msgid "LDAP Server port"
+msgstr "Porto do Servidor LDAP"
+
+#. module: users_ldap
+#: help:res.company.ldap,ldap_binddn:0
+msgid ""
+"The user account on the LDAP server that is used to query the directory. "
+"Leave empty to connect anonymously."
+msgstr ""
+"A conta do utilizador no servidor LDAP que é usada para consultar o "
+"diretório. Deixe em branco para ligar anonimamente."
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_base:0
+msgid "LDAP base"
+msgstr "LDAP base"
+
+#. module: users_ldap
+#: view:res.company.ldap:0
+msgid "User Information"
+msgstr "Informação do Utilizador"
+
+#. module: users_ldap
+#: sql_constraint:res.company:0
+msgid "The company name must be unique !"
+msgstr "O nome da empresa deve ser único!"
+
+#. module: users_ldap
+#: model:ir.model,name:users_ldap.model_res_company
+msgid "Companies"
+msgstr "Empresas"
+
+#. module: users_ldap
+#: view:res.company.ldap:0
+msgid "Process Parameter"
+msgstr "Parâmetro de Processamento"
+
+#. module: users_ldap
+#: model:ir.model,name:users_ldap.model_res_company_ldap
+msgid "res.company.ldap"
+msgstr "res.company.ldap"
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_tls:0
+msgid "Use TLS"
+msgstr "Usar TLS"
+
+#. module: users_ldap
+#: field:res.company.ldap,sequence:0
+msgid "Sequence"
+msgstr "Sequência"
+
+#. module: users_ldap
+#: view:res.company.ldap:0
+msgid "Login Information"
+msgstr "Informação de Login"
+
+#. module: users_ldap
+#: view:res.company.ldap:0
+msgid "Server Information"
+msgstr "Informação do Servidor"
+
+#. module: users_ldap
+#: model:ir.actions.act_window,name:users_ldap.action_ldap_installer
+msgid "Setup your LDAP Server"
+msgstr "Configure o seus servidor LDAP"
+
+#. module: users_ldap
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr "Não pode ter dois utilizadores com o mesmo login!"
+
+#. module: users_ldap
+#: field:res.company,ldaps:0
+msgid "LDAP Parameters"
+msgstr "Parâmetros de LDAP"
+
+#. module: users_ldap
+#: help:res.company.ldap,ldap_password:0
+msgid ""
+"The password of the user account on the LDAP server that is used to query "
+"the directory."
+msgstr "A senha da conta de acesso ao servidor LDAP usado pela query."
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_password:0
+msgid "LDAP password"
+msgstr "Senha de LDAP"
+
+#. module: users_ldap
+#: field:res.company.ldap,user:0
+msgid "Model User"
+msgstr "Utilizador Modelo"
+
+#. module: users_ldap
+#: model:ir.model,name:users_ldap.model_res_users
+msgid "res.users"
+msgstr "res.users"
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_filter:0
+msgid "LDAP filter"
+msgstr "Filtro LDAP"
+
+#. module: users_ldap
+#: field:res.company.ldap,create_user:0
+msgid "Create user"
+msgstr "Criar Utilizador"
+
+#~ msgid "Authenticate users with ldap server"
+#~ msgstr "Autenticar utilizadores com um servidor LDAP"
diff --git a/addons/users_ldap/i18n/pt_BR.po b/addons/users_ldap/i18n/pt_BR.po
new file mode 100644
index 00000000000..9f7ac1f243e
--- /dev/null
+++ b/addons/users_ldap/i18n/pt_BR.po
@@ -0,0 +1,188 @@
+# Brazilian Portuguese translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:37+0000\n"
+"PO-Revision-Date: 2012-07-28 22:27+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: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
+
+#. module: users_ldap
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr "Erro! Voce não pode criar empresas recursivas"
+
+#. module: users_ldap
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr ""
+"A empresa escolhida não está entre as empresas habilitadas para este usuário"
+
+#. module: users_ldap
+#: help:res.company.ldap,ldap_tls:0
+msgid ""
+"Request secure TLS/SSL encryption when connecting to the LDAP server. This "
+"option requires a server with STARTTLS enabled, otherwise all authentication "
+"attempts will fail."
+msgstr ""
+"Solicite a conexão segura com encriptação TLS/SSL quando se conectar no "
+"servidor LDAP. Esta opção requer um servidor com STARTTLS habilitado, caso "
+"contrário a autenticação irá falhar"
+
+#. module: users_ldap
+#: view:res.company:0
+#: view:res.company.ldap:0
+msgid "LDAP Configuration"
+msgstr "Configuração LDAP"
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_binddn:0
+msgid "LDAP binddn"
+msgstr "LDAP binddn"
+
+#. module: users_ldap
+#: help:res.company.ldap,create_user:0
+msgid "Create the user if not in database"
+msgstr "Cria o usuário se não existe na base"
+
+#. module: users_ldap
+#: help:res.company.ldap,user:0
+msgid "Model used for user creation"
+msgstr "Modelo utilizado para criação do usuário"
+
+#. module: users_ldap
+#: field:res.company.ldap,company:0
+msgid "Company"
+msgstr "Empresa"
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_server:0
+msgid "LDAP Server address"
+msgstr "Endereço do Servidor LDAP"
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_server_port:0
+msgid "LDAP Server port"
+msgstr "Porta do Servidor LDAP"
+
+#. module: users_ldap
+#: help:res.company.ldap,ldap_binddn:0
+msgid ""
+"The user account on the LDAP server that is used to query the directory. "
+"Leave empty to connect anonymously."
+msgstr ""
+"A conta do usuário no servidor LDAP que é usada para a busca no diretório, "
+"deixe em branco para conectar anonimamente"
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_base:0
+msgid "LDAP base"
+msgstr "Base LDAP"
+
+#. module: users_ldap
+#: view:res.company.ldap:0
+msgid "User Information"
+msgstr "Informações do usuário"
+
+#. module: users_ldap
+#: sql_constraint:res.company:0
+msgid "The company name must be unique !"
+msgstr "O nome da empresa deve ser exclusivo!"
+
+#. module: users_ldap
+#: model:ir.model,name:users_ldap.model_res_company
+msgid "Companies"
+msgstr "Empresas"
+
+#. module: users_ldap
+#: view:res.company.ldap:0
+msgid "Process Parameter"
+msgstr "Parâmetro de Processo"
+
+#. module: users_ldap
+#: model:ir.model,name:users_ldap.model_res_company_ldap
+msgid "res.company.ldap"
+msgstr "res.company.ldap"
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_tls:0
+msgid "Use TLS"
+msgstr "Usar TLS"
+
+#. module: users_ldap
+#: field:res.company.ldap,sequence:0
+msgid "Sequence"
+msgstr "Sequência"
+
+#. module: users_ldap
+#: view:res.company.ldap:0
+msgid "Login Information"
+msgstr "Informações de login"
+
+#. module: users_ldap
+#: view:res.company.ldap:0
+msgid "Server Information"
+msgstr "Informação do servidor"
+
+#. module: users_ldap
+#: model:ir.actions.act_window,name:users_ldap.action_ldap_installer
+msgid "Setup your LDAP Server"
+msgstr "Configure seu servidor LDAP"
+
+#. module: users_ldap
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr "Não é permitido criar dois usuários com o mesmo login!"
+
+#. module: users_ldap
+#: field:res.company,ldaps:0
+msgid "LDAP Parameters"
+msgstr "Parâmetros LDAP"
+
+#. module: users_ldap
+#: help:res.company.ldap,ldap_password:0
+msgid ""
+"The password of the user account on the LDAP server that is used to query "
+"the directory."
+msgstr ""
+"A senha da conta de usuário no servidor LDAP que é usada para a busca no "
+"diretório"
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_password:0
+msgid "LDAP password"
+msgstr "Senha LDAP"
+
+#. module: users_ldap
+#: field:res.company.ldap,user:0
+msgid "Model User"
+msgstr "Usuário Modelo"
+
+#. module: users_ldap
+#: model:ir.model,name:users_ldap.model_res_users
+msgid "res.users"
+msgstr "res.users"
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_filter:0
+msgid "LDAP filter"
+msgstr "Filtro LDAP"
+
+#. module: users_ldap
+#: field:res.company.ldap,create_user:0
+msgid "Create user"
+msgstr "Criar usuário"
+
+#~ msgid "Authenticate users with ldap server"
+#~ msgstr "Autenticar usuário com servidor ldap"
diff --git a/addons/users_ldap/i18n/ro.po b/addons/users_ldap/i18n/ro.po
new file mode 100644
index 00000000000..1bd578f6ea0
--- /dev/null
+++ b/addons/users_ldap/i18n/ro.po
@@ -0,0 +1,187 @@
+# Romanian 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-02-08 00:37+0000\n"
+"PO-Revision-Date: 2012-01-09 11:12+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: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
+
+#. module: users_ldap
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr "Eroare! Nu puteti crea companii recursive."
+
+#. module: users_ldap
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr ""
+"Compania aleasa nu se afla printre companiile permise acestui utilizator"
+
+#. module: users_ldap
+#: help:res.company.ldap,ldap_tls:0
+msgid ""
+"Request secure TLS/SSL encryption when connecting to the LDAP server. This "
+"option requires a server with STARTTLS enabled, otherwise all authentication "
+"attempts will fail."
+msgstr ""
+"Este necesara criptarea sigura TLS/SSl atunci cand va conectati la serverul "
+"LDAP. Aceasta optiune necesita un server cu STARTTLS activat, altfel toate "
+"incercarile de autentificare vor esua."
+
+#. module: users_ldap
+#: view:res.company:0
+#: view:res.company.ldap:0
+msgid "LDAP Configuration"
+msgstr "Configurare LDAP"
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_binddn:0
+msgid "LDAP binddn"
+msgstr "LDAP sistem binddn"
+
+#. module: users_ldap
+#: help:res.company.ldap,create_user:0
+msgid "Create the user if not in database"
+msgstr "Creeaza utilizator daca nu se afla in baza de date"
+
+#. module: users_ldap
+#: help:res.company.ldap,user:0
+msgid "Model used for user creation"
+msgstr "Model folosit pentru crearea utilizatorului"
+
+#. module: users_ldap
+#: field:res.company.ldap,company:0
+msgid "Company"
+msgstr "Companie"
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_server:0
+msgid "LDAP Server address"
+msgstr "Adresa Server LDAP"
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_server_port:0
+msgid "LDAP Server port"
+msgstr "Port Server LDAP"
+
+#. module: users_ldap
+#: help:res.company.ldap,ldap_binddn:0
+msgid ""
+"The user account on the LDAP server that is used to query the directory. "
+"Leave empty to connect anonymously."
+msgstr ""
+"Contul utilizatorului in serverul LDAP care este folosit pentru a cauta "
+"directoarea. Lasati necompletat pentru a va conecta anonim."
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_base:0
+msgid "LDAP base"
+msgstr "Baza LDAP"
+
+#. module: users_ldap
+#: view:res.company.ldap:0
+msgid "User Information"
+msgstr "Informatii utilizator"
+
+#. module: users_ldap
+#: sql_constraint:res.company:0
+msgid "The company name must be unique !"
+msgstr "Numele companiei trebuie să fie unic !"
+
+#. module: users_ldap
+#: model:ir.model,name:users_ldap.model_res_company
+msgid "Companies"
+msgstr "Companii"
+
+#. module: users_ldap
+#: view:res.company.ldap:0
+msgid "Process Parameter"
+msgstr "Parametri proces"
+
+#. module: users_ldap
+#: model:ir.model,name:users_ldap.model_res_company_ldap
+msgid "res.company.ldap"
+msgstr "res.ldap.companie"
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_tls:0
+msgid "Use TLS"
+msgstr "Utilizeaza TLS"
+
+#. module: users_ldap
+#: field:res.company.ldap,sequence:0
+msgid "Sequence"
+msgstr "Secventa"
+
+#. module: users_ldap
+#: view:res.company.ldap:0
+msgid "Login Information"
+msgstr "Informatii de autentificare"
+
+#. module: users_ldap
+#: view:res.company.ldap:0
+msgid "Server Information"
+msgstr "Informatii Server"
+
+#. module: users_ldap
+#: model:ir.actions.act_window,name:users_ldap.action_ldap_installer
+msgid "Setup your LDAP Server"
+msgstr "Configurati-va Serverul d-voastra LDAP"
+
+#. module: users_ldap
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr "Nu pot exista doi utilizatori cu acelasi nume de autentificare !"
+
+#. module: users_ldap
+#: field:res.company,ldaps:0
+msgid "LDAP Parameters"
+msgstr "Parametri LDAP"
+
+#. module: users_ldap
+#: help:res.company.ldap,ldap_password:0
+msgid ""
+"The password of the user account on the LDAP server that is used to query "
+"the directory."
+msgstr ""
+"Parola contului utilizatorului din serverul LDAP care este folosita pentru a "
+"cauta directoarea."
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_password:0
+msgid "LDAP password"
+msgstr "Parola LDAP"
+
+#. module: users_ldap
+#: field:res.company.ldap,user:0
+msgid "Model User"
+msgstr "Model Utilizator"
+
+#. module: users_ldap
+#: model:ir.model,name:users_ldap.model_res_users
+msgid "res.users"
+msgstr "res.utilizatori"
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_filter:0
+msgid "LDAP filter"
+msgstr "Filtru LDAP"
+
+#. module: users_ldap
+#: field:res.company.ldap,create_user:0
+msgid "Create user"
+msgstr "Creare utilizator"
+
+#~ msgid "Authenticate users with ldap server"
+#~ msgstr "Autentifică utilizatorii cu serverul ldap"
diff --git a/addons/users_ldap/i18n/ru.po b/addons/users_ldap/i18n/ru.po
new file mode 100644
index 00000000000..da04ed38add
--- /dev/null
+++ b/addons/users_ldap/i18n/ru.po
@@ -0,0 +1,180 @@
+# Russian translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:37+0000\n"
+"PO-Revision-Date: 2011-05-12 20:26+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: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
+
+#. module: users_ldap
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr "Ошибка ! Нельзя создать организации рекурсивно."
+
+#. module: users_ldap
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr ""
+"Выбранная организация отсутствует в списке разрешённых для этого пользователя"
+
+#. module: users_ldap
+#: help:res.company.ldap,ldap_tls:0
+msgid ""
+"Request secure TLS/SSL encryption when connecting to the LDAP server. This "
+"option requires a server with STARTTLS enabled, otherwise all authentication "
+"attempts will fail."
+msgstr ""
+
+#. module: users_ldap
+#: view:res.company:0
+#: view:res.company.ldap:0
+msgid "LDAP Configuration"
+msgstr "Конфигурация LDAP"
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_binddn:0
+msgid "LDAP binddn"
+msgstr "LDAP binddn"
+
+#. module: users_ldap
+#: help:res.company.ldap,create_user:0
+msgid "Create the user if not in database"
+msgstr "Создавать пользователя при отсутствии в базе данных"
+
+#. module: users_ldap
+#: help:res.company.ldap,user:0
+msgid "Model used for user creation"
+msgstr "Модель, используемая при создании пользователя"
+
+#. module: users_ldap
+#: field:res.company.ldap,company:0
+msgid "Company"
+msgstr "Организация"
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_server:0
+msgid "LDAP Server address"
+msgstr "Адрес сервера LDAP"
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_server_port:0
+msgid "LDAP Server port"
+msgstr "Порт сервера LDAP"
+
+#. module: users_ldap
+#: help:res.company.ldap,ldap_binddn:0
+msgid ""
+"The user account on the LDAP server that is used to query the directory. "
+"Leave empty to connect anonymously."
+msgstr ""
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_base:0
+msgid "LDAP base"
+msgstr "LDAP base"
+
+#. module: users_ldap
+#: view:res.company.ldap:0
+msgid "User Information"
+msgstr ""
+
+#. module: users_ldap
+#: sql_constraint:res.company:0
+msgid "The company name must be unique !"
+msgstr ""
+
+#. module: users_ldap
+#: model:ir.model,name:users_ldap.model_res_company
+msgid "Companies"
+msgstr "Организации"
+
+#. module: users_ldap
+#: view:res.company.ldap:0
+msgid "Process Parameter"
+msgstr ""
+
+#. module: users_ldap
+#: model:ir.model,name:users_ldap.model_res_company_ldap
+msgid "res.company.ldap"
+msgstr "res.company.ldap"
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_tls:0
+msgid "Use TLS"
+msgstr ""
+
+#. module: users_ldap
+#: field:res.company.ldap,sequence:0
+msgid "Sequence"
+msgstr "Последовательность"
+
+#. module: users_ldap
+#: view:res.company.ldap:0
+msgid "Login Information"
+msgstr ""
+
+#. module: users_ldap
+#: view:res.company.ldap:0
+msgid "Server Information"
+msgstr ""
+
+#. module: users_ldap
+#: model:ir.actions.act_window,name:users_ldap.action_ldap_installer
+msgid "Setup your LDAP Server"
+msgstr ""
+
+#. module: users_ldap
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr "Не может быть двух пользователей с одинаковым именем пользователя!"
+
+#. module: users_ldap
+#: field:res.company,ldaps:0
+msgid "LDAP Parameters"
+msgstr "Параметры LDAP"
+
+#. module: users_ldap
+#: help:res.company.ldap,ldap_password:0
+msgid ""
+"The password of the user account on the LDAP server that is used to query "
+"the directory."
+msgstr ""
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_password:0
+msgid "LDAP password"
+msgstr "Пароль LDAP"
+
+#. module: users_ldap
+#: field:res.company.ldap,user:0
+msgid "Model User"
+msgstr "Типовой пользователь"
+
+#. module: users_ldap
+#: model:ir.model,name:users_ldap.model_res_users
+msgid "res.users"
+msgstr "res.users"
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_filter:0
+msgid "LDAP filter"
+msgstr "Фильтр LDAP"
+
+#. module: users_ldap
+#: field:res.company.ldap,create_user:0
+msgid "Create user"
+msgstr "Создать пользователя"
+
+#~ msgid "Authenticate users with ldap server"
+#~ msgstr "Аутентификация пользователей на сервере LDAP"
diff --git a/addons/users_ldap/i18n/sv.po b/addons/users_ldap/i18n/sv.po
new file mode 100644
index 00000000000..2e992a148d4
--- /dev/null
+++ b/addons/users_ldap/i18n/sv.po
@@ -0,0 +1,176 @@
+# Swedish 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-02-08 00:37+0000\n"
+"PO-Revision-Date: 2012-06-23 11:22+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: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
+
+#. module: users_ldap
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr "Fel! Du kan inte skapa rekursiva bolagsstrukturer."
+
+#. module: users_ldap
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr "Detta bolag är inte tillåtet för den här användaren"
+
+#. module: users_ldap
+#: help:res.company.ldap,ldap_tls:0
+msgid ""
+"Request secure TLS/SSL encryption when connecting to the LDAP server. This "
+"option requires a server with STARTTLS enabled, otherwise all authentication "
+"attempts will fail."
+msgstr ""
+
+#. module: users_ldap
+#: view:res.company:0
+#: view:res.company.ldap:0
+msgid "LDAP Configuration"
+msgstr "LDAP-konfiguration"
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_binddn:0
+msgid "LDAP binddn"
+msgstr "LDAP-binddn"
+
+#. module: users_ldap
+#: help:res.company.ldap,create_user:0
+msgid "Create the user if not in database"
+msgstr "Skapa användaren om den saknas i databasen"
+
+#. module: users_ldap
+#: help:res.company.ldap,user:0
+msgid "Model used for user creation"
+msgstr "Klass som används för att skapa användaren"
+
+#. module: users_ldap
+#: field:res.company.ldap,company:0
+msgid "Company"
+msgstr "Bolag"
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_server:0
+msgid "LDAP Server address"
+msgstr "LDAP serveradress"
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_server_port:0
+msgid "LDAP Server port"
+msgstr "LDAP serverport"
+
+#. module: users_ldap
+#: help:res.company.ldap,ldap_binddn:0
+msgid ""
+"The user account on the LDAP server that is used to query the directory. "
+"Leave empty to connect anonymously."
+msgstr ""
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_base:0
+msgid "LDAP base"
+msgstr "LDAP-bas"
+
+#. module: users_ldap
+#: view:res.company.ldap:0
+msgid "User Information"
+msgstr "Användarinformation"
+
+#. module: users_ldap
+#: sql_constraint:res.company:0
+msgid "The company name must be unique !"
+msgstr "Bolagsnamnet måste vara unikt !"
+
+#. module: users_ldap
+#: model:ir.model,name:users_ldap.model_res_company
+msgid "Companies"
+msgstr "Bolag"
+
+#. module: users_ldap
+#: view:res.company.ldap:0
+msgid "Process Parameter"
+msgstr "Processparameter"
+
+#. module: users_ldap
+#: model:ir.model,name:users_ldap.model_res_company_ldap
+msgid "res.company.ldap"
+msgstr "res.company.ldap"
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_tls:0
+msgid "Use TLS"
+msgstr "Använd TLS"
+
+#. module: users_ldap
+#: field:res.company.ldap,sequence:0
+msgid "Sequence"
+msgstr "Nummerserie"
+
+#. module: users_ldap
+#: view:res.company.ldap:0
+msgid "Login Information"
+msgstr "Inloggningsuppgifter"
+
+#. module: users_ldap
+#: view:res.company.ldap:0
+msgid "Server Information"
+msgstr "Serverinformation"
+
+#. module: users_ldap
+#: model:ir.actions.act_window,name:users_ldap.action_ldap_installer
+msgid "Setup your LDAP Server"
+msgstr "Ställ in din LDAP-server"
+
+#. module: users_ldap
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr "Du kan inte ha två användare med samma användarid !"
+
+#. module: users_ldap
+#: field:res.company,ldaps:0
+msgid "LDAP Parameters"
+msgstr "LDAP-parametrar"
+
+#. module: users_ldap
+#: help:res.company.ldap,ldap_password:0
+msgid ""
+"The password of the user account on the LDAP server that is used to query "
+"the directory."
+msgstr ""
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_password:0
+msgid "LDAP password"
+msgstr "LDAP-lösenord"
+
+#. module: users_ldap
+#: field:res.company.ldap,user:0
+msgid "Model User"
+msgstr "Mallanvändare"
+
+#. module: users_ldap
+#: model:ir.model,name:users_ldap.model_res_users
+msgid "res.users"
+msgstr "res.users"
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_filter:0
+msgid "LDAP filter"
+msgstr "LDAP-filter"
+
+#. module: users_ldap
+#: field:res.company.ldap,create_user:0
+msgid "Create user"
+msgstr "Skapa användare"
diff --git a/addons/users_ldap/i18n/tr.po b/addons/users_ldap/i18n/tr.po
new file mode 100644
index 00000000000..160214fdc33
--- /dev/null
+++ b/addons/users_ldap/i18n/tr.po
@@ -0,0 +1,183 @@
+# Turkish translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:37+0000\n"
+"PO-Revision-Date: 2012-02-10 21:12+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: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
+
+#. module: users_ldap
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr "Hata! İç içe tekrarlayan şirketler seçemezsiniz."
+
+#. module: users_ldap
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr "Bu kullanıcının seçilen şirkete erişim hakkı yok"
+
+#. module: users_ldap
+#: help:res.company.ldap,ldap_tls:0
+msgid ""
+"Request secure TLS/SSL encryption when connecting to the LDAP server. This "
+"option requires a server with STARTTLS enabled, otherwise all authentication "
+"attempts will fail."
+msgstr ""
+"LDAP sunucuya bağlanırken güvenli TLS/SSL bağlantı iste. Bu opsiyon için "
+"sunucuda STARTTLS açık  olmalıdır, aksi durumda bağlantı kurulamaz."
+
+#. module: users_ldap
+#: view:res.company:0
+#: view:res.company.ldap:0
+msgid "LDAP Configuration"
+msgstr "LDAP Düzenleme"
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_binddn:0
+msgid "LDAP binddn"
+msgstr "LDAP binddn"
+
+#. module: users_ldap
+#: help:res.company.ldap,create_user:0
+msgid "Create the user if not in database"
+msgstr "Veritabanında yoksa kullanıcı oluştur"
+
+#. module: users_ldap
+#: help:res.company.ldap,user:0
+msgid "Model used for user creation"
+msgstr "Kullanıcı oluşturma için kullanılan model"
+
+#. module: users_ldap
+#: field:res.company.ldap,company:0
+msgid "Company"
+msgstr "Firma"
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_server:0
+msgid "LDAP Server address"
+msgstr "LDAP Sunucu adresi"
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_server_port:0
+msgid "LDAP Server port"
+msgstr "LDAP Sunucu portu"
+
+#. module: users_ldap
+#: help:res.company.ldap,ldap_binddn:0
+msgid ""
+"The user account on the LDAP server that is used to query the directory. "
+"Leave empty to connect anonymously."
+msgstr ""
+"LDAP dizininde sorgulama yapmak için kullanılacak kullanıcı adı. Anonim "
+"giriş için boş bırakın."
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_base:0
+msgid "LDAP base"
+msgstr "LDAP tabanı"
+
+#. module: users_ldap
+#: view:res.company.ldap:0
+msgid "User Information"
+msgstr "Kullanıcı Bilgileri"
+
+#. module: users_ldap
+#: sql_constraint:res.company:0
+msgid "The company name must be unique !"
+msgstr "Şirket adı tekil olmalı !"
+
+#. module: users_ldap
+#: model:ir.model,name:users_ldap.model_res_company
+msgid "Companies"
+msgstr "Firmalar"
+
+#. module: users_ldap
+#: view:res.company.ldap:0
+msgid "Process Parameter"
+msgstr "İşlem Parametresi"
+
+#. module: users_ldap
+#: model:ir.model,name:users_ldap.model_res_company_ldap
+msgid "res.company.ldap"
+msgstr "res.firma.ldap"
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_tls:0
+msgid "Use TLS"
+msgstr "TLS kullan"
+
+#. module: users_ldap
+#: field:res.company.ldap,sequence:0
+msgid "Sequence"
+msgstr "Sıra"
+
+#. module: users_ldap
+#: view:res.company.ldap:0
+msgid "Login Information"
+msgstr "Giriş Bilgileri"
+
+#. module: users_ldap
+#: view:res.company.ldap:0
+msgid "Server Information"
+msgstr "Sunucu bilgileri"
+
+#. module: users_ldap
+#: model:ir.actions.act_window,name:users_ldap.action_ldap_installer
+msgid "Setup your LDAP Server"
+msgstr "LDAP Sunucunuzu ayarlayın"
+
+#. module: users_ldap
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr "Aynı kullanıcı adı ile iki kullanıcı oluşturamazsınız !"
+
+#. module: users_ldap
+#: field:res.company,ldaps:0
+msgid "LDAP Parameters"
+msgstr "LDAP Parametreleri"
+
+#. module: users_ldap
+#: help:res.company.ldap,ldap_password:0
+msgid ""
+"The password of the user account on the LDAP server that is used to query "
+"the directory."
+msgstr "LDAP dizinini sorgulamak için gerekli kullanıcı şifresi."
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_password:0
+msgid "LDAP password"
+msgstr "LDAP şifresi"
+
+#. module: users_ldap
+#: field:res.company.ldap,user:0
+msgid "Model User"
+msgstr "Model Kullanıcı"
+
+#. module: users_ldap
+#: model:ir.model,name:users_ldap.model_res_users
+msgid "res.users"
+msgstr "res.users"
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_filter:0
+msgid "LDAP filter"
+msgstr "LDAP süzgeçi"
+
+#. module: users_ldap
+#: field:res.company.ldap,create_user:0
+msgid "Create user"
+msgstr "Kullanıcı oluştur"
+
+#~ msgid "Authenticate users with ldap server"
+#~ msgstr "Ldap sunucusu ile doğrulama"
diff --git a/addons/users_ldap/i18n/zh_CN.po b/addons/users_ldap/i18n/zh_CN.po
new file mode 100644
index 00000000000..2048ef06eeb
--- /dev/null
+++ b/addons/users_ldap/i18n/zh_CN.po
@@ -0,0 +1,179 @@
+# Chinese (Simplified) translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:37+0000\n"
+"PO-Revision-Date: 2012-02-08 03:35+0000\n"
+"Last-Translator: Wei \"oldrev\" Li <oldrev@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: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
+
+#. module: users_ldap
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr "错误！您不能创建递归公司."
+
+#. module: users_ldap
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr "选择的用户组不在这用允许的用户组"
+
+#. module: users_ldap
+#: help:res.company.ldap,ldap_tls:0
+msgid ""
+"Request secure TLS/SSL encryption when connecting to the LDAP server. This "
+"option requires a server with STARTTLS enabled, otherwise all authentication "
+"attempts will fail."
+msgstr "当连接 LDAP 服务器时请求服务器使用安全的 TLS/SSL 加密。该选项需要服务器启用 STARTTLS，否则所有用户验证都将失败。"
+
+#. module: users_ldap
+#: view:res.company:0
+#: view:res.company.ldap:0
+msgid "LDAP Configuration"
+msgstr "LDAP 配置"
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_binddn:0
+msgid "LDAP binddn"
+msgstr "LDAP binddn"
+
+#. module: users_ldap
+#: help:res.company.ldap,create_user:0
+msgid "Create the user if not in database"
+msgstr "如果数据库中没有用户就创建新的用户"
+
+#. module: users_ldap
+#: help:res.company.ldap,user:0
+msgid "Model used for user creation"
+msgstr "创建用户使用的模型"
+
+#. module: users_ldap
+#: field:res.company.ldap,company:0
+msgid "Company"
+msgstr "公司"
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_server:0
+msgid "LDAP Server address"
+msgstr "LDAP 服务器地址"
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_server_port:0
+msgid "LDAP Server port"
+msgstr "LDAP 服务器端口"
+
+#. module: users_ldap
+#: help:res.company.ldap,ldap_binddn:0
+msgid ""
+"The user account on the LDAP server that is used to query the directory. "
+"Leave empty to connect anonymously."
+msgstr "用于查询 LDAP 服务器目录的用户帐号。如果要匿名连接请保持为空。"
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_base:0
+msgid "LDAP base"
+msgstr "LDAP 基节点"
+
+#. module: users_ldap
+#: view:res.company.ldap:0
+msgid "User Information"
+msgstr "用户信息"
+
+#. module: users_ldap
+#: sql_constraint:res.company:0
+msgid "The company name must be unique !"
+msgstr "公司名必须唯一！"
+
+#. module: users_ldap
+#: model:ir.model,name:users_ldap.model_res_company
+msgid "Companies"
+msgstr "公司"
+
+#. module: users_ldap
+#: view:res.company.ldap:0
+msgid "Process Parameter"
+msgstr "进程参数"
+
+#. module: users_ldap
+#: model:ir.model,name:users_ldap.model_res_company_ldap
+msgid "res.company.ldap"
+msgstr "res.company.ldap"
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_tls:0
+msgid "Use TLS"
+msgstr "使用安全传输协议"
+
+#. module: users_ldap
+#: field:res.company.ldap,sequence:0
+msgid "Sequence"
+msgstr "序号"
+
+#. module: users_ldap
+#: view:res.company.ldap:0
+msgid "Login Information"
+msgstr "登录信息"
+
+#. module: users_ldap
+#: view:res.company.ldap:0
+msgid "Server Information"
+msgstr "服务器信息"
+
+#. module: users_ldap
+#: model:ir.actions.act_window,name:users_ldap.action_ldap_installer
+msgid "Setup your LDAP Server"
+msgstr "设置您的 LDAP 服务器"
+
+#. module: users_ldap
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr "你不能同时登录两个用户！"
+
+#. module: users_ldap
+#: field:res.company,ldaps:0
+msgid "LDAP Parameters"
+msgstr "LDAP 参数"
+
+#. module: users_ldap
+#: help:res.company.ldap,ldap_password:0
+msgid ""
+"The password of the user account on the LDAP server that is used to query "
+"the directory."
+msgstr "LDAP 服务器上的用户帐号密码，用于查询该目录服务。"
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_password:0
+msgid "LDAP password"
+msgstr "LDAP 密码"
+
+#. module: users_ldap
+#: field:res.company.ldap,user:0
+msgid "Model User"
+msgstr "用户模型"
+
+#. module: users_ldap
+#: model:ir.model,name:users_ldap.model_res_users
+msgid "res.users"
+msgstr "res.users"
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_filter:0
+msgid "LDAP filter"
+msgstr "LDAP 过滤器"
+
+#. module: users_ldap
+#: field:res.company.ldap,create_user:0
+msgid "Create user"
+msgstr "创建用户"
+
+#~ msgid "Authenticate users with ldap server"
+#~ msgstr "通过LDAP服务器认证用户"
diff --git a/addons/warning/__openerp__.py b/addons/warning/__openerp__.py
index 2391020d20c..c03dc1ec488 100644
--- a/addons/warning/__openerp__.py
+++ b/addons/warning/__openerp__.py
@@ -33,8 +33,8 @@ picking and invoice. The message is triggered by the form's onchange event.
     """,
     'author': 'OpenERP SA',
     'depends': ['base', 'sale', 'purchase'],
-    'update_xml': ['warning_view.xml'],
-    'demo_xml': [],
+    'data': ['warning_view.xml'],
+    'demo': [],
     'installable': True,
     'auto_install': False,
     'certificate': '0080334018749',
diff --git a/addons/warning/i18n/ar.po b/addons/warning/i18n/ar.po
index 3cd194d6c7c..dce4ac8a562 100644
--- a/addons/warning/i18n/ar.po
+++ b/addons/warning/i18n/ar.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:23+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:28+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: warning
 #: sql_constraint:purchase.order:0
diff --git a/addons/warning/i18n/bg.po b/addons/warning/i18n/bg.po
index c39818d6c92..c7445ad9d74 100644
--- a/addons/warning/i18n/bg.po
+++ b/addons/warning/i18n/bg.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:23+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:28+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: warning
 #: sql_constraint:purchase.order:0
diff --git a/addons/warning/i18n/bs.po b/addons/warning/i18n/bs.po
index 6f1063c82cd..02a136ae583 100644
--- a/addons/warning/i18n/bs.po
+++ b/addons/warning/i18n/bs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:23+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:28+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: warning
 #: sql_constraint:purchase.order:0
diff --git a/addons/warning/i18n/ca.po b/addons/warning/i18n/ca.po
index 26b65284152..ef62f46f9fa 100644
--- a/addons/warning/i18n/ca.po
+++ b/addons/warning/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:23+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:28+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: warning
 #: sql_constraint:purchase.order:0
diff --git a/addons/warning/i18n/cs.po b/addons/warning/i18n/cs.po
index 1c829186bfb..fdceb5d0f82 100644
--- a/addons/warning/i18n/cs.po
+++ b/addons/warning/i18n/cs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:23+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:28+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: warning
 #: sql_constraint:purchase.order:0
diff --git a/addons/warning/i18n/da.po b/addons/warning/i18n/da.po
index d4ad0768d81..9bdc4e21dbf 100644
--- a/addons/warning/i18n/da.po
+++ b/addons/warning/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:23+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:28+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: warning
 #: sql_constraint:purchase.order:0
diff --git a/addons/warning/i18n/de.po b/addons/warning/i18n/de.po
index b8eb618de5c..ef978b925de 100644
--- a/addons/warning/i18n/de.po
+++ b/addons/warning/i18n/de.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:23+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:28+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: warning
 #: sql_constraint:purchase.order:0
diff --git a/addons/warning/i18n/el.po b/addons/warning/i18n/el.po
index d8d70ed3051..c100f122eb3 100644
--- a/addons/warning/i18n/el.po
+++ b/addons/warning/i18n/el.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:23+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:28+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: warning
 #: sql_constraint:purchase.order:0
diff --git a/addons/warning/i18n/es.po b/addons/warning/i18n/es.po
index 64c2e7f7670..ff04abcdca5 100644
--- a/addons/warning/i18n/es.po
+++ b/addons/warning/i18n/es.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:23+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:28+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: warning
 #: sql_constraint:purchase.order:0
diff --git a/addons/warning/i18n/es_AR.po b/addons/warning/i18n/es_AR.po
index 6b884050565..9ba0b5a9949 100644
--- a/addons/warning/i18n/es_AR.po
+++ b/addons/warning/i18n/es_AR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:28+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: warning
 #: sql_constraint:purchase.order:0
diff --git a/addons/warning/i18n/es_CR.po b/addons/warning/i18n/es_CR.po
index a44bf835ce2..29ba326b5c3 100644
--- a/addons/warning/i18n/es_CR.po
+++ b/addons/warning/i18n/es_CR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:28+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 "Language: \n"
 
 #. module: warning
diff --git a/addons/warning/i18n/et.po b/addons/warning/i18n/et.po
index 9d2498d49a8..b6857942ecc 100644
--- a/addons/warning/i18n/et.po
+++ b/addons/warning/i18n/et.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:23+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:28+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: warning
 #: sql_constraint:purchase.order:0
diff --git a/addons/warning/i18n/fi.po b/addons/warning/i18n/fi.po
index f9b1be28f98..dc25098ef85 100644
--- a/addons/warning/i18n/fi.po
+++ b/addons/warning/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:23+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:28+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: warning
 #: sql_constraint:purchase.order:0
diff --git a/addons/warning/i18n/fr.po b/addons/warning/i18n/fr.po
index ddfc569c25d..5b91ba39fb0 100644
--- a/addons/warning/i18n/fr.po
+++ b/addons/warning/i18n/fr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:23+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:28+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: warning
 #: sql_constraint:purchase.order:0
diff --git a/addons/warning/i18n/gl.po b/addons/warning/i18n/gl.po
index 3cdfb0448b2..aafa36b7c1d 100644
--- a/addons/warning/i18n/gl.po
+++ b/addons/warning/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:23+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:28+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: warning
 #: sql_constraint:purchase.order:0
diff --git a/addons/warning/i18n/hr.po b/addons/warning/i18n/hr.po
index e9faa3935cf..1e2163778f0 100644
--- a/addons/warning/i18n/hr.po
+++ b/addons/warning/i18n/hr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:23+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:28+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 "Language: hr\n"
 
 #. module: warning
diff --git a/addons/warning/i18n/hu.po b/addons/warning/i18n/hu.po
index 39594cbb441..3eaf9f31561 100644
--- a/addons/warning/i18n/hu.po
+++ b/addons/warning/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:23+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:28+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: warning
 #: sql_constraint:purchase.order:0
diff --git a/addons/warning/i18n/id.po b/addons/warning/i18n/id.po
index f1c93212b62..d58ecb030ed 100644
--- a/addons/warning/i18n/id.po
+++ b/addons/warning/i18n/id.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:23+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:28+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: warning
 #: sql_constraint:purchase.order:0
diff --git a/addons/warning/i18n/it.po b/addons/warning/i18n/it.po
index 4e24deee656..4006b83683c 100644
--- a/addons/warning/i18n/it.po
+++ b/addons/warning/i18n/it.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:23+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:28+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: warning
 #: sql_constraint:purchase.order:0
diff --git a/addons/warning/i18n/ja.po b/addons/warning/i18n/ja.po
index 01d57ef1c33..56c4dce14a3 100644
--- a/addons/warning/i18n/ja.po
+++ b/addons/warning/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:23+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:28+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: warning
 #: sql_constraint:purchase.order:0
diff --git a/addons/warning/i18n/ko.po b/addons/warning/i18n/ko.po
index c64853eaae8..8f451f5b7a0 100644
--- a/addons/warning/i18n/ko.po
+++ b/addons/warning/i18n/ko.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:23+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:28+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: warning
 #: sql_constraint:purchase.order:0
diff --git a/addons/warning/i18n/lt.po b/addons/warning/i18n/lt.po
index 0fdb8805b10..fe055c29fe8 100644
--- a/addons/warning/i18n/lt.po
+++ b/addons/warning/i18n/lt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:23+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:28+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: warning
 #: sql_constraint:purchase.order:0
diff --git a/addons/warning/i18n/mn.po b/addons/warning/i18n/mn.po
index 8ee259dcfd1..ba8faced2b5 100644
--- a/addons/warning/i18n/mn.po
+++ b/addons/warning/i18n/mn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:23+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:28+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: warning
 #: sql_constraint:purchase.order:0
diff --git a/addons/warning/i18n/nb.po b/addons/warning/i18n/nb.po
index 3a1ca3cc299..68c63c30828 100644
--- a/addons/warning/i18n/nb.po
+++ b/addons/warning/i18n/nb.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:23+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:28+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: warning
 #: sql_constraint:purchase.order:0
diff --git a/addons/warning/i18n/nl.po b/addons/warning/i18n/nl.po
index 9e8ad6a88bf..9f6ed9b0539 100644
--- a/addons/warning/i18n/nl.po
+++ b/addons/warning/i18n/nl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:23+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:28+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: warning
 #: sql_constraint:purchase.order:0
@@ -195,7 +195,7 @@ msgstr "Ongeldige BBA gestructureerde communicatie!"
 #. module: warning
 #: view:res.partner:0
 msgid "Warning on the Picking"
-msgstr "Waarschuwing op de pickinglijst"
+msgstr "Waarschuwing op de verzamellijst"
 
 #. module: warning
 #: view:res.partner:0
diff --git a/addons/warning/i18n/nl_BE.po b/addons/warning/i18n/nl_BE.po
index 9f6e0f2db73..4e2ffb85f96 100644
--- a/addons/warning/i18n/nl_BE.po
+++ b/addons/warning/i18n/nl_BE.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:28+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: warning
 #: sql_constraint:purchase.order:0
diff --git a/addons/warning/i18n/pl.po b/addons/warning/i18n/pl.po
index bef2ae64477..8c59d4af8a3 100644
--- a/addons/warning/i18n/pl.po
+++ b/addons/warning/i18n/pl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:23+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:28+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: warning
 #: sql_constraint:purchase.order:0
diff --git a/addons/warning/i18n/pt.po b/addons/warning/i18n/pt.po
index bde4f7af791..f68e490ccab 100644
--- a/addons/warning/i18n/pt.po
+++ b/addons/warning/i18n/pt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:23+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:28+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: warning
 #: sql_constraint:purchase.order:0
diff --git a/addons/warning/i18n/pt_BR.po b/addons/warning/i18n/pt_BR.po
index a3d38486249..ac90bd8d0db 100644
--- a/addons/warning/i18n/pt_BR.po
+++ b/addons/warning/i18n/pt_BR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:28+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: warning
 #: sql_constraint:purchase.order:0
diff --git a/addons/warning/i18n/ro.po b/addons/warning/i18n/ro.po
index 4752bbcb7fd..284e5a8eeab 100644
--- a/addons/warning/i18n/ro.po
+++ b/addons/warning/i18n/ro.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:23+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:28+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: warning
 #: sql_constraint:purchase.order:0
diff --git a/addons/warning/i18n/ru.po b/addons/warning/i18n/ru.po
index 0f61603de42..8b0d32dd345 100644
--- a/addons/warning/i18n/ru.po
+++ b/addons/warning/i18n/ru.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:23+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:28+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: warning
 #: sql_constraint:purchase.order:0
diff --git a/addons/warning/i18n/sl.po b/addons/warning/i18n/sl.po
index 54fc88b9ef5..f7a8c06457c 100644
--- a/addons/warning/i18n/sl.po
+++ b/addons/warning/i18n/sl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:23+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:28+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: warning
 #: sql_constraint:purchase.order:0
diff --git a/addons/warning/i18n/sq.po b/addons/warning/i18n/sq.po
index b859c7ce59d..4a12f250d7a 100644
--- a/addons/warning/i18n/sq.po
+++ b/addons/warning/i18n/sq.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:23+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:28+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: warning
 #: sql_constraint:purchase.order:0
diff --git a/addons/warning/i18n/sr.po b/addons/warning/i18n/sr.po
index 85b62faea7d..4e73068fb63 100644
--- a/addons/warning/i18n/sr.po
+++ b/addons/warning/i18n/sr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:23+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:28+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: warning
 #: sql_constraint:purchase.order:0
diff --git a/addons/warning/i18n/sr@latin.po b/addons/warning/i18n/sr@latin.po
index d59a729a241..b3ef04fc861 100644
--- a/addons/warning/i18n/sr@latin.po
+++ b/addons/warning/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:28+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: warning
 #: sql_constraint:purchase.order:0
diff --git a/addons/warning/i18n/sv.po b/addons/warning/i18n/sv.po
index 2bdb10155e5..557965f2c3e 100644
--- a/addons/warning/i18n/sv.po
+++ b/addons/warning/i18n/sv.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:23+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:28+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: warning
 #: sql_constraint:purchase.order:0
diff --git a/addons/warning/i18n/tlh.po b/addons/warning/i18n/tlh.po
index 2781a73eb87..d9c06c1192a 100644
--- a/addons/warning/i18n/tlh.po
+++ b/addons/warning/i18n/tlh.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:28+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: warning
 #: sql_constraint:purchase.order:0
diff --git a/addons/warning/i18n/tr.po b/addons/warning/i18n/tr.po
index c1edd440a56..0ab145bdec9 100644
--- a/addons/warning/i18n/tr.po
+++ b/addons/warning/i18n/tr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:28+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: warning
 #: sql_constraint:purchase.order:0
diff --git a/addons/warning/i18n/uk.po b/addons/warning/i18n/uk.po
index 004478c61b7..db1adfe74a2 100644
--- a/addons/warning/i18n/uk.po
+++ b/addons/warning/i18n/uk.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:28+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: warning
 #: sql_constraint:purchase.order:0
diff --git a/addons/warning/i18n/vi.po b/addons/warning/i18n/vi.po
index 03ddb4c7e18..159c3971e4d 100644
--- a/addons/warning/i18n/vi.po
+++ b/addons/warning/i18n/vi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:28+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: warning
 #: sql_constraint:purchase.order:0
diff --git a/addons/warning/i18n/zh_CN.po b/addons/warning/i18n/zh_CN.po
index 96353f59b75..20e3f0994d1 100644
--- a/addons/warning/i18n/zh_CN.po
+++ b/addons/warning/i18n/zh_CN.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:28+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: warning
 #: sql_constraint:purchase.order:0
diff --git a/addons/warning/i18n/zh_TW.po b/addons/warning/i18n/zh_TW.po
index 534702508e7..54b430964f8 100644
--- a/addons/warning/i18n/zh_TW.po
+++ b/addons/warning/i18n/zh_TW.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:28+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: warning
 #: sql_constraint:purchase.order:0
diff --git a/addons/warning/warning_view.xml b/addons/warning/warning_view.xml
index 3f3bbefdbab..fd12ce53ac9 100644
--- a/addons/warning/warning_view.xml
+++ b/addons/warning/warning_view.xml
@@ -45,16 +45,14 @@
             <field name="arch" type="xml">
                 <notebook position="inside">
                     <page string="Warnings">
-                        <group colspan="2" col="2">
-                            <separator string="Warning when Selling this Product" colspan="4"/>
-                            <field name="sale_line_warn"  nolabel="1" />
-                            <field name="sale_line_warn_msg" colspan="3" nolabel="1" 
+                        <group string="Warning when Selling this Product">
+                            <field name="sale_line_warn"/>
+                            <field name="sale_line_warn_msg"
                                     attrs="{'required':[('sale_line_warn','!=','no-message')],'readonly':[('sale_line_warn','=','no-message')]}"/>
                         </group>
-                        <group colspan="2" col="2">
-                            <separator string="Warning when Purchasing this Product" colspan="4" />
-                            <field name="purchase_line_warn"  nolabel="1" />
-                            <field name="purchase_line_warn_msg" colspan="3" nolabel="1" 
+                        <group string="Warning when Purchasing this Product">
+                            <field name="purchase_line_warn"/>
+                            <field name="purchase_line_warn_msg"
                                     attrs="{'required':[('purchase_line_warn','!=','no-message')],'readonly':[('purchase_line_warn','=','no-message')]}"/>
                         </group>
                     </page>
diff --git a/addons/web_linkedin/__openerp__.py b/addons/web_linkedin/__openerp__.py
index 122453d6096..6ce78cfca47 100644
--- a/addons/web_linkedin/__openerp__.py
+++ b/addons/web_linkedin/__openerp__.py
@@ -1,26 +1,19 @@
 {
-    "name" : "LinkedIn Integration",
+    'name' : 'LinkedIn Integration',
     'version': '0.1',
     'category': 'Tools',
-    'complexity': "easy",
-    "description":
+    'complexity': 'easy',
+    'description':
         """
-        OpenERP Web LinkedIn module.
-        This module provides the Integration of the LinkedIn with OpenERP.
+OpenERP Web LinkedIn module.
+============================
+This module provides the Integration of the LinkedIn with OpenERP.
         """,
-    'update_xml': [
-        'web_linkedin_view.xml',
-    ],
-    "depends" : ["base"],
-    "js": [
-        "static/src/js/*.js"
-        ],
-    "css": [
-        "static/src/css/*.css"
-        ],
-    'qweb': [
-        "static/src/xml/*.xml"
-        ],
+    'data': ['web_linkedin_view.xml'],
+    'depends' : ['crm'],
+    'js': ['static/src/js/*.js'],
+    'css': ['static/src/css/*.css'],
+    'qweb': ['static/src/xml/*.xml'],
     'installable': True,
     'auto_install': False,
 }
diff --git a/addons/web_linkedin/static/src/css/linkedin.css b/addons/web_linkedin/static/src/css/linkedin.css
index 16eea9f04d5..992dc48aeb8 100644
--- a/addons/web_linkedin/static/src/css/linkedin.css
+++ b/addons/web_linkedin/static/src/css/linkedin.css
@@ -32,4 +32,13 @@
 .openerp .oe_linkedin_entity img {
     max-width: 70px;   
     max-height: 70px;
-}
\ No newline at end of file
+}
+
+.openerp .oe_linkedin_entity h3 {
+    margin-bottom: 5px;
+}
+
+.openerp .oe_linkedin_entity .oe_linkedin_entity_headline {
+    color: grey;
+    margin-bottom: 10px;
+}
diff --git a/addons/web_linkedin/static/src/js/linkedin.js b/addons/web_linkedin/static/src/js/linkedin.js
index c15b995bff9..8f6a2b096a5 100644
--- a/addons/web_linkedin/static/src/js/linkedin.js
+++ b/addons/web_linkedin/static/src/js/linkedin.js
@@ -78,16 +78,12 @@ openerp.web_linkedin = function(instance) {
             }, _.bind(this.linkedin_disabled, this));
         },
         linkedin_disabled: function() {
-            if (instance.session.uid !== 1) {
-                instance.web.dialog($(QWeb.render("LinkedIn.DisabledWarning")), {
-                    title: _t("LinkedIn is not enabled"),
-                    buttons: [
-                        {text: _t("Ok"), click: function() { $(this).dialog("close"); }}
-                    ]
-                });
-            } else {
-                new instance.web_linkedin.KeyWizard(this).open();
-            }
+            instance.web.dialog($(QWeb.render("LinkedIn.DisabledWarning")), {
+                title: _t("LinkedIn is not enabled"),
+                buttons: [
+                    {text: _t("Ok"), click: function() { $(this).dialog("close"); }}
+                ]
+            });
         },
         selected_entity: function(entity) {
             var self = this;
@@ -102,11 +98,11 @@ openerp.web_linkedin = function(instance) {
             if (entity.__type === "company") {
                 to_change.is_company = true;
                 to_change.name = entity.name;
-                to_change.photo = false;
+                to_change.image = false;
                 if (entity.logoUrl) {
                     defs.push(self.rpc('/web_linkedin/binary/url2binary',
                                        {'url': entity.logoUrl}).pipe(function(data){
-                        to_change.photo = data;
+                        to_change.image = data;
                     }));
                 }
                 to_change.website = entity.websiteUrl;
@@ -123,7 +119,10 @@ openerp.web_linkedin = function(instance) {
                         children_def.resolve(result);
                     });
                 defs.push(children_def.pipe(function(result) {
-                    var defs = _.map(result.people.values || [], function(el) {
+                    result = _.reject(result.people.values || [], function(el) {
+                        return ! el.formattedName;
+                    });
+                    var defs = _.map(result, function(el) {
                         el.__type = "people";
                         return self.create_on_change(el);
                     });
@@ -138,23 +137,24 @@ openerp.web_linkedin = function(instance) {
             } else { // people
                 to_change.is_company = false;
                 to_change.name = entity.formattedName;
-                to_change.photo = false;
+                to_change.image = false;
                 if (entity.pictureUrl) {
                     defs.push(self.rpc('/web_linkedin/binary/url2binary',
                                        {'url': entity.pictureUrl}).pipe(function(data){
-                        to_change.photo = data;
+                        to_change.image = data;
                     }));
                 }
                 to_change.mobile = false;
                 to_change.phone = false;
-                _.each(entity.phoneNumbers.values || [], function(el) {
+                _.each((entity.phoneNumbers || {}).values || [], function(el) {
                     if (el.phoneType === "mobile") {
                         to_change.mobile = el.phoneNumber;
                     } else {
                         to_change.phone = el.phoneNumber;
                     }
                 });
-                to_change.function = entity.headline;
+                var positions = (entity.positions || {}).values || [];
+                to_change.function = positions.length > 0 ? positions[0].title : false;
                 /* TODO
                 to_change.linkedinUrl = entity.publicProfileUrl;
                 */
@@ -169,14 +169,14 @@ openerp.web_linkedin = function(instance) {
     
     var commonPeopleFields = ["id", "picture-url", "public-profile-url",
                             "formatted-name", "location", "phone-numbers", "im-accounts",
-                            "main-address", "headline"];
+                            "main-address", "headline", "positions"];
     
     instance.web_linkedin.LinkedinPopup = instance.web.Dialog.extend({
         template: "Linkedin.popup",
         init: function(parent, text) {
             this._super(parent, {title:_t("LinkedIn search")});
             this.text = text;
-            this.limit = 15;
+            this.limit = 5;
         },
         start: function() {
             this._super();
@@ -196,50 +196,53 @@ openerp.web_linkedin = function(instance) {
                     encodeURI(this.text), this.limit)).result(function (result) {
                 cdef.resolve(result);
             });
+            var def = cdef.pipe(function(companies) {
+                var lst = companies.companies.values || [];
+                lst = _.first(lst, self.limit);
+                lst = _.map(lst, function(el) {
+                    el.__type = "company";
+                    return el;
+                });
+                console.debug("Linkedin companies found:", lst.length, lst);
+                return self.display_result(lst, self.$(".oe_linkedin_pop_c"));
+            });
             IN.API.PeopleSearch().fields(commonPeopleFields).
                 params({"keywords": this.text, "count": this.limit}).result(function(result) {
                 pdef.resolve(result);
             });
-            return $.when(cdef, pdef).then(function(companies, people) {
-                var lst = companies.companies.values || [];
+            var def2 = pdef.pipe(function(people) {
                 var plst = people.people.values || [];
-                lst = _.initial(lst, _.min([self.limit / 2, plst.length]));
-                _.map(lst, function(el) {
-                    el.__type = "company";
-                    return el;
-                });
-                plst = _.first(plst, self.limit - lst.length)
-                _.map(plst, function(el) {
+                plst = _.first(plst, self.limit);
+                plst = _.map(plst, function(el) {
                     el.__type = "people";
                     return el;
                 });
-                lst = plst.concat(lst);
-                console.log("Linkedin search found:", lst.length, lst);
-                self.result = lst;
-                self.display_result();
+                console.debug("Linkedin people found:", plst.length, plst);
+                return self.display_result(plst, self.$(".oe_linkedin_pop_p"));
             });
+            return $.when(def, def2);
         },
-        display_result: function() {
+        display_result: function(result, $elem) {
             var self = this;
             var i = 0;
             var $row;
-            _.each(self.result, function(el) {
+            _.each(result, function(el) {
                 var pc = new instance.web_linkedin.EntityWidget(self, el);
                 if (i % 5 === 0) {
                     $row = $("<div style='display: table-row;width:100%'/>");
-                    $row.appendTo(self.$(">div"));
+                    $row.appendTo($elem);
                 }
                 pc.appendTo($row);
-                pc.$element.css("display", "table-cell");
-                pc.$element.css("width", "20%");
+                pc.$el.css("display", "table-cell");
+                pc.$el.css("width", "20%");
                 pc.on("selected", self, function(data) {
                     self.trigger("selected", data);
                     self.destroy();
                 });
                 i++;
             });
-            if (self.result.length === 0) {
-                self.$(">div").text(_t("No results found"));
+            if (result.length === 0) {
+                $elem.text(_t("No results found"));
             }
         },
     });
@@ -252,7 +255,7 @@ openerp.web_linkedin = function(instance) {
         },
         start: function() {
             var self = this;
-            this.$element.click(function() {
+            this.$el.click(function() {
                 self.trigger("selected", self.data);
             });
             if (this.data.__type === "company") {
@@ -261,26 +264,9 @@ openerp.web_linkedin = function(instance) {
             } else { // people
                 this.$("h3").text(this.data.formattedName);
                 self.$("img").attr("src", this.data.pictureUrl);
+                self.$(".oe_linkedin_entity_headline").text(this.data.headline);
             }
         },
     });
-    
-    
-    instance.web_linkedin.KeyWizard = instance.web.Dialog.extend({
-        template: "LinkedIn.KeyWizard", 
-        init: function(parent, text) {
-            this._super(parent, {title:_t("LinkedIn API Key")});
-        },
-        start: function() {
-            this._super();
-            var self = this;
-            this.$("button").click(function() {
-                var value = self.$("input").val();
-                return new instance.web.Model("ir.config_parameter").call("set_param", ["web.linkedin.apikey", value]).pipe(function() {
-                    self.destroy();
-                });
-            });
-        },
-    });
 };
 // vim:et fdc=0 fdl=0:
diff --git a/addons/web_linkedin/static/src/xml/linkedin.xml b/addons/web_linkedin/static/src/xml/linkedin.xml
index 0d062e6fd8c..1a8009ab066 100644
--- a/addons/web_linkedin/static/src/xml/linkedin.xml
+++ b/addons/web_linkedin/static/src/xml/linkedin.xml
@@ -10,7 +10,10 @@
         <div>
             <script type="in/Login">
             </script>
-            <div style='display: table;width:100%'/>
+            <h2 style="margin-top: -10px;">People</h2>
+            <div class="oe_linkedin_pop_p" style='display: table;width:100%'/>
+            <h2>Companies</h2>
+            <div class="oe_linkedin_pop_c" style='display: table;width:100%'/>
         </div>
     </t>
     <t t-name="Linkedin.EntityWidget">
@@ -21,36 +24,13 @@
                 </span>
             </span>
             <h3/>
+            <div class="oe_linkedin_entity_headline" />
         </div>
     </t>
     <t t-name="LinkedIn.DisabledWarning">
         <div>
             LinkedIn access was not enabled on this server.
-            Please ask your administrator to activate it.
-        </div>
-    </t>
-    <t t-name="LinkedIn.KeyWizard">
-        <div>
-            <p>
-                To use the LinkedIn module with this database, an API Key is required. Please follow this procedure:
-            </p>
-            <ul>
-                <li>Go to this URL: 
-                    <a href="https://www.linkedin.com/secure/developer" target="_blank">https://www.linkedin.com/secure/developer</a>.
-                </li>
-                <li>Log into LinkedIn.</li>
-                <li>Add a new application and fill the form:
-                    <ul>
-                        <li>JavaScript API Domain is Your domain name (e.g. https://yourcompany.my.openerp.com)</li>
-                        <li>You can give multiple domain (e.g. yourcompany.my.openerp.com)</li>
-                        <li>The programming tool is Javascript</li>
-                    </ul>
-                </li>
-                <li>Copy the API key here:
-                    <input type="text"/>
-                    <button>Apply</button>
-                </li>
-            </ul>
+            Please ask your administrator to configure it in Settings > Configuration > Linkedin.
         </div>
     </t>
 </templates>
\ No newline at end of file
diff --git a/addons/web_linkedin/web_linkedin.py b/addons/web_linkedin/web_linkedin.py
index 5c8ffc57cb5..ea94329f8b1 100644
--- a/addons/web_linkedin/web_linkedin.py
+++ b/addons/web_linkedin/web_linkedin.py
@@ -28,6 +28,7 @@ except ImportError:
 
 import base64
 import urllib2
+from osv import osv, fields
 
 class Binary(openerpweb.Controller):
     _cp_path = "/web_linkedin/binary"
@@ -36,4 +37,20 @@ class Binary(openerpweb.Controller):
     def url2binary(self, req,url):
         bfile = urllib2.urlopen(url)
         return base64.b64encode(bfile.read())
+    
+class web_linkedin_settings(osv.osv_memory):
+    _inherit = 'sale.config.settings'
+    _columns = {
+        'api_key': fields.char(string="API Key", size=50),
+        'server_domain': fields.char(size=100),
+    }
+    
+    def get_default_linkedin(self, cr, uid, fields, context=None):
+        key = self.pool.get("ir.config_parameter").get_param(cr, uid, "web.linkedin.apikey") or ""
+        dom = self.pool.get('ir.config_parameter').get_param(cr, uid, 'web.base.url')
+        return {'api_key': key, 'server_domain': dom,}
+    
+    def set_linkedin(self, cr, uid, ids, context=None):
+        key = self.browse(cr, uid, ids[0], context)["api_key"] or ""
+        self.pool.get("ir.config_parameter").set_param(cr, uid, "web.linkedin.apikey", key)
 
diff --git a/addons/web_linkedin/web_linkedin_view.xml b/addons/web_linkedin/web_linkedin_view.xml
index b636722e2c7..8b4fa617bf3 100644
--- a/addons/web_linkedin/web_linkedin_view.xml
+++ b/addons/web_linkedin/web_linkedin_view.xml
@@ -10,12 +10,39 @@
                 <field name="name" position="replace">
                     <field name="name" default_focus="1" nolabel="1" widget="linkedin" />
                 </field>
-                <!--<field name="title" position="before">
-                    <field name="linkedin_id" invisible="1"/>
-                    <field name="profile_id" invisible="1"/>
-                    <field name="twitter_id" invisible="1"/>
-                </field>-->
             </field>
        </record>
+        
+        <record id="view_linkedin_config_settings" model="ir.ui.view">
+            <field name="name">linkedin_settings</field>
+            <field name="model">sale.config.settings</field>
+            <field name="inherit_id" ref="base_setup.view_sale_config_settings"/>
+            <field name="arch" type="xml">
+                <div name="linkedin" position="inside">
+                    <form string="Configure Linkedin" version="7.0" class="oe_form_configuration">
+                        <p>
+                            To use the LinkedIn module with this database, an API Key is required. Please follow this procedure:
+                        </p>
+                        <ul>
+                            <li>Go to this URL: 
+                                <a href="https://www.linkedin.com/secure/developer" target="_blank">https://www.linkedin.com/secure/developer</a>.
+                            </li>
+                            <li>Log into LinkedIn.</li>
+                            <li>Add a new application and fill the form:
+                                <ul>
+                                    <li>JavaScript API Domain: <field name="server_domain" readonly="1" style="width:0"/></li>
+                                    <li>The programming tool is Javascript</li>
+                                </ul>
+                            </li>
+                            <li>Copy the API key down here:</li>
+                        </ul>
+                        <group>
+                            <field name="api_key"/>
+                        </group>
+                    </form>
+                </div>
+            </field>
+        </record>
+        
    </data>
 </openerp>
diff --git a/addons/web_livechat/i18n/ar.po b/addons/web_livechat/i18n/ar.po
index bd84afda409..62592c521f1 100644
--- a/addons/web_livechat/i18n/ar.po
+++ b/addons/web_livechat/i18n/ar.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: web_livechat
 #: sql_constraint:publisher_warranty.contract:0
diff --git a/addons/web_livechat/i18n/bg.po b/addons/web_livechat/i18n/bg.po
index 285b640b8c5..25fbcaa2d93 100644
--- a/addons/web_livechat/i18n/bg.po
+++ b/addons/web_livechat/i18n/bg.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: web_livechat
 #: sql_constraint:publisher_warranty.contract:0
diff --git a/addons/web_livechat/i18n/ca.po b/addons/web_livechat/i18n/ca.po
index 4a83e2026e2..3cf34a167bd 100644
--- a/addons/web_livechat/i18n/ca.po
+++ b/addons/web_livechat/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: web_livechat
 #: sql_constraint:publisher_warranty.contract:0
diff --git a/addons/web_livechat/i18n/cs.po b/addons/web_livechat/i18n/cs.po
index 98a7bbb22a1..99498b13bb8 100644
--- a/addons/web_livechat/i18n/cs.po
+++ b/addons/web_livechat/i18n/cs.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: web_livechat
 #: sql_constraint:publisher_warranty.contract:0
diff --git a/addons/web_livechat/i18n/da.po b/addons/web_livechat/i18n/da.po
index 8c9acc8dd1d..194c9fa2c12 100644
--- a/addons/web_livechat/i18n/da.po
+++ b/addons/web_livechat/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: web_livechat
 #: sql_constraint:publisher_warranty.contract:0
diff --git a/addons/web_livechat/i18n/de.po b/addons/web_livechat/i18n/de.po
index 2214d149f7b..2eeb7a881a8 100644
--- a/addons/web_livechat/i18n/de.po
+++ b/addons/web_livechat/i18n/de.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: web_livechat
 #: sql_constraint:publisher_warranty.contract:0
diff --git a/addons/web_livechat/i18n/es.po b/addons/web_livechat/i18n/es.po
index 2d6f5240b16..618dab2c45d 100644
--- a/addons/web_livechat/i18n/es.po
+++ b/addons/web_livechat/i18n/es.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: web_livechat
 #: sql_constraint:publisher_warranty.contract:0
diff --git a/addons/web_livechat/i18n/es_CR.po b/addons/web_livechat/i18n/es_CR.po
index 253dab7f524..a98ffa0f16f 100644
--- a/addons/web_livechat/i18n/es_CR.po
+++ b/addons/web_livechat/i18n/es_CR.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 "Language: es\n"
 
 #. module: web_livechat
diff --git a/addons/web_livechat/i18n/fi.po b/addons/web_livechat/i18n/fi.po
index ded1ab3317e..333a41fb801 100644
--- a/addons/web_livechat/i18n/fi.po
+++ b/addons/web_livechat/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: web_livechat
 #: sql_constraint:publisher_warranty.contract:0
diff --git a/addons/web_livechat/i18n/fr.po b/addons/web_livechat/i18n/fr.po
index e900a6fe511..31a3254e836 100644
--- a/addons/web_livechat/i18n/fr.po
+++ b/addons/web_livechat/i18n/fr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: web_livechat
 #: sql_constraint:publisher_warranty.contract:0
diff --git a/addons/web_livechat/i18n/gl.po b/addons/web_livechat/i18n/gl.po
index 736da165d3c..923f1f8adfd 100644
--- a/addons/web_livechat/i18n/gl.po
+++ b/addons/web_livechat/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: web_livechat
 #: sql_constraint:publisher_warranty.contract:0
diff --git a/addons/web_livechat/i18n/hr.po b/addons/web_livechat/i18n/hr.po
index ed2d11a9788..7c6fe6e2e3d 100644
--- a/addons/web_livechat/i18n/hr.po
+++ b/addons/web_livechat/i18n/hr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: web_livechat
 #: sql_constraint:publisher_warranty.contract:0
diff --git a/addons/web_livechat/i18n/it.po b/addons/web_livechat/i18n/it.po
index 6755ccff6ba..700b980ac98 100644
--- a/addons/web_livechat/i18n/it.po
+++ b/addons/web_livechat/i18n/it.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: web_livechat
 #: sql_constraint:publisher_warranty.contract:0
diff --git a/addons/web_livechat/i18n/ja.po b/addons/web_livechat/i18n/ja.po
index a931d6ef838..ee1240d1f61 100644
--- a/addons/web_livechat/i18n/ja.po
+++ b/addons/web_livechat/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: web_livechat
 #: sql_constraint:publisher_warranty.contract:0
diff --git a/addons/web_livechat/i18n/mn.po b/addons/web_livechat/i18n/mn.po
index e92377fa24b..8dd7946a7ed 100644
--- a/addons/web_livechat/i18n/mn.po
+++ b/addons/web_livechat/i18n/mn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: web_livechat
 #: sql_constraint:publisher_warranty.contract:0
diff --git a/addons/web_livechat/i18n/nl.po b/addons/web_livechat/i18n/nl.po
index d934db4842f..20d3ff4801f 100644
--- a/addons/web_livechat/i18n/nl.po
+++ b/addons/web_livechat/i18n/nl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: web_livechat
 #: sql_constraint:publisher_warranty.contract:0
diff --git a/addons/web_livechat/i18n/oc.po b/addons/web_livechat/i18n/oc.po
index 140f86729b6..18d65e3a5a7 100644
--- a/addons/web_livechat/i18n/oc.po
+++ b/addons/web_livechat/i18n/oc.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: web_livechat
 #: sql_constraint:publisher_warranty.contract:0
diff --git a/addons/web_livechat/i18n/pt.po b/addons/web_livechat/i18n/pt.po
index c0a87b4192a..d1afc718cc0 100644
--- a/addons/web_livechat/i18n/pt.po
+++ b/addons/web_livechat/i18n/pt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: web_livechat
 #: sql_constraint:publisher_warranty.contract:0
diff --git a/addons/web_livechat/i18n/pt_BR.po b/addons/web_livechat/i18n/pt_BR.po
index 19b0032e513..c93cba7e51e 100644
--- a/addons/web_livechat/i18n/pt_BR.po
+++ b/addons/web_livechat/i18n/pt_BR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: web_livechat
 #: sql_constraint:publisher_warranty.contract:0
diff --git a/addons/web_livechat/i18n/ro.po b/addons/web_livechat/i18n/ro.po
index b5db6402738..4922f92f5c6 100644
--- a/addons/web_livechat/i18n/ro.po
+++ b/addons/web_livechat/i18n/ro.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: web_livechat
 #: sql_constraint:publisher_warranty.contract:0
diff --git a/addons/web_livechat/i18n/ru.po b/addons/web_livechat/i18n/ru.po
index 4c372861896..612c8540191 100644
--- a/addons/web_livechat/i18n/ru.po
+++ b/addons/web_livechat/i18n/ru.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: web_livechat
 #: sql_constraint:publisher_warranty.contract:0
diff --git a/addons/web_livechat/i18n/sk.po b/addons/web_livechat/i18n/sk.po
index 3cd16219187..d9775572da5 100644
--- a/addons/web_livechat/i18n/sk.po
+++ b/addons/web_livechat/i18n/sk.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: web_livechat
 #: sql_constraint:publisher_warranty.contract:0
diff --git a/addons/web_livechat/i18n/sl.po b/addons/web_livechat/i18n/sl.po
index e5b6ca91da7..cf4b8a10cb0 100644
--- a/addons/web_livechat/i18n/sl.po
+++ b/addons/web_livechat/i18n/sl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: web_livechat
 #: sql_constraint:publisher_warranty.contract:0
diff --git a/addons/web_livechat/i18n/sr@latin.po b/addons/web_livechat/i18n/sr@latin.po
index edff7cf8f96..c50a92e8b0b 100644
--- a/addons/web_livechat/i18n/sr@latin.po
+++ b/addons/web_livechat/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: web_livechat
 #: sql_constraint:publisher_warranty.contract:0
diff --git a/addons/web_livechat/i18n/sv.po b/addons/web_livechat/i18n/sv.po
index e5e79c978be..07de5866be7 100644
--- a/addons/web_livechat/i18n/sv.po
+++ b/addons/web_livechat/i18n/sv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: web_livechat
 #: sql_constraint:publisher_warranty.contract:0
diff --git a/addons/web_livechat/i18n/tr.po b/addons/web_livechat/i18n/tr.po
index b6db67ba9f2..9cb03de7df2 100644
--- a/addons/web_livechat/i18n/tr.po
+++ b/addons/web_livechat/i18n/tr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: web_livechat
 #: sql_constraint:publisher_warranty.contract:0
diff --git a/addons/web_livechat/i18n/zh_CN.po b/addons/web_livechat/i18n/zh_CN.po
index fd2677ef7d3..3a83c57c4b6 100644
--- a/addons/web_livechat/i18n/zh_CN.po
+++ b/addons/web_livechat/i18n/zh_CN.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: web_livechat
 #: sql_constraint:publisher_warranty.contract:0
diff --git a/addons/web_shortcuts/__openerp__.py b/addons/web_shortcuts/__openerp__.py
index b587215a501..aa23ed2bfa6 100644
--- a/addons/web_shortcuts/__openerp__.py
+++ b/addons/web_shortcuts/__openerp__.py
@@ -27,21 +27,16 @@ Enable shortcuts feature in the web client.
 ===========================================
 
 Add a Shortcut icon in the systray in order to access the user's shortcuts (if any).
+
 Add a Shortcut icon besides the views title in order to add/remove a shortcut.
     """,
     'author': 'OpenERP SA',
     'website': 'http://openerp.com',
     'depends': ['base'],
-    'update_xml': [],
-    'js' : [
-        'static/src/js/web_shortcuts.js',
-    ],
-    'css' : [
-        'static/src/css/web_shortcuts.css',
-    ],
-    'qweb' : [
-        "static/src/xml/*.xml",
-    ],
+    'data': [],
+    'js' : ['static/src/js/web_shortcuts.js'],
+    'css' : ['static/src/css/web_shortcuts.css'],
+    'qweb' : ['static/src/xml/*.xml'],
     'installable': True,
     'auto_install': False,
 }
diff --git a/addons/web_shortcuts/static/src/js/web_shortcuts.js b/addons/web_shortcuts/static/src/js/web_shortcuts.js
index a2d0fe43596..743f3fc73aa 100644
--- a/addons/web_shortcuts/static/src/js/web_shortcuts.js
+++ b/addons/web_shortcuts/static/src/js/web_shortcuts.js
@@ -39,13 +39,13 @@ instance.web_shortcuts.Shortcuts = instance.web.Widget.extend({
         var self = this;
         this._super();
         this.trigger('load');
-        this.$element.on('click', '.oe_systray_shortcuts_items a', function() {
+        this.$el.on('click', '.oe_systray_shortcuts_items a', function() {
             self.trigger('click', $(this));
         });
     },
     load: function() {
         var self = this;
-        this.$element.find('.oe_systray_shortcuts_items').empty();
+        this.$el.find('.oe_systray_shortcuts_items').empty();
         return this.rpc('/web/shortcuts/list', {}, function(shortcuts) {
             _.each(shortcuts, function(sc) {
                 self.trigger('display', sc);
@@ -64,13 +64,13 @@ instance.web_shortcuts.Shortcuts = instance.web.Widget.extend({
     },
     display: function(sc) {
         var self = this;
-        this.$element.find('.oe_systray_shortcuts_items').append();
+        this.$el.find('.oe_systray_shortcuts_items').append();
         var $sc = $(QWeb.render('Systray.Shortcuts.Item', {'shortcut': sc}));
-        $sc.appendTo(self.$element.find('.oe_systray_shortcuts_items'));
+        $sc.appendTo(self.$el.find('.oe_systray_shortcuts_items'));
     },
     remove: function (menu_id) {
         var menu_id = this.session.active_id;
-        var $shortcut = this.$element.find('.oe_systray_shortcuts_items li a[data-id=' + menu_id + ']');
+        var $shortcut = this.$el.find('.oe_systray_shortcuts_items li a[data-id=' + menu_id + ']');
         var shortcut_id = $shortcut.data('shortcut-id');
         $shortcut.remove();
         this.dataset.unlink([shortcut_id]);
@@ -85,10 +85,10 @@ instance.web_shortcuts.Shortcuts = instance.web.Widget.extend({
                 instance.webclient.user_menu.on_action({action_id: ir_menu_data.action[0][2].id});
             }
         });
-        this.$element.find('.oe_systray_shortcuts').trigger('mouseout');
+        this.$el.find('.oe_systray_shortcuts').trigger('mouseout');
     },
     has: function(menu_id) {
-        return !!this.$element.find('a[data-id=' + menu_id + ']').length;
+        return !!this.$el.find('a[data-id=' + menu_id + ']').length;
     }
 });
 
@@ -101,7 +101,7 @@ instance.web.UserMenu.include({
                 self.shortcuts.trigger('load');
             } else {
                 self.shortcuts = new instance.web_shortcuts.Shortcuts(self);
-                self.shortcuts.appendTo(instance.webclient.$element.find('.oe_systray'));
+                self.shortcuts.appendTo(instance.webclient.$el.find('.oe_systray'));
             }
         });
     },
@@ -119,7 +119,7 @@ instance.web.ViewManagerAction.include({
         var shortcuts_menu = instance.webclient.user_menu.shortcuts;
         var grandparent = this.getParent() && this.getParent().getParent();
         // display shortcuts if on the first view for the action
-        var $shortcut_toggle = this.$element.find('.oe_shortcuts_toggle');
+        var $shortcut_toggle = this.$el.find('.oe_shortcuts_toggle');
         if (!this.action.name ||
                 !(view.view_type === this.views_src[0].view_type
                     && view.view_id === this.views_src[0].view_id)) {